Merge pull request #1343 from autodesk-forks/adsk_contrib/138_main_sync

1.38.3 ILM main sync

CHANGELOG.md

@@ -1,20 +1,28 @@
 # Change Log
 
-## [1.38.3] - Development
+## [1.38.3] - 2021-12-14
 
 ### Added
+- Added an inheritance structure for versions of Autodesk Standard Surface.
+- Added versioning and customization support to MaterialX namespaces in C++.
 - Added preprocessor definitions for the API version to MaterialXCore.
-- Added an initial ClangFormat file for the MaterialX codebase.
 - Added color transform methods to the Image class.
+- Added an initial ClangFormat file for the MaterialX codebase.
+- Added initial support for FreeBSD.
 - Added support for Xcode 13.
 
 ### Changed
 - Refactored BSDF handling in shader generation, allowing for more flexible and efficient vertical layering.
 - Optimized GLSL implementations for GGX specular, moving common computations to tangent space.
+- Merged the ViewHandler and viewer camera into a new Camera class in MaterialXRender.
+- Updated CMake configuration generation logic, adding handling for shared library builds.
+- Updated the PyBind11 library to version 2.7.1
 
 ### Fixed
+- Fixed a performance regression in MaterialXView for multi-UDIM assets.
 - Fixed a bug that caused shader inputs to be skipped in createUIPropertyGroups.
 - Fixed the value of transmission roughness in UsdPreviewSurface.
+- Fixed Vulkan compatibility for generated GLSL code.
 
 ## [1.38.2] - 2021-10-07
 

CMakeLists.txt

@@ -88,18 +88,16 @@ endif()
 # Namespace
 set(MATERIALX_NAMESPACE_SUFFIX "" CACHE STRING "Add a suffix to the main MaterialX C++ namespace: Options include dev, staging, <YOURFACILITY> etc.")
 if(MATERIALX_NAMESPACE_SUFFIX STREQUAL "")
-	set(MATERIALX_NAMESPACE "MaterialX_v${MATERIALX_MAJOR_VERSION}_${MATERIALX_MINOR_VERSION}_${MATERIALX_BUILD_VERSION}")
+    set(MATERIALX_NAMESPACE "MaterialX_v${MATERIALX_MAJOR_VERSION}_${MATERIALX_MINOR_VERSION}_${MATERIALX_BUILD_VERSION}")
 else()
     set(MATERIALX_NAMESPACE "MaterialX_${MATERIALX_NAMESPACE_SUFFIX}_v${MATERIALX_MAJOR_VERSION}_${MATERIALX_MINOR_VERSION}_${MATERIALX_BUILD_VERSION}")
 endif()
 message(STATUS "Setting namespace to '${MATERIALX_NAMESPACE}'")
 
 # Library name custom suffix
 # This helps an application that needs to ship a dynamic library MaterialX ensure
-# that it has a unique name that won't conflict with one elsewhere on the
-# system.
-set (MATERIALX_LIBNAME_SUFFIX "" CACHE STRING
-     "Specify a suffix to all libraries that are built")
+# that it has a unique name that won't conflict with one elsewhere on the system.
+set (MATERIALX_LIBNAME_SUFFIX "" CACHE STRING "Specify a suffix to all libraries that are built")
 
 mark_as_advanced(MATERIALX_BUILD_DOCS)
 mark_as_advanced(MATERIALX_BUILD_GEN_GLSL)

libraries/bxdf/standard_surface.mtlx

@@ -3,13 +3,15 @@
   <!--
     Autodesk Standard Surface node definition.
   -->
-  <nodedef name="ND_standard_surface_surfaceshader" node="standard_surface" nodegroup="pbr" doc="Autodesk standard surface shader" version="1.0.1" isdefaultversion="true" 
-           inherit="ND_standard_surface_surfaceshader_100">
-    <input name="base" type="float" value="1.0" uimin="0.0" uimax="1.0" uiname="Base" uifolder="Base" doc="Multiplier on the intensity of the diffuse reflection." />
-    <input name="base_color" type="color3" value="0.8, 0.8, 0.8" uimin="0,0,0" uimax="1,1,1" uiname="Base Color" uifolder="Base" doc="Color of the diffuse reflection." />    
+  <nodedef name="ND_standard_surface_surfaceshader" node="standard_surface" nodegroup="pbr" version="1.0.1" isdefaultversion="true" inherit="ND_standard_surface_surfaceshader_100"
+           doc="Autodesk standard surface shader">
+    <input name="base" type="float" value="1.0" uimin="0.0" uimax="1.0" uiname="Base" uifolder="Base"
+           doc="Multiplier on the intensity of the diffuse reflection." />
+    <input name="base_color" type="color3" value="0.8, 0.8, 0.8" uimin="0,0,0" uimax="1,1,1" uiname="Base Color" uifolder="Base"
+           doc="Color of the diffuse reflection." />    
   </nodedef>
 
-  <nodedef name="ND_standard_surface_surfaceshader_100" node="standard_surface" nodegroup="pbr" doc="Autodesk standard surface shader" version="1.0.0" >
+  <nodedef name="ND_standard_surface_surfaceshader_100" node="standard_surface" nodegroup="pbr" version="1.0.0" doc="Autodesk standard surface shader">
     <input name="base" type="float" value="0.8" uimin="0.0" uimax="1.0" uiname="Base" uifolder="Base"
            doc="Multiplier on the intensity of the diffuse reflection." />
     <input name="base_color" type="color3" value="1.0, 1.0, 1.0" uimin="0,0,0" uimax="1,1,1" uiname="Base Color" uifolder="Base"
@@ -98,18 +100,13 @@
   </nodedef>
 
   <!--
-      Association between imlementation and definition.
-      Note that version 1.0.1 only changes some default values and thus reuses the same 1.0.0 nodegraph implementation
-   -->
-   <implementation name="IMPL_standard_surface_surfaceshader_101"
-       nodedef="ND_standard_surface_surfaceshader"
-       nodegraph="NG_standard_surface_surfaceshader_100" />
-
-   <implementation name="IMPL_standard_surface_surfaceshader_100"
-      nodedef="ND_standard_surface_surfaceshader_100"
-      nodegraph="NG_standard_surface_surfaceshader_100" />
+    Association between implementation and definition.
+    Note that version 1.0.1 only changes default values and thus reuses the same 1.0.0 nodegraph implementation.
+  -->
+  <implementation name="IMPL_standard_surface_surfaceshader_101" nodedef="ND_standard_surface_surfaceshader" nodegraph="NG_standard_surface_surfaceshader_100" />
+  <implementation name="IMPL_standard_surface_surfaceshader_100" nodedef="ND_standard_surface_surfaceshader_100" nodegraph="NG_standard_surface_surfaceshader_100" />
 
-   <!--
+  <!--
     Autodesk Standard Surface nodegraph implementation.
   -->
   <nodegraph name="NG_standard_surface_surfaceshader_100">

libraries/pbrlib/pbrlib_defs.mtlx

@@ -421,9 +421,14 @@
     <input name="anisotropy" type="float" value="0.0" uimin="0.0" uimax="1.0" />
     <output name="out" type="vector2" />
   </nodedef>
+
+  <!--
+    Node: <blackbody>
+    Returns the radiant emittance of a blackbody radiator with the given temperature.
+  -->
   <nodedef name="ND_blackbody" node="blackbody" nodegroup="pbr" doc="Returns the radiant emittance of a blackbody radiator with the given temperature.">
     <input name="temperature" type="float" value="5000.0" />
-    <output name="out" type="float" />
+    <output name="out" type="color3" />
   </nodedef>
 
   <!--

source/MaterialXCore/Definition.h

@@ -263,7 +263,6 @@ class MX_CORE_API Implementation : public InterfaceElement
         return getAttribute(PortElement::NODE_GRAPH_ATTRIBUTE);
     }
 
-
     /// @}
     /// @name NodeDef References
     /// @{

source/MaterialXCore/Document.cpp

@@ -396,10 +396,9 @@ vector<OutputPtr> Document::getMaterialOutputs() const
     const string documentUri = getSourceUri();
     for (NodeGraphPtr docNodeGraph : getNodeGraphs())
     {
-        // Skip nodegraphs which are either definitions or are from 
-        // an included file
+        // Skip nodegraphs which are either definitions or are from an included file.
         const string graphUri = docNodeGraph->getSourceUri();
-        if (docNodeGraph->getNodeDef() || (!graphUri.empty() && documentUri != graphUri ))
+        if (docNodeGraph->getNodeDef() || (!graphUri.empty() && documentUri != graphUri))
         {
             continue;
         }

source/MaterialXCore/Document.h

@@ -172,7 +172,7 @@ class MX_CORE_API Document : public GraphElement
     /// @}
     /// @name Material Outputs
     /// @{
-    
+
     /// Return material-type outputs for all nodegraphs in the document.
     vector<OutputPtr> getMaterialOutputs() const;
 

source/MaterialXCore/Interface.h

@@ -651,7 +651,7 @@ class MX_CORE_API InterfaceElement : public TypedElement
     /// Return true if this instance has an exact input match with the given
     /// declaration, where each input of this the instance corresponds to a
     /// declaration input of the same name and type.
-    /// 
+    ///
     /// If an exact input match is not found, and the optional message argument
     /// is provided, then an error message will be appended to the given string.
     bool hasExactInputMatch(ConstInterfaceElementPtr declaration, string* message = nullptr) const;

source/MaterialXCore/Material.cpp

@@ -135,4 +135,3 @@ vector<OutputPtr> getConnectedOutputs(NodePtr node)
 }
 
 MATERIALX_NAMESPACE_END
-

source/MaterialXCore/Node.h

@@ -327,7 +327,7 @@ class MX_CORE_API NodeGraph : public GraphElement
 
     /// @name Material References
     /// @{
-    
+
     /// Return all material-type outputs of the nodegraph.
     vector<OutputPtr> getMaterialOutputs() const;
 

source/MaterialXGenOsl/OslSyntax.cpp

@@ -264,7 +264,7 @@ class OSLFilenameTypeSyntax : public AggregateTypeSyntax
         const string prefix = uniform ? "{" : getName() + "(";
         const string suffix = uniform ? "}" : ")";
         const string filename = port->getValue() ? port->getValue()->getValueString() : EMPTY_STRING;
-        return prefix + "\"" + filename + "\", \"" + port->getColorspace() + "\"" + suffix;
+        return prefix + "\"" + filename + "\", \"" + port->getColorSpace() + "\"" + suffix;
     }
 
     string getValue(const Value& value, bool uniform) const override

source/MaterialXGenShader/ShaderGraph.cpp

@@ -326,7 +326,7 @@ void ShaderGraph::addUnitTransformNode(ShaderInput* input, const UnitTransform&
         shaderInput->setValue(input->getValue());
         shaderInput->setPath(input->getPath());
         shaderInput->setUnit(input->getUnit());
-        shaderInput->setColorspace(input->getColorspace());
+        shaderInput->setColorSpace(input->getColorSpace());
 
         if (input->isBindInput())
         {
@@ -489,8 +489,8 @@ ShaderGraphPtr ShaderGraph::createSurfaceShader(
             const string& nodeColorspace = nodeInput->getColorSpace();
             if (!nodeColorspace.empty())
             {
-                inputSocket->setColorspace(nodeColorspace);
-                input->setColorspace(nodeColorspace);
+                inputSocket->setColorSpace(nodeColorspace);
+                input->setColorSpace(nodeColorspace);
             }
         }
 
@@ -536,7 +536,7 @@ ShaderGraphPtr ShaderGraph::createSurfaceShader(
         const string& inputName = nodeInput->getName();
         const string path = nodePath + NAME_PATH_SEPARATOR + inputName;
         const string& unit = nodeInput->getUnit();
-        const string& colorspace = nodeInput->getColorSpace();
+        const string& colorSpace = nodeInput->getColorSpace();
         ShaderInput* input = newNode->getInput(inputName);
         if (input)
         {
@@ -548,9 +548,9 @@ ShaderGraphPtr ShaderGraph::createSurfaceShader(
             {
                 input->setUnit(unit);
             }
-            if (input->getColorspace().empty() && !colorspace.empty())
+            if (input->getColorSpace().empty() && !colorSpace.empty())
             {
-                input->setColorspace(colorspace);
+                input->setColorSpace(colorSpace);
             }
         }
         ShaderGraphInputSocket* inputSocket = graph->getInputSocket(inputName);
@@ -564,9 +564,9 @@ ShaderGraphPtr ShaderGraph::createSurfaceShader(
             {
                 inputSocket->setUnit(unit);
             }
-            if (inputSocket->getColorspace().empty() && !colorspace.empty())
+            if (inputSocket->getColorSpace().empty() && !colorSpace.empty())
             {
-                inputSocket->setColorspace(colorspace);
+                inputSocket->setColorSpace(colorSpace);
             }
         }
     }
@@ -630,10 +630,10 @@ ShaderGraphPtr ShaderGraph::create(const ShaderGraph* parent, const string& name
         {
             outputSocket->setUnit(outputUnit);
         }
-        const string& outputColorspace = output->getColorSpace();
-        if (!outputColorspace.empty())
+        const string& outputColorSpace = output->getColorSpace();
+        if (!outputColorSpace.empty())
         {
-            outputSocket->setColorspace(outputColorspace);
+            outputSocket->setColorSpace(outputColorSpace);
         }
 
         // Start traversal from this output
@@ -714,11 +714,11 @@ ShaderGraphPtr ShaderGraph::create(const ShaderGraph* parent, const string& name
                         inputSocket->setUnit(unit);
                         input->setUnit(unit);
                     }
-                    const string& colorspace = nodePort->getColorSpace();
-                    if (!colorspace.empty())
+                    const string& colorSpace = nodePort->getColorSpace();
+                    if (!colorSpace.empty())
                     {
-                        inputSocket->setColorspace(colorspace);
-                        input->setColorspace(colorspace);
+                        inputSocket->setColorSpace(colorSpace);
+                        input->setColorSpace(colorSpace);
                     }
                 }
 
@@ -831,11 +831,11 @@ ShaderNode* ShaderGraph::createNode(const Node& node, GenContext& context)
             ShaderOutput* shaderOutput = newNode->getOutput();
             if (shaderOutput)
             {
-                string cs = populateColorTransformMap(colorManagementSystem, shaderOutput, input, targetColorSpace, false);
+                string colorSpace = populateColorTransformMap(colorManagementSystem, shaderOutput, input, targetColorSpace, false);
                 ShaderInput* shaderInput = newNode->getInput(input->getName());
-                if (shaderInput && !cs.empty())
+                if (shaderInput && !colorSpace.empty())
                 {
-                    shaderInput->setColorspace(cs);
+                    shaderInput->setColorSpace(colorSpace);
                 }
                 populateUnitTransformMap(unitSystem, shaderOutput, input, targetDistanceUnit, false);
             }
@@ -950,7 +950,7 @@ void ShaderGraph::finalize(GenContext& context)
                             inputSocket->setPath(input->getPath());
                             inputSocket->setValue(input->getValue());
                             inputSocket->setUnit(input->getUnit());
-                            inputSocket->setColorspace(input->getColorspace());
+                            inputSocket->setColorSpace(input->getColorSpace());
                             if (input->isUniform())
                             {
                                 inputSocket->setUniform();
@@ -1103,10 +1103,10 @@ void ShaderGraph::bypass(GenContext& context, ShaderNode* node, size_t inputInde
             {
                 downstream->setUnit(inputUnit);
             }
-            const string& inputColorspace = input->getColorspace();
-            if (!inputColorspace.empty())
+            const string& inputColorSpace = input->getColorSpace();
+            if (!inputColorSpace.empty())
             {
-                downstream->setColorspace(inputColorspace);
+                downstream->setColorSpace(inputColorSpace);
             }
 
             // Swizzle the input value. Once done clear the channel to indicate
@@ -1309,7 +1309,7 @@ string ShaderGraph::populateColorTransformMap(ColorManagementSystemPtr colorMana
             if (sourceColorSpace != targetColorSpace)
             {
                 // Cache colorspace on shader port
-                shaderPort->setColorspace(sourceColorSpace);
+                shaderPort->setColorSpace(sourceColorSpace);
                 if (colorManagementSystem)
                 { 
                     ColorSpaceTransform transform(sourceColorSpace, targetColorSpace, shaderPort->getType());

source/MaterialXGenShader/ShaderNode.h

@@ -17,9 +17,8 @@
 
 #include <MaterialXCore/Node.h>
 
-#include <iostream>
-
 MATERIALX_NAMESPACE_BEGIN
+
 class ShaderNode;
 class ShaderPort;
 class ShaderInput;
@@ -173,10 +172,10 @@ class MX_GENSHADER_API ShaderPort : public std::enable_shared_from_this<ShaderPo
     ValuePtr getValue() const { return _value; }
 
     /// Set a source color space for the value on this port.
-    void setColorspace(const string& colorspace) { _colorspace = colorspace; }
+    void setColorSpace(const string& colorspace) { _colorspace = colorspace; }
 
     /// Return the source color space for the value on this port.
-    const string& getColorspace() const { return _colorspace; }
+    const string& getColorSpace() const { return _colorspace; }
 
     /// Set a unit type for the value on this port.
     void setUnit(const string& unit) { _unit = unit; }

source/MaterialXRenderGlsl/GlslProgram.cpp

@@ -947,7 +947,7 @@ const GlslProgram::InputMap& GlslProgram::updateUniformsList()
                     Input* input = inputIt->second.get();
                     input->path = v->getPath();
                     input->unit = v->getUnit();
-                    input->colorspace = v->getColorspace();
+                    input->colorspace = v->getColorSpace();
                     input->value = v->getValue();
                     if (input->gltype == glType)
                     {
@@ -962,7 +962,7 @@ const GlslProgram::InputMap& GlslProgram::updateUniformsList()
                             + "\". Semantic: \"" + v->getSemantic()
                             + "\". Value: \"" + (v->getValue() ? v->getValue()->getValueString() : "<none>")
                             + "\". Unit: \"" + (!v->getUnit().empty() ? v->getUnit() : "<none>")
-                            + "\". Colorspace: \"" + (!v->getColorspace().empty() ? v->getColorspace() : "<none>")
+                            + "\". Colorspace: \"" + (!v->getColorSpace().empty() ? v->getColorSpace() : "<none>")
                             + "\". GLType: " + std::to_string(mapTypeToOpenGLType(v->getType()))
                         );
                         uniformTypeMismatchFound = true;
@@ -988,7 +988,7 @@ const GlslProgram::InputMap& GlslProgram::updateUniformsList()
                         input->value = v->getValue();
                         input->path = v->getPath();
                         input->unit = v->getUnit();
-                        input->colorspace = v->getColorspace();
+                        input->colorspace = v->getColorSpace();
                     }
                     else
                     {
@@ -999,7 +999,7 @@ const GlslProgram::InputMap& GlslProgram::updateUniformsList()
                             + "\". Semantic: \"" + v->getSemantic()
                             + "\". Value: \"" + (v->getValue() ? v->getValue()->getValueString() : "<none>")
                             + "\". Unit: \"" + (!v->getUnit().empty() ? v->getUnit() : "<none>")
-                            + "\". Colorspace: \"" + (!v->getColorspace().empty() ? v->getColorspace() : "<none>")
+                            + "\". Colorspace: \"" + (!v->getColorSpace().empty() ? v->getColorSpace() : "<none>")
                             + "\". GLType: " + std::to_string(mapTypeToOpenGLType(v->getType()))
                         );
                         uniformTypeMismatchFound = true;

source/MaterialXRenderHw/SimpleWindowLinux.cpp

@@ -13,6 +13,7 @@
 #include <X11/Intrinsic.h> // for XtCallbackProc definition
 
 MATERIALX_NAMESPACE_BEGIN
+
 SimpleWindow::SimpleWindow()
 {
     clearInternalState();

source/MaterialXTest/MaterialXRender/RenderUtil.h

@@ -8,7 +8,6 @@
 
 #include <MaterialXTest/MaterialXGenShader/GenShaderUtil.h>
 
-#include <MaterialXRender/LightHandler.h>
 #include <MaterialXRender/ImageHandler.h>
 #include <MaterialXRender/Timer.h>
 #include <MaterialXRender/Util.h>

source/MaterialXTest/MaterialXRenderOgsFx/RenderOgsFx.cpp

@@ -9,6 +9,7 @@
 #include <MaterialXFormat/Util.h>
 
 #include <MaterialXGenShader/Shader.h>
+#include <MaterialXRender/LightHandler.h>
 
 #include <MaterialXGenOgsFx/MayaGlslPluginShaderGenerator.h>
 

source/PyMaterialX/PyMaterialXGenShader/PyShaderPort.cpp

@@ -30,6 +30,8 @@ void bindPyShaderPort(py::module& mod)
         .def("getPath", &mx::ShaderPort::getPath)
         .def("setUnit", &mx::ShaderPort::setUnit)
         .def("getUnit", &mx::ShaderPort::getUnit)
+        .def("setColorSpace", &mx::ShaderPort::setColorSpace)
+        .def("getColorSpace", &mx::ShaderPort::getColorSpace)
         .def("isUniform", &mx::ShaderPort::isUniform)
         .def("isEmitted", &mx::ShaderPort::isEmitted);
 }