From 7474a95f780b42baf5afeafb456c59556772ce18 Mon Sep 17 00:00:00 2001 From: Azab4d Date: Wed, 19 Apr 2023 14:30:15 +0200 Subject: [PATCH 01/11] Adding distance math node Adding distance math node to measure the distance between two point in(X, Y) --- libraries/stdlib/stdlib_defs.mtlx | 13 +++++++++++++ libraries/stdlib/stdlib_ng.mtlx | 27 +++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx index 6922ab3317..ac257a22a2 100644 --- a/libraries/stdlib/stdlib_defs.mtlx +++ b/libraries/stdlib/stdlib_defs.mtlx @@ -2453,6 +2453,19 @@ + + + + + + + + + + diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx index 8d4046f8ae..c52d860779 100644 --- a/libraries/stdlib/stdlib_ng.mtlx +++ b/libraries/stdlib/stdlib_ng.mtlx @@ -1243,6 +1243,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + From d7817e05f4a8971a11a5b9c8106fb8b217c63086 Mon Sep 17 00:00:00 2001 From: Azab4d Date: Wed, 19 Apr 2023 15:02:09 +0200 Subject: [PATCH 02/11] Update stdlib_ng.mtlx --- libraries/stdlib/stdlib_ng.mtlx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx index c52d860779..5bb503d8af 100644 --- a/libraries/stdlib/stdlib_ng.mtlx +++ b/libraries/stdlib/stdlib_ng.mtlx @@ -1243,6 +1243,11 @@ + + From 1e1f9019ca834fcba33d5be77d70c24237ba44d0 Mon Sep 17 00:00:00 2001 From: Mostafa Azab Date: Sun, 30 Apr 2023 00:05:46 +0300 Subject: [PATCH 03/11] changing nodeGraph and inputs As change request I have changed the inputs from 4 float to 2 vec2 and creating a node graph including Magnitude. --- libraries/stdlib/stdlib_defs.mtlx | 9 +++----- libraries/stdlib/stdlib_ng.mtlx | 35 ++++++++----------------------- 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx index ac257a22a2..e18f43eb86 100644 --- a/libraries/stdlib/stdlib_defs.mtlx +++ b/libraries/stdlib/stdlib_defs.mtlx @@ -2455,17 +2455,14 @@ - - - - + + - diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx index 5bb503d8af..298312a603 100644 --- a/libraries/stdlib/stdlib_ng.mtlx +++ b/libraries/stdlib/stdlib_ng.mtlx @@ -1245,34 +1245,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + From ac0936f575314799f53cabb7cf9715b62c63111e Mon Sep 17 00:00:00 2001 From: Mostafa Azab <31315913+Cinifreak@users.noreply.github.com> Date: Sun, 14 May 2023 11:19:44 +0300 Subject: [PATCH 04/11] Unifing node name and input, adding vec3 and vec4 Changing node name from "Distance" to "distance", inputs from "input" to "input". Adding vector3 and vector4 to the node. --- libraries/stdlib/stdlib_defs.mtlx | 18 ++++++++++++++---- libraries/stdlib/stdlib_ng.mtlx | 29 ++++++++++++++++++++++++----- 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx index e18f43eb86..e035aa53aa 100644 --- a/libraries/stdlib/stdlib_defs.mtlx +++ b/libraries/stdlib/stdlib_defs.mtlx @@ -2454,13 +2454,23 @@ - - - + + + + + + + + + + + + + diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx index 298312a603..f31ca90f31 100644 --- a/libraries/stdlib/stdlib_ng.mtlx +++ b/libraries/stdlib/stdlib_ng.mtlx @@ -1244,20 +1244,39 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + - From fa77c5786aee9b16d2bd73449ac387a81ac7ba33 Mon Sep 17 00:00:00 2001 From: Mostafa Azab <31315913+Cinifreak@users.noreply.github.com> Date: Sun, 14 May 2023 11:43:58 +0300 Subject: [PATCH 05/11] fix --- libraries/stdlib/stdlib_defs.mtlx | 12 ++++++------ libraries/stdlib/stdlib_ng.mtlx | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx index e035aa53aa..3f77ba4d25 100644 --- a/libraries/stdlib/stdlib_defs.mtlx +++ b/libraries/stdlib/stdlib_defs.mtlx @@ -2459,18 +2459,18 @@ --> - - + + - - + + - - + + diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx index f31ca90f31..a896f254b7 100644 --- a/libraries/stdlib/stdlib_ng.mtlx +++ b/libraries/stdlib/stdlib_ng.mtlx @@ -1248,7 +1248,7 @@ Measures the distance between two points in (X, Y). --> - + @@ -1258,7 +1258,7 @@ - + @@ -1268,7 +1268,7 @@ - + From db161b9fcde949afb6cd9b03743b7543a5d7e09f Mon Sep 17 00:00:00 2001 From: Mostafa Azab <31315913+Cinifreak@users.noreply.github.com> Date: Sun, 14 May 2023 12:16:00 +0300 Subject: [PATCH 06/11] fixing magnitude --- libraries/stdlib/stdlib_ng.mtlx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx index a896f254b7..f31ca90f31 100644 --- a/libraries/stdlib/stdlib_ng.mtlx +++ b/libraries/stdlib/stdlib_ng.mtlx @@ -1248,7 +1248,7 @@ Measures the distance between two points in (X, Y). --> - + @@ -1258,7 +1258,7 @@ - + @@ -1268,7 +1268,7 @@ - + From 108789ebd35de43089e895c5af6fb1bd92f6597f Mon Sep 17 00:00:00 2001 From: Jonathan Stone Date: Mon, 22 May 2023 16:13:32 -0700 Subject: [PATCH 07/11] Declare distance after magnitude Signed-off-by: Jonathan Stone --- libraries/stdlib/stdlib_defs.mtlx | 40 +++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx index cba22f113b..cf6146325a 100644 --- a/libraries/stdlib/stdlib_defs.mtlx +++ b/libraries/stdlib/stdlib_defs.mtlx @@ -2201,6 +2201,26 @@ + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - From 22ad2bdd1fc7762a473184442c7558ad44208802 Mon Sep 17 00:00:00 2001 From: Jonathan Stone Date: Mon, 22 May 2023 16:15:06 -0700 Subject: [PATCH 08/11] Add newline Signed-off-by: Jonathan Stone --- libraries/stdlib/stdlib_ng.mtlx | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx index 94172f539a..39733069db 100644 --- a/libraries/stdlib/stdlib_ng.mtlx +++ b/libraries/stdlib/stdlib_ng.mtlx @@ -1325,6 +1325,7 @@ + From d757f6de09755449ba5b2070a5533d7546c72cb7 Mon Sep 17 00:00:00 2001 From: Jonathan Stone Date: Mon, 22 May 2023 16:16:47 -0700 Subject: [PATCH 09/11] List nodes in processing order Signed-off-by: Jonathan Stone --- libraries/stdlib/stdlib_ng.mtlx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx index 39733069db..f0abf8a3ed 100644 --- a/libraries/stdlib/stdlib_ng.mtlx +++ b/libraries/stdlib/stdlib_ng.mtlx @@ -1296,33 +1296,33 @@ Measures the distance between two points in (X, Y). --> - - - + + + - - - + + + - - - + + + From 57dd3c8d7e0bea5cf075a20d1ec3a87224fa099e Mon Sep 17 00:00:00 2001 From: Jonathan Stone Date: Tue, 23 May 2023 12:05:49 -0700 Subject: [PATCH 10/11] Update comment Signed-off-by: Jonathan Stone --- libraries/stdlib/stdlib_defs.mtlx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx index cf6146325a..b6f9da35b1 100644 --- a/libraries/stdlib/stdlib_defs.mtlx +++ b/libraries/stdlib/stdlib_defs.mtlx @@ -2203,7 +2203,7 @@ From 77b4e11276e47c9d23edcc15733783cd8757f0d1 Mon Sep 17 00:00:00 2001 From: Jonathan Stone Date: Tue, 23 May 2023 12:06:31 -0700 Subject: [PATCH 11/11] Update comment Signed-off-by: Jonathan Stone --- libraries/stdlib/stdlib_ng.mtlx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx index f0abf8a3ed..8618c422ab 100644 --- a/libraries/stdlib/stdlib_ng.mtlx +++ b/libraries/stdlib/stdlib_ng.mtlx @@ -1293,7 +1293,7 @@