From e356b7674aa7a413daf1b6daf0036235c6a67341 Mon Sep 17 00:00:00 2001
From: vernalchen <shaochun.chen@autodesk.com>
Date: Wed, 13 Jul 2022 13:33:30 +0800
Subject: [PATCH] Refine wording & add test cases

---
 libraries/stdlib/stdlib_defs.mtlx             | 17 +++------
 libraries/stdlib/stdlib_ng.mtlx               | 14 ++++----
 .../stdlib/texture/image_transform.mtlx       | 35 +++++++++++++++++++
 3 files changed, 48 insertions(+), 18 deletions(-)
 create mode 100644 resources/Materials/TestSuite/stdlib/texture/image_transform.mtlx

diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx
index 326ded860e..1b64e2880d 100644
--- a/libraries/stdlib/stdlib_defs.mtlx
+++ b/libraries/stdlib/stdlib_defs.mtlx
@@ -2332,8 +2332,8 @@
 
   <!--
     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.
+    Transform incoming UV texture coordinates from one 2D frame of reference to another.
+    The order of transformation is: -pivot, scale, rotate, translate, pivot.
   -->
   <nodedef name="ND_place2d_vector2" node="place2d" nodegroup="math">
     <input name="texcoord" type="vector2" value="0.0, 0.0" />
@@ -2346,17 +2346,10 @@
 
   <!--
     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.
+    Transform incoming UV texture coordinates from one 2D frame of reference to another.
+    The order of transformation is: -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>
+  <nodedef name="ND_place2dframe_vector2" node="place2dframe" inherit="ND_place2d_vector2" />
 
   <!--
     Node: <arrayappend>
diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx
index 090b8fd857..fba360d8dd 100644
--- a/libraries/stdlib/stdlib_ng.mtlx
+++ b/libraries/stdlib/stdlib_ng.mtlx
@@ -1045,10 +1045,11 @@
 
   <!--
     Node: <place2d>
-    Transform incoming UV texture coordinates for 2D texture placement.
-    Sequence of transformation (in the order of application): -pivot, scale, rotate, translate, pivot.
+    Transform incoming UV texture coordinates from one 2D frame of reference to another.
+    The order of transformation is: -pivot, scale, rotate, translate, pivot.
   -->
-  <nodegraph name="NG_place2d_vector2" nodedef="ND_place2d_vector2">
+  <implementation name="IMPL_place2d_vector2" nodedef="ND_place2d_vector2" nodegraph="NG_place2d_vector2" />
+  <nodegraph name="NG_place2d_vector2">
     <subtract name="N_subpivot" type="vector2">
       <input name="in1" type="vector2" interfacename="texcoord" />
       <input name="in2" type="vector2" interfacename="pivot" />
@@ -1074,10 +1075,11 @@
 
   <!--
     Node: <place2dframe>
-    Transform incoming UV texture coordinates for 2D texture placement.
-    Sequence of transformation (in the order of application): -pivot, translate, rotate, scale, pivot.
+    Transform incoming UV texture coordinates from one 2D frame of reference to another.
+    The order of transformation is: -pivot, translate, rotate, scale, pivot.
   -->
-  <nodegraph name="NG_place2dframe_vector2" nodedef="ND_place2dframe_vector2">
+  <implementation name="IMPL_place2dframe_vector2" nodedef="ND_place2dframe_vector2" nodegraph="NG_place2dframe_vector2" />
+  <nodegraph name="NG_place2dframe_vector2">
     <subtract name="N_subpivot" type="vector2">
       <input name="in1" type="vector2" interfacename="texcoord" />
       <input name="in2" type="vector2" interfacename="pivot" />
diff --git a/resources/Materials/TestSuite/stdlib/texture/image_transform.mtlx b/resources/Materials/TestSuite/stdlib/texture/image_transform.mtlx
new file mode 100644
index 0000000000..33a78bca2e
--- /dev/null
+++ b/resources/Materials/TestSuite/stdlib/texture/image_transform.mtlx
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<materialx version="1.38">
+  <nodegraph name="test_place2d">
+    <image name="image_number_1" type="color3">
+      <input name="file" type="filename" value="resources/Images/grid.png" />
+      <input name="default" type="color3" value="1.0, 0.0, 0.0" />
+      <input name="texcoord" type="vector2" nodename="a_place2d" />
+    </image>
+    <output name="out" type="color3" nodename="image_number_1" />
+    <texcoord name="texcoord1" type="vector2" />
+    <place2d name="a_place2d" type="vector2">
+      <input name="texcoord" type="vector2" nodename="texcoord1" />
+      <input name="offset" type="vector2" value="0.0, 0.0" />
+      <input name="rotate" type="float" value="30.0" unittype="angle" unit="degree" />
+      <input name="scale" type="vector2" value="2.0, 1.0" />
+      <input name="pivot" type="vector2" value="0.5, 0.5" />
+    </place2d>
+  </nodegraph>
+  <nodegraph name="test_place2dframe">
+    <image name="image_number_1" type="color3">
+      <input name="file" type="filename" value="resources/Images/grid.png" />
+      <input name="default" type="color3" value="1.0, 0.0, 0.0" />
+      <input name="texcoord" type="vector2" nodename="a_place2d" />
+    </image>
+    <output name="out" type="color3" nodename="image_number_1" />
+    <texcoord name="texcoord1" type="vector2" />
+    <place2dframe name="a_place2d" type="vector2">
+      <input name="texcoord" type="vector2" nodename="texcoord1" />
+      <input name="offset" type="vector2" value="0.2, 0.2" />
+      <input name="rotate" type="float" value="30.0" unittype="angle" unit="degree" />
+      <input name="scale" type="vector2" value="2.0, 1.0" />
+      <input name="pivot" type="vector2" value="0.5, 0.5" />
+    </place2dframe>
+  </nodegraph>
+</materialx>