From 7a4f14c788e83e662ae5d47cafc18295ea2570b3 Mon Sep 17 00:00:00 2001
From: Francis Wang <73218921+francis-wangfr@users.noreply.github.com>
Date: Thu, 19 May 2022 14:10:53 +0800
Subject: [PATCH] Support multiple UV (#1386)

Add input node "uv_index" for supporting transfer data of multiple UV
---
 libraries/adsk/adsklib/adsklib_defs.mtlx |  6 ++++++
 libraries/adsk/adsklib/adsklib_ng.mtlx   | 24 ++++++++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/libraries/adsk/adsklib/adsklib_defs.mtlx b/libraries/adsk/adsklib/adsklib_defs.mtlx
index 05d5b207d8..eb2db79bc7 100644
--- a/libraries/adsk/adsklib/adsklib_defs.mtlx
+++ b/libraries/adsk/adsklib/adsklib_defs.mtlx
@@ -23,6 +23,7 @@
     <input name="invert" type="boolean" value="false" />
     <input name="uaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode U" uniform="true" />
     <input name="vaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode V" uniform="true" />
+    <input name="uv_index" type="integer" value="0" />
     <output name="out" type="color3"/>
   </nodedef>
 
@@ -42,6 +43,7 @@
     <input name="invert" type="boolean" value="false" />
     <input name="uaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode U" uniform="true" />
     <input name="vaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode V" uniform="true" />
+    <input name="uv_index" type="integer" value="0" />
     <output name="out" type="color4"/>
   </nodedef>
   
@@ -61,6 +63,7 @@
     <input name="invert" type="boolean" value="false" />
     <input name="uaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode U" uniform="true" />
     <input name="vaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode V" uniform="true" />
+    <input name="uv_index" type="integer" value="0" />
     <output name="out" type="float" />
   </nodedef>
 
@@ -83,6 +86,7 @@
     <input name="outhigh" type="float" value="1.0" />
     <input name="uaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode U" uniform="true" />
     <input name="vaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode V" uniform="true" />
+    <input name="uv_index" type="integer" value="0" />
     <output name="out" type="float" />
   </nodedef>
 
@@ -101,6 +105,7 @@
     <input name="normal_scale" type="float" value="1.0" />
     <input name="uaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode U" uniform="true" />
     <input name="vaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode V" uniform="true" />
+    <input name="uv_index" type="integer" value="0" />
     <output name="out" type="vector3" />
   </nodedef>
 
@@ -115,6 +120,7 @@
     <input name="depth" type="float" unittype="distance" />
     <input name="uaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode U" uniform="true" />
     <input name="vaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode V" uniform="true" />
+    <input name="uv_index" type="integer" value="0" />
     <output name="out" type="vector3" />
   </nodedef>
   
diff --git a/libraries/adsk/adsklib/adsklib_ng.mtlx b/libraries/adsk/adsklib/adsklib_ng.mtlx
index 9a801ca841..d14ca2b69b 100644
--- a/libraries/adsk/adsklib/adsklib_ng.mtlx
+++ b/libraries/adsk/adsklib/adsklib_ng.mtlx
@@ -27,7 +27,9 @@
     </multiply>
 
     <!-- use placement node to transform uv -->
-    <texcoord name="texcoord1" type="vector2" />
+    <texcoord name="texcoord1" type="vector2">
+      <input name="index" type="integer" interfacename="uv_index"/>
+    </texcoord>
     <place2d name="a_place2d" type="vector2">
       <input name="texcoord" type="vector2" nodename="texcoord1"/>
       <input name="offset" type="vector2" nodename="total_offset" />
@@ -83,7 +85,9 @@
     </multiply>
 
     <!-- use placement node to transform uv -->
-    <texcoord name="texcoord1" type="vector2" />
+    <texcoord name="texcoord1" type="vector2">
+      <input name="index" type="integer" interfacename="uv_index"/>
+    </texcoord>
     <place2d name="a_place2d" type="vector2">
       <input name="texcoord" type="vector2" nodename="texcoord1"/>
       <input name="offset" type="vector2" nodename="total_offset" />
@@ -139,7 +143,9 @@
     </multiply>
 
     <!-- use placement node to transform uv -->
-    <texcoord name="texcoord1" type="vector2" />
+    <texcoord name="texcoord1" type="vector2">
+      <input name="index" type="integer" interfacename="uv_index"/>
+    </texcoord>
     <place2d name="a_place2d" type="vector2">
       <input name="texcoord" type="vector2" nodename="texcoord1"/>
       <input name="offset" type="vector2" nodename="total_offset" />
@@ -201,7 +207,9 @@
     </multiply>
 
     <!-- use placement node to transform uv -->
-    <texcoord name="texcoord1" type="vector2" />
+    <texcoord name="texcoord1" type="vector2">
+      <input name="index" type="integer" interfacename="uv_index"/>
+    </texcoord>
     <place2d name="a_place2d" type="vector2">
       <input name="texcoord" type="vector2" nodename="texcoord1"/>
       <input name="offset" type="vector2" nodename="total_offset" />
@@ -274,7 +282,9 @@
     </multiply>
 
     <!-- use placement node to transform uv -->
-    <texcoord name="texcoord1" type="vector2" />
+    <texcoord name="texcoord1" type="vector2">
+      <input name="index" type="integer" interfacename="uv_index"/>
+    </texcoord>
     <place2d name="a_place2d" type="vector2">
       <input name="texcoord" type="vector2" nodename="texcoord1"/>
       <input name="offset" type="vector2" nodename="total_offset" />
@@ -328,7 +338,9 @@
       <input name="in2" type="float" value="-1.0"/>
     </multiply>
 
-    <texcoord name="texcoord1" type="vector2" />
+    <texcoord name="texcoord1" type="vector2">
+      <input name="index" type="integer" interfacename="uv_index"/>
+    </texcoord>
     <place2d name="a_place2d" type="vector2">
       <input name="texcoord" type="vector2" nodename="texcoord1"/>
       <input name="offset" type="vector2" nodename="total_offset" />