Merge branch 'AcademySoftwareFoundation:main' into graph_io

kwokcb · Aug 29, 2023 · 9436b14 · 9436b14
2 parents abd4741 + 6ce8370
commit 9436b14
Show file tree

Hide file tree

Showing 2 changed files with 228 additions and 18 deletions.
diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx
@@ -307,6 +307,7 @@
  <input name="default" type="float" value="0.0" />
  <input name="position" type="vector3" defaultgeomprop="Pobject" />
  <input name="normal" type="vector3" defaultgeomprop="Nobject" />
+ <input name="upaxis" type="integer" value="2" enum="X,Y,Z" enumvalues="0,1,2" uniform="true" />
  <input name="blend" type="float" value="1.0" uimin="0.0" uimax="1.0" />
  <input name="filtertype" type="string" value="linear" enum="closest,linear,cubic" uniform="true" />
  <input name="framerange" type="string" value="" uniform="true" />
@@ -324,6 +325,7 @@
  <input name="default" type="color3" value="0.0, 0.0, 0.0" />
  <input name="position" type="vector3" defaultgeomprop="Pobject" />
  <input name="normal" type="vector3" defaultgeomprop="Nobject" />
+ <input name="upaxis" type="integer" value="2" enum="X,Y,Z" enumvalues="0,1,2" uniform="true" />
  <input name="blend" type="float" value="1.0" uimin="0.0" uimax="1.0" />
  <input name="filtertype" type="string" value="linear" enum="closest,linear,cubic" uniform="true" />
  <input name="framerange" type="string" value="" uniform="true" />
@@ -341,6 +343,7 @@
  <input name="default" type="color4" value="0.0, 0.0, 0.0, 0.0" />
  <input name="position" type="vector3" defaultgeomprop="Pobject" />
  <input name="normal" type="vector3" defaultgeomprop="Nobject" />
+ <input name="upaxis" type="integer" value="2" enum="X,Y,Z" enumvalues="0,1,2" uniform="true" />
  <input name="blend" type="float" value="1.0" uimin="0.0" uimax="1.0" />
  <input name="filtertype" type="string" value="linear" enum="closest,linear,cubic" uniform="true" />
  <input name="framerange" type="string" value="" uniform="true" />
@@ -358,6 +361,7 @@
  <input name="default" type="vector2" value="0.0, 0.0" />
  <input name="position" type="vector3" defaultgeomprop="Pobject" />
  <input name="normal" type="vector3" defaultgeomprop="Nobject" />
+ <input name="upaxis" type="integer" value="2" enum="X,Y,Z" enumvalues="0,1,2" uniform="true" />
  <input name="blend" type="float" value="1.0" uimin="0.0" uimax="1.0" />
  <input name="filtertype" type="string" value="linear" enum="closest,linear,cubic" uniform="true" />
  <input name="framerange" type="string" value="" uniform="true" />
@@ -375,6 +379,7 @@
  <input name="default" type="vector3" value="0.0, 0.0, 0.0" />
  <input name="position" type="vector3" defaultgeomprop="Pobject" />
  <input name="normal" type="vector3" defaultgeomprop="Nobject" />
+ <input name="upaxis" type="integer" value="2" enum="X,Y,Z" enumvalues="0,1,2" uniform="true" />
  <input name="blend" type="float" value="1.0" uimin="0.0" uimax="1.0" />
  <input name="filtertype" type="string" value="linear" enum="closest,linear,cubic" uniform="true" />
  <input name="framerange" type="string" value="" uniform="true" />
@@ -392,6 +397,7 @@
  <input name="default" type="vector4" value="0.0, 0.0, 0.0, 0.0" />
  <input name="position" type="vector3" defaultgeomprop="Pobject" />
  <input name="normal" type="vector3" defaultgeomprop="Nobject" />
+ <input name="upaxis" type="integer" value="2" enum="X,Y,Z" enumvalues="0,1,2" uniform="true" />
  <input name="blend" type="float" value="1.0" uimin="0.0" uimax="1.0" />
  <input name="filtertype" type="string" value="linear" enum="closest,linear,cubic" uniform="true" />
  <input name="framerange" type="string" value="" uniform="true" />