Merge branch 'main' into python_packaging

.github/workflows/main.yml

@@ -207,7 +207,7 @@ jobs:
       run: |
         python MaterialXTest/main.py
         python MaterialXTest/genshader.py
-        python Scripts/mxformat.py ../resources/Materials/TestSuite/stdlib/upgrade --yes --upgradeVersion True
+        python Scripts/mxformat.py ../resources/Materials/TestSuite/stdlib/upgrade --yes --upgrade
         python Scripts/mxvalidate.py ../resources/Materials/Examples/StandardSurface/standard_surface_marble_solid.mtlx --stdlib --verbose
         python Scripts/mxdoc.py --docType md ../libraries/pbrlib/pbrlib_defs.mtlx
         python Scripts/mxdoc.py --docType html ../libraries/bxdf/standard_surface.mtlx

README.md

@@ -34,27 +34,27 @@ The [MaterialX Viewer](documents/DeveloperGuide/Viewer.md) leverages shader gene
 
 **Figure 1:** Procedural and uniform materials in the MaterialX viewer
 <p float="left">
-  <img src="/documents/Images/MaterialXView_Marble.png" width="204" />
-  <img src="/documents/Images/MaterialXView_Copper.png" width="204" /> 
-  <img src="/documents/Images/MaterialXView_Plastic.png" width="204" /> 
-  <img src="/documents/Images/MaterialXView_Carpaint.png" width="204" /> 
+  <img src="documents/Images/MaterialXView_Marble.png" width="204" />
+  <img src="documents/Images/MaterialXView_Copper.png" width="204" /> 
+  <img src="documents/Images/MaterialXView_Plastic.png" width="204" /> 
+  <img src="documents/Images/MaterialXView_Carpaint.png" width="204" /> 
 </p>
 
 **Figure 2:** Textured, color-space-managed materials in the MaterialX viewer
 <p float="left">
-  <img src="/documents/Images/MaterialXView_TiledBrass.png" width="412" />
-  <img src="/documents/Images/MaterialXView_TiledWood.png" width="412" /> 
+  <img src="documents/Images/MaterialXView_TiledBrass.png" width="412" />
+  <img src="documents/Images/MaterialXView_TiledWood.png" width="412" /> 
 </p>
 
 ### Open Chess Set
 
 The Open Chess Set is an open reference asset, consisting of a [MaterialX file](resources/Materials/Examples/StandardSurface/standard_surface_chess_set.mtlx) in the Standard Surface shading model and a [geometry file](resources/Geometry) in the glTF format.  It was authored by Moeen Sayed and Mujtaba Sayed, and was contributed to the MaterialX project by Side Effects.
 
 **Figure 3:** The Open Chess Set, rendered in Arnold for Maya
-<img src="/documents/Images/OpenChessSet_Arnold_01.png" />
+<img src="documents/Images/OpenChessSet_Arnold_01.png" />
 
 **Figure 4:** The Open Chess Set, rendered in Karma XPU for Houdini
-<img src="/documents/Images/OpenChessSet_Karma_01.png" />
+<img src="documents/Images/OpenChessSet_Karma_01.png" />
 
 ### Pre-Built Binaries
 

documents/Specification/inprog_v1.39/README_v1.39.md → documents/Specification/README.md

@@ -9,7 +9,7 @@ The documents in this folder comprise the complete MaterialX Specification, vers
 * [**MaterialX Specification**](./MaterialX.Specification.md) - the main Specification, describing definitions, core functionality and the standard node library
 * [**MaterialX Physically Based Shading Nodes**](./MaterialX.PBRSpec.md) - describes BSDF and other shading function nodes useful in constructing complex layered rendering shaders using node graphs
 * [**MaterialX Geometry Extensions**](./MaterialX.GeomExts.md) - additional MaterialX elements to define geometry-related information such as collections, properties and material assignments
-* [**MaterialX Supplemental Notes**](./MaterialX.Supplement.md) - describes a number of additional node types built from the standard nodes as well as recommended naming and structuring conventions for libraries of custom node definitions
+* [**MaterialX Supplemental Notes**](./MaterialX.Supplement.md) - describes recommended naming and structuring conventions for libraries of custom node definitions
 
 <p>
 
@@ -45,7 +45,7 @@ Similarly, &lt;token>s in materials and other node instances may now be connecte
 
 **Standardized Color Space Names**
 
-The [standard colorspace names](./MaterialX.Specification.md#color-spaces-and-color-management-systems) in MaterialX have now been defined explicitly in the Specification, and are aligned to their definitions in the ACES 1.2 OCIO config file.  With this change, there is no need for a definition of "cms" or "cmsconfig" in MaterialX documents, so those two attributes have been deprecated.
+The [standard colorspace names](./MaterialX.Specification.md#color-spaces-and-color-management-systems) in MaterialX have now been defined explicitly in the Specification, and are aligned to their definitions in the ACES 1.2 OCIO config file.  With this change, there is no need for a definition of "cms" or "cmsconfig" in MaterialX documents, so those two attributes have been deprecated.  Additionally, two new colorspaces, "srgb_displayp3" and "lin_displayp3" have been added as standard colorspaces.
 
 
 **Disambiguated Nodedef and Nodegraph References**
@@ -74,21 +74,16 @@ Typedefs may now inherit from other types, including built-in types, and may pro
 
 **New and Updated Standard Library Nodes**
 
-The following new operator nodes have been added to the standard library:
+In 1.39, we are removing the distinction between "standard nodes" and "supplemental nodes", and descriptions of both can now be found in the main Specification document.  Nodes that are implemented in the standard distribution using nodegraphs are annotated with "(NG)" in the Spec to differentiate them from nodes implemented in each rendering target's native shading language.
 
-* [Procedural nodes](./MaterialX.Specification.md#procedural-nodes): **tokenvalue**, **checkerboard**, **fractal2d**, **cellnoise1d**
+Additionally, the following new operator nodes have been added to the standard library:
+
+* [Procedural nodes](./MaterialX.Specification.md#procedural-nodes): **tokenvalue**, **checkerboard**, **fractal2d**, **cellnoise1d**, **unifiednoise2d**, **unifiednoise3d**
 * [Geometric nodes](./MaterialX.Specification.md#geometric-nodes): **bump**, **geompropvalueuniform**
-* [Math nodes](./MaterialX.Specification.md#math-nodes): boolean **and**, **or**, **not**; **distance**, **transformcolor** and **creatematrix**, as well as integer-output variants of **floor** and **ceil**
-* [Adjustment nodes](./MaterialX.Specification.md#adjustment-nodes): **curveinversecubic**, **curveuniformlinear** and **curveuniformcubic**
+* [Math nodes](./MaterialX.Specification.md#math-nodes): boolean **and**, **or**, **not**; **distance**, **transformcolor**, **creatematrix** and **triplanarblend**, as well as integer-output variants of **floor** and **ceil**
+* [Adjustment nodes](./MaterialX.Specification.md#adjustment-nodes): **curveinversecubic**, **curveuniformlinear**, **curveuniformcubic** and **colorcorrect**
 * [Conditional nodes](./MaterialX.Specification.md#conditional-nodes): boolean-output variants of **ifgreater**, **ifgreatereq** and **ifequal**; new **ifelse** node
-* [Channel nodes](./MaterialX.Specification.md#channel-nodes): **extractrowvector**
-
-Additionally, the following new supplemental nodes have been added:
-
-* [Procedural nodes](./MaterialX.Supplement.md#supplemental-procedural-nodes): **unifiednoise2d**, **unifiednoise3d**
-* [Math nodes](./MaterialX.Supplement.md#supplemental-math-nodes): **triplanarblend**
-* [Adjustment nodes](./MaterialX.Supplement.md#supplemental-adjustment-nodes): **colorcorrect**
-* [Channel nodes](./MaterialX.Supplement.md#supplemental-channel-nodes): **separatecolor4**
+* [Channel nodes](./MaterialX.Specification.md#channel-nodes): **extractrowvector** and **separatecolor4**
 
 
 **New Physically Based Shading Nodes**