Active connections overlay

Author: williamchange

export_presets.cfg

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

material_maker/panels/graph_edit/active_connection_overlay.tres

@@ -40,6 +40,9 @@ var undoredo_move_node_selection_changed : bool = true
 enum ConnectionStyle {DIRECT, BEZIER, ROUNDED, MANHATTAN, DIAGONAL}
 var connection_line_style : int = ConnectionStyle.BEZIER
 
+var active_connections : Array[Dictionary]
+var should_draw_active_overlays : bool = true
+
 @onready var drag_cut_cursor = preload("res://material_maker/icons/knife.png")
 var connections_to_cut : Array[Dictionary]
 var drag_cut_line : PackedVector2Array
@@ -140,6 +143,7 @@ func _gui_input(event) -> void:
 				connections_to_cut.append_array(conns)
 		if connections_to_cut.size():
 			on_cut_connections(connections_to_cut)
+			update_active_connections()
 			connections_to_cut.clear()
 		Input.set_custom_mouse_cursor(null)
 		drag_cut_line.clear()
@@ -215,7 +219,11 @@ func _gui_input(event) -> void:
 			if not (event.ctrl_pressed or event.shift_pressed or event.alt_pressed):
 				node_popup.position = Vector2i(get_screen_transform()*get_local_mouse_position())
 				node_popup.show_popup()
+		elif event.button_index == MOUSE_BUTTON_MIDDLE:
+			should_draw_active_overlays = not event.is_pressed()
+			queue_redraw()
 		else:
+			
 			if event.button_index == MOUSE_BUTTON_LEFT:
 				if event.double_click:
 					if get_nodes_under_mouse().is_empty():
@@ -305,9 +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)
-	if lasso_points.size() > 1:
-		draw_polyline(lasso_points + PackedVector2Array([lasso_points[0]]),
-				get_theme_color("lasso_stroke", "GraphEdit"), 1.0)
+	$HighlightsOverlay.queue_redraw()
 
 
 # Misc. useful functions
@@ -428,6 +434,7 @@ func do_disconnect_node(from : String, from_slot : int, to : String, to_slot : i
 	return false
 
 func on_cut_connections(connections_to_cut : Array):
+	queue_redraw()
 	var generator_hier_name : String = generator.get_hier_name()
 	var conns : Array = []
 	for c in connections_to_cut:
@@ -1027,14 +1034,20 @@ func _on_ButtonTransmitsSeed_toggled(button_pressed) -> void:
 
 var highlighting_connections : bool = false
 
+func update_active_connections() -> void:
+	active_connections.clear()
+	for c in get_connection_list():
+		if get_node(NodePath(c.from_node)).selected or get_node(NodePath(c.to_node)).selected:
+			active_connections.append(c)
+
 func highlight_connections() -> void:
 	if highlighting_connections:
 		return
 	highlighting_connections = true
 	while Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT):
 		await get_tree().process_frame
-	for c in get_connection_list():
-		set_connection_activity(c.from_node, c.from_port, c.to_node, c.to_port, 1.0 if get_node(NodePath(c.from_node)).selected or get_node(NodePath(c.to_node)).selected else 0.0)
+	update_active_connections()
+	queue_redraw()
 	highlighting_connections = false
 
 func _on_GraphEdit_node_selected(node : GraphElement) -> void:
@@ -1274,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:
@@ -1750,3 +1764,16 @@ func color_comment_nodes() -> void:
 		picker.popup_hide.connect(picker.queue_free)
 		picker.popup_hide.connect(undoredo.end_group)
 		picker.popup()
+
+func _on_connection_drag_started(_from_node: StringName, _from_port: int, _is_output: bool) -> void:
+	active_connections.clear()
+	should_draw_active_overlays = false
+
+func _on_end_node_move() -> void:
+	should_draw_active_overlays = true
+
+func _on_begin_node_move() -> void:
+	should_draw_active_overlays = false
+
+func _on_connection_drag_ended() -> void:
+	should_draw_active_overlays = true

material_maker/panels/graph_edit/graph_edit.gd

@@ -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,12 +86,22 @@ 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"]
 [connection signal="connection_from_empty" from="." to="." method="request_popup" binds= [true]]
 [connection signal="connection_request" from="." to="." method="on_connect_node"]
 [connection signal="connection_to_empty" from="." to="." method="request_popup" binds= [false]]
 [connection signal="copy_nodes_request" from="." to="." method="copy"]
 [connection signal="disconnection_request" from="." to="." method="on_disconnect_node"]
 [connection signal="duplicate_nodes_request" from="." to="." method="duplicate_selected"]
+[connection signal="end_node_move" from="." to="." method="_on_end_node_move"]
 [connection signal="node_deselected" from="." to="." method="_on_GraphEdit_node_unselected"]
 [connection signal="node_selected" from="." to="." method="_on_GraphEdit_node_selected"]
 [connection signal="paste_nodes_request" from="." to="." method="paste"]

material_maker/panels/graph_edit/graph_edit.tscn

@@ -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

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

material_maker/panels/graph_edit/highlights_overlay.gd.uid

@@ -86,6 +86,10 @@ func export_files(files, output_dir, target, target_file, image_size) -> void:
 	get_tree().quit()
 
 func _ready():
+	# Briefly show the shader at launch to allow it to compile
+	# to avoid the initial stutter when highlighting active connections
+	$ActiveOutlineOverlay.free()
+
 	var args : PackedStringArray = OS.get_cmdline_args()
 	if ("--export" in args) or ("--export-material" in args):
 		print("Exporting...")

parse_args.gd

@@ -1,6 +1,10 @@
-[gd_scene load_steps=2 format=3 uid="uid://bwfnpjyf1wqiu"]
+[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://cebf5h3c4353j" path="res://material_maker/panels/graph_edit/active_connection_overlay.tres" id="2_ai1me"]
 
 [node name="ParseArgs" type="Node"]
 script = ExtResource("1_or0h6")
+
+[node name="ActiveOutlineOverlay" type="ColorRect" parent="."]
+material = ExtResource("2_ai1me")