From f7a3d2b8464bae0d67950f058550a379fdb34742 Mon Sep 17 00:00:00 2001 From: RodZill4 Date: Sat, 25 Jan 2020 15:54:20 +0100 Subject: [PATCH] Updated moved files paths in GDScript files --- addons/material_maker/engine/gen_shader.gd | 2 +- material_maker/nodes/debug.gd | 2 +- material_maker/nodes/remote.gd | 8 ++++---- material_maker/nodes/switch.gd | 4 ++-- material_maker/widgets/node_editor/node_editor.gd | 6 +++--- material_maker/widgets/node_editor/node_editor.tscn | 2 +- material_maker/widgets/node_editor/output.tscn | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/addons/material_maker/engine/gen_shader.gd b/addons/material_maker/engine/gen_shader.gd index cad14cb..cf6b11b 100644 --- a/addons/material_maker/engine/gen_shader.gd +++ b/addons/material_maker/engine/gen_shader.gd @@ -344,7 +344,7 @@ func _deserialize(data : Dictionary) -> void: func edit(node) -> void: if shader_model != null: - var edit_window = load("res://addons/material_maker/widgets/node_editor/node_editor.tscn").instance() + var edit_window = load("res://material_maker/widgets/node_editor/node_editor.tscn").instance() node.get_parent().add_child(edit_window) edit_window.set_model_data(shader_model) edit_window.connect("node_changed", node, "update_generator") diff --git a/material_maker/nodes/debug.gd b/material_maker/nodes/debug.gd index 2cb9545..e65b54d 100644 --- a/material_maker/nodes/debug.gd +++ b/material_maker/nodes/debug.gd @@ -30,6 +30,6 @@ func _on_Button_pressed() -> void: if src != null: var context : MMGenContext = MMGenContext.new() var source = src.generator.get_shader_code("UV", src.output_index, context) - var popup = preload("res://addons/material_maker/nodes/debug/debug_popup.tscn").instance() + var popup = preload("res://material_maker/nodes/debug/debug_popup.tscn").instance() get_parent().add_child(popup) popup.show_code(generate_shader(source)) diff --git a/material_maker/nodes/remote.gd b/material_maker/nodes/remote.gd index d7b0f11..0f2ecce 100644 --- a/material_maker/nodes/remote.gd +++ b/material_maker/nodes/remote.gd @@ -8,7 +8,7 @@ onready var grid = $Controls func add_control(text, control) -> void: var index = grid.get_child_count() / 4 - var label = preload("res://addons/material_maker/widgets/linked_widgets/editable_label.tscn").instance() + var label = preload("res://material_maker/widgets/linked_widgets/editable_label.tscn").instance() label.set_text(text) label.connect("label_changed", self, "on_label_changed", [ control.name ]) grid.add_child(label) @@ -16,11 +16,11 @@ func add_control(text, control) -> void: control.connect("mouse_entered", self, "on_enter_widget", [ control ]) control.connect("mouse_exited", self, "on_exit_widget", [ control ]) var button = Button.new() - button.icon = preload("res://addons/material_maker/icons/link.tres") + button.icon = preload("res://material_maker/icons/link.tres") grid.add_child(button) button.connect("pressed", self, "_on_Link_pressed", [ control.name ]) button = Button.new() - button.icon = preload("res://addons/material_maker/icons/remove.tres") + button.icon = preload("res://material_maker/icons/remove.tres") grid.add_child(button) button.connect("pressed", generator, "remove_parameter", [ control.name ]) @@ -71,7 +71,7 @@ func _on_value_changed(new_value, variable : String) -> void: var command = new_value - widget.configurations.size() match command: 1: - var dialog = preload("res://addons/material_maker/widgets/line_dialog.tscn").instance() + var dialog = preload("res://material_maker/widgets/line_dialog.tscn").instance() add_child(dialog) dialog.set_texts("Configuration", "Enter a name for the new configuration") dialog.connect("ok", self, "do_add_configuration", [ variable ]) diff --git a/material_maker/nodes/switch.gd b/material_maker/nodes/switch.gd index ce1561e..7c9dec3 100644 --- a/material_maker/nodes/switch.gd +++ b/material_maker/nodes/switch.gd @@ -49,7 +49,7 @@ func update_node() -> void: sizer.add_child(control) control.connect("value_changed", self, "_on_value_changed", [ l.name ]) controls[l.name] = control - sizer.add_child(preload("res://addons/material_maker/widgets/preview_button.tscn").instance()) + sizer.add_child(preload("res://material_maker/widgets/preview_button.tscn").instance()) add_child(sizer) else: # Keep lines with controls @@ -69,7 +69,7 @@ func update_node() -> void: var space = Control.new() space.size_flags_horizontal = SIZE_EXPAND | SIZE_FILL sizer.add_child(space) - var button = preload("res://addons/material_maker/widgets/preview_button.tscn").instance() + var button = preload("res://material_maker/widgets/preview_button.tscn").instance() sizer.add_child(button) button.connect("toggled", self, "on_preview_button", [ get_child_count()-1 ]) add_child(sizer) diff --git a/material_maker/widgets/node_editor/node_editor.gd b/material_maker/widgets/node_editor/node_editor.gd index b9f256a..8ac76d0 100644 --- a/material_maker/widgets/node_editor/node_editor.gd +++ b/material_maker/widgets/node_editor/node_editor.gd @@ -11,9 +11,9 @@ onready var main_code_editor : TextEdit = $"Sizer/Tabs/Main Code" onready var instance_functions_editor : TextEdit = $"Sizer/Tabs/Instance Functions" onready var global_functions_editor : TextEdit = $"Sizer/Tabs/Global Functions" -const ParameterEditor = preload("res://addons/material_maker/widgets/node_editor/parameter.tscn") -const InputEditor = preload("res://addons/material_maker/widgets/node_editor/input.tscn") -const OutputEditor = preload("res://addons/material_maker/widgets/node_editor/output.tscn") +const ParameterEditor = preload("res://material_maker/widgets/node_editor/parameter.tscn") +const InputEditor = preload("res://material_maker/widgets/node_editor/input.tscn") +const OutputEditor = preload("res://material_maker/widgets/node_editor/output.tscn") signal node_changed diff --git a/material_maker/widgets/node_editor/node_editor.tscn b/material_maker/widgets/node_editor/node_editor.tscn index 0ae24d1..9686391 100644 --- a/material_maker/widgets/node_editor/node_editor.tscn +++ b/material_maker/widgets/node_editor/node_editor.tscn @@ -12,7 +12,7 @@ atlas = ExtResource( 3 ) region = Rect2( 48, 0, 16, 16 ) [sub_resource type="DynamicFontData" id=2] -font_path = "res://addons/material_maker/fonts/hack.ttf" +font_path = "res://material_maker/fonts/hack.ttf" [sub_resource type="DynamicFont" id=3] size = 12 diff --git a/material_maker/widgets/node_editor/output.tscn b/material_maker/widgets/node_editor/output.tscn index 2acca18..bd67275 100644 --- a/material_maker/widgets/node_editor/output.tscn +++ b/material_maker/widgets/node_editor/output.tscn @@ -21,7 +21,7 @@ atlas = ExtResource( 2 ) region = Rect2( 34, 48, 12, 16 ) [sub_resource type="DynamicFontData" id=4] -font_path = "res://addons/material_maker/fonts/hack.ttf" +font_path = "res://material_maker/fonts/hack.ttf" [sub_resource type="DynamicFont" id=5] size = 12