B28 vd exp update 4 (#2616)

* small ui tweaks * abstract out the draw_data composition * enable dashed shader during custom shader draw

B28 vd exp update 4 (#2616)
* small ui tweaks * abstract out the draw_data composition * enable dashed shader during custom shader draw
4886a26b · Dealga McArdle · GitHub · 07068a82 · 4886a26b · 4886a26b
--- a/nodes/viz/vd_draw_experimental.py
+++ b/nodes/viz/vd_draw_experimental.py
@@ -142,7 +142,7 @@ def draw_uniform(GL_KIND, coords, indices, color, width=1, dashed_data=None):

    if GL_KIND == 'LINES' and dashed_data:

-        shader = dashed_data.shader
+        shader = dashed_data.dashed_shader
        batch = batch_for_shader(shader, 'LINES', {"inPos" : coords}, **params)
        shader.bind()
        shader.uniform_float("u_mvp", dashed_data.matrix)
@@ -185,7 +185,7 @@ def pack_dashed_config(config):
    dashed_config.u_dash_size = config.u_dash_size
    dashed_config.u_gap_size = config.u_gap_size
    dashed_config.m_color = config.line4f
-    dashed_config.shader = config.shader
+    dashed_config.dashed_shader = config.dashed_shader
    return dashed_config

 def draw_lines_uniform(context, config, coords, indices, line_color, line_width):
@@ -216,7 +216,32 @@ def draw_fragment(context, args):
    shader.uniform_float("brightness", 0.5)
    batch.draw(shader)

-def draw_faces(context, args):
+def draw_faces_uniform(context, args):
+    geom, config = args
+
+    if config.draw_gl_wireframe:
+            bgl.glPolygonMode(bgl.GL_FRONT_AND_BACK, bgl.GL_LINE)
+
+    if config.draw_gl_polygonoffset:
+        bgl.glEnable(bgl.GL_POLYGON_OFFSET_FILL)
+        bgl.glPolygonOffset(1.0, 1.0)
+
+    if config.shade == "flat":
+        draw_uniform('TRIS', geom.verts, geom.faces, config.face4f)
+    elif config.shade == "facet":
+        draw_smooth(geom.facet_verts, geom.facet_verts_vcols)
+    elif config.shade == "smooth":
+        draw_smooth(geom.verts, geom.smooth_vcols, indices=geom.faces)
+    elif config.shade == 'fragment':
+        if config.draw_fragment_function:
+            config.draw_fragment_function(context, args)
+        else:
+            draw_fragment(context, args)
+
+    if config.draw_gl_wireframe:
+        bgl.glPolygonMode(bgl.GL_FRONT_AND_BACK, bgl.GL_FILL)
+
+def draw_complex(context, args):
    geom, config = args

    if config.draw_gl_polygonoffset:
@@ -224,32 +249,8 @@ def draw_faces(context, args):
    
    if config.display_edges:
        draw_lines_uniform(context, config, geom.verts, geom.edges, config.line4f, config.line_width)
-
    if config.display_faces:
-
-        if config.draw_gl_wireframe:
-            bgl.glPolygonMode(bgl.GL_FRONT_AND_BACK, bgl.GL_LINE)
-
-        if config.draw_gl_polygonoffset:
-            bgl.glEnable(bgl.GL_POLYGON_OFFSET_FILL)
-            bgl.glPolygonOffset(1.0, 1.0)
-
-        if config.shade == "flat":
-            draw_uniform('TRIS', geom.verts, geom.faces, config.face4f)
-        elif config.shade == "facet":
-            draw_smooth(geom.facet_verts, geom.facet_verts_vcols)
-        elif config.shade == "smooth":
-            draw_smooth(geom.verts, geom.smooth_vcols, indices=geom.faces)
-        elif config.shade == 'fragment':
-            if config.draw_fragment_function:
-                config.draw_fragment_function(context, args)
-            else:
-                draw_fragment(context, args)
-
-        if config.draw_gl_wireframe:
-            bgl.glPolygonMode(bgl.GL_FRONT_AND_BACK, bgl.GL_FILL)
-
-
+        draw_faces_uniform(context, args)
    if config.display_verts:
        draw_uniform('POINTS', geom.verts, None, config.vcol, config.point_size)

@@ -433,7 +434,7 @@ class SvVDExperimental(bpy.types.Node, SverchCustomTreeNode):
        layout.separator()

    def add_gl_stuff_to_config(self, config):
-        config.shader = gpu.types.GPUShader(dashed_vertex_shader, dashed_fragment_shader)
+        config.dashed_shader = gpu.types.GPUShader(dashed_vertex_shader, dashed_fragment_shader)

    def fill_config(self):

@@ -531,6 +532,12 @@ class SvVDExperimental(bpy.types.Node, SverchCustomTreeNode):
                    print('error inside socket_acquired_attrs: ', err)
                    self.id_data.unfreeze(hard=True)  # ensure this thing is unfrozen

+    def format_draw_data(self, func=None, args=None):
+        return {
+            'tree_name': self.id_data.name[:],
+            'custom_function': func,
+            'args': args}
+
    def process(self):

        self.handle_attr_socket()
@@ -560,12 +567,8 @@ class SvVDExperimental(bpy.types.Node, SverchCustomTreeNode):
            geom.verts = coords

            if self.display_verts and not any([display_edges, display_faces]):
-                draw_data = {
-                    'tree_name': self.id_data.name[:],
-                    'custom_function': draw_verts,
-                    'args': (geom, config)
-                }
-                callback_enable(n_id, draw_data)
+                gl_instructions = self.format_draw_data(func=draw_verts, args=(geom, config))
+                callback_enable(n_id, gl_instructions)
                return

            if edges_socket.is_linked and not faces_socket.is_linked:
@@ -573,20 +576,13 @@ class SvVDExperimental(bpy.types.Node, SverchCustomTreeNode):
                    self.add_gl_stuff_to_config(config)

                geom.edges = edge_indices
-                draw_data = {
-                    'tree_name': self.id_data.name[:],
-                    'custom_function': draw_edges,
-                    'args': (geom, config)
-                }
-                callback_enable(n_id, draw_data)
+                gl_instructions = self.format_draw_data(func=draw_edges, args=(geom, config))
+                callback_enable(n_id, gl_instructions)
                return

            if faces_socket.is_linked:

-                # we could offer different optimizations, like
-                #  -expecting only tris as input, then no processing
-                #  -expecting only quads, then minimal processing needed
-                #  -expecting mixed bag, then ensure_triangles (current default)
+                #  expecting mixed bag of tris/quads/ngons
                if self.display_faces:
                    geom.faces = ensure_triangles(coords, face_indices)

@@ -597,30 +593,20 @@ class SvVDExperimental(bpy.types.Node, SverchCustomTreeNode):
                    # we don't want to draw the inner edges of triangulated faces; use original face_indices.
                    # pass edges from socket if we can, else we manually compute them from faces
                    geom.edges = edge_indices if edges_socket.is_linked else edges_from_faces(face_indices)
-                if self.display_faces:

+                if self.display_faces:
                    self.faces_diplay(geom, config)

-                draw_data = {
-                    'tree_name': self.id_data.name[:],
-                    'custom_function': draw_faces,
-                    'args': (geom, config)
-                }
-                callback_enable(n_id, draw_data)
+                gl_instructions = self.format_draw_data(func=draw_complex, args=(geom, config))
+                callback_enable(n_id, gl_instructions)
                return

            return

        elif matrix_socket.is_linked:
            matrices = matrix_socket.sv_get(deepcopy=False, default=[Matrix()])
-
-            draw_data = {
-                'tree_name': self.id_data.name[:],
-                'custom_function': draw_matrix,
-                'args': (matrices,)
-            }
-
-            callback_enable(n_id, draw_data)
+            gl_instructions = self.format_draw_data(func=draw_matrix, args=(matrices, ))
+            callback_enable(n_id, gl_instructions)

    def copy(self, node):
        self.n_id = ''

--- a/ui/development.py
+++ b/ui/development.py
@@ -94,7 +94,7 @@ def node_show_branch(self, context):
        return
    if BRANCH:
        layout = self.layout
-        layout.label(text="GIT: {}".format(BRANCH))
+        layout.label(icon='CON_CHILDOF', text=BRANCH)

 class SvCopyIDName(bpy.types.Operator):
    ''' Copy node's ID name to clipboard to use in code '''

--- a/ui/nodeview_rclick_menu.py
+++ b/ui/nodeview_rclick_menu.py
@@ -17,7 +17,8 @@ supported_mesh_viewers = {'SvBmeshViewerNodeMK2', 'ViewerNode2'}
 common_nodes = [
    ['GenVectorsNode', 'VectorsOutNode'],
    ['SvNumberNode', 'GenListRangeIntNode', 'SvGenFloatRange'],
-    ['SvScalarMathNodeMK3', 'SvVectorMathNodeMK2']
+    ['SvScalarMathNodeMK3', 'SvVectorMathNodeMK2'],
+    ['---', 'NodeReroute']
 ]


@@ -215,7 +216,10 @@ class SvNodeviewRClickMenu(bpy.types.Menu):
        layout.separator()
        for nodelist in common_nodes:
            for named_node in nodelist:
-                draw_add_node_operator(layout, named_node)
+                if named_node == '---':
+                    layout.separator()
+                else:
+                    draw_add_node_operator(layout, named_node)