diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-06-15 16:36:04 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-06-15 16:37:13 +0300 |
commit | e5522474891459c8a2a08a735666850f5756b96f (patch) | |
tree | be29cae38c4bfc4b0a23984f02858c2cf679a06d /source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl | |
parent | 86a2f4a34a7d87c016416708117b6b36c6655666 (diff) |
MeshEditMode: refactor
- added a lib for shaded functions
- decreased active face inner size
Diffstat (limited to 'source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl')
-rw-r--r-- | source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl index eadb774c57e..203e7c3dddc 100644 --- a/source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl +++ b/source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl @@ -44,18 +44,10 @@ flat in vec2 eData2[3]; out vec4 FragColor; -#define EDGE_EXISTS (1 << 0) -#define EDGE_ACTIVE (1 << 1) -#define EDGE_SELECTED (1 << 2) -#define EDGE_SEAM (1 << 3) -#define EDGE_SHARP (1 << 4) /* Vertex flag is shifted and combined with the edge flag */ -#define VERTEX_ACTIVE (1 << (0 + 8)) -#define VERTEX_SELECTED (1 << (1 + 8)) #define FACE_ACTIVE (1 << (2 + 8)) #define LARGE_EDGE_SIZE 3.0 -#define LARGE_EDGE_SIZE_ACTIVE_FACE 5.0 /* Style Parameters in pixel */ @@ -153,17 +145,7 @@ void main() /* Outer large edge */ float largeEdge = e[v] - sizeEdge * LARGE_EDGE_SIZE; - vec4 large_edge_color = vec4(0.0); - large_edge_color = ((flag[v] & EDGE_SHARP) != 0) ? colorEdgeSharp : large_edge_color; - large_edge_color = (edgesCrease[v] > 0.0) ? vec4(colorEdgeCrease.rgb, edgesCrease[v]) : large_edge_color; - large_edge_color = (edgesBweight[v] > 0.0) ? vec4(colorEdgeBWeight.rgb, edgesBweight[v]) : large_edge_color; - large_edge_color = ((flag[v] & EDGE_SEAM) != 0) ? colorEdgeSeam : large_edge_color; - - if ((flag[0] & FACE_ACTIVE) != 0) - { - large_edge_color = colorEditMeshActive; - largeEdge = e[v] - sizeEdge * LARGE_EDGE_SIZE_ACTIVE_FACE; - } + vec4 large_edge_color = EDIT_MESH_edge_color_outer(flag[v], (flag[0]& FACE_ACTIVE) != 0, edgesCrease[v], edgesBweight[v]); if (large_edge_color.a != 0.0) { colorDistEdge(large_edge_color, largeEdge); @@ -178,14 +160,7 @@ void main() #ifdef VERTEX_SELECTION colorDistEdge(vec4(vertexColor, 1.0), innerEdge); #else -# ifdef EDGE_SELECTION - vec4 inner_edge_color = colorWireEdit; - inner_edge_color = ((flag[v] & EDGE_SELECTED) != 0) ? colorEdgeSelect : inner_edge_color; - inner_edge_color = ((flag[v] & EDGE_ACTIVE) != 0) ? vec4(colorEditMeshActive.rgb, 1.0) : inner_edge_color; - -# else - vec4 inner_edge_color = colorWireInactive; -# endif + vec4 inner_edge_color = EDIT_MESH_edge_color_inner(flag[v], (flag[0]& FACE_ACTIVE) != 0); colorDistEdge(inner_edge_color, innerEdge); #endif } @@ -197,8 +172,8 @@ void main() float size = p[v] - sizeVertex; vec4 point_color = colorVertex; - point_color = ((flag[v] & VERTEX_SELECTED) != 0) ? colorVertexSelect : point_color; - point_color = ((flag[v] & VERTEX_ACTIVE) != 0) ? vec4(colorEditMeshActive.xyz, 1.0) : point_color; + point_color = ((flag[v] & EDGE_VERTEX_SELECTED) != 0) ? colorVertexSelect : point_color; + point_color = ((flag[v] & EDGE_VERTEX_ACTIVE) != 0) ? vec4(colorEditMeshActive.xyz, 1.0) : point_color; colorDist(point_color, size); } |