Skip to content

Commit 5340acc

Browse files
williamchangewilliamchange
committed
Improved code style for _get_connection_line function in graph_edit.gd 
1 parent 59b4519 commit 5340acc

1 file changed

Lines changed: 61 additions & 61 deletions

File tree

‎material_maker/panels/graph_edit/graph_edit.gd‎

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1702,29 +1702,29 @@ func add_reroute_to_output(node : MMGraphNodeMinimal, port_index : int) -> void:
17021702
undoredo_create_step("Reroute output", generator.get_hier_name(), prev, next)
17031703

17041704
func _get_connection_line(from : Vector2, to : Vector2) -> PackedVector2Array:
1705-
var off := 15.0 * connection_lines_curvature * 0.5 * zoom
1706-
var points := PackedVector2Array()
1707-
var mid := (from + to) * 0.5
1705+
var off : float = 15.0 * connection_lines_curvature * 0.5 * zoom
1706+
var points : PackedVector2Array = PackedVector2Array()
1707+
var mid : Vector2 = (from + to) * 0.5
17081708
match connection_line_style:
17091709
ConnectionStyle.DIRECT:
17101710
if to.x > from.x:
17111711
off += (to.x - from.x) * 0.1
1712-
var ma := Vector2(maxf(mid.x, from.x + off), mid.y)
1713-
var mb := Vector2(minf(mid.x, to.x - off), mid.y)
1714-
var f1 := Vector2(from.x + off, from.y)
1715-
var t1 := Vector2(to.x - off, to.y)
1712+
var ma : Vector2 = Vector2(maxf(mid.x, from.x + off), mid.y)
1713+
var mb : Vector2 = Vector2(minf(mid.x, to.x - off), mid.y)
1714+
var f1 : Vector2 = Vector2(from.x + off, from.y)
1715+
var t1 : Vector2 = Vector2(to.x - off, to.y)
17161716
points.append_array([from, f1, (f1 + ma) * 0.5, (t1 + mb) * 0.5, t1, to])
17171717
return points
17181718

17191719
ConnectionStyle.BEZIER:
17201720
# default behavior, adapted from:
17211721
# github.com/godotengine/godot/blob/4.4/scene/gui/graph_edit.cpp#L1282
1722-
var x_diff := to.x - from.x
1723-
var cp_offset := x_diff * connection_lines_curvature
1724-
if x_diff < 0:
1725-
cp_offset *= -1
1722+
var x_diff : float = to.x - from.x
1723+
var cp_offset : float = x_diff * connection_lines_curvature
1724+
if x_diff < 0.0:
1725+
cp_offset *= -1.0
17261726

1727-
var curve := Curve2D.new()
1727+
var curve : Curve2D = Curve2D.new()
17281728
curve.add_point(from)
17291729
curve.set_point_out(0, Vector2(cp_offset, 0))
17301730
curve.add_point(to)
@@ -1736,118 +1736,118 @@ func _get_connection_line(from : Vector2, to : Vector2) -> PackedVector2Array:
17361736
return curve.tessellate(1)
17371737

17381738
ConnectionStyle.MANHATTAN:
1739-
if abs(from.x - to.x) < 0.5 or abs(from.y - to.y) < 0.5:
1739+
if absf(from.x - to.x) < 0.5 or absf(from.y - to.y) < 0.5:
17401740
return PackedVector2Array([from, to])
1741-
var ma := Vector2(maxf(mid.x, from.x + off), mid.y)
1742-
var mb := Vector2(minf(mid.x, to.x - off), mid.y)
1743-
var f1 := Vector2(maxf(mid.x, from.x + off), from.y)
1744-
var t1 := Vector2(mb.x, to.y)
1741+
var ma : Vector2 = Vector2(maxf(mid.x, from.x + off), mid.y)
1742+
var mb : Vector2 = Vector2(minf(mid.x, to.x - off), mid.y)
1743+
var f1 : Vector2 = Vector2(maxf(mid.x, from.x + off), from.y)
1744+
var t1 : Vector2 = Vector2(mb.x, to.y)
17451745
points.append_array([from, f1, ma, mb, t1, to])
17461746
return points
17471747

17481748
ConnectionStyle.ROUNDED:
1749-
if abs(from.x - to.x) < 0.5 or abs(from.y - to.y) < 0.5:
1749+
if absf(from.x - to.x) < 0.5 or absf(from.y - to.y) < 0.5:
17501750
return PackedVector2Array([from,to])
1751-
var mb := mid
1751+
var mb : Vector2 = mid
17521752
points.append(from)
17531753

1754-
const pts := 12.0 # corner arc resolution
1755-
var max_radius := 75.0 # max. arc radius when from < to
1756-
var inv_max_radius := 25.0 # max. arc radius when from > to
1754+
const pts : float = 12.0 # corner arc resolution
1755+
var max_radius : float = 75.0 # max. arc radius when from < to
1756+
var inv_max_radius : float = 25.0 # max. arc radius when from > to
17571757

1758-
var round_fac := clampf(connection_lines_curvature * 0.5, 0.0, 1.0)
1758+
var round_fac : float = clampf(connection_lines_curvature * 0.5, 0.0, 1.0)
17591759
max_radius = maxf(max_radius * round_fac, 4.0)
17601760
inv_max_radius = maxf(inv_max_radius * round_fac , 2.0)
17611761

1762-
var r := minf(minf(absf(to.y - from.y) * 0.25,
1762+
var r : float = minf(minf(absf(to.y - from.y) * 0.25,
17631763
absf(from.x - to.x) * 0.25), max_radius)
17641764

17651765
if from.x < to.x:
17661766
for i : float in range(pts):
1767-
var x := lerpf(mid.x - r, mid.x, i/pts)
1768-
var y := lerpf(from.y, from.y + r * signf(to.y - from.y), i/pts)
1767+
var x : float = lerpf(mid.x - r, mid.x, i/pts)
1768+
var y : float = lerpf(from.y, from.y + r * signf(to.y - from.y), i/pts)
17691769
points.append(Vector2(x, from.y).lerp(Vector2(mid.x, y), i/pts))
17701770

17711771
for i : float in range(pts):
1772-
var x := lerpf(mid.x, mid.x + r, i/pts)
1773-
var y := lerpf(to.y + r * sign(from.y - to.y), to.y, i/pts)
1772+
var x : float = lerpf(mid.x, mid.x + r, i/pts)
1773+
var y : float = lerpf(to.y + r * sign(from.y - to.y), to.y, i/pts)
17741774
points.append(Vector2(mid.x, y).lerp(Vector2(x , to.y), i/pts))
17751775
else:
17761776
r = minf(r, inv_max_radius)
17771777
for i : float in range(pts):
1778-
var x := lerpf(from.x, from.x + r, i/pts)
1779-
var y := lerpf(from.y, from.y + r * signf(to.y - from.y), i/pts)
1778+
var x : float = lerpf(from.x, from.x + r, i/pts)
1779+
var y : float = lerpf(from.y, from.y + r * signf(to.y - from.y), i/pts)
17801780
points.append(Vector2(x , from.y).lerp(Vector2(from.x + r, y), i/pts))
17811781

1782-
var last := points[points.size() - 1]
1782+
var last : Vector2 = points[points.size() - 1]
17831783
mb.x = last.x
1784-
var voff := last.y + 0.01 * signf(mid.y - last.y)
1784+
var voff : float = last.y + 0.01 * signf(mid.y - last.y)
17851785
mb.y = minf(mid.y + r, voff) if from.y > to.y else maxf(mid.y - r, voff)
17861786
points.append(mb)
17871787

17881788
if from.y < to.y:
17891789
var t1 := Vector2(points[points.size() - 1].x, mb.y)
17901790
for i : float in range(pts):
1791-
var x := lerpf(t1.x, t1.x - r, i/pts)
1792-
var y := lerpf(t1.y, t1.y + r, i/pts)
1791+
var x : float = lerpf(t1.x, t1.x - r, i/pts)
1792+
var y : float = lerpf(t1.y, t1.y + r, i/pts)
17931793
points.append(Vector2(t1.x, y).lerp(Vector2(x , t1.y + r), i/pts))
17941794

1795-
var t2 := Vector2(to.x, mb.y + r)
1795+
var t2 : Vector2 = Vector2(to.x, mb.y + r)
17961796
r = minf(absf(t2.y - to.y) * 0.5, r)
17971797
for i : float in range(1, pts):
1798-
var x := lerpf(t2.x, t2.x - r, i/pts)
1799-
var y := lerpf(t2.y, t2.y + r, i/pts)
1798+
var x : float = lerpf(t2.x, t2.x - r, i/pts)
1799+
var y : float = lerpf(t2.y, t2.y + r, i/pts)
18001800
points.append(Vector2(x, t2.y).lerp(Vector2(t2.x - r, y), i/pts))
18011801

1802-
var t3 := Vector2(to.x - r, to.y - r)
1802+
var t3 : Vector2 = Vector2(to.x - r, to.y - r)
18031803
for i : float in range(pts):
1804-
var x := lerpf(t3.x, t3.x + r, i/pts)
1805-
var y := lerpf(t3.y, t3.y + r, i/pts)
1804+
var x : float = lerpf(t3.x, t3.x + r, i/pts)
1805+
var y : float = lerpf(t3.y, t3.y + r, i/pts)
18061806
points.append(Vector2(t3.x, y).lerp(Vector2(x , t3.y + r), i/pts))
18071807
else:
1808-
var t4 := points[points.size() - 1]
1808+
var t4 : Vector2 = points[points.size() - 1]
18091809

18101810
r = minf(absf(t4.y - to.y) * 0.5, r)
18111811
for i : float in range(pts):
1812-
var x := lerpf(t4.x, t4.x - r, i/pts)
1813-
var y := lerpf(t4.y, t4.y - r, i/pts)
1812+
var x : float = lerpf(t4.x, t4.x - r, i/pts)
1813+
var y : float = lerpf(t4.y, t4.y - r, i/pts)
18141814
points.append(Vector2(t4.x, y).lerp(Vector2(x, t4.y - r),i/pts))
18151815

1816-
var t5 := Vector2(to.x, t4.y - r)
1816+
var t5 : Vector2 = Vector2(to.x, t4.y - r)
18171817
r = minf(absf(t5.y - to.y) * 0.5, r)
18181818
for i : float in range(pts):
1819-
var x := lerpf(t5.x, t5.x - r, i/pts)
1820-
var y := lerpf(t5.y, t5.y - r, i/pts)
1819+
var x : float = lerpf(t5.x, t5.x - r, i/pts)
1820+
var y : float = lerpf(t5.y, t5.y - r, i/pts)
18211821
points.append(Vector2(x, t5.y).lerp(Vector2(t5.x - r ,y), i/pts))
18221822

1823-
var t6 := Vector2(to.x - r, to.y + r)
1823+
var t6 : Vector2 = Vector2(to.x - r, to.y + r)
18241824
for i : float in range(pts):
1825-
var x := lerpf(t6.x, t6.x + r, i/pts)
1826-
var y := lerpf(t6.y, t6.y - r, i/pts)
1825+
var x : float = lerpf(t6.x, t6.x + r, i/pts)
1826+
var y : float = lerpf(t6.y, t6.y - r, i/pts)
18271827
points.append(Vector2(t6.x, y).lerp(Vector2(x , t6.y - r), i/pts))
18281828
points.append(to)
18291829
return points
18301830

18311831
ConnectionStyle.DIAGONAL:
1832-
var start := from
1833-
var end := to
1832+
var start : Vector2 = from
1833+
var end : Vector2 = to
18341834
from.x += off
18351835
to.x -= off
18361836

1837-
if abs(from.x - to.x) < 0.5:
1837+
if absf(from.x - to.x) < 0.5:
18381838
return PackedVector2Array([start, from, to, end])
1839-
elif abs(from.y - to.y) < 0.5:
1839+
elif absf(from.y - to.y) < 0.5:
18401840
return PackedVector2Array([start, end])
18411841

1842-
var diff := mid - from
1843-
var from_a := mid - Vector2(diff.y, diff.y)
1844-
var mid_b := mid + Vector2(diff.x, diff.x)
1845-
var corner_from := Vector2(from.x, mid.y)
1846-
var corner_to := Vector2(to.x, mid.y)
1842+
var diff : Vector2 = mid - from
1843+
var from_a : Vector2 = mid - Vector2(diff.y, diff.y)
1844+
var mid_b : Vector2 = mid + Vector2(diff.x, diff.x)
1845+
var corner_from : Vector2 = Vector2(from.x, mid.y)
1846+
var corner_to : Vector2 = Vector2(to.x, mid.y)
18471847

1848-
var stack := (func(dir: float, diff_y: float) -> void:
1849-
var max_off := absf(diff_y) * 0.5
1850-
var h_offset = (corner_from.x - max_off) - (corner_to.x + max_off) >= 0.0
1848+
var stack : Callable = (func(dir : float, diff_y : float) -> void:
1849+
var max_off : float = absf(diff_y) * 0.5
1850+
var h_offset : bool = (corner_from.x - max_off) - (corner_to.x + max_off) >= 0.0
18511851
if not h_offset:
18521852
max_off = clampf(diff.x * 0.5, -diff.x, diff.y)
18531853
points.append(from)

0 commit comments

Comments
 (0)