- Patch so multioutput node instances always add in output ports (#18)

- Add in QuiltiX plug-in reference - Bump version to 1.39.0.1 (patch 1)
kwokcb · Jul 25, 2024 · 72ef500 · 72ef500
1 parent b1f92ca
commit 72ef500
Show file tree

Hide file tree

Showing 52 changed files with 340 additions and 178 deletions.
diff --git a/docs/Doxyfile b/docs/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "MaterialXglTF"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.0.4
+PROJECT_NUMBER         = 1.39.0.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/docs/data/Geometry/DamagedHelmet.abc b/docs/data/Geometry/DamagedHelmet.abc
diff --git a/docs/data/Geometry/DamagedHelmet.usdc b/docs/data/Geometry/DamagedHelmet.usdc
diff --git a/docs/data/Geometry/MaterialVariant.usdc b/docs/data/Geometry/MaterialVariant.usdc
diff --git a/docs/data/Geometry/SciFiHelmet.usdc b/docs/data/Geometry/SciFiHelmet.usdc
diff --git a/docs/data/Geometry/textures/color_121212.hdr b/docs/data/Geometry/textures/color_121212.hdr
@@ -0,0 +1,5 @@
+#?RADIANCE
+FORMAT=32-bit_rle_rgbe
+
+-Y 4 +X 4
+���|���|���|���|���|���|���|���|���|���|���|���|���|���|���|���|
diff --git a/docs/data/RTS_GLTF/DamagedHelmet.gltf_converted.mtlx b/docs/data/RTS_GLTF/DamagedHelmet.gltf_converted.mtlx
@@ -3,7 +3,6 @@
   <!-- Generated shader: Material_MR -->
   <gltf_pbr name="Material_MR" type="surfaceshader" nodedef="ND_gltf_pbr_surfaceshader">
     <input name="base_color" type="color3" nodename="image_base_color" output="outcolor" />
-    <input name="alpha" type="float" nodename="image_base_color" output="outa" />
     <input name="metallic" type="float" nodename="extract_orm3" />
     <input name="roughness" type="float" nodename="extract_orm2" />
     <input name="occlusion" type="float" nodename="image_occlusion" />
@@ -16,6 +15,8 @@
   </surfacematerial>
   <gltf_colorimage name="image_base_color" type="multioutput">
     <input name="file" type="filename" value="Default_albedo.jpg" colorspace="srgb_texture" />
+    <output name="outcolor" type="color3" />
+    <output name="outa" type="float" />
   </gltf_colorimage>
   <gltf_image name="image_orm" type="vector3">
     <input name="file" type="filename" value="Default_metalRoughness.jpg" />
@@ -40,6 +41,8 @@
   </gltf_image>
   <gltf_colorimage name="image_emissive" type="multioutput">
     <input name="file" type="filename" value="Default_emissive.jpg" colorspace="srgb_texture" />
+    <output name="outcolor" type="color3" />
+    <output name="outa" type="float" />
   </gltf_colorimage>
   <!-- Generated material assignments -->
   <look name="look">

diff --git a/docs/data/RTS_GLTF/GlamVelvetSofa.gltf_converted.mtlx b/docs/data/RTS_GLTF/GlamVelvetSofa.gltf_converted.mtlx
@@ -160,8 +160,8 @@
   </gltf_image>
   <!-- Generated material assignments -->
   <look name="look">
-    <materialassign name="MAT_GlamVelvetSofa_legs" material="MAT_GlamVelvetSofa_legs" geom="GlamVelvetSofa_legs" />
-    <materialassign name="MAT_GlamVelvetSofa_fabric_navy" material="MAT_GlamVelvetSofa_fabric_navy" geom="GlamVelvetSofa_fabric" />
-    <materialassign name="MAT_GlamVelvetSofa_feet" material="MAT_GlamVelvetSofa_feet" geom="GlamVelvetSofa_feet" />
+    <materialassign name="MAT_GlamVelvetSofa_legs" material="MAT_GlamVelvetSofa_legs" geom="/GlamVelvetSofa_legs/GlamVelvetSofa_legs" />
+    <materialassign name="MAT_GlamVelvetSofa_fabric_navy" material="MAT_GlamVelvetSofa_fabric_navy" geom="/GlamVelvetSofa_fabric/GlamVelvetSofa_fabric" />
+    <materialassign name="MAT_GlamVelvetSofa_feet" material="MAT_GlamVelvetSofa_feet" geom="/GlamVelvetSofa_feet/GlamVelvetSofa_feet" />
   </look>
 </materialx>
diff --git a/docs/data/RTS_GLTF/MaterialsVariantsShoe.gltf_converted.mtlx b/docs/data/RTS_GLTF/MaterialsVariantsShoe.gltf_converted.mtlx
@@ -3,7 +3,7 @@
   <!-- Generated shader: phong1SG -->
   <gltf_pbr name="phong1SG" type="surfaceshader" nodedef="ND_gltf_pbr_surfaceshader">
     <input name="base_color" type="color3" nodename="image_base_color" output="outcolor" />
-    <input name="alpha" type="float" nodename="image_base_color" output="outa" />
+    <input name="alpha" type="float" value="1" />
     <input name="metallic" type="float" nodename="extract_orm3" />
     <input name="roughness" type="float" nodename="extract_orm2" />
     <input name="occlusion" type="float" nodename="image_occlusion" />
@@ -16,6 +16,8 @@
   </surfacematerial>
   <gltf_colorimage name="image_base_color" type="multioutput">
     <input name="file" type="filename" value="diffuseMidnight.jpg" colorspace="srgb_texture" />
+    <output name="outcolor" type="color3" />
+    <output name="outa" type="float" />
   </gltf_colorimage>
   <gltf_image name="image_orm" type="vector3">
     <input name="file" type="filename" value="occlusionRougnessMetalness.jpg" />
@@ -50,7 +52,7 @@
   <!-- Generated shader: phong1SG2 -->
   <gltf_pbr name="phong1SG2" type="surfaceshader" nodedef="ND_gltf_pbr_surfaceshader">
     <input name="base_color" type="color3" nodename="image_base_color2" output="outcolor" />
-    <input name="alpha" type="float" nodename="image_base_color2" output="outa" />
+    <input name="alpha" type="float" value="1" />
     <input name="metallic" type="float" nodename="extract_orm6" />
     <input name="roughness" type="float" nodename="extract_orm5" />
     <input name="occlusion" type="float" nodename="image_occlusion2" />
@@ -63,6 +65,8 @@
   </surfacematerial>
   <gltf_colorimage name="image_base_color2" type="multioutput">
     <input name="file" type="filename" value="diffuseBeach.jpg" colorspace="srgb_texture" />
+    <output name="outcolor" type="color3" />
+    <output name="outa" type="float" />
   </gltf_colorimage>
   <gltf_image name="image_orm2" type="vector3">
     <input name="file" type="filename" value="occlusionRougnessMetalness.jpg" />
@@ -97,7 +101,7 @@
   <!-- Generated shader: phong1SG3 -->
   <gltf_pbr name="phong1SG3" type="surfaceshader" nodedef="ND_gltf_pbr_surfaceshader">
     <input name="base_color" type="color3" nodename="image_base_color3" output="outcolor" />
-    <input name="alpha" type="float" nodename="image_base_color3" output="outa" />
+    <input name="alpha" type="float" value="1" />
     <input name="metallic" type="float" nodename="extract_orm9" />
     <input name="roughness" type="float" nodename="extract_orm8" />
     <input name="occlusion" type="float" nodename="image_occlusion3" />
@@ -110,6 +114,8 @@
   </surfacematerial>
   <gltf_colorimage name="image_base_color3" type="multioutput">
     <input name="file" type="filename" value="diffuseStreet.jpg" colorspace="srgb_texture" />
+    <output name="outcolor" type="color3" />
+    <output name="outa" type="float" />
   </gltf_colorimage>
   <gltf_image name="image_orm3" type="vector3">
     <input name="file" type="filename" value="occlusionRougnessMetalness.jpg" />

diff --git a/docs/data/RTS_GLTF/SciFiHelmet.gltf_converted.mtlx b/docs/data/RTS_GLTF/SciFiHelmet.gltf_converted.mtlx
@@ -3,7 +3,6 @@
   <!-- Generated shader: SciFiHelmet -->
   <gltf_pbr name="SciFiHelmet" type="surfaceshader" nodedef="ND_gltf_pbr_surfaceshader">
     <input name="base_color" type="color3" nodename="image_base_color" output="outcolor" />
-    <input name="alpha" type="float" nodename="image_base_color" output="outa" />
     <input name="metallic" type="float" nodename="extract_orm3" />
     <input name="roughness" type="float" nodename="extract_orm2" />
     <input name="occlusion" type="float" nodename="image_occlusion" />
@@ -16,6 +15,8 @@
   </surfacematerial>
   <gltf_colorimage name="image_base_color" type="multioutput">
     <input name="file" type="filename" value="SciFiHelmet_BaseColor.png" colorspace="srgb_texture" />
+    <output name="outcolor" type="color3" />
+    <output name="outa" type="float" />
   </gltf_colorimage>
   <gltf_image name="image_orm" type="vector3">
     <input name="file" type="filename" value="SciFiHelmet_MetallicRoughness.png" />

diff --git a/docs/data/RTS_GLTF/textures/Default_albedo.jpg b/docs/data/RTS_GLTF/textures/Default_albedo.jpg
diff --git a/docs/data/RTS_GLTF/textures/Default_emissive.jpg b/docs/data/RTS_GLTF/textures/Default_emissive.jpg
diff --git a/docs/data/RTS_GLTF/textures/Default_metalRoughness.jpg b/docs/data/RTS_GLTF/textures/Default_metalRoughness.jpg
diff --git a/docs/data/RTS_GLTF/textures/Default_normal.jpg b/docs/data/RTS_GLTF/textures/Default_normal.jpg
diff --git a/docs/data/RTS_GLTF/textures/color_121212.hdr b/docs/data/RTS_GLTF/textures/color_121212.hdr
@@ -0,0 +1,5 @@
+#?RADIANCE
+FORMAT=32-bit_rle_rgbe
+
+-Y 4 +X 4
+���|���|���|���|���|���|���|���|���|���|���|���|���|���|���|���|