From a5119c743c395e9390280906b7feedfa9c4cb525 Mon Sep 17 00:00:00 2001
From: Frieder Erdmann <frieder.erdmann@gmail.com>
Date: Thu, 5 Oct 2023 17:29:43 +0200
Subject: [PATCH] renamed node to creatematrix added signature for vector4

---
 .../stdlib/genglsl/mx_combine_v3_m3.glsl      |  6 -----
 libraries/stdlib/genglsl/mx_creatematrix.glsl | 14 ++++++++++++
 .../stdlib/genglsl/stdlib_genglsl_impl.mtlx   |  8 ++++---
 .../stdlib/genmdl/stdlib_genmdl_impl.mtlx     |  5 +++--
 .../stdlib/genmsl/stdlib_genmsl_impl.mtlx     |  5 +++--
 libraries/stdlib/genosl/mx_combine_v3_m3.osl  |  9 --------
 libraries/stdlib/genosl/mx_creatematrix.osl   | 17 ++++++++++++++
 .../stdlib/genosl/stdlib_genosl_impl.mtlx     |  5 +++--
 libraries/stdlib/stdlib_defs.mtlx             | 12 ++++++++--
 .../TestSuite/stdlib/channel/matrix.mtlx      |  6 ++---
 .../MaterialXGenMdl/mdl/materialx/stdlib.mdl  | 22 +++++++++++++++----
 11 files changed, 76 insertions(+), 33 deletions(-)
 delete mode 100644 libraries/stdlib/genglsl/mx_combine_v3_m3.glsl
 create mode 100644 libraries/stdlib/genglsl/mx_creatematrix.glsl
 delete mode 100644 libraries/stdlib/genosl/mx_combine_v3_m3.osl
 create mode 100644 libraries/stdlib/genosl/mx_creatematrix.osl

diff --git a/libraries/stdlib/genglsl/mx_combine_v3_m3.glsl b/libraries/stdlib/genglsl/mx_combine_v3_m3.glsl
deleted file mode 100644
index ecc4900886..0000000000
--- a/libraries/stdlib/genglsl/mx_combine_v3_m3.glsl
+++ /dev/null
@@ -1,6 +0,0 @@
-void mx_combine_v3_m3(vec3 in1, vec3 in2, vec3 in3, out mat3 result)
-{
-    result = mat3(in1.x, in1.y, in1.z,
-                in2.x, in2.y, in2.z,
-                in3.x, in3.y, in3.z);
-}
\ No newline at end of file
diff --git a/libraries/stdlib/genglsl/mx_creatematrix.glsl b/libraries/stdlib/genglsl/mx_creatematrix.glsl
new file mode 100644
index 0000000000..7dc7317201
--- /dev/null
+++ b/libraries/stdlib/genglsl/mx_creatematrix.glsl
@@ -0,0 +1,14 @@
+void mx_creatematrix_vector3(vec3 in1, vec3 in2, vec3 in3, out mat3 result)
+{
+    result = mat3(in1.x, in1.y, in1.z,
+                in2.x, in2.y, in2.z,
+                in3.x, in3.y, in3.z);
+}
+
+void mx_creatematrix_vector4(vec4 in1, vec4 in2, vec4 in3, vec4 in4, out mat4 result)
+{
+    result = mat4(in1.x, in1.y, in1.z, in1.w,
+                  in2.x, in2.y, in2.z, in2.w,
+                  in3.x, in3.y, in3.z, in3.w,
+                  in4.x, in4.y, in4.z, in4.w);
+}
\ No newline at end of file
diff --git a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
index 00e0677eaa..555dbd4c81 100644
--- a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
+++ b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
@@ -753,9 +753,11 @@
   <implementation name="IM_combine4_color4_genglsl" nodedef="ND_combine4_color4" target="genglsl" />
   <implementation name="IM_combine4_vector4_genglsl" nodedef="ND_combine4_vector4" target="genglsl" />
 
-  
-  <!-- <combine_v_m> -->
-  <implementation name="IM_combine_v3_matrix33_genmdl" nodedef="ND_combine_v3_matrix33" file="mx_combine_v3_m3.glsl" function="mx_combine_v3_m3" target="genglsl" />
+
+  <!-- <creatematrix> -->
+  <implementation name="IM_creatematrix_vector3_genglsl" nodedef="ND_creatematrix_vector3" file="mx_creatematrix.glsl" function="mx_creatematrix_vector3" target="genglsl" />
+  <implementation name="IM_creatematrix_vector4_genglsl" nodedef="ND_creatematrix_vector4" file="mx_creatematrix.glsl" function="mx_creatematrix_vector4" target="genglsl" />
+
 
   <!-- ======================================================================== -->
   <!-- Convolution nodes                                                        -->
diff --git a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
index 991e35f953..11424f0cbf 100644
--- a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
+++ b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
@@ -759,8 +759,9 @@
   <implementation name="IM_combine4_color4_genmdl" nodedef="ND_combine4_color4" target="genmdl" />
   <implementation name="IM_combine4_vector4_genmdl" nodedef="ND_combine4_vector4" target="genmdl" />
 
-  <!-- <combine_v_m> -->
-  <implementation name="IM_combine_v3_matrix33_genmdl" nodedef="ND_combine_v3_matrix33" sourcecode="mx::stdlib::mx_combine_v3_matrix33({{in1}}, {{in2}}, {{in3}}, {{result}})" target="genmdl" />
+  <!-- <creatematrix> -->
+  <implementation name="IM_creatematrix_vector3_genmdl" nodedef="ND_creatematrix_vector3" sourcecode="mx::stdlib::mx_creatematrix_vector3({{in1}}, {{in2}}, {{in3}}, {{result}})" target="genmdl" />
+  <implementation name="IM_creatematrix_vector4_genmdl" nodedef="ND_creatematrix_vector4" sourcecode="mx::stdlib::mx_creatematrix_vector4({{in1}}, {{in2}}, {{in3}}, {{in4}}, {{result}})" target="genmdl" />
 
   <!-- ======================================================================== -->
   <!-- Convolution nodes                                                        -->
diff --git a/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx b/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
index 6623f90df1..c7aea7f638 100644
--- a/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
+++ b/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
@@ -753,8 +753,9 @@
   <implementation name="IM_combine4_color4_genmsl" nodedef="ND_combine4_color4" target="genmsl" />
   <implementation name="IM_combine4_vector4_genmsl" nodedef="ND_combine4_vector4" target="genmsl" />
 
-  <!-- <combine_v_m> -->
-  <implementation name="IM_combine_v3_matrix33_genmsl" nodedef="ND_combine_v3_matrix33" file="../genglsl/mx_combine_v3_m3.glsl" function="mx_combine_v3_m3" nodegroup="genmsl" />
+  <!-- <creatematrix> -->
+  <implementation name="IM_creatematrix_vector3_genmsl" nodedef="ND_creatematrix_vector3" file="../genglsl/mx_creatematrix.glsl" function="mx_creatematrix_vector3" nodegroup="genmsl" />
+  <implementation name="IM_creatematrix_vector4_genmsl" nodedef="ND_creatematrix_vector4" file="../genglsl/mx_creatematrix.glsl" function="mx_creatematrix_vector4" nodegroup="genmsl" />
 
   <!-- ======================================================================== -->
   <!-- Convolution nodes                                                        -->
diff --git a/libraries/stdlib/genosl/mx_combine_v3_m3.osl b/libraries/stdlib/genosl/mx_combine_v3_m3.osl
deleted file mode 100644
index 566528ffed..0000000000
--- a/libraries/stdlib/genosl/mx_combine_v3_m3.osl
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "lib/matrix33.h"
-
-void mx_combine_v3_m3(vector in1, vector in2, vector in3, out matrix33 result)
-{
-    result = matrix33.matrix44To33(matrix(in1.x, in1.y, in1.z,  0.0,
-                                      in2.x, in2.y, in2.z,  0.0,
-                                      in3.x, in3.y, in3.z,  0.0,
-                                      0.0, 0.0, 0.0,  0.0));
-}
\ No newline at end of file
diff --git a/libraries/stdlib/genosl/mx_creatematrix.osl b/libraries/stdlib/genosl/mx_creatematrix.osl
new file mode 100644
index 0000000000..b15b18673c
--- /dev/null
+++ b/libraries/stdlib/genosl/mx_creatematrix.osl
@@ -0,0 +1,17 @@
+#include "lib/matrix33.h"
+
+void mx_creatematrix_vector3(vector in1, vector in2, vector in3, out matrix33 result)
+{
+    result = matrix33.matrix44To33(matrix(in1.x, in1.y, in1.z,  0.0,
+                                      in2.x, in2.y, in2.z,  0.0,
+                                      in3.x, in3.y, in3.z,  0.0,
+                                      0.0, 0.0, 0.0,  0.0));
+}
+
+void mx_creatematrix_vector4(vector4 in1, vector4 in2, vector4 in3, vector4 in4, out matrix result)
+{
+    result = matrix(in1.x, in1.y, in1.z,  in1.w,
+                    in2.x, in2.y, in2.z,  in2.w,
+                    in3.x, in3.y, in3.z,  in3.w,
+                    in4.x, in4.y, in4.z,  in4.w);
+}
\ No newline at end of file
diff --git a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
index 439e5febee..760897a249 100644
--- a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
+++ b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
@@ -756,8 +756,9 @@
   <implementation name="IM_combine4_color4_genosl" nodedef="ND_combine4_color4" target="genosl" />
   <implementation name="IM_combine4_vector4_genosl" nodedef="ND_combine4_vector4" target="genosl" />
 
-  <!-- <combine_v_m> -->
-  <implementation name="IM_combine_v3_matrix33_genosl" nodedef="ND_combine_v3_matrix33" file="mx_combine_v3_m3.osl" function="mx_combine_v3_m3" nodegroup="genosl" />
+  <!-- <creatematrix> -->
+  <implementation name="IM_creatematrix_vector3_genosl" nodedef="ND_creatematrix_vector3" file="mx_creatematrix.osl" function="mx_creatematrix_vector3" nodegroup="genosl" />
+  <implementation name="IM_creatematrix_vector4_genosl" nodedef="ND_creatematrix_vector4" file="mx_creatematrix.osl" function="mx_creatematrix_vector4" nodegroup="genosl" />
 
   <!-- ======================================================================== -->
   <!-- Convolution nodes                                                        -->
diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx
index 6013db0006..5ecb7f1a8a 100644
--- a/libraries/stdlib/stdlib_defs.mtlx
+++ b/libraries/stdlib/stdlib_defs.mtlx
@@ -4360,16 +4360,24 @@
   </nodedef>
 
   <!--
-    Node <combine_v3>
+    Node <creatematrix>
     Combine the the three vectors3 from stream into a matrix 33.
   -->
-  <nodedef name="ND_combine_v3_matrix33" node="combine_v3" nodegroup="channel">
+  <nodedef name="ND_creatematrix_vector3" node="creatematrix" nodegroup="math">
     <input name="in1" type="vector3" value="1.0, 0.0, 0.0" />
     <input name="in2" type="vector3" value="0.0, 1.0, 0.0" />
     <input name="in3" type="vector3" value="0.0, 0.0, 1.0" />
     <output name="result" type="matrix33" default="1.0, 0.0, 0.0,  0.0, 1.0, 0.0,  0.0, 0.0, 1.0" />
   </nodedef>
 
+  <nodedef name="ND_creatematrix_vector4" node="creatematrix" nodegroup="math">
+    <input name="in1" type="vector4" value="1.0, 0.0, 0.0, 0.0" />
+    <input name="in2" type="vector4" value="0.0, 1.0, 0.0, 0.0" />
+    <input name="in3" type="vector4" value="0.0, 0.0, 1.0, 0.0" />
+    <input name="in4" type="vector4" value="0.0, 0.0, 0.0, 1.0" />
+    <output name="result" type="matrix44" default="1.0, 0.0, 0.0, 0.0,  0.0, 1.0, 0.0, 0.0,  0.0, 0.0, 1.0, 0.0,  1.0, 0.0, 0.0, 0.0" />
+  </nodedef>
+
 
   <!--
     Node: <extract> Supplemental Node
diff --git a/resources/Materials/TestSuite/stdlib/channel/matrix.mtlx b/resources/Materials/TestSuite/stdlib/channel/matrix.mtlx
index 8678d0ab3e..9d004beaaf 100644
--- a/resources/Materials/TestSuite/stdlib/channel/matrix.mtlx
+++ b/resources/Materials/TestSuite/stdlib/channel/matrix.mtlx
@@ -6,14 +6,14 @@
   <surfacematerial name="Marble_3D" type="material" xpos="14.094203" ypos="2.008621">
     <input name="surfaceshader" type="surfaceshader" nodename="plain" />
   </surfacematerial>
-  <combine_v3 name="combine_v3_matrix33" type="matrix33" xpos="-0.985507" ypos="-1.793103">
+  <creatematrix name="creatematrix33" type="matrix33" xpos="-0.985507" ypos="-1.793103">
     <input name="in1" type="vector3" nodename="tangent_vector3" />
     <input name="in2" type="vector3" nodename="bitangent_vector3" />
     <input name="in3" type="vector3" nodename="normal_vector3" />
-  </combine_v3>
+  </creatematrix>
   <transformmatrix name="transformmatrix_vector3" type="vector3" xpos="4.028986" ypos="-1.784483">
     <input name="in" type="vector3" nodename="constant_vector4" />
-    <input name="mat" type="matrix33" nodename="combine_v3_matrix33" />
+    <input name="mat" type="matrix33" nodename="creatematrix33" />
   </transformmatrix>
   <normal name="normal_vector3" type="vector3" xpos="-2.347826" ypos="-0.620690">
     <input name="space" type="string" value="world" />
diff --git a/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl b/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl
index 90b885f0eb..203e1a0206 100644
--- a/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl
+++ b/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl
@@ -4149,18 +4149,32 @@ export float4 mx_combine4_vector4(
 	return float4(mxp_in1, mxp_in2, mxp_in3, mxp_in4);
 }
 
-export float3x3 mx_combine_v3_matrix33(
+export float3x3 mx_creatematrix_vector3(
 	float3 mxp_in1 = float3(1.0, 0.0, 0.0),
-	float3 mxp_in1 = float3(0.0, 1.0, 0.0),
-	float3 mxp_in1 = float3(0.0, 0.0, 1.0)
+	float3 mxp_in2 = float3(0.0, 1.0, 0.0),
+	float3 mxp_in3 = float3(0.0, 0.0, 1.0)
 )
 	[[
-		anno::description("Node Group: channel")
+		anno::description("Node Group: math")
 	]]
 {
 	return float3x3(mxp_in1[0],mxp_in1[1],mxp_in1[2],mxp_in2[0],mxp_in2[1],mxp_in2[2],mxp_in3[0],mxp_in3[1],mxp_in3[2]);
 }
 
+
+export float4x4 mx_creatematrix_vector4(
+	float4 mxp_in1 = float3(1.0, 0.0, 0.0, 0.0),
+	float4 mxp_in2 = float3(0.0, 1.0, 0.0, 0.0),
+	float4 mxp_in3 = float3(0.0, 0.0, 1.0, 0.0)
+	float4 mxp_in4 = float3(0.0, 0.0, 0.0, 1.0)
+)
+	[[
+		anno::description("Node Group: math")
+	]]
+{
+	return float4x4(mxp_in1[0],mxp_in1[1],mxp_in1[2],mxp_in1[3],mxp_in2[0],mxp_in2[1],mxp_in2[2],mxp_in2[3],mxp_in3[0],mxp_in3[1],mxp_in3[2],mxp_in3[3],mxp_in4[0],mxp_in4[1],mxp_in4[2],mxp_in4[3]);
+}
+
 // Nodedef: ND_extract_color3 is represented by a nodegraph: NG_extract_color3
 // Nodedef: ND_extract_color4 is represented by a nodegraph: NG_extract_color4
 // Nodedef: ND_extract_vector2 is represented by a nodegraph: NG_extract_vector2