From ab9ae4ce5d78cecc5c6c8b506e717c09a0509cdb Mon Sep 17 00:00:00 2001 From: RodZill4 Date: Sat, 22 Sep 2018 08:12:33 +0200 Subject: [PATCH] Reorganized nodes (1 directory per node) --- addons/material_maker/examples/radiation.ptex | 2 +- addons/material_maker/graph_edit.gd | 2 +- addons/material_maker/graph_edit.tscn | 3 ++- addons/material_maker/main_window.tscn | 2 +- .../nodes/{ => adjust_hsv}/adjust_hsv.gd | 0 .../nodes/{ => adjust_hsv}/adjust_hsv.tscn | 3 ++- addons/material_maker/nodes/{ => blend}/blend.gd | 0 addons/material_maker/nodes/{ => blend}/blend.tscn | 3 ++- addons/material_maker/nodes/{ => blur}/blur.gd | 0 addons/material_maker/nodes/{ => blur}/blur.tscn | 3 ++- addons/material_maker/nodes/{ => bricks}/bricks.gd | 0 .../material_maker/nodes/{ => bricks}/bricks.tscn | 3 ++- .../material_maker/nodes/{ => colorize}/colorize.gd | 0 .../nodes/{ => colorize}/colorize.tscn | 3 ++- .../material_maker/nodes/{ => combine}/combine.gd | 0 .../material_maker/nodes/{ => combine}/combine.tscn | 3 ++- .../material_maker/nodes/{ => comment}/comment.gd | 0 .../material_maker/nodes/{ => comment}/comment.tscn | 3 ++- addons/material_maker/nodes/compound.tscn | 3 ++- .../nodes/{ => decompose}/decompose.gd | 0 .../nodes/{ => decompose}/decompose.tscn | 3 ++- addons/material_maker/nodes/{ => emboss}/emboss.gd | 0 .../material_maker/nodes/{ => emboss}/emboss.tscn | 3 ++- addons/material_maker/nodes/{ => export}/export.gd | 0 .../material_maker/nodes/{ => export}/export.tscn | 3 ++- .../material_maker/nodes/{ => image}/godot_logo.png | Bin addons/material_maker/nodes/{ => image}/image.gd | 0 addons/material_maker/nodes/{ => image}/image.tscn | 5 +++-- .../material_maker/nodes/{ => material}/material.gd | 0 .../nodes/{ => material}/material.tscn | 3 ++- addons/material_maker/nodes/{ => noise}/noise.gd | 0 addons/material_maker/nodes/{ => noise}/noise.tscn | 3 ++- .../nodes/{ => normal_map}/normal_map.gd | 0 .../nodes/{ => normal_map}/normal_map.tscn | 3 ++- .../material_maker/nodes/{ => pattern}/pattern.gd | 0 .../material_maker/nodes/{ => pattern}/pattern.tscn | 3 ++- addons/material_maker/nodes/{ => perlin}/perlin.gd | 0 .../material_maker/nodes/{ => perlin}/perlin.tscn | 3 ++- addons/material_maker/nodes/{ => remote}/remote.gd | 0 .../material_maker/nodes/{ => remote}/remote.tscn | 3 ++- addons/material_maker/nodes/{ => shape}/shape.gd | 0 addons/material_maker/nodes/{ => shape}/shape.tscn | 3 ++- addons/material_maker/nodes/{ => switch}/switch.gd | 0 .../material_maker/nodes/{ => switch}/switch.tscn | 3 ++- .../nodes/{ => transform}/transform.gd | 0 .../nodes/{ => transform}/transform.tscn | 3 ++- .../material_maker/nodes/{ => uniform}/uniform.gd | 0 .../material_maker/nodes/{ => uniform}/uniform.tscn | 3 ++- .../material_maker/nodes/{ => voronoi}/voronoi.gd | 0 .../material_maker/nodes/{ => voronoi}/voronoi.tscn | 3 ++- addons/material_maker/nodes/{ => warp}/warp.gd | 0 addons/material_maker/nodes/{ => warp}/warp.tscn | 3 ++- 52 files changed, 54 insertions(+), 29 deletions(-) rename addons/material_maker/nodes/{ => adjust_hsv}/adjust_hsv.gd (100%) rename addons/material_maker/nodes/{ => adjust_hsv}/adjust_hsv.tscn (99%) rename addons/material_maker/nodes/{ => blend}/blend.gd (100%) rename addons/material_maker/nodes/{ => blend}/blend.tscn (98%) rename addons/material_maker/nodes/{ => blur}/blur.gd (100%) rename addons/material_maker/nodes/{ => blur}/blur.tscn (98%) rename addons/material_maker/nodes/{ => bricks}/bricks.gd (100%) rename addons/material_maker/nodes/{ => bricks}/bricks.tscn (99%) rename addons/material_maker/nodes/{ => colorize}/colorize.gd (100%) rename addons/material_maker/nodes/{ => colorize}/colorize.tscn (92%) rename addons/material_maker/nodes/{ => combine}/combine.gd (100%) rename addons/material_maker/nodes/{ => combine}/combine.tscn (96%) rename addons/material_maker/nodes/{ => comment}/comment.gd (100%) rename addons/material_maker/nodes/{ => comment}/comment.tscn (94%) rename addons/material_maker/nodes/{ => decompose}/decompose.gd (100%) rename addons/material_maker/nodes/{ => decompose}/decompose.tscn (96%) rename addons/material_maker/nodes/{ => emboss}/emboss.gd (100%) rename addons/material_maker/nodes/{ => emboss}/emboss.tscn (98%) rename addons/material_maker/nodes/{ => export}/export.gd (100%) rename addons/material_maker/nodes/{ => export}/export.tscn (96%) rename addons/material_maker/nodes/{ => image}/godot_logo.png (100%) rename addons/material_maker/nodes/{ => image}/image.gd (100%) rename addons/material_maker/nodes/{ => image}/image.tscn (89%) rename addons/material_maker/nodes/{ => material}/material.gd (100%) rename addons/material_maker/nodes/{ => material}/material.tscn (99%) rename addons/material_maker/nodes/{ => noise}/noise.gd (100%) rename addons/material_maker/nodes/{ => noise}/noise.tscn (97%) rename addons/material_maker/nodes/{ => normal_map}/normal_map.gd (100%) rename addons/material_maker/nodes/{ => normal_map}/normal_map.tscn (99%) rename addons/material_maker/nodes/{ => pattern}/pattern.gd (100%) rename addons/material_maker/nodes/{ => pattern}/pattern.tscn (98%) rename addons/material_maker/nodes/{ => perlin}/perlin.gd (100%) rename addons/material_maker/nodes/{ => perlin}/perlin.tscn (98%) rename addons/material_maker/nodes/{ => remote}/remote.gd (100%) rename addons/material_maker/nodes/{ => remote}/remote.tscn (97%) rename addons/material_maker/nodes/{ => shape}/shape.gd (100%) rename addons/material_maker/nodes/{ => shape}/shape.tscn (97%) rename addons/material_maker/nodes/{ => switch}/switch.gd (100%) rename addons/material_maker/nodes/{ => switch}/switch.tscn (98%) rename addons/material_maker/nodes/{ => transform}/transform.gd (100%) rename addons/material_maker/nodes/{ => transform}/transform.tscn (99%) rename addons/material_maker/nodes/{ => uniform}/uniform.gd (100%) rename addons/material_maker/nodes/{ => uniform}/uniform.tscn (93%) rename addons/material_maker/nodes/{ => voronoi}/voronoi.gd (100%) rename addons/material_maker/nodes/{ => voronoi}/voronoi.tscn (98%) rename addons/material_maker/nodes/{ => warp}/warp.gd (100%) rename addons/material_maker/nodes/{ => warp}/warp.tscn (96%) diff --git a/addons/material_maker/examples/radiation.ptex b/addons/material_maker/examples/radiation.ptex index dad585b..8eb546d 100644 --- a/addons/material_maker/examples/radiation.ptex +++ b/addons/material_maker/examples/radiation.ptex @@ -1 +1 @@ -{"connections":[{"from":"shape_0","from_port":0,"to":"blend_0","to_port":1},{"from":"blend_1","from_port":0,"to":"blend_0","to_port":0},{"from":"shape_2","from_port":0,"to":"blend_1","to_port":0},{"from":"shape_1","from_port":0,"to":"blend_1","to_port":1},{"from":"blend_0","from_port":0,"to":"blend_2","to_port":0},{"from":"shape_3","from_port":0,"to":"blend_2","to_port":1},{"from":"blend_2","from_port":0,"to":"colorize_0","to_port":0},{"from":"colorize_0","from_port":0,"to":"Material","to_port":0}],"nodes":[{"edge":0.05,"name":"shape_3","node_position":{"x":-35,"y":36},"radius":0.18,"shape":0,"sides":3,"type":"shape"},{"edge":0.02,"name":"shape_0","node_position":{"x":-373,"y":13},"radius":0.5,"shape":4,"sides":3,"type":"shape"},{"edge":0.02,"name":"shape_1","node_position":{"x":-359,"y":-99},"radius":0.87,"shape":0,"sides":3,"type":"shape"},{"edge":0.02,"name":"shape_2","node_position":{"x":-358,"y":-200},"radius":0.34,"shape":0,"sides":3,"type":"shape"},{"amount":1,"blend_type":11,"name":"blend_1","node_position":{"x":-236,"y":-159},"type":"blend"},{"amount":1,"blend_type":2,"name":"blend_0","node_position":{"x":-53,"y":-74},"type":"blend"},{"amount":1,"blend_type":3,"name":"blend_2","node_position":{"x":148,"y":-34},"type":"blend"},{"gradient":{"points":[{"b":0,"g":0.820313,"pos":0,"r":0.9375},{"b":0,"g":0,"pos":1,"r":0}],"type":"Gradient"},"name":"colorize_0","node_position":{"x":354.081177,"y":-39.5},"type":"colorize"},{"albedo_color":{"a":1,"b":1,"g":1,"r":1,"type":"Color"},"ao_light_affect":1,"depth_scale":1,"emission_energy":1,"metallic":1,"name":"Material","node_position":{"x":528,"y":-57},"normal_scale":1,"resolution":1,"roughness":1,"type":"material"}]} \ No newline at end of file +{"connections":[{"from":"shape_2","from_port":0,"to":"blend_1","to_port":0},{"from":"shape_1","from_port":0,"to":"blend_1","to_port":1},{"from":"blend_0","from_port":0,"to":"blend_2","to_port":0},{"from":"shape_3","from_port":0,"to":"blend_2","to_port":1},{"from":"blend_2","from_port":0,"to":"colorize_0","to_port":0},{"from":"colorize_0","from_port":0,"to":"Material","to_port":0},{"from":"transform_0","from_port":0,"to":"blend_0","to_port":1},{"from":"blend_1","from_port":0,"to":"blend_0","to_port":0},{"from":"shape_0","from_port":0,"to":"transform_0","to_port":0}],"nodes":[{"edge":0.05,"name":"shape_3","node_position":{"x":-35,"y":36},"radius":0.18,"shape":0,"sides":3,"type":"shape"},{"edge":0.02,"name":"shape_0","node_position":{"x":-373,"y":13},"radius":0.5,"shape":4,"sides":3,"type":"shape"},{"edge":0.02,"name":"shape_1","node_position":{"x":-359,"y":-99},"radius":0.87,"shape":0,"sides":3,"type":"shape"},{"edge":0.02,"name":"shape_2","node_position":{"x":-358,"y":-200},"radius":0.34,"shape":0,"sides":3,"type":"shape"},{"amount":1,"blend_type":11,"name":"blend_1","node_position":{"x":-236,"y":-159},"type":"blend"},{"albedo_color":{"a":1,"b":1,"g":1,"r":1,"type":"Color"},"ao_light_affect":1,"depth_scale":1,"emission_energy":1,"metallic":1,"name":"Material","node_position":{"x":528,"y":-57},"normal_scale":1,"resolution":1,"roughness":1,"type":"material"},{"amount":1,"blend_type":2,"name":"blend_0","node_position":{"x":-40,"y":-82},"type":"blend"},{"name":"transform_0","node_position":{"x":-245.657654,"y":-16.611115},"repeat":true,"rotate":30,"scale_x":1,"scale_y":1,"translate_x":0,"translate_y":0,"type":"transform"},{"amount":1,"blend_type":3,"name":"blend_2","node_position":{"x":149,"y":-34},"type":"blend"},{"gradient":{"points":[{"b":0,"g":0.820313,"pos":0,"r":0.9375},{"b":0,"g":0,"pos":1,"r":0}],"type":"Gradient"},"name":"colorize_0","node_position":{"x":354.081177,"y":-39.5},"type":"colorize"}]} \ No newline at end of file diff --git a/addons/material_maker/graph_edit.gd b/addons/material_maker/graph_edit.gd index 24a1ab7..22b2501 100644 --- a/addons/material_maker/graph_edit.gd +++ b/addons/material_maker/graph_edit.gd @@ -116,7 +116,7 @@ func create_nodes(data, position = null): if data == null: return if data.has("type"): - var node_type = load("res://addons/material_maker/nodes/"+data.type+".tscn") + var node_type = load("res://addons/material_maker/nodes/"+data.type+"/"+data.type+".tscn") if node_type != null: var node = node_type.instance() if data.has("name") && !has_node(data.name): diff --git a/addons/material_maker/graph_edit.tscn b/addons/material_maker/graph_edit.tscn index c36a474..1f756ee 100644 --- a/addons/material_maker/graph_edit.tscn +++ b/addons/material_maker/graph_edit.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://addons/material_maker/graph_edit.gd" type="Script" id=1] -[ext_resource path="res://addons/material_maker/nodes/material.tscn" type="PackedScene" id=2] +[ext_resource path="res://addons/material_maker/nodes/material/material.tscn" type="PackedScene" id=2] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/main_window.tscn b/addons/material_maker/main_window.tscn index 43850a8..5ae8cf6 100644 --- a/addons/material_maker/main_window.tscn +++ b/addons/material_maker/main_window.tscn @@ -6,7 +6,7 @@ [ext_resource path="res://addons/material_maker/widgets/tabs.gd" type="Script" id=4] [ext_resource path="res://addons/material_maker/renderer.tscn" type="PackedScene" id=5] -[node name="MainWindow" type="Panel"] +[node name="MainWindow" type="Panel" index="0"] anchor_left = 0.0 anchor_top = 0.0 diff --git a/addons/material_maker/nodes/adjust_hsv.gd b/addons/material_maker/nodes/adjust_hsv/adjust_hsv.gd similarity index 100% rename from addons/material_maker/nodes/adjust_hsv.gd rename to addons/material_maker/nodes/adjust_hsv/adjust_hsv.gd diff --git a/addons/material_maker/nodes/adjust_hsv.tscn b/addons/material_maker/nodes/adjust_hsv/adjust_hsv.tscn similarity index 99% rename from addons/material_maker/nodes/adjust_hsv.tscn rename to addons/material_maker/nodes/adjust_hsv/adjust_hsv.tscn index 8f869e7..ba4aa02 100644 --- a/addons/material_maker/nodes/adjust_hsv.tscn +++ b/addons/material_maker/nodes/adjust_hsv/adjust_hsv.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/material_maker/nodes/adjust_hsv.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/adjust_hsv/adjust_hsv.gd" type="Script" id=1] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/blend.gd b/addons/material_maker/nodes/blend/blend.gd similarity index 100% rename from addons/material_maker/nodes/blend.gd rename to addons/material_maker/nodes/blend/blend.gd diff --git a/addons/material_maker/nodes/blend.tscn b/addons/material_maker/nodes/blend/blend.tscn similarity index 98% rename from addons/material_maker/nodes/blend.tscn rename to addons/material_maker/nodes/blend/blend.tscn index b6f25e3..c554809 100644 --- a/addons/material_maker/nodes/blend.tscn +++ b/addons/material_maker/nodes/blend/blend.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/material_maker/nodes/blend.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/blend/blend.gd" type="Script" id=1] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/blur.gd b/addons/material_maker/nodes/blur/blur.gd similarity index 100% rename from addons/material_maker/nodes/blur.gd rename to addons/material_maker/nodes/blur/blur.gd diff --git a/addons/material_maker/nodes/blur.tscn b/addons/material_maker/nodes/blur/blur.tscn similarity index 98% rename from addons/material_maker/nodes/blur.tscn rename to addons/material_maker/nodes/blur/blur.tscn index 9bb51ee..ce06b10 100644 --- a/addons/material_maker/nodes/blur.tscn +++ b/addons/material_maker/nodes/blur/blur.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/material_maker/nodes/blur.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/blur/blur.gd" type="Script" id=1] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/bricks.gd b/addons/material_maker/nodes/bricks/bricks.gd similarity index 100% rename from addons/material_maker/nodes/bricks.gd rename to addons/material_maker/nodes/bricks/bricks.gd diff --git a/addons/material_maker/nodes/bricks.tscn b/addons/material_maker/nodes/bricks/bricks.tscn similarity index 99% rename from addons/material_maker/nodes/bricks.tscn rename to addons/material_maker/nodes/bricks/bricks.tscn index d971506..8f0c7c3 100644 --- a/addons/material_maker/nodes/bricks.tscn +++ b/addons/material_maker/nodes/bricks/bricks.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/material_maker/nodes/bricks.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/bricks/bricks.gd" type="Script" id=1] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/colorize.gd b/addons/material_maker/nodes/colorize/colorize.gd similarity index 100% rename from addons/material_maker/nodes/colorize.gd rename to addons/material_maker/nodes/colorize/colorize.gd diff --git a/addons/material_maker/nodes/colorize.tscn b/addons/material_maker/nodes/colorize/colorize.tscn similarity index 92% rename from addons/material_maker/nodes/colorize.tscn rename to addons/material_maker/nodes/colorize/colorize.tscn index 0175558..a3c7031 100644 --- a/addons/material_maker/nodes/colorize.tscn +++ b/addons/material_maker/nodes/colorize/colorize.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://addons/material_maker/nodes/colorize.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/colorize/colorize.gd" type="Script" id=1] [ext_resource path="res://addons/material_maker/widgets/gradient_editor.tscn" type="PackedScene" id=2] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/combine.gd b/addons/material_maker/nodes/combine/combine.gd similarity index 100% rename from addons/material_maker/nodes/combine.gd rename to addons/material_maker/nodes/combine/combine.gd diff --git a/addons/material_maker/nodes/combine.tscn b/addons/material_maker/nodes/combine/combine.tscn similarity index 96% rename from addons/material_maker/nodes/combine.tscn rename to addons/material_maker/nodes/combine/combine.tscn index 844c985..78add66 100644 --- a/addons/material_maker/nodes/combine.tscn +++ b/addons/material_maker/nodes/combine/combine.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/material_maker/nodes/combine.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/combine/combine.gd" type="Script" id=1] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/comment.gd b/addons/material_maker/nodes/comment/comment.gd similarity index 100% rename from addons/material_maker/nodes/comment.gd rename to addons/material_maker/nodes/comment/comment.gd diff --git a/addons/material_maker/nodes/comment.tscn b/addons/material_maker/nodes/comment/comment.tscn similarity index 94% rename from addons/material_maker/nodes/comment.tscn rename to addons/material_maker/nodes/comment/comment.tscn index a1b29ee..a48c7f3 100644 --- a/addons/material_maker/nodes/comment.tscn +++ b/addons/material_maker/nodes/comment/comment.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://addons/material_maker/nodes/comment.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/comment/comment.gd" type="Script" id=1] + [node name="GraphNode" type="GraphNode" index="0"] diff --git a/addons/material_maker/nodes/compound.tscn b/addons/material_maker/nodes/compound.tscn index 318ef5e..6c0bdcc 100644 --- a/addons/material_maker/nodes/compound.tscn +++ b/addons/material_maker/nodes/compound.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/material_maker/nodes/uniform.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/uniform/uniform.gd" type="Script" id=1] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/decompose.gd b/addons/material_maker/nodes/decompose/decompose.gd similarity index 100% rename from addons/material_maker/nodes/decompose.gd rename to addons/material_maker/nodes/decompose/decompose.gd diff --git a/addons/material_maker/nodes/decompose.tscn b/addons/material_maker/nodes/decompose/decompose.tscn similarity index 96% rename from addons/material_maker/nodes/decompose.tscn rename to addons/material_maker/nodes/decompose/decompose.tscn index 032bcfb..874ca50 100644 --- a/addons/material_maker/nodes/decompose.tscn +++ b/addons/material_maker/nodes/decompose/decompose.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/material_maker/nodes/decompose.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/decompose/decompose.gd" type="Script" id=1] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/emboss.gd b/addons/material_maker/nodes/emboss/emboss.gd similarity index 100% rename from addons/material_maker/nodes/emboss.gd rename to addons/material_maker/nodes/emboss/emboss.gd diff --git a/addons/material_maker/nodes/emboss.tscn b/addons/material_maker/nodes/emboss/emboss.tscn similarity index 98% rename from addons/material_maker/nodes/emboss.tscn rename to addons/material_maker/nodes/emboss/emboss.tscn index be03565..074e437 100644 --- a/addons/material_maker/nodes/emboss.tscn +++ b/addons/material_maker/nodes/emboss/emboss.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/material_maker/nodes/emboss.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/emboss/emboss.gd" type="Script" id=1] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/export.gd b/addons/material_maker/nodes/export/export.gd similarity index 100% rename from addons/material_maker/nodes/export.gd rename to addons/material_maker/nodes/export/export.gd diff --git a/addons/material_maker/nodes/export.tscn b/addons/material_maker/nodes/export/export.tscn similarity index 96% rename from addons/material_maker/nodes/export.tscn rename to addons/material_maker/nodes/export/export.tscn index 94b5faa..f37696b 100644 --- a/addons/material_maker/nodes/export.tscn +++ b/addons/material_maker/nodes/export/export.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/material_maker/nodes/export.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/export/export.gd" type="Script" id=1] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/godot_logo.png b/addons/material_maker/nodes/image/godot_logo.png similarity index 100% rename from addons/material_maker/nodes/godot_logo.png rename to addons/material_maker/nodes/image/godot_logo.png diff --git a/addons/material_maker/nodes/image.gd b/addons/material_maker/nodes/image/image.gd similarity index 100% rename from addons/material_maker/nodes/image.gd rename to addons/material_maker/nodes/image/image.gd diff --git a/addons/material_maker/nodes/image.tscn b/addons/material_maker/nodes/image/image.tscn similarity index 89% rename from addons/material_maker/nodes/image.tscn rename to addons/material_maker/nodes/image/image.tscn index 43546ea..14e9870 100644 --- a/addons/material_maker/nodes/image.tscn +++ b/addons/material_maker/nodes/image/image.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://addons/material_maker/nodes/image.gd" type="Script" id=1] -[ext_resource path="res://addons/material_maker/nodes/godot_logo.png" type="Texture" id=2] +[ext_resource path="res://addons/material_maker/nodes/image/image.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/image/godot_logo.png" type="Texture" id=2] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/material.gd b/addons/material_maker/nodes/material/material.gd similarity index 100% rename from addons/material_maker/nodes/material.gd rename to addons/material_maker/nodes/material/material.gd diff --git a/addons/material_maker/nodes/material.tscn b/addons/material_maker/nodes/material/material.tscn similarity index 99% rename from addons/material_maker/nodes/material.tscn rename to addons/material_maker/nodes/material/material.tscn index 14baefd..7cbd341 100644 --- a/addons/material_maker/nodes/material.tscn +++ b/addons/material_maker/nodes/material/material.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/material_maker/nodes/material.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/material/material.gd" type="Script" id=1] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/noise.gd b/addons/material_maker/nodes/noise/noise.gd similarity index 100% rename from addons/material_maker/nodes/noise.gd rename to addons/material_maker/nodes/noise/noise.gd diff --git a/addons/material_maker/nodes/noise.tscn b/addons/material_maker/nodes/noise/noise.tscn similarity index 97% rename from addons/material_maker/nodes/noise.tscn rename to addons/material_maker/nodes/noise/noise.tscn index 313b3fb..40972e4 100644 --- a/addons/material_maker/nodes/noise.tscn +++ b/addons/material_maker/nodes/noise/noise.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/material_maker/nodes/noise.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/noise/noise.gd" type="Script" id=1] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/normal_map.gd b/addons/material_maker/nodes/normal_map/normal_map.gd similarity index 100% rename from addons/material_maker/nodes/normal_map.gd rename to addons/material_maker/nodes/normal_map/normal_map.gd diff --git a/addons/material_maker/nodes/normal_map.tscn b/addons/material_maker/nodes/normal_map/normal_map.tscn similarity index 99% rename from addons/material_maker/nodes/normal_map.tscn rename to addons/material_maker/nodes/normal_map/normal_map.tscn index 3f549bf..2ec9384 100644 --- a/addons/material_maker/nodes/normal_map.tscn +++ b/addons/material_maker/nodes/normal_map/normal_map.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/material_maker/nodes/normal_map.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/normal_map/normal_map.gd" type="Script" id=1] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/pattern.gd b/addons/material_maker/nodes/pattern/pattern.gd similarity index 100% rename from addons/material_maker/nodes/pattern.gd rename to addons/material_maker/nodes/pattern/pattern.gd diff --git a/addons/material_maker/nodes/pattern.tscn b/addons/material_maker/nodes/pattern/pattern.tscn similarity index 98% rename from addons/material_maker/nodes/pattern.tscn rename to addons/material_maker/nodes/pattern/pattern.tscn index 4c6ac24..ff7cc24 100644 --- a/addons/material_maker/nodes/pattern.tscn +++ b/addons/material_maker/nodes/pattern/pattern.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/material_maker/nodes/pattern.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/pattern/pattern.gd" type="Script" id=1] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/perlin.gd b/addons/material_maker/nodes/perlin/perlin.gd similarity index 100% rename from addons/material_maker/nodes/perlin.gd rename to addons/material_maker/nodes/perlin/perlin.gd diff --git a/addons/material_maker/nodes/perlin.tscn b/addons/material_maker/nodes/perlin/perlin.tscn similarity index 98% rename from addons/material_maker/nodes/perlin.tscn rename to addons/material_maker/nodes/perlin/perlin.tscn index 0d0a965..0cea9b2 100644 --- a/addons/material_maker/nodes/perlin.tscn +++ b/addons/material_maker/nodes/perlin/perlin.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/material_maker/nodes/perlin.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/perlin/perlin.gd" type="Script" id=1] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/remote.gd b/addons/material_maker/nodes/remote/remote.gd similarity index 100% rename from addons/material_maker/nodes/remote.gd rename to addons/material_maker/nodes/remote/remote.gd diff --git a/addons/material_maker/nodes/remote.tscn b/addons/material_maker/nodes/remote/remote.tscn similarity index 97% rename from addons/material_maker/nodes/remote.tscn rename to addons/material_maker/nodes/remote/remote.tscn index e19728c..335af33 100644 --- a/addons/material_maker/nodes/remote.tscn +++ b/addons/material_maker/nodes/remote/remote.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://addons/material_maker/nodes/remote.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/remote/remote.gd" type="Script" id=1] [ext_resource path="res://addons/material_maker/icons/link.png" type="Texture" id=2] [ext_resource path="res://addons/material_maker/icons/config.png" type="Texture" id=3] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/shape.gd b/addons/material_maker/nodes/shape/shape.gd similarity index 100% rename from addons/material_maker/nodes/shape.gd rename to addons/material_maker/nodes/shape/shape.gd diff --git a/addons/material_maker/nodes/shape.tscn b/addons/material_maker/nodes/shape/shape.tscn similarity index 97% rename from addons/material_maker/nodes/shape.tscn rename to addons/material_maker/nodes/shape/shape.tscn index 5e80245..7526c19 100644 --- a/addons/material_maker/nodes/shape.tscn +++ b/addons/material_maker/nodes/shape/shape.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/material_maker/nodes/shape.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/shape/shape.gd" type="Script" id=1] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/switch.gd b/addons/material_maker/nodes/switch/switch.gd similarity index 100% rename from addons/material_maker/nodes/switch.gd rename to addons/material_maker/nodes/switch/switch.gd diff --git a/addons/material_maker/nodes/switch.tscn b/addons/material_maker/nodes/switch/switch.tscn similarity index 98% rename from addons/material_maker/nodes/switch.tscn rename to addons/material_maker/nodes/switch/switch.tscn index d1da2b6..c676ab2 100644 --- a/addons/material_maker/nodes/switch.tscn +++ b/addons/material_maker/nodes/switch/switch.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/material_maker/nodes/switch.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/switch/switch.gd" type="Script" id=1] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/transform.gd b/addons/material_maker/nodes/transform/transform.gd similarity index 100% rename from addons/material_maker/nodes/transform.gd rename to addons/material_maker/nodes/transform/transform.gd diff --git a/addons/material_maker/nodes/transform.tscn b/addons/material_maker/nodes/transform/transform.tscn similarity index 99% rename from addons/material_maker/nodes/transform.tscn rename to addons/material_maker/nodes/transform/transform.tscn index b193dc1..5b2e4a9 100644 --- a/addons/material_maker/nodes/transform.tscn +++ b/addons/material_maker/nodes/transform/transform.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/material_maker/nodes/transform.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/transform/transform.gd" type="Script" id=1] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/uniform.gd b/addons/material_maker/nodes/uniform/uniform.gd similarity index 100% rename from addons/material_maker/nodes/uniform.gd rename to addons/material_maker/nodes/uniform/uniform.gd diff --git a/addons/material_maker/nodes/uniform.tscn b/addons/material_maker/nodes/uniform/uniform.tscn similarity index 93% rename from addons/material_maker/nodes/uniform.tscn rename to addons/material_maker/nodes/uniform/uniform.tscn index 7baa152..f5e63a1 100644 --- a/addons/material_maker/nodes/uniform.tscn +++ b/addons/material_maker/nodes/uniform/uniform.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/material_maker/nodes/uniform.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/uniform/uniform.gd" type="Script" id=1] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/voronoi.gd b/addons/material_maker/nodes/voronoi/voronoi.gd similarity index 100% rename from addons/material_maker/nodes/voronoi.gd rename to addons/material_maker/nodes/voronoi/voronoi.gd diff --git a/addons/material_maker/nodes/voronoi.tscn b/addons/material_maker/nodes/voronoi/voronoi.tscn similarity index 98% rename from addons/material_maker/nodes/voronoi.tscn rename to addons/material_maker/nodes/voronoi/voronoi.tscn index e5e63b1..71973b2 100644 --- a/addons/material_maker/nodes/voronoi.tscn +++ b/addons/material_maker/nodes/voronoi/voronoi.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/material_maker/nodes/voronoi.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/voronoi/voronoi.gd" type="Script" id=1] + [sub_resource type="Theme" id=1] diff --git a/addons/material_maker/nodes/warp.gd b/addons/material_maker/nodes/warp/warp.gd similarity index 100% rename from addons/material_maker/nodes/warp.gd rename to addons/material_maker/nodes/warp/warp.gd diff --git a/addons/material_maker/nodes/warp.tscn b/addons/material_maker/nodes/warp/warp.tscn similarity index 96% rename from addons/material_maker/nodes/warp.tscn rename to addons/material_maker/nodes/warp/warp.tscn index 1586b07..5af5895 100644 --- a/addons/material_maker/nodes/warp.tscn +++ b/addons/material_maker/nodes/warp/warp.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/material_maker/nodes/warp.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/nodes/warp/warp.gd" type="Script" id=1] + [sub_resource type="Theme" id=1]