Added circuit/metro style (diagonal) connections (contributed by williamchange)

Add circuit/metro style connections(diagonal)

Author: RodZill4

material_maker/panels/graph_edit/graph_edit.gd

@@ -468,10 +468,10 @@ func do_disconnect_node(from : String, from_slot : int, to : String, to_slot : i
 		return true
 	return false
 
-func on_cut_connections(connections_to_cut : Array):
+func on_cut_connections(connections_to_be_cut : Array):
 	var generator_hier_name : String = generator.get_hier_name()
 	var conns : Array = []
-	for c in connections_to_cut:
+	for c in connections_to_be_cut:
 		var from_gen = get_node(str(c.from_node)).generator
 		var to_gen = get_node(str(c.to_node)).generator
 		if do_disconnect_node(c.from_node, c.from_port, c.to_node, c.to_port):
@@ -1631,150 +1631,185 @@ func add_reroute_to_output(node : MMGraphNodeMinimal, port_index : int) -> void:
 	var next = generator.serialize()
 	undoredo_create_step("Reroute output", generator.get_hier_name(), prev, next)
 
-func _get_connection_line(from: Vector2, to: Vector2) -> PackedVector2Array:
-	var off : float = 15.0 * connection_lines_curvature * 0.5 * zoom
-	var points : PackedVector2Array = PackedVector2Array()
+func _get_connection_line(from : Vector2, to : Vector2) -> PackedVector2Array:
+	var off := 15.0 * connection_lines_curvature * 0.5 * zoom
+	var points := PackedVector2Array()
+	var mid := (from + to) * 0.5
 	match connection_line_style:
 		ConnectionStyle.DIRECT:
-			return PackedVector2Array([from,to])
+			if to.x > from.x:
+				off += (to.x - from.x) * 0.1
+			var ma := Vector2(maxf(mid.x, from.x + off), mid.y)
+			var mb := Vector2(minf(mid.x, to.x - off), mid.y)
+			var f1 := Vector2(from.x + off, from.y)
+			var t1 := Vector2(to.x - off, to.y)
+			points.append_array([from, f1, (f1 + ma) * 0.5, (t1 + mb) * 0.5, t1, to])
+			return points
 
 		ConnectionStyle.BEZIER:
 		# default behavior, adapted from:
 		# github.com/godotengine/godot/blob/4.4/scene/gui/graph_edit.cpp#L1282
-			var x_diff = to.x - from.x
-			var cp_offset = x_diff * connection_lines_curvature
+			var x_diff := to.x - from.x
+			var cp_offset := x_diff * connection_lines_curvature
 			if x_diff < 0:
 				cp_offset *= -1
 
-			var curve : Curve2D = Curve2D.new()
+			var curve := Curve2D.new()
 			curve.add_point(from)
 			curve.set_point_out(0, Vector2(cp_offset, 0))
 			curve.add_point(to)
 			curve.set_point_in(1, Vector2(-cp_offset, 0))
-			
-			if connection_lines_curvature > 0:
+
+			if connection_lines_curvature > 0.0:
 				return curve.tessellate(5, 2.0)
 			else:
 				return curve.tessellate(1)
 
 		ConnectionStyle.MANHATTAN:
 			if abs(from.x - to.x) < 0.5 or abs(from.y - to.y) < 0.5:
-				return PackedVector2Array([from,to])
-			var mid : Vector2 = (from + to) / 2.0
-			var ma : Vector2 = Vector2(max(mid.x, from.x + off), mid.y)
-			var mb : Vector2 = Vector2(min(mid.x, to.x - off), mid.y)
-			var f1 : Vector2 = Vector2(max(mid.x, from.x + off), from.y)
-			var t1 : Vector2 = Vector2(mb.x, to.y)
-
-			points.append(from)
-			points.append(f1)
-			points.append(ma)
-			points.append(mb)
-			points.append(t1)
-			points.append(to)
+				return PackedVector2Array([from, to])
+			var ma := Vector2(maxf(mid.x, from.x + off), mid.y)
+			var mb := Vector2(minf(mid.x, to.x - off), mid.y)
+			var f1 := Vector2(maxf(mid.x, from.x + off), from.y)
+			var t1 := Vector2(mb.x, to.y)
+			points.append_array([from, f1, ma, mb, t1, to])
 			return points
 
 		ConnectionStyle.ROUNDED:
 			if abs(from.x - to.x) < 0.5 or abs(from.y - to.y) < 0.5:
 				return PackedVector2Array([from,to])
-			var mid : Vector2 = (from + to) / 2.0
-			var mb : Vector2 = mid
+			var mb := mid
 			points.append(from)
 
-			const pts : float = 12.0 # corner arc resolution
-			var max_radius : float = 75.0 # max. arc radius when from < to
-			var inv_max_radius : float = 25.0 # max. arc radius when from > to
+			const pts := 12.0 # corner arc resolution
+			var max_radius := 75.0 # max. arc radius when from < to
+			var inv_max_radius := 25.0 # max. arc radius when from > to
 
-			var round_fac : float = clamp(connection_lines_curvature * 0.5, 0.0, 1.0)
-			max_radius = max(max_radius * round_fac, 4.0)
-			inv_max_radius = max(inv_max_radius * round_fac , 2.0)
+			var round_fac := clampf(connection_lines_curvature * 0.5, 0.0, 1.0)
+			max_radius = maxf(max_radius * round_fac, 4.0)
+			inv_max_radius = maxf(inv_max_radius * round_fac , 2.0)
+
+			var r := minf(minf(absf(to.y - from.y) * 0.25,
+					absf(from.x - to.x) * 0.25), max_radius)
 
-			var r : float = min(min(abs(to.y - from.y) * 0.25,
-					abs(from.x - to.x) * 0.25), max_radius)
-			
 			if from.x < to.x:
 				for i : float in range(pts):
-					var x : float = lerp(mid.x - r, mid.x, i/pts)
-					var y : float = lerp(from.y, from.y + r * sign(to.y - from.y), i/pts)
-					points.append(lerp(Vector2(x, from.y), Vector2(mid.x, y), i/pts))
+					var x := lerpf(mid.x - r, mid.x, i/pts)
+					var y := lerpf(from.y, from.y + r * signf(to.y - from.y), i/pts)
+					points.append(Vector2(x, from.y).lerp(Vector2(mid.x, y), i/pts))
 
 				for i : float in range(pts):
-					var x : float = lerp(mid.x, mid.x + r, i/pts)
-					var y : float = lerp(to.y + r * sign(from.y - to.y), to.y, i/pts)
-					points.append(lerp(Vector2(mid.x, y),Vector2(x , to.y), i/pts))
+					var x := lerpf(mid.x, mid.x + r, i/pts)
+					var y := lerpf(to.y + r * sign(from.y - to.y), to.y, i/pts)
+					points.append(Vector2(mid.x, y).lerp(Vector2(x , to.y), i/pts))
 			else:
-				r = min(r, inv_max_radius)
+				r = minf(r, inv_max_radius)
 				for i : float in range(pts):
-					var x : float = lerp(from.x, from.x + r, i/pts)
-					var y : float = lerp(from.y, from.y + r * sign(to.y - from.y), i/pts)
-					points.append(lerp(Vector2(x , from.y), Vector2(from.x + r, y), i/pts))
+					var x := lerpf(from.x, from.x + r, i/pts)
+					var y := lerpf(from.y, from.y + r * signf(to.y - from.y), i/pts)
+					points.append(Vector2(x , from.y).lerp(Vector2(from.x + r, y), i/pts))
 
-				var last : Vector2 = points[points.size() - 1]
+				var last := points[points.size() - 1]
 				mb.x = last.x
-				var voff : float = last.y + 0.01 * sign(mid.y - last.y)
-				mb.y = min(mid.y + r, voff) if from.y > to.y else max(mid.y - r, voff)
+				var voff := last.y + 0.01 * signf(mid.y - last.y)
+				mb.y = minf(mid.y + r, voff) if from.y > to.y else maxf(mid.y - r, voff)
 				points.append(mb)
 
 				if from.y < to.y:
-					var t1 : Vector2 = Vector2(points[points.size() - 1].x, mb.y)
+					var t1 := Vector2(points[points.size() - 1].x, mb.y)
 					for i : float in range(pts):
-						var x : float = lerp(t1.x, t1.x - r, i/pts)
-						var y : float = lerp(t1.y, t1.y + r, i/pts)
-						points.append(lerp(Vector2(t1.x, y),Vector2(x , t1.y + r), i/pts))
+						var x := lerpf(t1.x, t1.x - r, i/pts)
+						var y := lerpf(t1.y, t1.y + r, i/pts)
+						points.append(Vector2(t1.x, y).lerp(Vector2(x , t1.y + r), i/pts))
 
-					var t2 : Vector2 = Vector2(to.x, mb.y + r)
-					r = min(abs(t2.y - to.y) * 0.5, r)
+					var t2 := Vector2(to.x, mb.y + r)
+					r = minf(absf(t2.y - to.y) * 0.5, r)
 					for i : float in range(1, pts):
-						var x : float = lerp(t2.x, t2.x - r, i/pts)
-						var y : float = lerp(t2.y, t2.y + r, i/pts)
-						points.append(lerp(Vector2(x, t2.y),Vector2(t2.x - r, y), i/pts))
-
-					var t3 : Vector2 = Vector2(to.x - r, to.y - r)
+						var x := lerpf(t2.x, t2.x - r, i/pts)
+						var y := lerpf(t2.y, t2.y + r, i/pts)
+						points.append(Vector2(x, t2.y).lerp(Vector2(t2.x - r, y), i/pts))
 
+					var t3 := Vector2(to.x - r, to.y - r)
 					for i : float in range(pts):
-						var x : float = lerp(t3.x, t3.x + r, i/pts)
-						var y : float = lerp(t3.y, t3.y + r, i/pts)
-						points.append(lerp(Vector2(t3.x, y),Vector2(x , t3.y + r), i/pts))
+						var x := lerpf(t3.x, t3.x + r, i/pts)
+						var y := lerpf(t3.y, t3.y + r, i/pts)
+						points.append(Vector2(t3.x, y).lerp(Vector2(x , t3.y + r), i/pts))
 				else:
-					var t4 : Vector2 = points[points.size() - 1]
+					var t4 := points[points.size() - 1]
 
-					r = min(abs(t4.y - to.y) * 0.5, r)
+					r = minf(absf(t4.y - to.y) * 0.5, r)
 					for i : float in range(pts):
-						var x : float = lerp(t4.x, t4.x - r, i/pts)
-						var y : float = lerp(t4.y, t4.y - r, i/pts)
-						points.append(lerp(Vector2(t4.x, y),Vector2(x, t4.y - r),i/pts))
-					var t5 : Vector2 = Vector2(to.x, t4.y - r)
+						var x := lerpf(t4.x, t4.x - r, i/pts)
+						var y := lerpf(t4.y, t4.y - r, i/pts)
+						points.append(Vector2(t4.x, y).lerp(Vector2(x, t4.y - r),i/pts))
 
-					r = min(abs(t5.y - to.y) * 0.5, r)
+					var t5 := Vector2(to.x, t4.y - r)
+					r = minf(absf(t5.y - to.y) * 0.5, r)
 					for i : float in range(pts):
-						var x : float = lerp(t5.x, t5.x - r, i/pts)
-						var y : float = lerp(t5.y, t5.y - r, i/pts)
-						points.append(lerp(Vector2(x, t5.y),Vector2(t5.x - r ,y), i/pts))
+						var x := lerpf(t5.x, t5.x - r, i/pts)
+						var y := lerpf(t5.y, t5.y - r, i/pts)
+						points.append(Vector2(x, t5.y).lerp(Vector2(t5.x - r ,y), i/pts))
 
-					var t6 : Vector2 = Vector2(to.x - r, to.y + r)
+					var t6 := Vector2(to.x - r, to.y + r)
 					for i : float in range(pts):
-						var x : float = lerp(t6.x, t6.x + r, i/pts)
-						var y : float = lerp(t6.y, t6.y - r, i/pts)
-						points.append(lerp(Vector2(t6.x, y),Vector2(x , t6.y - r), i/pts))
+						var x := lerpf(t6.x, t6.x + r, i/pts)
+						var y := lerpf(t6.y, t6.y - r, i/pts)
+						points.append(Vector2(t6.x, y).lerp(Vector2(x , t6.y - r), i/pts))
 			points.append(to)
 			return points
 
 		ConnectionStyle.DIAGONAL:
-			if to.x > from.x:
-				off += (to.x-from.x) * 0.1
-
-			var mid : Vector2 = (from + to) / 2.0
-			var ma : Vector2 = Vector2(max(mid.x, from.x + off), mid.y)
-			var mb : Vector2 = Vector2(min(mid.x, to.x - off), mid.y)
-			var f1 : Vector2 = Vector2(from.x + off, from.y)
-			var t1 : Vector2 = Vector2(to.x - off, to.y)
-
-			points.append(from)
-			points.append(f1)
-			points.append((f1 + ma) * 0.5)
-			points.append((t1 + mb) * 0.5)
-			points.append(t1)
-			points.append(to)
+			var start := from
+			var end := to
+			from.x += off
+			to.x -= off
+
+			if abs(from.x - to.x) < 0.5:
+				return PackedVector2Array([start, from, to, end])
+			elif abs(from.y - to.y) < 0.5:
+				return PackedVector2Array([start, end])
+
+			var diff := mid - from
+			var from_a := mid - Vector2(diff.y, diff.y)
+			var mid_b := mid + Vector2(diff.x, diff.x)
+			var corner_from := Vector2(from.x, mid.y)
+			var corner_to := Vector2(to.x, mid.y)
+
+			var stack := (func(dir: float, diff_y: float) -> void:
+				var max_off := absf(diff_y) * 0.5
+				var h_offset = (corner_from.x - max_off) - (corner_to.x + max_off) >= 0.0
+				if not h_offset:
+					max_off = clampf(diff.x * 0.5, -diff.x, diff.y)
+				points.append(from)
+				points.append(Vector2(corner_from.x, corner_from.y - max_off * dir))
+				if h_offset:
+					points.append(Vector2(corner_from.x - max_off, corner_from.y))
+					points.append(Vector2(corner_to.x + max_off, corner_to.y))
+				points.append(Vector2(corner_to.x, corner_to.y + max_off * dir))
+				points.append(to))
+
+			points.append(start)
+
+			if from.y < to.y:
+				if from.x > to.x:
+					stack.call(1.0, diff.y)
+				else:
+					if from_a.x < from.x:
+						from_a = mid - Vector2(diff.x, diff.x)
+					else:
+						mid_b = mid + Vector2(diff.y, diff.y)
+					points.append_array([from, from_a, mid, mid_b, to])
+			elif from.y > to.y:
+				if from.x > to.x:
+					stack.call(-1.0, mid.y - to.y)
+				else:
+					from_a = mid + Vector2(diff.y, -diff.y)
+					mid_b = mid + Vector2(-diff.y, diff.y)
+					if from_a.x < from.x:
+						mid_b = mid + Vector2(diff.x, -diff.x)
+						from_a = mid - Vector2(diff.x, -diff.x)
+					points.append_array([from, from_a, mid, mid_b, to])
+			points.append(end)
 			return points
 		_:
 			return points

material_maker/panels/graph_edit/graph_edit.tscn

@@ -98,7 +98,6 @@ script = ExtResource("3")
 [connection signal="node_selected" from="." to="." method="_on_GraphEdit_node_selected"]
 [connection signal="paste_nodes_request" from="." to="." method="paste"]
 [connection signal="resized" from="." to="." method="_on_resized"]
-[connection signal="visibility_changed" from="." to="." method="_on_GraphEdit_visibility_changed"]
 [connection signal="timeout" from="Timer" to="." method="do_send_changed_signal"]
 [connection signal="text_changed" from="GraphUI/SubGraphUI/Label" to="." method="_on_Label_text_changed"]
 [connection signal="descriptions_changed" from="GraphUI/SubGraphUI/Description" to="." method="_on_Description_descriptions_changed"]