Relintai/material-maker
1
0
Fork 0
mirror of https://github.com/Relintai/material-maker.git synced 2025-01-09 05:39:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated moved files paths in GDScript files

Browse Source
This commit is contained in:
RodZill4 2020-01-25 15:54:20 +01:00
parent b6a2d08f78
commit f7a3d2b846
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/material_maker/engine/gen_shader.gd
View File

@ -344,7 +344,7 @@ func _deserialize(data : Dictionary) -> void:
func edit(node) -> void: func edit(node) -> void:
if shader_model != null: 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) node.get_parent().add_child(edit_window)
edit_window.set_model_data(shader_model) edit_window.set_model_data(shader_model)
edit_window.connect("node_changed", node, "update_generator") edit_window.connect("node_changed", node, "update_generator")

2
material_maker/nodes/debug.gd
View File

@ -30,6 +30,6 @@ func _on_Button_pressed() -> void:
if src != null: if src != null:
var context : MMGenContext = MMGenContext.new() var context : MMGenContext = MMGenContext.new()
var source = src.generator.get_shader_code("UV", src.output_index, context) 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) get_parent().add_child(popup)
popup.show_code(generate_shader(source)) popup.show_code(generate_shader(source))

8
material_maker/nodes/remote.gd
View File

@ -8,7 +8,7 @@ onready var grid = $Controls
func add_control(text, control) -> void: func add_control(text, control) -> void:
var index = grid.get_child_count() / 4 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.set_text(text)
label.connect("label_changed", self, "on_label_changed", [ control.name ]) label.connect("label_changed", self, "on_label_changed", [ control.name ])
grid.add_child(label) 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_entered", self, "on_enter_widget", [ control ])
control.connect("mouse_exited", self, "on_exit_widget", [ control ]) control.connect("mouse_exited", self, "on_exit_widget", [ control ])
var button = Button.new() 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) grid.add_child(button)
button.connect("pressed", self, "_on_Link_pressed", [ control.name ]) button.connect("pressed", self, "_on_Link_pressed", [ control.name ])
button = Button.new() 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) grid.add_child(button)
button.connect("pressed", generator, "remove_parameter", [ control.name ]) 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() var command = new_value - widget.configurations.size()
match command: match command:
1: 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) add_child(dialog)
dialog.set_texts("Configuration", "Enter a name for the new configuration") dialog.set_texts("Configuration", "Enter a name for the new configuration")
dialog.connect("ok", self, "do_add_configuration", [ variable ]) dialog.connect("ok", self, "do_add_configuration", [ variable ])

4
material_maker/nodes/switch.gd
View File

@ -49,7 +49,7 @@ func update_node() -> void:
sizer.add_child(control) sizer.add_child(control)
control.connect("value_changed", self, "_on_value_changed", [ l.name ]) control.connect("value_changed", self, "_on_value_changed", [ l.name ])
controls[l.name] = control 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) add_child(sizer)
else: else:
# Keep lines with controls # Keep lines with controls
@ -69,7 +69,7 @@ func update_node() -> void:
var space = Control.new() var space = Control.new()
space.size_flags_horizontal = SIZE_EXPAND | SIZE_FILL space.size_flags_horizontal = SIZE_EXPAND | SIZE_FILL
sizer.add_child(space) 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) sizer.add_child(button)
button.connect("toggled", self, "on_preview_button", [ get_child_count()-1 ]) button.connect("toggled", self, "on_preview_button", [ get_child_count()-1 ])
add_child(sizer) add_child(sizer)

6
material_maker/widgets/node_editor/node_editor.gd
View File

@ -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 instance_functions_editor : TextEdit = $"Sizer/Tabs/Instance Functions"
onready var global_functions_editor : TextEdit = $"Sizer/Tabs/Global Functions" onready var global_functions_editor : TextEdit = $"Sizer/Tabs/Global Functions"
const ParameterEditor = preload("res://addons/material_maker/widgets/node_editor/parameter.tscn") const ParameterEditor = preload("res://material_maker/widgets/node_editor/parameter.tscn")
const InputEditor = preload("res://addons/material_maker/widgets/node_editor/input.tscn") const InputEditor = preload("res://material_maker/widgets/node_editor/input.tscn")
const OutputEditor = preload("res://addons/material_maker/widgets/node_editor/output.tscn") const OutputEditor = preload("res://material_maker/widgets/node_editor/output.tscn")
signal node_changed signal node_changed

2
material_maker/widgets/node_editor/node_editor.tscn
View File

@ -12,7 +12,7 @@ atlas = ExtResource( 3 )
region = Rect2( 48, 0, 16, 16 ) region = Rect2( 48, 0, 16, 16 )
[sub_resource type="DynamicFontData" id=2] [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] [sub_resource type="DynamicFont" id=3]
size = 12 size = 12

2
material_maker/widgets/node_editor/output.tscn
View File

@ -21,7 +21,7 @@ atlas = ExtResource( 2 )
region = Rect2( 34, 48, 12, 16 ) region = Rect2( 34, 48, 12, 16 )
[sub_resource type="DynamicFontData" id=4] [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] [sub_resource type="DynamicFont" id=5]
size = 12 size = 12