From 4dbfd6be75ddc81ff99603c191b5ad76ec234a56 Mon Sep 17 00:00:00 2001 From: RodZill4 Date: Sat, 12 Oct 2019 08:30:46 +0200 Subject: [PATCH] Added comment nodes --- addons/material_maker/engine/gen_comment.gd | 35 ++++++++++ addons/material_maker/engine/loader.gd | 6 ++ addons/material_maker/nodes/comment.gd | 31 +++++++++ addons/material_maker/nodes/comment.tscn | 50 ++++++++++++++ .../material_maker/nodes/comment/comment.gd | 32 --------- .../material_maker/nodes/comment/comment.tscn | 66 ------------------- export_presets.cfg | 6 +- project.godot | 6 ++ 8 files changed, 131 insertions(+), 101 deletions(-) create mode 100644 addons/material_maker/engine/gen_comment.gd create mode 100644 addons/material_maker/nodes/comment.gd create mode 100644 addons/material_maker/nodes/comment.tscn delete mode 100644 addons/material_maker/nodes/comment/comment.gd delete mode 100644 addons/material_maker/nodes/comment/comment.tscn diff --git a/addons/material_maker/engine/gen_comment.gd b/addons/material_maker/engine/gen_comment.gd new file mode 100644 index 00000000..1165abc7 --- /dev/null +++ b/addons/material_maker/engine/gen_comment.gd @@ -0,0 +1,35 @@ +tool +extends MMGenTexture +class_name MMGenComment + +""" +Comments to put in the graph +""" + +var text : String = "Double-click to write a comment" +var size : Vector2 = Vector2(0, 0) + +func _ready(): + if !parameters.has("size"): + parameters.size = 4 + +func get_type(): + return "comment" + +func get_type_name(): + return "Comment" + +func get_parameter_defs(): + return [] + +func get_input_defs(): + return [] + +func get_output_defs(): + return [] + +func _serialize(data): + data.type = "comment" + data.text = text + data.size = { x=size.x, y=size.y } + return data diff --git a/addons/material_maker/engine/loader.gd b/addons/material_maker/engine/loader.gd index bc7bdd03..e78be03e 100644 --- a/addons/material_maker/engine/loader.gd +++ b/addons/material_maker/engine/loader.gd @@ -73,6 +73,12 @@ static func create_gen(data) -> MMGenBase: generator = MMGenMaterial.new() elif data.type == "buffer": generator = MMGenBuffer.new() + elif data.type == "comment": + generator = MMGenComment.new() + if data.has("text"): + generator.text = data.text + if data.has("size"): + generator.size = Vector2(data.size.x, data.size.y) elif data.type == "image": generator = MMGenImage.new() elif data.type == "ios": diff --git a/addons/material_maker/nodes/comment.gd b/addons/material_maker/nodes/comment.gd new file mode 100644 index 00000000..ff9200e7 --- /dev/null +++ b/addons/material_maker/nodes/comment.gd @@ -0,0 +1,31 @@ +tool +extends "res://addons/material_maker/node_base.gd" + +var generator = null setget set_generator + +onready var label = $VBox/Label +onready var editor = $VBox/TextEdit + +func set_generator(g): + generator = g + label.text = generator.text + rect_size = generator.size + +func _on_resize_request(new_size): + rect_size = new_size + generator.size = new_size + +func _on_Label_gui_input(ev): + if ev is InputEventMouseButton and ev.doubleclick and ev.button_index == BUTTON_LEFT: + editor.rect_min_size = label.rect_size + Vector2(0, rect_size.y - get_minimum_size().y) + editor.text = label.text + label.visible = false + editor.visible = true + editor.select_all() + editor.grab_focus() + +func _on_TextEdit_focus_exited(): + label.text = editor.text + generator.text = editor.text + label.visible = true + editor.visible = false diff --git a/addons/material_maker/nodes/comment.tscn b/addons/material_maker/nodes/comment.tscn new file mode 100644 index 00000000..03a99889 --- /dev/null +++ b/addons/material_maker/nodes/comment.tscn @@ -0,0 +1,50 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://addons/material_maker/nodes/comment.gd" type="Script" id=1] + +[sub_resource type="StyleBoxFlat" id=1] +bg_color = Color( 1, 1, 1, 0.0627451 ) + +[node name="GraphNode" type="GraphNode"] +margin_left = 1.0 +margin_top = 1.0 +margin_right = 250.0 +margin_bottom = 44.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +title = "Comment" +show_close = true +resizable = true +comment = true +slot/0/left_enabled = false +slot/0/left_type = 0 +slot/0/left_color = Color( 1, 1, 1, 1 ) +slot/0/right_enabled = false +slot/0/right_type = 0 +slot/0/right_color = Color( 1, 1, 1, 1 ) +script = ExtResource( 1 ) + +[node name="VBox" type="VBoxContainer" parent="."] +margin_left = 16.0 +margin_top = 24.0 +margin_right = 233.0 +margin_bottom = 38.0 + +[node name="Label" type="Label" parent="VBox"] +margin_right = 217.0 +margin_bottom = 14.0 +mouse_filter = 0 +text = "Double-click to write a comment" +autowrap = true + +[node name="TextEdit" type="TextEdit" parent="VBox"] +visible = false +margin_top = 18.0 +margin_right = 221.0 +margin_bottom = 18.0 +custom_styles/focus = SubResource( 1 ) +custom_styles/normal = SubResource( 1 ) +wrap_enabled = true +[connection signal="resize_request" from="." to="." method="_on_resize_request"] +[connection signal="gui_input" from="VBox/Label" to="." method="_on_Label_gui_input"] +[connection signal="focus_exited" from="VBox/TextEdit" to="." method="_on_TextEdit_focus_exited"] diff --git a/addons/material_maker/nodes/comment/comment.gd b/addons/material_maker/nodes/comment/comment.gd deleted file mode 100644 index ea52fba3..00000000 --- a/addons/material_maker/nodes/comment/comment.gd +++ /dev/null @@ -1,32 +0,0 @@ -tool -extends "res://addons/material_maker/node_base.gd" - -func _get_shader_code(uv, slot = 0): - var rv = { defs="", code="" } - rv.rgb = "vec3(1.0)" - return rv - -func serialize(): - var data = .serialize() - data.text = $Label.text - return data - -func deserialize(data): - .deserialize(data) - if data.has("text"): - $Label.text = data.text - -func _on_resize_request(new_minsize): - rect_min_size = new_minsize - -func _on_Label_gui_input(ev): - if ev is InputEventMouseButton and ev.doubleclick and ev.button_index == BUTTON_LEFT: - var dialog = preload("res://addons/material_maker/widgets/text_dialog.tscn").instance() - dialog.set_title("Write comment") - dialog.set_text($Label.text) - add_child(dialog) - dialog.connect("ok", self, "set_comment") - dialog.popup_centered() - -func set_comment(text): - $Label.text = text diff --git a/addons/material_maker/nodes/comment/comment.tscn b/addons/material_maker/nodes/comment/comment.tscn deleted file mode 100644 index a48c7f32..00000000 --- a/addons/material_maker/nodes/comment/comment.tscn +++ /dev/null @@ -1,66 +0,0 @@ -[gd_scene load_steps=2 format=2] - -[ext_resource path="res://addons/material_maker/nodes/comment/comment.gd" type="Script" id=1] - - -[node name="GraphNode" type="GraphNode" index="0"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 1.0 -margin_top = 1.0 -margin_right = 109.0 -margin_bottom = 81.0 -rect_min_size = Vector2( 100, 80 ) -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 0 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 3 -size_flags_vertical = 3 -title = "Comment" -offset = Vector2( 0, 0 ) -show_close = true -resizable = true -selected = false -comment = true -overlay = 0 -slot/0/left_enabled = false -slot/0/left_type = 0 -slot/0/left_color = Color( 1, 1, 1, 1 ) -slot/0/right_enabled = false -slot/0/right_type = 0 -slot/0/right_color = Color( 1, 1, 1, 1 ) -script = ExtResource( 1 ) -_sections_unfolded = [ "custom_styles" ] - -[node name="Label" type="Label" parent="." index="0"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 16.0 -margin_top = 24.0 -margin_right = 92.0 -margin_bottom = 72.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 0 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 4 -text = "Double-click to write a comment" -autowrap = true -percent_visible = 1.0 -lines_skipped = 0 -max_lines_visible = -1 -_sections_unfolded = [ "Mouse" ] - -[connection signal="resize_request" from="." to="." method="_on_resize_request"] - -[connection signal="gui_input" from="Label" to="." method="_on_Label_gui_input"] - - diff --git a/export_presets.cfg b/export_presets.cfg index 5178d8ae..507bbaba 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -5,9 +5,9 @@ platform="Windows Desktop" runnable=true custom_features="" export_filter="resources" -export_files=PoolStringArray( "res://addons/material_maker/common.shader", "res://addons/material_maker/engine/gen_base.gd", "res://addons/material_maker/engine/gen_buffer.gd", "res://addons/material_maker/engine/gen_context.gd", "res://addons/material_maker/engine/gen_convolution.gd", "res://addons/material_maker/engine/gen_graph.gd", "res://addons/material_maker/engine/gen_image.gd", "res://addons/material_maker/engine/gen_ios.gd", "res://addons/material_maker/engine/gen_material.gd", "res://addons/material_maker/engine/gen_remote.gd", "res://addons/material_maker/engine/gen_shader.gd", "res://addons/material_maker/engine/gen_switch.gd", "res://addons/material_maker/engine/gen_texture.gd", "res://addons/material_maker/engine/loader.gd", "res://addons/material_maker/engine/renderer.gd", "res://addons/material_maker/engine/renderer.tscn", "res://addons/material_maker/graph_edit.gd", "res://addons/material_maker/graph_edit.tscn", "res://addons/material_maker/icons/add.png", "res://addons/material_maker/icons/add_config.png", "res://addons/material_maker/icons/add_link.png", "res://addons/material_maker/icons/config.png", "res://addons/material_maker/icons/edit.png", "res://addons/material_maker/icons/icon.png", "res://addons/material_maker/icons/link.png", "res://addons/material_maker/icons/load.png", "res://addons/material_maker/icons/minus.png", "res://addons/material_maker/icons/plus.png", "res://addons/material_maker/icons/remove.png", "res://addons/material_maker/icons/save.png", "res://addons/material_maker/library.gd", "res://addons/material_maker/main_window.gd", "res://addons/material_maker/main_window.tscn", "res://addons/material_maker/models/Material.material", "res://addons/material_maker/new.ptex", "res://addons/material_maker/node_base.gd", "res://addons/material_maker/node_factory.gd", "res://addons/material_maker/nodes/adjust_hsv.gd", "res://addons/material_maker/nodes/adjust_hsv.tscn", "res://addons/material_maker/nodes/adjust_hsv/adjust_hsv.gd", "res://addons/material_maker/nodes/adjust_hsv/adjust_hsv.tscn", "res://addons/material_maker/nodes/blend.gd", "res://addons/material_maker/nodes/blend.tscn", "res://addons/material_maker/nodes/blend/blend.gd", "res://addons/material_maker/nodes/blend/blend.tscn", "res://addons/material_maker/nodes/blur.gd", "res://addons/material_maker/nodes/blur.tscn", "res://addons/material_maker/nodes/blur/blur.gd", "res://addons/material_maker/nodes/blur/blur.tscn", "res://addons/material_maker/nodes/bricks.gd", "res://addons/material_maker/nodes/bricks.tscn", "res://addons/material_maker/nodes/bricks/bricks.gd", "res://addons/material_maker/nodes/bricks/bricks.tscn", "res://addons/material_maker/nodes/colorize.gd", "res://addons/material_maker/nodes/colorize.tscn", "res://addons/material_maker/nodes/colorize/colorize.gd", "res://addons/material_maker/nodes/colorize/colorize.tscn", "res://addons/material_maker/nodes/combine.gd", "res://addons/material_maker/nodes/combine.tscn", "res://addons/material_maker/nodes/combine/combine.gd", "res://addons/material_maker/nodes/combine/combine.tscn", "res://addons/material_maker/nodes/comment.gd", "res://addons/material_maker/nodes/comment.tscn", "res://addons/material_maker/nodes/comment/comment.gd", "res://addons/material_maker/nodes/comment/comment.tscn", "res://addons/material_maker/nodes/compound.tscn", "res://addons/material_maker/nodes/custom.gd", "res://addons/material_maker/nodes/custom.tscn", "res://addons/material_maker/nodes/custom/custom.gd", "res://addons/material_maker/nodes/custom/custom.tscn", "res://addons/material_maker/nodes/decompose.gd", "res://addons/material_maker/nodes/decompose.tscn", "res://addons/material_maker/nodes/decompose/decompose.gd", "res://addons/material_maker/nodes/decompose/decompose.tscn", "res://addons/material_maker/nodes/edit_buttons.gd", "res://addons/material_maker/nodes/edit_buttons.tscn", "res://addons/material_maker/nodes/emboss.gd", "res://addons/material_maker/nodes/emboss.tscn", "res://addons/material_maker/nodes/emboss/emboss.gd", "res://addons/material_maker/nodes/emboss/emboss.tscn", "res://addons/material_maker/nodes/export.gd", "res://addons/material_maker/nodes/export.tscn", "res://addons/material_maker/nodes/export/export.gd", "res://addons/material_maker/nodes/export/export.tscn", "res://addons/material_maker/nodes/generic.gd", "res://addons/material_maker/nodes/generic.tscn", "res://addons/material_maker/nodes/godot_logo.png", "res://addons/material_maker/nodes/image.gd", "res://addons/material_maker/nodes/image.tscn", "res://addons/material_maker/nodes/image/godot_logo.png", "res://addons/material_maker/nodes/image/image.gd", "res://addons/material_maker/nodes/image/image.tscn", "res://addons/material_maker/nodes/material.gd", "res://addons/material_maker/nodes/material.tscn", "res://addons/material_maker/nodes/material/material.gd", "res://addons/material_maker/nodes/material/material.tscn", "res://addons/material_maker/nodes/node_generic.gd", "res://addons/material_maker/nodes/noise.gd", "res://addons/material_maker/nodes/noise.tscn", "res://addons/material_maker/nodes/noise/noise.gd", "res://addons/material_maker/nodes/noise/noise.tscn", "res://addons/material_maker/nodes/normal_map.gd", "res://addons/material_maker/nodes/normal_map.tscn", "res://addons/material_maker/nodes/normal_map/normal_map.gd", "res://addons/material_maker/nodes/normal_map/normal_map.tscn", "res://addons/material_maker/nodes/pattern.gd", "res://addons/material_maker/nodes/pattern.tscn", "res://addons/material_maker/nodes/pattern/pattern.gd", "res://addons/material_maker/nodes/pattern/pattern.tscn", "res://addons/material_maker/nodes/perlin.gd", "res://addons/material_maker/nodes/perlin.tscn", "res://addons/material_maker/nodes/perlin/perlin.gd", "res://addons/material_maker/nodes/perlin/perlin.tscn", "res://addons/material_maker/nodes/remote.gd", "res://addons/material_maker/nodes/remote.tscn", "res://addons/material_maker/nodes/remote/remote.gd", "res://addons/material_maker/nodes/remote/remote.tscn", "res://addons/material_maker/nodes/shape/shape.gd", "res://addons/material_maker/nodes/shape/shape.tscn", "res://addons/material_maker/nodes/switch.gd", "res://addons/material_maker/nodes/switch.tscn", "res://addons/material_maker/nodes/switch/switch.gd", "res://addons/material_maker/nodes/switch/switch.tscn", "res://addons/material_maker/nodes/transform.gd", "res://addons/material_maker/nodes/transform.tscn", "res://addons/material_maker/nodes/transform/transform.gd", "res://addons/material_maker/nodes/transform/transform.tscn", "res://addons/material_maker/nodes/uniform.gd", "res://addons/material_maker/nodes/uniform.tscn", "res://addons/material_maker/nodes/uniform/uniform.gd", "res://addons/material_maker/nodes/uniform/uniform.tscn", "res://addons/material_maker/nodes/voronoi.gd", "res://addons/material_maker/nodes/voronoi.tscn", "res://addons/material_maker/nodes/voronoi/voronoi.gd", "res://addons/material_maker/nodes/voronoi/voronoi.tscn", "res://addons/material_maker/nodes/warp.gd", "res://addons/material_maker/nodes/warp.tscn", "res://addons/material_maker/nodes/warp/warp.gd", "res://addons/material_maker/nodes/warp/warp.tscn", "res://addons/material_maker/panoramas/experiment.hdr", "res://addons/material_maker/panoramas/lobby.hdr", "res://addons/material_maker/panoramas/night.hdr", "res://addons/material_maker/panoramas/park.hdr", "res://addons/material_maker/panoramas/schelde.hdr", "res://addons/material_maker/plugin.gd", "res://addons/material_maker/pm_editor.gd", "res://addons/material_maker/pm_editor.tscn", "res://addons/material_maker/preview.gd", "res://addons/material_maker/preview.tscn", "res://addons/material_maker/renderer.gd", "res://addons/material_maker/renderer.tscn", "res://addons/material_maker/types/gradient.gd", "res://addons/material_maker/types/types.gd", "res://addons/material_maker/widgets/about.gd", "res://addons/material_maker/widgets/about.tscn", "res://addons/material_maker/widgets/facebook.png", "res://addons/material_maker/widgets/github.png", "res://addons/material_maker/widgets/gradient_editor.gd", "res://addons/material_maker/widgets/gradient_editor.tscn", "res://addons/material_maker/widgets/icon.png", "res://addons/material_maker/widgets/line_dialog.gd", "res://addons/material_maker/widgets/line_dialog.tscn", "res://addons/material_maker/widgets/linked_widgets/config_control.gd", "res://addons/material_maker/widgets/linked_widgets/config_control.tscn", "res://addons/material_maker/widgets/linked_widgets/editable_label.gd", "res://addons/material_maker/widgets/linked_widgets/editable_label.tscn", "res://addons/material_maker/widgets/linked_widgets/link.gd", "res://addons/material_maker/widgets/linked_widgets/linked_control.gd", "res://addons/material_maker/widgets/linked_widgets/linked_control.tscn", "res://addons/material_maker/widgets/linked_widgets/linked_control_base.gd", "res://addons/material_maker/widgets/linked_widgets/linked_control_buttons.gd", "res://addons/material_maker/widgets/linked_widgets/linked_control_buttons.tscn", "res://addons/material_maker/widgets/node_editor.tscn", "res://addons/material_maker/widgets/node_editor/enum_editor.gd", "res://addons/material_maker/widgets/node_editor/enum_editor.tscn", "res://addons/material_maker/widgets/node_editor/input.gd", "res://addons/material_maker/widgets/node_editor/input.tscn", "res://addons/material_maker/widgets/node_editor/node_editor.gd", "res://addons/material_maker/widgets/node_editor/node_editor.tscn", "res://addons/material_maker/widgets/node_editor/output.gd", "res://addons/material_maker/widgets/node_editor/output.tscn", "res://addons/material_maker/widgets/node_editor/parameter.gd", "res://addons/material_maker/widgets/node_editor/parameter.tscn", "res://addons/material_maker/widgets/node_editor/parameter_boolean.gd", "res://addons/material_maker/widgets/node_editor/parameter_boolean.tscn", "res://addons/material_maker/widgets/node_editor/parameter_color.gd", "res://addons/material_maker/widgets/node_editor/parameter_color.tscn", "res://addons/material_maker/widgets/node_editor/parameter_enum.gd", "res://addons/material_maker/widgets/node_editor/parameter_enum.tscn", "res://addons/material_maker/widgets/node_editor/parameter_float.gd", "res://addons/material_maker/widgets/node_editor/parameter_float.tscn", "res://addons/material_maker/widgets/node_editor/parameter_gradient.gd", "res://addons/material_maker/widgets/node_editor/parameter_gradient.tscn", "res://addons/material_maker/widgets/node_editor/parameter_size.gd", "res://addons/material_maker/widgets/node_editor/parameter_size.tscn", "res://addons/material_maker/widgets/tabs.gd", "res://addons/material_maker/widgets/text_dialog.gd", "res://addons/material_maker/widgets/text_dialog.tscn", "res://addons/material_maker/widgets/twitter.png", "res://addons/material_maker/widgets/youtube.png", "res://addons/material_maker/window_dialog.tscn", "res://icon.png" ) -include_filter="*.json,*.mmn,res://addons/material_maker/library/base/*.png" -exclude_filter="*.ptex" +export_files=PoolStringArray( "res://addons/material_maker/common.shader", "res://addons/material_maker/engine/gen_base.gd", "res://addons/material_maker/engine/gen_buffer.gd", "res://addons/material_maker/engine/gen_context.gd", "res://addons/material_maker/engine/gen_convolution.gd", "res://addons/material_maker/engine/gen_graph.gd", "res://addons/material_maker/engine/gen_image.gd", "res://addons/material_maker/engine/gen_ios.gd", "res://addons/material_maker/engine/gen_material.gd", "res://addons/material_maker/engine/gen_remote.gd", "res://addons/material_maker/engine/gen_shader.gd", "res://addons/material_maker/engine/gen_switch.gd", "res://addons/material_maker/engine/gen_texture.gd", "res://addons/material_maker/engine/loader.gd", "res://addons/material_maker/engine/renderer.gd", "res://addons/material_maker/engine/renderer.tscn", "res://addons/material_maker/fonts/hack.ttf", "res://addons/material_maker/graph_edit.gd", "res://addons/material_maker/graph_edit.tscn", "res://addons/material_maker/icons/add.png", "res://addons/material_maker/icons/add_config.png", "res://addons/material_maker/icons/add_link.png", "res://addons/material_maker/icons/config.png", "res://addons/material_maker/icons/edit.png", "res://addons/material_maker/icons/icon.png", "res://addons/material_maker/icons/icons.svg", "res://addons/material_maker/icons/link.png", "res://addons/material_maker/icons/link.tres", "res://addons/material_maker/icons/load.png", "res://addons/material_maker/icons/minus.png", "res://addons/material_maker/icons/plus.png", "res://addons/material_maker/icons/remove.png", "res://addons/material_maker/icons/remove.tres", "res://addons/material_maker/icons/save.png", "res://addons/material_maker/library.gd", "res://addons/material_maker/library.tscn", "res://addons/material_maker/library_tree.gd", "res://addons/material_maker/main_window.gd", "res://addons/material_maker/main_window.tscn", "res://addons/material_maker/models/Material.material", "res://addons/material_maker/new.ptex", "res://addons/material_maker/node_base.gd", "res://addons/material_maker/node_factory.gd", "res://addons/material_maker/nodes/adjust_hsv.gd", "res://addons/material_maker/nodes/adjust_hsv.tscn", "res://addons/material_maker/nodes/adjust_hsv/adjust_hsv.gd", "res://addons/material_maker/nodes/adjust_hsv/adjust_hsv.tscn", "res://addons/material_maker/nodes/blend.gd", "res://addons/material_maker/nodes/blend.tscn", "res://addons/material_maker/nodes/blend/blend.gd", "res://addons/material_maker/nodes/blend/blend.tscn", "res://addons/material_maker/nodes/blur.gd", "res://addons/material_maker/nodes/blur.tscn", "res://addons/material_maker/nodes/bricks.gd", "res://addons/material_maker/nodes/bricks.tscn", "res://addons/material_maker/nodes/bricks/bricks.gd", "res://addons/material_maker/nodes/bricks/bricks.tscn", "res://addons/material_maker/nodes/colorize.gd", "res://addons/material_maker/nodes/colorize.tscn", "res://addons/material_maker/nodes/colorize/colorize.gd", "res://addons/material_maker/nodes/colorize/colorize.tscn", "res://addons/material_maker/nodes/combine.gd", "res://addons/material_maker/nodes/combine.tscn", "res://addons/material_maker/nodes/combine/combine.gd", "res://addons/material_maker/nodes/combine/combine.tscn", "res://addons/material_maker/nodes/comment.gd", "res://addons/material_maker/nodes/comment.tscn", "res://addons/material_maker/nodes/compound.tscn", "res://addons/material_maker/nodes/custom/custom.gd", "res://addons/material_maker/nodes/custom/custom.tscn", "res://addons/material_maker/nodes/decompose.gd", "res://addons/material_maker/nodes/decompose.tscn", "res://addons/material_maker/nodes/decompose/decompose.gd", "res://addons/material_maker/nodes/decompose/decompose.tscn", "res://addons/material_maker/nodes/edit_buttons.gd", "res://addons/material_maker/nodes/edit_buttons.tscn", "res://addons/material_maker/nodes/emboss.gd", "res://addons/material_maker/nodes/emboss.tscn", "res://addons/material_maker/nodes/export.gd", "res://addons/material_maker/nodes/export.tscn", "res://addons/material_maker/nodes/generic.gd", "res://addons/material_maker/nodes/generic.tscn", "res://addons/material_maker/nodes/godot_logo.png", "res://addons/material_maker/nodes/image.gd", "res://addons/material_maker/nodes/image.tscn", "res://addons/material_maker/nodes/image/godot_logo.png", "res://addons/material_maker/nodes/image/image.gd", "res://addons/material_maker/nodes/image/image.tscn", "res://addons/material_maker/nodes/material.gd", "res://addons/material_maker/nodes/material.tscn", "res://addons/material_maker/nodes/material/material.gd", "res://addons/material_maker/nodes/material/material.tscn", "res://addons/material_maker/nodes/noise.gd", "res://addons/material_maker/nodes/noise.tscn", "res://addons/material_maker/nodes/noise/noise.gd", "res://addons/material_maker/nodes/noise/noise.tscn", "res://addons/material_maker/nodes/normal_map.gd", "res://addons/material_maker/nodes/normal_map.tscn", "res://addons/material_maker/nodes/normal_map/normal_map.gd", "res://addons/material_maker/nodes/normal_map/normal_map.tscn", "res://addons/material_maker/nodes/pattern.gd", "res://addons/material_maker/nodes/pattern.tscn", "res://addons/material_maker/nodes/pattern/pattern.gd", "res://addons/material_maker/nodes/pattern/pattern.tscn", "res://addons/material_maker/nodes/perlin.gd", "res://addons/material_maker/nodes/perlin.tscn", "res://addons/material_maker/nodes/perlin/perlin.gd", "res://addons/material_maker/nodes/perlin/perlin.tscn", "res://addons/material_maker/nodes/remote.gd", "res://addons/material_maker/nodes/remote.tscn", "res://addons/material_maker/nodes/remote/remote.gd", "res://addons/material_maker/nodes/remote/remote.tscn", "res://addons/material_maker/nodes/shape/shape.gd", "res://addons/material_maker/nodes/shape/shape.tscn", "res://addons/material_maker/nodes/switch.gd", "res://addons/material_maker/nodes/switch.tscn", "res://addons/material_maker/nodes/switch/switch.gd", "res://addons/material_maker/nodes/switch/switch.tscn", "res://addons/material_maker/nodes/transform.gd", "res://addons/material_maker/nodes/transform.tscn", "res://addons/material_maker/nodes/transform/transform.gd", "res://addons/material_maker/nodes/transform/transform.tscn", "res://addons/material_maker/nodes/uniform.gd", "res://addons/material_maker/nodes/uniform.tscn", "res://addons/material_maker/nodes/uniform/uniform.gd", "res://addons/material_maker/nodes/uniform/uniform.tscn", "res://addons/material_maker/nodes/voronoi.gd", "res://addons/material_maker/nodes/voronoi.tscn", "res://addons/material_maker/nodes/voronoi/voronoi.gd", "res://addons/material_maker/nodes/voronoi/voronoi.tscn", "res://addons/material_maker/nodes/warp.gd", "res://addons/material_maker/nodes/warp.tscn", "res://addons/material_maker/nodes/warp/warp.gd", "res://addons/material_maker/nodes/warp/warp.tscn", "res://addons/material_maker/panoramas/experiment.hdr", "res://addons/material_maker/panoramas/lobby.hdr", "res://addons/material_maker/panoramas/night.hdr", "res://addons/material_maker/panoramas/park.hdr", "res://addons/material_maker/panoramas/schelde.hdr", "res://addons/material_maker/plugin.gd", "res://addons/material_maker/pm_editor.gd", "res://addons/material_maker/pm_editor.tscn", "res://addons/material_maker/preview.gd", "res://addons/material_maker/preview.tscn", "res://addons/material_maker/preview_3d.tscn", "res://addons/material_maker/preview_objects.tscn", "res://addons/material_maker/preview_world.tres", "res://addons/material_maker/renderer.gd", "res://addons/material_maker/renderer.tscn", "res://addons/material_maker/types/gradient.gd", "res://addons/material_maker/types/types.gd", "res://addons/material_maker/widgets/about.gd", "res://addons/material_maker/widgets/about.tscn", "res://addons/material_maker/widgets/facebook.png", "res://addons/material_maker/widgets/github.png", "res://addons/material_maker/widgets/gradient_editor.gd", "res://addons/material_maker/widgets/gradient_editor.tscn", "res://addons/material_maker/widgets/gradient_popup.gd", "res://addons/material_maker/widgets/gradient_popup.tscn", "res://addons/material_maker/widgets/hslider.gd", "res://addons/material_maker/widgets/hslider.tscn", "res://addons/material_maker/widgets/icon.png", "res://addons/material_maker/widgets/line_dialog.gd", "res://addons/material_maker/widgets/line_dialog.tscn", "res://addons/material_maker/widgets/linked_widgets/config_control.gd", "res://addons/material_maker/widgets/linked_widgets/config_control.tscn", "res://addons/material_maker/widgets/linked_widgets/editable_label.gd", "res://addons/material_maker/widgets/linked_widgets/editable_label.tscn", "res://addons/material_maker/widgets/linked_widgets/link.gd", "res://addons/material_maker/widgets/linked_widgets/linked_control.gd", "res://addons/material_maker/widgets/linked_widgets/linked_control.tscn", "res://addons/material_maker/widgets/linked_widgets/linked_control_base.gd", "res://addons/material_maker/widgets/linked_widgets/linked_control_buttons.gd", "res://addons/material_maker/widgets/linked_widgets/linked_control_buttons.tscn", "res://addons/material_maker/widgets/node_editor.tscn", "res://addons/material_maker/widgets/node_editor/enum_editor.gd", "res://addons/material_maker/widgets/node_editor/enum_editor.tscn", "res://addons/material_maker/widgets/node_editor/input.gd", "res://addons/material_maker/widgets/node_editor/input.tscn", "res://addons/material_maker/widgets/node_editor/node_editor.gd", "res://addons/material_maker/widgets/node_editor/node_editor.tscn", "res://addons/material_maker/widgets/node_editor/output.gd", "res://addons/material_maker/widgets/node_editor/output.tscn", "res://addons/material_maker/widgets/node_editor/parameter.gd", "res://addons/material_maker/widgets/node_editor/parameter.tscn", "res://addons/material_maker/widgets/node_editor/parameter_boolean.gd", "res://addons/material_maker/widgets/node_editor/parameter_boolean.tscn", "res://addons/material_maker/widgets/node_editor/parameter_color.gd", "res://addons/material_maker/widgets/node_editor/parameter_color.tscn", "res://addons/material_maker/widgets/node_editor/parameter_enum.gd", "res://addons/material_maker/widgets/node_editor/parameter_enum.tscn", "res://addons/material_maker/widgets/node_editor/parameter_float.gd", "res://addons/material_maker/widgets/node_editor/parameter_float.tscn", "res://addons/material_maker/widgets/node_editor/parameter_gradient.gd", "res://addons/material_maker/widgets/node_editor/parameter_gradient.tscn", "res://addons/material_maker/widgets/node_editor/parameter_size.gd", "res://addons/material_maker/widgets/node_editor/parameter_size.tscn", "res://addons/material_maker/widgets/preview_button.tscn", "res://addons/material_maker/widgets/tabs.gd", "res://addons/material_maker/widgets/text_dialog.gd", "res://addons/material_maker/widgets/text_dialog.tscn", "res://addons/material_maker/widgets/twitter.png", "res://addons/material_maker/widgets/youtube.png", "res://addons/material_maker/window_dialog.tscn", "res://default_env.tres", "res://icon.png", "res://rodz_labs_logo.png" ) +include_filter="*.json,res://addons/material_maker/library/base/*.png" +exclude_filter="*.ptex,*.mmn,*.mmg" export_path="D:/Dev/Releases/material_maker_0.7_windows/material_maker.exe" patch_list=PoolStringArray( ) script_export_mode=1 diff --git a/project.godot b/project.godot index 1e52dd02..b42e2c2b 100644 --- a/project.godot +++ b/project.godot @@ -19,6 +19,11 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://addons/material_maker/engine/gen_buffer.gd" }, { +"base": "MMGenTexture", +"class": "MMGenComment", +"language": "GDScript", +"path": "res://addons/material_maker/engine/gen_comment.gd" +}, { "base": "Object", "class": "MMGenContext", "language": "GDScript", @@ -117,6 +122,7 @@ _global_script_classes=[ { _global_script_class_icons={ "MMGenBase": "", "MMGenBuffer": "", +"MMGenComment": "", "MMGenContext": "", "MMGenConvolution": "", "MMGenGraph": "",