From 4f7f090d7f0f034c438bb9ecde3c5d9f754ce91b Mon Sep 17 00:00:00 2001 From: Chris Rydalch Date: Tue, 27 Sep 2022 10:56:53 -0500 Subject: [PATCH 1/4] Adds a Unified Noise node Adds a unified noise node, for artists to have a single noise node they can create, which unifies common controls (such as frequency and offset). A common complaint we hear from artists, is the MaterialX noises are so bare, they are missing the very basics of frequency/offset, and even some post-processing, which requires creating all sorts of nodes. The fractal controls are unique to that particular noise type, so an artist tool would probably hide those parameters when the noise type is not set to fractal. Jitter is treated as a common control; it behaves like jitter does on the standard worley noise, and for the non-Worley noises it scrambles the input. --- libraries/stdlib/stdlib_defs.mtlx | 53 ++++++++++++ libraries/stdlib/stdlib_ng.mtlx | 137 ++++++++++++++++++++++++++++++ 2 files changed, 190 insertions(+) diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx index 000344868c..365b12d203 100644 --- a/libraries/stdlib/stdlib_defs.mtlx +++ b/libraries/stdlib/stdlib_defs.mtlx @@ -973,6 +973,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx index 8ba5f070e7..f92a487060 100644 --- a/libraries/stdlib/stdlib_ng.mtlx +++ b/libraries/stdlib/stdlib_ng.mtlx @@ -1026,6 +1026,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 835ac7b6ebf3c8a3cc487c97e7bc65c53d77833c Mon Sep 17 00:00:00 2001 From: Chris Rydalch Date: Mon, 3 Oct 2022 14:17:38 -0500 Subject: [PATCH 2/4] Unified Noise: Removed unused values from connected inputs in the nodegraph. --- libraries/stdlib/stdlib_ng.mtlx | 114 ++++++++++++++++---------------- 1 file changed, 56 insertions(+), 58 deletions(-) diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx index f92a487060..595e058135 100644 --- a/libraries/stdlib/stdlib_ng.mtlx +++ b/libraries/stdlib/stdlib_ng.mtlx @@ -1033,68 +1033,67 @@ --> - - - - - + + + + + - - - - - - + + + + + - + - + - - + + - - - - + + + + - - + + - - + + - - - + + + - + - - + + - + - + @@ -1105,61 +1104,60 @@ --> - - - - - + + + + + - - - - - - + + + + + - + - + - - + + - - - - + + + + - - + + - - + + - + - - + + - + From dbd6295d1c26bd20ae7e7e01c9b2e848787b6689 Mon Sep 17 00:00:00 2001 From: Chris Rydalch Date: Fri, 7 Oct 2022 16:49:01 -0500 Subject: [PATCH 3/4] Unified Noise: added doc strings, removed gamma parameter, 'Noise' option renamed to 'Perlin', 2d input defaults to UV0, and 3d input defaults to Pobject --- libraries/stdlib/stdlib_defs.mtlx | 46 +++++++++++++++---------------- libraries/stdlib/stdlib_ng.mtlx | 28 ++++++++++++++++--- 2 files changed, 46 insertions(+), 28 deletions(-) diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx index 365b12d203..dde1a39019 100644 --- a/libraries/stdlib/stdlib_defs.mtlx +++ b/libraries/stdlib/stdlib_defs.mtlx @@ -991,18 +991,17 @@ The output is 1 channel, with controls to adjust the output range. --> - - - - - - - - - - - - + + + + + + + + + + + @@ -1011,18 +1010,17 @@ The 3d flavor of . --> - - - - - - - - - - - - + + + + + + + + + + + diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx index 595e058135..c650a39363 100644 --- a/libraries/stdlib/stdlib_ng.mtlx +++ b/libraries/stdlib/stdlib_ng.mtlx @@ -1032,16 +1032,26 @@ Combined 2d noises for artists. --> + + + + + + + + + + + + - - @@ -1103,16 +1113,26 @@ Combined 3d noises for artists. --> + + + + + + + + + + + + - - From e580e8d8dc1585e217140af8c909ba660bce6d96 Mon Sep 17 00:00:00 2001 From: Chris Rydalch Date: Tue, 11 Oct 2022 15:03:06 -0500 Subject: [PATCH 4/4] Unified Noise: Fixes vector3 input types on 3d version of node, and fixes doc comment in nodedef doc. --- libraries/stdlib/stdlib_defs.mtlx | 2 +- libraries/stdlib/stdlib_ng.mtlx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx index dde1a39019..4564df9c6c 100644 --- a/libraries/stdlib/stdlib_defs.mtlx +++ b/libraries/stdlib/stdlib_defs.mtlx @@ -983,7 +983,7 @@ The noise types are: - 0 - Noise (noise2d/noise3d) + 0 - Perlin (noise2d/noise3d) 1 - Cell (cellnoise2d/cellnoise3d) 2 - Worley (worley2d/worley3d) 3 - Fractal (fractal3d) diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx index c650a39363..dbb976c873 100644 --- a/libraries/stdlib/stdlib_ng.mtlx +++ b/libraries/stdlib/stdlib_ng.mtlx @@ -1113,9 +1113,9 @@ Combined 3d noises for artists. --> - - - + + +