From dcb829de344dcf0b514b721d83d03c67b7f78385 Mon Sep 17 00:00:00 2001 From: RodZill4 Date: Sat, 27 Jun 2020 10:00:14 +0200 Subject: [PATCH] Updated examples --- material_maker/examples/doc_tools.ptex | 46 ++- material_maker/examples/metal_pattern.ptex | 411 +++++++++++++-------- material_maker/examples/planet.ptex | 36 +- 3 files changed, 310 insertions(+), 183 deletions(-) diff --git a/material_maker/examples/doc_tools.ptex b/material_maker/examples/doc_tools.ptex index bfd58eacc..f2cc5342b 100644 --- a/material_maker/examples/doc_tools.ptex +++ b/material_maker/examples/doc_tools.ptex @@ -163,15 +163,15 @@ "to_port": 1 }, { - "from": "fill_to_uv", + "from": "fill_2", "from_port": 0, - "to": "@@1644", + "to": "fill_to_position", "to_port": 0 }, { - "from": "@@1644", + "from": "fill_2", "from_port": 0, - "to": "blend", + "to": "fill_to_size", "to_port": 0 } ], @@ -2237,7 +2237,8 @@ "count": 25, "rotate": 0, "scale": 0, - "select_inputs": 0 + "select_inputs": 0, + "value": 0 }, "type": "splatter" }, @@ -2464,6 +2465,7 @@ }, "parameters": { "count": 100, + "opacity": 0, "rotate": 0, "scale": 0, "select_inputs": 0 @@ -2477,7 +2479,9 @@ "y": 599.541748 }, "parameters": { + "fixed_offset": 0, "offset": 0.62, + "opacity": 0, "overlap": 1, "rotate": 45, "scale": 0.2, @@ -2497,7 +2501,8 @@ "count": 8, "rotate": 0, "scale": 0, - "select_inputs": 0 + "select_inputs": 0, + "value": 0 }, "type": "splatter" }, @@ -2590,10 +2595,10 @@ "type": "fill_to_uv" }, { - "name": "@@1644", + "name": "1644", "node_position": { - "x": 465.442322, - "y": 1070.827515 + "x": 479.442322, + "y": 1067.827515 }, "parameters": { @@ -2622,6 +2627,29 @@ ] }, "type": "shader" + }, + { + "name": "fill_to_position", + "node_position": { + "x": 239.209686, + "y": 1157.572266 + }, + "parameters": { + "axis": 0 + }, + "type": "fill_to_position" + }, + { + "name": "fill_to_size", + "node_position": { + "x": 249.209686, + "y": 1219.572266 + }, + "parameters": { + "formula": 1 + }, + "seed_value": -52887, + "type": "fill_to_size" } ], "parameters": { diff --git a/material_maker/examples/metal_pattern.ptex b/material_maker/examples/metal_pattern.ptex index 19e9e4a95..443aa20bd 100644 --- a/material_maker/examples/metal_pattern.ptex +++ b/material_maker/examples/metal_pattern.ptex @@ -1,49 +1,7 @@ { "connections": [ { - "from": "pattern_0", - "from_port": 0, - "to": "colorize_0", - "to_port": 0 - }, - { - "from": "colorize_0", - "from_port": 0, - "to": "blend_0", - "to_port": 0 - }, - { - "from": "transform_0", - "from_port": 0, - "to": "blend_0", - "to_port": 1 - }, - { - "from": "colorize_0", - "from_port": 0, - "to": "transform_0", - "to_port": 0 - }, - { - "from": "blend_0", - "from_port": 0, - "to": "transform_1", - "to_port": 0 - }, - { - "from": "transform_1", - "from_port": 0, - "to": "blend_1", - "to_port": 1 - }, - { - "from": "blend_0", - "from_port": 0, - "to": "blend_1", - "to_port": 0 - }, - { - "from": "blend_1", + "from": "graph", "from_port": 0, "to": "colorize_1", "to_port": 0 @@ -78,18 +36,6 @@ "to": "Material", "to_port": 0 }, - { - "from": "colorize_4", - "from_port": 0, - "to": "blend_2", - "to_port": 2 - }, - { - "from": "colorize_4", - "from_port": 0, - "to": "colorize_6", - "to_port": 0 - }, { "from": "colorize_6", "from_port": 0, @@ -109,7 +55,7 @@ "to_port": 0 }, { - "from": "blend_1", + "from": "graph", "from_port": 0, "to": "colorize_7", "to_port": 0 @@ -120,6 +66,30 @@ "to": "colorize_4", "to_port": 0 }, + { + "from": "colorize_4", + "from_port": 0, + "to": "blend", + "to_port": 0 + }, + { + "from": "blend", + "from_port": 0, + "to": "colorize_6", + "to_port": 0 + }, + { + "from": "blend", + "from_port": 0, + "to": "blend_2", + "to_port": 2 + }, + { + "from": "colorize_1", + "from_port": 0, + "to": "blend", + "to_port": 1 + }, { "from": "uniform_0", "from_port": 0, @@ -180,7 +150,7 @@ }, { "export_paths": { - + "Godot": "D:/Dev/Godot/illusions/floor_material" }, "name": "Material", "node_position": { @@ -221,8 +191,8 @@ { "name": "colorize_4", "node_position": { - "x": 258, - "y": -136 + "x": 93, + "y": -31 }, "parameters": { "gradient": { @@ -232,14 +202,21 @@ "a": 1, "b": 0, "g": 0, - "pos": 0.49091, + "pos": 0.354545, "r": 0 }, + { + "a": 1, + "b": 0.1875, + "g": 0.1875, + "pos": 0.47396, + "r": 0.1875 + }, { "a": 1, "b": 1, "g": 1, - "pos": 0.536364, + "pos": 0.645455, "r": 1 } ], @@ -251,8 +228,8 @@ { "name": "uniform_0", "node_position": { - "x": 233, - "y": -216 + "x": 236, + "y": -212 }, "parameters": { "color": { @@ -268,8 +245,8 @@ { "name": "colorize_7", "node_position": { - "x": -109.265503, - "y": -175 + "x": -147.265503, + "y": -170 }, "parameters": { "gradient": { @@ -286,7 +263,7 @@ "a": 1, "b": 1, "g": 1, - "pos": 0.018182, + "pos": 0.181818, "r": 1 } ], @@ -303,7 +280,7 @@ }, "parameters": { "iterations": 7, - "persistence": 0.75, + "persistence": 0.9, "scale_x": 4, "scale_y": 4 }, @@ -312,8 +289,8 @@ { "name": "colorize_6", "node_position": { - "x": 444, - "y": -66 + "x": 530, + "y": -97 }, "parameters": { "gradient": { @@ -321,10 +298,10 @@ "points": [ { "a": 1, - "b": 0.640625, - "g": 0.640625, + "b": 0.515625, + "g": 0.515625, "pos": 0, - "r": 0.640625 + "r": 0.515625 }, { "a": 1, @@ -353,7 +330,7 @@ "a": 1, "b": 0, "g": 0, - "pos": 0, + "pos": 0.418182, "r": 0 }, { @@ -396,26 +373,10 @@ "type": "blend" }, { - "name": "transform_1", + "name": "blend", "node_position": { - "x": -647, - "y": 285 - }, - "parameters": { - "repeat": true, - "rotate": 90, - "scale_x": 1, - "scale_y": 1, - "translate_x": 0.06, - "translate_y": 0 - }, - "type": "transform" - }, - { - "name": "blend_0", - "node_position": { - "x": -633, - "y": 181 + "x": 311.399109, + "y": -106.171265 }, "parameters": { "amount": 1, @@ -424,77 +385,215 @@ "type": "blend" }, { - "name": "blend_1", - "node_position": { - "x": -632, - "y": 77 - }, - "parameters": { - "amount": 1, - "blend_type": 2 - }, - "type": "blend" - }, - { - "name": "colorize_0", + "connections": [ + { + "from": "pattern_0", + "from_port": 0, + "to": "colorize_0", + "to_port": 0 + }, + { + "from": "colorize_0", + "from_port": 0, + "to": "blend_0", + "to_port": 0 + }, + { + "from": "transform_0", + "from_port": 0, + "to": "blend_0", + "to_port": 1 + }, + { + "from": "colorize_0", + "from_port": 0, + "to": "transform_0", + "to_port": 0 + }, + { + "from": "blend_0", + "from_port": 0, + "to": "transform_1", + "to_port": 0 + }, + { + "from": "transform_1", + "from_port": 0, + "to": "blend_1", + "to_port": 1 + }, + { + "from": "blend_0", + "from_port": 0, + "to": "blend_1", + "to_port": 0 + }, + { + "from": "blend_1", + "from_port": 0, + "to": "gen_outputs", + "to_port": 0 + } + ], + "label": "Pattern", + "name": "graph", "node_position": { - "x": -828, - "y": 218 - }, - "parameters": { - "gradient": { - "interpolation": 1, - "points": [ - { - "a": 1, - "b": 0, - "g": 0, - "pos": 0, - "r": 0 - }, + "x": -369.5, + "y": 78.333328 + }, + "nodes": [ + { + "name": "pattern_0", + "node_position": { + "x": -859, + "y": 120 + }, + "parameters": { + "mix": 5, + "x_scale": 8, + "x_wave": 0, + "y_scale": 8, + "y_wave": 0 + }, + "type": "pattern" + }, + { + "name": "transform_0", + "node_position": { + "x": -844, + "y": 279 + }, + "parameters": { + "repeat": true, + "rotate": 0, + "scale_x": 1, + "scale_y": 1, + "translate_x": 0.06, + "translate_y": 0.06 + }, + "type": "transform" + }, + { + "name": "colorize_0", + "node_position": { + "x": -828, + "y": 218 + }, + "parameters": { + "gradient": { + "interpolation": 1, + "points": [ + { + "a": 1, + "b": 0, + "g": 0, + "pos": 0, + "r": 0 + }, + { + "a": 1, + "b": 1, + "g": 1, + "pos": 0.045455, + "r": 1 + } + ], + "type": "Gradient" + } + }, + "type": "colorize" + }, + { + "name": "blend_1", + "node_position": { + "x": -632, + "y": 77 + }, + "parameters": { + "amount": 1, + "blend_type": 2 + }, + "type": "blend" + }, + { + "name": "blend_0", + "node_position": { + "x": -633, + "y": 181 + }, + "parameters": { + "amount": 1, + "blend_type": 2 + }, + "type": "blend" + }, + { + "name": "transform_1", + "node_position": { + "x": -647, + "y": 285 + }, + "parameters": { + "repeat": true, + "rotate": 90, + "scale_x": 1, + "scale_y": 1, + "translate_x": 0.06, + "translate_y": 0 + }, + "type": "transform" + }, + { + "name": "gen_inputs", + "node_position": { + "x": -1159, + "y": 193.333328 + }, + "parameters": { + + }, + "ports": [ + + ], + "type": "ios" + }, + { + "name": "gen_outputs", + "node_position": { + "x": -332, + "y": 193.333328 + }, + "parameters": { + + }, + "ports": [ { - "a": 1, - "b": 1, - "g": 1, - "pos": 0.045455, - "r": 1 + "name": "port0", + "type": "rgba" } ], - "type": "Gradient" + "type": "ios" + }, + { + "name": "gen_parameters", + "node_position": { + "x": -940.5, + "y": -223 + }, + "parameters": { + + }, + "type": "remote", + "widgets": [ + + ] } - }, - "type": "colorize" - }, - { - "name": "transform_0", - "node_position": { - "x": -844, - "y": 279 - }, - "parameters": { - "repeat": true, - "rotate": 0, - "scale_x": 1, - "scale_y": 1, - "translate_x": 0.06, - "translate_y": 0.06 - }, - "type": "transform" - }, - { - "name": "pattern_0", - "node_position": { - "x": -859, - "y": 120 - }, + ], "parameters": { - "mix": 5, - "x_scale": 8, - "x_wave": 0, - "y_scale": 8, - "y_wave": 0 + }, - "type": "pattern" + "seed_value": -62811, + "type": "graph" } ], "parameters": { diff --git a/material_maker/examples/planet.ptex b/material_maker/examples/planet.ptex index a52e9a7a2..42ed6d9f8 100644 --- a/material_maker/examples/planet.ptex +++ b/material_maker/examples/planet.ptex @@ -75,10 +75,13 @@ }, "nodes": [ { + "export_paths": { + + }, "name": "Material", "node_position": { - "x": 653, - "y": 157 + "x": 217, + "y": -183 }, "parameters": { "albedo_color": { @@ -88,14 +91,14 @@ "r": 1, "type": "Color" }, - "ao_light_affect": 1, - "depth_scale": 0.6, + "ao": 1, + "depth_scale": 1, "emission_energy": 1, "metallic": 0.05, - "normal_scale": 1, + "normal": 1, "roughness": 0.75, "size": 11, - "subsurf_scatter_strength": 0 + "sss": 0 }, "type": "material" }, @@ -234,17 +237,14 @@ { "name": "normal_map", "node_position": { - "x": -20.5, - "y": 273.5 + "x": -7.5, + "y": -93.5 }, "parameters": { - "amount": 0.5, "param0": 11, "param1": 0.99, "param2": 0, - "param3": 0, - "param4": 1, - "size": 4 + "param4": 1 }, "type": "normal_map" }, @@ -322,17 +322,17 @@ }, "name": "comment", "node_position": { - "x": -544.5, - "y": -395.194458 + "x": -605.5, + "y": -386.194458 }, "parameters": { - "size": 4 + }, "size": { - "x": 190, - "y": 67 + "x": 251, + "y": 54 }, - "text": "Best viewed on Sphere mesh", + "text": "Best viewed on SphereTess\n mesh", "title": "Comment", "type": "comment" }