re-synchronize the templates with the libraries folder.

verified data library builds with zero diffs
generated docs match everything discussed in AOUSD - modulo one out standing issue with colorcorrect node.

includes fix for mistake when adding default to unifiednoise node

Author: ld-kerley

libraries/stdlib/stdlib_defs.mtlx

@@ -1222,7 +1222,7 @@
     <input name="diminish" type="float" uiname="Diminish" uifolder="Fractal" uisoftmin="0.0" uisoftmax="1.0" value="0.5" doc="The rate at which noise amplitude is diminished for each octave of Fractal noise. Default is 0.5." />
     <input name="type" type="integer" uiname="Noise Type" uifolder="Common" uisoftmin="0" uisoftmax="3" value="0" enum="Perlin,Cell,Worley,Fractal" enumvalues="0,1,2,3" doc="Menu to select the type of noise: Perlin, Cell, Worley, or Fractal. Default is Perlin." />
     <input name="style" uiname="Worley Cell Style" type="integer" value="0" enum="Distance,Solid" enumvalues="0,1" doc="Sets the style of cell used when Noise Type is set to Worley." />
-    <output name="out" type="float" value="0.0" />
+    <output name="out" type="float" default="0.0" />
   </nodedef>
 
   <!--
@@ -1242,7 +1242,7 @@
     <input name="diminish" type="float" uiname="Diminish" uifolder="Fractal" uisoftmin="0.0" uisoftmax="1.0" value="0.5" doc="The rate at which noise amplitude is diminished for each octave of Fractal noise. Default is 0.5." />
     <input name="type" type="integer" uiname="Noise Type" uifolder="Common" uisoftmin="0" uisoftmax="3" value="0" enum="Perlin,Cell,Worley,Fractal" enumvalues="0,1,2,3" doc="Menu to select the type of noise: Perlin, Cell, Worley, or Fractal. Default is Perlin." />
     <input name="style" uiname="Worley Cell Style" type="integer" value="0" enum="Distance,Solid" enumvalues="0,1" doc="Sets the style of cell used when Noise Type is set to Worley." />
-    <output name="out" type="float" value="0.0" />
+    <output name="out" type="float" default="0.0" />
   </nodedef>
 
   <!--

source/MaterialXBuildTools/buildDocs/Main.cpp

@@ -232,6 +232,10 @@ mx::StringVec convertOptionToConsolidatedTypes(const mx::StringVec& options)
         "string", "filename",
         "surfaceshader", "displacementshader", "volumeshader", "lightshader"
     };
+    // TODO - for now we're just looking at stdlib - so we're just gonna skip these types
+    // this is because the `mix` node actually belongs in two separate documents
+    // standard nods and PBR nodes
+    static const std::vector<std::string> skipTypes = {"surfaceshader", "displacementshader", "volumeshader", "lightshader"};
 
     auto contains = [&](const std::vector<std::string>& array, const std::string& str) -> bool {
         return std::find(array.begin(), array.end(), str) != array.end();
@@ -278,6 +282,14 @@ mx::StringVec convertOptionToConsolidatedTypes(const mx::StringVec& options)
         parts.emplace_back("matrixNN");
     }
 
+    // remove the skipped types for now.
+    for (const auto& skipType : skipTypes)
+    {
+        if (contains(parts, skipType))
+            remove(parts, skipType);
+    }
+
+
     std::vector<std::string> res;
     for (const auto& part : preferredOptionOrder)
     {

source/MaterialXFormat/XmlIo.h

@@ -57,7 +57,7 @@ class MX_FORMAT_API XmlReadOptions
     /// Defaults to an empty vector.
     StringVec parentXIncludes;
 
-    /// Expand any <template> tags present in the document
+    /// Expand any template tags present in the document
     bool expandTemplateElems = false;
 };
 

templates/CMakeLists.txt

@@ -2,7 +2,7 @@
 # This is a temporary validation step - so I decided not to promote this setting
 # to a first class CMake option for now - we may decide we want to do this if
 # running this in CI is helpful -
-set(MATERIALX_COMPARE_TEMPLATES_TO_LIBRARY OFF)
+set(MATERIALX_COMPARE_TEMPLATES_TO_LIBRARY ON)
 
 if(MATERIALX_COMPARE_TEMPLATES_TO_LIBRARY)
     # Here we run both the "libraries" and "templates" folder through the

templates/bxdf/translation/standard_surface_to_gltf_pbr.mtlx

@@ -8,6 +8,7 @@
     <input name="specular_anisotropy" type="float" value="0.0" />
     <input name="specular_rotation" type="float" value="0.0" />
     <input name="specular_roughness" type="float" value="0.2" />
+    <input name="specular_IOR" type="float" value="1.5" />
     <input name="transmission" type="float" value="0" />
     <input name="transmission_color" type="color3" value="1, 1, 1" />
     <input name="transmission_depth" type="float" value="0" />
@@ -19,10 +20,14 @@
     <input name="coat_roughness" type="float" value="0.1" />
     <input name="emission" type="float" value="0" />
     <input name="emission_color" type="color3" value="1, 1, 1" />
+    <input name="normal" type="vector3" defaultgeomprop="Nworld" />
+    <input name="tangent" type="vector3" defaultgeomprop="Tworld" />
+    <input name="opacity" type="color3" value="1, 1, 1" />
 
     <output name="base_color_out" type="color3" />
     <output name="metallic_out" type="float" />
     <output name="roughness_out" type="float" />
+    <output name="ior_out" type="float" />
     <output name="anisotropy_strength_out" type="float" />
     <output name="anisotropy_rotation_out" type="float" />
     <output name="transmission_out" type="float" />
@@ -33,6 +38,11 @@
     <output name="clearcoat_out" type="float" />
     <output name="clearcoat_roughness_out" type="float" />
     <output name="emissive_out" type="color3" />
+    <output name="emissive_strength_out" type="float" />
+    <output name="normal_out" type="vector3" />
+    <output name="tangent_out" type="vector3" />
+    <output name="alpha_out" type="float" />
+    <output name="alpha_mode_out" type="integer" />
   </nodedef>
 
   <nodegraph name="NG_standard_surface_to_gltf_pbr" nodedef="ND_standard_surface_to_gltf_pbr">
@@ -186,14 +196,47 @@
     </dot>
 
     <!-- Emission -->
-    <multiply name="emissive" type="color3">
-      <input name="in1" type="color3" interfacename="emission_color" />
-      <input name="in2" type="float" interfacename="emission" />
-    </multiply>
+    <dot name="emissive" type="color3">
+      <input name="in" type="color3" interfacename="emission_color" />
+    </dot>
+    <dot name="emissive_strength" type="float">
+      <input name="in" type="float" interfacename="emission" />
+    </dot>
+
+    <!-- Specular Index of Refraction -->
+    <dot name="ior" type="float">
+      <input name="in" type="float" interfacename="specular_IOR" />
+    </dot>
+
+    <!-- Geometry -->
+    <dot name="normal" type="vector3">
+      <input name="in" type="vector3" interfacename="normal" />
+    </dot>
+    <dot name="tangent" type="vector3">
+      <input name="in" type="vector3" interfacename="tangent" />
+    </dot>
+
+    <!-- Opacity -->
+    <luminance name="opacity_luminance" type="color3">
+      <input name="in" type="color3" interfacename="opacity" />
+    </luminance>
+
+    <extract name="opacity_luminance_float" type="float">
+      <input name="in" type="color3" nodename="opacity_luminance" />
+      <input name="index" type="integer" value="0" />
+    </extract>
+
+    <ifequal name="alpha_mode_from_opacity_luminance" type="integer">
+      <input name="value1" type="float" nodename="opacity_luminance_float" />
+      <input name="value2" type="float" value="1.0" />
+      <input name="in1" type="integer" value="0" />
+      <input name="in2" type="integer" value="2" />
+    </ifequal>
 
     <output name="base_color_out" type="color3" nodename="base_color" />
     <output name="metallic_out" type="float" nodename="metallic" />
     <output name="roughness_out" type="float" nodename="roughness" />
+    <output name="ior_out" type="float" nodename="ior" />
     <output name="anisotropy_strength_out" type="float" nodename="anisotropy_strength" />
     <output name="anisotropy_rotation_out" type="float" nodename="anisotropy_rotation" />
     <output name="transmission_out" type="float" nodename="transmission" />
@@ -204,6 +247,11 @@
     <output name="clearcoat_out" type="float" nodename="clearcoat" />
     <output name="clearcoat_roughness_out" type="float" nodename="clearcoat_roughness" />
     <output name="emissive_out" type="color3" nodename="emissive" />
+    <output name="emissive_strength_out" type="float" nodename="emissive_strength" />
+    <output name="normal_out" type="vector3" nodename="normal" />
+    <output name="tangent_out" type="vector3" nodename="tangent" />
+    <output name="alpha_out" type="float" nodename="opacity_luminance_float" />
+    <output name="alpha_mode_out" type="integer" nodename="alpha_mode_from_opacity_luminance" />
 
   </nodegraph>
 </materialx>

templates/stdlib/genglsl/stdlib_genglsl_impl.mtlx

@@ -249,8 +249,8 @@
   <implementation name="IM_multiply_vector3FA_genglsl" nodedef="ND_multiply_vector3FA" target="genglsl" sourcecode="{{in1}} * {{in2}}" />
   <implementation name="IM_multiply_vector4_genglsl" nodedef="ND_multiply_vector4" target="genglsl" sourcecode="{{in1}} * {{in2}}" />
   <implementation name="IM_multiply_vector4FA_genglsl" nodedef="ND_multiply_vector4FA" target="genglsl" sourcecode="{{in1}} * {{in2}}" />
-  <implementation name="IM_multiply_matrix33_genglsl" nodedef="ND_multiply_matrix33" target="genglsl" sourcecode="{{in2}} * {{in1}}" />
-  <implementation name="IM_multiply_matrix44_genglsl" nodedef="ND_multiply_matrix44" target="genglsl" sourcecode="{{in2}} * {{in1}}" />
+  <implementation name="IM_multiply_matrix33_genglsl" nodedef="ND_multiply_matrix33" target="genglsl" sourcecode="mx_matrix_mul({{in2}}, {{in1}})" />
+  <implementation name="IM_multiply_matrix44_genglsl" nodedef="ND_multiply_matrix44" target="genglsl" sourcecode="mx_matrix_mul({{in2}}, {{in1}})" />
 
   <!-- <divide> -->
   <implementation name="IM_divide_float_genglsl" nodedef="ND_divide_float" target="genglsl" sourcecode="{{in1}} / {{in2}}" />
@@ -264,8 +264,8 @@
   <implementation name="IM_divide_vector3FA_genglsl" nodedef="ND_divide_vector3FA" target="genglsl" sourcecode="{{in1}} / {{in2}}" />
   <implementation name="IM_divide_vector4_genglsl" nodedef="ND_divide_vector4" target="genglsl" sourcecode="{{in1}} / {{in2}}" />
   <implementation name="IM_divide_vector4FA_genglsl" nodedef="ND_divide_vector4FA" target="genglsl" sourcecode="{{in1}} / {{in2}}" />
-  <implementation name="IM_divide_matrix33_genglsl" nodedef="ND_divide_matrix33" target="genglsl" sourcecode="mx_inverse({{in2}}) * {{in1}}" />
-  <implementation name="IM_divide_matrix44_genglsl" nodedef="ND_divide_matrix44" target="genglsl" sourcecode="mx_inverse({{in2}}) * {{in1}}" />
+  <implementation name="IM_divide_matrix33_genglsl" nodedef="ND_divide_matrix33" target="genglsl" sourcecode="mx_matrix_mul(mx_inverse({{in2}}), {{in1}})" />
+  <implementation name="IM_divide_matrix44_genglsl" nodedef="ND_divide_matrix44" target="genglsl" sourcecode="mx_matrix_mul(mx_inverse({{in2}}), {{in1}})" />
 
   <!-- <modulo> -->
   <implementation name="IM_modulo_float_genglsl" nodedef="ND_modulo_float" target="genglsl" sourcecode="mx_mod({{in1}}, {{in2}})" />
@@ -469,9 +469,9 @@
 
   <!-- <transformmatrix> -->
   <implementation name="IM_transformmatrix_vector2M3_genglsl" nodedef="ND_transformmatrix_vector2M3" function="mx_transformmatrix_vector2M3" file="mx_transformmatrix_vector2M3.glsl" target="genglsl" />
-  <implementation name="IM_transformmatrix_vector3_genglsl" nodedef="ND_transformmatrix_vector3" target="genglsl" sourcecode="{{mat}} * {{in}}" />
+  <implementation name="IM_transformmatrix_vector3_genglsl" nodedef="ND_transformmatrix_vector3" target="genglsl" sourcecode="mx_matrix_mul({{mat}}, {{in}})" />
   <implementation name="IM_transformmatrix_vector3M4_genglsl" nodedef="ND_transformmatrix_vector3M4" function="mx_transformmatrix_vector3M4" file="mx_transformmatrix_vector3M4.glsl" target="genglsl" />
-  <implementation name="IM_transformmatrix_vector4_genglsl" nodedef="ND_transformmatrix_vector4" target="genglsl" sourcecode="{{mat}} * {{in}}" />
+  <implementation name="IM_transformmatrix_vector4_genglsl" nodedef="ND_transformmatrix_vector4" target="genglsl" sourcecode="mx_matrix_mul({{mat}}, {{in}})" />
 
   <!-- <transpose> -->
   <implementation name="IM_transpose_matrix33_genglsl" nodedef="ND_transpose_matrix33" target="genglsl" sourcecode="transpose({{in}})" />

templates/stdlib/genosl/stdlib_genosl_impl.mtlx

@@ -174,7 +174,7 @@
 
   <!-- <geompropvalueuniform> -->
   <implementation name="IM_geompropvalue_string_genosl" nodedef="ND_geompropvalueuniform_string" file="mx_geompropvalue_string.osl" function="mx_geompropvalue_string" target="genosl" />
-  <implementation name="IM_geompropvalue_filename_genosl" nodedef="ND_geompropvalueuniform_filename" file="mx_geompropvalue_string.osl" function="mx_geompropvalue_string" target="genosl" />
+  <implementation name="IM_geompropvalue_filename_genosl" nodedef="ND_geompropvalueuniform_filename" file="mx_geompropvalue_filename.osl" function="mx_geompropvalue_filename" target="genosl" />
 
   <!-- ======================================================================== -->
   <!-- Application nodes                                                        -->

templates/stdlib/stdlib_defs.mtlx

@@ -651,7 +651,7 @@
     <input name="diminish" type="float" uiname="Diminish" uifolder="Fractal" uisoftmin="0.0" uisoftmax="1.0" value="0.5" doc="The rate at which noise amplitude is diminished for each octave of Fractal noise. Default is 0.5." spec_desc="The rate at which noise amplitude is diminished for each octave"/>
     <input name="type" type="integer" uiname="Noise Type" uifolder="Common" uisoftmin="0" uisoftmax="3" value="0" enum="Perlin,Cell,Worley,Fractal" enumvalues="0,1,2,3" doc="Menu to select the type of noise: Perlin, Cell, Worley, or Fractal. Default is Perlin." spec_desc="The type of noise function to use.  One of 0 (Perlin), 1 (Cell), 2 (Worley), or 3 (Fractal)"/>
     <input name="style" uiname="Worley Cell Style" type="integer" value="0" enum="Distance,Solid" enumvalues="0,1" doc="Sets the style of cell used when Noise Type is set to Worley." spec_desc="The output style "/>
-    <output name="out" type="float" spec_desc="the computed noise value"/>
+    <output name="out" type="float" default="0.0" spec_desc="the computed noise value"/>
   </nodedef>
 
   <!--
@@ -671,7 +671,7 @@
     <input name="diminish" type="float" uiname="Diminish" uifolder="Fractal" uisoftmin="0.0" uisoftmax="1.0" value="0.5" doc="The rate at which noise amplitude is diminished for each octave of Fractal noise. Default is 0.5." spec_desc="The rate at which noise amplitude is diminished for each octave"/>
     <input name="type" type="integer" uiname="Noise Type" uifolder="Common" uisoftmin="0" uisoftmax="3" value="0" enum="Perlin,Cell,Worley,Fractal" enumvalues="0,1,2,3" doc="Menu to select the type of noise: Perlin, Cell, Worley, or Fractal. Default is Perlin." spec_desc="The type of noise function to use.  One of 0 (Perlin), 1 (Cell), 2 (Worley), or 3 (Fractal)"/>
     <input name="style" uiname="Worley Cell Style" type="integer" value="0" enum="Distance,Solid" enumvalues="0,1" doc="Sets the style of cell used when Noise Type is set to Worley." spec_desc="The output style "/>
-    <output name="out" type="float" spec_desc="the computed noise value"/>
+    <output name="out" type="float" default="0.0" spec_desc="the computed noise value"/>
   </nodedef>
 
   <!--
@@ -1732,6 +1732,7 @@
     <input name="exposure" type="float" uiname="Exposure" uisoftmin="-1.0" uisoftmax="1.0" value="0" doc="Multiplier which increases or decreases color brightness by 2^value." spec_desc="Logarithmic brightness multiplier as 2^`exposure`" />
     <output name="out" type="color4" spec_desc="the color-corrected value" />
   </nodedef>
+
   <!-- ======================================================================== -->
   <!-- Compositing nodes                                                        -->
   <!-- ======================================================================== -->