diff --git a/addons/material_maker/nodes/mwf_mix.mmg b/addons/material_maker/nodes/mwf_mix.mmg index d79f25e..28f3341 100644 --- a/addons/material_maker/nodes/mwf_mix.mmg +++ b/addons/material_maker/nodes/mwf_mix.mmg @@ -73,7 +73,7 @@ } ], "instance": "", - "name": "MWF Mix", + "name": "Mix", "outputs": [ { "f": "max($h1($uv), $h2($uv))", diff --git a/addons/material_maker/nodes/mwf_mix_maps.mmg b/addons/material_maker/nodes/mwf_mix_maps.mmg new file mode 100644 index 0000000..44d99c9 --- /dev/null +++ b/addons/material_maker/nodes/mwf_mix_maps.mmg @@ -0,0 +1,53 @@ +{ + "name": "mwf_mix_maps", + "node_position": { + "x": 0, + "y": 0 + }, + "parameters": { + "angle": 45, + "height": 0.8 + }, + "shader_model": { + "code": "", + "global": "vec3 matmap_mix(vec3 in1, vec3 in2) {\n\tfloat is_in1 = step(in2.x, in1.x);\n\t//return vec3(max(in1.x, in2.x), in1.yz*is_in1+in2.yz*(1.0-is_in1));\n\treturn vec3(max(in1.x, in2.x), mix(in2.yz, in1.yz, is_in1));\n}", + "inputs": [ + { + "default": "vec3(0.0)", + "label": "", + "name": "in1", + "type": "rgb" + }, + { + "default": "vec3(0.0)", + "label": "", + "name": "in2", + "type": "rgb" + }, + { + "default": "vec3(0.0)", + "label": "", + "name": "in3", + "type": "rgb" + }, + { + "default": "vec3(0.0)", + "label": "", + "name": "in4", + "type": "rgb" + } + ], + "instance": "", + "name": "Mix maps", + "outputs": [ + { + "rgb": "matmap_mix(matmap_mix($in1($uv), $in2($uv)), matmap_mix($in3($uv), $in4($uv)))", + "type": "rgb" + } + ], + "parameters": [ + + ] + }, + "type": "shader" +} \ No newline at end of file diff --git a/addons/material_maker/nodes/mwf_output.mmg b/addons/material_maker/nodes/mwf_output.mmg index 491c764..128addb 100644 --- a/addons/material_maker/nodes/mwf_output.mmg +++ b/addons/material_maker/nodes/mwf_output.mmg @@ -85,7 +85,7 @@ "to_port": 0 } ], - "label": "Map Output", + "label": "Output", "name": "mwf_output", "node_position": { "x": 0,