improve shader, move line2ds to its own node

Author: williamchange

material_maker/panels/graph_edit/active_connection_overlay.tres

@@ -1,16 +1,13 @@
-[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://duk4r6tejiina"]
+[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://cebf5h3c4353j"]
 
 [sub_resource type="Shader" id="Shader_pewh7"]
 code = "shader_type canvas_item;
-uniform vec3 dash_color : source_color = vec3(1.0);
 
 void fragment() {
 	float f = smoothstep(0.0,0.5,abs(fract(UV.x*0.25-TIME)-0.5));
-	f = max(f, 0.5);
-	COLOR = vec4(vec3(f)*dash_color, 1.0);
+	COLOR = vec4(vec3(0.0), f*0.5);
 }
 "
 
 [resource]
 shader = SubResource("Shader_pewh7")
-shader_parameter/dash_color = Color(1, 1, 1, 1)

material_maker/panels/graph_edit/graph_edit.gd

@@ -313,7 +313,7 @@ func get_padded_node_rect(graph_node:GraphNode) -> Rect2:
 func _draw() -> void:
 	if drag_cut_line.size() > 1:
 		draw_polyline(drag_cut_line, get_theme_color("connection_knife", "GraphEdit"), 1.0)
-	draw_active_overlays()
+	$HighlightsOverlay.queue_redraw()
 
 
 # Misc. useful functions
@@ -1270,7 +1270,6 @@ func undoredo_command(command : Dictionary) -> void:
 					get_node("node_"+k).do_set_position(command.positions[k])
 				else:
 					parent_generator.get_node(k).set_position(command.positions[k])
-			draw_active_overlays.call_deferred()
 		"resize_comment":
 			var g = get_node_from_hier_name(command.node)
 			g.size = command.size
@@ -1288,6 +1287,7 @@ func undoredo_command(command : Dictionary) -> void:
 		_:
 			print("Unknown undo/redo command:")
 			print(command)
+	$HighlightsOverlay.queue_redraw.call_deferred()
 
 func undoredo_move_node(node_name : String, old_pos : Vector2, new_pos : Vector2):
 	if old_pos == new_pos:
@@ -1765,32 +1765,6 @@ func color_comment_nodes() -> void:
 		picker.popup_hide.connect(undoredo.end_group)
 		picker.popup()
 
-func draw_active_overlays() -> void:
-	for node in get_children():
-		if node is Line2D:
-			remove_child(node)
-			node.free()
-	if active_connections.size() and should_draw_active_overlays:
-		for line in active_connections:
-			if has_node(NodePath(line.to_node)) and has_node(NodePath(line.to_node)):
-				var from_node : GraphNode = get_node(NodePath(line.from_node))
-				var to_node : GraphNode = get_node(NodePath(line.to_node))
-				if from_node and to_node:
-					var from_pos : Vector2 = from_node.get_output_port_position(line.from_port)*zoom + from_node.position
-					var to_pos : Vector2 = to_node.get_input_port_position(line.to_port)*zoom + to_node.position
-					var line2d : Line2D = Line2D.new()
-					if get_viewport_rect().has_point(from_pos) or get_viewport_rect().has_point(to_pos):
-						var lm : ShaderMaterial = load("res://material_maker/panels/graph_edit/active_connection_overlay.tres")
-						line2d.texture_mode = Line2D.LINE_TEXTURE_TILE
-						line2d.material = lm.duplicate(true)
-						line2d.material.set_shader_parameter("dash_color", to_node.get_input_port_color(line.to_port))
-						line2d.points = _get_connection_line(from_pos, to_pos)
-						line2d.width = connection_lines_thickness
-						line2d.round_precision = 4
-						line2d.begin_cap_mode = Line2D.LINE_CAP_ROUND
-						line2d.end_cap_mode = Line2D.LINE_CAP_ROUND
-						add_child(line2d)
-
 func _on_connection_drag_started(_from_node: StringName, _from_port: int, _is_output: bool) -> void:
 	active_connections.clear()
 	should_draw_active_overlays = false

material_maker/panels/graph_edit/graph_edit.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=8 format=3 uid="uid://dy1u50we7gtru"]
+[gd_scene load_steps=9 format=3 uid="uid://dy1u50we7gtru"]
 
 [ext_resource type="Script" uid="uid://dkp4w3at1o6cm" path="res://material_maker/panels/graph_edit/graph_edit.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://c0j4px4n72di5" path="res://material_maker/icons/icons.tres" id="2"]
 [ext_resource type="Script" uid="uid://bne3k0g56crmy" path="res://material_maker/tools/undo_redo/undo_redo.gd" id="3"]
 [ext_resource type="PackedScene" uid="uid://buj231c2gxm4o" path="res://material_maker/widgets/desc_button/desc_button.tscn" id="4"]
+[ext_resource type="Script" uid="uid://dlah77kjy12l6" path="res://material_maker/panels/graph_edit/highlights_overlay.gd" id="5_u5byk"]
 
 [sub_resource type="AtlasTexture" id="3"]
 atlas = ExtResource("2")
@@ -85,6 +86,12 @@ layout_mode = 2
 [node name="UndoRedo" type="Node" parent="."]
 script = ExtResource("3")
 
+[node name="HighlightsOverlay" type="Control" parent="."]
+anchors_preset = 0
+offset_right = 40.0
+offset_bottom = 40.0
+script = ExtResource("5_u5byk")
+
 [connection signal="begin_node_move" from="." to="." method="_on_begin_node_move"]
 [connection signal="connection_drag_ended" from="." to="." method="_on_connection_drag_ended"]
 [connection signal="connection_drag_started" from="." to="." method="_on_connection_drag_started"]

material_maker/panels/graph_edit/highlights_overlay.gd

@@ -0,0 +1,32 @@
+extends Control
+
+func _ready() -> void:
+	owner.child_order_changed.connect(_move_above_connections.call_deferred)
+
+func _move_above_connections() -> void:
+	owner.move_child(self, owner.get_node("_connection_layer").get_index()+1)
+
+func _draw() -> void:
+	var zoom : float = owner.zoom
+	for node in get_children():
+		if node is Line2D:
+			remove_child(node)
+			node.free()
+	if owner.active_connections.size() and owner.should_draw_active_overlays:
+		for line in owner.active_connections:
+			if owner.has_node(NodePath(line.to_node)) and owner.has_node(NodePath(line.to_node)):
+				var from_node : GraphNode = owner.get_node(NodePath(line.from_node))
+				var to_node : GraphNode = owner.get_node(NodePath(line.to_node))
+				if from_node and to_node:
+					var from_pos := from_node.get_output_port_position(line.from_port)*zoom + from_node.position
+					var to_pos := to_node.get_input_port_position(line.to_port)*zoom + to_node.position
+					var line2d : Line2D = Line2D.new()
+					if get_viewport_rect().has_point(from_pos) or get_viewport_rect().has_point(to_pos):
+						line2d.texture_mode = Line2D.LINE_TEXTURE_TILE
+						line2d.material = load("res://material_maker/panels/graph_edit/active_connection_overlay.tres")
+						line2d.points = owner._get_connection_line(from_pos, to_pos)
+						line2d.width = owner.connection_lines_thickness
+						line2d.round_precision = 4
+						line2d.begin_cap_mode = Line2D.LINE_CAP_ROUND
+						line2d.end_cap_mode = Line2D.LINE_CAP_ROUND
+						add_child(line2d)

material_maker/panels/graph_edit/highlights_overlay.gd.uid

@@ -0,0 +1 @@
+uid://dlah77kjy12l6

parse_args.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=3 uid="uid://bwfnpjyf1wqiu"]
 
 [ext_resource type="Script" uid="uid://bcslbmkx1lijb" path="res://parse_args.gd" id="1_or0h6"]
-[ext_resource type="Material" uid="uid://duk4r6tejiina" path="res://material_maker/panels/graph_edit/active_connection_overlay.tres" id="2_ai1me"]
+[ext_resource type="Material" uid="uid://cebf5h3c4353j" path="res://material_maker/panels/graph_edit/active_connection_overlay.tres" id="2_ai1me"]
 
 [node name="ParseArgs" type="Node"]
 script = ExtResource("1_or0h6")