From 6d672c62ed56c7ad056f90ded2fecfe4ca693067 Mon Sep 17 00:00:00 2001
From: vernalchen <shaochun.chen@autodesk.com>
Date: Mon, 11 Jul 2022 16:04:55 +0800
Subject: [PATCH] Provide a frame transform for UV texture coordinates

---
 libraries/stdlib/stdlib_defs.mtlx             | 15 ++++++++++
 libraries/stdlib/stdlib_ng.mtlx               | 30 +++++++++++++++++++
 .../TestSuite/stdlib/math/transform.mtlx      | 14 +++++++++
 3 files changed, 59 insertions(+)

diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx
index f52ac0f300..326ded860e 100644
--- a/libraries/stdlib/stdlib_defs.mtlx
+++ b/libraries/stdlib/stdlib_defs.mtlx
@@ -2333,6 +2333,7 @@
   <!--
     Node: <place2d> Supplemental Node
     Transform incoming UV texture coordinates for 2D texture placement.
+    Sequence of transformation (in the order of application): -pivot, scale, rotate, translate, pivot.
   -->
   <nodedef name="ND_place2d_vector2" node="place2d" nodegroup="math">
     <input name="texcoord" type="vector2" value="0.0, 0.0" />
@@ -2343,6 +2344,20 @@
     <output name="out" type="vector2" defaultinput="texcoord" />
   </nodedef>
 
+  <!--
+    Node: <place2dframe> Supplemental Node
+    Transform incoming UV texture coordinates for 2D texture placement.
+    Sequence of transformation (in the order of application): -pivot, translate, rotate, scale, pivot.
+  -->
+  <nodedef name="ND_place2dframe_vector2" node="place2dframe" nodegroup="math">
+    <input name="texcoord" type="vector2" value="0.0, 0.0" />
+    <input name="pivot" type="vector2" value="0.0,0.0" />
+    <input name="scale" type="vector2" value="1.0,1.0" />
+    <input name="rotate" type="float" value="0.0" unittype="angle" unit="degree" />
+    <input name="offset" type="vector2" value="0.0,0.0" />
+    <output name="out" type="vector2" defaultinput="texcoord" />
+  </nodedef>
+
   <!--
     Node: <arrayappend>
     Creates a two-element array from two base types, or appends a base-type value to an array of
diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx
index c96dcb41bb..090b8fd857 100644
--- a/libraries/stdlib/stdlib_ng.mtlx
+++ b/libraries/stdlib/stdlib_ng.mtlx
@@ -1046,6 +1046,7 @@
   <!--
     Node: <place2d>
     Transform incoming UV texture coordinates for 2D texture placement.
+    Sequence of transformation (in the order of application): -pivot, scale, rotate, translate, pivot.
   -->
   <nodegraph name="NG_place2d_vector2" nodedef="ND_place2d_vector2">
     <subtract name="N_subpivot" type="vector2">
@@ -1071,6 +1072,35 @@
     <output name="out" type="vector2" nodename="N_addpivot" />
   </nodegraph>
 
+  <!--
+    Node: <place2dframe>
+    Transform incoming UV texture coordinates for 2D texture placement.
+    Sequence of transformation (in the order of application): -pivot, translate, rotate, scale, pivot.
+  -->
+  <nodegraph name="NG_place2dframe_vector2" nodedef="ND_place2dframe_vector2">
+    <subtract name="N_subpivot" type="vector2">
+      <input name="in1" type="vector2" interfacename="texcoord" />
+      <input name="in2" type="vector2" interfacename="pivot" />
+    </subtract>
+    <subtract name="N_applyoffset" type="vector2">
+      <input name="in1" type="vector2" nodename="N_subpivot" />
+      <input name="in2" type="vector2" interfacename="offset" />
+    </subtract>
+    <rotate2d name="N_applyrot" type="vector2">
+      <input name="in" type="vector2" nodename="N_applyoffset" />
+      <input name="amount" type="float" interfacename="rotate" />
+    </rotate2d>
+    <divide name="N_applyscale" type="vector2">
+      <input name="in1" type="vector2" nodename="N_applyrot" />
+      <input name="in2" type="vector2" interfacename="scale" />
+    </divide>
+    <add name="N_addpivot" type="vector2">
+      <input name="in1" type="vector2" nodename="N_applyscale" />
+      <input name="in2" type="vector2" interfacename="pivot" />
+    </add>
+    <output name="out" type="vector2" nodename="N_addpivot" />
+  </nodegraph>
+
   <!-- ======================================================================== -->
   <!-- Adjustment nodes                                                         -->
   <!-- ======================================================================== -->
diff --git a/resources/Materials/TestSuite/stdlib/math/transform.mtlx b/resources/Materials/TestSuite/stdlib/math/transform.mtlx
index 042f320c84..1fa31a5a50 100644
--- a/resources/Materials/TestSuite/stdlib/math/transform.mtlx
+++ b/resources/Materials/TestSuite/stdlib/math/transform.mtlx
@@ -178,4 +178,18 @@
     </place2d>
     <output name="out" type="vector2" nodename="place2d1_1" />
   </nodegraph>
+  <!-- place2dframe -->
+  <nodegraph name="place2dframe_vector2">
+    <texcoord name="texcoord1" type="vector2">
+      <input name="index" type="integer" value="0" />
+    </texcoord>
+    <place2dframe name="place2d1_1" type="vector2">
+      <input name="texcoord" type="vector2" nodename="texcoord1" />
+      <input name="pivot" type="vector2" value="0.5,0.5" />
+      <input name="scale" type="vector2" value="2.0,1.0" />
+      <input name="rotate" type="float" value="1.0" unittype="angle" unit="radian" />
+      <input name="offset" type="vector2" value="0.2,0.2" />
+    </place2dframe>
+    <output name="out" type="vector2" nodename="place2d1_1" />
+  </nodegraph>
 </materialx>