diff --git a/addons/material_maker/engine/nodes/gen_portal.gd b/addons/material_maker/engine/nodes/gen_portal.gd index 402d3a160..4bc651fa2 100644 --- a/addons/material_maker/engine/nodes/gen_portal.gd +++ b/addons/material_maker/engine/nodes/gen_portal.gd @@ -15,7 +15,7 @@ enum Portal { var io : Portal var source : MMGenBase.OutputPort -var editable := false +var editable : bool = false var color : Color = Color.WHITE func is_editable() -> bool: diff --git a/material_maker/nodes/portal/portal.gd b/material_maker/nodes/portal/portal.gd index 0116b2bfe..f332cf84b 100644 --- a/material_maker/nodes/portal/portal.gd +++ b/material_maker/nodes/portal/portal.gd @@ -133,9 +133,9 @@ func sync_io_slots() -> void: return syncing_io = true await get_tree().process_frame - var color := Color.WHITE - var type := 42 - var port_type := "any" + var color : Color = Color.WHITE + var type : int = 42 + var port_type : String = "any" if is_portal_in(): var source_node : MMGraphPortal = get_link_source(get_link(), graph_edit) for w in graph_edit.get_children(): @@ -165,9 +165,9 @@ func on_connections_changed() -> void: var graph_edit : MMGraphEdit = get_parent() if graph_edit == null: return - var color := Color.WHITE - var type := 42 - var port_type := "any" + var color : Color = Color.WHITE + var type : int = 42 + var port_type : String = "any" for c in graph_edit.get_connection_list(): if c.to_node == name and is_portal_in(): var node : MMGraphNodeMinimal = graph_edit.get_node(NodePath(c.from_node)) @@ -209,7 +209,7 @@ func set_unique_portal_link() -> void: if name == "node_" + generator.get_type(): generator.set_parameter("link", "aperture_1") else: - var next_available_id := 2 + var next_available_id : int = 2 var graph : GraphEdit = get_parent() var portal_input_links : PackedStringArray = graph.get_children().filter( func(w) -> bool: return w is MMGraphPortal and w.is_portal_in() and w != self).map( @@ -247,7 +247,7 @@ func replace_links(new_link : String, from_link : String) -> void: var g : MMGraphEdit = get_parent() if g == null: return - var existing_input := get_link_source(new_link, g) != null + var existing_input : bool = get_link_source(new_link, g) != null for p in g.get_children(): if p is MMGraphPortal and p != self and p.get_link() == from_link: p.add_link_undoredo(p.get_link(), new_link) @@ -271,9 +271,9 @@ func setup_portal_edit() -> void: return is_editing = true - var old_link := get_link() + var old_link : String = get_link() var graph : MMGraphEdit = get_parent() - var edit := LineEdit.new() + var edit : LineEdit = LineEdit.new() edit.add_theme_font_override("font", LABEL_FONT) edit.alignment = HORIZONTAL_ALIGNMENT_CENTER edit.max_length = 64 @@ -290,7 +290,7 @@ func setup_portal_edit() -> void: func(new_text : String) -> void: if not is_editing: return - var new_link := new_text.strip_edges() + var new_link : String = new_text.strip_edges() if not new_link.is_empty(): if is_link_unique(new_link): graph.undoredo.start_group() @@ -307,7 +307,7 @@ func setup_portal_edit() -> void: edit.queue_free()) edit.text_changed.connect( func(new_text : String) -> void: - var new_link := new_text.strip_edges() + var new_link : String = new_text.strip_edges() if not new_link.is_empty(): on_parameter_changed("link", new_link) edit.modulate = link_collision_warning_color(new_link) @@ -336,9 +336,9 @@ static func draw_links(g : MMGraphEdit) -> void: const link_width : float = 5.0 var zoom : float = g.zoom - var in_color := g.get_theme_color("in_color", "MM_Portal") - var out_color := g.get_theme_color("out_color", "MM_Portal") - var link_color := g.get_theme_color("link", "MM_Portal") + var in_color : Color = g.get_theme_color("in_color", "MM_Portal") + var out_color : Color = g.get_theme_color("out_color", "MM_Portal") + var link_color : Color = g.get_theme_color("link", "MM_Portal") for node in g.get_children(): if node is not MMGraphPortal: @@ -347,7 +347,7 @@ static func draw_links(g : MMGraphEdit) -> void: # portal link and circular highlight if wo.is_portal_out(): - var wi := get_link_source(wo.get_link(), g) + var wi : MMGraphPortal = get_link_source(wo.get_link(), g) if wi == null: continue var from : Vector2 = graph_node_center(wi, g) @@ -359,10 +359,10 @@ static func draw_links(g : MMGraphEdit) -> void: g.draw_circle(to, circle_r * zoom, out_color, false, circle_outline_width * zoom, true) # arrow - var mid := (from + to) * 0.5 - var dir_a := (from - to).normalized().rotated(-PI * 0.25) - var dir_b := (from - to).normalized().rotated(PI * 0.25) - var aw := maxf(20.0 * zoom, 15.0) + var mid : Vector2 = (from + to) * 0.5 + var dir_a : Vector2 = (from - to).normalized().rotated(-PI * 0.25) + var dir_b : Vector2 = (from - to).normalized().rotated(PI * 0.25) + var aw : float = maxf(20.0 * zoom, 15.0) g.draw_multiline(PackedVector2Array([ mid, mid + dir_a * aw, mid, mid + dir_b * aw]), link_color, link_width*0.8, true) diff --git a/material_maker/panels/graph_edit/graph_edit.gd b/material_maker/panels/graph_edit/graph_edit.gd index ee4079441..3d9a405fc 100644 --- a/material_maker/panels/graph_edit/graph_edit.gd +++ b/material_maker/panels/graph_edit/graph_edit.gd @@ -1875,7 +1875,7 @@ func _on_resized() -> void: func create_portals() -> void: const tolerance_pixels : float = 2.0 - var connection := get_closest_connection_at_point( + var connection : Dictionary = get_closest_connection_at_point( get_local_mouse_position(), connection_lines_thickness + tolerance_pixels) if connection.is_empty(): return @@ -1884,8 +1884,8 @@ func create_portals() -> void: var from_node : MMGraphNodeMinimal = get_node(NodePath(connection.from_node)) var to_node : MMGraphNodeMinimal = get_node(NodePath(connection.to_node)) - var outpos := from_node.position_offset + from_node.get_output_port_position(connection.from_port) - var inpos := to_node.position_offset + to_node.get_input_port_position(connection.to_port) + var outpos : Vector2 = from_node.position_offset + from_node.get_output_port_position(connection.from_port) + var inpos : Vector2 = to_node.position_offset + to_node.get_input_port_position(connection.to_port) outpos += Vector2(50, -12) inpos += Vector2(-70, -12)