From fd8328700029004be5a05714a8566e3dda5e9118 Mon Sep 17 00:00:00 2001 From: RodZill4 Date: Fri, 3 Apr 2020 08:03:51 +0200 Subject: [PATCH] Fixed truchet nodes (broken by seed related changes) --- addons/material_maker/nodes/truchet.mmg | 10 ++++------ addons/material_maker/nodes/truchet_generic.mmg | 8 +++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/addons/material_maker/nodes/truchet.mmg b/addons/material_maker/nodes/truchet.mmg index d63a5d1..6802153 100644 --- a/addons/material_maker/nodes/truchet.mmg +++ b/addons/material_maker/nodes/truchet.mmg @@ -5,10 +5,8 @@ "y": 0 }, "parameters": { - "Size": 4, "shape": 1, - "size": 4, - "type": 1 + "size": 4 }, "shader_model": { "code": "", @@ -20,7 +18,7 @@ "name": "Truchet", "outputs": [ { - "f": "truchet$shape($uv*$size, vec2($seed, $seed))", + "f": "truchet$shape($uv*$size, vec2(float($seed)))", "type": "f" } ], @@ -42,14 +40,14 @@ ] }, { + "control": "None", "default": 4, "label": "Size", "max": 64, "min": 2, "name": "size", "step": 1, - "type": "float", - "widget": "spinbox" + "type": "float" } ] }, diff --git a/addons/material_maker/nodes/truchet_generic.mmg b/addons/material_maker/nodes/truchet_generic.mmg index 1bbd527..c529ea8 100644 --- a/addons/material_maker/nodes/truchet_generic.mmg +++ b/addons/material_maker/nodes/truchet_generic.mmg @@ -5,10 +5,7 @@ "y": 0 }, "parameters": { - "Size": 4, - "shape": 0, - "size": 6, - "type": 1 + "size": 6 }, "shader_model": { "code": "", @@ -25,12 +22,13 @@ "name": "Generic Truchet", "outputs": [ { - "rgba": "$in(truchet_generic_uv($uv*$size, vec2($seed, $seed)))", + "rgba": "$in(truchet_generic_uv($uv*$size, vec2(float($seed))))", "type": "rgba" } ], "parameters": [ { + "control": "None", "default": 4, "label": "Size", "max": 64,