diff options
| author | Pablo Vazquez <venomgfx@gmail.com> | 2018-06-20 13:24:13 +0300 |
|---|---|---|
| committer | Pablo Vazquez <venomgfx@gmail.com> | 2018-06-20 13:24:24 +0300 |
| commit | 84c2ef0eaf9d9901f6a88c6e095490378ac5d677 (patch) | |
| tree | 84615355559c223e083196597921ce97d5ffe75a /source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl | |
| parent | 20788e174751797c8c3f225f63444939cb8c54bf (diff) | |
UI: Use chevrons for number sliders, pulldowns and popovers
In the future popovers/pulldowns should have different indicators
Patch by William Reynish and Clement Foucault
Diffstat (limited to 'source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl')
| -rw-r--r-- | source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl index dcd23413c77..733919e0aab 100644 --- a/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl @@ -47,10 +47,12 @@ const vec2 jit[9] = vec2[9]( /* We can reuse the CORNER_* bits for tria */ #define TRIA_VEC_RANGE BIT_RANGE(6) -const vec2 triavec[37] = vec2[37]( - /* ROUNDBOX_TRIA_ARROWS */ - vec2(-0.352077, 0.532607), vec2(-0.352077, -0.549313), vec2( 0.330000, -0.008353), - vec2( 0.352077, 0.532607), vec2( 0.352077, -0.549313), vec2(-0.330000, -0.008353), +const vec2 triavec[43] = vec2[43]( + + /* ROUNDBOX_TRIA_ARROWS */ + vec2(-0.170000, 0.400000), vec2(-0.050000, 0.520000), vec2( 0.250000, 0.000000), vec2( 0.470000, -0.000000), vec2(-0.170000, -0.400000), vec2(-0.050000, -0.520000), + vec2( 0.170000, 0.400000), vec2( 0.050000, 0.520000), vec2(-0.250000, 0.000000), vec2(-0.470000, -0.000000), vec2( 0.170000, -0.400000), vec2( 0.050000, -0.520000), + /* ROUNDBOX_TRIA_SCROLL - circle tria (triangle strip) */ vec2(0.000000, 1.000000), vec2(0.382684, 0.923879), vec2(-0.382683, 0.923880), @@ -61,13 +63,18 @@ const vec2 triavec[37] = vec2[37]( vec2(0.707107, -0.707107), vec2(-0.707107, -0.707107), vec2(0.382684, -0.923879), vec2(-0.382683, -0.923880), vec2(0.000000, -1.000000), - /* ROUNDBOX_TRIA_MENU - menu arrows */ - vec2(-0.33, 0.16), vec2(0.33, 0.16), vec2(0.0, 0.82), - vec2(0.0, -0.82), vec2(-0.33, -0.16), vec2(0.33, -0.16), + + + /* ROUNDBOX_TRIA_MENU - menu arrows */ + vec2(-0.66, 0.08), vec2(-0.56, 0.20), vec2(-0.2, -0.39), + vec2(-0.2, -0.18), vec2(0.26, 0.08), vec2(0.15, 0.20), + + /* ROUNDBOX_TRIA_CHECK - check mark */ - vec2(-0.578579, 0.253369), vec2(-0.392773, 0.412794), vec2(-0.004241, -0.328551), - vec2(-0.003001, 0.034320), vec2(1.055313, 0.864744), vec2(0.866408, 1.026895), - /* ROUNDBOX_TRIA_HOLD_ACTION_ARROW - hold action arrows */ + vec2(-0.67000, 0.020000), vec2(-0.500000, 0.190000), vec2(-0.130000, -0.520000), + vec2(-0.130000, -0.170000), vec2(0.720000, 0.430000), vec2(0.530000, 0.590000), + + /* ROUNDBOX_TRIA_HOLD_ACTION_ARROW - hold action arrows */ #define OY (-0.2 / 2) #define SC (0.35 * 2) // vec2(-0.5 + SC, 1.0 + OY), vec2( 0.5, 1.0 + OY), vec2( 0.5, 0.0 + OY + SC), |