diff --git a/addons/material_maker/nodes/circle_map.mmg b/addons/material_maker/nodes/circle_map.mmg index 8ca24e3ff..b35ed7c5a 100644 --- a/addons/material_maker/nodes/circle_map.mmg +++ b/addons/material_maker/nodes/circle_map.mmg @@ -17,8 +17,8 @@ "default": "vec4($uv, 0.0, 1.0)", "label": "", "longdesc": "The input image to be remapped", - "name": "in", - "shortdesc": "Input", + "name": "in#", + "shortdesc": "Input#", "type": "rgba" } ], @@ -28,7 +28,7 @@ "outputs": [ { "longdesc": "Shows the remapped image", - "rgba": "$in(vec2(fract($repeat*atan($uv.y-0.5, $uv.x-0.5)*0.15915494309), min(0.99999, 2.0/$radius*length($uv-vec2(0.5)))))", + "rgba": "$in#(vec2(fract($repeat*atan($uv.y-0.5, $uv.x-0.5)*0.15915494309), min(0.99999, 2.0/$radius*length($uv-vec2(0.5)))))", "shortdesc": "Output", "type": "rgba" } diff --git a/addons/material_maker/nodes/kaleidoscope.mmg b/addons/material_maker/nodes/kaleidoscope.mmg index fcd971324..76a4e1cb2 100644 --- a/addons/material_maker/nodes/kaleidoscope.mmg +++ b/addons/material_maker/nodes/kaleidoscope.mmg @@ -31,8 +31,8 @@ "function": true, "label": "", "longdesc": "The input image", - "name": "i", - "shortdesc": "Input", + "name": "i#", + "shortdesc": "Input#", "type": "rgba" } ], @@ -42,7 +42,7 @@ "outputs": [ { "longdesc": "Shows the transformed image", - "rgba": "$i.variation($(name_uv)_kal.xy, $variations ? $(name_uv)_kal.z : 0.0)", + "rgba": "$i#.variation($(name_uv)_kal.xy, $variations ? $(name_uv)_kal.z : 0.0)", "shortdesc": "Output", "type": "rgba" } diff --git a/addons/material_maker/nodes/mirror.mmg b/addons/material_maker/nodes/mirror.mmg index 19625fc0f..056c46f39 100644 --- a/addons/material_maker/nodes/mirror.mmg +++ b/addons/material_maker/nodes/mirror.mmg @@ -26,8 +26,8 @@ "default": "vec4($uv, 0, 1)", "label": "", "longdesc": "The input image", - "name": "i", - "shortdesc": "Input", + "name": "i#", + "shortdesc": "Input#", "type": "rgba" } ], @@ -37,8 +37,8 @@ "outputs": [ { "longdesc": "Shows the mirrored image", - "rgba": "$i(uvmirror_$direction($uv, $offset, $flip_sides ? -1.0 : 1.0))", - "shortdesc": "Output", + "rgba": "$i#(uvmirror_$direction($uv, $offset, $flip_sides ? -1.0 : 1.0))", + "shortdesc": "Output#", "type": "rgba" } ], diff --git a/addons/material_maker/nodes/quantize.mmg b/addons/material_maker/nodes/quantize.mmg index f962b4dc4..1b6595ccc 100644 --- a/addons/material_maker/nodes/quantize.mmg +++ b/addons/material_maker/nodes/quantize.mmg @@ -16,8 +16,8 @@ "default": "vec4(2.0*vec3(length($uv-vec2(0.5))), 1.0)", "label": "", "longdesc": "The input image", - "name": "in", - "shortdesc": "Input", + "name": "in#", + "shortdesc": "Input#", "type": "rgba" } ], @@ -27,8 +27,8 @@ "outputs": [ { "longdesc": "The quantized image", - "rgba": "vec4(floor($in($uv).rgb*$steps)/$steps, $in($uv).a)", - "shortdesc": "Output", + "rgba": "vec4(floor($in#($uv).rgb*$steps)/$steps, $in#($uv).a)", + "shortdesc": "Output#", "type": "rgba" } ], diff --git a/addons/material_maker/nodes/shear.mmg b/addons/material_maker/nodes/shear.mmg index aa26ee952..b65bdd41b 100644 --- a/addons/material_maker/nodes/shear.mmg +++ b/addons/material_maker/nodes/shear.mmg @@ -18,8 +18,8 @@ "default": "vec4(1.0)", "label": "", "longdesc": "The input image", - "name": "in", - "shortdesc": "Input", + "name": "in#", + "shortdesc": "Input#", "type": "rgba" } ], @@ -29,8 +29,8 @@ "outputs": [ { "longdesc": "Shows the transformed image", - "rgba": "$in($uv+$amount*($uv.yx-vec2($center))*vec2($direction))", - "shortdesc": "Output", + "rgba": "$in#($uv+$amount*($uv.yx-vec2($center))*vec2($direction))", + "shortdesc": "Output#", "type": "rgba" } ], diff --git a/addons/material_maker/nodes/swirl.mmg b/addons/material_maker/nodes/swirl.mmg index 30a5a0aff..85340668e 100644 --- a/addons/material_maker/nodes/swirl.mmg +++ b/addons/material_maker/nodes/swirl.mmg @@ -43,8 +43,8 @@ "default": "vec4($uv, 0.0, 1.0)", "label": "", "longdesc": "The input image", - "name": "i", - "shortdesc": "Input", + "name": "i#", + "shortdesc": "Input#", "type": "rgba" } ], @@ -54,8 +54,8 @@ "outputs": [ { "longdesc": "Shows the swirled image", - "rgba": "$i(swirl_tile_$tile($uv, vec2(0.5+$cx, 0.5+$cy), $radius, $angle*0.01745329251))", - "shortdesc": "Output", + "rgba": "$i#(swirl_tile_$tile($uv, vec2(0.5+$cx, 0.5+$cy), $radius, $angle*0.01745329251))", + "shortdesc": "Output#", "type": "rgba" } ], diff --git a/addons/material_maker/nodes/tonality.mmg b/addons/material_maker/nodes/tonality.mmg index bca6b1c56..c365d50e9 100644 --- a/addons/material_maker/nodes/tonality.mmg +++ b/addons/material_maker/nodes/tonality.mmg @@ -32,8 +32,8 @@ "default": "$uv.x", "label": "", "longdesc": "The input greyscale image", - "name": "input", - "shortdesc": "Input", + "name": "input#", + "shortdesc": "Input#", "type": "f" } ], @@ -42,9 +42,9 @@ "name": "Tonality", "outputs": [ { - "f": "$curve($input($uv))", + "f": "$curve($input#($uv))", "longdesc": "The remapped greyscale image", - "shortdesc": "Output", + "shortdesc": "Output#", "type": "f" } ], diff --git a/addons/material_maker/nodes/warp.mmg b/addons/material_maker/nodes/warp.mmg index 41fa0c8b3..0645b6f0a 100644 --- a/addons/material_maker/nodes/warp.mmg +++ b/addons/material_maker/nodes/warp.mmg @@ -21,8 +21,8 @@ "default": "vec4(sin($uv.x*20.0)*0.5+0.5, sin($uv.y*20.0)*0.5+0.5, 0, 1)", "label": "", "longdesc": "The input image to be warped", - "name": "in", - "shortdesc": "Input", + "name": "in#", + "shortdesc": "Input#", "type": "rgba" }, { @@ -45,8 +45,8 @@ "outputs": [ { "longdesc": "Shows the warped image", - "rgba": "$in($uv+$amount*$(name_uv)_warp)", - "shortdesc": "Output", + "rgba": "$in#($uv+$amount*$(name_uv)_warp)", + "shortdesc": "Output#", "type": "rgba" } ], diff --git a/material_maker/doc/node_filter_quantize.rst b/material_maker/doc/node_filter_quantize.rst index 2ff2c88cf..f1b185f03 100644 --- a/material_maker/doc/node_filter_quantize.rst +++ b/material_maker/doc/node_filter_quantize.rst @@ -9,12 +9,12 @@ The **Quantize** node approximates the colors of the input image. Inputs ++++++ -The **Quantize** node accepts an RGBA input texture. +The **Quantize** node accepts one or more RGBA input textures. Outputs +++++++ -The **Quantize** node provides a single RGBA texture. +The **Quantize** node outputs RGBA textures. Parameters ++++++++++ diff --git a/material_maker/doc/node_filter_tonality.rst b/material_maker/doc/node_filter_tonality.rst index 11e431a98..7e4aa5a74 100644 --- a/material_maker/doc/node_filter_tonality.rst +++ b/material_maker/doc/node_filter_tonality.rst @@ -1,7 +1,7 @@ Tonality node ~~~~~~~~~~~~~ -The **Tonality** node applies a user-defined curve to a greyscale image. +The **Tonality** node is variadic and applies a user-defined curve to greyscale images. .. image:: images/node_filter_tonality.png :align: center @@ -9,12 +9,12 @@ The **Tonality** node applies a user-defined curve to a greyscale image. Inputs ++++++ -The **Tonality** node requires a greyscale input texture. +The **Tonality** node accepts one or more greyscale input textures. Outputs +++++++ -The **Tonality** node provides a single greyscale texture. +The **Tonality** node outputs greyscale textures. Parameters ++++++++++ diff --git a/material_maker/doc/node_transform_circlemap.rst b/material_maker/doc/node_transform_circlemap.rst index 75e0e12b2..9263b5185 100644 --- a/material_maker/doc/node_transform_circlemap.rst +++ b/material_maker/doc/node_transform_circlemap.rst @@ -1,7 +1,7 @@ Circle Map node ~~~~~~~~~~~~~~~ -The **Circle Map** node maps an input image in a circle into the output. +The **Circle Map** node is variadic and map input images in a circle into the outputs. .. image:: images/node_transform_circlemap.png :align: center @@ -9,12 +9,12 @@ The **Circle Map** node maps an input image in a circle into the output. Inputs ++++++ -The **Circle Map** node accepts a single RGBA input. +The **Circle Map** node accepts one or more RGBA inputs. Outputs +++++++ -The **Circle Map** node outputs the deformed image. +The **Circle Map** node outputs the deformed images. Parameters ++++++++++ diff --git a/material_maker/doc/node_transform_kaleidoscope.rst b/material_maker/doc/node_transform_kaleidoscope.rst index 7c8bf7e0d..187c44945 100644 --- a/material_maker/doc/node_transform_kaleidoscope.rst +++ b/material_maker/doc/node_transform_kaleidoscope.rst @@ -1,8 +1,8 @@ Kaleidoscope node ~~~~~~~~~~~~~~~~~ -The **Kaleidoscope** node applies a kaleidoscope effect, i.e. copies an angle (by default the -upper one) all around the image to its input. +The **Kaleidoscope** node is variadic and applies a kaleidoscope effect, i.e. copies +an angle (by default the upper one) all around the image to its inputs. .. image:: images/node_transform_kaleidoscope.png :align: center @@ -10,12 +10,12 @@ upper one) all around the image to its input. Inputs ++++++ -The **Kaleidoscope** node accepts a single RGBA input. +The **Kaleidoscope** node accepts one or more RGBA inputs. Outputs +++++++ -The **Kaleidoscope** node outputs the result as RGBA. +The **Kaleidoscope** node outputs the results as RGBA. Parameters ++++++++++ diff --git a/material_maker/doc/node_transform_mirror.rst b/material_maker/doc/node_transform_mirror.rst index 57e57b604..00ee08114 100644 --- a/material_maker/doc/node_transform_mirror.rst +++ b/material_maker/doc/node_transform_mirror.rst @@ -1,7 +1,7 @@ Mirror node ~~~~~~~~~~~ -The **Mirror** node applies a mirror filter on its input. +The **Mirror** node is variadic and applies a mirror filter on its inputs. .. image:: images/node_transform_mirror.png :align: center @@ -9,12 +9,12 @@ The **Mirror** node applies a mirror filter on its input. Inputs ++++++ -The **Mirror** node accepts a single RGBA input. +The **Mirror** node accepts one or more RGBA inputs. Outputs +++++++ -The **Mirror** node outputs the mirrored image as RGBA. +The **Mirror** node outputs the mirrored images as RGBA. Parameters ++++++++++ diff --git a/material_maker/doc/node_transform_shear.rst b/material_maker/doc/node_transform_shear.rst index 8219fbd44..3ec993fe0 100644 --- a/material_maker/doc/node_transform_shear.rst +++ b/material_maker/doc/node_transform_shear.rst @@ -1,7 +1,7 @@ Shear node ~~~~~~~~~~ -The **Shear** node bends its input along te X or Y axis. +The **Shear** node is variadic and bends inputs along te X or Y axis. .. image:: images/node_transform_shear.png :align: center @@ -9,12 +9,12 @@ The **Shear** node bends its input along te X or Y axis. Inputs ++++++ -The **Shear** node accepts a single RGBA input. +The **Shear** node accepts one or more RGBA inputs. Outputs +++++++ -The **Shear** node outputs the shear stressed image as RGBA. +The **Shear** node outputs the shear stressed images as RGBA. Parameters ++++++++++ diff --git a/material_maker/doc/node_transform_swirl.rst b/material_maker/doc/node_transform_swirl.rst index 225154ea2..252881ab3 100644 --- a/material_maker/doc/node_transform_swirl.rst +++ b/material_maker/doc/node_transform_swirl.rst @@ -1,7 +1,7 @@ Swirl node ~~~~~~~~~~ -The **Swirl** node applies a swirl effect on its input. +The **Swirl** node is variadic and applies a swirl effect on its inputs. .. image:: images/node_transform_swirl.png :align: center @@ -9,12 +9,12 @@ The **Swirl** node applies a swirl effect on its input. Inputs ++++++ -The **Swirl** node accepts a single RGBA input, interpreted as a heightmap. +The **Swirl** node accepts one or more RGBA inputs, interpreted as a heightmap. Outputs +++++++ -The **Swirl** node outputs the transformed image as RGBA. +The **Swirl** node outputs the transformed images as RGBA. Parameters ++++++++++ diff --git a/material_maker/doc/node_transform_warp.rst b/material_maker/doc/node_transform_warp.rst index 12618a96d..fe97a2031 100644 --- a/material_maker/doc/node_transform_warp.rst +++ b/material_maker/doc/node_transform_warp.rst @@ -1,7 +1,8 @@ Warp node ~~~~~~~~~ -The **Warp** node deforms an input image according to the derivative of the second input image. +The **Warp** node is variadic and deform one or more input images according to the +derivative of a greyscale image. .. image:: images/node_transform_warp.png :align: center @@ -11,7 +12,7 @@ Inputs The **Warp** node accepts two inputs: -* The *Source* inputs is the image to be deformed. +* The *Source* input is the image to be deformed. * The *Displace* input is a greyscale image whose derivative will be used to deform the source.