diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-08-26 18:30:49 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-08-26 18:46:03 +0300 |
commit | 7fee153bf5e3268ce6627154e62ca5d867cecdb6 (patch) | |
tree | 34fbaa3f498c9042c521dfd7a04b446c1a4b21b4 /source/blender/draw/intern/draw_common.c | |
parent | 487cd7237c9d208cd2b9fa11f49a83ba46a97399 (diff) |
3D View: show selected object axis when affect origins is enabled
This replaces temporarily enabling draw-axis.
Diffstat (limited to 'source/blender/draw/intern/draw_common.c')
-rw-r--r-- | source/blender/draw/intern/draw_common.c | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index ac3e7e4ce67..096e1c2aeca 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -243,6 +243,7 @@ extern char datatoc_gpu_shader_point_varying_color_frag_glsl[]; extern char datatoc_object_mball_handles_vert_glsl[]; extern char datatoc_object_empty_axes_vert_glsl[]; +extern char datatoc_object_color_axes_vert_glsl[]; typedef struct COMMON_Shaders { struct GPUShader *shape_outline; @@ -262,6 +263,7 @@ typedef struct COMMON_Shaders { struct GPUShader *volume_velocity_needle_sh; struct GPUShader *volume_velocity_sh; struct GPUShader *empty_axes_sh; + struct GPUShader *color_axes_sh; struct GPUShader *mball_handles; } COMMON_Shaders; @@ -549,6 +551,37 @@ struct DRWCallBuffer *buffer_instance_empty_axes(DRWPass *pass, return DRW_shgroup_call_buffer_instance(grp, g_formats.instance_sized, geom); } +struct DRWCallBuffer *buffer_instance_color_axes(DRWPass *pass, + struct GPUBatch *geom, + DRWShadingGroup **r_grp, + eGPUShaderConfig sh_cfg) +{ + COMMON_Shaders *sh_data = &g_shaders[sh_cfg]; + if (sh_data->color_axes_sh == NULL) { + const GPUShaderConfigData *sh_cfg_data = &GPU_shader_cfg_data[sh_cfg]; + sh_data->color_axes_sh = GPU_shader_create_from_arrays({ + .vert = (const char *[]){sh_cfg_data->lib, datatoc_object_color_axes_vert_glsl, NULL}, + .frag = (const char *[]){datatoc_gpu_shader_flat_color_frag_glsl, NULL}, + .defs = (const char *[]){sh_cfg_data->def, NULL}, + }); + } + + DRW_shgroup_instance_format(g_formats.instance_sized, + { + {"color", DRW_ATTR_FLOAT, 3}, + {"size", DRW_ATTR_FLOAT, 1}, + {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16}, + }); + + DRWShadingGroup *grp = DRW_shgroup_create(sh_data->color_axes_sh, pass); + DRW_shgroup_uniform_vec3(grp, "screenVecs[0]", DRW_viewport_screenvecs_get(), 2); + if (sh_cfg == GPU_SHADER_CFG_CLIPPED) { + DRW_shgroup_state_enable(grp, DRW_STATE_CLIP_PLANES); + } + *r_grp = grp; + return DRW_shgroup_call_buffer_instance(grp, g_formats.instance_sized, geom); +} + struct DRWCallBuffer *buffer_instance_outline(DRWPass *pass, struct GPUBatch *geom, const int *baseid, |