From 49b0835f07e135eb93491997b33bc9fa74a0e5a6 Mon Sep 17 00:00:00 2001 From: Rasmus Bonnedal Date: Fri, 8 Sep 2023 01:33:31 +0200 Subject: [PATCH 01/66] Fix input/output count in Element::clearContent (#1520) When clearContent() is called on an InterfaceElement its _inputCount and _outputCount were not updated even though all inputs and outputs were removed. This led to problems including potential crash in Document::validate(). --- source/MaterialXCore/Element.h | 2 +- source/MaterialXCore/Interface.cpp | 7 +++++++ source/MaterialXCore/Interface.h | 3 +++ source/MaterialXTest/MaterialXCore/Node.cpp | 18 ++++++++++++++++++ .../PyMaterialXCore/PyInterface.cpp | 1 + 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/source/MaterialXCore/Element.h b/source/MaterialXCore/Element.h index 51e5f7dc24..0e00bf596a 100644 --- a/source/MaterialXCore/Element.h +++ b/source/MaterialXCore/Element.h @@ -739,7 +739,7 @@ class MX_CORE_API Element : public std::enable_shared_from_this void copyContentFrom(const ConstElementPtr& source); /// Clear all attributes and descendants from this element. - void clearContent(); + virtual void clearContent(); /// Using the input name as a starting point, modify it to create a valid, /// unique name for a child element. diff --git a/source/MaterialXCore/Interface.cpp b/source/MaterialXCore/Interface.cpp index b733d3a4c7..65570ab6b6 100644 --- a/source/MaterialXCore/Interface.cpp +++ b/source/MaterialXCore/Interface.cpp @@ -611,6 +611,13 @@ ConstInterfaceElementPtr InterfaceElement::getDeclaration(const string&) const return InterfaceElementPtr(); } +void InterfaceElement::clearContent() +{ + _inputCount = 0; + _outputCount = 0; + TypedElement::clearContent(); +} + bool InterfaceElement::hasExactInputMatch(ConstInterfaceElementPtr declaration, string* message) const { for (InputPtr input : getActiveInputs()) diff --git a/source/MaterialXCore/Interface.h b/source/MaterialXCore/Interface.h index 94f6eddbaa..0773d5f836 100644 --- a/source/MaterialXCore/Interface.h +++ b/source/MaterialXCore/Interface.h @@ -639,6 +639,9 @@ class MX_CORE_API InterfaceElement : public TypedElement /// no declaration was found. virtual ConstInterfaceElementPtr getDeclaration(const string& target = EMPTY_STRING) const; + /// Clear all attributes and descendants from this element. + void clearContent() override; + /// 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. diff --git a/source/MaterialXTest/MaterialXCore/Node.cpp b/source/MaterialXTest/MaterialXCore/Node.cpp index 2477d9f486..655ec5b7fb 100644 --- a/source/MaterialXTest/MaterialXCore/Node.cpp +++ b/source/MaterialXTest/MaterialXCore/Node.cpp @@ -136,6 +136,24 @@ TEST_CASE("Node", "[node]") REQUIRE(doc->getOutputs().empty()); } +TEST_CASE("Node inputCount repro", "[node]") +{ + // Create a document. + mx::DocumentPtr doc = mx::createDocument(); + mx::NodePtr constant = doc->addNode("constant"); + constant->setInputValue("value", 0.5f); + + // Check that input count is correct after clearContent + constant->clearContent(); + CHECK(constant->getInputCount() == 0); + + // Check that validate succeeds after clear and rebuild + constant->setType("float"); + mx::OutputPtr output = doc->addOutput(mx::EMPTY_STRING, "float"); + output->setConnectedNode(constant); + CHECK(doc->validate()); +} + TEST_CASE("Flatten", "[nodegraph]") { // Read an example containing graph-based custom nodes. diff --git a/source/PyMaterialX/PyMaterialXCore/PyInterface.cpp b/source/PyMaterialX/PyMaterialXCore/PyInterface.cpp index 2a4645d3b6..2e9b264381 100644 --- a/source/PyMaterialX/PyMaterialXCore/PyInterface.cpp +++ b/source/PyMaterialX/PyMaterialXCore/PyInterface.cpp @@ -93,6 +93,7 @@ void bindPyInterface(py::module& mod) .def("getDefaultVersion", &mx::InterfaceElement::getDefaultVersion) .def("getDeclaration", &mx::InterfaceElement::getDeclaration, py::arg("target") = mx::EMPTY_STRING) + .def("clearContent", &mx::InterfaceElement::clearContent) .def("hasExactInputMatch", &mx::InterfaceElement::hasExactInputMatch, py::arg("declaration"), py::arg("message") = nullptr) BIND_INTERFACE_TYPE_INSTANCE(integer, int) From be5b3389f12f89f3d78025dec285a2959c9e9c86 Mon Sep 17 00:00:00 2001 From: Jonathan Stone Date: Fri, 8 Sep 2023 09:29:48 -0700 Subject: [PATCH 02/66] Finalize changelog for 1.38.8 (#1521) --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf3fdcd50a..b60aaaaf0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log -## [1.38.8] - Development +## [1.38.8] - 2023-09-08 ### Added - Added a broad set of new pattern nodes to MaterialX, including [Circle, Hexagon, Cloverleaf, Line, Grid, Crosshatch](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1411), [Checkerboard](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1328), [Random Color, Random Float](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1330), [Triangle Wave](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1334), [Integer Floor, Integer Ceiling](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1362), and [Distance](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1333). @@ -10,7 +10,7 @@ - Added support for the [lin_displayp3 and srgb_displayp3](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1368) colorspaces in shader generation. - Added support for the [blackbody PBR node](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1367) in shader generation. - Added support for [displacement](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1396) in MDL generation. -- Added an up-axis control to the [triplanar projection node](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1489). +- Added [blend](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1350) and [up-axis](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1489) controls to the triplanar projection node. - Added version details to [shared libraries](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1447) on Windows. - Added a [MacOS 13](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1375) build to GitHub Actions. @@ -23,6 +23,7 @@ - Improved the robustness of [MaterialX unit tests](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1370) with respect to the current working directory. - Simplified the handling of [default colors](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1452) in GLSL generation, removing dynamic branches on texture size. - Simplified the definitions of the [default color transforms](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1352), implementing them as language-independent MaterialX graphs. +- Simplified the interface of [ShaderGenerator::emitFunctionCall](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1344), marking its original interface as deprecated. - Moved the MaterialX specification to [public Markdown files in GitHub](https://github.com/AcademySoftwareFoundation/MaterialX/tree/main/documents/Specification), enabling direct contributions from the community. ### Fixed From f69e4c22f915dd9e1186655a936313faef2f458a Mon Sep 17 00:00:00 2001 From: JGamache-autodesk <56274617+JGamache-autodesk@users.noreply.github.com> Date: Fri, 8 Sep 2023 15:16:13 -0400 Subject: [PATCH 03/66] Refine dot node elision and remove unused code (#1522) Dot nodes were elided in #1152 to prevent creating extra samplers in rasterized shadergen. This preserves the change written by @kwokcb while keeping the distinction between a topological constant node and a non-topological dot node. In scenarios where you want to feed a single color to multiple shader nodes in a complex material, using a constant node will force recompilation every time the color is tweaked, we want users to be able to use a dot node to feed the graph, which should allow tweaking the color without having to recompile the shader. Also allows re-using the shader code for material instances differing on this input color. --- .../stdlib/organization/organization.mtlx | 10 +++++ source/MaterialXGenShader/ShaderGraph.cpp | 40 ++----------------- source/MaterialXGenShader/ShaderNode.cpp | 10 ----- source/MaterialXGenShader/ShaderNode.h | 13 ++---- 4 files changed, 18 insertions(+), 55 deletions(-) diff --git a/resources/Materials/TestSuite/stdlib/organization/organization.mtlx b/resources/Materials/TestSuite/stdlib/organization/organization.mtlx index 21154aecdd..0f4c024848 100644 --- a/resources/Materials/TestSuite/stdlib/organization/organization.mtlx +++ b/resources/Materials/TestSuite/stdlib/organization/organization.mtlx @@ -90,4 +90,14 @@ + + + + + + + + + + diff --git a/source/MaterialXGenShader/ShaderGraph.cpp b/source/MaterialXGenShader/ShaderGraph.cpp index 8a424f8bf5..8482659b34 100644 --- a/source/MaterialXGenShader/ShaderGraph.cpp +++ b/source/MaterialXGenShader/ShaderGraph.cpp @@ -1027,48 +1027,16 @@ void ShaderGraph::optimize(GenContext& context) } else if (node->hasClassification(ShaderNode::Classification::DOT)) { - // Dot nodes without modifiers can be elided by moving their connection downstream. + // Filename dot nodes must be elided so they do not create extra samplers. ShaderInput* in = node->getInput("in"); - if (in->getChannels().empty()) + if (in->getChannels().empty() && in->getType() == Type::FILENAME) { bypass(context, node, 0); ++numEdits; } } - else if (node->hasClassification(ShaderNode::Classification::IFELSE)) - { - // Check if we have a constant conditional expression - ShaderInput* intest = node->getInput("intest"); - if (!intest->getConnection()) - { - // Find which branch should be taken - ShaderInput* cutoff = node->getInput("cutoff"); - ValuePtr value = intest->getValue(); - const float intestValue = value ? value->asA() : 0.0f; - const int branch = (intestValue <= cutoff->getValue()->asA() ? 2 : 3); - - // Bypass the conditional using the taken branch - bypass(context, node, branch); - - ++numEdits; - } - } - else if (node->hasClassification(ShaderNode::Classification::SWITCH)) - { - // Check if we have a constant conditional expression - const ShaderInput* which = node->getInput("which"); - if (!which->getConnection()) - { - // Find which branch should be taken - ValuePtr value = which->getValue(); - const int branch = int(value == nullptr ? 0 : (which->getType() == Type::FLOAT ? value->asA() : value->asA())); - - // Bypass the conditional using the taken branch - bypass(context, node, branch); - - ++numEdits; - } - } + // Adding more nodes here requires them to have an input that is tagged + // "uniform" in the NodeDef or to handle very specific cases, like FILENAME. } if (numEdits > 0) diff --git a/source/MaterialXGenShader/ShaderNode.cpp b/source/MaterialXGenShader/ShaderNode.cpp index 3eb750f1ff..04551cb6d2 100644 --- a/source/MaterialXGenShader/ShaderNode.cpp +++ b/source/MaterialXGenShader/ShaderNode.cpp @@ -135,8 +135,6 @@ const ShaderNodePtr ShaderNode::NONE = createEmptyNode(); const string ShaderNode::CONSTANT = "constant"; const string ShaderNode::DOT = "dot"; const string ShaderNode::IMAGE = "image"; -const string ShaderNode::COMPARE = "compare"; -const string ShaderNode::SWITCH = "switch"; const string ShaderNode::SURFACESHADER = "surfaceshader"; const string ShaderNode::SCATTER_MODE = "scatter_mode"; const string ShaderNode::BSDF_R = "R"; @@ -292,14 +290,6 @@ ShaderNodePtr ShaderNode::create(const ShaderGraph* parent, const string& name, { newNode->_classification = Classification::TEXTURE | Classification::DOT; } - else if (nodeDef.getNodeString() == COMPARE) - { - newNode->_classification = Classification::TEXTURE | Classification::CONDITIONAL | Classification::IFELSE; - } - else if (nodeDef.getNodeString() == SWITCH) - { - newNode->_classification = Classification::TEXTURE | Classification::CONDITIONAL | Classification::SWITCH; - } // Third, check for file texture classification by group name else if (groupName == TEXTURE2D_GROUPNAME || groupName == TEXTURE3D_GROUPNAME) { diff --git a/source/MaterialXGenShader/ShaderNode.h b/source/MaterialXGenShader/ShaderNode.h index 30e3ab6d59..536e0adc1e 100644 --- a/source/MaterialXGenShader/ShaderNode.h +++ b/source/MaterialXGenShader/ShaderNode.h @@ -350,14 +350,11 @@ class MX_GENSHADER_API ShaderNode static const uint32_t VOLUME = 1 << 15; /// A volume shader node static const uint32_t LIGHT = 1 << 16; /// A light shader node static const uint32_t UNLIT = 1 << 17; /// An unlit surface shader node - // Specific conditional types - static const uint32_t IFELSE = 1 << 18; /// An if-else statement - static const uint32_t SWITCH = 1 << 19; /// A switch statement // Types based on nodegroup - static const uint32_t SAMPLE2D = 1 << 20; /// Can be sampled in 2D (uv space) - static const uint32_t SAMPLE3D = 1 << 21; /// Can be sampled in 3D (position) - static const uint32_t GEOMETRIC = 1 << 22; /// Geometric input - static const uint32_t DOT = 1 << 23; /// A dot node + static const uint32_t SAMPLE2D = 1 << 18; /// Can be sampled in 2D (uv space) + static const uint32_t SAMPLE3D = 1 << 19; /// Can be sampled in 3D (position) + static const uint32_t GEOMETRIC = 1 << 20; /// Geometric input + static const uint32_t DOT = 1 << 21; /// A dot node }; static const ShaderNodePtr NONE; @@ -365,8 +362,6 @@ class MX_GENSHADER_API ShaderNode static const string CONSTANT; static const string DOT; static const string IMAGE; - static const string COMPARE; - static const string SWITCH; static const string SURFACESHADER; static const string SCATTER_MODE; static const string BSDF_R; From 92734332d595278298ad08e6543409bbabf344f0 Mon Sep 17 00:00:00 2001 From: Jonathan Stone Date: Fri, 8 Sep 2023 12:26:50 -0700 Subject: [PATCH 04/66] Additional changelog updates for 1.38.8 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b60aaaaf0e..5704c54b84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ - Simplified the handling of [default colors](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1452) in GLSL generation, removing dynamic branches on texture size. - Simplified the definitions of the [default color transforms](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1352), implementing them as language-independent MaterialX graphs. - Simplified the interface of [ShaderGenerator::emitFunctionCall](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1344), marking its original interface as deprecated. +- Marked legacy interfaces for [findRenderableElements and findRenderableMaterialNodes](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1340) as deprecated, making their usage visible to clients as compiler warnings. - Moved the MaterialX specification to [public Markdown files in GitHub](https://github.com/AcademySoftwareFoundation/MaterialX/tree/main/documents/Specification), enabling direct contributions from the community. ### Fixed @@ -33,6 +34,7 @@ - Fixed a bug to improve [shader generation determinism](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1376). - Fixed a bug to improve the [consistency of auto layout](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1389) in the MaterialX Graph Editor. - Fixed a bug to enable [multi-output connection edits](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1506) in the MaterialX Graph Editor. +- Fixed a bug in [dot node optimizations](https://github.com/AcademySoftwareFoundation/MaterialX/pull/1522) for shader generation. ## [1.38.7] - 2023-04-21 From 46a5b507b82bb38a70c66877e5d87e588ca9785e Mon Sep 17 00:00:00 2001 From: Jonathan Stone Date: Sun, 10 Sep 2023 10:50:11 -0700 Subject: [PATCH 05/66] Update development build to 1.38.9 --- CHANGELOG.md | 2 ++ CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5704c54b84..47b1bfe8b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Change Log +## [1.38.9] - Development + ## [1.38.8] - 2023-09-08 ### Added diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e8763d6c7..c255924fa4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # MaterialX Version set(MATERIALX_MAJOR_VERSION 1) set(MATERIALX_MINOR_VERSION 38) -set(MATERIALX_BUILD_VERSION 8) +set(MATERIALX_BUILD_VERSION 9) set(MATERIALX_LIBRARY_VERSION ${MATERIALX_MAJOR_VERSION}.${MATERIALX_MINOR_VERSION}.${MATERIALX_BUILD_VERSION}) # Cmake setup From 1a39d99a41ccfd5c0a12759b185af3946e2ff45f Mon Sep 17 00:00:00 2001 From: Jonathan Stone Date: Tue, 12 Sep 2023 17:03:47 -0700 Subject: [PATCH 06/66] Update documentation - Update links to pre-built binaries in README.md. - Update link to ASWF Open Source Days in README.md. - Update MaterialX Overview in MainPage.md. - Update code and data syntax in ShaderGeneration.md. - Update documentation for the ImageHandler::acquireImage method. --- README.md | 8 +- documents/DeveloperGuide/MainPage.md | 2 +- documents/DeveloperGuide/ShaderGeneration.md | 135 +++++++++---------- source/MaterialXRender/ImageHandler.h | 3 + 4 files changed, 71 insertions(+), 77 deletions(-) diff --git a/README.md b/README.md index e6c6e2d0e4..ddccb4a9db 100644 --- a/README.md +++ b/README.md @@ -60,13 +60,13 @@ The Open Chess Set is an open reference asset, consisting of a [MaterialX file]( The following packages contain pre-built binaries for the latest release, including the MaterialX viewer, Python libraries, and example assets: -- [Microsoft Windows (Visual Studio 2022, Python 3.9)](https://github.com/AcademySoftwareFoundation/MaterialX/releases/latest/download/MaterialX_Windows_VS2022_x64_Python39.zip) -- [MacOS (Xcode 13, Python 3.9)](https://github.com/AcademySoftwareFoundation/MaterialX/releases/latest/download/MaterialX_MacOS_Xcode_13_Python39.zip) -- [Linux (GCC 11, Python 3.9)](https://github.com/AcademySoftwareFoundation/MaterialX/releases/latest/download/MaterialX_Linux_GCC_11_Python39.zip) +- [Microsoft Windows (Visual Studio 2022, Python 3.11)](https://github.com/AcademySoftwareFoundation/MaterialX/releases/latest/download/MaterialX_Windows_VS2022_x64_Python311.zip) +- [MacOS (Xcode 14, Python 3.11)](https://github.com/AcademySoftwareFoundation/MaterialX/releases/latest/download/MaterialX_MacOS_Xcode_14_Python311.zip) +- [Linux (GCC 12, Python 3.11)](https://github.com/AcademySoftwareFoundation/MaterialX/releases/latest/download/MaterialX_Linux_GCC_12_Python311.zip) ### Additional Resources - The [Developer Guide](http://www.materialx.org/docs/api/index.html) contains a developer-oriented overview of MaterialX with API documentation. - The [Python Scripts](python/Scripts) folder contains standalone examples of MaterialX Python code. - The [JavaScript](javascript) folder contains details on building JavaScript bindings for MaterialX. -- Presentations at [ASWF Open Source Days](http://www.materialx.org/assets/ASWF_OSD2022_MaterialX_OSL_Final.pdf) and the [SIGGRAPH Physically Based Shading Course](https://blog.selfshadow.com/publications/s2020-shading-course/#materialx) provide details on the roadmap for MaterialX development. +- Presentations at [ASWF Open Source Days](https://materialx.org/assets/ASWF_OSD2023_MaterialX_Final.pdf) and the [SIGGRAPH Physically Based Shading Course](https://blog.selfshadow.com/publications/s2020-shading-course/#materialx) provide details on the roadmap for MaterialX development. diff --git a/documents/DeveloperGuide/MainPage.md b/documents/DeveloperGuide/MainPage.md index 79441a3e4d..d6c098a23d 100644 --- a/documents/DeveloperGuide/MainPage.md +++ b/documents/DeveloperGuide/MainPage.md @@ -1,6 +1,6 @@ # MaterialX Overview -MaterialX is an open standard for transfer of rich material and look-development content between applications and renderers. Originated at Lucasfilm in 2012, MaterialX has been used by Industrial Light & Magic (ILM) in feature films such as _Star Wars: The Force Awakens_ and real-time experiences such as _Trials on Tatooine_, and it remains the central material format for new ILM productions. +MaterialX is an open standard for representing rich material and look-development content in computer graphics, enabling its platform-independent description and exchange across applications and renderers. Launched at [Industrial Light & Magic](https://www.ilm.com/) in 2012, MaterialX has been a key technology in their feature films and real-time experiences since _Star Wars: The Force Awakens_ and _Millennium Falcon: Smugglers Run_. The project was released as open source in 2017, with companies including Sony Pictures Imageworks, Pixar, Autodesk, Adobe, and SideFX contributing to its ongoing development. In 2021, MaterialX became the seventh hosted project of the [Academy Software Foundation](https://www.aswf.io/). ### Quick Start for Developers diff --git a/documents/DeveloperGuide/ShaderGeneration.md b/documents/DeveloperGuide/ShaderGeneration.md index 059b34d580..01bd823ec4 100644 --- a/documents/DeveloperGuide/ShaderGeneration.md +++ b/documents/DeveloperGuide/ShaderGeneration.md @@ -33,37 +33,41 @@ Figure 2. The first option is to keep inline code in a file. The file extension ```xml // Nodedef elements for node - - - + + + + - - - + + + + <... more types ...> // Implementation elements for node - - + + <... more types ...> // Nodedef elements for node - - - - + + + + + - - - - + + + + + <... more types ...> // Implementation elements for node - - + + <... more types ...> ``` ```c++ @@ -79,30 +83,29 @@ For nodes that can’t be implemented by inline expressions a function definitio ```xml // Nodedef element - - - - - - - - - - - + + + + + + + + + + + + // Implementation element - + ``` ```c++ // File 'mx_image_color3.osl' contains: void mx_image_color3(string file, string layer, color defaultvalue, - vector2 texcoord, string filtertype, - string uaddressmode, string vaddressmode, - string framerange, int frameoffset, - string frameendaction, output color out) + vector2 texcoord, string uaddressmode, string vaddressmode, string filtertype, + string framerange, int frameoffset, string frameendaction, + output color out) { // Sample the texture out = texture(file, texcoord.x, texcoord.y, @@ -120,40 +123,28 @@ As an alternative to defining source code, there is also an option to reference This is useful for creating a compound for a set of nodes performing some common operation. It can then be referenced as a node inside other nodegraphs. It is also useful for creating compatibility graphs for unknown nodes. If a node is created by some third party, and its implementation is unknown or proprietary, a compatibility graph can be created using known nodes and be referenced as a stand-in implementation. Linking a nodegraph to a nodedef is done by simply setting a nodedef attribute on the nodegraph definition. See Figure 4 for an example. ```xml - - + + + + - - - - - + + - - - - - - - - - - + + - - - - - - - - - - + + + + + + + - + ``` **Figure 4**: Checker node implementation using a nodegraph. @@ -161,10 +152,9 @@ This is useful for creating a compound for a set of nodes performing some common ### 1.3.4 Dynamic Code Generation In some situations static source code is not enough to implement a node. The code might need to be customized depending on parameters set on the node. Or for a hardware render target vertex streams or uniform inputs might need to be created in order to supply the data needed for the node implementation. -In this case, a C++ class can be added to handle the implementation of the node. The class should be derived from the base class `ShaderNodeImpl`. It should specify what language and target it is for by overriding `getLanguage()` and `getTarget()`. It can also be specified to support all languages or all targets by setting the identifier to an empty string, as done for the target identifier in the example below. It then needs to be registered for a `ShaderGenerator` by calling `ShaderGenerator::registerImplementation()`. See Figure 5 for an example. +In this case, a C++ class can be added to handle the implementation of the node. The class should be derived from the base class `ShaderNodeImpl`. It should specify what target it is for by overriding `getTarget()`. It then needs to be registered for a `ShaderGenerator` by calling `ShaderGenerator::registerImplementation()`. See Figure 5 for an example. -When a `ShaderNodeImpl` class is used for a nodedef the corresponding `` -element doesn’t need a file attribute, since no static source code is used. The `` element will then act only as a declaration that there exists an implementation for the nodedef for a particular language and target. +When a `ShaderNodeImpl` class is used for a nodedef the corresponding `` element doesn’t need a file attribute, since no static source code is used. The `` element will then act only as a declaration that there exists an implementation for the nodedef for a particular target. Note that by using a `ShaderNodeImpl` class for your node's implementation it is no longer data driven, as in the other three methods above. So it's recommended to use this only when inline expressions or static source code functions are not enough to handle the implementation of a node. @@ -175,8 +165,7 @@ class FooOsl : public ShaderNodeImpl public: static ShaderNodeImplPtr create() { return std::make_shared(); } - const string& getLanguage() const override { return LANGUAGE_OSL; } - const string& getTarget() const override { return EMPTY_STRING; } + const string& getTarget() const override { return OslShaderGenerator::TARGET; } void emitFunctionDefinition(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override @@ -291,7 +280,8 @@ class TexCoordGlsl : public ShaderNodeImpl const string index = indexInput ? indexInput->getValue()->getValueString() : "0"; const string variable = "texcoord_" + index; - BEGIN_SHADER_STAGE(stage, Stage::VERTEX) + DEFINE_SHADER_STAGE(stage, Stage::VERTEX) + { VariableBlock& vertexData = stage.getOutputBlock(HW::VERTEX_DATA); const string prefix = vertexData.getInstance() + "."; ShaderPort* texcoord = vertexData[variable]; @@ -300,9 +290,10 @@ class TexCoordGlsl : public ShaderNodeImpl shadergen.emitLine(prefix + texcoord->getVariable() + " = i_" + variable, stage); texcoord->setEmitted(); } - END_SHADER_STAGE(shader, Stage::VERTEX) + } - BEGIN_SHADER_STAGE(stage, Stage::PIXEL) + DEFINE_SHADER_STAGE(stage, Stage::PIXEL) + { VariableBlock& vertexData = stage.getInputBlock(HW::VERTEX_DATA); const string prefix = vertexData.getInstance() + "."; ShaderPort* texcoord = vertexData[variable]; @@ -310,7 +301,7 @@ class TexCoordGlsl : public ShaderNodeImpl shadergen.emitOutput(node.getOutput(), true, false, context, stage); shadergen.emitString(" = " + prefix + texcoord->getVariable(), stage); shadergen.emitLineEnd(stage); - END_SHADER_STAGE(shader, Stage::PIXEL) + } } }; ``` diff --git a/source/MaterialXRender/ImageHandler.h b/source/MaterialXRender/ImageHandler.h index c744eb2f6a..fafc021857 100644 --- a/source/MaterialXRender/ImageHandler.h +++ b/source/MaterialXRender/ImageHandler.h @@ -186,7 +186,10 @@ class MX_RENDER_API ImageHandler /// Acquire an image from the cache or file system. If the image is not /// found in the cache, then each image loader will be applied in turn. + /// If the image cannot be found by any loader, then a uniform image of the + /// given default color will be returned. /// @param filePath File path of the image. + /// @param defaultColor Default color to use as a fallback for missing images. /// @return On success, a shared pointer to the acquired image. ImagePtr acquireImage(const FilePath& filePath, const Color4& defaultColor = Color4(0.0f)); From a5a74feab2eec007ca8e87eeb9c57c667e32ff2c Mon Sep 17 00:00:00 2001 From: Niklas Harrysson Date: Sun, 17 Sep 2023 00:11:53 +0200 Subject: [PATCH 07/66] Fix attenuation of coated emission in Standard Surface (#1534) This change list fixes a math mistake in the handling of how emission is attenuated by the top coat in Standard Surface. Thanks to @portsmouth and @Reedbeta for reporting my mistake and suggesting a workaround. --- libraries/bxdf/standard_surface.mtlx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libraries/bxdf/standard_surface.mtlx b/libraries/bxdf/standard_surface.mtlx index 843885aa50..c7de68929a 100644 --- a/libraries/bxdf/standard_surface.mtlx +++ b/libraries/bxdf/standard_surface.mtlx @@ -386,6 +386,10 @@ + + + + @@ -398,8 +402,8 @@ - - + + From 6c486837e682abd61fdd566fc28ef9980cdcda93 Mon Sep 17 00:00:00 2001 From: Jonathan Stone Date: Fri, 22 Sep 2023 10:26:46 -0700 Subject: [PATCH 08/66] Align default precision across shading languages (#1538) This changelist removes explicit overrides of floating-point precision in shader generation, making the default precision 6 decimal places across shading languages, and allowing the client to adjust the precision of generated shaders via Value::setFloatPrecision. This addresses a slight visual regression in generated OSL (with a maximum visual error on the order of 1e-3), caused by a hard-coding of floating-point precision to 3 decimal places in OslSyntax. --- source/MaterialXCore/Value.cpp | 5 ++++- source/MaterialXCore/Value.h | 2 +- source/MaterialXGenGlsl/GlslShaderGenerator.cpp | 4 +--- source/MaterialXGenMdl/MdlShaderGenerator.cpp | 3 +++ source/MaterialXGenMsl/MslShaderGenerator.cpp | 4 +--- source/MaterialXGenOsl/OslShaderGenerator.cpp | 3 +++ source/MaterialXGenOsl/OslSyntax.cpp | 1 - 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/source/MaterialXCore/Value.cpp b/source/MaterialXCore/Value.cpp index 238473d5ad..3e8c1f4462 100644 --- a/source/MaterialXCore/Value.cpp +++ b/source/MaterialXCore/Value.cpp @@ -242,7 +242,10 @@ ScopedFloatFormatting::ScopedFloatFormatting(Value::FloatFormat format, int prec _precision(Value::getFloatPrecision()) { Value::setFloatFormat(format); - Value::setFloatPrecision(precision); + if (precision >= 0) + { + Value::setFloatPrecision(precision); + } } ScopedFloatFormatting::~ScopedFloatFormatting() diff --git a/source/MaterialXCore/Value.h b/source/MaterialXCore/Value.h index 8e55a97acf..1bd29b1d2b 100644 --- a/source/MaterialXCore/Value.h +++ b/source/MaterialXCore/Value.h @@ -198,7 +198,7 @@ template class MX_CORE_API TypedValue : public Value class MX_CORE_API ScopedFloatFormatting { public: - explicit ScopedFloatFormatting(Value::FloatFormat format, int precision = 6); + explicit ScopedFloatFormatting(Value::FloatFormat format, int precision = -1); ~ScopedFloatFormatting(); private: diff --git a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp index 766b61ec05..839f591aa5 100644 --- a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp +++ b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp @@ -279,9 +279,7 @@ ShaderPtr GlslShaderGenerator::generate(const string& name, ElementPtr element, { ShaderPtr shader = createShader(name, element, context); - // Turn on fixed float formatting to make sure float values are - // emitted with a decimal point and not as integers, and to avoid - // any scientific notation which isn't supported by all OpenGL targets. + // Request fixed floating-point notation for consistency across targets. ScopedFloatFormatting fmt(Value::FloatFormatFixed); // Make sure we initialize/reset the binding context before generation. diff --git a/source/MaterialXGenMdl/MdlShaderGenerator.cpp b/source/MaterialXGenMdl/MdlShaderGenerator.cpp index dddf1f2f13..f64b555c20 100644 --- a/source/MaterialXGenMdl/MdlShaderGenerator.cpp +++ b/source/MaterialXGenMdl/MdlShaderGenerator.cpp @@ -198,6 +198,9 @@ ShaderPtr MdlShaderGenerator::generate(const string& name, ElementPtr element, G ShaderPtr shader = createShader(name, element, context); + // Request fixed floating-point notation for consistency across targets. + ScopedFloatFormatting fmt(Value::FloatFormatFixed); + ShaderGraph& graph = shader->getGraph(); ShaderStage& stage = shader->getStage(Stage::PIXEL); diff --git a/source/MaterialXGenMsl/MslShaderGenerator.cpp b/source/MaterialXGenMsl/MslShaderGenerator.cpp index dcb0a3ed69..0d97e8408f 100644 --- a/source/MaterialXGenMsl/MslShaderGenerator.cpp +++ b/source/MaterialXGenMsl/MslShaderGenerator.cpp @@ -283,9 +283,7 @@ ShaderPtr MslShaderGenerator::generate(const string& name, ElementPtr element, G { ShaderPtr shader = createShader(name, element, context); - // Turn on fixed float formatting to make sure float values are - // emitted with a decimal point and not as integers, and to avoid - // any scientific notation which isn't supported by all OpenGL targets. + // Request fixed floating-point notation for consistency across targets. ScopedFloatFormatting fmt(Value::FloatFormatFixed); // Make sure we initialize/reset the binding context before generation. diff --git a/source/MaterialXGenOsl/OslShaderGenerator.cpp b/source/MaterialXGenOsl/OslShaderGenerator.cpp index b4edbee44b..b37a84c579 100644 --- a/source/MaterialXGenOsl/OslShaderGenerator.cpp +++ b/source/MaterialXGenOsl/OslShaderGenerator.cpp @@ -170,6 +170,9 @@ ShaderPtr OslShaderGenerator::generate(const string& name, ElementPtr element, G { ShaderPtr shader = createShader(name, element, context); + // Request fixed floating-point notation for consistency across targets. + ScopedFloatFormatting fmt(Value::FloatFormatFixed); + ShaderGraph& graph = shader->getGraph(); ShaderStage& stage = shader->getStage(Stage::PIXEL); diff --git a/source/MaterialXGenOsl/OslSyntax.cpp b/source/MaterialXGenOsl/OslSyntax.cpp index d421c5e3d9..5a6b45dd61 100644 --- a/source/MaterialXGenOsl/OslSyntax.cpp +++ b/source/MaterialXGenOsl/OslSyntax.cpp @@ -220,7 +220,6 @@ class OSLMatrix3TypeSyntax : public AggregateTypeSyntax string getValue(const Value& value, bool uniform) const override { - ScopedFloatFormatting fmt(Value::FloatFormatFixed, 3); StringVec values = splitString(value.getValueString(), ","); return getValue(values, uniform); } From 7009c6daf7459716350593e318e4243d6e808f19 Mon Sep 17 00:00:00 2001 From: Jonathan Stone Date: Thu, 28 Sep 2023 17:57:00 -0700 Subject: [PATCH 09/66] Initial coverage test in GitHub CI This changelist adds an initial coverage test to GitHub Actions builds, uploading the generated HTML document as a new build artifact. --- .github/workflows/main.yml | 61 +++++++++++++++++++++++++++----------- CMakeLists.txt | 6 ++++ 2 files changed, 50 insertions(+), 17 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d5ac9d3f79..4fdcefb7fb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,6 +39,14 @@ jobs: python: 3.11 upload_shaders: ON + - name: Linux_GCC_CoverageAnalysis + os: ubuntu-22.04 + compiler: gcc + compiler_version: "None" + python: None + coverage_analysis: ON + cmake_config: -DMATERIALX_COVERAGE_ANALYSIS=ON -DMATERIALX_BUILD_RENDER=OFF -DMATERIALX_BUILD_PYTHON=OFF + - name: Linux_Clang_10_Python37 os: ubuntu-20.04 compiler: clang @@ -120,28 +128,32 @@ jobs: run: | sudo apt-get update sudo apt-get install xorg-dev mesa-utils - if [ "${{ matrix.compiler }}" = "gcc" ]; then - sudo apt-get install -y g++-${{ matrix.compiler_version }} g++-${{ matrix.compiler_version }}-multilib - echo "CC=gcc-${{ matrix.compiler_version }}" >> $GITHUB_ENV - echo "CXX=g++-${{ matrix.compiler_version }}" >> $GITHUB_ENV - else - sudo apt-get install -y clang-${{ matrix.compiler_version }} libc++-${{ matrix.compiler_version }}-dev libc++abi-${{ matrix.compiler_version }}-dev - echo "CC=clang-${{ matrix.compiler_version }}" >> $GITHUB_ENV - echo "CXX=clang++-${{ matrix.compiler_version }}" >> $GITHUB_ENV + if [ "${{ matrix.compiler_version }}" != 'None' ]; then + if [ "${{ matrix.compiler }}" = "gcc" ]; then + sudo apt-get install -y g++-${{ matrix.compiler_version }} g++-${{ matrix.compiler_version }}-multilib + echo "CC=gcc-${{ matrix.compiler_version }}" >> $GITHUB_ENV + echo "CXX=g++-${{ matrix.compiler_version }}" >> $GITHUB_ENV + else + sudo apt-get install -y clang-${{ matrix.compiler_version }} libc++-${{ matrix.compiler_version }}-dev libc++abi-${{ matrix.compiler_version }}-dev + echo "CC=clang-${{ matrix.compiler_version }}" >> $GITHUB_ENV + echo "CXX=clang++-${{ matrix.compiler_version }}" >> $GITHUB_ENV + fi fi - name: Install Dependencies (MacOS) if: runner.os == 'macOS' run: | - if [ "${{ matrix.compiler }}" = "gcc" ]; then - brew install gcc@${{ matrix.compiler_version }} - echo "CC=gcc-${{ matrix.compiler_version }}" >> $GITHUB_ENV - echo "CXX=g++-${{ matrix.compiler_version }}" >> $GITHUB_ENV - else - ls -ls /Applications/ - sudo xcode-select -switch /Applications/Xcode_${{ matrix.compiler_version }}.app - echo "CC=clang" >> $GITHUB_ENV - echo "CXX=clang++" >> $GITHUB_ENV + if [ "${{ matrix.compiler_version }}" != 'None' ]; then + if [ "${{ matrix.compiler }}" = "gcc" ]; then + brew install gcc@${{ matrix.compiler_version }} + echo "CC=gcc-${{ matrix.compiler_version }}" >> $GITHUB_ENV + echo "CXX=g++-${{ matrix.compiler_version }}" >> $GITHUB_ENV + else + ls -ls /Applications/ + sudo xcode-select -switch /Applications/Xcode_${{ matrix.compiler_version }}.app + echo "CC=clang" >> $GITHUB_ENV + echo "CXX=clang++" >> $GITHUB_ENV + fi fi - name: Install Dependencies (Windows) @@ -222,6 +234,14 @@ jobs: run: | python python/Scripts/generateshader.py resources/Materials/Examples/StandardSurface --target msl --validator "xcrun metal --language=metal" --validatorArgs="-w" + - name: Coverage Analysis Tests + if: matrix.coverage_analysis == 'ON' + run: | + sudo apt-get install gcovr + mkdir coverage + gcovr --html --html-details --output coverage/index.html --exclude .*\/External\/.* --root .. . + working-directory: build + - name: Static Analysis Tests if: matrix.static_analysis == 'ON' && runner.os == 'Linux' run: | @@ -279,6 +299,13 @@ jobs: name: Renders_${{ matrix.name }} path: build/render/*.png + - name: Upload Coverage Report + uses: actions/upload-artifact@v3 + if: matrix.coverage_analysis == 'ON' + with: + name: MaterialX_Coverage + path: build/coverage + - name: JavaScript CMake Generate if: matrix.build_javascript == 'ON' run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index c255924fa4..de6aa7442f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,6 +52,7 @@ option(MATERIALX_INSTALL_PYTHON "Install the MaterialX Python package as a third option(MATERIALX_INSTALL_RESOURCES "Install the resources folder when building render modules." ON) option(MATERIALX_TEST_RENDER "Run rendering tests for MaterialX Render module. GPU required for graphics validation." ON) option(MATERIALX_WARNINGS_AS_ERRORS "Interpret all compiler warnings as errors." OFF) +option(MATERIALX_COVERAGE_ANALYSIS "Build MaterialX libraries with coverage analysis on supporting platforms." OFF) option(MATERIALX_DYNAMIC_ANALYSIS "Build MaterialX libraries with dynamic analysis on supporting platforms." OFF) option(MATERIALX_OSL_LEGACY_CLOSURES "Build OSL shader generation supporting the legacy OSL closures." ON) @@ -138,6 +139,7 @@ mark_as_advanced(MATERIALX_INSTALL_PYTHON) mark_as_advanced(MATERIALX_INSTALL_RESOURCES) mark_as_advanced(MATERIALX_TEST_RENDER) mark_as_advanced(MATERIALX_WARNINGS_AS_ERRORS) +mark_as_advanced(MATERIALX_COVERAGE_ANALYSIS) mark_as_advanced(MATERIALX_DYNAMIC_ANALYSIS) mark_as_advanced(MATERIALX_PYTHON_VERSION) mark_as_advanced(MATERIALX_PYTHON_EXECUTABLE) @@ -228,6 +230,10 @@ else() if(MATERIALX_WARNINGS_AS_ERRORS) add_compile_options(-Werror) endif() + if(MATERIALX_COVERAGE_ANALYSIS) + add_compile_options(--coverage -O0) + add_link_options(--coverage) + endif() if(MATERIALX_DYNAMIC_ANALYSIS) set(DYNAMIC_ANALYSIS_OPTIONS -fsanitize=address -fsanitize=leak -fsanitize=undefined -fno-sanitize-recover=all) add_compile_options(${DYNAMIC_ANALYSIS_OPTIONS}) From 0bd09787e869619ea4ca0f78fe89711539d9f2cf Mon Sep 17 00:00:00 2001 From: Jonathan Stone Date: Tue, 3 Oct 2023 09:08:10 -0700 Subject: [PATCH 10/66] Improvements to shader generation tests - Include all example documents by default in shader generation tests, rather than excluding a subset of the examples in all generators. - Remove an unused input from the render test suite options, eliminating a source of syntax errors in shader generation tests. --- resources/Materials/TestSuite/_options.mtlx | 3 --- .../MaterialXGenShader/GenShaderUtil.cpp | 21 ------------------- .../MaterialXGenShader/GenShaderUtil.h | 8 +++---- 3 files changed, 3 insertions(+), 29 deletions(-) diff --git a/resources/Materials/TestSuite/_options.mtlx b/resources/Materials/TestSuite/_options.mtlx index 8716cba5f0..bb29fbd7c1 100644 --- a/resources/Materials/TestSuite/_options.mtlx +++ b/resources/Materials/TestSuite/_options.mtlx @@ -87,9 +87,6 @@ - - - diff --git a/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp b/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp index 863cd1af05..261aacdefe 100644 --- a/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp +++ b/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp @@ -480,27 +480,6 @@ void ShaderGeneratorTester::setupDependentLibraries() loadLibraries({ "libraries" }, _searchPath, _dependLib, _skipLibraryFiles); } -void ShaderGeneratorTester::addSkipFiles() -{ - _skipFiles.insert("_options.mtlx"); - _skipFiles.insert("light_rig_test_1.mtlx"); - _skipFiles.insert("light_rig_test_2.mtlx"); - _skipFiles.insert("light_compound_test.mtlx"); - _skipFiles.insert("xinclude_search_path.mtlx"); - _skipFiles.insert("1_38_parameter_to_input.mtlx"); - _skipFiles.insert("1_36_to_1_37.mtlx"); - _skipFiles.insert("1_37_to_1_38.mtlx"); - _skipFiles.insert("material_element_to_surface_material.mtlx"); -} - -void ShaderGeneratorTester::addSkipNodeDefs() -{ -} - -void ShaderGeneratorTester::addSkipLibraryFiles() -{ -} - LightIdMap ShaderGeneratorTester::computeLightIdMap(const std::vector& nodes) { std::unordered_map idMap; diff --git a/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.h b/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.h index 7be195e9de..ea34170d71 100644 --- a/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.h +++ b/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.h @@ -180,13 +180,13 @@ class ShaderGeneratorTester virtual void setTestStages() = 0; // Add files in to not examine - virtual void addSkipFiles(); + virtual void addSkipFiles() { }; // Add nodedefs to not examine - virtual void addSkipNodeDefs(); + virtual void addSkipNodeDefs() { }; // Add files to be skipped while loading libraries - virtual void addSkipLibraryFiles(); + virtual void addSkipLibraryFiles() { }; // Add color management virtual void addColorManagement(); @@ -268,8 +268,6 @@ class ShaderGeneratorTester mx::StringSet _usedImplementations; }; - - } // namespace GenShaderUtil #endif From a79ddfb25589955bdb6060f4ce379dce56029275 Mon Sep 17 00:00:00 2001 From: Niklas Harrysson Date: Wed, 4 Oct 2023 17:16:32 +0200 Subject: [PATCH 11/66] Use explicit colorspace parameters in OSL texture calls (#1546) This change list adds the parameter "colorspace" to the texture call in OSL, for sampling color3/color4 textures. Previously this was supported under the covers, by token replacement that a custom OSL generator had to setup, and only done for the Arnold OSL generator. --- libraries/stdlib/genosl/mx_image_color3.osl | 3 +-- libraries/stdlib/genosl/mx_image_color4.osl | 2 +- source/MaterialXGenOsl/OslShaderGenerator.cpp | 4 ---- source/MaterialXGenOsl/OslShaderGenerator.h | 3 --- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/libraries/stdlib/genosl/mx_image_color3.osl b/libraries/stdlib/genosl/mx_image_color3.osl index 15b594e885..89ba94f376 100644 --- a/libraries/stdlib/genosl/mx_image_color3.osl +++ b/libraries/stdlib/genosl/mx_image_color3.osl @@ -12,6 +12,5 @@ void mx_image_color3(textureresource file, string layer, color default_value, ve color missingColor = default_value; vector2 st = mx_transform_uv(texcoord); - out = texture(file.filename, st.x, st.y, "subimage", layer, "missingcolor", missingColor, "swrap", uaddressmode, "twrap", vaddressmode $extraTextureLookupArguments); + out = texture(file.filename, st.x, st.y, "subimage", layer, "missingcolor", missingColor, "swrap", uaddressmode, "twrap", vaddressmode, "colorspace", file.colorspace); } - diff --git a/libraries/stdlib/genosl/mx_image_color4.osl b/libraries/stdlib/genosl/mx_image_color4.osl index 3bde1a5047..261108b5b4 100644 --- a/libraries/stdlib/genosl/mx_image_color4.osl +++ b/libraries/stdlib/genosl/mx_image_color4.osl @@ -15,7 +15,7 @@ void mx_image_color4(textureresource file, string layer, color4 default_value, v vector2 st = mx_transform_uv(texcoord); float alpha; color rgb = texture(file.filename, st.x, st.y, "alpha", alpha, "subimage", layer, - "missingcolor", missingColor, "missingalpha", missingAlpha, "swrap", uaddressmode, "twrap", vaddressmode $extraTextureLookupArguments ); + "missingcolor", missingColor, "missingalpha", missingAlpha, "swrap", uaddressmode, "twrap", vaddressmode, "colorspace", file.colorspace); out = color4(rgb, alpha); } diff --git a/source/MaterialXGenOsl/OslShaderGenerator.cpp b/source/MaterialXGenOsl/OslShaderGenerator.cpp index b37a84c579..28ada48626 100644 --- a/source/MaterialXGenOsl/OslShaderGenerator.cpp +++ b/source/MaterialXGenOsl/OslShaderGenerator.cpp @@ -26,7 +26,6 @@ MATERIALX_NAMESPACE_BEGIN const string OslShaderGenerator::TARGET = "genosl"; -const string OslShaderGenerator::T_FILE_EXTRA_ARGUMENTS = "$extraTextureLookupArguments"; // // OslShaderGenerator methods @@ -161,9 +160,6 @@ OslShaderGenerator::OslShaderGenerator() : // registerImplementation("IM_surfacematerial_" + OslShaderGenerator::TARGET, MaterialNodeOsl::create); - - // Extra arguments for texture lookups. - _tokenSubstitutions[T_FILE_EXTRA_ARGUMENTS] = EMPTY_STRING; } ShaderPtr OslShaderGenerator::generate(const string& name, ElementPtr element, GenContext& context) const diff --git a/source/MaterialXGenOsl/OslShaderGenerator.h b/source/MaterialXGenOsl/OslShaderGenerator.h index 91690adc1d..0c7ca426d7 100644 --- a/source/MaterialXGenOsl/OslShaderGenerator.h +++ b/source/MaterialXGenOsl/OslShaderGenerator.h @@ -48,9 +48,6 @@ class MX_GENOSL_API OslShaderGenerator : public ShaderGenerator void registerShaderMetadata(const DocumentPtr& doc, GenContext& context) const override; protected: - // Extra file arguments for texture lookup call - static const string T_FILE_EXTRA_ARGUMENTS; - /// Create and initialize a new OSL shader for shader generation. virtual ShaderPtr createShader(const string& name, ElementPtr element, GenContext& context) const; From ab4c211ac3bc033afa8c9a0dbcfafa48eff2147e Mon Sep 17 00:00:00 2001 From: Bernard Kwok Date: Wed, 4 Oct 2023 11:26:15 -0400 Subject: [PATCH 12/66] Add XML tags to MaterialX blocks in specification (#1544) - Add xml formatting tag for spec markdown docs. - Existing docs like shader gen already use the appropriate formatting tags. - Tested this with converters such as pandoc, and VScode markdown converter and should make no difference as they will just end up as preformatted text `
`.
---
 documents/Specification/MaterialX.GeomExts.md |  42 +++---
 .../Specification/MaterialX.Specification.md  | 130 +++++++++---------
 .../Specification/MaterialX.Supplement.md     |   2 +-
 3 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/documents/Specification/MaterialX.GeomExts.md b/documents/Specification/MaterialX.GeomExts.md
index fb0d581ed8..5ff300de01 100644
--- a/documents/Specification/MaterialX.GeomExts.md
+++ b/documents/Specification/MaterialX.GeomExts.md
@@ -113,7 +113,7 @@ Collections are recipes for building a list of geometries (which can be any path
 
 A **<collection>** element contains lists of geometry expressions and/or collections to be included, and an optional list of geometry expressions to be excluded:
 
-```
+```xml
   
@@ -132,7 +132,7 @@ As a shorthand convenience, MaterialX allows the specification of a `geomprefix`
 So the following MTLX file snippets are equivalent:
 
 
-```
+```xml
   
     
   
@@ -176,7 +176,7 @@ The most common use for geominfo elements is to define the filenames (or portion
 
 A **<geominfo>** element contains one or more geometry property and/or token definitions, and associates them and their values with all geometries listed in the `geom` or `collection` attribute of the <geominfo>:
 
-```
+```xml
   
     ...geometry property and token value definitions...
   
@@ -200,7 +200,7 @@ The core MaterialX Specification defines a Geometric Property, or "geomprop", as
 
 MaterialX Geometry Extensions expands upons this by allowing the use of <geomprop> elements to define specific uniform values of a geometric property with specific geometries, as opposed to relying on those values being defined externally.  This could include application-specific metadata, attributes passed from a lighting package to a renderer, or other geometry-specific data.  A geomprop may also specify a `unittype` and `unit` if appropriate to indicate that the geometric property's value is in that unit; see the [**Units** section of the main MaterialX Specification](./MaterialX.Specification.md#units), although typically the <geompropdef> would define the `unittype` and `unit`, and a geomprop would only provide an overriding `unit` if the unit for its value differed from the geompropdef's defined default unit.
 
-```
+```xml
     
 ```
 
@@ -216,7 +216,7 @@ Only float and vectorN geometric properties may specify a `unittype` an
 
 For example, one could specify a unique surface ID value associated with a geometry:
 
-```
+```xml
   
   
     
@@ -225,13 +225,13 @@ For example, one could specify a unique surface ID value associated with a geome
 
 GeomProp values can be accessed from a nodegraph using a `` node:
 
-```
+```xml
   
 ```
 
 A <geomprop> can also be used to define a default value for an intrinsic varying geometric property such as "geomcolor" for the geometry specified by the enclosing <geominfo>, which would be returned by the corresponding Geometric node (e.g. <geomcolor>) if the current geometry did not itself define values for that property.
 
-```
+```xml
   
     
   
@@ -243,7 +243,7 @@ A <geomprop> can also be used to define a default value for an intrinsic vary
 
 Token elements may be used within <geominfo> elements to define constant (typically string or integer) named values associated with specific geometries.  These geometry token values can be substituted into filenames within image nodes; see the [**Additional Filename Substitutions**](#additional-filename-substitutions) section above for details:
 
-```
+```xml
   
 ```
 
@@ -257,7 +257,7 @@ Token elements have the following attributes:
 
 For example, one could specify a texture identifier value associated with a geometry:
 
-```
+```xml
   
     
   
@@ -265,7 +265,7 @@ For example, one could specify a texture identifier value associated with a geom
 
 and then reference that token's value in a filename:
 
-```
+```xml
   
     
@@ -279,7 +279,7 @@ The <txtid> in the file name would be replaced by whatever value the txtid to
 
 TokenDefault elements define the default value for a specified geometry token name; this default value will be used in a filename string substitution if an explicit token value is not defined for the current geometry.  Since TokenDefault does not apply to any geometry in particular, it must be used outside of a <geominfo> element.
 
-```
+```xml
   
 ```
 
@@ -288,7 +288,7 @@ TokenDefault elements define the default value for a specified geometry token na
 
 Workflows involving textures with implicitly-computed filenames based on u,v coordinates (such as <UDIM> and <UVTILE>) can be made more efficient by explicitly listing the set of values that they resolve to for any given geometry.  The MaterialX specification reserves two geomprop names for this purpose, `udimset` and `uvtileset`, each of which is a stringarray containing a comma-separated list of UDIM or UVTILE values:
 
-```
+```xml
   
     
   
@@ -313,7 +313,7 @@ A MaterialX document can contain multiple property and/or look elements.
 
 A **<property>** element defines the name, type and value of a look-specific non-material property of geometry; <**propertyset**> elements are used to group a number of <property>s into a single named object.  The connection between properties or propertysets and specific geometries or collections is done in a <look> element, so that these properties can be reused across different geometries, and enabled in some looks but not others.  <Property> elements may only be used within <propertyset>s; they may not be used independently, although a dedicated <propertyassign> element may be used within a <look> to declare a property name, type, value and assignment all at once.
 
-```
+```xml
   
     
     
@@ -338,7 +338,7 @@ In the example above, the "trace_maxdiffusedepth" property is target-specific, h
 
 A **<look>** element contains one or more material, variant, visibility and/or propertyset assignment declarations:
 
-```
+```xml
   
     ...materialassign, variantassign, visibilityassign, property/propertysetassign declarations...
   
@@ -348,7 +348,7 @@ Looks can inherit the assignments from another look by including an `inherit` at
 
 A number of looks can be grouped together into a **LookGroup**, e.g. to indicate which looks are defined for a particular asset:
 
-```
+```xml
   
 ```
 
@@ -368,7 +368,7 @@ For elements which make assignments to geometries, the pathed names within `geom
 
 MaterialAssign elements are used within a <look> to connect a specified material to one or more geometries or collections (either a `geom` or a `collection` may be specified, but not both).
 
-```
+```xml
   
@@ -383,7 +383,7 @@ Material assignments are generally assumed to be mutually-exclusive, that is, an
 
 VariantAssign elements are used within a <materialassign> or a <look> to apply the values defined in one variant of a variantset to one assigned material, or to all applicable materials in a look.
 
-```
+```xml
   
     
     
@@ -407,7 +407,7 @@ In the above example, the input/token values defined within variant "var1" will
 
 Visibility elements are used within a <look> to define various types of generalized visibility between a "viewer" object and other geometries.  A "viewer object" is simply a geometry that has the ability to "see" other geometries in some rendering context and thus may need to have the list of geometries that it "sees" in different contexts be specified; the most common examples are light sources and a primary rendering camera.
 
-```
+```xml
   
@@ -442,7 +442,7 @@ If the <visibility> `geom` or `collection` refers to light geometry, then ass
 
 For the "secondary" vistype, `viewergeom` should be renderable geometry rather than a light, to declare that certain other geometry is or is not visible to indirect bounce illumination or raytraced reflections in that `viewergeom`.  In this example, "/b" would not be seen in reflections nor contribute indirect bounce illumination to "/a", while geometry "/c" would not be visible to _any_ secondary rays:
 
-```
+```xml
   
   
 ```
@@ -452,7 +452,7 @@ For the "secondary" vistype, `viewergeom` should be renderable geometry rather t
 
 PropertyAssign and PropertySetAssign elements are used within a <look> to connect a specified property value or propertyset to one or more geometries or collections.
 
-```
+```xml
   
@@ -467,7 +467,7 @@ Either a `geom` or a `collection` may be specified, but not both.  Multiple prop
 
 This example defines four collections, a light shader and material, and a propertyset, which are then used by two looks:
 
-```
+```xml
 
 
   
diff --git a/documents/Specification/MaterialX.Specification.md b/documents/Specification/MaterialX.Specification.md
index 7e876bdb57..4b99956fb4 100644
--- a/documents/Specification/MaterialX.Specification.md
+++ b/documents/Specification/MaterialX.Specification.md
@@ -267,7 +267,7 @@ Types not defined with a specific semantic are assumed to have semantic="default
 
 Custom types are defined using the <typedef> element:
 
-```
+```xml
   
   
 ```
@@ -292,7 +292,7 @@ The standard MaterialX distribution includes definitions for four "shader"-seman
 
 An MTLX file (with file extension ".mtlx") has the following general form:
 
-```
+```xml
   
   
     
@@ -303,7 +303,7 @@ That is, a standard XML declaration line followed by a root <materialx> eleme
 
 Standard XML XIncludes are supported ([http://en/wikipedia.org/wiki/XInclude](http://en/wikipedia.org/wiki/Xinclude)), as well as standard XML comments and the XML character entities `"`, `&`, `'`, `<` and `>`:
 
-```
+```xml
   
   
   
@@ -345,7 +345,7 @@ The working color space of a MaterialX document is defined by the `colorspace` a
 
 The color space of individual color image files and values may be defined via a `colorspace` attribute in an input which defines a filename or value.  Color images and values in spaces other than the working color space are expected to be transformed by the application into the working space before computations are performed.  In the example below, an image file has been defined in the “srgb_texture” color space, while its default value has been defined in “lin_rec709”; both should be transformed to the application’s working color space before being applied to any computations.
 
-```
+```xml
   
     
@@ -364,7 +364,7 @@ MaterialX allows floating-point and vector values to be defined in terms of a sp
 
 Unit types are defined using a <unittypedef> element, and a set of units of that type is defined using a <unitdef> element with one or more child <unit> elements:
 
-```
+```xml
   
   
     
@@ -397,7 +397,7 @@ References to elements in a different namespace are qualified using the syntax "
 
 Mtllib.mtlx contains the following (assuming that "..." contains any necessary material input connections and other element definitions):
 
-```
+```xml
   
   
     ...
@@ -412,7 +412,7 @@ Mtllib.mtlx contains the following (assuming that "..." contains any necessary m
 
 Then another MaterialX file could reference these materials like this:
 
-```
+```xml
     
     ...
     
@@ -423,7 +423,7 @@ Then another MaterialX file could reference these materials like this:
 
 Similarly, if a .mtlx file defining the "site_ops" namespace defined a custom color3-typed node "mynoise" with a single float input "f", it could be used in a node graph like this:
 
-```
+```xml
     
       
     
@@ -431,7 +431,7 @@ Similarly, if a .mtlx file defining the "site_ops" namespace defined a custom co
 
 A `namespace` attribute may also be added to individual <nodedef>s or <nodegraph>s, in which case the `name` and `node` of a <nodedef>, or just the `name` of a <nodegraph> will be assigned to the specified `namespace`.  In a <nodegraph>, the `nodedef` must include a namespace reference if the <nodedef> to which it refers is defined in a specific namespace, even if it's the same namespace as the <nodegraph>: this is because the `namespace` only applies to the content that is created by or contained within an element, not to anything external referenced by that element.
 
-```
+```xml
   
     
   
@@ -453,14 +453,14 @@ Geometric Properties, or "geomprops", are intrinsic or user-defined surface coor
 
 One may also define custom geometric properties using a <geompropdef> element:
 
-```
+```xml
   
 ```
 
 e.g.
 
-```
+```xml
   
   
 ```
@@ -469,13 +469,13 @@ The `type` of the geomprop may be any non-array MaterialX type, although `string
 
 Once defined, a custom geomprop name may be used any place that a standard geomprop can:
 
-```
+```xml
   
 ```
 
 A geompropdef may also specify a `unittype` and a `unit` to indicate that the geometric property is defined in terms of a specific unit.  If a geomprop with a defined unit is accessed in a nodegraph using <geompropvalue>, the geometric property value will be converted from the unit specified by the geompropdef to the application-specified scene unit.
 
-```
+```xml
   
 ```
 
@@ -487,7 +487,7 @@ As a shorthand convenience, MaterialX allows the specification of a `fileprefix`
 
 So the following snippets are equivalent:
 
-```
+```xml
   
     
       
@@ -538,7 +538,7 @@ Nodes are individual data generation or processing "blocks".  Node functionality
 
 Individual node elements have the form:
 
-```
+```xml
   
     
@@ -560,7 +560,7 @@ Node elements contain zero or more <input> elements defining the name, type,
 
 A float/vectorN input of a node, or a "filename"-type input referring to an image file containing float or vectorN values, may specify a unit for its value by providing a `unit` attribute, and that unit must be one associated with the `unittype` for that input in the nodedef, if specified; please see the [Units](#units) section above for details on declaring units and unittypes.  If the nodedef for a node (see the [Custom Nodes](#custom-nodes) section below) does not declare a `unittype` for an input, the node may do so; it is not permissible to provide a `unit` for a node input without a compatible `unittype` being defined on either the node or applicable nodedef.
 
-```
+```xml
   
     
   
@@ -570,7 +570,7 @@ Unless specified otherwise, all inputs default to a value of 0 in all channels f
 
 A node input must generally be connected to outputs of the same type, but float inputs may also be connected to any single channel within a multi-channel data types by adding an integer "channel" attribute, indicating the channel number (0-3) to extract from the input:
 
-```
+```xml
   
     
   
@@ -593,7 +593,7 @@ Standard MaterialX nodes have exactly one output, while custom nodes may have an
 
 A graph containing any number of nodes and output declarations forms a Node Graph, which may be enclosed within a <nodegraph> element to group them together into a single functional unit.  Please see the [Custom Node Definition Using Node Graphs](#custom-node-definition-using-node-graphs) section below for details on how nodegraphs can be used to describe the functionality of new nodes.
 
-```
+```xml
   
     ...node element(s)...
     ...output element(s)...
@@ -606,7 +606,7 @@ A graph containing any number of nodes and output declarations forms a Node Grap
 
 Output data streams are defined using **<output>** elements, and may be used to declare which output streams are connectable to other MaterialX elements.  Within a node graph, an <output> element declares an output stream that may be connected to a shader input or to the input of a referencing node in another graph when the nodegraph is the implementation of a custom node.  See the [Custom Node Definition Using Node Graphs](#custom-node-definition-using-node-graphs) section for details on the use of node graphs as node implementations.
 
-```
+```xml
   
   
@@ -640,7 +640,7 @@ This section defines the Source Nodes that all MaterialX implementations are exp
 
 Texture nodes are used to read filtered image data from image or texture map files for processing within a node graph.
 
-```
+```xml
   
     
     
@@ -721,7 +721,7 @@ Arbitrary frame number expressions and speed changes are not supported.
 
 Procedural nodes are used to generate value data programmatically.
 
-```
+```xml
   
     
   
@@ -900,7 +900,7 @@ To scale or offset the noise pattern generated by `noise3d`, `fractal3d` or `cel
 
 Geometric nodes are used to reference local geometric properties from within a node graph:
 
-```
+```xml
   
   
     
@@ -982,7 +982,7 @@ Applications may also reference other renderer-specific named spaces, at the exp
 
 Global nodes generate color data using non-local geometric context, requiring access to geometric features beyond the surface point being processed.  This non-local context can be provided by tracing rays into the scene, rasterizing scene geometry, or any other appropriate method.
 
-```
+```xml
   
     
   
@@ -1002,7 +1002,7 @@ Standard Global nodes:
 
 Application nodes are used to reference application-defined properties within a node graph, and have no inputs:
 
-```
+```xml
   
   
 ```
@@ -1028,7 +1028,7 @@ Standard Application nodes:
 
 Operator nodes process one or more required input streams to form an output.  Like other nodes, each operator must define its output type, which in most cases also determines the type(s) of the required input streams.
 
-```
+```xml
   
     
     
@@ -1786,7 +1786,7 @@ A simple merge of two single-layer images with a separate mask image, followed b
 
 ![Nodegraph Example 1](media/nodegraph1.png "Nodegraph Example 1")
 
-```
+```xml
 
 
   
@@ -1818,7 +1818,7 @@ A more complex nodegraph using geometry properties to define two diffuse albedo
 
 ![Nodegraph Example 2](media/nodegraph2.png "Nodegraph Example 2")
 
-```
+```xml
 
 
   
@@ -1885,7 +1885,7 @@ MaterialX supports the definition of nodes, attributes and inputs that are speci
 
 Targets are declared using a <targetdef> element:
 
-```
+```xml
   
   
   
@@ -1893,7 +1893,7 @@ Targets are declared using a <targetdef> element:
 
 A target may inherit from another target, so that any reference to a parent target will automatically include any definitions specific to the inherited child target that do not have a definition for the parent target itself:
 
-```
+```xml
   
   
   
@@ -1913,14 +1913,14 @@ While the MaterialX specification describes the attributes and elements that are
 If an application requires additional information related to any MaterialX element, it may define and utilize additional attributes with non-standard names.  Custom attributes are defined using <attributedef> elements:
 
 
-```
+```xml
   
 ```
 
 where _name_ is a unique name for the attributedef, _attrname_ is the name of the custom attribute to define, _type_ is the type of the attribute (typically string, stringarray, integer or boolean, although any MaterialX type is allowed), _defaultvalue_ is the default value for the attribute, _target_ is an optional list of targets to which this attribute applies, and _elements_ is an optional list of element names or elementname/inputname in which the attribute may be used.  It is also permissible to provide enum and enumvalues attributes for an attributedef, to define specific labels and values that the custom attribute is allowed to take, using the same syntax and limitations as enum/enumvalues on nodedef inputs and tokens (see below).  By default, a custom attribute is not emitted as metadata in generated shaders, but can be exported if the `exportable` attribute is set to "true".  Examples:
 
-```
+```xml
   
   
     
   
@@ -1948,7 +1948,7 @@ Once defined, custom attributes may be used in exactly the same manner as standa
 
 If an application requires additional custom inputs within a standard MaterialX node, it may define a target application-specific <nodedef> for that node inheriting the base input definitions from the standard node's <nodedef>, then add inputs specific to that target application.  
 
-```
+```xml
   
     
   
@@ -1958,7 +1958,7 @@ In the above example, a Maya-specific version of the color4-type <image> node
 
 When using a node, the definition appropriate for the current target will automatically be used, and other targets will ignore any inputs that are not part of the nodedef for that target.  However, one may specify a documentational  `target` attribute on an input to hint what target it is intended for if desired.  In this example, the "preFilter" input has indicated that it is specific to the "maya" target.
 
-```
+```xml
   
     
     
@@ -1998,7 +1998,7 @@ NodeDefs must define one or more child <output> elements within the <noded
 
 The parameter interface of a custom node is specified via a set of child <input> and <token> elements of the <nodedef>, while documentation of the folder structure of a node may be defined using a number of <uifolder> elements, each of which may provide a doc attribute to provide documentation for that folder layer.  A <uifolder> element may not contain any other elements; in particular, the <input>s and <token>s of the nodedef interface must be direct children of the <nodedef>.  Nested folders may be indicated using a full path for the folder, with a "/" separator between folder levels.
 
-```
+```xml
   
     
     
@@ -2012,7 +2012,7 @@ The parameter interface of a custom node is specified via a set of child <inp
 
 **Input** elements are used within a <nodedef> to declare the spatially-varying and uniform inputs for a node:
 
-```
+```xml
   
 ```
 
@@ -2047,7 +2047,7 @@ It is permissible to define a `value` or a `defaultgeomprop` for an input but no
 
 **Token** elements are used within a <nodedef> to declare uniform "interface token" string-substitution values to be referenced and substituted within filenames used in a node's nodegraph implementation:
 
-```
+```xml
   
 ```
 
@@ -2068,7 +2068,7 @@ Please see the [Example Pre-Shader Compositing Material](#example-pre-shader-com
 
 **Output** elements are used within a <nodedef> to declare an output for node definitions, including the output's name, type, and default value or "defaultinput" connection:
 
-```
+```xml
   
 ```
 
@@ -2103,7 +2103,7 @@ An <implementation> may define a `file` or `sourcecode` attribute, or neither
 
 Because the names used for node inputs (such as "normal" or "default") may conflict with the reserved words in various shading languages, or may simply be different for specific targets, <implementation> elements may contain a number of <input> elements to remap the `name`s of <input>s as specified in the <nodedef> to different `implname`s to indicate what the input name is actually called in the implementation's code.  Only the inputs that need to be remapped to new `implname`s need to be listed; for each, it is recommended that the `type` of that input be listed for clarity, but if specified, it must match the type specified in the <nodedef>: <implementation>s are not allowed to change the type or any other attribute defined in the <nodedef>.  In this example, the <implementation> declares that the "default" input defined in the "ND_image_color3" nodedef is actually called "default_value" in the "mx_image_color" function:
 
-```
+```xml
   
     
@@ -2112,7 +2112,7 @@ Because the names used for node inputs (such as "normal" or "default") may confl
 
 For uniform inputs and tokens whose nodedef description includes an enum list of allowable values, individual implementations may associate different target-specific resolved values for them potentially of a different type; these may be described by providing an `enumvalues` attribute on the uniform input or token within an <implementation> and if appropriate, an `impltype` to declare the target-specific type of these enumvalues.  Note that if the type of an enum input in the nodedef is an array type, then the `impltype` (if specified) must also be an array type, while `enumvalues` is a list of values of the base (non-array) type.  The following <implementation> states that for the "mystudio" target, the uaddressmode and vaddressmode inputs of the "image" node are actually called "extrapolate_u" and "extrapolate_v", are integers rather than strings, and take different values (e.g. "clamp" is 2):
 
-```
+```xml
   
   
      element with a file attribute defining an external compiled implementation of a surface shader may contain one or more <aov> elements to declare the names and types of arbitrary output variables ("AOVs") which the shader can output to the renderer.  AOVs must be of type float, color3, vector3, BSDF or EDF.  Note that in MaterialX, AOVs for pre-shading "pattern" colors are normally of type color3, while post-shaded color-like values are normally of type BSDF and emissive color-like values are normally of type EDF.  An <implementation> with a `nodegraph` attribute may not contain <aov> elements; instead, <aovoutput> elements within the nodegraph should be used.
 
-```
+```xml
   
@@ -2139,7 +2139,7 @@ An <implementation> element with a file attribute defining an external compil
 
 #### Example Custom Nodes Defined by External File Implementations
 
-```
+```xml
   
     
     
@@ -2179,7 +2179,7 @@ This example defines two templates for a custom operator node called "mariBlend"
 
 Here is an example of a two-output node definition and external implementation declaration.
 
-```
+```xml
   
     
     
@@ -2203,7 +2203,7 @@ A **<nodegraph>** element consists of at least one node element and at least
 
 A **functional nodegraph** is a nodegraph-based implementation for a specified <nodedef>, with the <nodedef> declaring the set of inputs that the nodegraph accepts: a functional nodegraph may not itself specify any direct child input elements.
 
-```
+```xml
   
     ...node element(s)...
     ...output element(s)...
@@ -2212,7 +2212,7 @@ A **functional nodegraph** is a nodegraph-based implementation for a specified &
 
 or
 
-```
+```xml
   
     ...node element(s)...
     ...output element(s)...
@@ -2223,7 +2223,7 @@ or
 
 The type(s) of the <output>(s) of the <nodedef> and the type(s) of the nodegraph <output>(s) must agree, and if there are multiple outputs, then the `name`s of the <output>s in the <nodegraph> and <nodedef> must also agree.  The inputs and tokens of the <nodedef> can be referenced within <input> and <token> elements of nodes within the nodegraph implementation using `interfacename` attributes in place of `value` or `nodename` attributes, e.g. a nodedef input "i2" and interface token "diffmap" could be referenced as follows:
 
-```
+```xml
     
     
 ```
@@ -2235,7 +2235,7 @@ Note that a uniform <input> of a node within the nodegraph may use `interface
 
 A **compound <nodegraph>** element may specify one or more child <input> and/or <token> elements.  In this case, the <nodegraph> functions as a collapsible "wrapper" for the contained nodes.
 
-```
+```xml
   
     [...input and/or token element(s)...]
     ...node and/or (compound) nodegraph element(s)...
@@ -2250,7 +2250,7 @@ It is permissible to define multiple nodegraph- and/or file-based implementation
 
 #### Example Custom Node Defined by a Nodegraph
 
-```
+```xml
   
     
     
@@ -2277,7 +2277,7 @@ The inputs of the nodegraph are declared by the <nodedef>, and the nodes with
 
 Once defined with a <nodedef>, using a custom node within a node graph follows the same syntax as any other standard node: the name of the element is the name of the custom node, and the MaterialX type of the node's output is required; the custom node's child elements define connections of inputs to other node outputs as well as any input values for the custom node.
 
-```
+```xml
   
     
     
@@ -2292,7 +2292,7 @@ Once defined with a <nodedef>, using a custom node within a node graph follow
 
 When invoking nodes with multiple outputs, the `type` of the node should be declared as "multioutput", and other node inputs connecting to an output of the node must include an `output` attribute to specify which output of the node to connect to:
 
-```
+```xml
   
     
     
@@ -2313,7 +2313,7 @@ When invoking nodes with multiple outputs, the `type` of the node should be decl
 
 Custom nodes that output data types with a "shader" semantic are referred to in MaterialX as "Shader Nodes".  Shaders, along with their inputs, are declared using the same <nodedef>, <implementation> and <nodegraph> elements described above:
 
-```
+```xml
   
     ...input declarations...
     
@@ -2331,7 +2331,7 @@ NodeDef elements defining shader nodes do not typically include `default` or `de
 
 As mentioned in the [Custom Data Types](#custom-data-types) section earlier, the standard MaterialX distribution includes the following standard data types for shaders:
 
-```
+```xml
   
   
   
@@ -2342,7 +2342,7 @@ These types all declare that they have "shader" semantic, but define different c
 
 Instantiation of shader nodes to give them specific values is done the same way as instantiating any other node type:
 
-```
+```xml
   
     
     
@@ -2352,7 +2352,7 @@ Instantiation of shader nodes to give them specific values is done the same way
 
 Instantiated shader nodes can also inherit from other shader nodes of the same class:
 
-```
+```xml
   
     
   
@@ -2398,7 +2398,7 @@ The Standard MaterialX Library defines the following nodes and node variants ope
 
 A functional nodegraph with either a "shader" or "material"-semantic output type may contain a number of <aovoutput> elements to declare arbitrary output variables ("AOVs") which the renderer can see and output as additional streams of information.  AOVoutputs must be of type float, color3 or vector3 for pre-shading "pattern" values, or BSDF or EDF for shader-node output values; the renderer is expected to extract the appropriate color-like information from BSDF and EDF types.  AOVs defined within a shader-semantic node instantiated within this functional nodegraph may be "passed along" and potentially renamed (but may not be modified or operated on in any way) by providing a sourceaov attribute in the <aovoutput>.
 
-```
+```xml
   
 ```
@@ -2413,7 +2413,7 @@ The attributes for <aovoutput> elements are:
 
 Examples:
 
-```
+```xml
   
   
@@ -2424,7 +2424,7 @@ Examples:
 
 Example of using <aovoutput> with sourceaov to forward AOVs from within an instantiation of a shader-semantic node; this assumes that <standard_surface> has itself defined <aovoutput>s for "diffuse" and "specular" AOVs:
 
-```
+```xml
   
     
       s for geometric
 
 Custom nodes that output data types with a "material" semantic are referred to in MaterialX as "Material Nodes".  Material nodes typically have one or more "shader" semantic inputs which establish what shaders the material references; previous versions of MaterialX used <shaderref> elements to establish these shader-to-material connections.  Material Nodes are declared using the same <nodedef> elements as described above:
 
-```
+```xml
   
     
     ...additional shader or input declarations...
@@ -2476,7 +2476,7 @@ The attributes for <nodedef> elements as they pertain to the declaration of m
 
 The standard MaterialX distribution includes a single material type definition used as the output type for all material nodes:
 
-```
+```xml
   
 ```
 
@@ -2501,7 +2501,7 @@ as well as definitions for three standard material nodes, all outputting type "m
 
 Material nodes supporting multiple shaders of the same type for different rendering targets can be defined:
 
-```
+```xml
   
     
     
@@ -2514,7 +2514,7 @@ Material nodes supporting multiple shaders of the same type for different render
 
 Creating materials with specific values bound to shader inputs involves instantiating a Shader Node for each desired shader type and setting values on those shader nodes, and connecting the shader node(s) to the inputs of a Material Node:
 
-```
+```xml
   
     
     
@@ -2535,7 +2535,7 @@ Alternatively, and perhaps more usefully, a complete network of multiple shader
 
 Materials can inherit from other materials, to add or change shaders connected to different inputs; in this example, a displacement shader is added to the above "Mgold" material to create a new "Mgolddsp" material:
 
-```
+```xml
   
     
     
@@ -2555,7 +2555,7 @@ Inheritance of material-type custom nodes is also allowed, so that new or change
 
 A material to blend between three different surface layers using mask textures.  This example also demonstrates the use of the "target" attribute of a shader implementation element to define multiple renderer-specific shaders of the same type referenced within a single material, and the use of interface tokens to define texture filenames.
 
-```
+```xml
 
 
   
+
+  
+    
+      
+    
+    
+      
+    
+    
+      
+    
+    
+      
+    
+    
+      
+    
+    
+      
+    
+    
+      
+    
+    
+      
+    
+    
+      
+    
+    
+      
+    
+    
+      
+    
+    
+      
+    
+    
+      
+    
+    
+      
+    
+    
+      
+    
+    
+      
+    
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
+    
+  
+
diff --git a/resources/Materials/TestSuite/stdlib/upgrade/syntax_1_25.mtlx b/resources/Materials/TestSuite/stdlib/upgrade/syntax_1_25.mtlx
new file mode 100644
index 0000000000..df723e7054
--- /dev/null
+++ b/resources/Materials/TestSuite/stdlib/upgrade/syntax_1_25.mtlx
@@ -0,0 +1,28 @@
+
+
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+
diff --git a/resources/Materials/TestSuite/stdlib/upgrade/1_36_to_1_37.mtlx b/resources/Materials/TestSuite/stdlib/upgrade/syntax_1_36.mtlx
similarity index 99%
rename from resources/Materials/TestSuite/stdlib/upgrade/1_36_to_1_37.mtlx
rename to resources/Materials/TestSuite/stdlib/upgrade/syntax_1_36.mtlx
index 84db1c6101..08a049435f 100644
--- a/resources/Materials/TestSuite/stdlib/upgrade/1_36_to_1_37.mtlx
+++ b/resources/Materials/TestSuite/stdlib/upgrade/syntax_1_36.mtlx
@@ -1,9 +1,7 @@
 
 
   
 
   
diff --git a/resources/Materials/TestSuite/stdlib/upgrade/1_37_to_1_38.mtlx b/resources/Materials/TestSuite/stdlib/upgrade/syntax_1_37.mtlx
similarity index 62%
rename from resources/Materials/TestSuite/stdlib/upgrade/1_37_to_1_38.mtlx
rename to resources/Materials/TestSuite/stdlib/upgrade/syntax_1_37.mtlx
index 28b9ae8ad2..3cb8eb6237 100644
--- a/resources/Materials/TestSuite/stdlib/upgrade/1_37_to_1_38.mtlx
+++ b/resources/Materials/TestSuite/stdlib/upgrade/syntax_1_37.mtlx
@@ -1,5 +1,9 @@
 
-
+
+  
+
   
     
       
@@ -37,4 +41,24 @@
       
     
   
+
+  
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+    
+    
+  
+  
+    
+      
+    
+  
 
diff --git a/source/MaterialXCore/Document.cpp b/source/MaterialXCore/Document.cpp
index 4ba48cc84b..0449189873 100644
--- a/source/MaterialXCore/Document.cpp
+++ b/source/MaterialXCore/Document.cpp
@@ -492,12 +492,10 @@ void Document::upgradeVersion()
                     if (nodeDef->hasAttribute("shadertype"))
                     {
                         nodeDef->setType(SURFACE_SHADER_TYPE_STRING);
-                        nodeDef->removeAttribute("shadertype");
                     }
                     if (nodeDef->hasAttribute("shaderprogram"))
                     {
                         nodeDef->setNodeString(nodeDef->getAttribute("shaderprogram"));
-                        nodeDef->removeAttribute("shaderprogram");
                     }
                 }
                 else if (child->getCategory() == "shaderref")
@@ -751,8 +749,18 @@ void Document::upgradeVersion()
         // Remove legacy shader nodedefs.
         for (NodeDefPtr nodeDef : getNodeDefs())
         {
-            if (nodeDef->getType() == "surface")
+            if (nodeDef->hasAttribute("shadertype"))
             {
+                for (ElementPtr mat : getChildrenOfType("material"))
+                {
+                    for (ElementPtr shaderRef : mat->getChildrenOfType("shaderref"))
+                    {
+                        if (shaderRef->getAttribute(InterfaceElement::NODE_DEF_ATTRIBUTE) == nodeDef->getName())
+                        {
+                            shaderRef->removeAttribute(InterfaceElement::NODE_DEF_ATTRIBUTE);
+                        }
+                    }
+                }
                 removeNodeDef(nodeDef->getName());
             }
         }
diff --git a/source/MaterialXGraphEditor/RenderView.cpp b/source/MaterialXGraphEditor/RenderView.cpp
index 176014ba65..d2967e6b85 100644
--- a/source/MaterialXGraphEditor/RenderView.cpp
+++ b/source/MaterialXGraphEditor/RenderView.cpp
@@ -82,26 +82,6 @@ void applyModifiers(mx::DocumentPtr doc, const DocumentModifiers& modifiers)
         }
     }
 
-    // Remap references to unimplemented shader nodedefs.
-    for (mx::NodePtr materialNode : doc->getMaterialNodes())
-    {
-        for (mx::NodePtr shader : getShaderNodes(materialNode))
-        {
-            mx::NodeDefPtr nodeDef = shader->getNodeDef();
-            if (nodeDef && !nodeDef->getImplementation())
-            {
-                std::vector altNodeDefs = doc->getMatchingNodeDefs(nodeDef->getNodeString());
-                for (mx::NodeDefPtr altNodeDef : altNodeDefs)
-                {
-                    if (altNodeDef->getImplementation())
-                    {
-                        shader->setNodeDefString(altNodeDef->getName());
-                    }
-                }
-            }
-        }
-    }
-
     // Remap unsupported texture coordinate indices.
     for (mx::ElementPtr elem : doc->traverseTree())
     {
diff --git a/source/MaterialXTest/MaterialXCore/Document.cpp b/source/MaterialXTest/MaterialXCore/Document.cpp
index 29092071cf..af39035dbe 100644
--- a/source/MaterialXTest/MaterialXCore/Document.cpp
+++ b/source/MaterialXTest/MaterialXCore/Document.cpp
@@ -108,108 +108,3 @@ TEST_CASE("Document", "[document]")
     // Validate the combined document.
     REQUIRE(doc->validate());
 }
-
-TEST_CASE("Version", "[document]")
-{
-    mx::FileSearchPath searchPath = mx::getDefaultDataSearchPath();
-    mx::DocumentPtr stdlib = mx::createDocument();
-    mx::loadLibraries({ "libraries" }, searchPath, stdlib);
-    searchPath.append(searchPath.find("resources/Materials/TestSuite/stdlib/upgrade"));
-
-    // 1.36 to 1.37
-    {
-        mx::DocumentPtr doc = mx::createDocument();
-        mx::readFromXmlFile(doc, "1_36_to_1_37.mtlx", searchPath);
-        doc->importLibrary(stdlib);
-        REQUIRE(doc->validate());
-
-        mx::XmlWriteOptions writeOptions;
-        writeOptions.writeXIncludeEnable = true;
-        std::string xmlString = mx::writeToXmlString(doc, &writeOptions);
-
-        mx::DocumentPtr doc2 = mx::createDocument();
-        mx::readFromXmlString(doc2, xmlString);
-        REQUIRE(doc2->validate());
-
-        // Check conversion to desired types occurred
-        std::unordered_map convertSet =
-        {
-            { "invertmatrix", 2},
-            { "rotate2d", 1},
-            { "rotate3d", 1},
-            { "transformmatrix", 7},
-            { "ifgreatereq", 7},
-            { "separate2", 1},
-            { "separate3", 1},
-            { "separate4", 1},
-            { "combine2", 1},
-            { "combine3", 1},
-            { "combine4", 1}
-        };
-        for (mx::NodePtr node : doc2->getNodes())
-        {
-            auto convertItem = convertSet.find(node->getCategory());
-            if (convertItem != convertSet.end())
-            {
-                convertItem->second--;
-            }
-        }
-        for (auto convertItem : convertSet)
-        {
-            REQUIRE((convertItem.second == 0));
-        }
-    }
-
-    // 1.37 to 1.38
-    {
-        mx::DocumentPtr doc = mx::createDocument();
-        mx::readFromXmlFile(doc, "1_37_to_1_38.mtlx", searchPath);
-        doc->importLibrary(stdlib);
-        REQUIRE(doc->validate());
-
-        mx::XmlWriteOptions writeOptions;
-        writeOptions.writeXIncludeEnable = false;
-        std::string xmlString = mx::writeToXmlString(doc, &writeOptions);
-
-        mx::DocumentPtr doc2 = mx::createDocument();
-        mx::readFromXmlString(doc2, xmlString);
-        REQUIRE(doc2->validate());
-
-        // atan2 test
-        const std::string ATAN2 = "atan2";
-        mx::StringMap ATAN2_MAP;
-        ATAN2_MAP["in1"] = "in2";
-        ATAN2_MAP["in2"] = "in1";
-
-        for (mx::ElementPtr elem : doc->traverseTree())
-        {
-            mx::NodePtr node = elem->asA();
-            if (!node)
-            {
-                continue;
-            }
-            const std::string& nodeCategory = node->getCategory();
-            if (nodeCategory == ATAN2)
-            {
-                const std::string &nodePath = node->getNamePath();
-                for (auto in : ATAN2_MAP)
-                {
-                    mx::ElementPtr input = node->getChild(in.first);
-                    if (input)
-                    {
-                        mx::ElementPtr newNode = doc2->getDescendant(nodePath);
-                        REQUIRE((newNode && newNode->getChild(in.second)));
-                    }
-                }
-            }
-        }
-
-        mx::NodeGraphPtr testNodeGraph = doc2->getNodeGraph("NG_Test");
-        REQUIRE(!testNodeGraph->getNode("add"));
-        REQUIRE(testNodeGraph->getNode("add1"));
-        REQUIRE(testNodeGraph->getNode("add2"));
-        REQUIRE(testNodeGraph->getNode("add2")->getInput("in1")->getInterfaceName() == "add");
-        REQUIRE(testNodeGraph->getNode("add1")->getInput("in1")->getNodeName() == "add2");
-    }
-}
-
diff --git a/source/MaterialXTest/MaterialXRender/RenderUtil.cpp b/source/MaterialXTest/MaterialXRender/RenderUtil.cpp
index af392a9a05..0460f9282a 100644
--- a/source/MaterialXTest/MaterialXRender/RenderUtil.cpp
+++ b/source/MaterialXTest/MaterialXRender/RenderUtil.cpp
@@ -76,19 +76,6 @@ void ShaderRenderTester::loadDependentLibraries(GenShaderUtil::TestSuiteOptions
     loadAdditionalLibraries(dependLib, options);
 }
 
-void ShaderRenderTester::addSkipFiles()
-{
-    _skipFiles.insert("_options.mtlx");
-    _skipFiles.insert("light_rig_test_1.mtlx");
-    _skipFiles.insert("light_rig_test_2.mtlx");
-    _skipFiles.insert("light_compound_test.mtlx");
-    _skipFiles.insert("xinclude_search_path.mtlx");
-    _skipFiles.insert("1_38_parameter_to_input.mtlx");
-    _skipFiles.insert("1_36_to_1_37.mtlx");
-    _skipFiles.insert("1_37_to_1_38.mtlx");
-    _skipFiles.insert("material_element_to_surface_material.mtlx");
-}
-
 bool ShaderRenderTester::validate(const mx::FilePath optionsFilePath)
 {
 #ifdef LOG_TO_FILE
@@ -144,9 +131,6 @@ bool ShaderRenderTester::validate(const mx::FilePath optionsFilePath)
     }
     ioTimer.endTimer();
 
-    // Add files to skip
-    addSkipFiles();
-
     // Load in the library dependencies once
     // This will be imported in each test document below
     ioTimer.startTimer();
@@ -215,11 +199,6 @@ bool ShaderRenderTester::validate(const mx::FilePath optionsFilePath)
 
         for (const mx::FilePath& file : files)
         {
-            if (_skipFiles.count(file))
-            {
-                continue;
-            }
-
             ioTimer.startTimer();
             // Check if a file override set is used and ignore all files
             // not part of the override set
diff --git a/source/MaterialXTest/MaterialXRender/RenderUtil.h b/source/MaterialXTest/MaterialXRender/RenderUtil.h
index 9f892569de..b29145dcb1 100644
--- a/source/MaterialXTest/MaterialXRender/RenderUtil.h
+++ b/source/MaterialXTest/MaterialXRender/RenderUtil.h
@@ -114,9 +114,6 @@ class ShaderRenderTester
     }
 #endif
 
-    // Add files to skip
-    void addSkipFiles();
-
     // Load dependencies
     void loadDependentLibraries(GenShaderUtil::TestSuiteOptions options, mx::FileSearchPath searchPath,
                              mx::DocumentPtr& dependLib);
@@ -181,9 +178,6 @@ class ShaderRenderTester
     bool _resolveImageFilenames;
     mx::StringResolverPtr _customFilenameResolver;
 
-    // Files to skip
-    mx::StringSet _skipFiles;
-
     // Color management information
     mx::ColorManagementSystemPtr _colorManagementSystem;
     mx::FilePath _colorManagementConfigFile;
diff --git a/source/MaterialXView/Viewer.cpp b/source/MaterialXView/Viewer.cpp
index 6346658d07..560a19e778 100644
--- a/source/MaterialXView/Viewer.cpp
+++ b/source/MaterialXView/Viewer.cpp
@@ -121,26 +121,6 @@ void applyModifiers(mx::DocumentPtr doc, const DocumentModifiers& modifiers)
         }
     }
 
-    // Remap references to unimplemented shader nodedefs.
-    for (mx::NodePtr materialNode : doc->getMaterialNodes())
-    {
-        for (mx::NodePtr shader : getShaderNodes(materialNode))
-        {
-            mx::NodeDefPtr nodeDef = shader->getNodeDef();
-            if (nodeDef && !nodeDef->getImplementation())
-            {
-                std::vector altNodeDefs = doc->getMatchingNodeDefs(nodeDef->getNodeString());
-                for (mx::NodeDefPtr altNodeDef : altNodeDefs)
-                {
-                    if (altNodeDef->getImplementation())
-                    {
-                        shader->setNodeDefString(altNodeDef->getName());
-                    }
-                }
-            }
-        }
-    }
-
     // Remap unsupported texture coordinate indices.
     for (mx::ElementPtr elem : doc->traverseTree())
     {

From 85dc5e1ea3239de507af07143224fd1c7852ee75 Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Sat, 7 Oct 2023 09:59:34 -0700
Subject: [PATCH 15/66] Improvements to 1.37 upgrade (#1555)

- Add an example shading model graph using MaterialX 1.37 syntax, allowing improved coverage of version upgrade logic in unit tests.
- Simplify the logic for 1.37 upgrades in Document::upgradeVersion, removing legacy code that was dedicated to upgrading the MaterialX standard libraries.
---
 .../TestSuite/stdlib/upgrade/syntax_1_37.mtlx | 151 ++++++++++------
 source/MaterialXCore/Document.cpp             | 166 +++++-------------
 2 files changed, 144 insertions(+), 173 deletions(-)

diff --git a/resources/Materials/TestSuite/stdlib/upgrade/syntax_1_37.mtlx b/resources/Materials/TestSuite/stdlib/upgrade/syntax_1_37.mtlx
index 3cb8eb6237..66dc69f668 100644
--- a/resources/Materials/TestSuite/stdlib/upgrade/syntax_1_37.mtlx
+++ b/resources/Materials/TestSuite/stdlib/upgrade/syntax_1_37.mtlx
@@ -4,61 +4,110 @@
     Examples of MaterialX 1.37 syntax
   -->
 
-  
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-      
-    
-  
-
-  
-    
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
   
-  
-    
-      
-      
-    
-    
-      
-      
-    
-  
 
-  
-    
-      
-      
-      
+  
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
     
-    
-      
-    
-    
-      
-    
-    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+    
+    
   
-  
-    
-      
+
+  
+    
+      
     
   
+
+  
+    
+    
+  
+  
+    
+    
+    
+  
 
diff --git a/source/MaterialXCore/Document.cpp b/source/MaterialXCore/Document.cpp
index 0449189873..80143bb9c8 100644
--- a/source/MaterialXCore/Document.cpp
+++ b/source/MaterialXCore/Document.cpp
@@ -1040,39 +1040,7 @@ void Document::upgradeVersion()
             }
         }
 
-        // Update atan2 interface and rotate3d interface
-        const string ATAN2 = "atan2";
-        const string IN1 = "in1";
-        const string IN2 = "in2";
-        const string ROTATE3D = "rotate3d";
-        const string AXIS = "axis";
-        const string INPUT_ONE = "1.0";
-
-        // Update nodedefs
-        bool upgradeAtan2Instances = false;
-        for (auto nodedef : getMatchingNodeDefs(ATAN2))
-        {
-            InputPtr input = nodedef->getInput(IN1);
-            InputPtr input2 = nodedef->getInput(IN2);
-            string inputValue = input->getValueString();
-            // Only flip value if nodedef value is the previous versions.
-            if (inputValue == INPUT_ONE)
-            {
-                input->setValueString(input2->getValueString());
-                input2->setValueString(inputValue);
-                upgradeAtan2Instances = true;
-            }
-        }
-        for (auto nodedef : getMatchingNodeDefs(ROTATE3D))
-        {
-            ElementPtr axis = nodedef->getChild(AXIS);
-            if (axis)
-            {
-                nodedef->changeChildCategory(axis, "input");
-            }
-        }
-
-        // Update BSDF interfaces
+        // Define BSDF node pairs.
         using StringPair = std::pair;
         const StringPair DIELECTRIC_BRDF = { "dielectric_brdf", "dielectric_bsdf" };
         const StringPair DIELECTRIC_BTDF = { "dielectric_btdf", "dielectric_bsdf" };
@@ -1085,57 +1053,11 @@ void Document::upgradeVersion()
         const StringPair SUBSURFACE_BRDF = { "subsurface_brdf", "subsurface_bsdf" };
         const StringPair THIN_FILM_BRDF = { "thin_film_brdf", "thin_film_bsdf" };
 
-        const string SCATTER_MODE = "scatter_mode";
-        const string BSDF = "BSDF";
-        const string LAYER = "layer";
-        const string TOP = "top";
-        const string BASE = "base";
-        const string INTERIOR = "interior";
-        const string ARTISTIC_IOR = "artistic_ior";
-        const string COMPLEX_IOR = "complex_ior";
-        const string REFLECTIVITY = "reflectivity";
-        const string EDGE_COLOR = "edge_color";
-        const string IOR = "ior";
-        const string EXTINCTION = "extinction";
-        const string COLOR3 = "color3";
-        const string VECTOR3 = "vector3";
-        const string CONVERT = "convert";
-        const string IN = "in";
-
-        // Function for upgrading BSDF nodedef.
-        auto upgradeBsdfNodeDef = [SCATTER_MODE](NodeDefPtr nodedef, const string& newCategory, bool addScatterMode = false)
-        {
-            if (nodedef)
-            {
-                nodedef->setName(newCategory);
-                if (addScatterMode)
-                {
-                    InputPtr mode = nodedef->addInput(SCATTER_MODE, STRING_TYPE_STRING);
-                    mode->setIsUniform(true);
-                    mode->setValueString("R");
-                    mode->setAttribute("enum", "R,T,RT");
-                }
-            }
-        };
-
-        // Update nodedefs.
-        upgradeBsdfNodeDef(getNodeDef(DIELECTRIC_BRDF.first), DIELECTRIC_BRDF.second, true);
-        upgradeBsdfNodeDef(getNodeDef(GENERALIZED_SCHLICK_BRDF.first), GENERALIZED_SCHLICK_BRDF.second, true);
-        upgradeBsdfNodeDef(getNodeDef(CONDUCTOR_BRDF.first), CONDUCTOR_BRDF.second);
-        upgradeBsdfNodeDef(getNodeDef(SHEEN_BRDF.first), SHEEN_BRDF.second);
-        upgradeBsdfNodeDef(getNodeDef(DIFFUSE_BRDF.first), DIFFUSE_BRDF.second);
-        upgradeBsdfNodeDef(getNodeDef(BURLEY_DIFFUSE_BRDF.first), BURLEY_DIFFUSE_BRDF.second);
-        upgradeBsdfNodeDef(getNodeDef(DIFFUSE_BTDF.first), DIFFUSE_BTDF.second);
-        upgradeBsdfNodeDef(getNodeDef(SUBSURFACE_BRDF.first), SUBSURFACE_BRDF.second);
-        upgradeBsdfNodeDef(getNodeDef(THIN_FILM_BRDF.first), THIN_FILM_BRDF.second);
-        removeNodeDef(DIELECTRIC_BTDF.first);
-        removeNodeDef(COMPLEX_IOR);
-
         // Function for upgrading old nested layering setup
         // to new setup with layer operators.
-        auto upgradeBsdfLayering = [TOP, BASE, LAYER, BSDF](NodePtr node)
+        auto upgradeBsdfLayering = [](NodePtr node)
         {
-            InputPtr base = node->getInput(BASE);
+            InputPtr base = node->getInput("base");
             if (base)
             {
                 NodePtr baseNode = base->getConnectedNode();
@@ -1146,13 +1068,13 @@ void Document::upgradeVersion()
                     // so we don't need to update any connection references.
                     const string oldName = node->getName();
                     node->setName(oldName + "__layer_top");
-                    NodePtr layer = parent->addNode(LAYER, oldName, BSDF);
-                    InputPtr layerTop = layer->addInput(TOP, BSDF);
-                    InputPtr layerBase = layer->addInput(BASE, BSDF);
+                    NodePtr layer = parent->addNode("layer", oldName, "BSDF");
+                    InputPtr layerTop = layer->addInput("top", "BSDF");
+                    InputPtr layerBase = layer->addInput("base", "BSDF");
                     layerTop->setConnectedNode(node);
                     layerBase->setConnectedNode(baseNode);
                 }
-                node->removeInput(BASE);
+                node->removeInput("base");
             }
         };
 
@@ -1177,31 +1099,31 @@ void Document::upgradeVersion()
                 continue;
             }
             const string& nodeCategory = node->getCategory();
-            if (upgradeAtan2Instances && nodeCategory == ATAN2)
+            if (nodeCategory == "atan2")
             {
-                InputPtr input = node->getInput(IN1);
-                InputPtr input2 = node->getInput(IN2);
+                InputPtr input = node->getInput("in1");
+                InputPtr input2 = node->getInput("in2");
                 if (input && input2)
                 {
                     input->setName(EMPTY_STRING);
-                    input2->setName(IN1);
-                    input->setName(IN2);
+                    input2->setName("in1");
+                    input->setName("in2");
                 }
                 else
                 {
                     if (input)
                     {
-                        input->setName(IN2);
+                        input->setName("in2");
                     }
                     if (input2)
                     {
-                        input2->setName(IN1);
+                        input2->setName("in1");
                     }
                 }
             }
-            else if (nodeCategory == ROTATE3D)
+            else if (nodeCategory == "rotate3d")
             {
-                ElementPtr axis = node->getChild(AXIS);
+                ElementPtr axis = node->getChild("axis");
                 if (axis)
                 {
                     node->changeChildCategory(axis, "input");
@@ -1215,8 +1137,8 @@ void Document::upgradeVersion()
             else if (nodeCategory == DIELECTRIC_BTDF.first)
             {
                 node->setCategory(DIELECTRIC_BTDF.second);
-                node->removeInput(INTERIOR);
-                InputPtr mode = node->addInput(SCATTER_MODE, STRING_TYPE_STRING);
+                node->removeInput("interior");
+                InputPtr mode = node->addInput("scatter_mode", STRING_TYPE_STRING);
                 mode->setValueString("T");
             }
             else if (nodeCategory == GENERALIZED_SCHLICK_BRDF.first)
@@ -1240,32 +1162,32 @@ void Document::upgradeVersion()
 
                 // Create an artistic_ior node to convert from artistic to physical parameterization.
                 GraphElementPtr parent = node->getParent()->asA();
-                NodePtr artisticIor = parent->addNode(ARTISTIC_IOR, node->getName() + "__artistic_ior", "multioutput");
-                OutputPtr artisticIor_ior = artisticIor->addOutput(IOR, COLOR3);
-                OutputPtr artisticIor_extinction = artisticIor->addOutput(EXTINCTION, COLOR3);
+                NodePtr artisticIor = parent->addNode("artistic_ior", node->getName() + "__artistic_ior", "multioutput");
+                OutputPtr artisticIor_ior = artisticIor->addOutput("ior", "color3");
+                OutputPtr artisticIor_extinction = artisticIor->addOutput("extinction", "color3");
 
                 // Copy values and connections from conductor node to artistic_ior node.
-                InputPtr reflectivity = node->getInput(REFLECTIVITY);
+                InputPtr reflectivity = node->getInput("reflectivity");
                 if (reflectivity)
                 {
-                    InputPtr artisticIor_reflectivity = artisticIor->addInput(REFLECTIVITY, COLOR3);
+                    InputPtr artisticIor_reflectivity = artisticIor->addInput("reflectivity", "color3");
                     copyAttributes(reflectivity, artisticIor_reflectivity);
                 }
-                InputPtr edge_color = node->getInput(EDGE_COLOR);
+                InputPtr edge_color = node->getInput("edge_color");
                 if (edge_color)
                 {
-                    InputPtr artisticIor_edge_color = artisticIor->addInput(EDGE_COLOR, COLOR3);
+                    InputPtr artisticIor_edge_color = artisticIor->addInput("edge_color", "color3");
                     copyAttributes(edge_color, artisticIor_edge_color);
                 }
 
                 // Update the parameterization on the conductor node
                 // and connect it to the artistic_ior node.
-                node->removeInput(REFLECTIVITY);
-                node->removeInput(EDGE_COLOR);
-                InputPtr ior = node->addInput(IOR, COLOR3);
+                node->removeInput("reflectivity");
+                node->removeInput("edge_color");
+                InputPtr ior = node->addInput("ior", "color3");
                 ior->setNodeName(artisticIor->getName());
                 ior->setOutputString(artisticIor_ior->getName());
-                InputPtr extinction = node->addInput(EXTINCTION, COLOR3);
+                InputPtr extinction = node->addInput("extinction", "color3");
                 extinction->setNodeName(artisticIor->getName());
                 extinction->setOutputString(artisticIor_extinction->getName());
             }
@@ -1285,17 +1207,17 @@ void Document::upgradeVersion()
             {
                 node->setCategory(SUBSURFACE_BRDF.second);
             }
-            else if (nodeCategory == ARTISTIC_IOR)
+            else if (nodeCategory == "artistic_ior")
             {
-                OutputPtr ior = node->getOutput(IOR);
+                OutputPtr ior = node->getOutput("ior");
                 if (ior)
                 {
-                    ior->setType(COLOR3);
+                    ior->setType("color3");
                 }
-                OutputPtr extinction = node->getOutput(EXTINCTION);
+                OutputPtr extinction = node->getOutput("extinction");
                 if (extinction)
                 {
-                    extinction->setType(COLOR3);
+                    extinction->setType("color3");
                 }
             }
 
@@ -1306,18 +1228,18 @@ void Document::upgradeVersion()
             // since we can't modify the graph while traversing it.
             for (InputPtr input : node->getInputs())
             {
-                if (input->getOutputString() == IOR && input->getType() == VECTOR3)
+                if (input->getOutputString() == "ior" && input->getType() == "vector3")
                 {
                     NodePtr connectedNode = input->getConnectedNode();
-                    if (connectedNode && connectedNode->getCategory() == ARTISTIC_IOR)
+                    if (connectedNode && connectedNode->getCategory() == "artistic_ior")
                     {
                         artisticIorConnections.push_back(input);
                     }
                 }
-                else if (input->getOutputString() == EXTINCTION && input->getType() == VECTOR3)
+                else if (input->getOutputString() == "extinction" && input->getType() == "vector3")
                 {
                     NodePtr connectedNode = input->getConnectedNode();
-                    if (connectedNode && connectedNode->getCategory() == ARTISTIC_IOR)
+                    if (connectedNode && connectedNode->getCategory() == "artistic_ior")
                     {
                         artisticExtConnections.push_back(input);
                     }
@@ -1331,10 +1253,10 @@ void Document::upgradeVersion()
             NodePtr artisticIorNode = input->getConnectedNode();
             ElementPtr node = input->getParent();
             GraphElementPtr parent = node->getParent()->asA();
-            NodePtr convert = parent->addNode(CONVERT, node->getName() + "__convert_ior", VECTOR3);
-            InputPtr convertInput = convert->addInput(IN, COLOR3);
+            NodePtr convert = parent->addNode("convert", node->getName() + "__convert_ior", "vector3");
+            InputPtr convertInput = convert->addInput("in", "color3");
             convertInput->setNodeName(artisticIorNode->getName());
-            convertInput->setOutputString(IOR);
+            convertInput->setOutputString("ior");
             input->setNodeName(convert->getName());
             input->removeAttribute(PortElement::OUTPUT_ATTRIBUTE);
         }
@@ -1343,10 +1265,10 @@ void Document::upgradeVersion()
             NodePtr artisticIorNode = input->getConnectedNode();
             ElementPtr node = input->getParent();
             GraphElementPtr parent = node->getParent()->asA();
-            NodePtr convert = parent->addNode(CONVERT, node->getName() + "__convert_extinction", VECTOR3);
-            InputPtr convertInput = convert->addInput(IN, COLOR3);
+            NodePtr convert = parent->addNode("convert", node->getName() + "__convert_extinction", "vector3");
+            InputPtr convertInput = convert->addInput("in", "color3");
             convertInput->setNodeName(artisticIorNode->getName());
-            convertInput->setOutputString(EXTINCTION);
+            convertInput->setOutputString("extinction");
             input->setNodeName(convert->getName());
             input->removeAttribute(PortElement::OUTPUT_ATTRIBUTE);
         }

From f583ea1aaa4d1e97488fd7528695d7590a566db5 Mon Sep 17 00:00:00 2001
From: Igor Elovikov 
Date: Sat, 7 Oct 2023 20:13:03 +0300
Subject: [PATCH 16/66] Fix Ninja builds of both Viewer and Editor (#1533)

Related to: #1208
---
 source/MaterialXGraphEditor/External/Glfw/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/MaterialXGraphEditor/External/Glfw/CMakeLists.txt b/source/MaterialXGraphEditor/External/Glfw/CMakeLists.txt
index eaae85a825..2ec553856f 100644
--- a/source/MaterialXGraphEditor/External/Glfw/CMakeLists.txt
+++ b/source/MaterialXGraphEditor/External/Glfw/CMakeLists.txt
@@ -41,7 +41,7 @@ if (BUILD_SHARED_LIBS AND UNIX)
     # On Unix-like systems, shared libraries can use the soname system.
     set(GLFW_LIB_NAME glfw)
 else()
-    set(GLFW_LIB_NAME glfw3)
+    set(GLFW_LIB_NAME glfw3_minimal)
 endif()
 
 if (GLFW_VULKAN_STATIC)

From 695901492ef791d09a0ecf23c0ef7680aa27a563 Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Sat, 7 Oct 2023 15:39:32 -0700
Subject: [PATCH 17/66] Improvements to look inheritance

- Add support for look inheritance in the MaterialX viewer.
- Improve coverage of look inheritance in MaterialX unit tests.
- Raises statement coverage for MaterialX unit tests to 88.6%.
---
 source/MaterialXTest/MaterialXCore/Look.cpp | 2 ++
 source/MaterialXView/Viewer.cpp             | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/MaterialXTest/MaterialXCore/Look.cpp b/source/MaterialXTest/MaterialXCore/Look.cpp
index 4106bf2eb3..006538891c 100644
--- a/source/MaterialXTest/MaterialXCore/Look.cpp
+++ b/source/MaterialXTest/MaterialXCore/Look.cpp
@@ -75,6 +75,7 @@ TEST_CASE("Look", "[look]")
     // Create an inherited look.
     mx::LookPtr look2 = doc->addLook();
     look2->setInheritsFrom(look);
+    REQUIRE(look2->getActiveMaterialAssigns().size() == 2);
     REQUIRE(look2->getActivePropertySetAssigns().size() == 1);
     REQUIRE(look2->getActiveVisibilities().size() == 1);
 
@@ -86,6 +87,7 @@ TEST_CASE("Look", "[look]")
 
     // Disconnect the inherited look.
     look2->setInheritsFrom(nullptr);
+    REQUIRE(look2->getActiveMaterialAssigns().empty());
     REQUIRE(look2->getActivePropertySetAssigns().empty());
     REQUIRE(look2->getActiveVisibilities().empty());
 }
diff --git a/source/MaterialXView/Viewer.cpp b/source/MaterialXView/Viewer.cpp
index 560a19e778..c06846f2ce 100644
--- a/source/MaterialXView/Viewer.cpp
+++ b/source/MaterialXView/Viewer.cpp
@@ -1375,7 +1375,7 @@ void Viewer::loadDocument(const mx::FilePath& filename, mx::DocumentPtr librarie
             // with later assignments superseding earlier ones.
             for (mx::LookPtr look : doc->getLooks())
             {
-                for (mx::MaterialAssignPtr matAssign : look->getMaterialAssigns())
+                for (mx::MaterialAssignPtr matAssign : look->getActiveMaterialAssigns())
                 {
                     const std::string& activeGeom = matAssign->getActiveGeom();
                     for (mx::MeshPartitionPtr part : _geometryList)

From c7f01d89e402ff58364cbdcf52cbd2d6f2213e0e Mon Sep 17 00:00:00 2001
From: Niklas Harrysson 
Date: Mon, 9 Oct 2023 19:54:24 +0200
Subject: [PATCH 18/66] Improve OSL generation of filename inputs (#1547)

This change list modifies the generation of public filename parameters from being a textureresource struct, to being two separate string parameters for filename and colorspace.
---
 source/MaterialXGenOsl/OslShaderGenerator.cpp | 212 +++++++++++-------
 source/MaterialXGenOsl/OslShaderGenerator.h   |   3 +
 2 files changed, 130 insertions(+), 85 deletions(-)

diff --git a/source/MaterialXGenOsl/OslShaderGenerator.cpp b/source/MaterialXGenOsl/OslShaderGenerator.cpp
index 28ada48626..fbb2bb29be 100644
--- a/source/MaterialXGenOsl/OslShaderGenerator.cpp
+++ b/source/MaterialXGenOsl/OslShaderGenerator.cpp
@@ -294,6 +294,25 @@ ShaderPtr OslShaderGenerator::generate(const string& name, ElementPtr element, G
         emitLineBreak(stage);
     }
 
+    // Inputs of type 'filename' has been generated into two shader inputs.
+    // So here we construct a single 'textureresource' from these inputs,
+    // to be used further downstream. See emitShaderInputs() for details.
+    VariableBlock& inputs = stage.getUniformBlock(OSL::UNIFORMS);
+    for (size_t i = 0; i < inputs.size(); ++i)
+    {
+        ShaderPort* input = inputs[i];
+        if (input->getType() == Type::FILENAME)
+        {
+            // Construct the textureresource variable.
+            const string newVariableName = input->getVariable() + "_";
+            const string& type = _syntax->getTypeName(input->getType());
+            emitLine(type + newVariableName + " = {" + input->getVariable() + ", " + input->getVariable() + "_colorspace}", stage);
+
+            // Update the variable name to be used downstream.
+            input->setVariable(newVariableName);
+        }
+    }
+
     // Emit all texturing nodes. These are inputs to any
     // closure/shader nodes and need to be emitted first.
     emitFunctionCalls(graph, context, stage, ShaderNode::Classification::TEXTURE);
@@ -489,111 +508,75 @@ void OslShaderGenerator::emitLibraryIncludes(ShaderStage& stage, GenContext& con
     emitLineBreak(stage);
 }
 
-namespace
-{
-
-std::unordered_map GEOMPROP_DEFINITIONS =
-{
-    { "Pobject", "transform(\"object\", P)" },
-    { "Pworld", "P" },
-    { "Nobject", "transform(\"object\", N)" },
-    { "Nworld", "N" },
-    { "Tobject", "transform(\"object\", dPdu)" },
-    { "Tworld", "dPdu" },
-    { "Bobject", "transform(\"object\", dPdv)" },
-    { "Bworld", "dPdv" },
-    { "UV0", "{u,v}" },
-    { "Vworld", "I" }
-};
-
-} // anonymous namespace
-
 void OslShaderGenerator::emitShaderInputs(const VariableBlock& inputs, ShaderStage& stage) const
 {
-    const std::unordered_map UI_WIDGET_METADATA =
-    {
-        { Type::FLOAT, ShaderMetadata("widget", Type::STRING, Value::createValueFromStrings("number", Type::STRING->getName())) },
-        { Type::INTEGER, ShaderMetadata("widget", Type::STRING, Value::createValueFromStrings("number", Type::STRING->getName())) },
-        { Type::FILENAME, ShaderMetadata("widget", Type::STRING, Value::createValueFromStrings("filename", Type::STRING->getName())) },
-        { Type::BOOLEAN, ShaderMetadata("widget", Type::STRING, Value::createValueFromStrings("checkBox", Type::STRING->getName())) }
-    };
-
-    const std::set METADATA_TYPE_BLACKLIST =
+    static const std::unordered_map GEOMPROP_DEFINITIONS =
     {
-        Type::VECTOR2,  // Custom struct types doesn't support metadata declarations.
-        Type::VECTOR4,  //
-        Type::COLOR4,   //
-        Type::FILENAME, //
-        Type::BSDF      //
+        { "Pobject", "transform(\"object\", P)" },
+        { "Pworld", "P" },
+        { "Nobject", "transform(\"object\", N)" },
+        { "Nworld", "N" },
+        { "Tobject", "transform(\"object\", dPdu)" },
+        { "Tworld", "dPdu" },
+        { "Bobject", "transform(\"object\", dPdv)" },
+        { "Bworld", "dPdv" },
+        { "UV0", "{u,v}" },
+        { "Vworld", "I" }
     };
 
     for (size_t i = 0; i < inputs.size(); ++i)
     {
         const ShaderPort* input = inputs[i];
-
         const string& type = _syntax->getTypeName(input->getType());
-        string value = _syntax->getValue(input, true);
-
-        emitLineBegin(stage);
-        emitString(type + " " + input->getVariable(), stage);
 
-        const string& geomprop = input->getGeomProp();
-        if (!geomprop.empty())
+        if (input->getType() == Type::FILENAME)
         {
-            auto it = GEOMPROP_DEFINITIONS.find(geomprop);
-            if (it != GEOMPROP_DEFINITIONS.end())
-            {
-                value = it->second;
-            }
+            // Shader inputs of type 'filename' (textures) need special handling.
+            // In OSL codegen a 'filename' is translated to the custom type 'textureresource',
+            // which is a struct containing a file string and a colorspace string.
+            // For the published shader interface we here split this into two separate inputs,
+            // which gives a nicer shader interface with widget metadata on each input.
+            
+            ValuePtr value = input->getValue();
+            const string valueStr = value ? value->getValueString() : EMPTY_STRING;
+
+            // Add the file string input
+            emitLineBegin(stage);
+            emitString("string " + input->getVariable() + " = \"" + valueStr + "\"", stage);
+            emitMetadata(input, stage);
+            emitString(",", stage);
+            emitLineEnd(stage, false);
+
+            // Add the colorspace string input
+            emitLineBegin(stage);
+            emitString("string " + input->getVariable() + "_colorspace = \"" + input->getColorSpace() + "\"", stage);
+            emitLineEnd(stage, false);
+            emitScopeBegin(stage, Syntax::DOUBLE_SQUARE_BRACKETS);
+            emitLine("string widget = \"colorspace\"", stage, false);
+            emitScopeEnd(stage, false, false);
         }
-
-        if (value.empty())
+        else
         {
-            value = _syntax->getDefaultValue(input->getType());
-        }
-        emitString(" = " + value, stage);
-
-        //
-        // Add shader input metadata.
-        //
-
-        auto widgetMetadataIt = UI_WIDGET_METADATA.find(input->getType());
-        const ShaderMetadata* widgetMetadata = widgetMetadataIt != UI_WIDGET_METADATA.end() ? &widgetMetadataIt->second : nullptr;
-        const ShaderMetadataVecPtr& metadata = input->getMetadata();
+            emitLineBegin(stage);
+            emitString(type + " " + input->getVariable(), stage);
 
-        if (widgetMetadata || (metadata && metadata->size()))
-        {
-            StringVec metadataLines;
-            if (metadata)
+            string value = _syntax->getValue(input, true);
+            const string& geomprop = input->getGeomProp();
+            if (!geomprop.empty())
             {
-                for (size_t j = 0; j < metadata->size(); ++j)
+                auto it = GEOMPROP_DEFINITIONS.find(geomprop);
+                if (it != GEOMPROP_DEFINITIONS.end())
                 {
-                    const ShaderMetadata& data = metadata->at(j);
-                    if (METADATA_TYPE_BLACKLIST.count(data.type) == 0)
-                    {
-                        const string& delim = (widgetMetadata || j < metadata->size() - 1) ? Syntax::COMMA : EMPTY_STRING;
-                        const string& dataType = _syntax->getTypeName(data.type);
-                        const string dataValue = _syntax->getValue(data.type, *data.value, true);
-                        metadataLines.push_back(dataType + " " + data.name + " = " + dataValue + delim);
-                    }
+                    value = it->second;
                 }
             }
-            if (widgetMetadata)
+            if (value.empty())
             {
-                const string& dataType = _syntax->getTypeName(widgetMetadata->type);
-                const string dataValue = _syntax->getValue(widgetMetadata->type, *widgetMetadata->value, true);
-                metadataLines.push_back(dataType + " " + widgetMetadata->name + " = " + dataValue);
-            }
-            if (metadataLines.size())
-            {
-                emitLineEnd(stage, false);
-                emitScopeBegin(stage, Syntax::DOUBLE_SQUARE_BRACKETS);
-                for (auto line : metadataLines)
-                {
-                    emitLine(line, stage, false);
-                }
-                emitScopeEnd(stage, false, false);
+                value = _syntax->getDefaultValue(input->getType());
             }
+
+            emitString(" = " + value, stage);
+            emitMetadata(input, stage);
         }
 
         if (i < inputs.size())
@@ -618,6 +601,65 @@ void OslShaderGenerator::emitShaderOutputs(const VariableBlock& outputs, ShaderS
     }
 }
 
+void OslShaderGenerator::emitMetadata(const ShaderPort* port, ShaderStage& stage) const
+{
+    static const std::unordered_map UI_WIDGET_METADATA =
+    {
+        { Type::FLOAT, ShaderMetadata("widget", Type::STRING, Value::createValueFromStrings("number", Type::STRING->getName())) },
+        { Type::INTEGER, ShaderMetadata("widget", Type::STRING, Value::createValueFromStrings("number", Type::STRING->getName())) },
+        { Type::FILENAME, ShaderMetadata("widget", Type::STRING, Value::createValueFromStrings("filename", Type::STRING->getName())) },
+        { Type::BOOLEAN, ShaderMetadata("widget", Type::STRING, Value::createValueFromStrings("checkBox", Type::STRING->getName())) }
+    };
+
+    static const std::set METADATA_TYPE_BLACKLIST =
+    {
+        Type::VECTOR2,  // Custom struct types doesn't support metadata declarations.
+        Type::VECTOR4,  //
+        Type::COLOR4,   //
+        Type::FILENAME, //
+        Type::BSDF      //
+    };
+
+    auto widgetMetadataIt = UI_WIDGET_METADATA.find(port->getType());
+    const ShaderMetadata* widgetMetadata = widgetMetadataIt != UI_WIDGET_METADATA.end() ? &widgetMetadataIt->second : nullptr;
+    const ShaderMetadataVecPtr& metadata = port->getMetadata();
+
+    if (widgetMetadata || (metadata && metadata->size()))
+    {
+        StringVec metadataLines;
+        if (metadata)
+        {
+            for (size_t j = 0; j < metadata->size(); ++j)
+            {
+                const ShaderMetadata& data = metadata->at(j);
+                if (METADATA_TYPE_BLACKLIST.count(data.type) == 0)
+                {
+                    const string& delim = (widgetMetadata || j < metadata->size() - 1) ? Syntax::COMMA : EMPTY_STRING;
+                    const string& dataType = _syntax->getTypeName(data.type);
+                    const string dataValue = _syntax->getValue(data.type, *data.value, true);
+                    metadataLines.push_back(dataType + " " + data.name + " = " + dataValue + delim);
+                }
+            }
+        }
+        if (widgetMetadata)
+        {
+            const string& dataType = _syntax->getTypeName(widgetMetadata->type);
+            const string dataValue = _syntax->getValue(widgetMetadata->type, *widgetMetadata->value, true);
+            metadataLines.push_back(dataType + " " + widgetMetadata->name + " = " + dataValue);
+        }
+        if (metadataLines.size())
+        {
+            emitLineEnd(stage, false);
+            emitScopeBegin(stage, Syntax::DOUBLE_SQUARE_BRACKETS);
+            for (auto line : metadataLines)
+            {
+                emitLine(line, stage, false);
+            }
+            emitScopeEnd(stage, false, false);
+        }
+    }
+}
+
 namespace OSL
 {
 
diff --git a/source/MaterialXGenOsl/OslShaderGenerator.h b/source/MaterialXGenOsl/OslShaderGenerator.h
index 0c7ca426d7..e5cf13977e 100644
--- a/source/MaterialXGenOsl/OslShaderGenerator.h
+++ b/source/MaterialXGenOsl/OslShaderGenerator.h
@@ -59,6 +59,9 @@ class MX_GENOSL_API OslShaderGenerator : public ShaderGenerator
 
     /// Emit a block of shader outputs.
     virtual void emitShaderOutputs(const VariableBlock& inputs, ShaderStage& stage) const;
+
+    /// Emit metadata for a shader parameter.
+    virtual void emitMetadata(const ShaderPort* port, ShaderStage& stage) const;
 };
 
 namespace OSL

From 54adaeefcb2864632e2e7a38e842e8cd6658ea54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ars=C3=A8ne=20P=C3=A9rard-Gayot?=
 
Date: Fri, 13 Oct 2023 21:47:47 +0200
Subject: [PATCH 19/66] Fix edge case in HW shader generation for texcoords
 (#1559)

This merges both TexCoordNodeMsl and TexCoordNodeGlsl into a single HwTexCoordNode. The parts of the node that are configurable (e.g. the input index) can be changed via re-implementation of the virtual member function getIndexInput().

The new mechanism works regardless of syntax, and uses the smallest texcoord width, depending on what is used in the shader graph.
---
 .../TestSuite/stdlib/texture/texcoord.mtlx    | 25 ++++++
 .../MaterialXGenGlsl/GlslShaderGenerator.cpp  |  6 +-
 source/MaterialXGenGlsl/GlslShaderGenerator.h |  2 +-
 .../Nodes/TexCoordNodeGlsl.cpp                | 62 --------------
 source/MaterialXGenMsl/MslShaderGenerator.cpp |  6 +-
 source/MaterialXGenMsl/MslShaderGenerator.h   |  2 +-
 .../MaterialXGenMsl/Nodes/TexCoordNodeMsl.cpp | 62 --------------
 .../MaterialXGenMsl/Nodes/TexCoordNodeMsl.h   | 26 ------
 source/MaterialXGenShader/HwShaderGenerator.h |  3 +
 .../Nodes/HwTexCoordNode.cpp                  | 83 +++++++++++++++++++
 .../Nodes/HwTexCoordNode.h}                   | 15 ++--
 source/MaterialXGenShader/ShaderStage.cpp     | 17 +++-
 source/MaterialXGenShader/ShaderStage.h       | 26 ++++--
 13 files changed, 163 insertions(+), 172 deletions(-)
 create mode 100644 resources/Materials/TestSuite/stdlib/texture/texcoord.mtlx
 delete mode 100644 source/MaterialXGenGlsl/Nodes/TexCoordNodeGlsl.cpp
 delete mode 100644 source/MaterialXGenMsl/Nodes/TexCoordNodeMsl.cpp
 delete mode 100644 source/MaterialXGenMsl/Nodes/TexCoordNodeMsl.h
 create mode 100644 source/MaterialXGenShader/Nodes/HwTexCoordNode.cpp
 rename source/{MaterialXGenGlsl/Nodes/TexCoordNodeGlsl.h => MaterialXGenShader/Nodes/HwTexCoordNode.h} (55%)

diff --git a/resources/Materials/TestSuite/stdlib/texture/texcoord.mtlx b/resources/Materials/TestSuite/stdlib/texture/texcoord.mtlx
new file mode 100644
index 0000000000..4fbf6d12d9
--- /dev/null
+++ b/resources/Materials/TestSuite/stdlib/texture/texcoord.mtlx
@@ -0,0 +1,25 @@
+
+
+  
+  
+    
+    
+    
+    
+    
+  
+  
+    
+  
+  
+  
+  
+    
+  
+  
+    
+  
+
diff --git a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
index 839f591aa5..87582c8f50 100644
--- a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
+++ b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
@@ -10,7 +10,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -34,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -174,8 +174,8 @@ GlslShaderGenerator::GlslShaderGenerator() :
     // 
     registerImplementation("IM_bitangent_vector3_" + GlslShaderGenerator::TARGET, BitangentNodeGlsl::create);
     // 
-    registerImplementation("IM_texcoord_vector2_" + GlslShaderGenerator::TARGET, TexCoordNodeGlsl::create);
-    registerImplementation("IM_texcoord_vector3_" + GlslShaderGenerator::TARGET, TexCoordNodeGlsl::create);
+    registerImplementation("IM_texcoord_vector2_" + GlslShaderGenerator::TARGET, HwTexCoordNode::create);
+    registerImplementation("IM_texcoord_vector3_" + GlslShaderGenerator::TARGET, HwTexCoordNode::create);
     // 
     registerImplementation("IM_geomcolor_float_" + GlslShaderGenerator::TARGET, GeomColorNodeGlsl::create);
     registerImplementation("IM_geomcolor_color3_" + GlslShaderGenerator::TARGET, GeomColorNodeGlsl::create);
diff --git a/source/MaterialXGenGlsl/GlslShaderGenerator.h b/source/MaterialXGenGlsl/GlslShaderGenerator.h
index 1df2ace543..4464f5d47c 100644
--- a/source/MaterialXGenGlsl/GlslShaderGenerator.h
+++ b/source/MaterialXGenGlsl/GlslShaderGenerator.h
@@ -45,7 +45,7 @@ class MX_GENGLSL_API GlslShaderGenerator : public HwShaderGenerator
     ShaderNodeImplPtr getImplementation(const NodeDef& nodedef, GenContext& context) const override;
 
     /// Determine the prefix of vertex data variables.
-    virtual string getVertexDataPrefix(const VariableBlock& vertexData) const;
+    string getVertexDataPrefix(const VariableBlock& vertexData) const override;
 
   public:
     /// Unique identifier for this generator target
diff --git a/source/MaterialXGenGlsl/Nodes/TexCoordNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/TexCoordNodeGlsl.cpp
deleted file mode 100644
index 846c77f5b7..0000000000
--- a/source/MaterialXGenGlsl/Nodes/TexCoordNodeGlsl.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include 
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-ShaderNodeImplPtr TexCoordNodeGlsl::create()
-{
-    return std::make_shared();
-}
-
-void TexCoordNodeGlsl::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
-{
-    const ShaderOutput* output = node.getOutput();
-    const ShaderInput* indexInput = node.getInput(INDEX);
-    const string index = indexInput ? indexInput->getValue()->getValueString() : "0";
-
-    ShaderStage& vs = shader.getStage(Stage::VERTEX);
-    ShaderStage& ps = shader.getStage(Stage::PIXEL);
-
-    addStageInput(HW::VERTEX_INPUTS, output->getType(), HW::T_IN_TEXCOORD + "_" + index, vs);
-    addStageConnector(HW::VERTEX_DATA, output->getType(), HW::T_TEXCOORD + "_" + index, vs, ps);
-}
-
-void TexCoordNodeGlsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
-{
-    const GlslShaderGenerator& shadergen = static_cast(context.getShaderGenerator());
-
-    const ShaderInput* indexInput = node.getInput(INDEX);
-    const string index = indexInput ? indexInput->getValue()->getValueString() : "0";
-    const string variable = HW::T_TEXCOORD + "_" + index;
-
-    DEFINE_SHADER_STAGE(stage, Stage::VERTEX)
-    {
-        VariableBlock& vertexData = stage.getOutputBlock(HW::VERTEX_DATA);
-        const string prefix = shadergen.getVertexDataPrefix(vertexData);
-        ShaderPort* texcoord = vertexData[variable];
-        if (!texcoord->isEmitted())
-        {
-            shadergen.emitLine(prefix + texcoord->getVariable() + " = " + HW::T_IN_TEXCOORD + "_" + index, stage);
-            texcoord->setEmitted();
-        }
-    }
-
-    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
-    {
-        VariableBlock& vertexData = stage.getInputBlock(HW::VERTEX_DATA);
-        const string prefix = shadergen.getVertexDataPrefix(vertexData);
-        ShaderPort* texcoord = vertexData[variable];
-        shadergen.emitLineBegin(stage);
-        shadergen.emitOutput(node.getOutput(), true, false, context, stage);
-        shadergen.emitString(" = " + prefix + texcoord->getVariable(), stage);
-        shadergen.emitLineEnd(stage);
-    }
-}
-
-MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenMsl/MslShaderGenerator.cpp b/source/MaterialXGenMsl/MslShaderGenerator.cpp
index 0d97e8408f..1d93104ce8 100644
--- a/source/MaterialXGenMsl/MslShaderGenerator.cpp
+++ b/source/MaterialXGenMsl/MslShaderGenerator.cpp
@@ -10,7 +10,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -34,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -178,8 +178,8 @@ MslShaderGenerator::MslShaderGenerator() :
     // 
     registerImplementation("IM_bitangent_vector3_" + MslShaderGenerator::TARGET, BitangentNodeMsl::create);
     // 
-    registerImplementation("IM_texcoord_vector2_" + MslShaderGenerator::TARGET, TexCoordNodeMsl::create);
-    registerImplementation("IM_texcoord_vector3_" + MslShaderGenerator::TARGET, TexCoordNodeMsl::create);
+    registerImplementation("IM_texcoord_vector2_" + MslShaderGenerator::TARGET, HwTexCoordNode::create);
+    registerImplementation("IM_texcoord_vector3_" + MslShaderGenerator::TARGET, HwTexCoordNode::create);
     // 
     registerImplementation("IM_geomcolor_float_" + MslShaderGenerator::TARGET, GeomColorNodeMsl::create);
     registerImplementation("IM_geomcolor_color3_" + MslShaderGenerator::TARGET, GeomColorNodeMsl::create);
diff --git a/source/MaterialXGenMsl/MslShaderGenerator.h b/source/MaterialXGenMsl/MslShaderGenerator.h
index ecbf37d7a6..631c38f33d 100644
--- a/source/MaterialXGenMsl/MslShaderGenerator.h
+++ b/source/MaterialXGenMsl/MslShaderGenerator.h
@@ -48,7 +48,7 @@ class MX_GENMSL_API MslShaderGenerator : public HwShaderGenerator
     ShaderNodeImplPtr getImplementation(const NodeDef& nodedef, GenContext& context) const override;
 
     /// Determine the prefix of vertex data variables.
-    virtual string getVertexDataPrefix(const VariableBlock& vertexData) const;
+    string getVertexDataPrefix(const VariableBlock& vertexData) const override;
 
   public:
     /// Unique identifier for this generator target
diff --git a/source/MaterialXGenMsl/Nodes/TexCoordNodeMsl.cpp b/source/MaterialXGenMsl/Nodes/TexCoordNodeMsl.cpp
deleted file mode 100644
index a88152eb82..0000000000
--- a/source/MaterialXGenMsl/Nodes/TexCoordNodeMsl.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include 
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-ShaderNodeImplPtr TexCoordNodeMsl::create()
-{
-    return std::make_shared();
-}
-
-void TexCoordNodeMsl::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
-{
-    const ShaderOutput* output = node.getOutput();
-    const ShaderInput* indexInput = node.getInput(INDEX);
-    const string index = indexInput ? indexInput->getValue()->getValueString() : "0";
-
-    ShaderStage& vs = shader.getStage(Stage::VERTEX);
-    ShaderStage& ps = shader.getStage(Stage::PIXEL);
-
-    addStageInput(HW::VERTEX_INPUTS, output->getType(), HW::T_IN_TEXCOORD + "_" + index, vs);
-    addStageConnector(HW::VERTEX_DATA, output->getType(), HW::T_TEXCOORD + "_" + index, vs, ps);
-}
-
-void TexCoordNodeMsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
-{
-    const MslShaderGenerator& shadergen = static_cast(context.getShaderGenerator());
-
-    const ShaderInput* indexInput = node.getInput(INDEX);
-    const string index = indexInput ? indexInput->getValue()->getValueString() : "0";
-    const string variable = HW::T_TEXCOORD + "_" + index;
-
-    DEFINE_SHADER_STAGE(stage, Stage::VERTEX)
-    {
-        VariableBlock& vertexData = stage.getOutputBlock(HW::VERTEX_DATA);
-        const string prefix = shadergen.getVertexDataPrefix(vertexData);
-        ShaderPort* texcoord = vertexData[variable];
-        if (!texcoord->isEmitted())
-        {
-            shadergen.emitLine(prefix + texcoord->getVariable() + " = " + HW::T_IN_TEXCOORD + "_" + index, stage);
-            texcoord->setEmitted();
-        }
-    }
-
-    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
-    {
-        VariableBlock& vertexData = stage.getInputBlock(HW::VERTEX_DATA);
-        const string prefix = shadergen.getVertexDataPrefix(vertexData);
-        ShaderPort* texcoord = vertexData[variable];
-        shadergen.emitLineBegin(stage);
-        shadergen.emitOutput(node.getOutput(), true, false, context, stage);
-        shadergen.emitString(" = " + prefix + texcoord->getVariable(), stage);
-        shadergen.emitLineEnd(stage);
-    }
-}
-
-MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenMsl/Nodes/TexCoordNodeMsl.h b/source/MaterialXGenMsl/Nodes/TexCoordNodeMsl.h
deleted file mode 100644
index 6c227cc63b..0000000000
--- a/source/MaterialXGenMsl/Nodes/TexCoordNodeMsl.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#ifndef MATERIALX_TEXCOORDNODEMSL_H
-#define MATERIALX_TEXCOORDNODEMSL_H
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-/// TexCoord node implementation for MSL
-class MX_GENMSL_API TexCoordNodeMsl : public MslImplementation
-{
-  public:
-    static ShaderNodeImplPtr create();
-
-    void createVariables(const ShaderNode& node, GenContext& context, Shader& shader) const override;
-
-    void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
-};
-
-MATERIALX_NAMESPACE_END
-
-#endif
diff --git a/source/MaterialXGenShader/HwShaderGenerator.h b/source/MaterialXGenShader/HwShaderGenerator.h
index 66d60dc68a..bba572c631 100644
--- a/source/MaterialXGenShader/HwShaderGenerator.h
+++ b/source/MaterialXGenShader/HwShaderGenerator.h
@@ -306,6 +306,9 @@ class MX_GENSHADER_API HwShaderGenerator : public ShaderGenerator
     /// Unbind all light shaders previously bound.
     static void unbindLightShaders(GenContext& context);
 
+    /// Determine the prefix of vertex data variables.
+    virtual string getVertexDataPrefix(const VariableBlock& vertexData) const = 0;
+
     /// Types of closure contexts for HW.
     enum ClosureContextType
     {
diff --git a/source/MaterialXGenShader/Nodes/HwTexCoordNode.cpp b/source/MaterialXGenShader/Nodes/HwTexCoordNode.cpp
new file mode 100644
index 0000000000..3aa84400df
--- /dev/null
+++ b/source/MaterialXGenShader/Nodes/HwTexCoordNode.cpp
@@ -0,0 +1,83 @@
+//
+// Copyright Contributors to the MaterialX Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#include 
+#include 
+#include 
+
+MATERIALX_NAMESPACE_BEGIN
+
+string HwTexCoordNode::INDEX = "index";
+
+ShaderNodeImplPtr HwTexCoordNode::create()
+{
+    return std::make_shared();
+}
+
+void HwTexCoordNode::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
+{
+    const ShaderOutput* output = node.getOutput();
+    const string index = getIndex(node);
+
+    ShaderStage& vs = shader.getStage(Stage::VERTEX);
+    ShaderStage& ps = shader.getStage(Stage::PIXEL);
+
+    addStageInput(HW::VERTEX_INPUTS, output->getType(), HW::T_IN_TEXCOORD + "_" + index, vs, true);
+    addStageConnector(HW::VERTEX_DATA, output->getType(), HW::T_TEXCOORD + "_" + index, vs, ps, true);
+}
+
+void HwTexCoordNode::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
+{
+    const HwShaderGenerator& shadergen = static_cast(context.getShaderGenerator());
+
+    const string index = getIndex(node);
+    const string variable = HW::T_TEXCOORD + "_" + index;
+    const ShaderOutput* output = node.getOutput();
+
+    DEFINE_SHADER_STAGE(stage, Stage::VERTEX)
+    {
+        VariableBlock& vertexData = stage.getOutputBlock(HW::VERTEX_DATA);
+        const string prefix = shadergen.getVertexDataPrefix(vertexData);
+        ShaderPort* texcoord = vertexData[variable];
+        if (!texcoord->isEmitted())
+        {
+            shadergen.emitLine(prefix + texcoord->getVariable() + " = " + HW::T_IN_TEXCOORD + "_" + index, stage);
+            texcoord->setEmitted();
+        }
+    }
+
+    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
+    {
+        VariableBlock& vertexData = stage.getInputBlock(HW::VERTEX_DATA);
+        const string prefix = shadergen.getVertexDataPrefix(vertexData);
+        ShaderPort* texcoord = vertexData[variable];
+        shadergen.emitLineBegin(stage);
+        shadergen.emitOutput(output, true, false, context, stage);
+
+        // Extract the requested number of components from the texture coordinates (which may be a
+        // larger datatype than the requested number of texture coordinates, if several texture
+        // coordinate nodes with different width coexist).
+        string suffix = EMPTY_STRING;
+        if (output->getType() == Type::VECTOR2)
+        {
+            suffix = ".xy";
+        }
+        else if (output->getType() == Type::VECTOR3)
+        {
+            suffix = ".xyz";
+        }
+
+        shadergen.emitString(" = " + prefix + texcoord->getVariable() + suffix, stage);
+        shadergen.emitLineEnd(stage);
+    }
+}
+
+string HwTexCoordNode::getIndex(const ShaderNode& node) const
+{
+    const ShaderInput* input = node.getInput(INDEX);
+    return input ? input->getValue()->getValueString() : "0";
+}
+
+MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenGlsl/Nodes/TexCoordNodeGlsl.h b/source/MaterialXGenShader/Nodes/HwTexCoordNode.h
similarity index 55%
rename from source/MaterialXGenGlsl/Nodes/TexCoordNodeGlsl.h
rename to source/MaterialXGenShader/Nodes/HwTexCoordNode.h
index c15a86fd9c..9aae3d18ce 100644
--- a/source/MaterialXGenGlsl/Nodes/TexCoordNodeGlsl.h
+++ b/source/MaterialXGenShader/Nodes/HwTexCoordNode.h
@@ -3,15 +3,15 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#ifndef MATERIALX_TEXCOORDNODEGLSL_H
-#define MATERIALX_TEXCOORDNODEGLSL_H
+#ifndef MATERIALX_HWTEXCOORDNODE_H
+#define MATERIALX_HWTEXCOORDNODE_H
 
-#include 
+#include 
 
 MATERIALX_NAMESPACE_BEGIN
 
-/// TexCoord node implementation for GLSL
-class MX_GENGLSL_API TexCoordNodeGlsl : public GlslImplementation
+/// Generic texture coordinate node for hardware languages
+class MX_GENSHADER_API HwTexCoordNode : public ShaderNodeImpl
 {
   public:
     static ShaderNodeImplPtr create();
@@ -19,6 +19,11 @@ class MX_GENGLSL_API TexCoordNodeGlsl : public GlslImplementation
     void createVariables(const ShaderNode& node, GenContext& context, Shader& shader) const override;
 
     void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
+
+  protected:
+    virtual string getIndex(const ShaderNode& node) const;
+
+    static string INDEX;
 };
 
 MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenShader/ShaderStage.cpp b/source/MaterialXGenShader/ShaderStage.cpp
index 822f3c9664..b5387bcb94 100644
--- a/source/MaterialXGenShader/ShaderStage.cpp
+++ b/source/MaterialXGenShader/ShaderStage.cpp
@@ -65,11 +65,26 @@ ShaderPort* VariableBlock::find(const ShaderPortPredicate& predicate)
     return nullptr;
 }
 
-ShaderPort* VariableBlock::add(const TypeDesc* type, const string& name, ValuePtr value)
+ShaderPort* VariableBlock::add(const TypeDesc* type, const string& name, ValuePtr value, bool shouldWiden)
 {
     auto it = _variableMap.find(name);
     if (it != _variableMap.end())
     {
+        if (shouldWiden)
+        {
+            // Automatically try to widen the type of the shader port if the requested type differs from
+            // the existing port's type.
+            if (it->second->getType()->getSize() < type->getSize())
+            {
+                it->second->setType(type);
+            }
+        }
+        else if (type != it->second->getType())
+        {
+            throw ExceptionShaderGenError("Trying to add shader port '" + name + "' with type '" +
+                type->getName() + "', but existing shader port with type '" +
+                it->second->getType()->getName() + "' was found");
+        }
         return it->second.get();
     }
 
diff --git a/source/MaterialXGenShader/ShaderStage.h b/source/MaterialXGenShader/ShaderStage.h
index 71004f8e52..a6a5cec0b8 100644
--- a/source/MaterialXGenShader/ShaderStage.h
+++ b/source/MaterialXGenShader/ShaderStage.h
@@ -113,7 +113,14 @@ class MX_GENSHADER_API VariableBlock
     ShaderPort* find(const ShaderPortPredicate& predicate);
 
     /// Add a new shader port to this block.
-    ShaderPort* add(const TypeDesc* type, const string& name, ValuePtr value = nullptr);
+    /// @param type The desired shader port type
+    /// @param name The shader port name
+    /// @param value The value to attach to the shader port
+    /// @param shouldWiden When false, an exception is thrown if the type of the existing port with
+    ///   the same name does not match the requested type. When true, the types can mismatch, and the
+    ///   type of any existing port is widened to match the requested type when necessary.
+    /// @return A new shader port, or a pre-existing shader port with the same name.
+    ShaderPort* add(const TypeDesc* type, const string& name, ValuePtr value = nullptr, bool shouldWiden = false);
 
     /// Add an existing shader port to this block.
     void add(ShaderPortPtr port);
@@ -339,20 +346,22 @@ inline ShaderPort* addStageUniform(const string& block,
 inline ShaderPort* addStageInput(const string& block,
                                  const TypeDesc* type,
                                  const string& name,
-                                 ShaderStage& stage)
+                                 ShaderStage& stage,
+                                 bool shouldWiden = false)
 {
     VariableBlock& inputs = stage.getInputBlock(block);
-    return inputs.add(type, name);
+    return inputs.add(type, name, {}, shouldWiden);
 }
 
 /// Utility function for adding a new shader port to an output block.
 inline ShaderPort* addStageOutput(const string& block,
                                   const TypeDesc* type,
                                   const string& name,
-                                  ShaderStage& stage)
+                                  ShaderStage& stage,
+                                  bool shouldWiden = false)
 {
     VariableBlock& outputs = stage.getOutputBlock(block);
-    return outputs.add(type, name);
+    return outputs.add(type, name, {}, shouldWiden);
 }
 
 /// Utility function for adding a connector block between stages.
@@ -370,10 +379,11 @@ inline void addStageConnector(const string& block,
                               const TypeDesc* type,
                               const string& name,
                               ShaderStage& from,
-                              ShaderStage& to)
+                              ShaderStage& to,
+                              bool shouldWiden = false)
 {
-    addStageOutput(block, type, name, from);
-    addStageInput(block, type, name, to);
+    addStageOutput(block, type, name, from, shouldWiden);
+    addStageInput(block, type, name, to, shouldWiden);
 }
 
 MATERIALX_NAMESPACE_END

From eb52ec28e09fc86e00b6e7120f5676d37db6e8b8 Mon Sep 17 00:00:00 2001
From: Erika Harrison 
Date: Fri, 13 Oct 2023 17:26:19 -0600
Subject: [PATCH 20/66] Update link connections by dragging between ports
 (#1569)

Currently, one must explicitly delete an existing link before adding a new link for a given node. This change enables dragging to update a link connection, and automatically deletes the existing link on the input pin if one exists.

Note: An output pin on a node may have many outgoing links, but an input pin may only have one incoming link. This behaviour is unchanged.

Also:

- Renames a few variables for consistency on start/end and input/output pins
- Ensures you can't add a link from an input to an input, or from an output to an output
- Can also drag from an output to an input and have it correctly delete existing link
---
 source/MaterialXGraphEditor/Graph.cpp | 307 ++++++++++++++------------
 source/MaterialXGraphEditor/Graph.h   |   4 +-
 2 files changed, 171 insertions(+), 140 deletions(-)

diff --git a/source/MaterialXGraphEditor/Graph.cpp b/source/MaterialXGraphEditor/Graph.cpp
index 2b28317ee2..522280cb08 100644
--- a/source/MaterialXGraphEditor/Graph.cpp
+++ b/source/MaterialXGraphEditor/Graph.cpp
@@ -846,7 +846,7 @@ void Graph::setRenderMaterial(UiNodePtr node)
     }
 }
 
-void Graph::updateMaterials(mx::InputPtr input, mx::ValuePtr value)
+void Graph::updateMaterials(mx::InputPtr input /* = nullptr */, mx::ValuePtr value /* = nullptr */)
 {
     std::string renderablePath;
     if (_currRenderNode)
@@ -2483,12 +2483,22 @@ void Graph::setDefaults(mx::InputPtr input)
     }
 }
 
-void Graph::addLink(ed::PinId inputPinId, ed::PinId outputPinId)
+void Graph::addLink(ed::PinId startPinId, ed::PinId endPinId)
 {
-    int end_attr = int(outputPinId.Get());
-    int start_attr = int(inputPinId.Get());
-    UiPinPtr inputPin = getPin(outputPinId);
-    UiPinPtr outputPin = getPin(inputPinId);
+    // prefer to assume left to right - start is an output, end is an input; swap if inaccurate
+    if (UiPinPtr inputPin = getPin(endPinId); inputPin && inputPin->_kind != ed::PinKind::Input)
+    {
+        auto tmp = startPinId;
+        startPinId = endPinId;
+        endPinId = tmp;
+    }
+
+    int end_attr = int(endPinId.Get());
+    int start_attr = int(startPinId.Get());
+    ed::PinId outputPinId = startPinId;
+    ed::PinId inputPinId = endPinId;
+    UiPinPtr outputPin = getPin(outputPinId);
+    UiPinPtr inputPin = getPin(inputPinId);
 
     if (!inputPin || !outputPin)
     {
@@ -2505,187 +2515,206 @@ void Graph::addLink(ed::PinId inputPinId, ed::PinId outputPinId)
         return;
     }
 
-    if (inputPin->_connected == false)
+    // Perform kind check
+    bool kindsMatch = (outputPin->_kind == inputPin->_kind);
+    if (kindsMatch)
     {
-        int upNode = getNodeId(inputPinId);
-        int downNode = getNodeId(outputPinId);
-        UiNodePtr uiDownNode = _graphNodes[downNode];
-        UiNodePtr uiUpNode = _graphNodes[upNode];
-        if (!uiDownNode || !uiUpNode)
-        {
-            ed::RejectNewItem();
-            return;
-        }
+        ed::RejectNewItem();
+        showLabel("Invalid connection due to same input/output kind", ImColor(50, 50, 50, 255));
+        return;
+    }
 
-        // make sure there is an implementation for node
-        const mx::ShaderGenerator& shadergen = _renderer->getGenContext().getShaderGenerator();
+    int upNode = getNodeId(outputPinId);
+    int downNode = getNodeId(inputPinId);
+    UiNodePtr uiDownNode = _graphNodes[downNode];
+    UiNodePtr uiUpNode = _graphNodes[upNode];
+    if (!uiDownNode || !uiUpNode)
+    {
+        ed::RejectNewItem();
+        return;
+    }
 
-        // Prevent direct connecting from input to output
-        if (uiDownNode->getInput() && uiUpNode->getOutput())
-        {
-            ed::RejectNewItem();
-            showLabel("Direct connections between inputs and outputs is invalid", ImColor(50, 50, 50, 255));
-            return;
-        }
+    // make sure there is an implementation for node
+    const mx::ShaderGenerator& shadergen = _renderer->getGenContext().getShaderGenerator();
 
-        // Find the implementation for this nodedef if not an input or output uinode
-        if (uiDownNode->getInput() && _isNodeGraph)
+    // Prevent direct connecting from input to output
+    if (uiDownNode->getInput() && uiUpNode->getOutput())
+    {
+        ed::RejectNewItem();
+        showLabel("Direct connections between inputs and outputs is invalid", ImColor(50, 50, 50, 255));
+        return;
+    }
+
+    // Find the implementation for this nodedef if not an input or output uinode
+    if (uiDownNode->getInput() && _isNodeGraph)
+    {
+        ed::RejectNewItem();
+        showLabel("Cannot connect to inputs inside of graph", ImColor(50, 50, 50, 255));
+        return;
+    }
+    else if (uiUpNode->getNode())
+    {
+        mx::ShaderNodeImplPtr impl = shadergen.getImplementation(*_graphNodes[upNode]->getNode()->getNodeDef(), _renderer->getGenContext());
+        if (!impl)
         {
             ed::RejectNewItem();
-            showLabel("Cannot connect to inputs inside of graph", ImColor(50, 50, 50, 255));
+            showLabel("Invalid Connection: Node does not have an implementation", ImColor(50, 50, 50, 255));
             return;
         }
-        else if (uiUpNode->getNode())
+    }
+
+    if (ed::AcceptNewItem())
+    {
+        // If the accepting node already has a link, remove it
+        if (inputPin->_connected)
         {
-            mx::ShaderNodeImplPtr impl = shadergen.getImplementation(*_graphNodes[upNode]->getNode()->getNodeDef(), _renderer->getGenContext());
-            if (!impl)
+            for (auto linksItr = _currLinks.begin(); linksItr != _currLinks.end(); linksItr++)
             {
-                ed::RejectNewItem();
-                showLabel("Invalid Connection: Node does not have an implementation", ImColor(50, 50, 50, 255));
-                return;
+                if (linksItr->_endAttr == end_attr)
+                {
+                    // found existing link - remove it; adapted from deleteLink
+                    // note: ed::BreakLinks doesn't work as the order ends up inaccurate
+                    deleteLinkInfo(linksItr->_startAttr, linksItr->_endAttr);
+                    _currLinks.erase(linksItr);
+                    break;
+                }
             }
+
         }
 
-        if (ed::AcceptNewItem())
-        {
-            // Since we accepted new link, lets add one to our list of links.
-            Link link;
-            link._startAttr = start_attr;
-            link._endAttr = end_attr;
-            _currLinks.push_back(link);
-            _frameCount = ImGui::GetFrameCount();
-            _renderer->setMaterialCompilation(true);
+        // Since we accepted new link, lets add one to our list of links.
+        Link link;
+        link._startAttr = start_attr;
+        link._endAttr = end_attr;
+        _currLinks.push_back(link);
+        _frameCount = ImGui::GetFrameCount();
+        _renderer->setMaterialCompilation(true);
 
-            if (uiDownNode->getNode() || uiDownNode->getNodeGraph())
+        if (uiDownNode->getNode() || uiDownNode->getNodeGraph())
+        {
+            mx::InputPtr connectingInput = nullptr;
+            for (UiPinPtr pin : uiDownNode->inputPins)
             {
-                mx::InputPtr connectingInput = nullptr;
-                for (UiPinPtr pin : uiDownNode->inputPins)
+                if (pin->_pinId == inputPinId)
                 {
-                    if (pin->_pinId == outputPinId)
+                    addNodeInput(uiDownNode, pin->_input);
+                    // update value to be empty
+                    if (uiDownNode->getNode() && uiDownNode->getNode()->getType() == mx::SURFACE_SHADER_TYPE_STRING)
                     {
-                        addNodeInput(uiDownNode, pin->_input);
-                        // update value to be empty
-                        if (uiDownNode->getNode() && uiDownNode->getNode()->getType() == mx::SURFACE_SHADER_TYPE_STRING)
+                        if (uiUpNode->getOutput() != nullptr)
                         {
-                            if (uiUpNode->getOutput() != nullptr)
-                            {
-                                pin->_input->setConnectedOutput(uiUpNode->getOutput());
-                            }
-                            else if (uiUpNode->getInput() != nullptr)
-                            {
-                                pin->_input->setInterfaceName(uiUpNode->getName());
-                            }
-                            else
+                            pin->_input->setConnectedOutput(uiUpNode->getOutput());
+                        }
+                        else if (uiUpNode->getInput() != nullptr)
+                        {
+                            pin->_input->setInterfaceName(uiUpNode->getName());
+                        }
+                        else
+                        {
+                            // node graph
+                            if (uiUpNode->getNodeGraph() != nullptr)
                             {
-                                // node graph
-                                if (uiUpNode->getNodeGraph() != nullptr)
+                                for (UiPinPtr outPin : uiUpNode->outputPins)
                                 {
-                                    for (UiPinPtr outPin : uiUpNode->outputPins)
+                                    // set pin connection to correct output
+                                    if (outPin->_pinId == outputPinId)
                                     {
-                                        // set pin connection to correct output
-                                        if (outPin->_pinId == inputPinId)
-                                        {
-                                            mx::OutputPtr outputs = uiUpNode->getNodeGraph()->getOutput(outPin->_name);
-                                            pin->_input->setConnectedOutput(outputs);
-                                        }
+                                        mx::OutputPtr outputs = uiUpNode->getNodeGraph()->getOutput(outPin->_name);
+                                        pin->_input->setConnectedOutput(outputs);
                                     }
                                 }
-                                else
-                                {
-                                    pin->_input->setConnectedNode(uiUpNode->getNode());
-                                }
                             }
+                            else
+                            {
+                                pin->_input->setConnectedNode(uiUpNode->getNode());
+                            }
+                        }
+                    }
+                    else
+                    {
+                        if (uiUpNode->getInput())
+                        {
+                            pin->_input->setInterfaceName(uiUpNode->getName());
                         }
                         else
                         {
-                            if (uiUpNode->getInput())
-                            {
-                                pin->_input->setInterfaceName(uiUpNode->getName());
-                            }
-                            else
+                            if (uiUpNode->getNode())
                             {
-                                if (uiUpNode->getNode())
+                                mx::NodePtr upstreamNode = _graphNodes[upNode]->getNode();
+                                mx::NodeDefPtr upstreamNodeDef = upstreamNode->getNodeDef();
+                                bool isMultiOutput = upstreamNodeDef ? upstreamNodeDef->getOutputs().size() > 1 : false;
+
+                                // This is purely to avoid adding a reference to an update node only 1 output,
+                                // as currently validation consides adding this an error. Otherwise
+                                // it will add an "output" attribute all the time.
+                                if (!isMultiOutput)
                                 {
-                                    mx::NodePtr upstreamNode = _graphNodes[upNode]->getNode();
-                                    mx::NodeDefPtr upstreamNodeDef = upstreamNode->getNodeDef();
-                                    bool isMultiOutput = upstreamNodeDef ? upstreamNodeDef->getOutputs().size() > 1 : false;
-
-                                    // This is purely to avoid adding a reference to an update node only 1 output,
-                                    // as currently validation consides adding this an error. Otherwise
-                                    // it will add an "output" attribute all the time.
-                                    if (!isMultiOutput)
-                                    {
-                                        pin->_input->setConnectedNode(uiUpNode->getNode());
-                                    }
-                                    else
+                                    pin->_input->setConnectedNode(uiUpNode->getNode());
+                                }
+                                else
+                                {
+                                    for (UiPinPtr outPin : _graphNodes[upNode]->outputPins)
                                     {
-                                        for (UiPinPtr outPin : _graphNodes[upNode]->outputPins)
+                                        // set pin connection to correct output
+                                        if (outPin->_pinId == outputPinId)
                                         {
-                                            // set pin connection to correct output
-                                            if (outPin->_pinId == inputPinId)
+                                            mx::OutputPtr outputs = uiUpNode->getNode()->getOutput(outPin->_name);
+                                            if (!outputs)
                                             {
-                                                mx::OutputPtr outputs = uiUpNode->getNode()->getOutput(outPin->_name);
-                                                if (!outputs)
-                                                {
-                                                    outputs = uiUpNode->getNode()->addOutput(outPin->_name, pin->_input->getType());
-                                                }
-                                                pin->_input->setConnectedOutput(outputs);
+                                                outputs = uiUpNode->getNode()->addOutput(outPin->_name, pin->_input->getType());
                                             }
+                                            pin->_input->setConnectedOutput(outputs);
                                         }
                                     }
                                 }
-                                else if (uiUpNode->getNodeGraph())
+                            }
+                            else if (uiUpNode->getNodeGraph())
+                            {
+                                for (UiPinPtr outPin : uiUpNode->outputPins)
                                 {
-                                    for (UiPinPtr outPin : uiUpNode->outputPins)
+                                    // set pin connection to correct output
+                                    if (outPin->_pinId == outputPinId)
                                     {
-                                        // set pin connection to correct output
-                                        if (outPin->_pinId == inputPinId)
-                                        {
-                                            mx::OutputPtr outputs = uiUpNode->getNodeGraph()->getOutput(outPin->_name);
-                                            pin->_input->setConnectedOutput(outputs);
-                                        }
+                                        mx::OutputPtr outputs = uiUpNode->getNodeGraph()->getOutput(outPin->_name);
+                                        pin->_input->setConnectedOutput(outputs);
                                     }
                                 }
                             }
                         }
-
-                        pin->setConnected(true);
-                        pin->_input->removeAttribute(mx::ValueElement::VALUE_ATTRIBUTE);
-                        connectingInput = pin->_input;
-                        break;
                     }
+
+                    pin->setConnected(true);
+                    pin->_input->removeAttribute(mx::ValueElement::VALUE_ATTRIBUTE);
+                    connectingInput = pin->_input;
+                    break;
                 }
-                // create new edge and set edge information
-                createEdge(_graphNodes[upNode], _graphNodes[downNode], connectingInput);
             }
-            else if (_graphNodes[downNode]->getOutput() != nullptr)
-            {
-                mx::InputPtr connectingInput = nullptr;
-                _graphNodes[downNode]->getOutput()->setConnectedNode(_graphNodes[upNode]->getNode());
+            // create new edge and set edge information
+            createEdge(_graphNodes[upNode], _graphNodes[downNode], connectingInput);
+        }
+        else if (_graphNodes[downNode]->getOutput() != nullptr)
+        {
+            mx::InputPtr connectingInput = nullptr;
+            _graphNodes[downNode]->getOutput()->setConnectedNode(_graphNodes[upNode]->getNode());
 
-                // create new edge and set edge information
-                createEdge(_graphNodes[upNode], _graphNodes[downNode], connectingInput);
-            }
-            else
+            // create new edge and set edge information
+            createEdge(_graphNodes[upNode], _graphNodes[downNode], connectingInput);
+        }
+        else
+        {
+            // create new edge and set edge info
+            UiEdge newEdge = UiEdge(_graphNodes[upNode], _graphNodes[downNode], nullptr);
+            if (!edgeExists(newEdge))
             {
-                // create new edge and set edge info
-                UiEdge newEdge = UiEdge(_graphNodes[upNode], _graphNodes[downNode], nullptr);
-                if (!edgeExists(newEdge))
-                {
-                    _graphNodes[downNode]->edges.push_back(newEdge);
-                    _currEdge.push_back(newEdge);
+                _graphNodes[downNode]->edges.push_back(newEdge);
+                _currEdge.push_back(newEdge);
 
-                    // update input node num and output connections
-                    _graphNodes[downNode]->setInputNodeNum(1);
-                    _graphNodes[upNode]->setOutputConnection(_graphNodes[downNode]);
-                }
+                // update input node num and output connections
+                _graphNodes[downNode]->setInputNodeNum(1);
+                _graphNodes[upNode]->setOutputConnection(_graphNodes[downNode]);
             }
         }
     }
-    else
-    {
-        ed::RejectNewItem();
-    }
 }
 
 void Graph::removeEdge(int downNode, int upNode, UiPinPtr pin)
@@ -4045,12 +4074,12 @@ void Graph::drawGraph(ImVec2 mousePos)
         // Add new link
         if (ed::BeginCreate())
         {
-            ed::PinId inputPinId, outputPinId, filterPinId;
-            if (ed::QueryNewLink(&inputPinId, &outputPinId))
+            ed::PinId startPinId, endPinId, filterPinId;
+            if (ed::QueryNewLink(&startPinId, &endPinId))
             {
                 if (!readOnly())
                 {
-                    addLink(inputPinId, outputPinId);
+                    addLink(startPinId, endPinId);
                 }
                 else
                 {
diff --git a/source/MaterialXGraphEditor/Graph.h b/source/MaterialXGraphEditor/Graph.h
index 8c76f0f68d..9b9857c69a 100644
--- a/source/MaterialXGraphEditor/Graph.h
+++ b/source/MaterialXGraphEditor/Graph.h
@@ -90,7 +90,9 @@ class Graph
 
     // Add link to nodegraph and set up connections between UiNodes and
     // MaterialX Nodes to update shader
-    void addLink(ed::PinId inputPinId, ed::PinId outputPinId);
+    // startPinId - where the link was initiated
+    // endPinId - where the link was ended
+    void addLink(ed::PinId startPinId, ed::PinId endPinId);
 
     // Delete link from current link vector and remove any connections in
     // UiNode or MaterialX Nodes to update shader

From 044645345bd491250ff6041489b83b28640e54bb Mon Sep 17 00:00:00 2001
From: Andy <94316446+beersandrew@users.noreply.github.com>
Date: Sat, 14 Oct 2023 22:56:53 +0300
Subject: [PATCH 21/66] Restructure Add Node List (#1562)

Added a list of nodes to the best of my ability to be the order they should be displayed
---
 source/MaterialXGraphEditor/Graph.cpp | 166 ++++++++++++++------------
 source/MaterialXGraphEditor/Graph.h   |  27 ++++-
 2 files changed, 112 insertions(+), 81 deletions(-)

diff --git a/source/MaterialXGraphEditor/Graph.cpp b/source/MaterialXGraphEditor/Graph.cpp
index 522280cb08..849b8607b4 100644
--- a/source/MaterialXGraphEditor/Graph.cpp
+++ b/source/MaterialXGraphEditor/Graph.cpp
@@ -236,9 +236,6 @@ void Graph::addExtraNodes()
         return;
     }
 
-    // Clear any old nodes, if we previously used tab with another graph doc
-    _extraNodes.clear();
-
     // Get all types from the doc
     std::vector types;
     std::vector typeDefs = _graphDoc->getTypeDefs();
@@ -252,18 +249,16 @@ void Graph::addExtraNodes()
     for (const std::string& type : types)
     {
         std::string nodeName = "ND_input_" + type;
-        _extraNodes["Input Nodes"].push_back({ nodeName, type, "input" });
+        _nodesToAdd.emplace_back(nodeName, type, "input", "Input Nodes");
         nodeName = "ND_output_" + type;
-        _extraNodes["Output Nodes"].push_back({ nodeName, type, "output" });
+        _nodesToAdd.emplace_back(nodeName, type, "output", "Output Nodes");
     }
 
     // Add group node
-    std::vector groupNode{ "ND_group", "", "group" };
-    _extraNodes["Group Nodes"].push_back(groupNode);
+    _nodesToAdd.emplace_back("ND_group", "", "group", "Group Nodes");
 
     // Add nodegraph node
-    std::vector nodeGraph{ "ND_nodegraph", "", "nodegraph" };
-    _extraNodes["Node Graph"].push_back(nodeGraph);
+    _nodesToAdd.emplace_back("ND_nodegraph", "", "nodegraph", "Node Graph");
 }
 
 ed::PinId Graph::getOutputPin(UiNodePtr node, UiNodePtr upNode, UiPinPtr input)
@@ -1224,20 +1219,63 @@ void Graph::setUiNodeInfo(UiNodePtr node, const std::string& type, const std::st
 void Graph::createNodeUIList(mx::DocumentPtr doc)
 {
     _nodesToAdd.clear();
-    const std::string EXTRA_GROUP_NAME = "extra";
-    for (mx::NodeDefPtr nodeDef : doc->getNodeDefs())
+
+    std::vector ordered_groups = {
+        "texture2d",
+        "texture3d",
+        "procedural",
+        "procedural2d",
+        "procedural3d",
+        "geometric",
+        "translation",
+        "convolution2d",
+        "math",
+        "adjustment",
+        "compositing",
+        "conditional",
+        "channel",
+        "organization",
+        "global",
+        "application",
+        "material",
+        "shader",
+        "pbr",
+        "light",
+        "colortransform",
+        "no_group"
+    };
+
+    auto nodeDefs = doc->getNodeDefs();
+    std::unordered_map> groupToNodeDef;
+
+    for (const auto& nodeDef : nodeDefs)
     {
-        // NodeDef is the key for the map
         std::string group = nodeDef->getNodeGroup();
+
         if (group.empty())
         {
-            group = EXTRA_GROUP_NAME;
+            group = "no_group";
         }
-        if (_nodesToAdd.find(group) == _nodesToAdd.end())
+
+        if (groupToNodeDef.find(group) == groupToNodeDef.end())
         {
-            _nodesToAdd[group] = std::vector();
+            groupToNodeDef[group] = std::vector();
+        }
+        groupToNodeDef[group].push_back(nodeDef);
+    }
+
+    for (const auto& group : ordered_groups)
+    {
+        auto it = groupToNodeDef.find(group);
+        if (it != groupToNodeDef.end())
+        {
+            const auto& groupNodeDefs = it->second;
+
+            for (const auto& nodeDef : groupNodeDefs)
+            {
+                _nodesToAdd.emplace_back(nodeDef->getName(), nodeDef->getType(), nodeDef->getNodeString(), group);
+            }
         }
-        _nodesToAdd[group].push_back(nodeDef);
     }
 
     addExtraNodes();
@@ -3595,96 +3633,66 @@ void Graph::addNodePopup(bool cursor)
         // Input string length
         // Filter extra nodes - includes inputs, outputs, groups, and node graphs
         const std::string NODEGRAPH_ENTRY = "Node Graph";
-        for (std::unordered_map>>::iterator it = _extraNodes.begin(); it != _extraNodes.end(); ++it)
+
+         // Filter nodedefs and add to menu if matches filter
+        for (auto node : _nodesToAdd)
         {
             // Filter out list of nodes
             if (subs.size() > 0)
             {
                 ImGui::SetNextWindowSizeConstraints(ImVec2(250.0f, 300.0f), ImVec2(-1.0f, 500.0f));
-                for (size_t i = 0; i < it->second.size(); i++)
-                {
-                    std::string str(it->second[i][0]);
-                    std::string nodeName = it->second[i][0];
+                std::string str(node.getName());
+                std::string nodeName = node.getName();
 
-                    // Disallow creating nested nodegraphs 
-                    if (_isNodeGraph && it->first == NODEGRAPH_ENTRY)
-                    {
-                        continue;
-                    }
+                // Disallow creating nested nodegraphs
+                if (_isNodeGraph && node.getGroup() == NODEGRAPH_ENTRY)
+                {
+                    continue;
+                }
 
-                    // Allow spaces to be used to search for node names
-                    std::replace(subs.begin(), subs.end(), ' ', '_');
+                // Allow spaces to be used to search for node names
+                std::replace(subs.begin(), subs.end(), ' ', '_');
 
-                    if (str.find(subs) != std::string::npos)
+                if (str.find(subs) != std::string::npos)
+                {
+                    if (ImGui::MenuItem(getUserNodeDefName(nodeName).c_str()) || (ImGui::IsItemFocused() && ImGui::IsKeyPressedMap(ImGuiKey_Enter)))
                     {
-                        if (ImGui::MenuItem(getUserNodeDefName(nodeName).c_str()) || (ImGui::IsItemFocused() && ImGui::IsKeyPressedMap(ImGuiKey_Enter)))
-                        {
-                            addNode(it->second[i][2], getUserNodeDefName(nodeName), it->second[i][1]);
-                            _addNewNode = true;
-                            memset(input, '\0', sizeof(input));
-                        }
+                        addNode(node.getCategory(), getUserNodeDefName(nodeName), node.getType());
+                        _addNewNode = true;
+                        memset(input, '\0', sizeof(input));
                     }
                 }
             }
             else
             {
                 ImGui::SetNextWindowSizeConstraints(ImVec2(100, 10), ImVec2(-1, 300));
-                if (ImGui::BeginMenu(it->first.c_str()))
+                if (ImGui::BeginMenu(node.getGroup().c_str()))
                 {
                     ImGui::SetWindowFontScale(_fontScale);
-                    for (size_t j = 0; j < it->second.size(); j++)
+                    std::string name = node.getName();
+                    std::string prefix = "ND_";
+                    if (name.compare(0, prefix.size(), prefix) == 0 && name.compare(prefix.size(), std::string::npos, node.getCategory()) == 0)
                     {
-                        std::string name = it->second[j][0];
                         if (ImGui::MenuItem(getUserNodeDefName(name).c_str()) || (ImGui::IsItemFocused() && ImGui::IsKeyPressedMap(ImGuiKey_Enter)))
                         {
-                            addNode(it->second[j][2], getUserNodeDefName(name), it->second[j][1]);
-                            _addNewNode = true;
-                        }
-                    }
-                    ImGui::EndMenu();
-                }
-            }
-        }
-
-        // Filter nodedefs and add to menu if matches filter
-        for (std::unordered_map>::iterator it = _nodesToAdd.begin(); it != _nodesToAdd.end(); ++it)
-        {
-            // Filter out list of nodes
-            if (subs.size() > 0)
-            {
-                ImGui::SetNextWindowSizeConstraints(ImVec2(250.0f, 300.0f), ImVec2(-1.0f, 500.0f));
-                for (size_t i = 0; i < it->second.size(); i++)
-                {
-                    std::string str(it->second[i]->getName());
-                    std::string nodeName = it->second[i]->getName();
-                    if (str.find(subs) != std::string::npos)
-                    {
-                        std::string val = getUserNodeDefName(nodeName);
-                        if (ImGui::MenuItem(val.c_str()) || (ImGui::IsItemFocused() && ImGui::IsKeyPressedMap(ImGuiKey_Enter)))
-                        {
-                            addNode(it->second[i]->getNodeString(), val, it->second[i]->getType());
+                            addNode(node.getCategory(), getUserNodeDefName(name), node.getType());
                             _addNewNode = true;
-                            memset(input, '\0', sizeof(input));
                         }
                     }
-                }
-            }
-            else
-            {
-                ImGui::SetNextWindowSizeConstraints(ImVec2(100, 10), ImVec2(-1, 300));
-                if (ImGui::BeginMenu(it->first.c_str()))
-                {
-                    ImGui::SetWindowFontScale(_fontScale);
-                    for (size_t i = 0; i < it->second.size(); i++)
+                    else
                     {
-                        std::string name = it->second[i]->getName();
-                        std::string val = getUserNodeDefName(name);
-                        if (ImGui::MenuItem(val.c_str()) || (ImGui::IsItemFocused() && ImGui::IsKeyPressedMap(ImGuiKey_Enter)))
+                        if (ImGui::BeginMenu(node.getCategory().c_str()))
                         {
-                            addNode(it->second[i]->getNodeString(), val, it->second[i]->getType());
-                            _addNewNode = true;
+                            if (ImGui::MenuItem(getUserNodeDefName(name).c_str()) || (ImGui::IsItemFocused() && ImGui::IsKeyPressedMap(ImGuiKey_Enter)))
+                            {
+                                addNode(node.getCategory(), getUserNodeDefName(name), node.getType());
+                                _addNewNode = true;
+                            }
+                            ImGui::EndMenu();
                         }
                     }
+
+                    
                     ImGui::EndMenu();
                 }
             }
diff --git a/source/MaterialXGraphEditor/Graph.h b/source/MaterialXGraphEditor/Graph.h
index 9b9857c69a..87d4119c2a 100644
--- a/source/MaterialXGraphEditor/Graph.h
+++ b/source/MaterialXGraphEditor/Graph.h
@@ -14,6 +14,30 @@
 
 #include 
 
+class MenuItem
+{
+  public:
+    MenuItem(const std::string& name, const std::string& type, const std::string& category, const std::string& group) :
+        name(name), type(type), category(category), group(group) { }
+
+    // getters
+    std::string getName() const { return name; }
+    std::string getType() const { return type; }
+    std::string getCategory() const { return category; }
+    std::string getGroup() const { return group; }
+
+    // setters
+    void setName(const std::string& newName) { this->name = newName; }
+    void setType(const std::string& newType) { this->type = newType; }
+    void setCategory(const std::string& newCategory) { this->category = newCategory; }
+    void setGroup(const std::string& newGroup) { this->group = newGroup; }
+
+  private:
+    std::string name;
+    std::string type;
+    std::string category;
+    std::string group;
+};
 namespace ed = ax::NodeEditor;
 namespace mx = MaterialX;
 
@@ -248,8 +272,7 @@ class Graph
     std::vector _currGraphName;
 
     // for adding new nodes
-    std::unordered_map> _nodesToAdd;
-    std::unordered_map>> _extraNodes;
+    std::vector _nodesToAdd;
 
     // stacks to dive into and out of node graphs
     std::stack> _graphStack;

From 74462510a32948341131b93d1695514cfc283927 Mon Sep 17 00:00:00 2001
From: iukpo-lucasfilm <145880411+iukpo-lucasfilm@users.noreply.github.com>
Date: Sat, 14 Oct 2023 15:26:23 -0700
Subject: [PATCH 22/66] Stop Graph Editor from creating imgui.ini file (#1570)

Added code to stop creation of imgui.ini after saving material after saving then closing Graph Editor
---
 source/MaterialXGraphEditor/Main.cpp | 51 ++++------------------------
 1 file changed, 7 insertions(+), 44 deletions(-)

diff --git a/source/MaterialXGraphEditor/Main.cpp b/source/MaterialXGraphEditor/Main.cpp
index 754d766798..5bbcbdad66 100644
--- a/source/MaterialXGraphEditor/Main.cpp
+++ b/source/MaterialXGraphEditor/Main.cpp
@@ -23,44 +23,6 @@ static void errorCallback(int error, const char* description)
     fprintf(stderr, "Glfw Error %d: %s\n", error, description);
 }
 
-mx::FilePath getConfigPath()
-{
-    mx::FilePath configPath;
-    auto xdgConfigHome = mx::getEnviron("XDG_CONFIG_HOME");
-    auto homeDirectory = mx::getEnviron("HOME");
-    if (!xdgConfigHome.empty())
-    {
-        configPath = mx::FilePath(xdgConfigHome);
-    }
-    else if (!homeDirectory.empty())
-    {
-#if defined(__APPLE__)
-        configPath = mx::FilePath(homeDirectory) / "Library" / "Preferences";
-#else
-        configPath = mx::FilePath(homeDirectory) / ".config";
-        if (!configPath.exists())
-        {
-            configPath.createDirectory();
-        }
-#endif
-    }
-    else
-    {
-        return {};
-    }
-
-    configPath = configPath / "MaterialX";
-    configPath.createDirectory();
-
-    if (!configPath.exists())
-    {
-        std::cerr << "Failed to create MaterialX config directory at " << configPath.asString() << std::endl;
-        return {};
-    }
-
-    return configPath / "GraphEditor.imgui.ini";
-}
-
 const std::string options =
     " Options: \n"
     "    --material [FILENAME]          Specify the filename of the MTLX document to be displayed in the graph editor\n"
@@ -197,13 +159,14 @@ int main(int argc, char* const argv[])
     IMGUI_CHECKVERSION();
     ImGui::CreateContext();
     ImGuiIO& io = ImGui::GetIO();
-    io.Fonts->AddFontDefault();
 
-    mx::FilePath configPath = getConfigPath();
-    if (!configPath.isEmpty())
-    {
-        io.IniFilename = configPath.asString().c_str();
-    }
+    // Set ini and log filename to NULL. This will prevent the automatic creation of imgui.ini
+    // in the same folder as the saved material.
+    // TODO: Consider setting the ini and log file paths to an application directory.
+    io.IniFilename = NULL;
+    io.LogFilename = NULL;
+
+    io.Fonts->AddFontDefault();
 
     // Setup Dear ImGui style
     ImGui::StyleColorsDark();

From a62a468ed80f4a6830950cc7a9ff7e544567d669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ars=C3=A8ne=20P=C3=A9rard-Gayot?=
 
Date: Sun, 15 Oct 2023 20:18:43 +0200
Subject: [PATCH 23/66] Fix edge case in HW shader generation for transform
 nodes (#1560)

This merges the TransformXXXNodeGlsl and TransformXXXNodeMsl classes into a HwTransformNode which has 3 subclasses, HwTransformVectorNode, HwTransformPointNode, and HwTransformNormalNode, all of which can be configured by overriding the virtual methods of HwTransformNode.
---
 .../MaterialXGenGlsl/GlslShaderGenerator.cpp  |  15 +--
 source/MaterialXGenGlsl/GlslShaderGenerator.h |   5 -
 .../Nodes/TransformNormalNodeGlsl.cpp         |  43 -------
 .../Nodes/TransformNormalNodeGlsl.h           |  27 -----
 .../Nodes/TransformPointNodeGlsl.cpp          |  23 ----
 .../Nodes/TransformPointNodeGlsl.h            |  25 ----
 .../Nodes/TransformVectorNodeGlsl.cpp         |  84 -------------
 .../Nodes/TransformVectorNodeGlsl.h           |  30 -----
 source/MaterialXGenMsl/MslShaderGenerator.cpp |  15 +--
 source/MaterialXGenMsl/MslShaderGenerator.h   |   5 -
 .../Nodes/TransformNormalNodeMsl.cpp          |  43 -------
 .../Nodes/TransformNormalNodeMsl.h            |  27 -----
 .../Nodes/TransformPointNodeMsl.cpp           |  23 ----
 .../Nodes/TransformPointNodeMsl.h             |  25 ----
 .../Nodes/TransformVectorNodeMsl.cpp          |  84 -------------
 .../Nodes/TransformVectorNodeMsl.h            |  30 -----
 .../Nodes/HwTransformNode.cpp                 | 110 ++++++++++++++++++
 .../Nodes/HwTransformNode.h                   |  71 +++++++++++
 source/MaterialXGenShader/ShaderNode.cpp      |   5 +
 source/MaterialXGenShader/ShaderNode.h        |   3 +
 .../PyMaterialXGenShader/PyShaderPort.cpp     |   1 +
 21 files changed, 198 insertions(+), 496 deletions(-)
 delete mode 100644 source/MaterialXGenGlsl/Nodes/TransformNormalNodeGlsl.cpp
 delete mode 100644 source/MaterialXGenGlsl/Nodes/TransformNormalNodeGlsl.h
 delete mode 100644 source/MaterialXGenGlsl/Nodes/TransformPointNodeGlsl.cpp
 delete mode 100644 source/MaterialXGenGlsl/Nodes/TransformPointNodeGlsl.h
 delete mode 100644 source/MaterialXGenGlsl/Nodes/TransformVectorNodeGlsl.cpp
 delete mode 100644 source/MaterialXGenGlsl/Nodes/TransformVectorNodeGlsl.h
 delete mode 100644 source/MaterialXGenMsl/Nodes/TransformNormalNodeMsl.cpp
 delete mode 100644 source/MaterialXGenMsl/Nodes/TransformNormalNodeMsl.h
 delete mode 100644 source/MaterialXGenMsl/Nodes/TransformPointNodeMsl.cpp
 delete mode 100644 source/MaterialXGenMsl/Nodes/TransformPointNodeMsl.h
 delete mode 100644 source/MaterialXGenMsl/Nodes/TransformVectorNodeMsl.cpp
 delete mode 100644 source/MaterialXGenMsl/Nodes/TransformVectorNodeMsl.h
 create mode 100644 source/MaterialXGenShader/Nodes/HwTransformNode.cpp
 create mode 100644 source/MaterialXGenShader/Nodes/HwTransformNode.h

diff --git a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
index 87582c8f50..ec5e48d4ec 100644
--- a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
+++ b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
@@ -22,9 +22,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
 #include 
 
 #include 
@@ -34,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -228,13 +226,13 @@ GlslShaderGenerator::GlslShaderGenerator() :
     registerImplementation(elementNames, BlurNodeGlsl::create);
 
     // 
     elementNames = {
@@ -902,11 +900,6 @@ ShaderNodeImplPtr GlslShaderGenerator::getImplementation(const NodeDef& nodedef,
 }
 
 const string GlslImplementation::SPACE = "space";
-const string GlslImplementation::TO_SPACE = "tospace";
-const string GlslImplementation::FROM_SPACE = "fromspace";
-const string GlslImplementation::WORLD = "world";
-const string GlslImplementation::OBJECT = "object";
-const string GlslImplementation::MODEL = "model";
 const string GlslImplementation::INDEX = "index";
 const string GlslImplementation::GEOMPROP = "geomprop";
 
diff --git a/source/MaterialXGenGlsl/GlslShaderGenerator.h b/source/MaterialXGenGlsl/GlslShaderGenerator.h
index 4464f5d47c..acc8b0d6ee 100644
--- a/source/MaterialXGenGlsl/GlslShaderGenerator.h
+++ b/source/MaterialXGenGlsl/GlslShaderGenerator.h
@@ -110,11 +110,6 @@ class MX_GENGLSL_API GlslImplementation : public ShaderNodeImpl
 
     /// Internal string constants
     static const string SPACE;
-    static const string TO_SPACE;
-    static const string FROM_SPACE;
-    static const string WORLD;
-    static const string OBJECT;
-    static const string MODEL;
     static const string INDEX;
     static const string GEOMPROP;
 };
diff --git a/source/MaterialXGenGlsl/Nodes/TransformNormalNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/TransformNormalNodeGlsl.cpp
deleted file mode 100644
index 0800fb4bf3..0000000000
--- a/source/MaterialXGenGlsl/Nodes/TransformNormalNodeGlsl.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-ShaderNodeImplPtr TransformNormalNodeGlsl::create()
-{
-    return std::make_shared();
-}
-
-void TransformNormalNodeGlsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
-{
-    TransformVectorNodeGlsl::emitFunctionCall(node, context, stage);
-
-    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
-    {
-        const ShaderGenerator& shadergen = context.getShaderGenerator();
-        const ShaderOutput* output = node.getOutput();
-        shadergen.emitLineBegin(stage);
-        shadergen.emitOutput(output, false, false, context, stage);
-        shadergen.emitString(" = normalize(" + output->getVariable() + ")", stage);
-        shadergen.emitLineEnd(stage);
-    }
-}
-
-const string& TransformNormalNodeGlsl::getMatrix(const string& fromSpace, const string& toSpace) const
-{
-    if ((fromSpace == MODEL || fromSpace == OBJECT) && toSpace == WORLD)
-    {
-        return HW::T_WORLD_INVERSE_TRANSPOSE_MATRIX;
-    }
-    else if (fromSpace == WORLD && (toSpace == MODEL || toSpace == OBJECT))
-    {
-        return HW::T_WORLD_TRANSPOSE_MATRIX;
-    }
-    return EMPTY_STRING;
-}
-
-MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenGlsl/Nodes/TransformNormalNodeGlsl.h b/source/MaterialXGenGlsl/Nodes/TransformNormalNodeGlsl.h
deleted file mode 100644
index f08ec564d9..0000000000
--- a/source/MaterialXGenGlsl/Nodes/TransformNormalNodeGlsl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#ifndef MATERIALX_TRANSFORMNORMALNODEGLSL_H
-#define MATERIALX_TRANSFORMNORMALNODEGLSL_H
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-/// TransformNormal node implementation for GLSL
-class MX_GENGLSL_API TransformNormalNodeGlsl : public TransformVectorNodeGlsl
-{
-  public:
-    static ShaderNodeImplPtr create();
-
-  protected:
-    void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
-
-    const string& getMatrix(const string& fromSpace, const string& toSpace) const override;
-};
-
-MATERIALX_NAMESPACE_END
-
-#endif
diff --git a/source/MaterialXGenGlsl/Nodes/TransformPointNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/TransformPointNodeGlsl.cpp
deleted file mode 100644
index 1570939bfe..0000000000
--- a/source/MaterialXGenGlsl/Nodes/TransformPointNodeGlsl.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include 
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-ShaderNodeImplPtr TransformPointNodeGlsl::create()
-{
-    return std::make_shared();
-}
-
-string TransformPointNodeGlsl::getHomogeneousCoordinate(const ShaderInput* in, GenContext& context) const
-{
-    const ShaderGenerator& shadergen = context.getShaderGenerator();
-    return "vec4(" + shadergen.getUpstreamResult(in, context) + ", 1.0)";
-}
-
-MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenGlsl/Nodes/TransformPointNodeGlsl.h b/source/MaterialXGenGlsl/Nodes/TransformPointNodeGlsl.h
deleted file mode 100644
index eb366d8190..0000000000
--- a/source/MaterialXGenGlsl/Nodes/TransformPointNodeGlsl.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#ifndef MATERIALX_TRANSFORMPOINTNODEGLSL_H
-#define MATERIALX_TRANSFORMPOINTNODEGLSL_H
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-/// TransformPoint node implementation for GLSL
-class MX_GENGLSL_API TransformPointNodeGlsl : public TransformVectorNodeGlsl
-{
-  public:
-    static ShaderNodeImplPtr create();
-
-  protected:
-    virtual string getHomogeneousCoordinate(const ShaderInput* in, GenContext& context) const override;
-};
-
-MATERIALX_NAMESPACE_END
-
-#endif
diff --git a/source/MaterialXGenGlsl/Nodes/TransformVectorNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/TransformVectorNodeGlsl.cpp
deleted file mode 100644
index df1e921497..0000000000
--- a/source/MaterialXGenGlsl/Nodes/TransformVectorNodeGlsl.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include 
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-ShaderNodeImplPtr TransformVectorNodeGlsl::create()
-{
-    return std::make_shared();
-}
-
-void TransformVectorNodeGlsl::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
-{
-    const ShaderInput* toSpaceInput = node.getInput(TO_SPACE);
-    string toSpace = toSpaceInput ? toSpaceInput->getValue()->getValueString() : EMPTY_STRING;
-
-    const ShaderInput* fromSpaceInput = node.getInput(FROM_SPACE);
-    string fromSpace = fromSpaceInput ? fromSpaceInput->getValue()->getValueString() : EMPTY_STRING;
-
-    const string& matrix = getMatrix(fromSpace, toSpace);
-    if (!matrix.empty())
-    {
-        ShaderStage& ps = shader.getStage(Stage::PIXEL);
-        addStageUniform(HW::PRIVATE_UNIFORMS, Type::MATRIX44, matrix, ps);
-    }
-}
-
-void TransformVectorNodeGlsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
-{
-    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
-    {
-        const ShaderGenerator& shadergen = context.getShaderGenerator();
-
-        const ShaderInput* inInput = node.getInput("in");
-        if (inInput->getType() != Type::VECTOR3 && inInput->getType() != Type::VECTOR4)
-        {
-            throw ExceptionShaderGenError("Transform node must have 'in' type of vector3 or vector4.");
-        }
-
-        const ShaderInput* toSpaceInput = node.getInput(TO_SPACE);
-        string toSpace = toSpaceInput ? toSpaceInput->getValue()->getValueString() : EMPTY_STRING;
-
-        const ShaderInput* fromSpaceInput = node.getInput(FROM_SPACE);
-        string fromSpace = fromSpaceInput ? fromSpaceInput->getValue()->getValueString() : EMPTY_STRING;
-
-        shadergen.emitLineBegin(stage);
-        shadergen.emitOutput(node.getOutput(), true, false, context, stage);
-        shadergen.emitString(" = (", stage);
-        const string& matrix = getMatrix(fromSpace, toSpace);
-        if (!matrix.empty())
-        {
-            shadergen.emitString(matrix + " * ", stage);
-        }
-        shadergen.emitString(getHomogeneousCoordinate(inInput, context), stage);
-        shadergen.emitString(").xyz", stage);
-        shadergen.emitLineEnd(stage);
-    }
-}
-
-const string& TransformVectorNodeGlsl::getMatrix(const string& fromSpace, const string& toSpace) const
-{
-    if ((fromSpace == MODEL || fromSpace == OBJECT) && toSpace == WORLD)
-    {
-        return HW::T_WORLD_MATRIX;
-    }
-    else if (fromSpace == WORLD && (toSpace == MODEL || toSpace == OBJECT))
-    {
-        return HW::T_WORLD_INVERSE_MATRIX;
-    }
-    return EMPTY_STRING;
-}
-
-string TransformVectorNodeGlsl::getHomogeneousCoordinate(const ShaderInput* in, GenContext& context) const
-{
-    const ShaderGenerator& shadergen = context.getShaderGenerator();
-    return "vec4(" + shadergen.getUpstreamResult(in, context) + ", 0.0)";
-}
-
-MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenGlsl/Nodes/TransformVectorNodeGlsl.h b/source/MaterialXGenGlsl/Nodes/TransformVectorNodeGlsl.h
deleted file mode 100644
index e9861650b3..0000000000
--- a/source/MaterialXGenGlsl/Nodes/TransformVectorNodeGlsl.h
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#ifndef MATERIALX_TRANSFORMVECTORNODEGLSL_H
-#define MATERIALX_TRANSFORMVECTORNODEGLSL_H
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-/// TransformVector node implementation for GLSL
-class MX_GENGLSL_API TransformVectorNodeGlsl : public GlslImplementation
-{
-  public:
-    static ShaderNodeImplPtr create();
-
-    void createVariables(const ShaderNode& node, GenContext& context, Shader& shader) const override;
-
-    void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
-
-  protected:
-    virtual const string& getMatrix(const string& fromSpace, const string& toSpace) const;
-    virtual string getHomogeneousCoordinate(const ShaderInput* in, GenContext& context) const;
-};
-
-MATERIALX_NAMESPACE_END
-
-#endif
diff --git a/source/MaterialXGenMsl/MslShaderGenerator.cpp b/source/MaterialXGenMsl/MslShaderGenerator.cpp
index 1d93104ce8..ea3fb7112d 100644
--- a/source/MaterialXGenMsl/MslShaderGenerator.cpp
+++ b/source/MaterialXGenMsl/MslShaderGenerator.cpp
@@ -22,9 +22,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
 #include 
 
 #include 
@@ -34,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -232,13 +230,13 @@ MslShaderGenerator::MslShaderGenerator() :
     registerImplementation(elementNames, BlurNodeMsl::create);
 
     // 
     elementNames = {
@@ -1404,11 +1402,6 @@ ShaderNodeImplPtr MslShaderGenerator::getImplementation(const NodeDef& nodedef,
 }
 
 const string MslImplementation::SPACE = "space";
-const string MslImplementation::TO_SPACE = "tospace";
-const string MslImplementation::FROM_SPACE = "fromspace";
-const string MslImplementation::WORLD = "world";
-const string MslImplementation::OBJECT = "object";
-const string MslImplementation::MODEL = "model";
 const string MslImplementation::INDEX = "index";
 const string MslImplementation::GEOMPROP = "geomprop";
 
diff --git a/source/MaterialXGenMsl/MslShaderGenerator.h b/source/MaterialXGenMsl/MslShaderGenerator.h
index 631c38f33d..21817db735 100644
--- a/source/MaterialXGenMsl/MslShaderGenerator.h
+++ b/source/MaterialXGenMsl/MslShaderGenerator.h
@@ -137,11 +137,6 @@ class MX_GENMSL_API MslImplementation : public ShaderNodeImpl
 
     /// Internal string constants
     static const string SPACE;
-    static const string TO_SPACE;
-    static const string FROM_SPACE;
-    static const string WORLD;
-    static const string OBJECT;
-    static const string MODEL;
     static const string INDEX;
     static const string GEOMPROP;
 };
diff --git a/source/MaterialXGenMsl/Nodes/TransformNormalNodeMsl.cpp b/source/MaterialXGenMsl/Nodes/TransformNormalNodeMsl.cpp
deleted file mode 100644
index 98810c025b..0000000000
--- a/source/MaterialXGenMsl/Nodes/TransformNormalNodeMsl.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-ShaderNodeImplPtr TransformNormalNodeMsl::create()
-{
-    return std::make_shared();
-}
-
-void TransformNormalNodeMsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
-{
-    TransformVectorNodeMsl::emitFunctionCall(node, context, stage);
-
-    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
-    {
-        const ShaderGenerator& shadergen = context.getShaderGenerator();
-        const ShaderOutput* output = node.getOutput();
-        shadergen.emitLineBegin(stage);
-        shadergen.emitOutput(output, false, false, context, stage);
-        shadergen.emitString(" = normalize(" + output->getVariable() + ")", stage);
-        shadergen.emitLineEnd(stage);
-    }
-}
-
-const string& TransformNormalNodeMsl::getMatrix(const string& fromSpace, const string& toSpace) const
-{
-    if ((fromSpace == MODEL || fromSpace == OBJECT) && toSpace == WORLD)
-    {
-        return HW::T_WORLD_INVERSE_TRANSPOSE_MATRIX;
-    }
-    else if (fromSpace == WORLD && (toSpace == MODEL || toSpace == OBJECT))
-    {
-        return HW::T_WORLD_TRANSPOSE_MATRIX;
-    }
-    return EMPTY_STRING;
-}
-
-MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenMsl/Nodes/TransformNormalNodeMsl.h b/source/MaterialXGenMsl/Nodes/TransformNormalNodeMsl.h
deleted file mode 100644
index 603ba3771c..0000000000
--- a/source/MaterialXGenMsl/Nodes/TransformNormalNodeMsl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#ifndef MATERIALX_TRANSFORMNORMALNODEMSL_H
-#define MATERIALX_TRANSFORMNORMALNODEMSL_H
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-/// TransformNormal node implementation for MSL
-class MX_GENMSL_API TransformNormalNodeMsl : public TransformVectorNodeMsl
-{
-  public:
-    static ShaderNodeImplPtr create();
-
-  protected:
-    void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
-
-    const string& getMatrix(const string& fromSpace, const string& toSpace) const override;
-};
-
-MATERIALX_NAMESPACE_END
-
-#endif
diff --git a/source/MaterialXGenMsl/Nodes/TransformPointNodeMsl.cpp b/source/MaterialXGenMsl/Nodes/TransformPointNodeMsl.cpp
deleted file mode 100644
index 38db776855..0000000000
--- a/source/MaterialXGenMsl/Nodes/TransformPointNodeMsl.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include 
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-ShaderNodeImplPtr TransformPointNodeMsl::create()
-{
-    return std::make_shared();
-}
-
-string TransformPointNodeMsl::getHomogeneousCoordinate(const ShaderInput* in, GenContext& context) const
-{
-    const ShaderGenerator& shadergen = context.getShaderGenerator();
-    return "float4(" + shadergen.getUpstreamResult(in, context) + ", 1.0)";
-}
-
-MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenMsl/Nodes/TransformPointNodeMsl.h b/source/MaterialXGenMsl/Nodes/TransformPointNodeMsl.h
deleted file mode 100644
index 9fc2361d7d..0000000000
--- a/source/MaterialXGenMsl/Nodes/TransformPointNodeMsl.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#ifndef MATERIALX_TRANSFORMPOINTNODEMSL_H
-#define MATERIALX_TRANSFORMPOINTNODEMSL_H
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-/// TransformPoint node implementation for MSL
-class MX_GENMSL_API TransformPointNodeMsl : public TransformVectorNodeMsl
-{
-  public:
-    static ShaderNodeImplPtr create();
-
-  protected:
-    virtual string getHomogeneousCoordinate(const ShaderInput* in, GenContext& context) const override;
-};
-
-MATERIALX_NAMESPACE_END
-
-#endif
diff --git a/source/MaterialXGenMsl/Nodes/TransformVectorNodeMsl.cpp b/source/MaterialXGenMsl/Nodes/TransformVectorNodeMsl.cpp
deleted file mode 100644
index c5d6ce242a..0000000000
--- a/source/MaterialXGenMsl/Nodes/TransformVectorNodeMsl.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include 
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-ShaderNodeImplPtr TransformVectorNodeMsl::create()
-{
-    return std::make_shared();
-}
-
-void TransformVectorNodeMsl::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
-{
-    const ShaderInput* toSpaceInput = node.getInput(TO_SPACE);
-    string toSpace = toSpaceInput ? toSpaceInput->getValue()->getValueString() : EMPTY_STRING;
-
-    const ShaderInput* fromSpaceInput = node.getInput(FROM_SPACE);
-    string fromSpace = fromSpaceInput ? fromSpaceInput->getValue()->getValueString() : EMPTY_STRING;
-
-    const string& matrix = getMatrix(fromSpace, toSpace);
-    if (!matrix.empty())
-    {
-        ShaderStage& ps = shader.getStage(Stage::PIXEL);
-        addStageUniform(HW::PRIVATE_UNIFORMS, Type::MATRIX44, matrix, ps);
-    }
-}
-
-void TransformVectorNodeMsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
-{
-    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
-    {
-        const ShaderGenerator& shadergen = context.getShaderGenerator();
-
-        const ShaderInput* inInput = node.getInput("in");
-        if (inInput->getType() != Type::VECTOR3 && inInput->getType() != Type::VECTOR4)
-        {
-            throw ExceptionShaderGenError("Transform node must have 'in' type of vector3 or vector4.");
-        }
-
-        const ShaderInput* toSpaceInput = node.getInput(TO_SPACE);
-        string toSpace = toSpaceInput ? toSpaceInput->getValue()->getValueString() : EMPTY_STRING;
-
-        const ShaderInput* fromSpaceInput = node.getInput(FROM_SPACE);
-        string fromSpace = fromSpaceInput ? fromSpaceInput->getValue()->getValueString() : EMPTY_STRING;
-
-        shadergen.emitLineBegin(stage);
-        shadergen.emitOutput(node.getOutput(), true, false, context, stage);
-        shadergen.emitString(" = (", stage);
-        const string& matrix = getMatrix(fromSpace, toSpace);
-        if (!matrix.empty())
-        {
-            shadergen.emitString(matrix + " * ", stage);
-        }
-        shadergen.emitString(getHomogeneousCoordinate(inInput, context), stage);
-        shadergen.emitString(").xyz", stage);
-        shadergen.emitLineEnd(stage);
-    }
-}
-
-const string& TransformVectorNodeMsl::getMatrix(const string& fromSpace, const string& toSpace) const
-{
-    if ((fromSpace == MODEL || fromSpace == OBJECT) && toSpace == WORLD)
-    {
-        return HW::T_WORLD_MATRIX;
-    }
-    else if (fromSpace == WORLD && (toSpace == MODEL || toSpace == OBJECT))
-    {
-        return HW::T_WORLD_INVERSE_MATRIX;
-    }
-    return EMPTY_STRING;
-}
-
-string TransformVectorNodeMsl::getHomogeneousCoordinate(const ShaderInput* in, GenContext& context) const
-{
-    const ShaderGenerator& shadergen = context.getShaderGenerator();
-    return "float4(" + shadergen.getUpstreamResult(in, context) + ", 0.0)";
-}
-
-MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenMsl/Nodes/TransformVectorNodeMsl.h b/source/MaterialXGenMsl/Nodes/TransformVectorNodeMsl.h
deleted file mode 100644
index 013a3db29a..0000000000
--- a/source/MaterialXGenMsl/Nodes/TransformVectorNodeMsl.h
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#ifndef MATERIALX_TRANSFORMVECTORNODEMSL_H
-#define MATERIALX_TRANSFORMVECTORNODEMSL_H
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-/// TransformVector node implementation for MSL
-class MX_GENMSL_API TransformVectorNodeMsl : public MslImplementation
-{
-  public:
-    static ShaderNodeImplPtr create();
-
-    void createVariables(const ShaderNode& node, GenContext& context, Shader& shader) const override;
-
-    void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
-
-  protected:
-    virtual const string& getMatrix(const string& fromSpace, const string& toSpace) const;
-    virtual string getHomogeneousCoordinate(const ShaderInput* in, GenContext& context) const;
-};
-
-MATERIALX_NAMESPACE_END
-
-#endif
diff --git a/source/MaterialXGenShader/Nodes/HwTransformNode.cpp b/source/MaterialXGenShader/Nodes/HwTransformNode.cpp
new file mode 100644
index 0000000000..018924855d
--- /dev/null
+++ b/source/MaterialXGenShader/Nodes/HwTransformNode.cpp
@@ -0,0 +1,110 @@
+//
+// Copyright Contributors to the MaterialX Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#include 
+#include 
+#include 
+
+MATERIALX_NAMESPACE_BEGIN
+
+const string HwTransformNode::FROM_SPACE = "fromspace";
+const string HwTransformNode::TO_SPACE = "tospace";
+const string HwTransformNode::MODEL = "model";
+const string HwTransformNode::OBJECT = "object";
+const string HwTransformNode::WORLD = "world";
+
+void HwTransformNode::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
+{
+    const string toSpace   = getToSpace(node);
+    const string fromSpace = getFromSpace(node);
+    const string& matrix = getMatrix(fromSpace, toSpace);
+    if (!matrix.empty())
+    {
+        ShaderStage& ps = shader.getStage(Stage::PIXEL);
+        addStageUniform(HW::PRIVATE_UNIFORMS, Type::MATRIX44, matrix, ps);
+    }
+}
+
+void HwTransformNode::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
+{
+    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
+    {
+        const ShaderGenerator& shadergen = context.getShaderGenerator();
+
+        const ShaderOutput* output = node.getOutput();
+        const ShaderInput* inInput = node.getInput("in");
+        if (inInput->getType() != Type::VECTOR3 && inInput->getType() != Type::VECTOR4)
+        {
+            throw ExceptionShaderGenError("Transform node must have 'in' type of vector3 or vector4.");
+        }
+
+        shadergen.emitLineBegin(stage);
+        shadergen.emitOutput(output, true, false, context, stage);
+        shadergen.emitString(" = (", stage);
+
+        const string toSpace = getToSpace(node);
+        const string fromSpace = getFromSpace(node);
+        const string& matrix = getMatrix(fromSpace, toSpace);
+        if (!matrix.empty())
+        {
+            shadergen.emitString(matrix + " * ", stage);
+        }
+
+        const string type = shadergen.getSyntax().getTypeName(Type::VECTOR4);
+        const string input = shadergen.getUpstreamResult(inInput, context);
+        shadergen.emitString(type + "(" + input + ", " + getHomogeneousCoordinate() + ")).xyz", stage);
+        shadergen.emitLineEnd(stage);
+
+        if (shouldNormalize())
+        {
+            shadergen.emitLineBegin(stage);
+            shadergen.emitOutput(output, false, false, context, stage);
+            shadergen.emitString(" = normalize(" + output->getVariable() + ")", stage);
+            shadergen.emitLineEnd(stage);
+        }
+    }
+}
+
+string HwTransformNode::getFromSpace(const ShaderNode& node) const
+{
+    const ShaderInput* input = node.getInput(FROM_SPACE);
+    return input ? input->getValueString() : EMPTY_STRING;
+}
+
+string HwTransformNode::getToSpace(const ShaderNode& node) const
+{
+    const ShaderInput* input = node.getInput(TO_SPACE);
+    return input ? input->getValueString() : EMPTY_STRING;
+}
+
+const string& HwTransformNode::getMatrix(const string& fromSpace, const string& toSpace) const
+{
+    if ((fromSpace == MODEL || fromSpace == OBJECT) && toSpace == WORLD)
+    {
+        return getModelToWorldMatrix();
+    }
+    else if (fromSpace == WORLD && (toSpace == MODEL || toSpace == OBJECT))
+    {
+        return getWorldToModelMatrix();
+    }
+    return EMPTY_STRING;
+}
+
+ShaderNodeImplPtr HwTransformVectorNode::create()
+{
+    return std::make_shared();
+}
+
+ShaderNodeImplPtr HwTransformPointNode::create()
+{
+    return std::make_shared();
+}
+
+ShaderNodeImplPtr HwTransformNormalNode::create()
+{
+    return std::make_shared();
+}
+
+MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenShader/Nodes/HwTransformNode.h b/source/MaterialXGenShader/Nodes/HwTransformNode.h
new file mode 100644
index 0000000000..a97e57405c
--- /dev/null
+++ b/source/MaterialXGenShader/Nodes/HwTransformNode.h
@@ -0,0 +1,71 @@
+//
+// Copyright Contributors to the MaterialX Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#ifndef MATERIALX_HWTRANSFORMNODE_H
+#define MATERIALX_HWTRANSFORMNODE_H
+
+#include 
+
+MATERIALX_NAMESPACE_BEGIN
+
+/// Generic transformation node for hardware languages
+class MX_GENSHADER_API HwTransformNode : public ShaderNodeImpl
+{
+  public:
+    void createVariables(const ShaderNode& node, GenContext& context, Shader& shader) const override;
+    void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
+
+  protected:
+    virtual const string& getMatrix(const string& fromSpace, const string& toSpace) const;
+    virtual const string& getModelToWorldMatrix() const = 0;
+    virtual const string& getWorldToModelMatrix() const = 0;
+    virtual string getHomogeneousCoordinate() const = 0;
+    virtual bool shouldNormalize() const { return false; }
+
+    virtual string getFromSpace(const ShaderNode&) const;
+    virtual string getToSpace(const ShaderNode&) const;
+
+    static const string FROM_SPACE;
+    static const string TO_SPACE;
+    static const string MODEL;
+    static const string OBJECT;
+    static const string WORLD;
+};
+
+class MX_GENSHADER_API HwTransformVectorNode : public HwTransformNode
+{
+  public:
+    static ShaderNodeImplPtr create();
+
+  protected:
+    const string& getModelToWorldMatrix() const override { return HW::T_WORLD_MATRIX; }
+    const string& getWorldToModelMatrix() const override { return HW::T_WORLD_INVERSE_MATRIX; }
+    string getHomogeneousCoordinate() const override { return "0.0"; }
+};
+
+class MX_GENSHADER_API HwTransformPointNode : public HwTransformVectorNode
+{
+  public:
+    static ShaderNodeImplPtr create();
+
+  protected:
+    string getHomogeneousCoordinate() const override { return "1.0"; }
+};
+
+class MX_GENSHADER_API HwTransformNormalNode : public HwTransformNode
+{
+  public:
+    static ShaderNodeImplPtr create();
+
+  protected:
+    const string& getModelToWorldMatrix() const override { return HW::T_WORLD_INVERSE_TRANSPOSE_MATRIX; }
+    const string& getWorldToModelMatrix() const override { return HW::T_WORLD_TRANSPOSE_MATRIX; }
+    string getHomogeneousCoordinate() const override { return "0.0"; }
+    bool shouldNormalize() const override { return true; }
+};
+
+MATERIALX_NAMESPACE_END
+
+#endif
diff --git a/source/MaterialXGenShader/ShaderNode.cpp b/source/MaterialXGenShader/ShaderNode.cpp
index 04551cb6d2..3e393178f1 100644
--- a/source/MaterialXGenShader/ShaderNode.cpp
+++ b/source/MaterialXGenShader/ShaderNode.cpp
@@ -32,6 +32,11 @@ string ShaderPort::getFullName() const
     return (_node->getName() + "_" + _name);
 }
 
+string ShaderPort::getValueString() const
+{
+    return getValue() ? getValue()->getValueString() : EMPTY_STRING;
+}
+
 //
 // ShaderInput methods
 //
diff --git a/source/MaterialXGenShader/ShaderNode.h b/source/MaterialXGenShader/ShaderNode.h
index 536e0adc1e..dd74269764 100644
--- a/source/MaterialXGenShader/ShaderNode.h
+++ b/source/MaterialXGenShader/ShaderNode.h
@@ -170,6 +170,9 @@ class MX_GENSHADER_API ShaderPort : public std::enable_shared_from_this
Date: Mon, 16 Oct 2023 13:54:34 -0700
Subject: [PATCH 24/66] Add floating popup to pins when hovered (#1565)

Added a tooltip/popup showing the name, type, value and connection of a pin!
---
 source/MaterialXGraphEditor/Graph.cpp | 64 ++++++++++++++++++++++++++-
 source/MaterialXGraphEditor/Graph.h   |  2 +
 source/MaterialXGraphEditor/UiNode.h  | 23 ++++++++++
 3 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/source/MaterialXGraphEditor/Graph.cpp b/source/MaterialXGraphEditor/Graph.cpp
index 849b8607b4..439f720e2e 100644
--- a/source/MaterialXGraphEditor/Graph.cpp
+++ b/source/MaterialXGraphEditor/Graph.cpp
@@ -2257,6 +2257,7 @@ std::vector Graph::createNodes(bool nodegraph)
                             }
 
                             upUiNode->outputPins[pinIndex]->addConnection(pin);
+                            pin->addConnection(upUiNode->outputPins[pinIndex]);
                         }
                         pin->setConnected(true);
                     }
@@ -2322,6 +2323,7 @@ std::vector Graph::createNodes(bool nodegraph)
                                 }
                             }
                             upUiNode->outputPins[pinIndex]->addConnection(pin);
+                            pin->addConnection(upUiNode->outputPins[pinIndex]);
                         }
                         pin->setConnected(true);
                     }
@@ -2392,6 +2394,7 @@ std::vector Graph::createNodes(bool nodegraph)
                                 }
                             }
                             upUiNode->outputPins[pinIndex]->addConnection(pin);
+                            pin->addConnection(upUiNode->outputPins[pinIndex]);
                         }
                     }
 
@@ -2628,6 +2631,11 @@ void Graph::addLink(ed::PinId startPinId, ed::PinId endPinId)
         _frameCount = ImGui::GetFrameCount();
         _renderer->setMaterialCompilation(true);
 
+        inputPin->addConnection(outputPin);
+        outputPin->addConnection(inputPin);
+        outputPin->setConnected(true);
+        inputPin->setConnected(true);
+
         if (uiDownNode->getNode() || uiDownNode->getNodeGraph())
         {
             mx::InputPtr connectingInput = nullptr;
@@ -2721,6 +2729,7 @@ void Graph::addLink(ed::PinId startPinId, ed::PinId endPinId)
                         }
                     }
 
+                    
                     pin->setConnected(true);
                     pin->_input->removeAttribute(mx::ValueElement::VALUE_ATTRIBUTE);
                     connectingInput = pin->_input;
@@ -2806,9 +2815,13 @@ void Graph::deleteLinkInfo(int startAttr, int endAttr)
                     setDefaults(_graphNodes[upNode]->getInput());
                 }
 
+                for (UiPinPtr connect : pin->_connections)
+                {
+                    pin->deleteConnection(connect);
+                }
+
                 // Remove any output reference
                 pin->_input->removeAttribute(mx::PortElement::OUTPUT_ATTRIBUTE);
-
                 pin->setConnected(false);
 
                 // If a value exists update the input with it
@@ -2833,6 +2846,10 @@ void Graph::deleteLinkInfo(int startAttr, int endAttr)
                     _graphNodes[downNode]->getNodeGraph()->getInput(pin->_name)->removeAttribute(mx::ValueElement::INTERFACE_NAME_ATTRIBUTE);
                     setDefaults(_graphNodes[upNode]->getInput());
                 }
+                for (UiPinPtr connect : pin->_connections)
+                {
+                    pin->deleteConnection(connect);
+                }
                 pin->_input->setConnectedNode(nullptr);
                 pin->setConnected(false);
                 setDefaults(pin->_input);
@@ -2847,6 +2864,10 @@ void Graph::deleteLinkInfo(int startAttr, int endAttr)
             {
                 removeEdge(downNode, upNode, pin);
                 _graphNodes[downNode]->getOutput()->removeAttribute("nodename");
+                for (UiPinPtr connect : pin->_connections)
+                {
+                    pin->deleteConnection(connect);
+                }
                 pin->setConnected(false);
             }
         }
@@ -3744,6 +3765,46 @@ void Graph::searchNodePopup(bool cursor)
     }
 }
 
+bool Graph::isPinHovered()
+{
+    ed::PinId currentPin = ed::GetHoveredPin();
+    ed::PinId nullPin = 0;
+    return currentPin != nullPin;
+}
+
+void Graph::addPinPopup()
+{
+    // Add a floating popup to pin when hovered
+    if (isPinHovered())
+    {
+        ed::Suspend();
+        UiPinPtr pin = getPin(ed::GetHoveredPin());
+        std::string connected = "";
+        std::string value = "";
+        if (pin->_connected)
+        {
+            connected = "\nConnected to";
+            int size = static_cast(pin->getConnections().size());
+            for (int i = 0; i < size; i++)
+            {
+                UiPinPtr connectedPin = pin->getConnections()[i];
+                connected = connected + " " + connectedPin->_name;
+                if (i != size - 1)
+                {
+                    connected = connected + ",";
+                }
+            }
+        }
+        else if (pin->_input != nullptr)
+        {
+            value = "\nValue: " + pin->_input->getValueString();
+        }
+        const std::string message("Name: " + pin->_name + "\nType: " + pin->_type + value + connected);
+        ImGui::SetTooltip("%s", message.c_str());
+        ed::Resume();
+    }
+}
+
 void Graph::readOnlyPopup()
 {
     if (_popup)
@@ -3860,6 +3921,7 @@ void Graph::drawGraph(ImVec2 mousePos)
         ImGui::SetNextWindowSizeConstraints(ImVec2(250.0f, 300.0f), ImVec2(-1.0f, 500.0f));
         addNodePopup(TextCursor);
         searchNodePopup(TextCursor);
+        addPinPopup();
         readOnlyPopup();
         ImGui::PopStyleVar();
 
diff --git a/source/MaterialXGraphEditor/Graph.h b/source/MaterialXGraphEditor/Graph.h
index 87d4119c2a..fcdf93723e 100644
--- a/source/MaterialXGraphEditor/Graph.h
+++ b/source/MaterialXGraphEditor/Graph.h
@@ -213,6 +213,8 @@ class Graph
 
     void addNodePopup(bool cursor);
     void searchNodePopup(bool cursor);
+    bool isPinHovered();
+    void addPinPopup();
     bool readOnly();
     void readOnlyPopup();
 
diff --git a/source/MaterialXGraphEditor/UiNode.h b/source/MaterialXGraphEditor/UiNode.h
index c03ae43219..cf7aa41e28 100644
--- a/source/MaterialXGraphEditor/UiNode.h
+++ b/source/MaterialXGraphEditor/UiNode.h
@@ -95,6 +95,29 @@ class UiPin
         _connections.push_back(pin);
     }
 
+    void deleteConnection(UiPinPtr pin)
+    {
+        for (size_t i = 0; i < _connections.size(); i++)
+        {
+            if (_connections[i]->_pinId == pin->_pinId)
+            {
+                _connections.erase(_connections.begin()+i);
+            }
+        }
+        for (size_t i = 0; i < pin->_connections.size(); i++)
+        {
+            if (pin->_connections[i]->_pinId == _pinId)
+            {
+                pin->_connections.erase(pin->_connections.begin() + i);
+            }
+        }
+        if (pin->_connections.size() == 0)
+        {
+            pin->setConnected(false);
+        }
+        return;
+    }
+
     const std::vector& getConnections()
     {
         return _connections;

From d5634c83335766952026f6120dcea7b902894c44 Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Tue, 17 Oct 2023 10:18:51 -0700
Subject: [PATCH 25/66] Refinements to Graph class

- Move the ordered group vector in Graph::createNodeUIList to a constant at module scope.
- Use the joinStrings helper function in Graph::addPinPopup to simplify its implementation.
- Update comments to align with coding conventions.
---
 source/MaterialXGraphEditor/Graph.cpp | 105 ++++++++++++--------------
 1 file changed, 48 insertions(+), 57 deletions(-)

diff --git a/source/MaterialXGraphEditor/Graph.cpp b/source/MaterialXGraphEditor/Graph.cpp
index 439f720e2e..889789706b 100644
--- a/source/MaterialXGraphEditor/Graph.cpp
+++ b/source/MaterialXGraphEditor/Graph.cpp
@@ -23,6 +23,32 @@ const ImVec2 DEFAULT_NODE_SIZE = ImVec2(138, 116);
 const int DEFAULT_ALPHA = 255;
 const int FILTER_ALPHA = 50;
 
+const std::array NODE_GROUP_ORDER =
+{
+    "texture2d",
+    "texture3d",
+    "procedural",
+    "procedural2d",
+    "procedural3d",
+    "geometric",
+    "translation",
+    "convolution2d",
+    "math",
+    "adjustment",
+    "compositing",
+    "conditional",
+    "channel",
+    "organization",
+    "global",
+    "application",
+    "material",
+    "shader",
+    "pbr",
+    "light",
+    "colortransform",
+    "none"
+};
+
 // Based on ImRect_Expanded function in ImGui Node Editor blueprints-example.cpp
 ImRect expandImRect(const ImRect& rect, float x, float y)
 {
@@ -1220,41 +1246,15 @@ void Graph::createNodeUIList(mx::DocumentPtr doc)
 {
     _nodesToAdd.clear();
 
-    std::vector ordered_groups = {
-        "texture2d",
-        "texture3d",
-        "procedural",
-        "procedural2d",
-        "procedural3d",
-        "geometric",
-        "translation",
-        "convolution2d",
-        "math",
-        "adjustment",
-        "compositing",
-        "conditional",
-        "channel",
-        "organization",
-        "global",
-        "application",
-        "material",
-        "shader",
-        "pbr",
-        "light",
-        "colortransform",
-        "no_group"
-    };
-
     auto nodeDefs = doc->getNodeDefs();
     std::unordered_map> groupToNodeDef;
 
     for (const auto& nodeDef : nodeDefs)
     {
         std::string group = nodeDef->getNodeGroup();
-
         if (group.empty())
         {
-            group = "no_group";
+            group = NODE_GROUP_ORDER.back();
         }
 
         if (groupToNodeDef.find(group) == groupToNodeDef.end())
@@ -1264,7 +1264,7 @@ void Graph::createNodeUIList(mx::DocumentPtr doc)
         groupToNodeDef[group].push_back(nodeDef);
     }
 
-    for (const auto& group : ordered_groups)
+    for (const auto& group : NODE_GROUP_ORDER)
     {
         auto it = groupToNodeDef.find(group);
         if (it != groupToNodeDef.end())
@@ -2526,7 +2526,7 @@ void Graph::setDefaults(mx::InputPtr input)
 
 void Graph::addLink(ed::PinId startPinId, ed::PinId endPinId)
 {
-    // prefer to assume left to right - start is an output, end is an input; swap if inaccurate
+    // Prefer to assume left to right - start is an output, end is an input; swap if inaccurate
     if (UiPinPtr inputPin = getPin(endPinId); inputPin && inputPin->_kind != ed::PinKind::Input)
     {
         auto tmp = startPinId;
@@ -2575,7 +2575,7 @@ void Graph::addLink(ed::PinId startPinId, ed::PinId endPinId)
         return;
     }
 
-    // make sure there is an implementation for node
+    // Make sure there is an implementation for node
     const mx::ShaderGenerator& shadergen = _renderer->getGenContext().getShaderGenerator();
 
     // Prevent direct connecting from input to output
@@ -2613,7 +2613,7 @@ void Graph::addLink(ed::PinId startPinId, ed::PinId endPinId)
             {
                 if (linksItr->_endAttr == end_attr)
                 {
-                    // found existing link - remove it; adapted from deleteLink
+                    // Found existing link - remove it; adapted from deleteLink
                     // note: ed::BreakLinks doesn't work as the order ends up inaccurate
                     deleteLinkInfo(linksItr->_startAttr, linksItr->_endAttr);
                     _currLinks.erase(linksItr);
@@ -2644,7 +2644,8 @@ void Graph::addLink(ed::PinId startPinId, ed::PinId endPinId)
                 if (pin->_pinId == inputPinId)
                 {
                     addNodeInput(uiDownNode, pin->_input);
-                    // update value to be empty
+
+                    // Update value to be empty
                     if (uiDownNode->getNode() && uiDownNode->getNode()->getType() == mx::SURFACE_SHADER_TYPE_STRING)
                     {
                         if (uiUpNode->getOutput() != nullptr)
@@ -2657,12 +2658,11 @@ void Graph::addLink(ed::PinId startPinId, ed::PinId endPinId)
                         }
                         else
                         {
-                            // node graph
                             if (uiUpNode->getNodeGraph() != nullptr)
                             {
                                 for (UiPinPtr outPin : uiUpNode->outputPins)
                                 {
-                                    // set pin connection to correct output
+                                    // Set pin connection to correct output
                                     if (outPin->_pinId == outputPinId)
                                     {
                                         mx::OutputPtr outputs = uiUpNode->getNodeGraph()->getOutput(outPin->_name);
@@ -2689,10 +2689,6 @@ void Graph::addLink(ed::PinId startPinId, ed::PinId endPinId)
                                 mx::NodePtr upstreamNode = _graphNodes[upNode]->getNode();
                                 mx::NodeDefPtr upstreamNodeDef = upstreamNode->getNodeDef();
                                 bool isMultiOutput = upstreamNodeDef ? upstreamNodeDef->getOutputs().size() > 1 : false;
-
-                                // This is purely to avoid adding a reference to an update node only 1 output,
-                                // as currently validation consides adding this an error. Otherwise
-                                // it will add an "output" attribute all the time.
                                 if (!isMultiOutput)
                                 {
                                     pin->_input->setConnectedNode(uiUpNode->getNode());
@@ -2701,7 +2697,7 @@ void Graph::addLink(ed::PinId startPinId, ed::PinId endPinId)
                                 {
                                     for (UiPinPtr outPin : _graphNodes[upNode]->outputPins)
                                     {
-                                        // set pin connection to correct output
+                                        // Set pin connection to correct output
                                         if (outPin->_pinId == outputPinId)
                                         {
                                             mx::OutputPtr outputs = uiUpNode->getNode()->getOutput(outPin->_name);
@@ -2718,7 +2714,7 @@ void Graph::addLink(ed::PinId startPinId, ed::PinId endPinId)
                             {
                                 for (UiPinPtr outPin : uiUpNode->outputPins)
                                 {
-                                    // set pin connection to correct output
+                                    // Set pin connection to correct output
                                     if (outPin->_pinId == outputPinId)
                                     {
                                         mx::OutputPtr outputs = uiUpNode->getNodeGraph()->getOutput(outPin->_name);
@@ -2729,14 +2725,14 @@ void Graph::addLink(ed::PinId startPinId, ed::PinId endPinId)
                         }
                     }
 
-                    
                     pin->setConnected(true);
                     pin->_input->removeAttribute(mx::ValueElement::VALUE_ATTRIBUTE);
                     connectingInput = pin->_input;
                     break;
                 }
             }
-            // create new edge and set edge information
+
+            // Create new edge and set edge information
             createEdge(_graphNodes[upNode], _graphNodes[downNode], connectingInput);
         }
         else if (_graphNodes[downNode]->getOutput() != nullptr)
@@ -2744,19 +2740,19 @@ void Graph::addLink(ed::PinId startPinId, ed::PinId endPinId)
             mx::InputPtr connectingInput = nullptr;
             _graphNodes[downNode]->getOutput()->setConnectedNode(_graphNodes[upNode]->getNode());
 
-            // create new edge and set edge information
+            // Create new edge and set edge information
             createEdge(_graphNodes[upNode], _graphNodes[downNode], connectingInput);
         }
         else
         {
-            // create new edge and set edge info
+            // Create new edge and set edge info
             UiEdge newEdge = UiEdge(_graphNodes[upNode], _graphNodes[downNode], nullptr);
             if (!edgeExists(newEdge))
             {
                 _graphNodes[downNode]->edges.push_back(newEdge);
                 _currEdge.push_back(newEdge);
 
-                // update input node num and output connections
+                // Update input node num and output connections
                 _graphNodes[downNode]->setInputNodeNum(1);
                 _graphNodes[upNode]->setOutputConnection(_graphNodes[downNode]);
             }
@@ -3779,23 +3775,18 @@ void Graph::addPinPopup()
     {
         ed::Suspend();
         UiPinPtr pin = getPin(ed::GetHoveredPin());
-        std::string connected = "";
-        std::string value = "";
+        std::string connected;
+        std::string value;
         if (pin->_connected)
         {
-            connected = "\nConnected to";
-            int size = static_cast(pin->getConnections().size());
-            for (int i = 0; i < size; i++)
+            mx::StringVec connectedNames;
+            for (UiPinPtr connectedPin : pin->getConnections())
             {
-                UiPinPtr connectedPin = pin->getConnections()[i];
-                connected = connected + " " + connectedPin->_name;
-                if (i != size - 1)
-                {
-                    connected = connected + ",";
-                }
+                connectedNames.push_back(connectedPin->_name);
             }
+            connected = "\nConnected to " + mx::joinStrings(connectedNames, ", ");
         }
-        else if (pin->_input != nullptr)
+        else if (pin->_input)
         {
             value = "\nValue: " + pin->_input->getValueString();
         }

From 1c78f460e582a83d0b79117428996b74b6b7b60c Mon Sep 17 00:00:00 2001
From: nicolassavva-autodesk
 <61437351+nicolassavva-autodesk@users.noreply.github.com>
Date: Wed, 18 Oct 2023 16:16:03 -0700
Subject: [PATCH 26/66] Remove unused uniforms in HW generation for
 heighttonormal (#1576)

This PR addresses the undesirable shaderGen for Metal and GLSL targets when using the HeightToNormalNode.
The parent ConvolutionNode class emits a couple of filter kernel arrays, for box and gaussian weights, that may cause shader compiler issues when they remain unused.
---
 source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.cpp | 5 +++++
 source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.h   | 2 ++
 source/MaterialXGenMsl/Nodes/HeightToNormalNodeMsl.cpp   | 5 +++++
 source/MaterialXGenMsl/Nodes/HeightToNormalNodeMsl.h     | 2 ++
 4 files changed, 14 insertions(+)

diff --git a/source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.cpp
index 157cd5be04..e98a4ab75c 100644
--- a/source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.cpp
+++ b/source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.cpp
@@ -33,6 +33,11 @@ ShaderNodeImplPtr HeightToNormalNodeGlsl::create()
     return std::make_shared();
 }
 
+void HeightToNormalNodeGlsl::createVariables(const ShaderNode&, GenContext&, Shader&) const
+{
+    // Default filter kernels from ConvolutionNode are not used by this derived class.
+}
+
 void HeightToNormalNodeGlsl::computeSampleOffsetStrings(const string& sampleSizeName, const string& offsetTypeString,
                                                         unsigned int, StringVec& offsetStrings) const
 {
diff --git a/source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.h b/source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.h
index 638623ea43..fc6e6b421f 100644
--- a/source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.h
+++ b/source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.h
@@ -18,6 +18,8 @@ class MX_GENGLSL_API HeightToNormalNodeGlsl : public ConvolutionNode
   public:
     static ShaderNodeImplPtr create();
 
+    void createVariables(const ShaderNode&, GenContext&, Shader& shader) const override;
+
     void emitFunctionDefinition(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
     void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
 
diff --git a/source/MaterialXGenMsl/Nodes/HeightToNormalNodeMsl.cpp b/source/MaterialXGenMsl/Nodes/HeightToNormalNodeMsl.cpp
index 12b1a9675c..7282e5e9df 100644
--- a/source/MaterialXGenMsl/Nodes/HeightToNormalNodeMsl.cpp
+++ b/source/MaterialXGenMsl/Nodes/HeightToNormalNodeMsl.cpp
@@ -33,6 +33,11 @@ ShaderNodeImplPtr HeightToNormalNodeMsl::create()
     return std::make_shared();
 }
 
+void HeightToNormalNodeMsl::createVariables(const ShaderNode&, GenContext&, Shader&) const
+{
+    // Default filter kernels from ConvolutionNode are not used by this derived class.
+}
+
 void HeightToNormalNodeMsl::computeSampleOffsetStrings(const string& sampleSizeName, const string& offsetTypeString,
                                                        unsigned int, StringVec& offsetStrings) const
 {
diff --git a/source/MaterialXGenMsl/Nodes/HeightToNormalNodeMsl.h b/source/MaterialXGenMsl/Nodes/HeightToNormalNodeMsl.h
index 752c411ed5..035ad300b4 100644
--- a/source/MaterialXGenMsl/Nodes/HeightToNormalNodeMsl.h
+++ b/source/MaterialXGenMsl/Nodes/HeightToNormalNodeMsl.h
@@ -18,6 +18,8 @@ class MX_GENMSL_API HeightToNormalNodeMsl : public ConvolutionNode
   public:
     static ShaderNodeImplPtr create();
 
+    void createVariables(const ShaderNode&, GenContext&, Shader& shader) const override;
+
     void emitFunctionDefinition(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
     void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
 

From 78d27622a0edc00f4936d7d7c613b29f5d181fe0 Mon Sep 17 00:00:00 2001
From: Rasmus Bonnedal 
Date: Thu, 19 Oct 2023 02:57:37 +0200
Subject: [PATCH 27/66] Update overlay node logic to match reference (#1539)

This commit changes the overlay node to match the overlay operation in the Adobe PDF spec.

It also changes the implementation to graph based instead of code snippets.
---
 .../Specification/MaterialX.Specification.md  |   2 +-
 libraries/stdlib/genglsl/mx_overlay.glsl      |  25 ----
 .../stdlib/genglsl/mx_overlay_color3.glsl     |   6 -
 .../stdlib/genglsl/mx_overlay_color4.glsl     |   6 -
 .../stdlib/genglsl/stdlib_genglsl_impl.mtlx   |   5 -
 .../stdlib/genmdl/stdlib_genmdl_impl.mtlx     |   5 -
 .../stdlib/genmsl/stdlib_genmsl_impl.mtlx     |   5 -
 libraries/stdlib/genosl/mx_overlay_color3.osl |  16 ---
 libraries/stdlib/genosl/mx_overlay_color4.osl |  22 ----
 .../stdlib/genosl/stdlib_genosl_impl.mtlx     |   5 -
 libraries/stdlib/stdlib_defs.mtlx             |   4 +-
 libraries/stdlib/stdlib_ng.mtlx               | 112 ++++++++++++++++++
 .../stdlib/compositing/compositing.mtlx       |  12 +-
 .../MaterialXGenMdl/mdl/materialx/stdlib.mdl  |  60 ----------
 14 files changed, 121 insertions(+), 164 deletions(-)
 delete mode 100644 libraries/stdlib/genglsl/mx_overlay.glsl
 delete mode 100644 libraries/stdlib/genglsl/mx_overlay_color3.glsl
 delete mode 100644 libraries/stdlib/genglsl/mx_overlay_color4.glsl
 delete mode 100644 libraries/stdlib/genosl/mx_overlay_color3.osl
 delete mode 100644 libraries/stdlib/genosl/mx_overlay_color4.osl

diff --git a/documents/Specification/MaterialX.Specification.md b/documents/Specification/MaterialX.Specification.md
index 4b99956fb4..895b4756c5 100644
--- a/documents/Specification/MaterialX.Specification.md
+++ b/documents/Specification/MaterialX.Specification.md
@@ -1496,7 +1496,7 @@ Blend nodes take two 1-4 channel inputs and apply the same operator to all chann
 | **`burn`** | 1-(1-B)/F | float, colorN |
 | **`dodge`** | B/(1-F) | float, colorN |
 | **`screen`** | 1-(1-F)(1-B) | float, colorN |
-| **`overlay`** | 2FB if F<0.5;
 1-(1-F)(1-B) if F>=0.5 | float, colorN |
+| **`overlay`** | 2FB if B<0.5;
 1-2(1-F)(1-B) if B>=0.5 | float, colorN |
 
 
 #### Merge Nodes
diff --git a/libraries/stdlib/genglsl/mx_overlay.glsl b/libraries/stdlib/genglsl/mx_overlay.glsl
deleted file mode 100644
index e1bec8ac44..0000000000
--- a/libraries/stdlib/genglsl/mx_overlay.glsl
+++ /dev/null
@@ -1,25 +0,0 @@
-float mx_overlay(float fg, float bg)
-{
-    return (fg < 0.5) ? (2.0 * fg * bg) : (1.0 - (1.0 - fg) * (1.0 - bg));
-}
-
-vec2 mx_overlay(vec2 fg, vec2 bg)
-{
-    return vec2(mx_overlay(fg.r, bg.r),
-                mx_overlay(fg.g, bg.g));
-}
-
-vec3 mx_overlay(vec3 fg, vec3 bg)
-{
-    return vec3(mx_overlay(fg.r, bg.r),
-                mx_overlay(fg.g, bg.g),
-                mx_overlay(fg.b, bg.b));
-}
-
-vec4 mx_overlay(vec4 fg, vec4 bg)
-{
-    return vec4(mx_overlay(fg.r, bg.r),
-                mx_overlay(fg.g, bg.g),
-                mx_overlay(fg.b, bg.b),
-                mx_overlay(fg.a, bg.a));
-}
diff --git a/libraries/stdlib/genglsl/mx_overlay_color3.glsl b/libraries/stdlib/genglsl/mx_overlay_color3.glsl
deleted file mode 100644
index 3b6ae67804..0000000000
--- a/libraries/stdlib/genglsl/mx_overlay_color3.glsl
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "mx_overlay.glsl"
-
-void mx_overlay_color3(vec3 fg, vec3 bg, float mix, out vec3 result)
-{
-    result = mix * mx_overlay(fg, bg) + (1.0-mix) * bg;
-}
diff --git a/libraries/stdlib/genglsl/mx_overlay_color4.glsl b/libraries/stdlib/genglsl/mx_overlay_color4.glsl
deleted file mode 100644
index 411e0da372..0000000000
--- a/libraries/stdlib/genglsl/mx_overlay_color4.glsl
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "mx_overlay.glsl"
-
-void mx_overlay_color4(vec4 fg, vec4 bg, float mix, out vec4 result)
-{
-    result = mix * mx_overlay(fg, bg) + (1.0-mix) * bg;
-}
diff --git a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
index 90d3120bd7..07aae6ce66 100644
--- a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
+++ b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
@@ -560,11 +560,6 @@
   
   
 
-  
-  
-  
-  
-
   
   
 
diff --git a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
index ab0d776936..0081dec924 100644
--- a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
+++ b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
@@ -568,11 +568,6 @@
   
   
 
-  
-  
-  
-  
-
   
   
 
diff --git a/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx b/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
index fcab8fd69d..dea1c49636 100644
--- a/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
+++ b/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
@@ -560,11 +560,6 @@
   
   
 
-  
-  
-  
-  
-
   
   
 
diff --git a/libraries/stdlib/genosl/mx_overlay_color3.osl b/libraries/stdlib/genosl/mx_overlay_color3.osl
deleted file mode 100644
index 387653fe05..0000000000
--- a/libraries/stdlib/genosl/mx_overlay_color3.osl
+++ /dev/null
@@ -1,16 +0,0 @@
-float overlay(float fg, float bg)
-{
-    return (fg < 0.5) ? (2 * fg * bg) : (1 - (1 - fg) * (1 - bg));
-}
-
-color overlay(color fg, color bg)
-{
-    return color(overlay(fg[0], bg[0]),
-                 overlay(fg[1], bg[1]),
-                 overlay(fg[2], bg[2]));
-}
-
-void mx_overlay_color3(color fg, color bg, float mix, output color out)
-{
-    out = mix * overlay(fg, bg) + (1-mix) * bg;
-}
diff --git a/libraries/stdlib/genosl/mx_overlay_color4.osl b/libraries/stdlib/genosl/mx_overlay_color4.osl
deleted file mode 100644
index 1ae6a72c15..0000000000
--- a/libraries/stdlib/genosl/mx_overlay_color4.osl
+++ /dev/null
@@ -1,22 +0,0 @@
-float overlay(float fg, float bg)
-{
-    return (fg < 0.5) ? (2 * fg * bg) : (1 - (1 - fg) * (1 - bg));
-}
-
-color overlay(color fg, color bg)
-{
-    return color(overlay(fg[0], bg[0]),
-                 overlay(fg[1], bg[1]),
-                 overlay(fg[2], bg[2]));
-}
-
-color4 overlay(color4 fg, color4 bg)
-{
-    return color4(overlay(fg.rgb, bg.rgb),
-                  overlay(fg.a, bg.a));
-}
-
-void mx_overlay_color4(color4 fg, color4 bg, float mix, output color4 out)
-{
-    out = mix * overlay(fg, bg) + (1-mix) * bg;
-}
diff --git a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
index 1ba22ef6a3..42828ce641 100644
--- a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
+++ b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
@@ -561,11 +561,6 @@
   
   
 
-  
-  
-  
-  
-
   
   
 
diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx
index bb5e8edd1f..3f187e2be1 100644
--- a/libraries/stdlib/stdlib_defs.mtlx
+++ b/libraries/stdlib/stdlib_defs.mtlx
@@ -3343,8 +3343,8 @@
   
   
     
diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx
index e031e72412..4983aaa477 100644
--- a/libraries/stdlib/stdlib_ng.mtlx
+++ b/libraries/stdlib/stdlib_ng.mtlx
@@ -3391,6 +3391,118 @@
   
   
 
+  
+  
+    
+    
+      
+      
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+    
+  
+  
+    
+    
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+  
+  
+    
+    
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+      
+    
+  
+
+
   
   
   
diff --git a/resources/Materials/TestSuite/stdlib/compositing/compositing.mtlx b/resources/Materials/TestSuite/stdlib/compositing/compositing.mtlx
index e7a742c581..b125e70dca 100644
--- a/resources/Materials/TestSuite/stdlib/compositing/compositing.mtlx
+++ b/resources/Materials/TestSuite/stdlib/compositing/compositing.mtlx
@@ -183,24 +183,24 @@
   
   
     
-      
-      
+      
+      
       
     
     
   
   
     
-      
-      
+      
+      
       
     
     
   
   
     
-      
-      
+      
+      
       
     
     
diff --git a/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl b/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl
index bce4a44ea5..8089feb7f0 100644
--- a/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl
+++ b/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl
@@ -2777,66 +2777,6 @@ export color4 mx_screen_color4(
 	return color4(rgb,a);
 }
 
-float mx_overlay(float mxp_fg, float mxp_bg)
-{
-	return (mxp_fg < 0.5) ? (2 * mxp_fg * mxp_bg) : (1 - (1 - mxp_fg) * (1 - mxp_bg));
-}
-float2 mx_overlay(float2 mxp_fg, float2 mxp_bg) [[ anno::unused() ]]
-{
-	return float2(
-		mx_overlay(mxp_fg.x, mxp_bg.x),
-		mx_overlay(mxp_fg.y, mxp_bg.y)
-	);
-}
-color mx_overlay(color mxp_fg, color mxp_bg)
-{
-	float3 fg(mxp_fg);
-	float3 bg(mxp_bg);
-	return color(
-		mx_overlay(fg.x, bg.x),
-		mx_overlay(fg.y, bg.y),
-		mx_overlay(fg.z, bg.z)
-	);
-}
-
-export float mx_overlay_float(
-	float mxp_fg = 0.0,
-	float mxp_bg = 0.0,
-	float mxp_mix = 1.0
-)
-	[[
-		anno::description("Node Group: compositing")
-	]]
-{
-	return mxp_mix * mx_overlay(mxp_fg, mxp_bg) + (1-mxp_mix) * mxp_bg;
-}
-
-export color mx_overlay_color3(
-	color mxp_fg = color(0.0),
-	color mxp_bg = color(0.0),
-	float mxp_mix = 1.0
-)
-	[[
-		anno::description("Node Group: compositing")
-	]]
-{
-	return mxp_mix * mx_overlay(mxp_fg, mxp_bg) + (1-mxp_mix) * mxp_bg;
-}
-
-export color4 mx_overlay_color4(
-	color4 mxp_fg = mk_color4(0.0, 0.0, 0.0, 0.0),
-	color4 mxp_bg = mk_color4(0.0, 0.0, 0.0, 0.0),
-	float mxp_mix = float(1.0)
-)
-	[[
-		anno::description("Node Group: compositing")
-	]]
-{
-	color rgb = mxp_mix * mx_overlay(mxp_fg.rgb, mxp_bg.rgb) + (1-mxp_mix) * mxp_bg.rgb;
-	float   a = mxp_mix * mx_overlay(mxp_fg.a  , mxp_bg.a  ) + (1-mxp_mix) * mxp_bg.a;
-	return color4(rgb,a);
-}
-
 export color4 mx_disjointover_color4(
 	color4 mxp_fg = mk_color4(0.0, 0.0, 0.0, 0.0),
 	color4 mxp_bg = mk_color4(0.0, 0.0, 0.0, 0.0),

From a5b832dc8addc24cb2d661d6c1a04faacd684fe9 Mon Sep 17 00:00:00 2001
From: Stefan Habel <19556655+StefanHabel@users.noreply.github.com>
Date: Tue, 24 Oct 2023 08:15:32 -0700
Subject: [PATCH 28/66] Fixed off-by-one index check in setChildIndex (#1582)

Fixed an off-by-one index check in Element::setChildIndex().
---
 source/MaterialXCore/Element.cpp               | 2 +-
 source/MaterialXTest/MaterialXCore/Element.cpp | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/MaterialXCore/Element.cpp b/source/MaterialXCore/Element.cpp
index 18d028efd3..5131dc8070 100644
--- a/source/MaterialXCore/Element.cpp
+++ b/source/MaterialXCore/Element.cpp
@@ -168,7 +168,7 @@ void Element::setChildIndex(const string& name, int index)
         return;
     }
 
-    if (index < 0 || index > (int) _childOrder.size())
+    if (index < 0 || index >= (int) _childOrder.size())
     {
         throw Exception("Invalid child index");
     }
diff --git a/source/MaterialXTest/MaterialXCore/Element.cpp b/source/MaterialXTest/MaterialXCore/Element.cpp
index fc4939a74f..3865934ccb 100644
--- a/source/MaterialXTest/MaterialXCore/Element.cpp
+++ b/source/MaterialXTest/MaterialXCore/Element.cpp
@@ -54,6 +54,9 @@ TEST_CASE("Element", "[element]")
     REQUIRE(*doc2 != *doc);
     doc2->setChildIndex("elem1", doc2->getChildIndex("elem2"));
     REQUIRE(*doc2 == *doc);
+    REQUIRE_THROWS_AS(doc2->setChildIndex("elem1", -100), mx::Exception);
+    REQUIRE_THROWS_AS(doc2->setChildIndex("elem1", -1), mx::Exception);
+    REQUIRE_THROWS_AS(doc2->setChildIndex("elem1", 2), mx::Exception);
     REQUIRE_THROWS_AS(doc2->setChildIndex("elem1", 100), mx::Exception);
     REQUIRE(*doc2 == *doc);
 

From 926ac2756c36f5541d44f6c3f8814bfebf228f3b Mon Sep 17 00:00:00 2001
From: Ashwin Bhat <1727158+ashwinbhat@users.noreply.github.com>
Date: Tue, 24 Oct 2023 14:45:51 -0700
Subject: [PATCH 29/66] Update Catch2 to version 2.13.10 (#1566)

- Update Catch2 version to v2.13.10
- Catch2 v2.13.0 supports BENCHMARK tests.
- A new BENCHMARK test "GenShader: ShaderGen Performance" to benchmark document load, validation and shadergen times
---
 CMakeLists.txt                                |  5 ++
 source/MaterialXTest/CMakeLists.txt           |  4 +
 source/MaterialXTest/External/Catch/catch.hpp | 28 ++++---
 .../MaterialXGenGlsl/GenGlsl.cpp              | 11 +++
 .../MaterialXGenShader/GenShaderUtil.cpp      | 79 +++++++++++++++++++
 .../MaterialXGenShader/GenShaderUtil.h        |  3 +
 6 files changed, 119 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de6aa7442f..0d6a64d6b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,7 @@ option(MATERIALX_BUILD_GEN_MSL "Build the MSL shader generator back-end." ON)
 option(MATERIALX_BUILD_RENDER "Build the MaterialX Render modules." ON)
 option(MATERIALX_BUILD_OIIO "Build OpenImageIO support for MaterialXRender." OFF)
 option(MATERIALX_BUILD_TESTS "Build unit tests." ON)
+option(MATERIALX_BUILD_BENCHMARK_TESTS "Build benchmark tests." OFF)
 
 option(MATERIALX_BUILD_SHARED_LIBS "Build MaterialX libraries as shared rather than static." OFF)
 option(MATERIALX_PYTHON_LTO "Enable link-time optimizations for MaterialX Python." ON)
@@ -131,6 +132,7 @@ mark_as_advanced(MATERIALX_BUILD_GEN_MSL)
 mark_as_advanced(MATERIALX_BUILD_RENDER)
 mark_as_advanced(MATERIALX_BUILD_OIIO)
 mark_as_advanced(MATERIALX_BUILD_TESTS)
+mark_as_advanced(MATERIALX_BUILD_BENCHMARK_TESTS)
 mark_as_advanced(MATERIALX_BUILD_SHARED_LIBS)
 mark_as_advanced(MATERIALX_NAMESPACE_SUFFIX)
 mark_as_advanced(MATERIALX_LIBNAME_SUFFIX)
@@ -177,6 +179,9 @@ endif()
 if(MATERIALX_TEST_RENDER)
     add_definitions(-DMATERIALX_TEST_RENDER)
 endif()
+if (MATERIALX_BUILD_BENCHMARK_TESTS)
+    add_definitions(-DMATERIALX_BUILD_BENCHMARK_TESTS)
+endif()
 
 if (MATERIALX_BUILD_GEN_MDL)
     add_definitions(-DMATERIALX_MDLC_EXECUTABLE=\"${MATERIALX_MDLC_EXECUTABLE}\")
diff --git a/source/MaterialXTest/CMakeLists.txt b/source/MaterialXTest/CMakeLists.txt
index e66db4bd2e..862a176b50 100644
--- a/source/MaterialXTest/CMakeLists.txt
+++ b/source/MaterialXTest/CMakeLists.txt
@@ -121,6 +121,10 @@ set_target_properties(
     VERSION "${MATERIALX_LIBRARY_VERSION}"
     SOVERSION "${MATERIALX_MAJOR_VERSION}")
 
+if(MATERIALX_BUILD_BENCHMARK_TESTS)
+    target_compile_definitions(MaterialXTest PRIVATE -DCATCH_CONFIG_ENABLE_BENCHMARKING)
+endif()
+
 target_link_libraries(
     MaterialXTest
     ${CMAKE_DL_LIBS})
diff --git a/source/MaterialXTest/External/Catch/catch.hpp b/source/MaterialXTest/External/Catch/catch.hpp
index d2a12427b2..9b309bddc6 100644
--- a/source/MaterialXTest/External/Catch/catch.hpp
+++ b/source/MaterialXTest/External/Catch/catch.hpp
@@ -1,6 +1,6 @@
 /*
- *  Catch v2.13.9
- *  Generated: 2022-04-12 22:37:23.260201
+ *  Catch v2.13.10
+ *  Generated: 2022-10-16 11:01:23.452308
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
  *  Copyright (c) 2022 Two Blue Cubes Ltd. All rights reserved.
@@ -15,7 +15,7 @@
 
 #define CATCH_VERSION_MAJOR 2
 #define CATCH_VERSION_MINOR 13
-#define CATCH_VERSION_PATCH 9
+#define CATCH_VERSION_PATCH 10
 
 #ifdef __clang__
 #    pragma clang system_header
@@ -7395,8 +7395,6 @@ namespace Catch {
             template 
             struct ObjectStorage
             {
-                using TStorage = typename std::aligned_storage::value>::type;
-
                 ObjectStorage() : data() {}
 
                 ObjectStorage(const ObjectStorage& other)
@@ -7439,7 +7437,7 @@ namespace Catch {
                     return *static_cast(static_cast(&data));
                 }
 
-                TStorage data;
+                struct { alignas(T) unsigned char data[sizeof(T)]; }  data;
             };
         }
 
@@ -7949,7 +7947,7 @@ namespace Catch {
     #if defined(__i386__) || defined(__x86_64__)
         #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
     #elif defined(__aarch64__)
-        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
+        #define CATCH_TRAP()  __asm__(".inst 0xd43e0000")
     #endif
 
 #elif defined(CATCH_PLATFORM_IPHONE)
@@ -13558,7 +13556,7 @@ namespace Catch {
 
             // Handle list request
             if( Option listed = list( m_config ) )
-                return static_cast( *listed );
+                return (std::min) (MaxExitCode, static_cast(*listed));
 
             TestGroup tests { m_config };
             auto const totals = tests.execute();
@@ -15391,7 +15389,7 @@ namespace Catch {
     }
 
     Version const& libraryVersion() {
-        static Version version( 2, 13, 9, "", 0 );
+        static Version version( 2, 13, 10, "", 0 );
         return version;
     }
 
@@ -17526,12 +17524,20 @@ namespace Catch {
 
 #ifndef __OBJC__
 
+#ifndef CATCH_INTERNAL_CDECL
+#ifdef _MSC_VER
+#define CATCH_INTERNAL_CDECL __cdecl
+#else
+#define CATCH_INTERNAL_CDECL
+#endif
+#endif
+
 #if defined(CATCH_CONFIG_WCHAR) && defined(CATCH_PLATFORM_WINDOWS) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
 // Standard C/C++ Win32 Unicode wmain entry point
-extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
+extern "C" int CATCH_INTERNAL_CDECL wmain (int argc, wchar_t * argv[], wchar_t * []) {
 #else
 // Standard C/C++ main entry point
-int main (int argc, char * argv[]) {
+int CATCH_INTERNAL_CDECL main (int argc, char * argv[]) {
 #endif
 
     return Catch::Session().run( argc, argv );
diff --git a/source/MaterialXTest/MaterialXGenGlsl/GenGlsl.cpp b/source/MaterialXTest/MaterialXGenGlsl/GenGlsl.cpp
index 339d3853cb..2cc4d7ccf4 100644
--- a/source/MaterialXTest/MaterialXGenGlsl/GenGlsl.cpp
+++ b/source/MaterialXTest/MaterialXGenGlsl/GenGlsl.cpp
@@ -119,6 +119,17 @@ TEST_CASE("GenShader: Bind Light Shaders", "[genglsl]")
     REQUIRE_NOTHROW(mx::HwShaderGenerator::bindLightShader(*spotLightShader, 66, context));
 }
 
+#ifdef MATERIALX_BUILD_BENCHMARK_TESTS
+TEST_CASE("GenShader: Performance Test", "[genglsl]")
+{
+    mx::GenContext context(mx::GlslShaderGenerator::create());
+    BENCHMARK("Load documents, validate and generate shader") 
+    {
+        return GenShaderUtil::shaderGenPerformanceTest(context);
+    };
+}
+#endif
+
 enum class GlslType
 {
     Glsl400,
diff --git a/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp b/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp
index 261aacdefe..2ca8afa86c 100644
--- a/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp
+++ b/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp
@@ -314,6 +314,85 @@ void testUniqueNames(mx::GenContext& context, const std::string& stage)
     REQUIRE(sgNode1->getOutput()->getVariable() == "unique_names_out");
 }
 
+// Test ShaderGen performance 
+void shaderGenPerformanceTest(mx::GenContext& context)
+{
+    mx::DocumentPtr nodeLibrary = mx::createDocument();
+    mx::FilePath currentPath = mx::FilePath::getCurrentPath();
+    const mx::FileSearchPath libSearchPath(currentPath);
+
+    // Load the standard libraries.
+    loadLibraries({ "libraries" }, libSearchPath, nodeLibrary);
+    context.registerSourceCodeSearchPath(libSearchPath);
+
+    // Enable Color Management
+    mx::ColorManagementSystemPtr colorManagementSystem =
+        mx::DefaultColorManagementSystem::create(context.getShaderGenerator().getTarget());
+
+    REQUIRE(colorManagementSystem);
+    if (colorManagementSystem)
+    {
+        context.getShaderGenerator().setColorManagementSystem(colorManagementSystem);
+        colorManagementSystem->loadLibrary(nodeLibrary);
+    }
+
+    // Enable Unit System
+    mx::UnitSystemPtr unitSystem = mx::UnitSystem::create(context.getShaderGenerator().getTarget());
+    REQUIRE(unitSystem);
+    if (unitSystem)
+    {
+        context.getShaderGenerator().setUnitSystem(unitSystem);
+        unitSystem->loadLibrary(nodeLibrary);
+        // Setup Unit converters
+        unitSystem->setUnitConverterRegistry(mx::UnitConverterRegistry::create());
+        mx::UnitTypeDefPtr distanceTypeDef = nodeLibrary->getUnitTypeDef("distance");
+        unitSystem->getUnitConverterRegistry()->addUnitConverter(distanceTypeDef, mx::LinearUnitConverter::create(distanceTypeDef));
+        mx::UnitTypeDefPtr angleTypeDef = nodeLibrary->getUnitTypeDef("angle");
+        unitSystem->getUnitConverterRegistry()->addUnitConverter(angleTypeDef, mx::LinearUnitConverter::create(angleTypeDef));
+        context.getOptions().targetDistanceUnit = "meter";
+    }
+
+    // Read mtlx documents
+    mx::FilePathVec testRootPaths;
+    testRootPaths.push_back("resources/Materials/Examples/StandardSurface");
+
+    std::vector loadedDocuments;
+    mx::StringVec documentsPaths;
+    mx::StringVec errorLog;
+
+    for (const auto& testRoot : testRootPaths)
+    {
+        mx::loadDocuments(testRoot, libSearchPath, {}, {}, loadedDocuments, documentsPaths,
+                          nullptr, &errorLog);
+    }
+
+    REQUIRE(loadedDocuments.size() > 0);
+    REQUIRE(loadedDocuments.size() == documentsPaths.size());
+
+    // Shuffle the order of documents and perform document library import validatation and shadergen
+    std::random_device random_dev;
+    std::mt19937 generator(random_dev());
+    std::shuffle(loadedDocuments.begin(), loadedDocuments.end(), generator);
+    for (const auto& doc : loadedDocuments)
+    {
+        doc->importLibrary(nodeLibrary);
+        std::vector elements = mx::findRenderableElements(doc);
+
+        REQUIRE(elements.size() > 0);
+
+        std::string message;
+        bool docValid = doc->validate(&message);
+
+        REQUIRE(docValid == true);
+
+        mx::StringVec sourceCode;
+        mx::ShaderPtr shader = nullptr;
+        shader = context.getShaderGenerator().generate(elements[0]->getName(), elements[0], context);
+
+        REQUIRE(shader != nullptr);
+        REQUIRE(shader->getSourceCode(mx::Stage::PIXEL).length() > 0);
+    }
+}
 
 void ShaderGeneratorTester::checkImplementationUsage(const mx::StringSet& usedImpls,
                                                      const mx::GenContext& context,
diff --git a/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.h b/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.h
index ea34170d71..9c471466aa 100644
--- a/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.h
+++ b/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.h
@@ -52,6 +52,9 @@ void checkImplementations(mx::GenContext& context,
 // Utility test to  check unique name generation on a shader generator
 void testUniqueNames(mx::GenContext& context, const std::string& stage);
 
+// Utility to perfrom simple performance test to load, validate and generate shaders
+void shaderGenPerformanceTest(mx::GenContext& context);
+
 //
 // Render validation options. Reflects the _options.mtlx
 // file in the test suite area.

From 578118d645657f800b4fd96f24c140325f9cb6bb Mon Sep 17 00:00:00 2001
From: Pablo Delgado 
Date: Sat, 28 Oct 2023 02:29:31 +0200
Subject: [PATCH 30/66] Fix MDL implementation of mx_hsvtorgb (#1584)

---
 source/MaterialXGenMdl/mdl/materialx/hsv.mdl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/MaterialXGenMdl/mdl/materialx/hsv.mdl b/source/MaterialXGenMdl/mdl/materialx/hsv.mdl
index 888d4ada86..9adb1505cb 100644
--- a/source/MaterialXGenMdl/mdl/materialx/hsv.mdl
+++ b/source/MaterialXGenMdl/mdl/materialx/hsv.mdl
@@ -25,16 +25,16 @@ import ::limits::*;
 export float3 mx_hsvtorgb(float3 hsv) {
     // from "Color Imaging, Fundamentals and Applications", Reinhard et al., p. 442
 
-    // A hue of 1.0 is questionably valid, and needs to be interpreted as 0.0f
-    float h_prime = (hsv.x < 1.0f) ? hsv.x * 6.0f : 0.0f; // H * 360.0/60.0
-    float h_floor = math::floor(h_prime);
-    float f = h_prime - h_floor;
+    float h = 6.0 * (hsv.x - math::floor(hsv.x));
+    int hi = int(h); // truncate
+    float f = h - float(hi);
+
     float zy = hsv.z*hsv.y;
     float a = hsv.z - zy;
     float b = hsv.z - zy*f;
     float c = a + zy*f;
 
-    switch(int(h_floor)) {
+    switch(hi) {
         default:
             // hue out of [0,1] range...
             // fall through...

From 6a5a1adf7f5fdc408f141eb1dcc1e916ec783f5f Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Fri, 27 Oct 2023 17:42:44 -0700
Subject: [PATCH 31/66] Add initial Python 3.12 test

This changelist adds an initial Python 3.12 test to GitHub CI, leveraging the support for this Python version in the Windows VS2022 environment.
---
 .github/workflows/main.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4fdcefb7fb..c842d3b530 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -37,7 +37,6 @@ jobs:
           compiler: gcc
           compiler_version: "12"
           python: 3.11
-          upload_shaders: ON
 
         - name: Linux_GCC_CoverageAnalysis
           os: ubuntu-22.04
@@ -104,18 +103,19 @@ jobs:
           python: 3.7
           cmake_config: -G "Visual Studio 16 2019" -A "Win32" -DMATERIALX_BUILD_SHARED_LIBS=ON
 
-        - name: Windows_VS2022_x64_Python39
+        - name: Windows_VS2022_x64_Python311
           os: windows-2022
           architecture: x64
-          python: 3.9
+          python: 3.11
           cmake_config: -G "Visual Studio 17 2022" -A "x64"
+          test_shaders: ON
 
-        - name: Windows_VS2022_x64_Python311
+        - name: Windows_VS2022_x64_Python312
           os: windows-2022
           architecture: x64
-          python: 3.11
+          python: 3.12
           cmake_config: -G "Visual Studio 17 2022" -A "x64"
-          test_shaders: ON
+          upload_shaders: ON
 
     steps:
     - name: Sync Repository
@@ -172,6 +172,10 @@ jobs:
         python-version: ${{ matrix.python }}
         architecture: ${{ matrix.architecture }}
 
+    - name: Install Python Dependencies
+      if: matrix.python != 'None'
+      run: pip install setuptools
+
     - name: Install Emscripten
       if: matrix.build_javascript == 'ON'
       run: |

From 50062e5da4d6f279bcc134a61651096ea6a2c26c Mon Sep 17 00:00:00 2001
From: krohmerNV <42233792+krohmerNV@users.noreply.github.com>
Date: Wed, 1 Nov 2023 00:17:38 +0100
Subject: [PATCH 32/66] Add fileTextureVerticalFlip option for MDL generation
 (#1418)

When investigating the differences in the MaterialXTest I implemented the fileTextureVerticalFlip in the MDL shader gen.
In theory this option is not needed because the MaterialX and MDL define the image coordinate both in the lower left.
But it might be useful to align with existing but non standard conform renderers. It could for instance be used in the MaterialXTest to align with the flipped GLSL and OSL results.
---
 .../stdlib/genmdl/stdlib_genmdl_impl.mtlx     | 12 ++---
 source/MaterialXGenMdl/MdlShaderGenerator.cpp |  9 ++++
 source/MaterialXGenMdl/Nodes/ImageNodeMdl.cpp | 50 +++++++++++++++++
 source/MaterialXGenMdl/Nodes/ImageNodeMdl.h   | 34 ++++++++++++
 .../MaterialXGenMdl/mdl/materialx/stdlib.mdl  | 54 ++++++++++++++++---
 .../MaterialXTest/MaterialXGenMdl/GenMdl.cpp  | 18 ++++++-
 6 files changed, 164 insertions(+), 13 deletions(-)
 create mode 100644 source/MaterialXGenMdl/Nodes/ImageNodeMdl.cpp
 create mode 100644 source/MaterialXGenMdl/Nodes/ImageNodeMdl.h

diff --git a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
index 0081dec924..022f0896f1 100644
--- a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
+++ b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
@@ -22,22 +22,22 @@
   
 
   
-  
+  
     
   
-  
+  
     
   
-  
+  
     
   
-  
+  
     
   
-  
+  
     
   
-  
+  
     
   
 
diff --git a/source/MaterialXGenMdl/MdlShaderGenerator.cpp b/source/MaterialXGenMdl/MdlShaderGenerator.cpp
index f64b555c20..e10d586d69 100644
--- a/source/MaterialXGenMdl/MdlShaderGenerator.cpp
+++ b/source/MaterialXGenMdl/MdlShaderGenerator.cpp
@@ -17,6 +17,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -187,6 +188,14 @@ MdlShaderGenerator::MdlShaderGenerator() :
 
     // 
     registerImplementation("IM_sheen_bsdf_" + MdlShaderGenerator::TARGET, LayerableNodeMdl::create);
+
+    // 
+    registerImplementation("IM_image_float_" + MdlShaderGenerator::TARGET, ImageNodeMdl::create);
+    registerImplementation("IM_image_color3_" + MdlShaderGenerator::TARGET, ImageNodeMdl::create);
+    registerImplementation("IM_image_color4_" + MdlShaderGenerator::TARGET, ImageNodeMdl::create);
+    registerImplementation("IM_image_vector2_" + MdlShaderGenerator::TARGET, ImageNodeMdl::create);
+    registerImplementation("IM_image_vector3_" + MdlShaderGenerator::TARGET, ImageNodeMdl::create);
+    registerImplementation("IM_image_vector4_" + MdlShaderGenerator::TARGET, ImageNodeMdl::create);
 }
 
 ShaderPtr MdlShaderGenerator::generate(const string& name, ElementPtr element, GenContext& context) const
diff --git a/source/MaterialXGenMdl/Nodes/ImageNodeMdl.cpp b/source/MaterialXGenMdl/Nodes/ImageNodeMdl.cpp
new file mode 100644
index 0000000000..502711fe01
--- /dev/null
+++ b/source/MaterialXGenMdl/Nodes/ImageNodeMdl.cpp
@@ -0,0 +1,50 @@
+//
+// Copyright Contributors to the MaterialX Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#include 
+#include 
+#include 
+#include 
+
+MATERIALX_NAMESPACE_BEGIN
+
+const string ImageNodeMdl::FLIP_V = "flip_v";
+
+ShaderNodeImplPtr ImageNodeMdl::create()
+{
+    return std::make_shared();
+}
+
+void ImageNodeMdl::addInputs(ShaderNode& node, GenContext& context) const
+{
+    BASE::addInputs(node, context);
+    node.addInput(ImageNodeMdl::FLIP_V, Type::BOOLEAN)->setUniform();
+}
+
+bool ImageNodeMdl::isEditable(const ShaderInput& input) const
+{
+    if (input.getName() == ImageNodeMdl::FLIP_V)
+    {
+        return false;
+    }
+    return BASE::isEditable(input);
+}
+
+void ImageNodeMdl::emitFunctionCall(const ShaderNode& _node, GenContext& context, ShaderStage& stage) const
+{
+    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
+    {
+        ShaderNode& node = const_cast(_node);
+        ShaderInput* flipUInput = node.getInput(ImageNodeMdl::FLIP_V);
+        ValuePtr value = TypedValue::createValue(context.getOptions().fileTextureVerticalFlip);
+        if (flipUInput)
+        {
+            flipUInput->setValue(value);
+        }
+        BASE::emitFunctionCall(_node, context, stage);
+    }
+}
+
+MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenMdl/Nodes/ImageNodeMdl.h b/source/MaterialXGenMdl/Nodes/ImageNodeMdl.h
new file mode 100644
index 0000000000..fe88b2ce09
--- /dev/null
+++ b/source/MaterialXGenMdl/Nodes/ImageNodeMdl.h
@@ -0,0 +1,34 @@
+//
+// Copyright Contributors to the MaterialX Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#ifndef MATERIALX_IMAGENODEMDL_H
+#define MATERIALX_IMAGENODEMDL_H
+
+#include 
+
+#include "SourceCodeNodeMdl.h"
+
+MATERIALX_NAMESPACE_BEGIN
+
+/// Image node implementation for MDL
+class MX_GENMDL_API ImageNodeMdl : public SourceCodeNodeMdl
+{
+    using BASE = SourceCodeNodeMdl;
+
+  public:
+    static const string FLIP_V; ///< the empty string ""
+
+    static ShaderNodeImplPtr create();
+
+    void addInputs(ShaderNode& node, GenContext& context) const override;
+
+    bool isEditable(const ShaderInput& input) const override;
+
+    void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
+};
+
+MATERIALX_NAMESPACE_END
+
+#endif
diff --git a/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl b/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl
index 8089feb7f0..4ba4f0875a 100644
--- a/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl
+++ b/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl
@@ -139,6 +139,11 @@ export float mx_image_float(
 		anno::description("Enumeration {constant,clamp,periodic,mirror}."),
 		anno::display_name("Frame End Action"),
         anno::unused()
+	]],
+	uniform bool mxp_flip_v = false
+	[[
+		anno::usage("for applying the 'fileTextureVerticalFlip' shader generator option."),
+		anno::hidden()
 	]]
 )
 	[[
@@ -153,7 +158,9 @@ export float mx_image_float(
 		return mxp_default;
 
 	float returnValue = ::tex::lookup_float(tex: mxp_file, 
-						coord: mxp_texcoord,
+						coord: mxp_flip_v
+							? float2(mxp_texcoord.x, 1.0f - mxp_texcoord.y) 
+							: mxp_texcoord,
 						wrap_u: map_addressmode(mxp_uaddressmode),
 						wrap_v: map_addressmode(mxp_vaddressmode));
 	return returnValue;
@@ -207,6 +214,11 @@ export color mx_image_color3(
 		anno::description("Enumeration {constant,clamp,periodic,mirror}."),
 		anno::display_name("Frame End Action"),
         anno::unused()
+	]],
+	uniform bool mxp_flip_v = false
+	[[
+		anno::usage("for applying the 'fileTextureVerticalFlip' shader generator option."),
+		anno::hidden()
 	]]
 )
 	[[
@@ -221,7 +233,9 @@ export color mx_image_color3(
 		return mxp_default;
 
 	color returnValue = ::tex::lookup_color(tex: mxp_file, 
-						coord: mxp_texcoord,
+						coord: mxp_flip_v
+							? float2(mxp_texcoord.x, 1.0f - mxp_texcoord.y) 
+							: mxp_texcoord,
 						wrap_u: map_addressmode(mxp_uaddressmode),
 						wrap_v: map_addressmode(mxp_vaddressmode));
 	return returnValue;
@@ -275,6 +289,11 @@ export color4 mx_image_color4(
 		anno::description("Enumeration {constant,clamp,periodic,mirror}."),
 		anno::display_name("Frame End Action"),
         anno::unused()
+	]],
+	uniform bool mxp_flip_v = false
+	[[
+		anno::usage("for applying the 'fileTextureVerticalFlip' shader generator option."),
+		anno::hidden()
 	]]
 )
 	[[
@@ -289,7 +308,9 @@ export color4 mx_image_color4(
 		return mxp_default;
 
 	color4 returnValue = mk_color4( ::tex::lookup_float4(tex: mxp_file, 
-						coord: mxp_texcoord,
+						coord: mxp_flip_v
+							? float2(mxp_texcoord.x, 1.0f - mxp_texcoord.y) 
+							: mxp_texcoord,
 						wrap_u: map_addressmode(mxp_uaddressmode),
 						wrap_v: map_addressmode(mxp_vaddressmode)));
 	return returnValue;
@@ -343,6 +364,11 @@ export float2 mx_image_vector2(
 		anno::description("Enumeration {constant,clamp,periodic,mirror}."),
 		anno::display_name("Frame End Action"),
         anno::unused()
+	]],
+	uniform bool mxp_flip_v = false
+	[[
+		anno::usage("for applying the 'fileTextureVerticalFlip' shader generator option."),
+		anno::hidden()
 	]]
 )
 	[[
@@ -357,7 +383,9 @@ export float2 mx_image_vector2(
 		return mxp_default;
 
 	float2 returnValue = ::tex::lookup_float2(tex: mxp_file, 
-						coord: mxp_texcoord,
+						coord: mxp_flip_v
+							? float2(mxp_texcoord.x, 1.0f - mxp_texcoord.y) 
+							: mxp_texcoord,
 						wrap_u: map_addressmode(mxp_uaddressmode),
 						wrap_v: map_addressmode(mxp_vaddressmode));
 	return returnValue;
@@ -411,6 +439,11 @@ export float3 mx_image_vector3(
 		anno::description("Enumeration {constant,clamp,periodic,mirror}."),
 		anno::display_name("Frame End Action"),
         anno::unused()
+	]],
+	uniform bool mxp_flip_v = false
+	[[
+		anno::usage("for applying the 'fileTextureVerticalFlip' shader generator option."),
+		anno::hidden()
 	]]
 )
 	[[
@@ -425,7 +458,9 @@ export float3 mx_image_vector3(
 		return mxp_default;
 
 	float3 returnValue = ::tex::lookup_float3(tex: mxp_file, 
-						coord: mxp_texcoord,
+						coord: mxp_flip_v
+							? float2(mxp_texcoord.x, 1.0f - mxp_texcoord.y) 
+							: mxp_texcoord,
 						wrap_u: map_addressmode(mxp_uaddressmode),
 						wrap_v: map_addressmode(mxp_vaddressmode));
 	return returnValue;
@@ -479,6 +514,11 @@ export float4 mx_image_vector4(
 		anno::description("Enumeration {constant,clamp,periodic,mirror}."),
 		anno::display_name("Frame End Action"),
         anno::unused()
+	]],
+	uniform bool mxp_flip_v = false
+	[[
+		anno::usage("for applying the 'fileTextureVerticalFlip' shader generator option."),
+		anno::hidden()
 	]]
 )
 	[[
@@ -493,7 +533,9 @@ export float4 mx_image_vector4(
 		return mxp_default;
 
 	float4 returnValue = ::tex::lookup_float4(tex: mxp_file, 
-						coord: mxp_texcoord,
+						coord: mxp_flip_v
+							? float2(mxp_texcoord.x, 1.0f - mxp_texcoord.y) 
+							: mxp_texcoord,
 						wrap_u: map_addressmode(mxp_uaddressmode),
 						wrap_v: map_addressmode(mxp_vaddressmode));
 	return returnValue;
diff --git a/source/MaterialXTest/MaterialXGenMdl/GenMdl.cpp b/source/MaterialXTest/MaterialXGenMdl/GenMdl.cpp
index 1a3e127cde..22ad0d456e 100644
--- a/source/MaterialXTest/MaterialXGenMdl/GenMdl.cpp
+++ b/source/MaterialXTest/MaterialXGenMdl/GenMdl.cpp
@@ -288,7 +288,10 @@ void MdlShaderGeneratorTester::compileSource(const std::vector& so
         std::string iblFile = (rootPath / "resources/lights/san_giuseppe_bridge.hdr").asString();
         renderCommand += " --hdr \"" + iblFile + "\" --hdr_rotate 90";
         // set scene
-        renderCommand += " --uv_scale 0.5 1.0 --uv_offset 0.0 0.0 --uv_repeat --uv_flip";
+        renderCommand += " --uv_scale 0.5 1.0 --uv_offset 0.0 0.0 --uv_repeat";
+        renderCommand += " --uv_flip"; // this will flip the v coordinate of the vertices, which flips all the
+                                       // UV operations. In contrast, the fileTextureVerticalFlip option will
+                                       // only flip the image access nodes.
         renderCommand += " --camera 0 0 3 0 0 0 --fov 45";
 
         // set the material
@@ -365,6 +368,19 @@ TEST_CASE("GenShader: MDL Shader Generation", "[genmdl]")
 
     mx::GenOptions genOptions;
     genOptions.targetColorSpaceOverride = "lin_rec709";
+
+    // Flipping the texture lookups for the test renderer only.
+    // This is because OSL testrender does not allow to change the UV layout of their sphere (yet) and the MaterialX test suite
+    // adopts the OSL behavior in order to produce comparable results. This means that raw texture coordinates, or procedurals
+    // that use the texture coordinates, do not match what might be expected when reading the MaterialX spec:
+    //    "[...] the image is mapped onto the geometry based on geometry UV coordinates, with the lower-left corner of an image 
+    //     mapping to the (0,0) UV coordinate [...]"
+    // This means for MDL: here, and only here in the test suite, we flip the UV coordinates of mesh using the `--uv_flip` option
+    // of the renderer, and to correct the image orientation, we apply `fileTextureVerticalFlip`.
+    // In regular MDL integrations this is not needed because MDL and MaterialX define the texture space equally with the origin
+    // at the bottom left.
+    genOptions.fileTextureVerticalFlip = true;
+
     mx::FilePath optionsFilePath = searchPath.find("resources/Materials/TestSuite/_options.mtlx");
     tester.validate(genOptions, optionsFilePath);
 }

From f086b861d306eec39d864693f7ca56d7a9975f03 Mon Sep 17 00:00:00 2001
From: HudsonHN 
Date: Fri, 3 Nov 2023 11:04:23 -0700
Subject: [PATCH 33/66] Fix scroll wheel interaction across graph editor
 windows (#1578)

Fixed scroll wheel causing both the renderview to zoom as well as the property editor to scroll.
This is done by moving the renderview cursor bounds check up on the call stack and adding flags to disable scrolling for the property editor if the cursor is within the renderview.
---
 source/MaterialXGraphEditor/Graph.cpp | 113 +++++++++++++++-----------
 source/MaterialXGraphEditor/Graph.h   |   2 +-
 2 files changed, 65 insertions(+), 50 deletions(-)

diff --git a/source/MaterialXGraphEditor/Graph.cpp b/source/MaterialXGraphEditor/Graph.cpp
index 889789706b..88ee10a4c1 100644
--- a/source/MaterialXGraphEditor/Graph.cpp
+++ b/source/MaterialXGraphEditor/Graph.cpp
@@ -3241,13 +3241,27 @@ void Graph::graphButtons()
 
     // Create two windows using splitter
     float paneWidth = (leftPaneWidth - 2.0f);
-    ImGui::BeginChild("Selection", ImVec2(paneWidth, 0));
+    
+    float aspectRatio = _renderer->getPixelRatio();
+    ImVec2 screenSize = ImVec2(paneWidth, paneWidth / aspectRatio);
+
+    ImVec2 mousePos = ImGui::GetMousePos();
+    ImVec2 tempWindowPos = ImGui::GetCursorPos();
+    bool cursorInRenderView = mousePos.x > tempWindowPos.x && mousePos.x < (tempWindowPos.x + screenSize.x) &&
+                              mousePos.y > tempWindowPos.y && mousePos.y < (tempWindowPos.y + screenSize.y);
+    
+    ImGuiWindowFlags windowFlags = 0;
+
+    if (cursorInRenderView)
+    {
+        windowFlags |= ImGuiWindowFlags_NoScrollWithMouse;
+    }
+    
+    ImGui::BeginChild("Selection", ImVec2(paneWidth, 0), false, windowFlags);
     ImVec2 windowPos = ImGui::GetWindowPos();
 
     // RenderView window
     ImVec2 wsize = ImVec2((float) _renderer->getViewWidth(), (float) _renderer->getViewHeight());
-    float aspectRatio = _renderer->getPixelRatio();
-    ImVec2 screenSize = ImVec2(paneWidth, paneWidth / aspectRatio);
     _renderer->setViewWidth((int) screenSize[0]);
     _renderer->setViewHeight((int) screenSize[1]);
 
@@ -3267,7 +3281,10 @@ void Graph::graphButtons()
     ImGui::EndChild();
     ImGui::SameLine(0.0f, 12.0f);
 
-    handleRenderViewInputs(windowPos, screenSize[0], screenSize[1]);
+    if (cursorInRenderView)
+    {
+        handleRenderViewInputs();
+    }
 }
 
 void Graph::propertyEditor()
@@ -3830,56 +3847,54 @@ void Graph::shaderPopup()
     }
 }
 
-void Graph::handleRenderViewInputs(ImVec2 minValue, float width, float height)
+void Graph::handleRenderViewInputs()
 {
     ImVec2 mousePos = ImGui::GetMousePos();
-    if (mousePos.x > minValue.x && mousePos.x < (minValue.x + width) && mousePos.y > minValue.y && mousePos.y < (minValue.y + height))
+    mx::Vector2 mxMousePos = mx::Vector2(mousePos.x, mousePos.y);
+    float scrollAmt = ImGui::GetIO().MouseWheel;
+    int button = -1;
+    bool down = false;
+    if (ImGui::IsMouseDragging(0) || ImGui::IsMouseDragging(1))
     {
-        mx::Vector2 mxMousePos = mx::Vector2(mousePos.x, mousePos.y);
-        float scrollAmt = ImGui::GetIO().MouseWheel;
-        int button = -1;
-        bool down = false;
-        if (ImGui::IsMouseDragging(0) || ImGui::IsMouseDragging(1))
-        {
-            _renderer->setMouseMotionEvent(mxMousePos);
-        }
-        if (ImGui::IsMouseClicked(0))
-        {
-            button = 0;
-            down = true;
-            _renderer->setMouseButtonEvent(button, down, mxMousePos);
-        }
-        else if (ImGui::IsMouseClicked(1))
-        {
-            button = 1;
-            down = true;
-            _renderer->setMouseButtonEvent(button, down, mxMousePos);
-        }
-        else if (ImGui::IsMouseReleased(0))
-        {
-            button = 0;
-            _renderer->setMouseButtonEvent(button, down, mxMousePos);
-        }
-        else if (ImGui::IsMouseReleased(1))
-        {
-            button = 1;
-            _renderer->setMouseButtonEvent(button, down, mxMousePos);
-        }
-        else if (ImGui::IsKeyPressed(ImGuiKey_KeypadAdd))
-        {
-            _renderer->setKeyEvent(ImGuiKey_KeypadAdd);
-        }
-        else if (ImGui::IsKeyPressed(ImGuiKey_KeypadSubtract))
-        {
-            _renderer->setKeyEvent(ImGuiKey_KeypadSubtract);
-        }
+        _renderer->setMouseMotionEvent(mxMousePos);
+    }
+    if (ImGui::IsMouseClicked(0))
+    {
+        button = 0;
+        down = true;
+        _renderer->setMouseButtonEvent(button, down, mxMousePos);
+    }
+    else if (ImGui::IsMouseClicked(1))
+    {
+        button = 1;
+        down = true;
+        _renderer->setMouseButtonEvent(button, down, mxMousePos);
+    }
+    else if (ImGui::IsMouseReleased(0))
+    {
+        button = 0;
+        _renderer->setMouseButtonEvent(button, down, mxMousePos);
+    }
+    else if (ImGui::IsMouseReleased(1))
+    {
+        button = 1;
+        _renderer->setMouseButtonEvent(button, down, mxMousePos);
+    }
+    else if (ImGui::IsKeyPressed(ImGuiKey_KeypadAdd))
+    {
+        _renderer->setKeyEvent(ImGuiKey_KeypadAdd);
+    }
+    else if (ImGui::IsKeyPressed(ImGuiKey_KeypadSubtract))
+    {
+        _renderer->setKeyEvent(ImGuiKey_KeypadSubtract);
+    }
 
-        // Scrolling not possible if open or save file dialog is open
-        if (scrollAmt != 0 && !_fileDialogSave.isOpened() && !_fileDialog.isOpened() && !_fileDialogGeom.isOpened())
-        {
-            _renderer->setScrollEvent(scrollAmt);
-        }
+    // Scrolling not possible if open or save file dialog is open
+    if (scrollAmt != 0 && !_fileDialogSave.isOpened() && !_fileDialog.isOpened() && !_fileDialogGeom.isOpened())
+    {
+        _renderer->setScrollEvent(scrollAmt);
     }
+    
 }
 
 void Graph::drawGraph(ImVec2 mousePos)
diff --git a/source/MaterialXGraphEditor/Graph.h b/source/MaterialXGraphEditor/Graph.h
index fcdf93723e..821ecf71fd 100644
--- a/source/MaterialXGraphEditor/Graph.h
+++ b/source/MaterialXGraphEditor/Graph.h
@@ -225,7 +225,7 @@ class Graph
     void selectMaterial(UiNodePtr node);
 
     // Allow for camera manipulation of render view window
-    void handleRenderViewInputs(ImVec2 minValue, float width, float height);
+    void handleRenderViewInputs();
 
     // Set the node to display in render view based on selected node or nodegraph
     void setRenderMaterial(UiNodePtr node);

From 83ae82eefa9e34e081f1341e34b194e84ad5b151 Mon Sep 17 00:00:00 2001
From: Stefan Habel <19556655+StefanHabel@users.noreply.github.com>
Date: Thu, 9 Nov 2023 09:00:41 -0800
Subject: [PATCH 34/66] Resolved Python module import dependencies (#1595)

This patch adds pybind11::module::import() calls to MaterialX Python C extension modules that depend on other MaterialX Python C extension modules.

The intention is to allow any of the MaterialX Python C extension modules to be imported in any order.

A couple of the Python scripts are updated to remove unused MaterialX imports, and to sort imports alphabetically (which is now possible as the modules import their own dependencies).
---
 python/Scripts/baketextures.py                       |  3 +--
 python/Scripts/generateshader.py                     |  5 +++--
 python/Scripts/translateshader.py                    |  6 ++----
 source/PyMaterialX/PyMaterialX.h                     | 12 ++++++++++++
 source/PyMaterialX/PyMaterialXFormat/PyModule.cpp    |  3 +++
 source/PyMaterialX/PyMaterialXGenGlsl/PyModule.cpp   |  3 +++
 source/PyMaterialX/PyMaterialXGenMdl/PyModule.cpp    |  3 +++
 source/PyMaterialX/PyMaterialXGenMsl/PyModule.cpp    |  3 +++
 source/PyMaterialX/PyMaterialXGenOsl/PyModule.cpp    |  3 +++
 source/PyMaterialX/PyMaterialXRender/PyModule.cpp    |  3 +++
 .../PyMaterialX/PyMaterialXRenderGlsl/PyModule.cpp   |  3 +++
 source/PyMaterialX/PyMaterialXRenderMsl/PyModule.mm  |  3 +++
 source/PyMaterialX/PyMaterialXRenderOsl/PyModule.cpp |  3 +++
 13 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/python/Scripts/baketextures.py b/python/Scripts/baketextures.py
index caf2aaed3e..ce132036a6 100644
--- a/python/Scripts/baketextures.py
+++ b/python/Scripts/baketextures.py
@@ -5,9 +5,8 @@
 
 import sys, os, argparse
 from sys import platform
+
 import MaterialX as mx
-from MaterialX import PyMaterialXGenShader
-from MaterialX import PyMaterialXGenGlsl
 from MaterialX import PyMaterialXRender as mx_render
 from MaterialX import PyMaterialXRenderGlsl as mx_render_glsl
 if platform == "darwin":
diff --git a/python/Scripts/generateshader.py b/python/Scripts/generateshader.py
index 8329f7231e..038625eacf 100644
--- a/python/Scripts/generateshader.py
+++ b/python/Scripts/generateshader.py
@@ -5,12 +5,13 @@
 '''
 
 import sys, os, argparse, subprocess
+
 import MaterialX as mx
-import MaterialX.PyMaterialXGenShader as mx_gen_shader
 import MaterialX.PyMaterialXGenGlsl as mx_gen_glsl
-import MaterialX.PyMaterialXGenOsl as mx_gen_osl
 import MaterialX.PyMaterialXGenMdl as mx_gen_mdl
 import MaterialX.PyMaterialXGenMsl as mx_gen_msl
+import MaterialX.PyMaterialXGenOsl as mx_gen_osl
+import MaterialX.PyMaterialXGenShader as mx_gen_shader
 
 def validateCode(sourceCodeFile, codevalidator, codevalidatorArgs):
     if codevalidator:
diff --git a/python/Scripts/translateshader.py b/python/Scripts/translateshader.py
index 71d7a480b5..f7c5686211 100644
--- a/python/Scripts/translateshader.py
+++ b/python/Scripts/translateshader.py
@@ -5,15 +5,13 @@
 '''
 
 import sys, os, argparse
-import MaterialX as mx
-
 from sys import platform
+
+import MaterialX as mx
 from MaterialX import PyMaterialXGenShader as mx_gen_shader
-from MaterialX import PyMaterialXGenGlsl as ms_gen_glsl
 from MaterialX import PyMaterialXRender as mx_render
 from MaterialX import PyMaterialXRenderGlsl as mx_render_glsl
 if platform == "darwin":
-    from MaterialX import PyMaterialXGenMsl as ms_gen_msl
     from MaterialX import PyMaterialXRenderMsl as mx_render_msl
 
 def main():
diff --git a/source/PyMaterialX/PyMaterialX.h b/source/PyMaterialX/PyMaterialX.h
index 7af67ac4bd..1e7bc7ff87 100644
--- a/source/PyMaterialX/PyMaterialX.h
+++ b/source/PyMaterialX/PyMaterialX.h
@@ -16,4 +16,16 @@
 #include 
 #include 
 
+// Define a macro to import a PyMaterialX module, e.g. `PyMaterialXCore`,
+// either within the `MaterialX` Python package, e.g. in `installed/python/`,
+// or as a standalone module, e.g. in `lib/`
+#define PYMATERIALX_IMPORT_MODULE(MODULE_NAME)                               \
+    try                                                                      \
+    {                                                                        \
+        pybind11::module::import("MaterialX." #MODULE_NAME);                 \
+    }                                                                        \
+    catch (const py::error_already_set&)                                     \
+    {                                                                        \
+        pybind11::module::import(#MODULE_NAME);                              \
+    }
 #endif
diff --git a/source/PyMaterialX/PyMaterialXFormat/PyModule.cpp b/source/PyMaterialX/PyMaterialXFormat/PyModule.cpp
index 842087d24f..3965f48753 100644
--- a/source/PyMaterialX/PyMaterialXFormat/PyModule.cpp
+++ b/source/PyMaterialX/PyMaterialXFormat/PyModule.cpp
@@ -15,6 +15,9 @@ PYBIND11_MODULE(PyMaterialXFormat, mod)
 {
     mod.doc() = "Module containing Python bindings for the MaterialXFormat library";
 
+    // PyMaterialXFormat depends on types defined in PyMaterialXCore
+    PYMATERIALX_IMPORT_MODULE(PyMaterialXCore);
+
     bindPyFile(mod);
     bindPyXmlIo(mod);
     bindPyUtil(mod);
diff --git a/source/PyMaterialX/PyMaterialXGenGlsl/PyModule.cpp b/source/PyMaterialX/PyMaterialXGenGlsl/PyModule.cpp
index a36b815d32..9ab46e514d 100644
--- a/source/PyMaterialX/PyMaterialXGenGlsl/PyModule.cpp
+++ b/source/PyMaterialX/PyMaterialXGenGlsl/PyModule.cpp
@@ -16,6 +16,9 @@ PYBIND11_MODULE(PyMaterialXGenGlsl, mod)
 {
     mod.doc() = "Module containing Python bindings for the MaterialXGenGlsl library";
 
+    // PyMaterialXGenGlsl depends on types defined in PyMaterialXGenShader
+    PYMATERIALX_IMPORT_MODULE(PyMaterialXGenShader);
+
     bindPyGlslShaderGenerator(mod);
     bindPyGlslResourceBindingContext(mod);
 
diff --git a/source/PyMaterialX/PyMaterialXGenMdl/PyModule.cpp b/source/PyMaterialX/PyMaterialXGenMdl/PyModule.cpp
index 020c944e63..a34b28a729 100644
--- a/source/PyMaterialX/PyMaterialXGenMdl/PyModule.cpp
+++ b/source/PyMaterialX/PyMaterialXGenMdl/PyModule.cpp
@@ -13,5 +13,8 @@ PYBIND11_MODULE(PyMaterialXGenMdl, mod)
 {
     mod.doc() = "Module containing Python bindings for the MaterialXGenMdl library";
 
+    // PyMaterialXGenMdl depends on types defined in PyMaterialXGenShader
+    PYMATERIALX_IMPORT_MODULE(PyMaterialXGenShader);
+
     bindPyMdlShaderGenerator(mod);
 };
diff --git a/source/PyMaterialX/PyMaterialXGenMsl/PyModule.cpp b/source/PyMaterialX/PyMaterialXGenMsl/PyModule.cpp
index 6eda44871b..b3dcdb10a8 100644
--- a/source/PyMaterialX/PyMaterialXGenMsl/PyModule.cpp
+++ b/source/PyMaterialX/PyMaterialXGenMsl/PyModule.cpp
@@ -14,6 +14,9 @@ PYBIND11_MODULE(PyMaterialXGenMsl, mod)
 {
     mod.doc() = "Module containing Python bindings for the MaterialXGenMsl library";
 
+    // PyMaterialXGenMsl depends on types defined in PyMaterialXGenShader
+    PYMATERIALX_IMPORT_MODULE(PyMaterialXGenShader);
+
     bindPyMslShaderGenerator(mod);
     bindPyMslResourceBindingContext(mod);
 }
diff --git a/source/PyMaterialX/PyMaterialXGenOsl/PyModule.cpp b/source/PyMaterialX/PyMaterialXGenOsl/PyModule.cpp
index d772d18b6a..54d7d2439a 100644
--- a/source/PyMaterialX/PyMaterialXGenOsl/PyModule.cpp
+++ b/source/PyMaterialX/PyMaterialXGenOsl/PyModule.cpp
@@ -13,5 +13,8 @@ PYBIND11_MODULE(PyMaterialXGenOsl, mod)
 {
     mod.doc() = "Module containing Python bindings for the MaterialXGenOsl library";
 
+    // PyMaterialXGenOsl depends on types defined in PyMaterialXGenShader
+    PYMATERIALX_IMPORT_MODULE(PyMaterialXGenShader);
+
     bindPyOslShaderGenerator(mod);
 }
diff --git a/source/PyMaterialX/PyMaterialXRender/PyModule.cpp b/source/PyMaterialX/PyMaterialXRender/PyModule.cpp
index 1c60142346..bbf9688403 100644
--- a/source/PyMaterialX/PyMaterialXRender/PyModule.cpp
+++ b/source/PyMaterialX/PyMaterialXRender/PyModule.cpp
@@ -25,6 +25,9 @@ PYBIND11_MODULE(PyMaterialXRender, mod)
 {
     mod.doc() = "Module containing Python bindings for the MaterialXRender library";
 
+    // PyMaterialXRender depends on types defined in PyMaterialXCore
+    PYMATERIALX_IMPORT_MODULE(PyMaterialXCore);
+
     bindPyMesh(mod);
     bindPyGeometryHandler(mod);
     bindPyLightHandler(mod);
diff --git a/source/PyMaterialX/PyMaterialXRenderGlsl/PyModule.cpp b/source/PyMaterialX/PyMaterialXRenderGlsl/PyModule.cpp
index 32fb79239d..d0ef04158d 100644
--- a/source/PyMaterialX/PyMaterialXRenderGlsl/PyModule.cpp
+++ b/source/PyMaterialX/PyMaterialXRenderGlsl/PyModule.cpp
@@ -16,6 +16,9 @@ PYBIND11_MODULE(PyMaterialXRenderGlsl, mod)
 {
     mod.doc() = "Module containing Python bindings for the MaterialXRenderGlsl library";
 
+    // PyMaterialXRenderGlsl depends on types defined in PyMaterialXRender
+    PYMATERIALX_IMPORT_MODULE(PyMaterialXRender);
+
     bindPyGlslProgram(mod);
     bindPyGlslRenderer(mod);
     bindPyGLTextureHandler(mod);
diff --git a/source/PyMaterialX/PyMaterialXRenderMsl/PyModule.mm b/source/PyMaterialX/PyMaterialXRenderMsl/PyModule.mm
index 10b440d21c..f4d0dbeaeb 100644
--- a/source/PyMaterialX/PyMaterialXRenderMsl/PyModule.mm
+++ b/source/PyMaterialX/PyMaterialXRenderMsl/PyModule.mm
@@ -16,6 +16,9 @@
 {
     mod.doc() = "Module containing Python bindings for the MaterialXRenderMsl library";
 
+    // PyMaterialXRenderMsl depends on types defined in PyMaterialXRender
+    PYMATERIALX_IMPORT_MODULE(PyMaterialXRender);
+
     bindPyMslProgram(mod);
     bindPyMslRenderer(mod);
     bindPyMetalTextureHandler(mod);
diff --git a/source/PyMaterialX/PyMaterialXRenderOsl/PyModule.cpp b/source/PyMaterialX/PyMaterialXRenderOsl/PyModule.cpp
index 15610066f3..4019d364ab 100644
--- a/source/PyMaterialX/PyMaterialXRenderOsl/PyModule.cpp
+++ b/source/PyMaterialX/PyMaterialXRenderOsl/PyModule.cpp
@@ -13,5 +13,8 @@ PYBIND11_MODULE(PyMaterialXRenderOsl, mod)
 {
     mod.doc() = "Module containing Python bindings for the MaterialXRenderOsl library";
 
+    // PyMaterialXRenderOsl depends on types defined in PyMaterialXRender
+    PYMATERIALX_IMPORT_MODULE(PyMaterialXRender);
+
     bindPyOslRenderer(mod);
 }

From 30a446ea2548f4d7fc39a18dc1cde592191bab38 Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Sun, 19 Nov 2023 13:02:36 -0800
Subject: [PATCH 35/66] Add GCC 13 and Clang 15 builds

This changelist adds GCC 13 and Clang 15 builds to GitHub CI, leveraging new support for these builds in the ubuntu-22.04 environment.
---
 .github/workflows/main.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c842d3b530..aeba7b2c45 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,18 +25,19 @@ jobs:
           python: 3.7
           cmake_config: -DMATERIALX_BUILD_SHARED_LIBS=ON
 
-        - name: Linux_GCC_11_Python39
-          os: ubuntu-20.04
-          compiler: gcc
-          compiler_version: "11"
-          python: 3.9
-          build_javascript: ON
-
         - name: Linux_GCC_12_Python311
           os: ubuntu-22.04
           compiler: gcc
           compiler_version: "12"
           python: 3.11
+          build_javascript: ON
+
+        - name: Linux_GCC_13_Python312
+          os: ubuntu-22.04
+          compiler: gcc
+          compiler_version: "13"
+          python: 3.12
+          static_analysis: ON
 
         - name: Linux_GCC_CoverageAnalysis
           os: ubuntu-22.04
@@ -52,20 +53,19 @@ jobs:
           compiler_version: "10"
           python: 3.7
           cmake_config: -DMATERIALX_BUILD_SHARED_LIBS=ON
-          static_analysis: ON
 
-        - name: Linux_Clang_14_Python311
+        - name: Linux_Clang_15_Python312
           os: ubuntu-22.04
           compiler: clang
-          compiler_version: "14"
-          python: 3.11
+          compiler_version: "15"
+          python: 3.12
           test_render: ON
           clang_format: ON
 
-        - name: Linux_Clang_14_DynamicAnalysis
+        - name: Linux_Clang_DynamicAnalysis
           os: ubuntu-22.04
           compiler: clang
-          compiler_version: "14"
+          compiler_version: "15"
           python: None
           cmake_config: -DMATERIALX_DYNAMIC_ANALYSIS=ON
           dynamic_analysis: ON

From 60c8a5967ab5561d571a78e0c246d3b304c794fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20Arabeyre?=
 <34628622+eytienne@users.noreply.github.com>
Date: Tue, 21 Nov 2023 01:51:32 +0100
Subject: [PATCH 36/66] Fixed null check in Graph::propertyEditor (#1601)

---
 source/MaterialXGraphEditor/Graph.cpp | 40 +++++++++++++--------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/source/MaterialXGraphEditor/Graph.cpp b/source/MaterialXGraphEditor/Graph.cpp
index 88ee10a4c1..bab5df7b58 100644
--- a/source/MaterialXGraphEditor/Graph.cpp
+++ b/source/MaterialXGraphEditor/Graph.cpp
@@ -240,7 +240,7 @@ mx::DocumentPtr Graph::loadDocument(mx::FilePath filename)
                 std::cerr << "*** Validation warnings for " << filename.asString() << " ***" << std::endl;
                 std::cerr << message << std::endl;
             }
-            
+
             // Cache the currently loaded file
             _materialFilename = filename;
         }
@@ -2102,11 +2102,11 @@ mx::InputPtr Graph::findInput(mx::InputPtr nodeInput, const std::string& name)
 {
     if (_isNodeGraph)
     {
-        for (UiNodePtr node : _graphNodes)
+        for (UiNodePtr uiNode : _graphNodes)
         {
-            if (node->getNode())
+            if (uiNode->getNode())
             {
-                for (mx::InputPtr input : node->getNode()->getActiveInputs())
+                for (mx::InputPtr input : uiNode->getNode()->getActiveInputs())
                 {
                     if (input->getInterfaceInput())
                     {
@@ -2547,7 +2547,7 @@ void Graph::addLink(ed::PinId startPinId, ed::PinId endPinId)
         return;
     }
 
-    // Perform type check 
+    // Perform type check
     bool typesMatch = (outputPin->_type == inputPin->_type);
     if (!typesMatch)
     {
@@ -3093,7 +3093,7 @@ void Graph::loadGraphFromFile(bool prompt)
         _fileDialog.open();
     }
     else
-    { 
+    {
         _graphDoc = loadDocument(_materialFilename);
 
         // Rebuild the UI
@@ -3104,7 +3104,7 @@ void Graph::loadGraphFromFile(bool prompt)
 
         _renderer->setDocument(_graphDoc);
         _renderer->updateMaterials(nullptr);
-    }   
+    }
 }
 
 void Graph::saveGraphToFile()
@@ -3241,7 +3241,7 @@ void Graph::graphButtons()
 
     // Create two windows using splitter
     float paneWidth = (leftPaneWidth - 2.0f);
-    
+
     float aspectRatio = _renderer->getPixelRatio();
     ImVec2 screenSize = ImVec2(paneWidth, paneWidth / aspectRatio);
 
@@ -3249,14 +3249,14 @@ void Graph::graphButtons()
     ImVec2 tempWindowPos = ImGui::GetCursorPos();
     bool cursorInRenderView = mousePos.x > tempWindowPos.x && mousePos.x < (tempWindowPos.x + screenSize.x) &&
                               mousePos.y > tempWindowPos.y && mousePos.y < (tempWindowPos.y + screenSize.y);
-    
+
     ImGuiWindowFlags windowFlags = 0;
 
     if (cursorInRenderView)
     {
         windowFlags |= ImGuiWindowFlags_NoScrollWithMouse;
     }
-    
+
     ImGui::BeginChild("Selection", ImVec2(paneWidth, 0), false, windowFlags);
     ImVec2 windowPos = ImGui::GetWindowPos();
 
@@ -3306,16 +3306,16 @@ void Graph::propertyEditor()
                 std::string name = _currUiNode->getNode()->getParent()->createValidChildName(temp);
 
                 std::vector downstreamNodes = _currUiNode->getOutputConnections();
-                for (UiNodePtr nodes : downstreamNodes)
+                for (UiNodePtr uiNode : downstreamNodes)
                 {
-                    if (nodes->getInput() == nullptr)
+                    if (!uiNode->getInput() && uiNode->getNode())
                     {
-                        for (mx::InputPtr input : nodes->getNode()->getActiveInputs())
+                        for (mx::InputPtr input : uiNode->getNode()->getActiveInputs())
                         {
                             if (input->getConnectedNode() == _currUiNode->getNode())
                             {
                                 _currUiNode->getNode()->setName(name);
-                                nodes->getNode()->setConnectedNode(input->getName(), _currUiNode->getNode());
+                                uiNode->getNode()->setConnectedNode(input->getName(), _currUiNode->getNode());
                             }
                         }
                     }
@@ -3330,13 +3330,13 @@ void Graph::propertyEditor()
             {
                 std::string name = _currUiNode->getInput()->getParent()->createValidChildName(temp);
                 std::vector downstreamNodes = _currUiNode->getOutputConnections();
-                for (UiNodePtr nodes : downstreamNodes)
+                for (UiNodePtr uiNode : downstreamNodes)
                 {
-                    if (nodes->getInput() == nullptr)
+                    if (uiNode->getInput() == nullptr)
                     {
-                        if (nodes->getNode())
+                        if (uiNode->getNode())
                         {
-                            for (mx::InputPtr input : nodes->getNode()->getActiveInputs())
+                            for (mx::InputPtr input : uiNode->getNode()->getActiveInputs())
                             {
                                 if (input->getInterfaceInput() == _currUiNode->getInput())
                                 {
@@ -3349,7 +3349,7 @@ void Graph::propertyEditor()
                         }
                         else
                         {
-                            nodes->getOutput()->setConnectedNode(_currUiNode->getNode());
+                            uiNode->getOutput()->setConnectedNode(_currUiNode->getNode());
                         }
                     }
                 }
@@ -3726,7 +3726,6 @@ void Graph::addNodePopup(bool cursor)
                         }
                     }
 
-                    
                     ImGui::EndMenu();
                 }
             }
@@ -3894,7 +3893,6 @@ void Graph::handleRenderViewInputs()
     {
         _renderer->setScrollEvent(scrollAmt);
     }
-    
 }
 
 void Graph::drawGraph(ImVec2 mousePos)

From e45d67f2d2f5f9a972c6235960b74fceb9fc5487 Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Mon, 20 Nov 2023 20:01:18 -0800
Subject: [PATCH 37/66] Initial C++ fuzz tests

This changelist adds initial C++ fuzz tests to the XmlIo module of the MaterialX test suite.  In these new tests, pseudo-random edits are applied to a set of source documents before import, in order to uncover edge cases that aren't yet handled in MaterialXCore and MaterialXFormat.

Also:

- Add missing type casts to invalidNameChar and hasWindowDriveSpecifier.
- Make random numbers deterministic in shaderGenPerformanceTest.
---
 source/MaterialXCore/Util.cpp                 |  2 +-
 source/MaterialXFormat/File.cpp               |  2 +-
 .../MaterialXTest/MaterialXFormat/XmlIo.cpp   | 46 ++++++++++++++++++-
 .../MaterialXGenShader/GenShaderUtil.cpp      |  5 +-
 4 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/source/MaterialXCore/Util.cpp b/source/MaterialXCore/Util.cpp
index 9bb75a19b5..639b8f343c 100644
--- a/source/MaterialXCore/Util.cpp
+++ b/source/MaterialXCore/Util.cpp
@@ -24,7 +24,7 @@ const std::tuple LIBRARY_VERSION_TUPLE(MATERIALX_MAJOR_VERSION,
 
 bool invalidNameChar(char c)
 {
-    return !isalnum(c) && c != '_' && c != ':';
+    return !isalnum((unsigned char) c) && c != '_' && c != ':';
 }
 
 } // anonymous namespace
diff --git a/source/MaterialXFormat/File.cpp b/source/MaterialXFormat/File.cpp
index bb40ba54d1..62b7ec39a8 100644
--- a/source/MaterialXFormat/File.cpp
+++ b/source/MaterialXFormat/File.cpp
@@ -51,7 +51,7 @@ const string MATERIALX_SEARCH_PATH_ENV_VAR = "MATERIALX_SEARCH_PATH";
 
 inline bool hasWindowsDriveSpecifier(const string& val)
 {
-    return (val.length() > 1 && std::isalpha(val[0]) && (val[1] == ':'));
+    return (val.length() > 1 && std::isalpha((unsigned char) val[0]) && (val[1] == ':'));
 }
 
 //
diff --git a/source/MaterialXTest/MaterialXFormat/XmlIo.cpp b/source/MaterialXTest/MaterialXFormat/XmlIo.cpp
index 1336a080c4..495712381e 100644
--- a/source/MaterialXTest/MaterialXFormat/XmlIo.cpp
+++ b/source/MaterialXTest/MaterialXFormat/XmlIo.cpp
@@ -6,7 +6,6 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
 
@@ -262,6 +261,51 @@ TEST_CASE("Comments and newlines", "[xmlio]")
     REQUIRE(origXml == newXml);
 }
 
+TEST_CASE("Fuzz testing", "[xmlio]")
+{
+    mx::FileSearchPath searchPath = mx::getDefaultDataSearchPath();
+    mx::FilePath examplesPath = searchPath.find("resources/Materials/Examples/StandardSurface");
+
+    std::mt19937 rng(0);
+    std::uniform_int_distribution randChar(0, 255);
+
+    for (const mx::FilePath& filename : examplesPath.getFilesInDirectory(mx::MTLX_EXTENSION))
+    {
+        // Read the example file into an XML string buffer.
+        const std::string origString = mx::readFile(examplesPath / filename);
+        REQUIRE(origString.size() > 0);
+        std::uniform_int_distribution randPos(0, origString.size() - 1);
+
+        // Iterate over test runs.
+        for (size_t testRun = 0; testRun < 256; testRun++)
+        {
+            std::string editString = origString;
+
+            // Iterate over string edits.
+            for (size_t editIndex = 0; editIndex < 32; editIndex++)
+            {
+                // Randomly alter one character in the document.
+                size_t charIndex = randPos(rng);
+                size_t newChar = randChar(rng);
+                editString[charIndex] = (char) newChar;
+
+                // Attempt to interpret the edited string as a document, allowing only MaterialX exceptions.
+                mx::DocumentPtr doc = mx::createDocument();
+                try
+                {
+                    mx::readFromXmlString(doc, editString, searchPath);
+                    doc->validate();
+                }
+                catch (const mx::Exception&)
+                {
+                    // On a MaterialX exception, proceed to the next test run.
+                    break;
+                }
+            }
+        }
+    }
+}
+
 TEST_CASE("Locale region testing", "[xmlio]")
 {
     // In the United States, the thousands separator is a comma, while in Germany it is a period.
diff --git a/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp b/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp
index 2ca8afa86c..1280ff390d 100644
--- a/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp
+++ b/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp
@@ -370,9 +370,8 @@ void shaderGenPerformanceTest(mx::GenContext& context)
     REQUIRE(loadedDocuments.size() == documentsPaths.size());
 
     // Shuffle the order of documents and perform document library import validatation and shadergen
-    std::random_device random_dev;
-    std::mt19937 generator(random_dev());
-    std::shuffle(loadedDocuments.begin(), loadedDocuments.end(), generator);
+    std::mt19937 rng(0);
+    std::shuffle(loadedDocuments.begin(), loadedDocuments.end(), rng);
     for (const auto& doc : loadedDocuments)
     {
         doc->importLibrary(nodeLibrary);

From 273b8a59c612d85313eaa9bbe719ad7c995f4b1d Mon Sep 17 00:00:00 2001
From: Stefan Habel <19556655+StefanHabel@users.noreply.github.com>
Date: Mon, 27 Nov 2023 11:46:11 -0800
Subject: [PATCH 38/66] Fixed Python script errors flagged by pyflakes (#1604)

---
 python/Scripts/generateshader.py |  4 ++--
 python/Scripts/genmdl.py         | 10 ++++++----
 python/Scripts/mxdoc.py          |  4 +++-
 python/Scripts/mxformat.py       |  4 +++-
 python/Scripts/mxvalidate.py     |  6 ++++--
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/python/Scripts/generateshader.py b/python/Scripts/generateshader.py
index 038625eacf..f6158d270a 100644
--- a/python/Scripts/generateshader.py
+++ b/python/Scripts/generateshader.py
@@ -25,7 +25,7 @@ def validateCode(sourceCodeFile, codevalidator, codevalidatorArgs):
         print(cmd_flatten)
         try:
             output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
-            result = output.decode(encoding='utf-8')
+            return output.decode(encoding='utf-8')
         except subprocess.CalledProcessError as out:                                                                                                   
             return (out.output.decode(encoding='utf-8'))
     return ""
@@ -83,7 +83,7 @@ def main():
         try:
             mx.loadLibraries(libraryFolders, searchPath, stdlib)
             doc.importLibrary(stdlib)
-        except err:
+        except Exception as err:
             print('Generation failed: "', err, '"')
             sys.exit(-1)
 
diff --git a/python/Scripts/genmdl.py b/python/Scripts/genmdl.py
index f42add0425..ded1021554 100644
--- a/python/Scripts/genmdl.py
+++ b/python/Scripts/genmdl.py
@@ -3,9 +3,11 @@
 Generate MDL implementation directory based on MaterialX nodedefs
 '''
 
-import sys
 import os
-import string; os.environ['PYTHONIOENCODING'] = 'utf-8'
+import sys
+
+os.environ['PYTHONIOENCODING'] = 'utf-8'
+
 import MaterialX as mx
 
 def usage():
@@ -345,7 +347,7 @@ def main():
 
     doc = mx.createDocument()
     searchPath = os.path.join(_startPath, 'libraries')
-    libraryPath = os.path.join(searchPath, 'stdlib')
+    libraryPath = os.path.join(searchPath, LIBRARY)
     _loadLibraries(doc, searchPath, libraryPath)
 
     DEFINITION_PREFIX = 'ND_'
@@ -522,7 +524,7 @@ def main():
             if isinstance(elem, mx.Output):
                 outputValue = elem.getAttribute('default')
                 if outputValue == '[]':
-                    outputvalue = ''
+                    outputValue = ''
                 if not outputValue:
                     outputValue = elem.getAttribute('defaultinput')
                     if outputValue:
diff --git a/python/Scripts/mxdoc.py b/python/Scripts/mxdoc.py
index 7ee21eb8e5..7c9ba09a07 100644
--- a/python/Scripts/mxdoc.py
+++ b/python/Scripts/mxdoc.py
@@ -3,7 +3,9 @@
 Print markdown documentation for each nodedef in the given document.
 '''
 
-import sys, os, argparse
+import argparse
+import sys
+
 import MaterialX as mx
 
 HEADERS = ('Name', 'Type', 'Default Value',
diff --git a/python/Scripts/mxformat.py b/python/Scripts/mxformat.py
index 8f6ad731e1..0b327883bd 100644
--- a/python/Scripts/mxformat.py
+++ b/python/Scripts/mxformat.py
@@ -4,7 +4,9 @@
 the documents to the latest version of the standard.
 '''
 
-import sys, os, argparse
+import argparse
+import os
+
 import MaterialX as mx
 
 def main():
diff --git a/python/Scripts/mxvalidate.py b/python/Scripts/mxvalidate.py
index e251b4599b..8b5271e9ed 100755
--- a/python/Scripts/mxvalidate.py
+++ b/python/Scripts/mxvalidate.py
@@ -3,7 +3,9 @@
 Verify that the given file is a valid MaterialX document.
 '''
 
-import sys, os, argparse
+import argparse
+import sys
+
 import MaterialX as mx
 
 def main():
@@ -25,7 +27,7 @@ def main():
         stdlib = mx.createDocument()
         try:
             mx.loadLibraries(mx.getDefaultDataLibraryFolders(), mx.getDefaultDataSearchPath(), stdlib)            
-        except err:
+        except Exception as err:
             print(err)
             sys.exit(0)
         doc.importLibrary(stdlib)

From 1cdecf734983676ddaf3c6f84bfe92792f887d0b Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Mon, 27 Nov 2023 12:46:48 -0800
Subject: [PATCH 39/66] Raise minimum CMake version to 3.16

This changelist raises the minimum CMake version to 3.16, allowing more modern CMake features to be leveraged in future pull requests.

CMake 3.16 is the first version that natively supports Objective C++ files, which are an important component of the Metal Shading Language support in MaterialX.
---
 CMakeLists.txt                             | 16 +++++++---------
 source/MaterialXGraphEditor/CMakeLists.txt |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d6a64d6b1..9d6519156e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ set(MATERIALX_BUILD_VERSION 9)
 set(MATERIALX_LIBRARY_VERSION ${MATERIALX_MAJOR_VERSION}.${MATERIALX_MINOR_VERSION}.${MATERIALX_BUILD_VERSION})
 
 # Cmake setup
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
 set(CMAKE_MACOSX_RPATH ON)
@@ -339,14 +339,12 @@ if(MATERIALX_BUILD_JS)
     add_subdirectory(source/JsMaterialX)
 endif()
 
-if(${CMAKE_VERSION} VERSION_GREATER "3.6.2")
-    if(MATERIALX_BUILD_VIEWER)
-        set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT MaterialXView)
-    elseif(MATERIALX_BUILD_GRAPH_EDITOR)
-        set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT MaterialXGraphEditor)
-    elseif(MATERIALX_BUILD_TESTS)
-        set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT MaterialXTest)
-    endif()
+if(MATERIALX_BUILD_VIEWER)
+    set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT MaterialXView)
+elseif(MATERIALX_BUILD_GRAPH_EDITOR)
+    set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT MaterialXGraphEditor)
+elseif(MATERIALX_BUILD_TESTS)
+    set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT MaterialXTest)
 endif()
 
 # Install root-level documents
diff --git a/source/MaterialXGraphEditor/CMakeLists.txt b/source/MaterialXGraphEditor/CMakeLists.txt
index 1785540bd8..f5f22be2c5 100644
--- a/source/MaterialXGraphEditor/CMakeLists.txt
+++ b/source/MaterialXGraphEditor/CMakeLists.txt
@@ -9,7 +9,7 @@ if (NOT IS_DIRECTORY "${DEAR_IMGUI_PREFIX}/backends")
 endif()
 
 if(MSVC)
-    add_compile_options(-wd4100)
+    add_compile_options(-wd4100 -wd4152 -wd4201 -wd4244 -wd4456)
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     add_compile_options(-Wno-unused -Wno-deprecated -Wno-comment -Wno-unused-variable)
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")

From b50dea8ef6c6eda52f7ecabafeb45272a48cfe11 Mon Sep 17 00:00:00 2001
From: Paul Molodowitch 
Date: Tue, 28 Nov 2023 15:57:50 -0800
Subject: [PATCH 40/66] Link to the OpenGL::GL target instead of
 OPENGL_LIBRARIES (#1603)

This prevents absolute paths from creeping into the output MaterialXConfig.cmake, which makes it not portable.

Also, in general in modern CMake, targets are preferred over baked paths. Additionally, at least on Linux,
${OPENGL_LIBRARIES} includes libGLU, which is not actually a required dependency
---
 source/MaterialXRenderGlsl/CMakeLists.txt | 11 ++++-------
 source/MaterialXRenderMsl/CMakeLists.txt  | 21 +++++++++------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/source/MaterialXRenderGlsl/CMakeLists.txt b/source/MaterialXRenderGlsl/CMakeLists.txt
index cb2f3c27c2..fdeae933b9 100644
--- a/source/MaterialXRenderGlsl/CMakeLists.txt
+++ b/source/MaterialXRenderGlsl/CMakeLists.txt
@@ -50,7 +50,8 @@ if(MATERIALX_BUILD_SHARED_LIBS)
     target_compile_definitions(${MATERIALX_MODULE_NAME} PUBLIC GLAD_GLAPI_EXPORT PRIVATE GLAD_GLAPI_EXPORT_BUILD)
 endif()
 
-set(COMMON_LIBRARIES
+target_link_libraries(
+    ${MATERIALX_MODULE_NAME}
     MaterialXRenderHw
     MaterialXGenGlsl
     ${CMAKE_DL_LIBS})
@@ -59,28 +60,24 @@ if(WIN32)
     if(MSVC)
         target_link_libraries(
             ${MATERIALX_MODULE_NAME}
-            ${COMMON_LIBRARIES}
             Opengl32)
     elseif(MINGW)
         target_link_libraries(
             ${MATERIALX_MODULE_NAME}
-            ${COMMON_LIBRARIES}
             Opengl32
             gdi32)
     endif()
 elseif(APPLE)
     target_link_libraries(
         ${MATERIALX_MODULE_NAME}
-        ${COMMON_LIBRARIES}
-        ${OPENGL_LIBRARIES}
+        OpenGL::GL
         "-framework Foundation"
         "-framework Cocoa"
         "-framework Metal")
 elseif(UNIX)
     target_link_libraries(
         ${MATERIALX_MODULE_NAME}
-        ${COMMON_LIBRARIES}
-        ${OPENGL_LIBRARIES}
+        OpenGL::GL
         ${X11_LIBRARIES}
         ${X11_Xt_LIB})
 endif()
diff --git a/source/MaterialXRenderMsl/CMakeLists.txt b/source/MaterialXRenderMsl/CMakeLists.txt
index 4d5e286463..3410ac7931 100644
--- a/source/MaterialXRenderMsl/CMakeLists.txt
+++ b/source/MaterialXRenderMsl/CMakeLists.txt
@@ -42,34 +42,31 @@ add_library(${MATERIALX_MODULE_NAME} ${materialx_source} ${materialx_headers})
 
 add_definitions(-DMATERIALX_RENDERMSL_EXPORTS)
 
-set(COMMON_LIBRARIES
+target_link_libraries(
+    ${MATERIALX_MODULE_NAME}
     MaterialXRenderHw
     MaterialXGenMsl
     ${CMAKE_DL_LIBS})
-    
-if(APPLE AND NOT MATERIALX_BUILD_IOS)
-set(COMMON_LIBRARIES
-    ${COMMON_LIBRARIES}
-    "-framework Cocoa")
-endif()
 
 if(MSVC)
     target_link_libraries(
         ${MATERIALX_MODULE_NAME}
-        ${COMMON_LIBRARIES}
         Opengl32)
 elseif(APPLE)
+    if(NOT MATERIALX_BUILD_IOS)
+        target_link_libraries(
+            ${MATERIALX_MODULE_NAME}
+            "-framework Cocoa"
+            OpenGL::GL)
+    endif()
     target_link_libraries(
         ${MATERIALX_MODULE_NAME}
-        ${COMMON_LIBRARIES}
-        ${OPENGL_LIBRARIES}
         "-framework Foundation"
         "-framework Metal")
 elseif(UNIX)
     target_link_libraries(
         ${MATERIALX_MODULE_NAME}
-        ${COMMON_LIBRARIES}
-        ${OPENGL_LIBRARIES}
+        OpenGL::GL
         ${X11_LIBRARIES}
         ${X11_Xt_LIB})
 endif()

From b8cc4de9122b5c08ffda70c31ccfef530fb68f6d Mon Sep 17 00:00:00 2001
From: Paul Molodowitch 
Date: Tue, 28 Nov 2023 16:32:55 -0800
Subject: [PATCH 41/66] Link to X11 targets instead of CMake variables (#1606)

This prevents absolute paths from creeping into the output MaterialXConfig.cmake, which makes it not portable.

Also, in general in modern CMake, targets are preferred over baked paths.
---
 source/MaterialXRenderGlsl/CMakeLists.txt | 4 ++--
 source/MaterialXRenderHw/CMakeLists.txt   | 4 ++--
 source/MaterialXRenderMsl/CMakeLists.txt  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/MaterialXRenderGlsl/CMakeLists.txt b/source/MaterialXRenderGlsl/CMakeLists.txt
index fdeae933b9..067cc5d016 100644
--- a/source/MaterialXRenderGlsl/CMakeLists.txt
+++ b/source/MaterialXRenderGlsl/CMakeLists.txt
@@ -78,8 +78,8 @@ elseif(UNIX)
     target_link_libraries(
         ${MATERIALX_MODULE_NAME}
         OpenGL::GL
-        ${X11_LIBRARIES}
-        ${X11_Xt_LIB})
+        X11::X11
+        X11::Xt)
 endif()
 
 set_target_properties(
diff --git a/source/MaterialXRenderHw/CMakeLists.txt b/source/MaterialXRenderHw/CMakeLists.txt
index dfd262a3ae..9efc26017c 100644
--- a/source/MaterialXRenderHw/CMakeLists.txt
+++ b/source/MaterialXRenderHw/CMakeLists.txt
@@ -57,8 +57,8 @@ elseif(UNIX)
         ${MATERIALX_MODULE_NAME}
         MaterialXRender
         ${CMAKE_DL_LIBS}
-        ${X11_LIBRARIES}
-        ${X11_Xt_LIB})
+        X11::X11
+        X11::Xt)
 endif()
 
 set_target_properties(
diff --git a/source/MaterialXRenderMsl/CMakeLists.txt b/source/MaterialXRenderMsl/CMakeLists.txt
index 3410ac7931..41e00d4b9f 100644
--- a/source/MaterialXRenderMsl/CMakeLists.txt
+++ b/source/MaterialXRenderMsl/CMakeLists.txt
@@ -67,8 +67,8 @@ elseif(UNIX)
     target_link_libraries(
         ${MATERIALX_MODULE_NAME}
         OpenGL::GL
-        ${X11_LIBRARIES}
-        ${X11_Xt_LIB})
+        X11::X11
+        X11::Xt)
 endif()
 
 set_target_properties(

From eb24c5ed9a524955604fe898a77c664225cb2a70 Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Tue, 28 Nov 2023 17:25:48 -0800
Subject: [PATCH 42/66] Improvements to build scripts

- Simplify CMake generation commands using the -S and -B options.
- Simplify the usage of CMAKE_EXPORT_COMPILE_COMMANDS in GitHub CI.
- Unify JavaScript build settings in the root-level CMakeLists.txt.
---
 .github/workflows/main.yml          | 11 +++--------
 CMakeLists.txt                      | 26 +++++++++++++++-----------
 javascript/build_javascript_win.bat |  8 +++-----
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index aeba7b2c45..0a71a31011 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -38,6 +38,7 @@ jobs:
           compiler_version: "13"
           python: 3.12
           static_analysis: ON
+          cmake_config: -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
 
         - name: Linux_GCC_CoverageAnalysis
           os: ubuntu-22.04
@@ -197,10 +198,7 @@ jobs:
       run: find source \( -name *.h -o -name *.cpp -o -name *.mm \) ! -path "*/External/*" ! -path "*/NanoGUI/*" | xargs clang-format -i --verbose
 
     - name: CMake Generate
-      run: |
-        mkdir build
-        cd build
-        cmake -DMATERIALX_BUILD_PYTHON=ON -DMATERIALX_BUILD_VIEWER=ON -DMATERIALX_BUILD_GRAPH_EDITOR=ON -DMATERIALX_TEST_RENDER=OFF -DMATERIALX_WARNINGS_AS_ERRORS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ${{matrix.cmake_config}} ..
+      run: cmake -S . -B build -DMATERIALX_BUILD_PYTHON=ON -DMATERIALX_BUILD_VIEWER=ON -DMATERIALX_BUILD_GRAPH_EDITOR=ON -DMATERIALX_TEST_RENDER=OFF -DMATERIALX_WARNINGS_AS_ERRORS=ON ${{matrix.cmake_config}}
 
     - name: CMake Build
       run: cmake --build . --target install --config Release --parallel 2
@@ -312,10 +310,7 @@ jobs:
 
     - name: JavaScript CMake Generate
       if: matrix.build_javascript == 'ON'
-      run: |
-        mkdir javascript/build
-        cd javascript/build
-        cmake -DMATERIALX_BUILD_JS=ON -DMATERIALX_EMSDK_PATH=${{ env.EMSDK }} -DMATERIALX_BUILD_RENDER=OFF -DMATERIALX_BUILD_TESTS=OFF -DMATERIALX_BUILD_GEN_OSL=OFF -DMATERIALX_BUILD_GEN_MDL=OFF ../..
+      run: cmake -S . -B javascript/build -DMATERIALX_BUILD_JS=ON -DMATERIALX_EMSDK_PATH=${{ env.EMSDK }}
 
     - name: JavaScript CMake Build
       if: matrix.build_javascript == 'ON'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d6519156e..c29565a7ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,13 +61,21 @@ option(MATERIALX_BUILD_IOS "Build MaterialX for iOS." OFF)
 if (MATERIALX_BUILD_IOS)
     set(CMAKE_SYSTEM_NAME iOS)
     add_definitions(-DTARGET_OS_IOS=1)
-    set(MATERIALX_BUILD_PYTHON        OFF)
-    set(MATERIALX_BUILD_VIEWER        OFF)
-    set(MATERIALX_BUILD_GRAPH_EDITOR  OFF)
-    set(MATERIALX_BUILD_GEN_GLSL      OFF)
-    set(MATERIALX_BUILD_GEN_OSL       OFF)
-    set(MATERIALX_BUILD_GEN_MDL       OFF)
-    set(MATERIALX_BUILD_TESTS         OFF)
+    set(MATERIALX_BUILD_PYTHON OFF)
+    set(MATERIALX_BUILD_VIEWER OFF)
+    set(MATERIALX_BUILD_GRAPH_EDITOR OFF)
+    set(MATERIALX_BUILD_GEN_GLSL OFF)
+    set(MATERIALX_BUILD_GEN_OSL OFF)
+    set(MATERIALX_BUILD_GEN_MDL OFF)
+    set(MATERIALX_BUILD_TESTS OFF)
+endif()
+
+if (MATERIALX_BUILD_JS)
+    set(MATERIALX_BUILD_GEN_OSL OFF)
+    set(MATERIALX_BUILD_GEN_MSL OFF)
+    set(MATERIALX_BUILD_GEN_MDL OFF)
+    set(MATERIALX_BUILD_RENDER OFF)
+    set(MATERIALX_BUILD_TESTS OFF)
 endif()
 
 set(MATERIALX_PYTHON_VERSION "" CACHE STRING
@@ -81,10 +89,6 @@ set(MATERIALX_PYTHON_PYBIND11_DIR "" CACHE PATH
 
 set(MATERIALX_OIIO_DIR "" CACHE PATH "Path to the root folder of the OpenImageIO installation.")
 
-if (MATERIALX_BUILD_JS)
-    set(MATERIALX_BUILD_GEN_GLSL ON)
-endif()
-
 # Settings to define installation layout
 set(MATERIALX_INSTALL_INCLUDE_PATH "include" CACHE STRING "Install header include path (e.g. 'inc', 'include').")
 set(MATERIALX_INSTALL_LIB_PATH "lib" CACHE STRING "Install lib path (e.g. 'libs', 'lib').")
diff --git a/javascript/build_javascript_win.bat b/javascript/build_javascript_win.bat
index 43d8b8b562..8b08c26600 100644
--- a/javascript/build_javascript_win.bat
+++ b/javascript/build_javascript_win.bat
@@ -8,14 +8,12 @@ if NOT ["%errorlevel%"]==["0"] pause
 @echo --------------------- Build MaterialX With JavaScript ---------------------
 @echo on
 cd %MATERIALX_LOCATION%
-mkdir javascript\build
-cd javascript\build
-cmake -DMATERIALX_BUILD_JS=ON -DMATERIALX_EMSDK_PATH=%EMSDK_LOCATION% -G Ninja -DMATERIALX_BUILD_RENDER=OFF -DMATERIALX_BUILD_TESTS=OFF -DMATERIALX_BUILD_GEN_OSL=OFF -DMATERIALX_BUILD_GEN_MDL=OFF ..\..
-cmake --build . --target install --config  RelWithDebInfo --parallel 2
+cmake -S . -B javascript/build -DMATERIALX_BUILD_JS=ON -DMATERIALX_EMSDK_PATH=%EMSDK_LOCATION% -G Ninja
+cmake --build javascript/build --target install --config RelWithDebInfo --parallel 2
 if NOT ["%errorlevel%"]==["0"] pause
 @echo --------------------- Run JavaScript Tests ---------------------
 @echo on
-cd ../MaterialXTest
+cd javascript/MaterialXTest
 call npm install
 call npm run test
 call npm run test:browser

From 61d4967f3307790aae7b5710eda5a44382c62680 Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Fri, 1 Dec 2023 08:33:15 -0800
Subject: [PATCH 43/66] Apply Clang formatting

This changelist applies Clang formatting to source files in the MaterialX codebase, and includes no functional changes.
---
 source/MaterialXCore/Definition.cpp           |  2 +-
 source/MaterialXFormat/Util.cpp               |  2 +-
 source/MaterialXFormat/Util.h                 |  2 +-
 .../MaterialXGenGlsl/GlslShaderGenerator.cpp  | 20 ++---
 source/MaterialXGenMdl/MdlShaderGenerator.cpp |  6 +-
 source/MaterialXGenMdl/MdlSyntax.cpp          |  2 +-
 .../Nodes/ClosureCompoundNodeMdl.cpp          |  2 +-
 .../Nodes/ClosureLayerNodeMdl.cpp             | 24 +++---
 .../Nodes/ClosureLayerNodeMdl.h               | 16 ++--
 source/MaterialXGenMsl/MslShaderGenerator.cpp |  2 +-
 source/MaterialXGenOsl/OslShaderGenerator.cpp |  2 +-
 .../MaterialXGenShader/HwShaderGenerator.cpp  |  4 +-
 .../Nodes/HwTransformNode.cpp                 |  2 +-
 source/MaterialXGenShader/ShaderGenerator.cpp |  2 +-
 source/MaterialXGenShader/ShaderGenerator.h   |  2 +-
 source/MaterialXGenShader/ShaderNode.cpp      |  2 +-
 source/MaterialXGenShader/ShaderStage.cpp     |  4 +-
 source/MaterialXGraphEditor/FileDialog.h      |  6 +-
 source/MaterialXGraphEditor/Graph.cpp         |  3 +-
 source/MaterialXGraphEditor/RenderView.cpp    |  4 +-
 source/MaterialXGraphEditor/UiNode.h          |  2 +-
 source/MaterialXRender/Camera.cpp             |  8 +-
 source/MaterialXRender/Camera.h               | 14 ++--
 source/MaterialXRender/CgltfLoader.cpp        | 13 ++-
 source/MaterialXRender/CgltfLoader.h          |  4 +-
 source/MaterialXRender/GeometryHandler.cpp    | 22 +++--
 source/MaterialXRender/GeometryHandler.h      |  2 +-
 source/MaterialXRender/Harmonics.cpp          |  3 +-
 source/MaterialXRender/Harmonics.h            |  3 +-
 source/MaterialXRender/ImageHandler.cpp       | 11 ++-
 source/MaterialXRender/ImageHandler.h         |  8 +-
 source/MaterialXRender/LightHandler.cpp       |  4 +-
 source/MaterialXRender/LightHandler.h         |  2 +-
 source/MaterialXRender/Mesh.cpp               | 25 +++---
 source/MaterialXRender/Mesh.h                 |  2 +-
 source/MaterialXRender/OiioImageLoader.cpp    |  6 +-
 source/MaterialXRender/OiioImageLoader.h      |  6 +-
 source/MaterialXRender/ShaderMaterial.cpp     | 10 +--
 source/MaterialXRender/ShaderMaterial.h       |  4 +-
 source/MaterialXRender/ShaderRenderer.h       |  6 +-
 source/MaterialXRender/StbImageLoader.cpp     |  8 +-
 source/MaterialXRender/StbImageLoader.h       |  2 +-
 source/MaterialXRender/TextureBaker.h         | 10 +--
 source/MaterialXRender/TextureBaker.inl       | 83 +++++++++----------
 source/MaterialXRender/TinyObjLoader.cpp      |  8 +-
 source/MaterialXRender/TinyObjLoader.h        |  2 +-
 source/MaterialXRender/Types.h                |  6 +-
 source/MaterialXRender/Util.h                 | 22 ++---
 source/MaterialXRenderGlsl/GLFramebuffer.cpp  | 54 ++++++------
 source/MaterialXRenderGlsl/GLTextureHandler.h |  2 +-
 source/MaterialXRenderGlsl/GlslMaterial.cpp   |  2 +-
 source/MaterialXRenderGlsl/GlslMaterial.h     |  5 +-
 source/MaterialXRenderGlsl/GlslProgram.cpp    | 25 +++---
 source/MaterialXRenderGlsl/GlslProgram.h      |  2 +-
 source/MaterialXRenderGlsl/GlslRenderer.h     |  2 +-
 source/MaterialXRenderGlsl/TextureBaker.h     |  2 +-
 source/MaterialXRenderHw/SimpleWindow.h       |  4 +-
 .../MaterialXRenderHw/SimpleWindowLinux.cpp   |  6 +-
 .../MaterialXRenderHw/SimpleWindowWindows.cpp | 40 ++++-----
 source/MaterialXView/Editor.cpp               | 58 ++++++-------
 source/MaterialXView/Editor.h                 |  4 +-
 source/MaterialXView/Main.cpp                 | 72 ++++++++--------
 source/MaterialXView/RenderPipeline.h         | 12 +--
 63 files changed, 347 insertions(+), 348 deletions(-)

diff --git a/source/MaterialXCore/Definition.cpp b/source/MaterialXCore/Definition.cpp
index cf9587ecda..c3150e2a87 100644
--- a/source/MaterialXCore/Definition.cpp
+++ b/source/MaterialXCore/Definition.cpp
@@ -84,7 +84,7 @@ InterfaceElementPtr NodeDef::getImplementation(const string& target) const
             }
         }
     }
-    
+
     // Then search for a generic match.
     for (InterfaceElementPtr interface : interfaces)
     {
diff --git a/source/MaterialXFormat/Util.cpp b/source/MaterialXFormat/Util.cpp
index 32feda4d0d..48ded1d6b1 100644
--- a/source/MaterialXFormat/Util.cpp
+++ b/source/MaterialXFormat/Util.cpp
@@ -234,7 +234,7 @@ FileSearchPath getDefaultDataSearchPath()
         }
         currentPath = currentPath.getParentPath();
     }
-    return FileSearchPath();    
+    return FileSearchPath();
 }
 
 MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXFormat/Util.h b/source/MaterialXFormat/Util.h
index 46f55c41ee..c7ef0c6d38 100644
--- a/source/MaterialXFormat/Util.h
+++ b/source/MaterialXFormat/Util.h
@@ -62,7 +62,7 @@ MX_FORMAT_API FileSearchPath getSourceSearchPath(ConstDocumentPtr doc);
 
 /// Return a file search path to the default data library folder.
 /// The module path and all parent paths are examined to until either there is
-/// no parent or the library folder is found. 
+/// no parent or the library folder is found.
 MX_FORMAT_API FileSearchPath getDefaultDataSearchPath();
 
 MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
index ec5e48d4ec..ea78e1bee3 100644
--- a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
+++ b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
@@ -56,17 +56,17 @@ GlslShaderGenerator::GlslShaderGenerator() :
     //
 
     StringVec elementNames;
-    
+
     // 
     elementNames = {
         // 
-        "IM_switch_float_"   + GlslShaderGenerator::TARGET,
-        "IM_switch_color3_"  + GlslShaderGenerator::TARGET,
-        "IM_switch_color4_"  + GlslShaderGenerator::TARGET,
+        "IM_switch_float_" + GlslShaderGenerator::TARGET,
+        "IM_switch_color3_" + GlslShaderGenerator::TARGET,
+        "IM_switch_color4_" + GlslShaderGenerator::TARGET,
         "IM_switch_vector2_" + GlslShaderGenerator::TARGET,
         "IM_switch_vector3_" + GlslShaderGenerator::TARGET,
         "IM_switch_vector4_" + GlslShaderGenerator::TARGET,
-        
+
         // 
         "IM_switch_floatI_" + GlslShaderGenerator::TARGET,
         "IM_switch_color3I_" + GlslShaderGenerator::TARGET,
@@ -85,7 +85,7 @@ GlslShaderGenerator::GlslShaderGenerator() :
         "IM_swizzle_float_vector2_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_float_vector3_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_float_vector4_" + GlslShaderGenerator::TARGET,
-        
+
         // 
         "IM_swizzle_color3_float_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_color3_color3_" + GlslShaderGenerator::TARGET,
@@ -93,7 +93,7 @@ GlslShaderGenerator::GlslShaderGenerator() :
         "IM_swizzle_color3_vector2_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_color3_vector3_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_color3_vector4_" + GlslShaderGenerator::TARGET,
-        
+
         // 
         "IM_swizzle_color4_float_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_color4_color3_" + GlslShaderGenerator::TARGET,
@@ -101,7 +101,7 @@ GlslShaderGenerator::GlslShaderGenerator() :
         "IM_swizzle_color4_vector2_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_color4_vector3_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_color4_vector4_" + GlslShaderGenerator::TARGET,
-        
+
         // 
         "IM_swizzle_vector2_float_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_vector2_color3_" + GlslShaderGenerator::TARGET,
@@ -109,7 +109,7 @@ GlslShaderGenerator::GlslShaderGenerator() :
         "IM_swizzle_vector2_vector2_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_vector2_vector3_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_vector2_vector4_" + GlslShaderGenerator::TARGET,
-        
+
         // 
         "IM_swizzle_vector3_float_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_vector3_color3_" + GlslShaderGenerator::TARGET,
@@ -117,7 +117,7 @@ GlslShaderGenerator::GlslShaderGenerator() :
         "IM_swizzle_vector3_vector2_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_vector3_vector3_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_vector3_vector4_" + GlslShaderGenerator::TARGET,
-        
+
         // 
         "IM_swizzle_vector4_float_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_vector4_color3_" + GlslShaderGenerator::TARGET,
diff --git a/source/MaterialXGenMdl/MdlShaderGenerator.cpp b/source/MaterialXGenMdl/MdlShaderGenerator.cpp
index e10d586d69..af75a2cef4 100644
--- a/source/MaterialXGenMdl/MdlShaderGenerator.cpp
+++ b/source/MaterialXGenMdl/MdlShaderGenerator.cpp
@@ -291,9 +291,9 @@ ShaderPtr MdlShaderGenerator::generate(const string& name, ElementPtr element, G
         {
             emitLine("float3 displacement__ = " + result + ".geometry.displacement", stage);
             emitLine("color finalOutput__ = mk_color3("
-                "r: math::dot(displacement__, state::texture_tangent_u(0)),"
-                "g: math::dot(displacement__, state::texture_tangent_v(0)),"
-                "b: math::dot(displacement__, state::normal()))", stage);
+                     "r: math::dot(displacement__, state::texture_tangent_u(0)),"
+                     "g: math::dot(displacement__, state::texture_tangent_v(0)),"
+                     "b: math::dot(displacement__, state::normal()))", stage);
         }
         else
         {
diff --git a/source/MaterialXGenMdl/MdlSyntax.cpp b/source/MaterialXGenMdl/MdlSyntax.cpp
index 9d5483bcca..7560297ce4 100644
--- a/source/MaterialXGenMdl/MdlSyntax.cpp
+++ b/source/MaterialXGenMdl/MdlSyntax.cpp
@@ -48,7 +48,7 @@ class MdlFilenameTypeSyntax : public ScalarTypeSyntax
         // assuming it ends with a slash ...
         if (outputValue.back() == '/')
         {
-             return getDefaultValue(true);
+            return getDefaultValue(true);
         }
         // ... or the last segment does not have an extension suffix
         size_t idx_s = outputValue.find_last_of('/');
diff --git a/source/MaterialXGenMdl/Nodes/ClosureCompoundNodeMdl.cpp b/source/MaterialXGenMdl/Nodes/ClosureCompoundNodeMdl.cpp
index e175696d55..0a2004cd71 100644
--- a/source/MaterialXGenMdl/Nodes/ClosureCompoundNodeMdl.cpp
+++ b/source/MaterialXGenMdl/Nodes/ClosureCompoundNodeMdl.cpp
@@ -41,7 +41,7 @@ void ClosureCompoundNodeMdl::emitFunctionDefinition(const ShaderNode& node, GenC
             {
                 if (!outputSocket->getConnection())
                     continue;
-        
+
                 const ShaderNode* upstream = outputSocket->getConnection()->getNode();
                 const bool isMaterialExpr = (upstream->hasClassification(ShaderNode::Classification::CLOSURE) ||
                                              upstream->hasClassification(ShaderNode::Classification::SHADER));
diff --git a/source/MaterialXGenMdl/Nodes/ClosureLayerNodeMdl.cpp b/source/MaterialXGenMdl/Nodes/ClosureLayerNodeMdl.cpp
index fd27d5e547..bff1351142 100644
--- a/source/MaterialXGenMdl/Nodes/ClosureLayerNodeMdl.cpp
+++ b/source/MaterialXGenMdl/Nodes/ClosureLayerNodeMdl.cpp
@@ -368,12 +368,12 @@ const string& MixBsdfNodeMdl::getOperatorName(size_t index) const
 {
     switch (index)
     {
-    case 0:
-        return StringConstantsMdl::FG;
-    case 1:
-        return StringConstantsMdl::BG;
-    default:
-        return StringConstantsMdl::EMPTY;
+        case 0:
+            return StringConstantsMdl::FG;
+        case 1:
+            return StringConstantsMdl::BG;
+        default:
+            return StringConstantsMdl::EMPTY;
     }
 }
 
@@ -386,12 +386,12 @@ const string& AddOrMultiplyBsdfNodeMdl::getOperatorName(size_t index) const
 {
     switch (index)
     {
-    case 0:
-        return StringConstantsMdl::IN1;
-    case 1:
-        return StringConstantsMdl::IN2;
-    default:
-        return StringConstantsMdl::EMPTY;
+        case 0:
+            return StringConstantsMdl::IN1;
+        case 1:
+            return StringConstantsMdl::IN2;
+        default:
+            return StringConstantsMdl::EMPTY;
     }
 }
 
diff --git a/source/MaterialXGenMdl/Nodes/ClosureLayerNodeMdl.h b/source/MaterialXGenMdl/Nodes/ClosureLayerNodeMdl.h
index 75ea46046c..95c51198f8 100644
--- a/source/MaterialXGenMdl/Nodes/ClosureLayerNodeMdl.h
+++ b/source/MaterialXGenMdl/Nodes/ClosureLayerNodeMdl.h
@@ -21,18 +21,18 @@ class MX_GENMDL_API StringConstantsMdl
 
   public:
     /// String constants
-    static const string TOP; ///< layer parameter name of the top component
+    static const string TOP;  ///< layer parameter name of the top component
     static const string BASE; ///< layer parameter name of the base component
-    static const string FG; ///< parameter of the mix node
-    static const string BG; ///< parameter of the mix node
-    static const string IN1; ///< parameter of the add and multiply nodes
-    static const string IN2; ///< parameter of the add and multiply nodes
+    static const string FG;   ///< parameter of the mix node
+    static const string BG;   ///< parameter of the mix node
+    static const string IN1;  ///< parameter of the add and multiply nodes
+    static const string IN2;  ///< parameter of the add and multiply nodes
 
     static const string THICKNESS; ///< thickness parameter name of the thin_film_bsdf
-    static const string IOR; ///< ior parameter name of the thin_film_bsdf
+    static const string IOR;       ///< ior parameter name of the thin_film_bsdf
 
     static const string THIN_FILM_THICKNESS; ///< helper parameter name for transporting thickness
-    static const string THIN_FILM_IOR; ///< helper parameter name for transporting ior
+    static const string THIN_FILM_IOR;       ///< helper parameter name for transporting ior
 
     static const string EMPTY; ///< the empty string ""
 };
@@ -41,7 +41,7 @@ class MX_GENMDL_API StringConstantsMdl
 /// thin_film_bsdf through layers and mixers, etc., to the elemental bsdfs that support thin film.
 /// Because thin-film can not be layered on any BSDF in MDL, we try to push down the parameters to
 /// the nodes that support thin-film.
-template class CarryThinFilmParameters : public TBase
+template  class CarryThinFilmParameters : public TBase
 {
   public:
     /// Add the thin film inputs for transporting the parameter.
diff --git a/source/MaterialXGenMsl/MslShaderGenerator.cpp b/source/MaterialXGenMsl/MslShaderGenerator.cpp
index ea3fb7112d..7fe50fef4a 100644
--- a/source/MaterialXGenMsl/MslShaderGenerator.cpp
+++ b/source/MaterialXGenMsl/MslShaderGenerator.cpp
@@ -1018,7 +1018,7 @@ void MslShaderGenerator::emitPixelStage(const ShaderGraph& graph, GenContext& co
             emitLightData(context, stage);
         }
     }
-    
+
     bool needsLightBuffer = lighting && context.getOptions().hwMaxActiveLightSources > 0;
 
     emitMathMatrixScalarMathOperators(context, stage);
diff --git a/source/MaterialXGenOsl/OslShaderGenerator.cpp b/source/MaterialXGenOsl/OslShaderGenerator.cpp
index fbb2bb29be..f16770174b 100644
--- a/source/MaterialXGenOsl/OslShaderGenerator.cpp
+++ b/source/MaterialXGenOsl/OslShaderGenerator.cpp
@@ -536,7 +536,7 @@ void OslShaderGenerator::emitShaderInputs(const VariableBlock& inputs, ShaderSta
             // which is a struct containing a file string and a colorspace string.
             // For the published shader interface we here split this into two separate inputs,
             // which gives a nicer shader interface with widget metadata on each input.
-            
+
             ValuePtr value = input->getValue();
             const string valueStr = value ? value->getValueString() : EMPTY_STRING;
 
diff --git a/source/MaterialXGenShader/HwShaderGenerator.cpp b/source/MaterialXGenShader/HwShaderGenerator.cpp
index 568c666478..0db78eda27 100644
--- a/source/MaterialXGenShader/HwShaderGenerator.cpp
+++ b/source/MaterialXGenShader/HwShaderGenerator.cpp
@@ -260,9 +260,9 @@ ShaderPtr HwShaderGenerator::createShader(const string& name, ElementPtr element
             if (geomprop)
             {
                 // A default geomprop was assigned to this graph input.
-                // For all internal connections to this input, break the connection 
+                // For all internal connections to this input, break the connection
                 // and assign a geomprop node that generates this data.
-                // Note: If a geomprop node exists already it is reused, 
+                // Note: If a geomprop node exists already it is reused,
                 // so only a single node per geometry type is created.
                 ShaderInputVec connections = socket->getConnections();
                 for (auto connection : connections)
diff --git a/source/MaterialXGenShader/Nodes/HwTransformNode.cpp b/source/MaterialXGenShader/Nodes/HwTransformNode.cpp
index 018924855d..76394309af 100644
--- a/source/MaterialXGenShader/Nodes/HwTransformNode.cpp
+++ b/source/MaterialXGenShader/Nodes/HwTransformNode.cpp
@@ -17,7 +17,7 @@ const string HwTransformNode::WORLD = "world";
 
 void HwTransformNode::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
 {
-    const string toSpace   = getToSpace(node);
+    const string toSpace = getToSpace(node);
     const string fromSpace = getFromSpace(node);
     const string& matrix = getMatrix(fromSpace, toSpace);
     if (!matrix.empty())
diff --git a/source/MaterialXGenShader/ShaderGenerator.cpp b/source/MaterialXGenShader/ShaderGenerator.cpp
index 177201a9e3..d5f51aed1c 100644
--- a/source/MaterialXGenShader/ShaderGenerator.cpp
+++ b/source/MaterialXGenShader/ShaderGenerator.cpp
@@ -270,7 +270,7 @@ void ShaderGenerator::registerImplementation(const string& name, CreatorFunction
 
 void ShaderGenerator::registerImplementation(const StringVec& nameVec, CreatorFunction creator)
 {
-    for(const string& name : nameVec)
+    for (const string& name : nameVec)
     {
         _implFactory.registerClass(name, creator);
     }
diff --git a/source/MaterialXGenShader/ShaderGenerator.h b/source/MaterialXGenShader/ShaderGenerator.h
index 8e7f9855de..fa60a4d63e 100644
--- a/source/MaterialXGenShader/ShaderGenerator.h
+++ b/source/MaterialXGenShader/ShaderGenerator.h
@@ -151,7 +151,7 @@ class MX_GENSHADER_API ShaderGenerator
 
     /// Register a shader node implementation for a given implementation element name
     void registerImplementation(const string& name, CreatorFunction creator);
-    
+
     /// Register a shader node implementation for a given set of implementation element names
     void registerImplementation(const StringVec& nameVec, CreatorFunction creator);
 
diff --git a/source/MaterialXGenShader/ShaderNode.cpp b/source/MaterialXGenShader/ShaderNode.cpp
index 3e393178f1..9ef5b0789a 100644
--- a/source/MaterialXGenShader/ShaderNode.cpp
+++ b/source/MaterialXGenShader/ShaderNode.cpp
@@ -290,7 +290,7 @@ ShaderNodePtr ShaderNode::create(const ShaderGraph* parent, const string& name,
     else if (nodeDef.getNodeString() == CONSTANT)
     {
         newNode->_classification = Classification::TEXTURE | Classification::CONSTANT;
-    }    
+    }
     else if (nodeDef.getNodeString() == DOT)
     {
         newNode->_classification = Classification::TEXTURE | Classification::DOT;
diff --git a/source/MaterialXGenShader/ShaderStage.cpp b/source/MaterialXGenShader/ShaderStage.cpp
index b5387bcb94..d304c22dd2 100644
--- a/source/MaterialXGenShader/ShaderStage.cpp
+++ b/source/MaterialXGenShader/ShaderStage.cpp
@@ -82,8 +82,8 @@ ShaderPort* VariableBlock::add(const TypeDesc* type, const string& name, ValuePt
         else if (type != it->second->getType())
         {
             throw ExceptionShaderGenError("Trying to add shader port '" + name + "' with type '" +
-                type->getName() + "', but existing shader port with type '" +
-                it->second->getType()->getName() + "' was found");
+                                          type->getName() + "', but existing shader port with type '" +
+                                          it->second->getType()->getName() + "' was found");
         }
         return it->second.get();
     }
diff --git a/source/MaterialXGraphEditor/FileDialog.h b/source/MaterialXGraphEditor/FileDialog.h
index 49b905f28c..4b6c042ef8 100644
--- a/source/MaterialXGraphEditor/FileDialog.h
+++ b/source/MaterialXGraphEditor/FileDialog.h
@@ -16,9 +16,9 @@ class FileDialog
   public:
     enum Flags
     {
-        SelectDirectory   = 1 << 0, // select directory instead of regular file
-        EnterNewFilename  = 1 << 1, // allow user to enter new filename when selecting regular file
-        NoTitleBar        = 1 << 2, // hide window title bar
+        SelectDirectory = 1 << 0,  // select directory instead of regular file
+        EnterNewFilename = 1 << 1, // allow user to enter new filename when selecting regular file
+        NoTitleBar = 1 << 2,       // hide window title bar
     };
 
   public:
diff --git a/source/MaterialXGraphEditor/Graph.cpp b/source/MaterialXGraphEditor/Graph.cpp
index bab5df7b58..fc682e8f05 100644
--- a/source/MaterialXGraphEditor/Graph.cpp
+++ b/source/MaterialXGraphEditor/Graph.cpp
@@ -2620,7 +2620,6 @@ void Graph::addLink(ed::PinId startPinId, ed::PinId endPinId)
                     break;
                 }
             }
-
         }
 
         // Since we accepted new link, lets add one to our list of links.
@@ -3668,7 +3667,7 @@ void Graph::addNodePopup(bool cursor)
         // Filter extra nodes - includes inputs, outputs, groups, and node graphs
         const std::string NODEGRAPH_ENTRY = "Node Graph";
 
-         // Filter nodedefs and add to menu if matches filter
+        // Filter nodedefs and add to menu if matches filter
         for (auto node : _nodesToAdd)
         {
             // Filter out list of nodes
diff --git a/source/MaterialXGraphEditor/RenderView.cpp b/source/MaterialXGraphEditor/RenderView.cpp
index d2967e6b85..3c2e01dff9 100644
--- a/source/MaterialXGraphEditor/RenderView.cpp
+++ b/source/MaterialXGraphEditor/RenderView.cpp
@@ -299,7 +299,7 @@ void RenderView::loadMesh(const mx::FilePath& filename)
         _cameraTarget = mx::Vector3();
 
         initCamera();
-    
+
         if (_shadowMap)
         {
             _imageHandler->releaseRenderResources(_shadowMap);
@@ -848,7 +848,7 @@ void RenderView::initCamera()
 {
     _viewCamera->setViewportSize(mx::Vector2((float) _viewWidth, (float) _viewHeight));
 
-    if ( _geometryHandler->getMeshes().empty())
+    if (_geometryHandler->getMeshes().empty())
     {
         return;
     }
diff --git a/source/MaterialXGraphEditor/UiNode.h b/source/MaterialXGraphEditor/UiNode.h
index cf7aa41e28..06d0281676 100644
--- a/source/MaterialXGraphEditor/UiNode.h
+++ b/source/MaterialXGraphEditor/UiNode.h
@@ -101,7 +101,7 @@ class UiPin
         {
             if (_connections[i]->_pinId == pin->_pinId)
             {
-                _connections.erase(_connections.begin()+i);
+                _connections.erase(_connections.begin() + i);
             }
         }
         for (size_t i = 0; i < pin->_connections.size(); i++)
diff --git a/source/MaterialXRender/Camera.cpp b/source/MaterialXRender/Camera.cpp
index 6464246e3a..7b9579376c 100644
--- a/source/MaterialXRender/Camera.cpp
+++ b/source/MaterialXRender/Camera.cpp
@@ -23,8 +23,8 @@ Matrix44 Camera::createViewMatrix(const Vector3& eye,
 }
 
 Matrix44 Camera::createPerspectiveMatrixZP(float left, float right,
-                                         float bottom, float top,
-                                         float nearP, float farP)
+                                           float bottom, float top,
+                                           float nearP, float farP)
 {
     return Matrix44(
         (2.0f * nearP) / (right - left), 0.0f, (right + left) / (right - left), 0.0f,
@@ -34,8 +34,8 @@ Matrix44 Camera::createPerspectiveMatrixZP(float left, float right,
 }
 
 Matrix44 Camera::createOrthographicMatrixZP(float left, float right,
-                                          float bottom, float top,
-                                          float nearP, float farP)
+                                            float bottom, float top,
+                                            float nearP, float farP)
 {
     return Matrix44(
         2.0f / (right - left), 0.0f, 0.0f, 0.0f,
diff --git a/source/MaterialXRender/Camera.h b/source/MaterialXRender/Camera.h
index a20c0f0e70..3135904b5a 100644
--- a/source/MaterialXRender/Camera.h
+++ b/source/MaterialXRender/Camera.h
@@ -163,17 +163,17 @@ class MX_RENDER_API Camera
     static Matrix44 createOrthographicMatrix(float left, float right,
                                              float bottom, float top,
                                              float nearP, float farP);
-    
+
     /// Create a perpective projection matrix given a set of clip planes with [0,1] projected Z.
     static Matrix44 createPerspectiveMatrixZP(float left, float right,
-                                            float bottom, float top,
-                                            float nearP, float farP);
+                                              float bottom, float top,
+                                              float nearP, float farP);
 
     /// Create an orthographic projection matrix given a set of clip planes with [0,1] projected Z.
     static Matrix44 createOrthographicMatrixZP(float left, float right,
-                                             float bottom, float top,
-                                             float nearP, float farP);
- 
+                                               float bottom, float top,
+                                               float nearP, float farP);
+
     /// Apply a perspective transform to the given 3D point, performing a
     /// homogeneous divide on the transformed result.
     static Vector3 transformPointPerspective(const Matrix44& m, const Vector3& v)
@@ -185,7 +185,7 @@ class MX_RENDER_API Camera
     /// @}
 
   protected:
-    // Transform matrices 
+    // Transform matrices
     Matrix44 _worldMatrix;
     Matrix44 _viewMatrix;
     Matrix44 _projectionMatrix;
diff --git a/source/MaterialXRender/CgltfLoader.cpp b/source/MaterialXRender/CgltfLoader.cpp
index 1c8ec598a6..fcc8831732 100644
--- a/source/MaterialXRender/CgltfLoader.cpp
+++ b/source/MaterialXRender/CgltfLoader.cpp
@@ -59,7 +59,7 @@ void computeMeshMatrices(GLTFMeshMatrixList& meshMatrices, cgltf_node* cnode)
     }
 
     // Iterate over all children. Note that the existence of a mesh
-    // does not imply that this is a leaf node so traversal should 
+    // does not imply that this is a leaf node so traversal should
     // continue even when a mesh is encountered.
     for (cgltf_size i = 0; i < cnode->children_count; i++)
     {
@@ -76,7 +76,7 @@ using GLTFMeshPathList = std::unordered_map;
 void computeMeshPaths(GLTFMeshPathList& meshPaths, cgltf_node* cnode, FilePath path, size_t nodeCount, size_t meshCount)
 {
     string cnodeName = cnode->name ? string(cnode->name) : DEFAULT_NODE_PREFIX + std::to_string(nodeCount++);
-    path = path / ( createValidName(cnodeName) + "/" );
+    path = path / (createValidName(cnodeName) + "/");
 
     cgltf_mesh* cmesh = cnode->mesh;
     if (cmesh)
@@ -92,7 +92,7 @@ void computeMeshPaths(GLTFMeshPathList& meshPaths, cgltf_node* cnode, FilePath p
     }
 
     // Iterate over all children. Note that the existence of a mesh
-    // does not imply that this is a leaf node so traversal should 
+    // does not imply that this is a leaf node so traversal should
     // continue even when a mesh is encountered.
     for (cgltf_size i = 0; i < cnode->children_count; i++)
     {
@@ -220,11 +220,11 @@ bool CgltfLoader::load(const FilePath& filePath, MeshList& meshList, bool texcoo
         }
 
         // Iterate through all parent transform
-        for (size_t mtx=0; mtx < positionMatrices.size(); mtx++)
+        for (size_t mtx = 0; mtx < positionMatrices.size(); mtx++)
         {
             const Matrix44& positionMatrix = positionMatrices[mtx];
             const Matrix44 normalMatrix = positionMatrix.getInverse().getTranspose();
-            
+
             for (cgltf_size primitiveIndex = 0; primitiveIndex < cmesh->primitives_count; ++primitiveIndex)
             {
                 cgltf_primitive* primitive = &cmesh->primitives[primitiveIndex];
@@ -347,8 +347,7 @@ bool CgltfLoader::load(const FilePath& filePath, MeshList& meshList, bool texcoo
                     else
                     {
                         if (_debugLevel > 0)
-                            std::cout << "Unknown stream type: " << std::to_string(attribute->type)
-                            << std::endl;
+                            std::cout << "Unknown stream type: " << std::to_string(attribute->type) << std::endl;
                     }
 
                     // Fill in stream
diff --git a/source/MaterialXRender/CgltfLoader.h b/source/MaterialXRender/CgltfLoader.h
index 4f4a7145ba..fb63cb6102 100644
--- a/source/MaterialXRender/CgltfLoader.h
+++ b/source/MaterialXRender/CgltfLoader.h
@@ -6,7 +6,7 @@
 #ifndef MATERIALX_CGLTFLOADER_H
 #define MATERIALX_CGLTFLOADER_H
 
-/// @file 
+/// @file
 /// GLTF format loader using the Cgltf library
 
 #include 
@@ -32,7 +32,7 @@ class MX_RENDER_API CgltfLoader : public GeometryLoader
     static CgltfLoaderPtr create() { return std::make_shared(); }
 
     /// Load geometry from file path
-    bool load(const FilePath& filePath, MeshList& meshList, bool texcoordVerticalFlip=false) override;
+    bool load(const FilePath& filePath, MeshList& meshList, bool texcoordVerticalFlip = false) override;
 
   private:
     unsigned int _debugLevel;
diff --git a/source/MaterialXRender/GeometryHandler.cpp b/source/MaterialXRender/GeometryHandler.cpp
index e2c974a767..dfea0b2ceb 100644
--- a/source/MaterialXRender/GeometryHandler.cpp
+++ b/source/MaterialXRender/GeometryHandler.cpp
@@ -89,7 +89,7 @@ bool GeometryHandler::loadGeometry(const FilePath& filePath, bool texcoordVertic
 
     bool loaded = false;
 
-    std::pair  range;
+    std::pair range;
     string extension = filePath.getExtension();
     range = _geometryLoaders.equal_range(extension);
     GeometryLoaderMap::iterator first = --range.second;
@@ -140,19 +140,17 @@ MeshPtr GeometryHandler::createQuadMesh(const Vector2& uvMin, const Vector2& uvM
     quadTexCoords->setStride(MeshStream::STRIDE_2D);
     if (!flipTexCoordsHorizontally)
     {
-        quadTexCoords->getData().assign({
-            uvMax[0], uvMax[1],
-            uvMax[0], uvMin[1],
-            uvMin[0], uvMin[1],
-            uvMin[0], uvMax[1] });
+        quadTexCoords->getData().assign({ uvMax[0], uvMax[1],
+                                          uvMax[0], uvMin[1],
+                                          uvMin[0], uvMin[1],
+                                          uvMin[0], uvMax[1] });
     }
     else
     {
-        quadTexCoords->getData().assign({
-            uvMax[0], uvMin[1],
-            uvMax[0], uvMax[1],
-            uvMin[0], uvMax[1],
-            uvMin[0], uvMin[1] });
+        quadTexCoords->getData().assign({ uvMax[0], uvMin[1],
+                                          uvMax[0], uvMax[1],
+                                          uvMin[0], uvMax[1],
+                                          uvMin[0], uvMin[1] });
     }
     MeshPartitionPtr quadIndices = MeshPartition::create();
     quadIndices->getIndices().assign({ 0, 1, 3, 1, 2, 3 });
@@ -161,7 +159,7 @@ MeshPtr GeometryHandler::createQuadMesh(const Vector2& uvMin, const Vector2& uvM
     quadMesh->addStream(quadPositions);
     quadMesh->addStream(quadTexCoords);
     quadMesh->addPartition(quadIndices);
-    
+
     return quadMesh;
 }
 
diff --git a/source/MaterialXRender/GeometryHandler.h b/source/MaterialXRender/GeometryHandler.h
index 0022487602..5dfc561e0e 100644
--- a/source/MaterialXRender/GeometryHandler.h
+++ b/source/MaterialXRender/GeometryHandler.h
@@ -121,7 +121,7 @@ class MX_RENDER_API GeometryHandler
     static MeshPtr createQuadMesh(const Vector2& uvMin = Vector2(0.0f, 0.0f),
                                   const Vector2& uvMax = Vector2(1.0f, 1.0f),
                                   bool flipTexCoordsHorizontally = false);
-    
+
   protected:
     // Recompute bounds for all stored geometry
     void computeBounds();
diff --git a/source/MaterialXRender/Harmonics.cpp b/source/MaterialXRender/Harmonics.cpp
index daf6a59d10..3d5c9d0a1d 100644
--- a/source/MaterialXRender/Harmonics.cpp
+++ b/source/MaterialXRender/Harmonics.cpp
@@ -9,7 +9,8 @@
 
 MATERIALX_NAMESPACE_BEGIN
 
-namespace {
+namespace
+{
 
 const double PI = std::acos(-1.0);
 
diff --git a/source/MaterialXRender/Harmonics.h b/source/MaterialXRender/Harmonics.h
index 10d5f81e49..f51991361a 100644
--- a/source/MaterialXRender/Harmonics.h
+++ b/source/MaterialXRender/Harmonics.h
@@ -27,7 +27,8 @@ template  class ShCoeffs
 
   public:
     ShCoeffs() = default;
-    explicit ShCoeffs(const std::array& arr) : _arr(arr) { }
+    explicit ShCoeffs(const std::array& arr) :
+        _arr(arr) { }
 
     /// @name Comparison Operators
     /// @{
diff --git a/source/MaterialXRender/ImageHandler.cpp b/source/MaterialXRender/ImageHandler.cpp
index d54a18fedd..2d56207f32 100644
--- a/source/MaterialXRender/ImageHandler.cpp
+++ b/source/MaterialXRender/ImageHandler.cpp
@@ -306,12 +306,11 @@ void ImageSamplingProperties::setProperties(const string& fileNameUniform,
 
 bool ImageSamplingProperties::operator==(const ImageSamplingProperties& r) const
 {
-    return
-      (enableMipmaps == r.enableMipmaps &&
-       uaddressMode  == r.uaddressMode  &&
-       vaddressMode  == r.vaddressMode  &&
-       filterType    == r.filterType    &&
-       defaultColor  == r.defaultColor)  ;
+    return (enableMipmaps == r.enableMipmaps &&
+            uaddressMode == r.uaddressMode &&
+            vaddressMode == r.vaddressMode &&
+            filterType == r.filterType &&
+            defaultColor == r.defaultColor);
 }
 
 MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXRender/ImageHandler.h b/source/MaterialXRender/ImageHandler.h
index fafc021857..e8eaf99b2f 100644
--- a/source/MaterialXRender/ImageHandler.h
+++ b/source/MaterialXRender/ImageHandler.h
@@ -35,7 +35,7 @@ using ImageHandlerPtr = std::shared_ptr;
 using ImageLoaderPtr = std::shared_ptr;
 
 /// Map from strings to vectors of image loaders
-using ImageLoaderMap = std::unordered_map< string, std::vector >;
+using ImageLoaderMap = std::unordered_map>;
 
 /// @class ImageSamplingProperties
 /// Interface to describe sampling properties for images.
@@ -48,16 +48,16 @@ class MX_RENDER_API ImageSamplingProperties
     /// @param uniformBlock Block containing sampler uniforms
     void setProperties(const string& fileNameUniform,
                        const VariableBlock& uniformBlock);
-    
+
     bool operator==(const ImageSamplingProperties& r) const;
 
     /// Address mode options. Matches enumerations allowed for image address
     /// modes, except UNSPECIFIED which indicates no explicit mode was defined.
     enum class AddressMode : int
-    { 
+    {
         UNSPECIFIED = -1,
         CONSTANT = 0,
-        CLAMP = 1, 
+        CLAMP = 1,
         PERIODIC = 2,
         MIRROR = 3
     };
diff --git a/source/MaterialXRender/LightHandler.cpp b/source/MaterialXRender/LightHandler.cpp
index cc96d979c7..c7d9311005 100644
--- a/source/MaterialXRender/LightHandler.cpp
+++ b/source/MaterialXRender/LightHandler.cpp
@@ -51,7 +51,7 @@ void LightHandler::findLights(DocumentPtr doc, vector& lights)
 
 void LightHandler::registerLights(DocumentPtr doc, const vector& lights, GenContext& context)
 {
-    // Clear context light user data which is set when bindLightShader() 
+    // Clear context light user data which is set when bindLightShader()
     // is called. This is necessary in case the light types have already been
     // registered.
     HwShaderGenerator::unbindLightShaders(context);
@@ -71,7 +71,7 @@ void LightHandler::registerLights(DocumentPtr doc, const vector& lights
     }
 
     // Make sure max light count is large enough
-    const unsigned int lightCount = (unsigned int)lights.size();
+    const unsigned int lightCount = (unsigned int) lights.size();
     if (lightCount > context.getOptions().hwMaxActiveLightSources)
     {
         context.getOptions().hwMaxActiveLightSources = lightCount;
diff --git a/source/MaterialXRender/LightHandler.h b/source/MaterialXRender/LightHandler.h
index 666edd34a1..852ccfa41d 100644
--- a/source/MaterialXRender/LightHandler.h
+++ b/source/MaterialXRender/LightHandler.h
@@ -48,7 +48,7 @@ class MX_RENDER_API LightHandler
 
     /// @name Global State
     /// @{
-    
+
     /// Set the light transform.
     void setLightTransform(const Matrix44& mat)
     {
diff --git a/source/MaterialXRender/Mesh.cpp b/source/MaterialXRender/Mesh.cpp
index 110829cd21..bfa7dedd13 100644
--- a/source/MaterialXRender/Mesh.cpp
+++ b/source/MaterialXRender/Mesh.cpp
@@ -18,7 +18,8 @@ const string MeshStream::BITANGENT_ATTRIBUTE("bitangent");
 const string MeshStream::COLOR_ATTRIBUTE("color");
 const string MeshStream::GEOMETRY_PROPERTY_ATTRIBUTE("geomprop");
 
-namespace {
+namespace
+{
 
 const float MAX_FLOAT = std::numeric_limits::max();
 const size_t FACE_VERTEX_COUNT = 3;
@@ -266,7 +267,7 @@ void Mesh::splitByUdims()
 // MeshStream methods
 //
 
-void MeshStream::transform(const Matrix44 &matrix)
+void MeshStream::transform(const Matrix44& matrix)
 {
     unsigned int stride = getStride();
     size_t numElements = _data.size() / getStride();
@@ -274,17 +275,17 @@ void MeshStream::transform(const Matrix44 &matrix)
         getType() == MeshStream::TEXCOORD_ATTRIBUTE ||
         getType() == MeshStream::GEOMETRY_PROPERTY_ATTRIBUTE)
     {
-        for (size_t i=0; i
diff --git a/source/MaterialXRender/OiioImageLoader.h b/source/MaterialXRender/OiioImageLoader.h
index 6619c85bb2..38781dad9e 100644
--- a/source/MaterialXRender/OiioImageLoader.h
+++ b/source/MaterialXRender/OiioImageLoader.h
@@ -7,7 +7,7 @@
 #define MATERIALX_OIIOIMAGELOADER_H
 
 /// @file
-/// Image loader wrapper using OpenImageIO 
+/// Image loader wrapper using OpenImageIO
 
 #include 
 
@@ -21,7 +21,7 @@ using OiioImageLoaderPtr = std::shared_ptr;
 class MX_RENDER_API OiioImageLoader : public ImageLoader
 {
   public:
-    OiioImageLoader() 
+    OiioImageLoader()
     {
         // Set all extensions supported by OpenImageIO
         _extensions.insert(BMP_EXTENSION);
@@ -40,7 +40,7 @@ class MX_RENDER_API OiioImageLoader : public ImageLoader
         _extensions.insert(TXT_EXTENSION);
         _extensions.insert(TXR_EXTENSION);
     }
-    virtual ~OiioImageLoader() { }    
+    virtual ~OiioImageLoader() { }
 
     /// Create a new OpenImageIO image loader
     static OiioImageLoaderPtr create() { return std::make_shared(); }
diff --git a/source/MaterialXRender/ShaderMaterial.cpp b/source/MaterialXRender/ShaderMaterial.cpp
index d51efa54af..4e8ccc491f 100644
--- a/source/MaterialXRender/ShaderMaterial.cpp
+++ b/source/MaterialXRender/ShaderMaterial.cpp
@@ -8,8 +8,8 @@
 
 MATERIALX_NAMESPACE_BEGIN
 
-ShaderMaterial::ShaderMaterial() : _hasTransparency(false) {}
-ShaderMaterial::~ShaderMaterial() {}
+ShaderMaterial::ShaderMaterial() : _hasTransparency(false) { }
+ShaderMaterial::~ShaderMaterial() { }
 
 void ShaderMaterial::setDocument(DocumentPtr doc)
 {
@@ -62,9 +62,9 @@ bool ShaderMaterial::hasTransparency() const
 }
 
 bool ShaderMaterial::generateEnvironmentShader(GenContext& context,
-                                         const FilePath& filename,
-                                         DocumentPtr stdLib,
-                                         const FilePath& imagePath)
+                                               const FilePath& filename,
+                                               DocumentPtr stdLib,
+                                               const FilePath& imagePath)
 {
     // Read in the environment nodegraph.
     DocumentPtr doc = createDocument();
diff --git a/source/MaterialXRender/ShaderMaterial.h b/source/MaterialXRender/ShaderMaterial.h
index cf500463e4..f29b6f763c 100644
--- a/source/MaterialXRender/ShaderMaterial.h
+++ b/source/MaterialXRender/ShaderMaterial.h
@@ -74,7 +74,7 @@ class MX_RENDER_API ShaderMaterial
     /// Generate a shader from our currently stored element and
     /// the given generator context.
     virtual bool generateShader(GenContext& context) = 0;
-    
+
     /// Copies shader and API specific generated program from ShaderMaterial to this one.
     virtual void copyShader(MaterialPtr ShaderMaterial) = 0;
 
@@ -86,7 +86,7 @@ class MX_RENDER_API ShaderMaterial
                                            const FilePath& filename,
                                            DocumentPtr stdLib,
                                            const FilePath& imagePath);
-    
+
     /// Return the underlying hardware shader.
     ShaderPtr getShader() const;
 
diff --git a/source/MaterialXRender/ShaderRenderer.h b/source/MaterialXRender/ShaderRenderer.h
index c1cfbecfa0..829a0252c1 100644
--- a/source/MaterialXRender/ShaderRenderer.h
+++ b/source/MaterialXRender/ShaderRenderer.h
@@ -34,7 +34,7 @@ class MX_RENDER_API ShaderRenderer
     enum class MatrixConvention
     {
         OpenGL = 0,
-        Metal  = 1
+        Metal = 1
     };
     /// A map with name and source code for each shader stage.
     using StageMap = StringMap;
@@ -133,7 +133,7 @@ class MX_RENDER_API ShaderRenderer
 
   protected:
     ShaderRenderer(unsigned int width, unsigned int height, Image::BaseType baseType,
-        MatrixConvention matrixConvention = MatrixConvention::OpenGL);
+                   MatrixConvention matrixConvention = MatrixConvention::OpenGL);
 
   protected:
     unsigned int _width;
@@ -167,7 +167,7 @@ class MX_RENDER_API ExceptionRenderError : public Exception
     {
     }
 
-    ExceptionRenderError& operator=(const ExceptionRenderError& e)         
+    ExceptionRenderError& operator=(const ExceptionRenderError& e)
     {
         Exception::operator=(e);
         _errorLog = e._errorLog;
diff --git a/source/MaterialXRender/StbImageLoader.cpp b/source/MaterialXRender/StbImageLoader.cpp
index d8747b75ad..b367bf741c 100644
--- a/source/MaterialXRender/StbImageLoader.cpp
+++ b/source/MaterialXRender/StbImageLoader.cpp
@@ -7,9 +7,9 @@
 
 #if defined(_MSC_VER)
     #pragma warning(push)
-    #pragma warning(disable: 4100)
-    #pragma warning(disable: 4505)
-    #pragma warning(disable: 4996)
+    #pragma warning(disable : 4100)
+    #pragma warning(disable : 4505)
+    #pragma warning(disable : 4996)
 #endif
 
 #define STB_IMAGE_IMPLEMENTATION
@@ -96,7 +96,7 @@ ImagePtr StbImageLoader::loadImage(const FilePath& filePath)
     int height = 0;
     int channelCount = 0;
     Image::BaseType baseType = Image::BaseType::UINT8;
-    void *buffer = nullptr;
+    void* buffer = nullptr;
 
     // Select standard or float reader based on file extension.
     string extension = filePath.getExtension();
diff --git a/source/MaterialXRender/StbImageLoader.h b/source/MaterialXRender/StbImageLoader.h
index dabbb8ca9e..f9d91fbcc7 100644
--- a/source/MaterialXRender/StbImageLoader.h
+++ b/source/MaterialXRender/StbImageLoader.h
@@ -34,7 +34,7 @@ class MX_RENDER_API StbImageLoader : public ImageLoader
         _extensions.insert(PSD_EXTENSION);
         _extensions.insert(TGA_EXTENSION);
     }
-    virtual ~StbImageLoader() { }    
+    virtual ~StbImageLoader() { }
 
     /// Create a new stb image loader
     static StbImageLoaderPtr create() { return std::make_shared(); }
diff --git a/source/MaterialXRender/TextureBaker.h b/source/MaterialXRender/TextureBaker.h
index 54b1016451..656bb63c1d 100644
--- a/source/MaterialXRender/TextureBaker.h
+++ b/source/MaterialXRender/TextureBaker.h
@@ -27,7 +27,7 @@ using BakedDocumentVec = std::vector>;
 /// A helper class for baking procedural material content to textures.
 /// TODO: Add support for graphs containing geometric nodes such as position
 ///       and normal.
-template
+template 
 class TextureBaker : public Renderer
 {
   public:
@@ -112,7 +112,7 @@ class TextureBaker : public Renderer
     /// Set the name of the baked graph element.
     void setBakedGraphName(const string& name)
     {
-        _bakedGraphName= name;
+        _bakedGraphName = name;
     }
 
     /// Return the name of the baked graph element.
@@ -218,13 +218,13 @@ class TextureBaker : public Renderer
     void optimizeBakedTextures(NodePtr shader);
 
     /// Bake material to document in memory and write baked textures to disk.
-    DocumentPtr bakeMaterialToDoc(DocumentPtr doc, const FileSearchPath& searchPath, const string& materialPath, 
+    DocumentPtr bakeMaterialToDoc(DocumentPtr doc, const FileSearchPath& searchPath, const string& materialPath,
                                   const StringVec& udimSet, std::string& documentName);
 
     /// Bake materials in the given document and write them to disk.  If multiple documents are written,
     /// then the given output filename will be used as a template.
     void bakeAllMaterials(DocumentPtr doc, const FileSearchPath& searchPath, const FilePath& outputFileName);
-    
+
     /// Set whether to write a separate document per material when calling bakeAllMaterials.
     /// By default separate documents are written.
     void writeDocumentPerMaterial(bool value)
@@ -295,7 +295,7 @@ class TextureBaker : public Renderer
     StringMap _bakedInputMap;
 
     std::unordered_map _worldSpaceNodes;
-    
+
     bool _flipSavedImage;
 
     bool _writeDocumentPerMaterial;
diff --git a/source/MaterialXRender/TextureBaker.inl b/source/MaterialXRender/TextureBaker.inl
index bcc9401210..65759ed998 100644
--- a/source/MaterialXRender/TextureBaker.inl
+++ b/source/MaterialXRender/TextureBaker.inl
@@ -13,7 +13,8 @@
 
 MATERIALX_NAMESPACE_BEGIN
 
-namespace {
+namespace
+{
 
 const string SRGB_TEXTURE = "srgb_texture";
 const string LIN_REC709 = "lin_rec709";
@@ -23,7 +24,7 @@ const string DEFAULT_UDIM_PREFIX = "_";
 
 } // anonymous namespace
 
-template
+template 
 string TextureBaker::getValueStringFromColor(const Color4& color, const string& type)
 {
     if (type == "color4" || type == "vector4")
@@ -45,7 +46,7 @@ string TextureBaker::getValueStringFromColor(const Color4&
     return EMPTY_STRING;
 }
 
-template
+template 
 TextureBaker::TextureBaker(unsigned int width, unsigned int height, Image::BaseType baseType, bool flipSavedImage) :
     Renderer(width, height, baseType),
     _distanceUnit("meter"),
@@ -97,7 +98,7 @@ TextureBaker::TextureBaker(unsigned int width, unsigned int
     _frameCaptureImage->createResourceBuffer();
 }
 
-template
+template 
 size_t TextureBaker::findVarInTemplate(const string& filename, const string& var, size_t start)
 {
     size_t i = filename.find(var, start);
@@ -112,17 +113,15 @@ size_t TextureBaker::findVarInTemplate(const string& filena
     return i;
 }
 
-template
+template 
 FilePath TextureBaker::generateTextureFilename(const StringMap& filenameTemplateMap)
 {
     string bakedImageName = _textureFilenameTemplate;
 
     for (auto& pair : filenameTemplateMap)
     {
-        string replacement = (_texTemplateOverrides.count(pair.first)) ?
-            _texTemplateOverrides[pair.first] : pair.second;
-        replacement = (filenameTemplateMap.at("$UDIM").empty() && pair.first == "$UDIMPREFIX") ?
-            EMPTY_STRING : replacement;
+        string replacement = (_texTemplateOverrides.count(pair.first)) ? _texTemplateOverrides[pair.first] : pair.second;
+        replacement = (filenameTemplateMap.at("$UDIM").empty() && pair.first == "$UDIMPREFIX") ? EMPTY_STRING : replacement;
 
         for (size_t i = 0; (i = findVarInTemplate(bakedImageName, pair.first, i)) != string::npos; i++)
         {
@@ -140,7 +139,7 @@ FilePath TextureBaker::generateTextureFilename(const String
     return _outputImagePath / bakedImageName;
 }
 
-template
+template 
 StringMap TextureBaker::initializeFileTemplateMap(InputPtr input, NodePtr shader, const string& udim)
 {
     FilePath assetPath = FilePath(shader->getActiveSourceUri());
@@ -156,7 +155,7 @@ StringMap TextureBaker::initializeFileTemplateMap(InputPtr
     return filenameTemplateMap;
 }
 
-template
+template 
 bool TextureBaker::writeBakedImage(const BakedImage& baked, ImagePtr image)
 {
     if (!Renderer::_imageHandler->saveImage(baked.filename, image, _flipSavedImage))
@@ -176,11 +175,11 @@ bool TextureBaker::writeBakedImage(const BakedImage& baked,
     return true;
 }
 
-template
+template 
 void TextureBaker::bakeShaderInputs(NodePtr material, NodePtr shader, GenContext& context, const string& udim)
 {
     _material = material;
-    
+
     if (!shader)
     {
         return;
@@ -216,16 +215,16 @@ void TextureBaker::bakeShaderInputs(NodePtr material, NodeP
     Renderer::_imageHandler->clearImageCache();
 }
 
-template
+template 
 void TextureBaker::bakeGraphOutput(OutputPtr output, GenContext& context, const StringMap& filenameTemplateMap)
 {
     if (!output)
     {
         return;
     }
-    
+
     bool encodeSrgb = _colorSpace == SRGB_TEXTURE &&
-        (output->getType() == "color3" || output->getType() == "color4");
+                      (output->getType() == "color3" || output->getType() == "color4");
     Renderer::getFramebuffer()->setEncodeSrgb(encodeSrgb);
 
     ShaderPtr shader = _generator->generate("BakingShader", output, context);
@@ -258,7 +257,7 @@ void TextureBaker::bakeGraphOutput(OutputPtr output, GenCon
     }
 }
 
-template
+template 
 void TextureBaker::optimizeBakedTextures(NodePtr shader)
 {
     if (!shader)
@@ -320,7 +319,7 @@ void TextureBaker::optimizeBakedTextures(NodePtr shader)
     }
 }
 
-template
+template 
 DocumentPtr TextureBaker::generateNewDocumentFromShader(NodePtr shader, const StringVec& udimSet)
 {
     if (!shader)
@@ -359,7 +358,7 @@ DocumentPtr TextureBaker::generateNewDocumentFromShader(Nod
     // Optionally create a material node, connecting it to the new shader node.
     if (_material)
     {
-        string materialName = (_texTemplateOverrides.count("$MATERIAL"))? _texTemplateOverrides["$MATERIAL"] : _material->getName();
+        string materialName = (_texTemplateOverrides.count("$MATERIAL")) ? _texTemplateOverrides["$MATERIAL"] : _material->getName();
         NodePtr bakedMaterial = _bakedTextureDoc->addNode(_material->getCategory(), materialName + BAKED_POSTFIX, _material->getType());
         for (auto sourceMaterialInput : _material->getInputs())
         {
@@ -483,9 +482,9 @@ DocumentPtr TextureBaker::generateNewDocumentFromShader(Nod
     return _bakedTextureDoc;
 }
 
-template
+template 
 DocumentPtr TextureBaker::bakeMaterialToDoc(DocumentPtr doc, const FileSearchPath& searchPath, const string& materialPath,
-                                            const StringVec& udimSet, string& documentName)
+                                                                 const StringVec& udimSet, string& documentName)
 {
     if (_outputStream)
     {
@@ -551,7 +550,7 @@ DocumentPtr TextureBaker::bakeMaterialToDoc(DocumentPtr doc
     return generateNewDocumentFromShader(shaderNode, udimSet);
 }
 
-template
+template 
 void TextureBaker::bakeAllMaterials(DocumentPtr doc, const FileSearchPath& searchPath, const FilePath& outputFilename)
 {
     if (_outputImagePath.isEmpty())
@@ -593,31 +592,31 @@ void TextureBaker::bakeAllMaterials(DocumentPtr doc, const
 
     if (_writeDocumentPerMaterial)
     {
-    // Write documents in memory to disk.
-    size_t bakeCount = bakedDocuments.size();
-    for (size_t i = 0; i < bakeCount; i++)
-    {
-        if (bakedDocuments[i].second)
+        // Write documents in memory to disk.
+        size_t bakeCount = bakedDocuments.size();
+        for (size_t i = 0; i < bakeCount; i++)
         {
-            FilePath writeFilename = outputFilename;
-
-            // Add additional filename decorations if there are multiple documents.
-            if (bakedDocuments.size() > 1)
+            if (bakedDocuments[i].second)
             {
-                const string extension = writeFilename.getExtension();
-                writeFilename.removeExtension();
-                string filenameSeparator = writeFilename.isDirectory()? EMPTY_STRING : "_";
-                writeFilename = FilePath(writeFilename.asString() + filenameSeparator + bakedDocuments[i].first + "." + extension);
-            }
+                FilePath writeFilename = outputFilename;
 
-            writeToXmlFile(bakedDocuments[i].second, writeFilename);
-            if (_outputStream)
-            {
-                *_outputStream << "Wrote baked document: " << writeFilename.asString() << std::endl;
+                // Add additional filename decorations if there are multiple documents.
+                if (bakedDocuments.size() > 1)
+                {
+                    const string extension = writeFilename.getExtension();
+                    writeFilename.removeExtension();
+                    string filenameSeparator = writeFilename.isDirectory() ? EMPTY_STRING : "_";
+                    writeFilename = FilePath(writeFilename.asString() + filenameSeparator + bakedDocuments[i].first + "." + extension);
+                }
+
+                writeToXmlFile(bakedDocuments[i].second, writeFilename);
+                if (_outputStream)
+                {
+                    *_outputStream << "Wrote baked document: " << writeFilename.asString() << std::endl;
+                }
             }
         }
     }
-}
     else if (_bakedTextureDoc)
     {
         writeToXmlFile(_bakedTextureDoc, outputFilename);
@@ -628,7 +627,7 @@ void TextureBaker::bakeAllMaterials(DocumentPtr doc, const
     }
 }
 
-template
+template 
 void TextureBaker::setupUnitSystem(DocumentPtr unitDefinitions)
 {
     UnitTypeDefPtr distanceTypeDef = unitDefinitions ? unitDefinitions->getUnitTypeDef("distance") : nullptr;
diff --git a/source/MaterialXRender/TinyObjLoader.cpp b/source/MaterialXRender/TinyObjLoader.cpp
index 324a1df3e7..b01af1ebf9 100644
--- a/source/MaterialXRender/TinyObjLoader.cpp
+++ b/source/MaterialXRender/TinyObjLoader.cpp
@@ -23,7 +23,8 @@
 
 MATERIALX_NAMESPACE_BEGIN
 
-namespace {
+namespace
+{
 
 const float MAX_FLOAT = std::numeric_limits::max();
 const size_t FACE_VERTEX_COUNT = 3;
@@ -32,9 +33,10 @@ class VertexVector : public VectorN
 {
   public:
     using VectorN::VectorN;
-    VertexVector(const Vector3& p, const Vector3& n, const Vector2& t) : VectorN(Uninit{})
+    VertexVector(const Vector3& p, const Vector3& n, const Vector2& t) :
+        VectorN(Uninit{})
     {
-        _arr = {p[0], p[1], p[2], n[0], n[1], n[2], t[0], t[1]};
+        _arr = { p[0], p[1], p[2], n[0], n[1], n[2], t[0], t[1] };
     }
 };
 
diff --git a/source/MaterialXRender/TinyObjLoader.h b/source/MaterialXRender/TinyObjLoader.h
index 8cfb80762b..e3934f9e41 100644
--- a/source/MaterialXRender/TinyObjLoader.h
+++ b/source/MaterialXRender/TinyObjLoader.h
@@ -6,7 +6,7 @@
 #ifndef MATERIALX_TINYOBJLOADER_H
 #define MATERIALX_TINYOBJLOADER_H
 
-/// @file 
+/// @file
 /// OBJ geometry format loader using the TinyObj library
 
 #include 
diff --git a/source/MaterialXRender/Types.h b/source/MaterialXRender/Types.h
index 6af59b9122..b3c15c9f8b 100644
--- a/source/MaterialXRender/Types.h
+++ b/source/MaterialXRender/Types.h
@@ -65,7 +65,7 @@ class MX_RENDER_API Vector3d : public VectorN
     Vector3d() = default;
     Vector3d(double x, double y, double z) : VectorN(Uninit{})
     {
-        _arr = {x, y, z};
+        _arr = { x, y, z };
     }
 };
 
@@ -78,7 +78,7 @@ class MX_RENDER_API Vector4d : public VectorN
     Vector4d() = default;
     Vector4d(double x, double y, double z, double w) : VectorN(Uninit{})
     {
-        _arr = {x, y, z, w};
+        _arr = { x, y, z, w };
     }
 };
 
@@ -91,7 +91,7 @@ class MX_RENDER_API Color3d : public VectorN
     Color3d() = default;
     Color3d(double r, double g, double b) : VectorN(Uninit{})
     {
-        _arr = {r, g, b};
+        _arr = { r, g, b };
     }
 };
 
diff --git a/source/MaterialXRender/Util.h b/source/MaterialXRender/Util.h
index 10799cfd33..922c06e529 100644
--- a/source/MaterialXRender/Util.h
+++ b/source/MaterialXRender/Util.h
@@ -31,28 +31,28 @@ MX_RENDER_API ShaderPtr createShader(const string& shaderName, GenContext& conte
 /// Create a shader with a constant color output, using the given standard libraries
 /// for code generation.
 MX_RENDER_API ShaderPtr createConstantShader(GenContext& context,
-                               DocumentPtr stdLib,
-                               const string& shaderName,
-                               const Color3& color);
+                                             DocumentPtr stdLib,
+                                             const string& shaderName,
+                                             const Color3& color);
 
 /// Create a shader with depth value output, using the given standard libraries
 /// for code generation.
 MX_RENDER_API ShaderPtr createDepthShader(GenContext& context,
-                            DocumentPtr stdLib,
-                            const string& shaderName);
+                                          DocumentPtr stdLib,
+                                          const string& shaderName);
 
 /// Create a shader that generates a look-up table for directional albedo, using
 /// the given standard libraries for code generation.
 MX_RENDER_API ShaderPtr createAlbedoTableShader(GenContext& context,
-                                  DocumentPtr stdLib,
-                                  const string& shaderName);
+                                                DocumentPtr stdLib,
+                                                const string& shaderName);
 
 /// Create a blur shader, using the given standard libraries for code generation.
 MX_RENDER_API ShaderPtr createBlurShader(GenContext& context,
-                           DocumentPtr stdLib,
-                           const string& shaderName,
-                           const string& filterType,
-                           float filterSize);
+                                         DocumentPtr stdLib,
+                                         const string& shaderName,
+                                         const string& filterType,
+                                         float filterSize);
 
 /// @}
 /// @name User Interface Utilities
diff --git a/source/MaterialXRenderGlsl/GLFramebuffer.cpp b/source/MaterialXRenderGlsl/GLFramebuffer.cpp
index bb8e567c58..9516e9ad43 100644
--- a/source/MaterialXRenderGlsl/GLFramebuffer.cpp
+++ b/source/MaterialXRenderGlsl/GLFramebuffer.cpp
@@ -75,33 +75,33 @@ GLFramebuffer::GLFramebuffer(unsigned int width, unsigned int height, unsigned i
         string errorMessage;
         switch (status)
         {
-        case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
-            errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT";
-            break;
-        case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
-            errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT";
-            break;
-        case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
-            errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER";
-            break;
-        case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
-            errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER";
-            break;
-        case GL_FRAMEBUFFER_UNSUPPORTED:
-            errorMessage = "GL_FRAMEBUFFER_UNSUPPORTED";
-            break;
-        case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE:
-            errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE";
-            break;
-        case GL_FRAMEBUFFER_UNDEFINED:
-            errorMessage = "GL_FRAMEBUFFER_UNDEFINED";
-            break;
-        case GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS:
-            errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS";
-            break;
-        default:
-            errorMessage = std::to_string(status);
-            break;
+            case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
+                errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT";
+                break;
+            case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
+                errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT";
+                break;
+            case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
+                errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER";
+                break;
+            case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
+                errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER";
+                break;
+            case GL_FRAMEBUFFER_UNSUPPORTED:
+                errorMessage = "GL_FRAMEBUFFER_UNSUPPORTED";
+                break;
+            case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE:
+                errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE";
+                break;
+            case GL_FRAMEBUFFER_UNDEFINED:
+                errorMessage = "GL_FRAMEBUFFER_UNDEFINED";
+                break;
+            case GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS:
+                errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS";
+                break;
+            default:
+                errorMessage = std::to_string(status);
+                break;
         }
 
         throw ExceptionRenderError("Frame buffer object setup failed: " + errorMessage);
diff --git a/source/MaterialXRenderGlsl/GLTextureHandler.h b/source/MaterialXRenderGlsl/GLTextureHandler.h
index 4485ab98eb..942d6dc446 100644
--- a/source/MaterialXRenderGlsl/GLTextureHandler.h
+++ b/source/MaterialXRenderGlsl/GLTextureHandler.h
@@ -33,7 +33,7 @@ class MX_RENDERGLSL_API GLTextureHandler : public ImageHandler
     /// will fail if there are not enough available image units to bind to.
     bool bindImage(ImagePtr image, const ImageSamplingProperties& samplingProperties) override;
 
-    /// Unbind an image. 
+    /// Unbind an image.
     bool unbindImage(ImagePtr image) override;
 
     /// Create rendering resources for the given image.
diff --git a/source/MaterialXRenderGlsl/GlslMaterial.cpp b/source/MaterialXRenderGlsl/GlslMaterial.cpp
index ce4582d44f..84668d2d0a 100644
--- a/source/MaterialXRenderGlsl/GlslMaterial.cpp
+++ b/source/MaterialXRenderGlsl/GlslMaterial.cpp
@@ -38,7 +38,7 @@ bool GlslMaterial::loadSource(const FilePath& vertexShaderFile, const FilePath&
     }
 
     // TODO:
-    // Here we set new source code on the _glProgram without rebuilding 
+    // Here we set new source code on the _glProgram without rebuilding
     // the _hwShader instance. So the _hwShader is not in sync with the
     // _glProgram after this operation.
     _glProgram = GlslProgram::create();
diff --git a/source/MaterialXRenderGlsl/GlslMaterial.h b/source/MaterialXRenderGlsl/GlslMaterial.h
index 1e3d0f7f3b..1ae945867a 100644
--- a/source/MaterialXRenderGlsl/GlslMaterial.h
+++ b/source/MaterialXRenderGlsl/GlslMaterial.h
@@ -24,7 +24,8 @@ using GlslMaterialPtr = std::shared_ptr;
 class MX_RENDERGLSL_API GlslMaterial : public ShaderMaterial
 {
   public:
-    GlslMaterial() : ShaderMaterial()
+    GlslMaterial() :
+        ShaderMaterial()
     {
     }
     ~GlslMaterial() { }
@@ -45,7 +46,7 @@ class MX_RENDERGLSL_API GlslMaterial : public ShaderMaterial
 
     /// Generate a shader from the given hardware shader.
     bool generateShader(ShaderPtr hwShader) override;
-    
+
     /// Copy shader from one material to this one
     void copyShader(MaterialPtr material) override
     {
diff --git a/source/MaterialXRenderGlsl/GlslProgram.cpp b/source/MaterialXRenderGlsl/GlslProgram.cpp
index 900cac0ef1..4497019e91 100644
--- a/source/MaterialXRenderGlsl/GlslProgram.cpp
+++ b/source/MaterialXRenderGlsl/GlslProgram.cpp
@@ -59,7 +59,7 @@ void GlslProgram::setStages(ShaderPtr shader)
 
     // Extract out the shader code per stage
     _shader = shader;
-    for (size_t i =0; inumStages(); ++i)
+    for (size_t i = 0; i < shader->numStages(); ++i)
     {
         const ShaderStage& stage = shader->getStage(i);
         addStage(stage.getName(), stage.getSourceCode());
@@ -101,7 +101,7 @@ void GlslProgram::build()
 
     // Compile vertex shader, if any
     GLuint vertexShaderId = UNDEFINED_OPENGL_RESOURCE_ID;
-    const string &vertexShaderSource = _stages[Stage::VERTEX];
+    const string& vertexShaderSource = _stages[Stage::VERTEX];
     if (!vertexShaderSource.empty())
     {
         vertexShaderId = glCreateShader(GL_VERTEX_SHADER);
@@ -138,7 +138,7 @@ void GlslProgram::build()
         fragmentShaderId = glCreateShader(GL_FRAGMENT_SHADER);
 
         // Compile fragment shader
-        const char *fragmentChar = fragmentShaderSource.c_str();
+        const char* fragmentChar = fragmentShaderSource.c_str();
         glShaderSource(fragmentShaderId, 1, &fragmentChar, nullptr);
         glCompileShader(fragmentShaderId);
 
@@ -324,7 +324,7 @@ void GlslProgram::bindPartition(MeshPartitionPtr part)
 
 void GlslProgram::bindMesh(MeshPtr mesh)
 {
-    _enabledStreamLocations.clear(); 
+    _enabledStreamLocations.clear();
 
     if (_programId == UNDEFINED_OPENGL_RESOURCE_ID)
     {
@@ -547,7 +547,7 @@ void GlslProgram::bindTextures(ImageHandlerPtr imageHandler)
 
             // Always bind a texture unless it is a lighting texture.
             // Lighting textures are handled in the bindLighting() call.
-            // If no texture can be loaded then the default color defined in 
+            // If no texture can be loaded then the default color defined in
             // "samplingProperties" will be used to create a fallback texture.
             if (fileName != HW::ENV_RADIANCE &&
                 fileName != HW::ENV_IRRADIANCE)
@@ -903,7 +903,7 @@ const GlslProgram::InputMap& GlslProgram::updateUniformsList()
 
         // Process constants
         const VariableBlock& constants = ps.getConstantBlock();
-        for (size_t i=0; i< constants.size(); ++i)
+        for (size_t i = 0; i < constants.size(); ++i)
         {
             const ShaderPort* v = constants[i];
             // There is no way to match with an unnamed variable
@@ -1197,9 +1197,9 @@ void GlslProgram::printUniforms(std::ostream& outputStream)
         string colorspace = input.second->colorspace;
         bool isConstant = input.second->isConstant;
         outputStream << "Program Uniform: \"" << input.first
-            << "\". Location:" << location
-            << ". GLtype: " << std::hex << gltype
-            << ". Size: " << std::dec << size;
+                     << "\". Location:" << location
+                     << ". GLtype: " << std::hex << gltype
+                     << ". Size: " << std::dec << size;
         if (!type.empty())
             outputStream << ". TypeString: \"" << type << "\"";
         if (!value.empty())
@@ -1217,7 +1217,6 @@ void GlslProgram::printUniforms(std::ostream& outputStream)
     }
 }
 
-
 void GlslProgram::printAttributes(std::ostream& outputStream)
 {
     updateAttributesList();
@@ -1229,9 +1228,9 @@ void GlslProgram::printAttributes(std::ostream& outputStream)
         string type = input.second->typeString;
         string value = input.second->value ? input.second->value->getValueString() : EMPTY_STRING;
         outputStream << "Program Attribute: \"" << input.first
-            << "\". Location:" << location
-            << ". GLtype: " << std::hex << gltype
-            << ". Size: " << std::dec << size;
+                     << "\". Location:" << location
+                     << ". GLtype: " << std::hex << gltype
+                     << ". Size: " << std::dec << size;
         if (!type.empty())
             outputStream << ". TypeString: \"" << type << "\"";
         if (!value.empty())
diff --git a/source/MaterialXRenderGlsl/GlslProgram.h b/source/MaterialXRenderGlsl/GlslProgram.h
index 2538c63fcb..e90853eedb 100644
--- a/source/MaterialXRenderGlsl/GlslProgram.h
+++ b/source/MaterialXRenderGlsl/GlslProgram.h
@@ -109,7 +109,7 @@ class MX_RENDERGLSL_API GlslProgram
         string path;
         /// Unit
         string unit;
-        /// Colorspace 
+        /// Colorspace
         string colorspace;
 
         /// Program input constructor
diff --git a/source/MaterialXRenderGlsl/GlslRenderer.h b/source/MaterialXRenderGlsl/GlslRenderer.h
index 9ea121aec9..bdf16b44b3 100644
--- a/source/MaterialXRenderGlsl/GlslRenderer.h
+++ b/source/MaterialXRenderGlsl/GlslRenderer.h
@@ -50,7 +50,7 @@ class MX_RENDERGLSL_API GlslRenderer : public ShaderRenderer
     {
         return GLTextureHandler::create(imageLoader);
     }
-    
+
     /// Destructor
     virtual ~GlslRenderer() { }
 
diff --git a/source/MaterialXRenderGlsl/TextureBaker.h b/source/MaterialXRenderGlsl/TextureBaker.h
index be1f713cd6..c084b00a1a 100644
--- a/source/MaterialXRenderGlsl/TextureBaker.h
+++ b/source/MaterialXRenderGlsl/TextureBaker.h
@@ -37,7 +37,7 @@ class MX_RENDERGLSL_API TextureBakerGlsl : public TextureBaker;
 
 /// @class SimpleWindow
 /// A platform-independent window class.
-/// 
+///
 /// Plaform-specific resources are encapsulated by a WindowWrapper instance.
 class MX_RENDERHW_API SimpleWindow
 {
@@ -30,7 +30,7 @@ class MX_RENDERHW_API SimpleWindow
     virtual ~SimpleWindow();
 
     /// Window initialization
-    bool initialize(const char* title, unsigned int width, unsigned int height, void *applicationShell);
+    bool initialize(const char* title, unsigned int width, unsigned int height, void* applicationShell);
 
     /// Return our platform-specific resource wrapper
     WindowWrapperPtr getWindowWrapper()
diff --git a/source/MaterialXRenderHw/SimpleWindowLinux.cpp b/source/MaterialXRenderHw/SimpleWindowLinux.cpp
index 23779bd92b..5a14a51aba 100644
--- a/source/MaterialXRenderHw/SimpleWindowLinux.cpp
+++ b/source/MaterialXRenderHw/SimpleWindowLinux.cpp
@@ -26,7 +26,7 @@ SimpleWindow::SimpleWindow() :
 
 bool SimpleWindow::initialize(const char* title,
                               unsigned int width, unsigned int height,
-                              void *applicationShell)
+                              void* applicationShell)
 {
     int n = 0;
 
@@ -49,13 +49,13 @@ bool SimpleWindow::initialize(const char* title,
     else
     {
         // Reuse existing application shell;
-        shell = (Widget)applicationShell;
+        shell = (Widget) applicationShell;
     }
 
     if (!shell)
     {
         _id = 0;
-        return false;;
+        return false;
     }
 
     Arg args[6];
diff --git a/source/MaterialXRenderHw/SimpleWindowWindows.cpp b/source/MaterialXRenderHw/SimpleWindowWindows.cpp
index de5cf48fc1..070950e682 100644
--- a/source/MaterialXRenderHw/SimpleWindowWindows.cpp
+++ b/source/MaterialXRenderHw/SimpleWindowWindows.cpp
@@ -30,19 +30,19 @@ LRESULT CALLBACK NoOpProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
     switch (msg)
     {
-    case WM_CLOSE:
-    case WM_DESTROY:
-        break;
-    default:
-        return DefWindowProc(hWnd, msg, wParam, lParam);
-        break;
+        case WM_CLOSE:
+        case WM_DESTROY:
+            break;
+        default:
+            return DefWindowProc(hWnd, msg, wParam, lParam);
+            break;
     }
     return 0;
 }
 
 bool SimpleWindow::initialize(const char* title,
                               unsigned int width, unsigned int height,
-                              void * /*applicationShell*/)
+                              void* /*applicationShell*/)
 {
     HINSTANCE hInstance = GetModuleHandle(NULL);
 
@@ -50,14 +50,14 @@ bool SimpleWindow::initialize(const char* title,
     //
     WNDCLASS wc;
     wc.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC;
-    wc.lpfnWndProc = (WNDPROC)NoOpProc;
+    wc.lpfnWndProc = (WNDPROC) NoOpProc;
     wc.cbClsExtra = 0;
     wc.cbWndExtra = 0;
     wc.hInstance = hInstance; // Set the instance to this application
     wc.hIcon = LoadIcon(NULL, IDI_WINLOGO);
     wc.hCursor = LoadCursor(NULL, IDC_ARROW);
     wc.hbrBackground = NULL; // No background required
-    wc.lpszMenuName = NULL;	 // No menu required
+    wc.lpszMenuName = NULL;  // No menu required
     wc.lpszClassName = _windowClassName;
 
     if (!RegisterClass(&wc))
@@ -73,10 +73,10 @@ bool SimpleWindow::initialize(const char* title,
 
     // Set the rectangle of the client area.
     RECT WindowRect;
-    WindowRect.left = (long)0;
-    WindowRect.top = (long)0;
-    WindowRect.right = (long)width;
-    WindowRect.bottom = (long)height;
+    WindowRect.left = (long) 0;
+    WindowRect.top = (long) 0;
+    WindowRect.right = (long) width;
+    WindowRect.bottom = (long) height;
 
     // Calculate the exact window size (including border) so that the
     // client area has the desired dimensions.
@@ -86,13 +86,13 @@ bool SimpleWindow::initialize(const char* title,
     // Attempt to create the window.
     HWND hWnd = CreateWindowEx(dwExStyle, _windowClassName, title,
         dwStyle | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
-        0, 0, // Window position
-        WindowRect.right - WindowRect.left,	// Window width (including borders)
-        WindowRect.bottom - WindowRect.top,	// Window height (including borders/title bar)
-        NULL, // No parent window
-        NULL, // No menu
-        hInstance, // Instance
-        NULL); // Don't pass anything To WM_CREATE
+        0, 0,                               // Window position
+        WindowRect.right - WindowRect.left, // Window width (including borders)
+        WindowRect.bottom - WindowRect.top, // Window height (including borders/title bar)
+        NULL,                               // No parent window
+        NULL,                               // No menu
+        hInstance,                          // Instance
+        NULL);                              // Don't pass anything To WM_CREATE
 
     if (!hWnd)
     {
diff --git a/source/MaterialXView/Editor.cpp b/source/MaterialXView/Editor.cpp
index ff91f0f129..090937d6e5 100644
--- a/source/MaterialXView/Editor.cpp
+++ b/source/MaterialXView/Editor.cpp
@@ -18,14 +18,13 @@ namespace
 class EditorColorPicker : public ng::ColorPicker
 {
   public:
-    EditorColorPicker(ng::Widget *parent, const ng::Color& color) :
+    EditorColorPicker(ng::Widget* parent, const ng::Color& color) :
         ng::ColorPicker(parent, color)
     {
-        ng::Popup *popup = this->popup();
-        ng::Widget *floatGroup = new ng::Widget(popup);
-        auto layout =
-            new ng::GridLayout(ng::Orientation::Horizontal, 2,
-                ng::Alignment::Middle, 2, 2);
+        ng::Popup* popup = this->popup();
+        ng::Widget* floatGroup = new ng::Widget(popup);
+        auto layout = new ng::GridLayout(ng::Orientation::Horizontal, 2,
+                                         ng::Alignment::Middle, 2, 2);
         layout->set_col_alignment({ ng::Alignment::Fill, ng::Alignment::Fill });
         layout->set_spacing(1, 1);
         floatGroup->set_layout(layout);
@@ -51,7 +50,8 @@ class EditorColorPicker : public ng::ColorPicker
 
         // The color wheel does not handle alpha properly, so only
         // overwrite RGB in the callback.
-        m_callback = [this](const ng::Color &value) {
+        m_callback = [this](const ng::Color& value)
+        {
             _colorWidgets[0]->set_value(value[0]);
             _colorWidgets[1]->set_value(value[1]);
             _colorWidgets[2]->set_value(value[2]);
@@ -110,7 +110,7 @@ void PropertyEditor::create(Viewer& parent)
     _window->set_position(previousPosition);
     _window->set_visible(_visible);
 
-    ng::VScrollPanel *scroll_panel = new ng::VScrollPanel(_window);
+    ng::VScrollPanel* scroll_panel = new ng::VScrollPanel(_window);
     scroll_panel->set_fixed_height(300);
     _container = new ng::Widget(scroll_panel);
     _container->set_layout(new ng::GroupLayout(1, 1, 1, 1));
@@ -122,7 +122,7 @@ void PropertyEditor::create(Viewer& parent)
 
     // 3 cell layout for label plus widget value pair.
     _gridLayout3 = new ng::GridLayout(ng::Orientation::Horizontal, 3,
-        ng::Alignment::Minimum, 2, 2);
+                                      ng::Alignment::Minimum, 2, 2);
     _gridLayout3->set_col_alignment({ ng::Alignment::Minimum, ng::Alignment::Maximum, ng::Alignment::Maximum });
 }
 
@@ -150,7 +150,7 @@ void PropertyEditor::addItemToForm(const mx::UIPropertyItem& item, const std::st
     {
         ng::Widget* twoColumns = new ng::Widget(container);
         twoColumns->set_layout(_gridLayout2);
-        ng::Label* groupLabel =  new ng::Label(twoColumns, group);
+        ng::Label* groupLabel = new ng::Label(twoColumns, group);
         groupLabel->set_font_size(20);
         groupLabel->set_font("sans-bold");
         new ng::Label(twoColumns, "");
@@ -163,7 +163,7 @@ void PropertyEditor::addItemToForm(const mx::UIPropertyItem& item, const std::st
         auto indexInEnumeration = [&value, &enumValues, &enumeration]()
         {
             size_t index = 0;
-            for (auto& enumValue: enumValues)
+            for (auto& enumValue : enumValues)
             {
                 if (value->getValueString() == enumValue->getValueString())
                 {
@@ -172,7 +172,7 @@ void PropertyEditor::addItemToForm(const mx::UIPropertyItem& item, const std::st
                 index++;
             }
             index = 0;
-            for (auto& enumName: enumeration)
+            for (auto& enumName : enumeration)
             {
                 if (value->getValueString() == enumName)
                 {
@@ -191,7 +191,7 @@ void PropertyEditor::addItemToForm(const mx::UIPropertyItem& item, const std::st
             twoColumns->set_layout(_gridLayout2);
 
             new ng::Label(twoColumns, label);
-            ng::ComboBox* comboBox = new ng::ComboBox(twoColumns, {""});
+            ng::ComboBox* comboBox = new ng::ComboBox(twoColumns, { "" });
             comboBox->set_enabled(editable);
             comboBox->set_items(enumeration);
             comboBox->set_selected_index(static_cast(valueIndex));
@@ -259,7 +259,7 @@ void PropertyEditor::addItemToForm(const mx::UIPropertyItem& item, const std::st
             mx::MaterialPtr material = viewer->getSelectedMaterial();
             if (material)
             {
-                material->modifyUniform(path, mx::Value::createValue(value));            
+                material->modifyUniform(path, mx::Value::createValue(value));
             }
         });
         floatBox->set_fixed_size(ng::Vector2i(100, 20));
@@ -333,12 +333,12 @@ void PropertyEditor::addItemToForm(const mx::UIPropertyItem& item, const std::st
         {
             mx::Color3 v = value->asA();
             ng::Color c(v[0], v[1], v[2], 1.0);
-            
+
             new ng::Label(twoColumns, label);
             auto colorVar = new EditorColorPicker(twoColumns, c);
             colorVar->set_fixed_size({ 100, 20 });
             colorVar->set_font_size(15);
-            colorVar->set_final_callback([path, viewer](const ng::Color &c)
+            colorVar->set_final_callback([path, viewer](const ng::Color& c)
             {
                 mx::MaterialPtr material = viewer->getSelectedMaterial();
                 if (material)
@@ -362,7 +362,7 @@ void PropertyEditor::addItemToForm(const mx::UIPropertyItem& item, const std::st
         auto colorVar = new EditorColorPicker(twoColumns, c);
         colorVar->set_fixed_size({ 100, 20 });
         colorVar->set_font_size(15);
-        colorVar->set_final_callback([path, viewer](const ng::Color &c)
+        colorVar->set_final_callback([path, viewer](const ng::Color& c)
         {
             mx::MaterialPtr material = viewer->getSelectedMaterial();
             if (material)
@@ -583,10 +583,10 @@ void PropertyEditor::addItemToForm(const mx::UIPropertyItem& item, const std::st
             else
             {
                 new ng::Label(twoColumns, label);
-                ng::TextBox* stringVar =  new ng::TextBox(twoColumns, v);
+                ng::TextBox* stringVar = new ng::TextBox(twoColumns, v);
                 stringVar->set_fixed_size({ 100, 20 });
                 stringVar->set_font_size(15);
-                stringVar->set_callback([path, viewer](const std::string &v)
+                stringVar->set_callback([path, viewer](const std::string& v)
                 {
                     mx::MaterialPtr material = viewer->getSelectedMaterial();
                     mx::ShaderPort* uniform = material ? material->findUniform(path) : nullptr;
@@ -646,7 +646,7 @@ void PropertyEditor::updateContents(Viewer* viewer)
         mx::UIPropertyGroup groups;
         mx::UIPropertyGroup unnamedGroups;
         const std::string pathSeparator(":");
-        mx::createUIPropertyGroups(elem->getDocument(), *publicUniforms, groups, unnamedGroups, pathSeparator); 
+        mx::createUIPropertyGroups(elem->getDocument(), *publicUniforms, groups, unnamedGroups, pathSeparator);
 
         // First add items with named groups.
         std::string previousFolder;
@@ -691,7 +691,7 @@ ng::FloatBox* createFloatWidget(ng::Widget* parent, const std::string& la
 {
     new ng::Label(parent, label);
 
-    ng::Slider *slider = new ng::Slider(parent);
+    ng::Slider* slider = new ng::Slider(parent);
     slider->set_value(value);
 
     ng::FloatBox* box = new ng::FloatBox(parent, value);
@@ -732,7 +732,7 @@ ng::FloatBox* createFloatWidget(ng::Widget* parent, const std::string& la
         }
     }
 
-    slider->set_callback([box, callback](float value) 
+    slider->set_callback([box, callback](float value)
     {
         box->set_value(value);
         callback(value);
@@ -747,12 +747,12 @@ ng::FloatBox* createFloatWidget(ng::Widget* parent, const std::string& la
 }
 
 ng::IntBox* createIntWidget(ng::Widget* parent, const std::string& label, int value,
-    const mx::UIProperties* ui, std::function callback)
+                                 const mx::UIProperties* ui, std::function callback)
 {
     new ng::Label(parent, label);
 
-    ng::Slider *slider = new ng::Slider(parent);
-    slider->set_value((float)value);
+    ng::Slider* slider = new ng::Slider(parent);
+    slider->set_value((float) value);
 
     ng::IntBox* box = new ng::IntBox(parent, value);
     box->set_fixed_width(60);
@@ -781,7 +781,7 @@ ng::IntBox* createIntWidget(ng::Widget* parent, const std::string& label, i
         }
         if (range.first != range.second)
         {
-            std::pair float_range((float)range.first, (float)range.second);
+            std::pair float_range((float) range.first, (float) range.second);
             slider->set_range(float_range);
         }
         if (ui->uiStep)
@@ -794,12 +794,12 @@ ng::IntBox* createIntWidget(ng::Widget* parent, const std::string& label, i
 
     slider->set_callback([box, callback](float value)
     {
-        box->set_value((int)value);
-        callback((int)value);
+        box->set_value((int) value);
+        callback((int) value);
     });
     box->set_callback([slider, callback](int value)
     {
-        slider->set_value((float)value);
+        slider->set_value((float) value);
         callback(value);
     });
 
diff --git a/source/MaterialXView/Editor.h b/source/MaterialXView/Editor.h
index 8e74ca987d..b1fb4a3ade 100644
--- a/source/MaterialXView/Editor.h
+++ b/source/MaterialXView/Editor.h
@@ -19,7 +19,7 @@ namespace ng = nanogui;
 
 class Viewer;
 
-class PropertyEditor 
+class PropertyEditor
 {
   public:
     PropertyEditor();
@@ -58,7 +58,7 @@ class PropertyEditor
 };
 
 ng::FloatBox* createFloatWidget(ng::Widget* parent, const std::string& label, float value,
-                                       const mx::UIProperties*ui, std::function callback = nullptr);
+                                       const mx::UIProperties* ui, std::function callback = nullptr);
 ng::IntBox* createIntWidget(ng::Widget* parent, const std::string& label, int value,
                                  const mx::UIProperties* ui, std::function callback);
 
diff --git a/source/MaterialXView/Main.cpp b/source/MaterialXView/Main.cpp
index 99104f7fa2..c703e48883 100644
--- a/source/MaterialXView/Main.cpp
+++ b/source/MaterialXView/Main.cpp
@@ -13,40 +13,40 @@
 
 NANOGUI_FORCE_DISCRETE_GPU();
 
-const std::string options = 
-" Options: \n"
-"    --material [FILENAME]          Specify the filename of the MTLX document to be displayed in the viewer\n"
-"    --mesh [FILENAME]              Specify the filename of the OBJ mesh to be displayed in the viewer\n"
-"    --meshRotation [VECTOR3]       Specify the rotation of the displayed mesh as three comma-separated floats, representing rotations in degrees about the X, Y, and Z axes (defaults to 0,0,0)\n"
-"    --meshScale [FLOAT]            Specify the uniform scale of the displayed mesh\n"
-"    --enableTurntable[BOOLEAN]     Specify whether to enable turntable rendering of the scene\n"
-"    --turntableSteps [INTEGER]     Specify the number of steps for a complete turntable rotation. Defaults to 360\n"
-"    --cameraPosition [VECTOR3]     Specify the position of the camera as three comma-separated floats (defaults to 0,0,5)\n"
-"    --cameraTarget [VECTOR3]       Specify the position of the camera target as three comma-separated floats (defaults to 0,0,0)\n"
-"    --cameraViewAngle [FLOAT]      Specify the view angle of the camera, or zero for an orthographic projection (defaults to 45)\n"
-"    --cameraZoom [FLOAT]           Specify the zoom factor for the camera, implemented as a mesh scale multiplier (defaults to 1)\n"
-"    --envRad [FILENAME]            Specify the filename of the environment light to display, stored as HDR environment radiance in the latitude-longitude format\n"
-"    --envMethod [INTEGER]          Specify the environment lighting method (0 = filtered importance sampling, 1 = prefiltered environment maps, defaults to 0)\n"
-"    --envSampleCount [INTEGER]     Specify the environment sample count (defaults to 16)\n"
-"    --lightRotation [FLOAT]        Specify the rotation in degrees of the lighting environment about the Y axis (defaults to 0)\n"
-"    --shadowMap [BOOLEAN]          Specify whether shadow mapping is enabled (defaults to true)\n"
-"    --path [FILEPATH]              Specify an additional data search path location (e.g. '/projects/MaterialX').  This absolute path will be queried when locating data libraries, XInclude references, and referenced images.\n"
-"    --library [FILEPATH]           Specify an additional data library folder (e.g. 'vendorlib', 'studiolib').  This relative path will be appended to each location in the data search path when loading data libraries.\n"
-"    --screenWidth [INTEGER]        Specify the width of the screen image in pixels (defaults to 1280)\n"
-"    --screenHeight [INTEGER]       Specify the height of the screen image in pixels (defaults to 960)\n"
-"    --screenColor [VECTOR3]        Specify the background color of the viewer as three comma-separated floats (defaults to 0.3,0.3,0.32)\n"
-"    --drawEnvironment [BOOLEAN]    Specify whether to render the environment as the background (defaults to false)\n"
-"    --captureFilename [FILENAME]   Specify the filename to which the first rendered frame should be written\n"
-"    --bakeWidth [INTEGER]          Specify the target width for texture baking (defaults to maximum image width of the source document)\n"
-"    --bakeHeight [INTEGER]         Specify the target height for texture baking (defaults to maximum image height of the source document)\n"
-"    --bakeFilename [STRING]        Specify the output document filename for texture baking\n"
-"    --refresh [FLOAT]              Specify the refresh period for the viewer in milliseconds (defaults to 50, set to -1 to disable)\n"
-"    --remap [TOKEN1:TOKEN2]        Specify the remapping from one token to another when MaterialX document is loaded\n"
-"    --skip [NAME]                  Specify to skip elements matching the given name attribute\n"
-"    --terminator [STRING]          Specify to enforce the given terminator string for file prefixes\n"
-"    --help                         Display the complete list of command-line options\n";
+const std::string options =
+    " Options: \n"
+    "    --material [FILENAME]          Specify the filename of the MTLX document to be displayed in the viewer\n"
+    "    --mesh [FILENAME]              Specify the filename of the OBJ mesh to be displayed in the viewer\n"
+    "    --meshRotation [VECTOR3]       Specify the rotation of the displayed mesh as three comma-separated floats, representing rotations in degrees about the X, Y, and Z axes (defaults to 0,0,0)\n"
+    "    --meshScale [FLOAT]            Specify the uniform scale of the displayed mesh\n"
+    "    --enableTurntable[BOOLEAN]     Specify whether to enable turntable rendering of the scene\n"
+    "    --turntableSteps [INTEGER]     Specify the number of steps for a complete turntable rotation. Defaults to 360\n"
+    "    --cameraPosition [VECTOR3]     Specify the position of the camera as three comma-separated floats (defaults to 0,0,5)\n"
+    "    --cameraTarget [VECTOR3]       Specify the position of the camera target as three comma-separated floats (defaults to 0,0,0)\n"
+    "    --cameraViewAngle [FLOAT]      Specify the view angle of the camera, or zero for an orthographic projection (defaults to 45)\n"
+    "    --cameraZoom [FLOAT]           Specify the zoom factor for the camera, implemented as a mesh scale multiplier (defaults to 1)\n"
+    "    --envRad [FILENAME]            Specify the filename of the environment light to display, stored as HDR environment radiance in the latitude-longitude format\n"
+    "    --envMethod [INTEGER]          Specify the environment lighting method (0 = filtered importance sampling, 1 = prefiltered environment maps, defaults to 0)\n"
+    "    --envSampleCount [INTEGER]     Specify the environment sample count (defaults to 16)\n"
+    "    --lightRotation [FLOAT]        Specify the rotation in degrees of the lighting environment about the Y axis (defaults to 0)\n"
+    "    --shadowMap [BOOLEAN]          Specify whether shadow mapping is enabled (defaults to true)\n"
+    "    --path [FILEPATH]              Specify an additional data search path location (e.g. '/projects/MaterialX').  This absolute path will be queried when locating data libraries, XInclude references, and referenced images.\n"
+    "    --library [FILEPATH]           Specify an additional data library folder (e.g. 'vendorlib', 'studiolib').  This relative path will be appended to each location in the data search path when loading data libraries.\n"
+    "    --screenWidth [INTEGER]        Specify the width of the screen image in pixels (defaults to 1280)\n"
+    "    --screenHeight [INTEGER]       Specify the height of the screen image in pixels (defaults to 960)\n"
+    "    --screenColor [VECTOR3]        Specify the background color of the viewer as three comma-separated floats (defaults to 0.3,0.3,0.32)\n"
+    "    --drawEnvironment [BOOLEAN]    Specify whether to render the environment as the background (defaults to false)\n"
+    "    --captureFilename [FILENAME]   Specify the filename to which the first rendered frame should be written\n"
+    "    --bakeWidth [INTEGER]          Specify the target width for texture baking (defaults to maximum image width of the source document)\n"
+    "    --bakeHeight [INTEGER]         Specify the target height for texture baking (defaults to maximum image height of the source document)\n"
+    "    --bakeFilename [STRING]        Specify the output document filename for texture baking\n"
+    "    --refresh [FLOAT]              Specify the refresh period for the viewer in milliseconds (defaults to 50, set to -1 to disable)\n"
+    "    --remap [TOKEN1:TOKEN2]        Specify the remapping from one token to another when MaterialX document is loaded\n"
+    "    --skip [NAME]                  Specify to skip elements matching the given name attribute\n"
+    "    --terminator [STRING]          Specify to enforce the given terminator string for file prefixes\n"
+    "    --help                         Display the complete list of command-line options\n";
 
-template void parseToken(std::string token, std::string type, T& res)
+template  void parseToken(std::string token, std::string type, T& res)
 {
     if (token.empty())
     {
@@ -64,7 +64,7 @@ template void parseToken(std::string token, std::string type, T& res)
 }
 
 int main(int argc, char* const argv[])
-{  
+{
     std::vector tokens;
     for (int i = 1; i < argc; i++)
     {
@@ -131,7 +131,7 @@ int main(int argc, char* const argv[])
         else if (token == "--turntableSteps")
         {
             parseToken(nextToken, "integer", turntableSteps);
-            turntableSteps = std::clamp(turntableSteps, 2, 360);;
+            turntableSteps = std::clamp(turntableSteps, 2, 360);
         }
         else if (token == "--cameraPosition")
         {
@@ -159,7 +159,7 @@ int main(int argc, char* const argv[])
         else if (token == "--envSampleCount")
         {
             parseToken(nextToken, "integer", envSampleCount);
-        }       
+        }
         else if (token == "--lightRotation")
         {
             parseToken(nextToken, "float", lightRotation);
diff --git a/source/MaterialXView/RenderPipeline.h b/source/MaterialXView/RenderPipeline.h
index 82f5990513..87baac3fa4 100644
--- a/source/MaterialXView/RenderPipeline.h
+++ b/source/MaterialXView/RenderPipeline.h
@@ -44,16 +44,16 @@ class RenderPipeline
     virtual ~RenderPipeline() { }
 
     virtual void initialize(void* device, void* command_queue) = 0;
-    
+
     virtual mx::ImageHandlerPtr createImageHandler() = 0;
-    virtual mx::MaterialPtr     createMaterial() = 0;
+    virtual mx::MaterialPtr createMaterial() = 0;
     virtual void bakeTextures() = 0;
-    
+
     virtual void updateAlbedoTable(int tableSize) = 0;
     virtual std::shared_ptr createTextureBaker(unsigned int width,
                                                      unsigned int height,
                                                      mx::Image::BaseType baseType) = 0;
-    
+
     virtual void renderFrame(void* color_texture, int shadowMapSize, const char* dirLightNodeCat) = 0;
 
     virtual void initFramebuffer(int width, int height,
@@ -62,9 +62,9 @@ class RenderPipeline
                                    void* color_texture) = 0;
 
     virtual mx::ImagePtr getShadowMap(int shadowMapSize) = 0;
-    
+
     virtual mx::ImagePtr getFrameImage() = 0;
-    
+
   public:
     Viewer* _viewer;
 };

From 343a587ec01ed8293ac8b4f6fd34dbdea04a5df3 Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Mon, 4 Dec 2023 20:33:36 -0800
Subject: [PATCH 44/66] Improvements to GitHub CI

- Add a MacOS build with Xcode 15 and Python 3.12.
- Add INL files to the Clang Format step.
- Simplify CMake build steps.
---
 .github/workflows/main.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0a71a31011..1af8012ef0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -78,17 +78,17 @@ jobs:
           cmake_config: -DMATERIALX_BUILD_SHARED_LIBS=ON
           python: 3.7
 
-        - name: MacOS_Xcode_13_Python39
-          os: macos-12
-          compiler: xcode
-          compiler_version: "13.4"
-          python: 3.9
-
         - name: MacOS_Xcode_14_Python311
           os: macos-13
           compiler: xcode
           compiler_version: "14.3"
           python: 3.11
+
+        - name: MacOS_Xcode_15_Python312
+          os: macos-13
+          compiler: xcode
+          compiler_version: "15.0"
+          python: 3.12
           test_shaders: ON
 
         - name: iOS_Xcode_15
@@ -195,14 +195,13 @@ jobs:
 
     - name: Run Clang Format
       if: matrix.clang_format == 'ON'
-      run: find source \( -name *.h -o -name *.cpp -o -name *.mm \) ! -path "*/External/*" ! -path "*/NanoGUI/*" | xargs clang-format -i --verbose
+      run: find source \( -name *.h -o -name *.cpp -o -name *.mm -o -name *.inl \) ! -path "*/External/*" ! -path "*/NanoGUI/*" | xargs clang-format -i --verbose
 
     - name: CMake Generate
       run: cmake -S . -B build -DMATERIALX_BUILD_PYTHON=ON -DMATERIALX_BUILD_VIEWER=ON -DMATERIALX_BUILD_GRAPH_EDITOR=ON -DMATERIALX_TEST_RENDER=OFF -DMATERIALX_WARNINGS_AS_ERRORS=ON ${{matrix.cmake_config}}
 
     - name: CMake Build
-      run: cmake --build . --target install --config Release --parallel 2
-      working-directory: build
+      run: cmake --build build --target install --config Release --parallel 2
 
     - name: CMake Unit Tests
       run: ctest -VV --output-on-failure --build-config Release
@@ -314,8 +313,7 @@ jobs:
 
     - name: JavaScript CMake Build
       if: matrix.build_javascript == 'ON'
-      run: cmake --build . --target install --config Release --parallel 2
-      working-directory: javascript/build
+      run: cmake --build javascript/build --target install --config Release --parallel 2
     
     - name: JavaScript Unit Tests
       if: matrix.build_javascript == 'ON'

From cd82ea55f2a280a94ce748d3f03d04e00c00ca40 Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Fri, 8 Dec 2023 11:51:49 -0800
Subject: [PATCH 45/66] Update JavaScript packages

This changelist updates all referenced JavaScript packages to their latest version via 'npm update'.
---
 javascript/MaterialXTest/package-lock.json | 1252 ++++++++++----------
 javascript/MaterialXTest/package.json      |    8 +-
 javascript/MaterialXView/package-lock.json |  466 +++++---
 javascript/MaterialXView/package.json      |    4 +-
 4 files changed, 935 insertions(+), 795 deletions(-)

diff --git a/javascript/MaterialXTest/package-lock.json b/javascript/MaterialXTest/package-lock.json
index 7835f07ce5..5c3b779bc7 100644
--- a/javascript/MaterialXTest/package-lock.json
+++ b/javascript/MaterialXTest/package-lock.json
@@ -9,10 +9,10 @@
       "version": "1.0.0",
       "license": "ISC",
       "devDependencies": {
-        "@babel/core": "^7.22.5",
-        "@babel/preset-env": "^7.22.5",
-        "@babel/register": "^7.22.5",
-        "chai": "^4.3.7",
+        "@babel/core": "^7.23.5",
+        "@babel/preset-env": "^7.23.5",
+        "@babel/register": "^7.22.15",
+        "chai": "^4.3.10",
         "copyfiles": "^2.4.1",
         "karma": "^6.4.2",
         "karma-chai": "^0.1.0",
@@ -37,47 +37,48 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
-      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
+      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.22.5"
+        "@babel/highlight": "^7.23.4",
+        "chalk": "^2.4.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz",
-      "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
+      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz",
-      "integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.5.tgz",
+      "integrity": "sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.5",
-        "@babel/helper-module-transforms": "^7.22.5",
-        "@babel/helpers": "^7.22.5",
-        "@babel/parser": "^7.22.5",
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
-        "@babel/types": "^7.22.5",
-        "convert-source-map": "^1.7.0",
+        "@babel/code-frame": "^7.23.5",
+        "@babel/generator": "^7.23.5",
+        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-module-transforms": "^7.23.3",
+        "@babel/helpers": "^7.23.5",
+        "@babel/parser": "^7.23.5",
+        "@babel/template": "^7.22.15",
+        "@babel/traverse": "^7.23.5",
+        "@babel/types": "^7.23.5",
+        "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.2",
-        "semver": "^6.3.0"
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -88,12 +89,12 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz",
-      "integrity": "sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.5.tgz",
+      "integrity": "sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5",
+        "@babel/types": "^7.23.5",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -115,51 +116,48 @@
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz",
-      "integrity": "sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
+      "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz",
-      "integrity": "sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
+      "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.22.5",
-        "@babel/helper-validator-option": "^7.22.5",
-        "browserslist": "^4.21.3",
+        "@babel/compat-data": "^7.22.9",
+        "@babel/helper-validator-option": "^7.22.15",
+        "browserslist": "^4.21.9",
         "lru-cache": "^5.1.1",
-        "semver": "^6.3.0"
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz",
-      "integrity": "sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.5.tgz",
+      "integrity": "sha512-QELlRWxSpgdwdJzSJn4WAhKC+hvw/AtHbbrIoncKHkhKKR/luAlKkgBDcri1EzWAo8f8VvYVryEHN4tax/V67A==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
+        "@babel/helper-member-expression-to-functions": "^7.23.0",
         "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.20",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.5",
-        "semver": "^6.3.0"
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -169,14 +167,14 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz",
-      "integrity": "sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
+      "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
         "regexpu-core": "^5.3.1",
-        "semver": "^6.3.0"
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -186,39 +184,38 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz",
-      "integrity": "sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz",
+      "integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.17.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "debug": "^4.1.1",
         "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
+        "resolve": "^1.14.2"
       },
       "peerDependencies": {
-        "@babel/core": "^7.4.0-0"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
-      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
-      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -237,46 +234,46 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
-      "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
+      "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.23.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
-      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz",
-      "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
+      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-module-imports": "^7.22.15",
         "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5",
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-validator-identifier": "^7.22.20"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
@@ -301,15 +298,14 @@
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz",
-      "integrity": "sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
+      "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-wrap-function": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-wrap-function": "^7.22.20"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -319,20 +315,20 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz",
-      "integrity": "sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz",
+      "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-member-expression-to-functions": "^7.22.5",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-member-expression-to-functions": "^7.22.15",
+        "@babel/helper-optimise-call-expression": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-simple-access": {
@@ -360,9 +356,9 @@
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz",
-      "integrity": "sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "dev": true,
       "dependencies": {
         "@babel/types": "^7.22.5"
@@ -372,69 +368,68 @@
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
-      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
+      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz",
-      "integrity": "sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
+      "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-function-name": "^7.22.5",
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.22.19"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz",
-      "integrity": "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.5.tgz",
+      "integrity": "sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/template": "^7.22.15",
+        "@babel/traverse": "^7.23.5",
+        "@babel/types": "^7.23.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
-      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
+      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.5",
-        "chalk": "^2.0.0",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       },
       "engines": {
@@ -442,9 +437,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz",
-      "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.5.tgz",
+      "integrity": "sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -454,9 +449,9 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
-      "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz",
+      "integrity": "sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -469,14 +464,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
-      "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz",
+      "integrity": "sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.22.5"
+        "@babel/plugin-transform-optional-chaining": "^7.23.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -485,29 +480,29 @@
         "@babel/core": "^7.13.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.21.0-placeholder-for-preset-env.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
-      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
+    "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3.tgz",
+      "integrity": "sha512-XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w==",
       "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
-      "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
+    "node_modules/@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.21.0-placeholder-for-preset-env.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
       "engines": {
-        "node": ">=4"
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
@@ -577,9 +572,9 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
-      "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz",
+      "integrity": "sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -592,9 +587,9 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
-      "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz",
+      "integrity": "sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -749,9 +744,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
-      "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz",
+      "integrity": "sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -764,14 +759,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz",
-      "integrity": "sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.4.tgz",
+      "integrity": "sha512-efdkfPhHYTtn0G6n2ddrESE91fgXxjlqLsnUtPWnJs4a4mZIbUaK7ffqKIIUKXSHwcDvaCVX6GXkaJJFqtX7jw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.20",
         "@babel/plugin-syntax-async-generators": "^7.8.4"
       },
       "engines": {
@@ -782,14 +777,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
-      "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz",
+      "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.5"
+        "@babel/helper-remap-async-to-generator": "^7.22.20"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -799,9 +794,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
-      "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz",
+      "integrity": "sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -814,9 +809,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz",
-      "integrity": "sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz",
+      "integrity": "sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -829,12 +824,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
-      "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz",
+      "integrity": "sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -845,12 +840,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
-      "integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz",
+      "integrity": "sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-class-static-block": "^7.14.5"
       },
@@ -862,19 +857,19 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz",
-      "integrity": "sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.5.tgz",
+      "integrity": "sha512-jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-optimise-call-expression": "^7.22.5",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.20",
+        "@babel/helper-split-export-declaration": "^7.22.6",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -885,13 +880,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
-      "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz",
+      "integrity": "sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/template": "^7.22.5"
+        "@babel/template": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -901,9 +896,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz",
-      "integrity": "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz",
+      "integrity": "sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -916,12 +911,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
-      "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz",
+      "integrity": "sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -932,9 +927,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
-      "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz",
+      "integrity": "sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -947,9 +942,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
-      "integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz",
+      "integrity": "sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -963,12 +958,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
-      "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz",
+      "integrity": "sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -979,9 +974,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
-      "integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz",
+      "integrity": "sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -995,9 +990,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
-      "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.3.tgz",
+      "integrity": "sha512-X8jSm8X1CMwxmK878qsUGJRmbysKNbdpTv/O1/v0LuY/ZkZrng5WYiekYSdg9m09OTmDDUWeEDsTE+17WYbAZw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1010,13 +1005,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
-      "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz",
+      "integrity": "sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1027,9 +1022,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
-      "integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz",
+      "integrity": "sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1043,9 +1038,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
-      "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz",
+      "integrity": "sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1058,9 +1053,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
-      "integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz",
+      "integrity": "sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1074,9 +1069,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
-      "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz",
+      "integrity": "sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1089,12 +1084,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
-      "integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz",
+      "integrity": "sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.23.3",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1105,12 +1100,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
-      "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz",
+      "integrity": "sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.23.3",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-simple-access": "^7.22.5"
       },
@@ -1122,15 +1117,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
-      "integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz",
+      "integrity": "sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.23.3",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5"
+        "@babel/helper-validator-identifier": "^7.22.20"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1140,12 +1135,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
-      "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz",
+      "integrity": "sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.23.3",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1172,9 +1167,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
-      "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz",
+      "integrity": "sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1187,9 +1182,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
-      "integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz",
+      "integrity": "sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1203,9 +1198,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
-      "integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz",
+      "integrity": "sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1219,16 +1214,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
-      "integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz",
+      "integrity": "sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/compat-data": "^7.23.3",
+        "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.22.5"
+        "@babel/plugin-transform-parameters": "^7.23.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1238,13 +1233,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
-      "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz",
+      "integrity": "sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.5"
+        "@babel/helper-replace-supers": "^7.22.20"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1254,9 +1249,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
-      "integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz",
+      "integrity": "sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1270,9 +1265,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz",
-      "integrity": "sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz",
+      "integrity": "sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1287,9 +1282,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
-      "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz",
+      "integrity": "sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1302,12 +1297,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
-      "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz",
+      "integrity": "sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1318,13 +1313,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
-      "integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz",
+      "integrity": "sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       },
@@ -1336,9 +1331,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
-      "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz",
+      "integrity": "sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1351,13 +1346,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz",
-      "integrity": "sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz",
+      "integrity": "sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
-        "regenerator-transform": "^0.15.1"
+        "regenerator-transform": "^0.15.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1367,9 +1362,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
-      "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz",
+      "integrity": "sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1382,9 +1377,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
-      "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz",
+      "integrity": "sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1397,9 +1392,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
-      "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz",
+      "integrity": "sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1413,9 +1408,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
-      "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz",
+      "integrity": "sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1428,9 +1423,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
-      "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz",
+      "integrity": "sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1443,9 +1438,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
-      "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz",
+      "integrity": "sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1458,9 +1453,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz",
-      "integrity": "sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz",
+      "integrity": "sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1473,12 +1468,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
-      "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz",
+      "integrity": "sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1489,12 +1484,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
-      "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz",
+      "integrity": "sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1505,12 +1500,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
-      "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz",
+      "integrity": "sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1521,25 +1516,26 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.5.tgz",
-      "integrity": "sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.5.tgz",
+      "integrity": "sha512-0d/uxVD6tFGWXGDSfyMD1p2otoaKmu6+GD+NfAx0tMaH+dxORnp7T9TaVQ6mKyya7iBtCIVxHjWT7MuzzM9z+A==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/compat-data": "^7.23.5",
+        "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-option": "^7.22.5",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
+        "@babel/helper-validator-option": "^7.23.5",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.3",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.22.5",
-        "@babel/plugin-syntax-import-attributes": "^7.22.5",
+        "@babel/plugin-syntax-import-assertions": "^7.23.3",
+        "@babel/plugin-syntax-import-attributes": "^7.23.3",
         "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
@@ -1551,61 +1547,60 @@
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.22.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.22.5",
-        "@babel/plugin-transform-async-to-generator": "^7.22.5",
-        "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
-        "@babel/plugin-transform-block-scoping": "^7.22.5",
-        "@babel/plugin-transform-class-properties": "^7.22.5",
-        "@babel/plugin-transform-class-static-block": "^7.22.5",
-        "@babel/plugin-transform-classes": "^7.22.5",
-        "@babel/plugin-transform-computed-properties": "^7.22.5",
-        "@babel/plugin-transform-destructuring": "^7.22.5",
-        "@babel/plugin-transform-dotall-regex": "^7.22.5",
-        "@babel/plugin-transform-duplicate-keys": "^7.22.5",
-        "@babel/plugin-transform-dynamic-import": "^7.22.5",
-        "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
-        "@babel/plugin-transform-export-namespace-from": "^7.22.5",
-        "@babel/plugin-transform-for-of": "^7.22.5",
-        "@babel/plugin-transform-function-name": "^7.22.5",
-        "@babel/plugin-transform-json-strings": "^7.22.5",
-        "@babel/plugin-transform-literals": "^7.22.5",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
-        "@babel/plugin-transform-member-expression-literals": "^7.22.5",
-        "@babel/plugin-transform-modules-amd": "^7.22.5",
-        "@babel/plugin-transform-modules-commonjs": "^7.22.5",
-        "@babel/plugin-transform-modules-systemjs": "^7.22.5",
-        "@babel/plugin-transform-modules-umd": "^7.22.5",
+        "@babel/plugin-transform-arrow-functions": "^7.23.3",
+        "@babel/plugin-transform-async-generator-functions": "^7.23.4",
+        "@babel/plugin-transform-async-to-generator": "^7.23.3",
+        "@babel/plugin-transform-block-scoped-functions": "^7.23.3",
+        "@babel/plugin-transform-block-scoping": "^7.23.4",
+        "@babel/plugin-transform-class-properties": "^7.23.3",
+        "@babel/plugin-transform-class-static-block": "^7.23.4",
+        "@babel/plugin-transform-classes": "^7.23.5",
+        "@babel/plugin-transform-computed-properties": "^7.23.3",
+        "@babel/plugin-transform-destructuring": "^7.23.3",
+        "@babel/plugin-transform-dotall-regex": "^7.23.3",
+        "@babel/plugin-transform-duplicate-keys": "^7.23.3",
+        "@babel/plugin-transform-dynamic-import": "^7.23.4",
+        "@babel/plugin-transform-exponentiation-operator": "^7.23.3",
+        "@babel/plugin-transform-export-namespace-from": "^7.23.4",
+        "@babel/plugin-transform-for-of": "^7.23.3",
+        "@babel/plugin-transform-function-name": "^7.23.3",
+        "@babel/plugin-transform-json-strings": "^7.23.4",
+        "@babel/plugin-transform-literals": "^7.23.3",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.23.4",
+        "@babel/plugin-transform-member-expression-literals": "^7.23.3",
+        "@babel/plugin-transform-modules-amd": "^7.23.3",
+        "@babel/plugin-transform-modules-commonjs": "^7.23.3",
+        "@babel/plugin-transform-modules-systemjs": "^7.23.3",
+        "@babel/plugin-transform-modules-umd": "^7.23.3",
         "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-        "@babel/plugin-transform-new-target": "^7.22.5",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
-        "@babel/plugin-transform-numeric-separator": "^7.22.5",
-        "@babel/plugin-transform-object-rest-spread": "^7.22.5",
-        "@babel/plugin-transform-object-super": "^7.22.5",
-        "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.22.5",
-        "@babel/plugin-transform-parameters": "^7.22.5",
-        "@babel/plugin-transform-private-methods": "^7.22.5",
-        "@babel/plugin-transform-private-property-in-object": "^7.22.5",
-        "@babel/plugin-transform-property-literals": "^7.22.5",
-        "@babel/plugin-transform-regenerator": "^7.22.5",
-        "@babel/plugin-transform-reserved-words": "^7.22.5",
-        "@babel/plugin-transform-shorthand-properties": "^7.22.5",
-        "@babel/plugin-transform-spread": "^7.22.5",
-        "@babel/plugin-transform-sticky-regex": "^7.22.5",
-        "@babel/plugin-transform-template-literals": "^7.22.5",
-        "@babel/plugin-transform-typeof-symbol": "^7.22.5",
-        "@babel/plugin-transform-unicode-escapes": "^7.22.5",
-        "@babel/plugin-transform-unicode-property-regex": "^7.22.5",
-        "@babel/plugin-transform-unicode-regex": "^7.22.5",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
-        "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.22.5",
-        "babel-plugin-polyfill-corejs2": "^0.4.3",
-        "babel-plugin-polyfill-corejs3": "^0.8.1",
-        "babel-plugin-polyfill-regenerator": "^0.5.0",
-        "core-js-compat": "^3.30.2",
-        "semver": "^6.3.0"
+        "@babel/plugin-transform-new-target": "^7.23.3",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
+        "@babel/plugin-transform-numeric-separator": "^7.23.4",
+        "@babel/plugin-transform-object-rest-spread": "^7.23.4",
+        "@babel/plugin-transform-object-super": "^7.23.3",
+        "@babel/plugin-transform-optional-catch-binding": "^7.23.4",
+        "@babel/plugin-transform-optional-chaining": "^7.23.4",
+        "@babel/plugin-transform-parameters": "^7.23.3",
+        "@babel/plugin-transform-private-methods": "^7.23.3",
+        "@babel/plugin-transform-private-property-in-object": "^7.23.4",
+        "@babel/plugin-transform-property-literals": "^7.23.3",
+        "@babel/plugin-transform-regenerator": "^7.23.3",
+        "@babel/plugin-transform-reserved-words": "^7.23.3",
+        "@babel/plugin-transform-shorthand-properties": "^7.23.3",
+        "@babel/plugin-transform-spread": "^7.23.3",
+        "@babel/plugin-transform-sticky-regex": "^7.23.3",
+        "@babel/plugin-transform-template-literals": "^7.23.3",
+        "@babel/plugin-transform-typeof-symbol": "^7.23.3",
+        "@babel/plugin-transform-unicode-escapes": "^7.23.3",
+        "@babel/plugin-transform-unicode-property-regex": "^7.23.3",
+        "@babel/plugin-transform-unicode-regex": "^7.23.3",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.23.3",
+        "@babel/preset-modules": "0.1.6-no-external-plugins",
+        "babel-plugin-polyfill-corejs2": "^0.4.6",
+        "babel-plugin-polyfill-corejs3": "^0.8.5",
+        "babel-plugin-polyfill-regenerator": "^0.5.3",
+        "core-js-compat": "^3.31.0",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1615,25 +1610,23 @@
       }
     },
     "node_modules/@babel/preset-modules": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+      "version": "0.1.6-no-external-plugins",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
+      "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
         "@babel/types": "^7.4.4",
         "esutils": "^2.0.2"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/@babel/register": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.22.5.tgz",
-      "integrity": "sha512-vV6pm/4CijSQ8Y47RH5SopXzursN35RQINfGJkmOlcpAtGuf94miFvIPhCKGQN7WGIcsgG1BHEX2KVdTYwTwUQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.22.15.tgz",
+      "integrity": "sha512-V3Q3EqoQdn65RCgTLwauZaTfd1ShhwPmbBv+1dkZV/HpCGMKVyn6oFcRlI7RaKqiDQjX2Qd3AuoEguBgdjIKlg==",
       "dev": true,
       "dependencies": {
         "clone-deep": "^4.0.1",
@@ -1656,45 +1649,45 @@
       "dev": true
     },
     "node_modules/@babel/runtime": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.5.tgz",
-      "integrity": "sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.5.tgz",
+      "integrity": "sha512-NdUTHcPe4C99WxPub+K9l9tK5/lV4UXIoaHSYgzco9BCyjKAAwzdBI+wWtYqHt7LJdbo74ZjRPJgzVweq1sz0w==",
       "dev": true,
       "dependencies": {
-        "regenerator-runtime": "^0.13.11"
+        "regenerator-runtime": "^0.14.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
-      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.22.5",
-        "@babel/parser": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz",
-      "integrity": "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.5.tgz",
+      "integrity": "sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
+        "@babel/code-frame": "^7.23.5",
+        "@babel/generator": "^7.23.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.5",
-        "@babel/parser": "^7.22.5",
-        "@babel/types": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.23.5",
+        "@babel/types": "^7.23.5",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1703,13 +1696,13 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz",
-      "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.5.tgz",
+      "integrity": "sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/helper-string-parser": "^7.23.4",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -1740,9 +1733,9 @@
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
       "dev": true,
       "engines": {
         "node": ">=6.0.0"
@@ -1764,21 +1757,15 @@
       "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.18",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
-      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+      "version": "0.3.20",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
+      "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
-    "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-      "dev": true
-    },
     "node_modules/@socket.io/component-emitter": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
@@ -1792,19 +1779,22 @@
       "dev": true
     },
     "node_modules/@types/cors": {
-      "version": "2.8.13",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz",
-      "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==",
+      "version": "2.8.17",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz",
+      "integrity": "sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/node": {
-      "version": "20.3.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.3.3.tgz",
-      "integrity": "sha512-wheIYdr4NYML61AjC8MKj/2jrR/kDQri/CIpVoZwldwhnIrD/j9jIU5bJ8yBKuB2VhpFV7Ab6G2XkBjv9r9Zzw==",
-      "dev": true
+      "version": "20.10.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.4.tgz",
+      "integrity": "sha512-D08YG6rr8X90YB56tSIuBaddy/UXAA9RKJoFvrsnogAum/0pmjkgi4+2nx96A330FmioegBWmEYQ+syqCFaveg==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
     },
     "node_modules/accepts": {
       "version": "1.3.8",
@@ -1878,42 +1868,42 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz",
-      "integrity": "sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==",
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz",
+      "integrity": "sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.17.7",
-        "@babel/helper-define-polyfill-provider": "^0.4.0",
-        "semver": "^6.1.1"
+        "@babel/compat-data": "^7.22.6",
+        "@babel/helper-define-polyfill-provider": "^0.4.3",
+        "semver": "^6.3.1"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz",
-      "integrity": "sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==",
+      "version": "0.8.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.6.tgz",
+      "integrity": "sha512-leDIc4l4tUgU7str5BWLS2h8q2N4Nf6lGZP6UrNDxdtfF2g69eJ5L0H7S8A5Ln/arfFAfHor5InAdZuIOwZdgQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.4.0",
-        "core-js-compat": "^3.30.1"
+        "@babel/helper-define-polyfill-provider": "^0.4.3",
+        "core-js-compat": "^3.33.1"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz",
-      "integrity": "sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz",
+      "integrity": "sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.4.0"
+        "@babel/helper-define-polyfill-provider": "^0.4.3"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/balanced-match": {
@@ -2008,9 +1998,9 @@
       "dev": true
     },
     "node_modules/browserslist": {
-      "version": "4.21.9",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz",
-      "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==",
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz",
+      "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==",
       "dev": true,
       "funding": [
         {
@@ -2027,10 +2017,10 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001503",
-        "electron-to-chromium": "^1.4.431",
-        "node-releases": "^2.0.12",
-        "update-browserslist-db": "^1.0.11"
+        "caniuse-lite": "^1.0.30001565",
+        "electron-to-chromium": "^1.4.601",
+        "node-releases": "^2.0.14",
+        "update-browserslist-db": "^1.0.13"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -2055,13 +2045,14 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
+      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
       "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.1",
+        "set-function-length": "^1.1.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2080,9 +2071,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001512",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001512.tgz",
-      "integrity": "sha512-2S9nK0G/mE+jasCUsMPlARhRCts1ebcp2Ji8Y8PWi4NDE1iRdLCnEPHkEfeBrGC45L4isBx5ur3IQ6yTE2mRZw==",
+      "version": "1.0.30001566",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001566.tgz",
+      "integrity": "sha512-ggIhCsTxmITBAMmK8yZjEhCO5/47jKXPu6Dha/wuCS4JePVL+3uiDEBuhu2aIoT+bqTOR8L76Ip1ARL9xYsEJA==",
       "dev": true,
       "funding": [
         {
@@ -2100,18 +2091,18 @@
       ]
     },
     "node_modules/chai": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
-      "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz",
+      "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==",
       "dev": true,
       "dependencies": {
         "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^4.1.2",
-        "get-func-name": "^2.0.0",
-        "loupe": "^2.3.1",
+        "check-error": "^1.0.3",
+        "deep-eql": "^4.1.3",
+        "get-func-name": "^2.0.2",
+        "loupe": "^2.3.6",
         "pathval": "^1.1.1",
-        "type-detect": "^4.0.5"
+        "type-detect": "^4.0.8"
       },
       "engines": {
         "node": ">=4"
@@ -2132,10 +2123,13 @@
       }
     },
     "node_modules/check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
+      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
       "dev": true,
+      "dependencies": {
+        "get-func-name": "^2.0.2"
+      },
       "engines": {
         "node": "*"
       }
@@ -2280,9 +2274,9 @@
       }
     },
     "node_modules/convert-source-map": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
       "dev": true
     },
     "node_modules/cookie": {
@@ -2314,12 +2308,12 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.31.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.0.tgz",
-      "integrity": "sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==",
+      "version": "3.34.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.34.0.tgz",
+      "integrity": "sha512-4ZIyeNbW/Cn1wkMMDy+mvrRUxrwFNjKwbhCfQpDd+eLgYipDqp8oGFGtLmhh18EDPKA0g3VUBYOxQGGwvWLVpA==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.21.5"
+        "browserslist": "^4.22.2"
       },
       "funding": {
         "type": "opencollective",
@@ -2401,6 +2395,20 @@
         "node": ">=6"
       }
     },
+    "node_modules/define-data-property": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -2454,9 +2462,9 @@
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.449",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.449.tgz",
-      "integrity": "sha512-TxLRpRUj/107ATefeP8VIUWNOv90xJxZZbCW/eIbSZQiuiFANCx2b7u+GbVc9X4gU+xnbvypNMYVM/WArE1DNQ==",
+      "version": "1.4.609",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.609.tgz",
+      "integrity": "sha512-ihiCP7PJmjoGNuLpl7TjNA8pCQWu09vGyjlPYw1Rqww4gvNuCcmvl+44G+2QyJ6S2K4o+wbTS++Xz0YN8Q9ERw==",
       "dev": true
     },
     "node_modules/emoji-regex": {
@@ -2475,9 +2483,9 @@
       }
     },
     "node_modules/engine.io": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.1.tgz",
-      "integrity": "sha512-mGqhI+D7YxS9KJMppR6Iuo37Ed3abhU8NdfgSvJSDUafQutrN+sPTncJYTyM9+tkhSmWodKtVYGPPHyXJEwEQA==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.4.tgz",
+      "integrity": "sha512-KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg==",
       "dev": true,
       "dependencies": {
         "@types/cookie": "^0.4.1",
@@ -2488,17 +2496,17 @@
         "cookie": "~0.4.1",
         "cors": "~2.8.5",
         "debug": "~4.3.1",
-        "engine.io-parser": "~5.1.0",
+        "engine.io-parser": "~5.2.1",
         "ws": "~8.11.0"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=10.2.0"
       }
     },
     "node_modules/engine.io-parser": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.1.0.tgz",
-      "integrity": "sha512-enySgNiK5tyZFynt3z7iqBR+Bto9EVVVvDFuTT0ioHCGbzirZVGDGiQjZzEp8hWl6hd5FSVytJGuScX1C1C35w==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.1.tgz",
+      "integrity": "sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
@@ -2652,15 +2660,15 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "version": "3.2.9",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
+      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "version": "1.15.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
+      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
       "dev": true,
       "funding": [
         {
@@ -2698,9 +2706,9 @@
       "dev": true
     },
     "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "hasInstallScript": true,
       "optional": true,
@@ -2712,10 +2720,13 @@
       }
     },
     "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
@@ -2736,24 +2747,24 @@
       }
     },
     "node_modules/get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
       "dev": true,
       "engines": {
         "node": "*"
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
+      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
       "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
+        "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2800,24 +2811,24 @@
         "node": ">=4"
       }
     },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -2827,6 +2838,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
+      "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/has-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
@@ -2851,6 +2874,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/hasown": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -2940,12 +2975,12 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
-      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
       "dev": true,
       "dependencies": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -3264,12 +3299,12 @@
       }
     },
     "node_modules/loupe": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
-      "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
+      "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
       "dev": true,
       "dependencies": {
-        "get-func-name": "^2.0.0"
+        "get-func-name": "^2.0.1"
       }
     },
     "node_modules/lru-cache": {
@@ -3295,9 +3330,9 @@
       }
     },
     "node_modules/make-dir/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
       "bin": {
         "semver": "bin/semver"
@@ -3618,9 +3653,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz",
-      "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==",
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
       "dev": true
     },
     "node_modules/noms": {
@@ -3652,9 +3687,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -3965,9 +4000,9 @@
       "dev": true
     },
     "node_modules/regenerate-unicode-properties": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
-      "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
+      "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
       "dev": true,
       "dependencies": {
         "regenerate": "^1.4.2"
@@ -3977,15 +4012,15 @@
       }
     },
     "node_modules/regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
+      "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==",
       "dev": true
     },
     "node_modules/regenerator-transform": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz",
-      "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
       "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.8.4"
@@ -4045,12 +4080,12 @@
       "dev": true
     },
     "node_modules/resolve": {
-      "version": "1.22.2",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
       "dev": true,
       "dependencies": {
-        "is-core-module": "^2.11.0",
+        "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -4109,9 +4144,9 @@
       "dev": true
     },
     "node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
       "bin": {
         "semver": "bin/semver.js"
@@ -4126,6 +4161,21 @@
         "randombytes": "^2.1.0"
       }
     },
+    "node_modules/set-function-length": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
+      "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.1.1",
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -4159,21 +4209,21 @@
       }
     },
     "node_modules/socket.io": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.7.1.tgz",
-      "integrity": "sha512-W+utHys2w//dhFjy7iQQu9sGd3eokCjGbl2r59tyLqNiJJBdIebn3GAKEXBr3osqHTObJi2die/25bCx2zsaaw==",
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.7.2.tgz",
+      "integrity": "sha512-bvKVS29/I5fl2FGLNHuXlQaUH/BlzX1IN6S+NKLNZpBsPZIDH+90eQmCs2Railn4YUiww4SzUedJ6+uzwFnKLw==",
       "dev": true,
       "dependencies": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
         "cors": "~2.8.5",
         "debug": "~4.3.2",
-        "engine.io": "~6.5.0",
+        "engine.io": "~6.5.2",
         "socket.io-adapter": "~2.5.2",
         "socket.io-parser": "~4.2.4"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=10.2.0"
       }
     },
     "node_modules/socket.io-adapter": {
@@ -4440,9 +4490,9 @@
       }
     },
     "node_modules/ua-parser-js": {
-      "version": "0.7.35",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.35.tgz",
-      "integrity": "sha512-veRf7dawaj9xaWEu9HoTVn5Pggtc/qj+kqTOFvNiN1l0YdxwC1kvel57UCjThjGa3BHBihE8/UJAHI+uQHmd/g==",
+      "version": "0.7.37",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.37.tgz",
+      "integrity": "sha512-xV8kqRKM+jhMvcHWUKthV9fNebIzrNy//2O9ZwWcfiBFR5f25XVZPLlEajk/sf3Ra15V92isyQqnIEXRDaZWEA==",
       "dev": true,
       "funding": [
         {
@@ -4452,12 +4502,22 @@
         {
           "type": "paypal",
           "url": "https://paypal.me/faisalman"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/faisalman"
         }
       ],
       "engines": {
         "node": "*"
       }
     },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
@@ -4526,9 +4586,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
       "dev": true,
       "funding": [
         {
diff --git a/javascript/MaterialXTest/package.json b/javascript/MaterialXTest/package.json
index ac3fa3a182..cc67644462 100644
--- a/javascript/MaterialXTest/package.json
+++ b/javascript/MaterialXTest/package.json
@@ -16,10 +16,10 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@babel/core": "^7.22.5",
-    "@babel/preset-env": "^7.22.5",
-    "@babel/register": "^7.22.5",
-    "chai": "^4.3.7",
+    "@babel/core": "^7.23.5",
+    "@babel/preset-env": "^7.23.5",
+    "@babel/register": "^7.22.15",
+    "chai": "^4.3.10",
     "copyfiles": "^2.4.1",
     "karma": "^6.4.2",
     "karma-chai": "^0.1.0",
diff --git a/javascript/MaterialXView/package-lock.json b/javascript/MaterialXView/package-lock.json
index 7bdf38ceba..7a8e6f71d7 100644
--- a/javascript/MaterialXView/package-lock.json
+++ b/javascript/MaterialXView/package-lock.json
@@ -11,11 +11,11 @@
       "dependencies": {
         "dat.gui": "^0.7.9",
         "three": "^0.136.0",
-        "webpack": "^5.88.2"
+        "webpack": "^5.89.0"
       },
       "devDependencies": {
         "copy-webpack-plugin": "^8.1.1",
-        "html-webpack-plugin": "^5.5.3",
+        "html-webpack-plugin": "^5.5.4",
         "webpack-cli": "^4.10.0",
         "webpack-dev-server": "^4.15.1"
       }
@@ -43,9 +43,9 @@
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -73,19 +73,14 @@
       "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.18",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
-      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+      "version": "0.3.20",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
+      "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
       "dependencies": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
-    "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
-    },
     "node_modules/@leichtgewicht/ip-codec": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
@@ -128,9 +123,9 @@
       }
     },
     "node_modules/@types/body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
+      "version": "1.19.5",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
+      "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
       "dev": true,
       "dependencies": {
         "@types/connect": "*",
@@ -138,27 +133,27 @@
       }
     },
     "node_modules/@types/bonjour": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
-      "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
+      "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/connect": {
-      "version": "3.4.35",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
-      "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
+      "version": "3.4.38",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/connect-history-api-fallback": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
-      "integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
+      "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
       "dev": true,
       "dependencies": {
         "@types/express-serve-static-core": "*",
@@ -166,32 +161,32 @@
       }
     },
     "node_modules/@types/eslint": {
-      "version": "8.44.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.1.tgz",
-      "integrity": "sha512-XpNDc4Z5Tb4x+SW1MriMVeIsMoONHCkWFMkR/aPJbzEsxqHy+4Glu/BqTdPrApfDeMaXbtNh6bseNgl5KaWrSg==",
+      "version": "8.44.8",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.8.tgz",
+      "integrity": "sha512-4K8GavROwhrYl2QXDXm0Rv9epkA8GBFu0EI+XrrnnuCl7u8CWBRusX7fXJfanhZTDWSAL24gDI/UqXyUM0Injw==",
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
       }
     },
     "node_modules/@types/eslint-scope": {
-      "version": "3.7.4",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
-      "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
       "dependencies": {
         "@types/eslint": "*",
         "@types/estree": "*"
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
-      "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA=="
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
     },
     "node_modules/@types/express": {
-      "version": "4.17.17",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
-      "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
+      "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
       "dev": true,
       "dependencies": {
         "@types/body-parser": "*",
@@ -201,9 +196,9 @@
       }
     },
     "node_modules/@types/express-serve-static-core": {
-      "version": "4.17.35",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz",
-      "integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==",
+      "version": "4.17.41",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.41.tgz",
+      "integrity": "sha512-OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
@@ -219,46 +214,58 @@
       "dev": true
     },
     "node_modules/@types/http-errors": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz",
-      "integrity": "sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
+      "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",
       "dev": true
     },
     "node_modules/@types/http-proxy": {
-      "version": "1.17.11",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz",
-      "integrity": "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==",
+      "version": "1.17.14",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz",
+      "integrity": "sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/json-schema": {
-      "version": "7.0.12",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
-      "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA=="
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
     },
     "node_modules/@types/mime": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
-      "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
+      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.4.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.5.tgz",
-      "integrity": "sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg=="
+      "version": "20.10.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.4.tgz",
+      "integrity": "sha512-D08YG6rr8X90YB56tSIuBaddy/UXAA9RKJoFvrsnogAum/0pmjkgi4+2nx96A330FmioegBWmEYQ+syqCFaveg==",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@types/node-forge": {
+      "version": "1.3.10",
+      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.10.tgz",
+      "integrity": "sha512-y6PJDYN4xYBxwd22l+OVH35N+1fCYWiuC3aiP2SlXVE6Lo7SS+rSx9r89hLxrP4pn6n1lBGhHJ12pj3F3Mpttw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
     },
     "node_modules/@types/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
+      "version": "6.9.10",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.10.tgz",
+      "integrity": "sha512-3Gnx08Ns1sEoCrWssEgTSJs/rsT2vhGP+Ja9cnnk9k4ALxinORlQneLXFeFKOTJMOeZUFD1s7w+w2AphTpvzZw==",
       "dev": true
     },
     "node_modules/@types/range-parser": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
-      "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
+      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
       "dev": true
     },
     "node_modules/@types/retry": {
@@ -268,9 +275,9 @@
       "dev": true
     },
     "node_modules/@types/send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
+      "version": "0.17.4",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
+      "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
       "dev": true,
       "dependencies": {
         "@types/mime": "^1",
@@ -278,18 +285,18 @@
       }
     },
     "node_modules/@types/serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
+      "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
       "dev": true,
       "dependencies": {
         "@types/express": "*"
       }
     },
     "node_modules/@types/serve-static": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.2.tgz",
-      "integrity": "sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==",
+      "version": "1.15.5",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.5.tgz",
+      "integrity": "sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==",
       "dev": true,
       "dependencies": {
         "@types/http-errors": "*",
@@ -298,18 +305,18 @@
       }
     },
     "node_modules/@types/sockjs": {
-      "version": "0.3.33",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
-      "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
+      "version": "0.3.36",
+      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
+      "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/ws": {
-      "version": "8.5.5",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz",
-      "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
+      "version": "8.5.10",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
+      "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
@@ -506,9 +513,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+      "version": "8.11.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
+      "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -730,9 +737,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.21.9",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz",
-      "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==",
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz",
+      "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==",
       "funding": [
         {
           "type": "opencollective",
@@ -748,10 +755,10 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001503",
-        "electron-to-chromium": "^1.4.431",
-        "node-releases": "^2.0.12",
-        "update-browserslist-db": "^1.0.11"
+        "caniuse-lite": "^1.0.30001565",
+        "electron-to-chromium": "^1.4.601",
+        "node-releases": "^2.0.14",
+        "update-browserslist-db": "^1.0.13"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -775,13 +782,14 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
+      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
       "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.1",
+        "set-function-length": "^1.1.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -798,9 +806,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001517",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz",
-      "integrity": "sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==",
+      "version": "1.0.30001566",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001566.tgz",
+      "integrity": "sha512-ggIhCsTxmITBAMmK8yZjEhCO5/47jKXPu6Dha/wuCS4JePVL+3uiDEBuhu2aIoT+bqTOR8L76Ip1ARL9xYsEJA==",
       "funding": [
         {
           "type": "opencollective",
@@ -852,9 +860,9 @@
       }
     },
     "node_modules/clean-css": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz",
-      "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz",
+      "integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==",
       "dev": true,
       "dependencies": {
         "source-map": "~0.6.0"
@@ -1078,6 +1086,20 @@
         "node": ">= 10"
       }
     },
+    "node_modules/define-data-property": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/define-lazy-prop": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
@@ -1131,9 +1153,9 @@
       "dev": true
     },
     "node_modules/dns-packet": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.0.tgz",
-      "integrity": "sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ==",
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
+      "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
       "dev": true,
       "dependencies": {
         "@leichtgewicht/ip-codec": "^2.0.1"
@@ -1223,9 +1245,9 @@
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.470",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.470.tgz",
-      "integrity": "sha512-zZM48Lmy2FKWgqyvsX9XK+J6FfP7aCDUFLmgooLJzA7v1agCs/sxSoBpTIwDLhmbhpx9yJIxj2INig/ncjJRqg=="
+      "version": "1.4.609",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.609.tgz",
+      "integrity": "sha512-ihiCP7PJmjoGNuLpl7TjNA8pCQWu09vGyjlPYw1Rqww4gvNuCcmvl+44G+2QyJ6S2K4o+wbTS++Xz0YN8Q9ERw=="
     },
     "node_modules/encodeurl": {
       "version": "1.0.2",
@@ -1258,9 +1280,9 @@
       }
     },
     "node_modules/envinfo": {
-      "version": "7.10.0",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.10.0.tgz",
-      "integrity": "sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.11.0.tgz",
+      "integrity": "sha512-G9/6xF1FPbIw0TtalAMaVPpiq2aDEuKLXM314jPVAO9r2fo2a4BLqMNkmRS7O/xPPZ+COAhGIz3ETvHEV3eUcg==",
       "dev": true,
       "bin": {
         "envinfo": "dist/cli.js"
@@ -1270,9 +1292,9 @@
       }
     },
     "node_modules/es-module-lexer": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
-      "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA=="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz",
+      "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w=="
     },
     "node_modules/escalade": {
       "version": "3.1.1",
@@ -1427,9 +1449,9 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "node_modules/fast-glob": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
-      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -1520,10 +1542,19 @@
         "node": ">=8"
       }
     },
+    "node_modules/flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true,
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
     "node_modules/follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "version": "1.15.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
+      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
       "dev": true,
       "funding": [
         {
@@ -1559,9 +1590,9 @@
       }
     },
     "node_modules/fs-monkey": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz",
-      "integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz",
+      "integrity": "sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==",
       "dev": true
     },
     "node_modules/fs.realpath": {
@@ -1571,9 +1602,9 @@
       "dev": true
     },
     "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "hasInstallScript": true,
       "optional": true,
@@ -1585,21 +1616,24 @@
       }
     },
     "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
+      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
       "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
+        "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1674,6 +1708,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
@@ -1685,18 +1731,6 @@
       "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
       "dev": true
     },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -1705,6 +1739,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
+      "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/has-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
@@ -1729,6 +1775,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/hasown": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -1818,9 +1876,9 @@
       }
     },
     "node_modules/html-webpack-plugin": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz",
-      "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==",
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.4.tgz",
+      "integrity": "sha512-3wNSaVVxdxcu0jd4FpQFoICdqgxs4zIQQvj+2yQKFfBOnLETQ6X5CDWdeasuGlSsooFlMkEioWDTqBv1wvw5Iw==",
       "dev": true,
       "dependencies": {
         "@types/html-minifier-terser": "^6.0.0",
@@ -1947,9 +2005,9 @@
       }
     },
     "node_modules/ignore": {
-      "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
+      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -2021,12 +2079,12 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
-      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
       "dev": true,
       "dependencies": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2179,13 +2237,13 @@
       }
     },
     "node_modules/launch-editor": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz",
-      "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz",
+      "integrity": "sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==",
       "dev": true,
       "dependencies": {
         "picocolors": "^1.0.0",
-        "shell-quote": "^1.7.3"
+        "shell-quote": "^1.8.1"
       }
     },
     "node_modules/loader-runner": {
@@ -2397,9 +2455,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
@@ -2435,9 +2493,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2720,9 +2778,9 @@
       }
     },
     "node_modules/punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "engines": {
         "node": ">=6"
       }
@@ -2879,12 +2937,12 @@
       "dev": true
     },
     "node_modules/resolve": {
-      "version": "1.22.2",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
       "dev": true,
       "dependencies": {
-        "is-core-module": "^2.11.0",
+        "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -3022,11 +3080,12 @@
       "dev": true
     },
     "node_modules/selfsigned": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
-      "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
+      "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
       "dev": true,
       "dependencies": {
+        "@types/node-forge": "^1.3.0",
         "node-forge": "^1"
       },
       "engines": {
@@ -3150,6 +3209,21 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/set-function-length": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
+      "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.1.1",
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -3405,9 +3479,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.19.2",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
-      "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
+      "version": "5.26.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.26.0.tgz",
+      "integrity": "sha512-dytTGoE2oHgbNV9nTzgBEPaqAWvcJNl66VZ0BkJqlvp71IjO8CxdBx/ykCNb47cLnCmCvRZ6ZR0tLkqvZCdVBQ==",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -3500,9 +3574,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
-      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
       "dev": true
     },
     "node_modules/type-is": {
@@ -3518,6 +3592,11 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+    },
     "node_modules/unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -3528,9 +3607,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
       "funding": [
         {
           "type": "opencollective",
@@ -3625,9 +3704,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.88.2",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz",
-      "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==",
+      "version": "5.89.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz",
+      "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==",
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^1.0.0",
@@ -3915,12 +3994,13 @@
       }
     },
     "node_modules/webpack-merge": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.9.0.tgz",
-      "integrity": "sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==",
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
+      "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
       "dev": true,
       "dependencies": {
         "clone-deep": "^4.0.1",
+        "flat": "^5.0.2",
         "wildcard": "^2.0.0"
       },
       "engines": {
@@ -3986,9 +4066,9 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+      "version": "8.14.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
+      "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
diff --git a/javascript/MaterialXView/package.json b/javascript/MaterialXView/package.json
index adce3d2e82..8912357208 100644
--- a/javascript/MaterialXView/package.json
+++ b/javascript/MaterialXView/package.json
@@ -12,11 +12,11 @@
   "dependencies": {
     "dat.gui": "^0.7.9",
     "three": "^0.136.0",
-    "webpack": "^5.88.2"
+    "webpack": "^5.89.0"
   },
   "devDependencies": {
     "copy-webpack-plugin": "^8.1.1",
-    "html-webpack-plugin": "^5.5.3",
+    "html-webpack-plugin": "^5.5.4",
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.15.1"
   }

From 20022bcd4a8981c1537f093fabcbbadad598d6fc Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Tue, 12 Dec 2023 18:42:20 -0800
Subject: [PATCH 46/66] Update three.js to r152

This changelist updates the version of three.js to r152 in the MaterialX Web Viewer, making a handful of adjustments to account for changes in texture storage conventions.
---
 javascript/MaterialXView/package-lock.json | 32 ++++++------
 javascript/MaterialXView/package.json      |  2 +-
 javascript/MaterialXView/source/helper.js  | 60 +++-------------------
 javascript/MaterialXView/source/index.js   |  4 +-
 4 files changed, 27 insertions(+), 71 deletions(-)

diff --git a/javascript/MaterialXView/package-lock.json b/javascript/MaterialXView/package-lock.json
index 7a8e6f71d7..d5338a3517 100644
--- a/javascript/MaterialXView/package-lock.json
+++ b/javascript/MaterialXView/package-lock.json
@@ -10,7 +10,7 @@
       "license": "ISC",
       "dependencies": {
         "dat.gui": "^0.7.9",
-        "three": "^0.136.0",
+        "three": "^0.152.2",
         "webpack": "^5.89.0"
       },
       "devDependencies": {
@@ -161,9 +161,9 @@
       }
     },
     "node_modules/@types/eslint": {
-      "version": "8.44.8",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.8.tgz",
-      "integrity": "sha512-4K8GavROwhrYl2QXDXm0Rv9epkA8GBFu0EI+XrrnnuCl7u8CWBRusX7fXJfanhZTDWSAL24gDI/UqXyUM0Injw==",
+      "version": "8.44.9",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.9.tgz",
+      "integrity": "sha512-6yBxcvwnnYoYT1Uk2d+jvIfsuP4mb2EdIxFnrPABj5a/838qe5bGkNLFOiipX4ULQ7XVQvTxOh7jO+BTAiqsEw==",
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -806,9 +806,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001566",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001566.tgz",
-      "integrity": "sha512-ggIhCsTxmITBAMmK8yZjEhCO5/47jKXPu6Dha/wuCS4JePVL+3uiDEBuhu2aIoT+bqTOR8L76Ip1ARL9xYsEJA==",
+      "version": "1.0.30001570",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001570.tgz",
+      "integrity": "sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw==",
       "funding": [
         {
           "type": "opencollective",
@@ -1245,9 +1245,9 @@
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.609",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.609.tgz",
-      "integrity": "sha512-ihiCP7PJmjoGNuLpl7TjNA8pCQWu09vGyjlPYw1Rqww4gvNuCcmvl+44G+2QyJ6S2K4o+wbTS++Xz0YN8Q9ERw=="
+      "version": "1.4.613",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.613.tgz",
+      "integrity": "sha512-r4x5+FowKG6q+/Wj0W9nidx7QO31BJwmR2uEo+Qh3YLGQ8SbBAFuDFpTxzly/I2gsbrFwBuIjrMp423L3O5U3w=="
     },
     "node_modules/encodeurl": {
       "version": "1.0.2",
@@ -3542,9 +3542,9 @@
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
     },
     "node_modules/three": {
-      "version": "0.136.0",
-      "resolved": "https://registry.npmjs.org/three/-/three-0.136.0.tgz",
-      "integrity": "sha512-+fEMX7nYLz2ZesVP/dyifli5Jf8gR3XPAnFJveQ80aMhibFduzrADnjMbARXh8+W9qLK7rshJCjAIL/6cDxC+A=="
+      "version": "0.152.2",
+      "resolved": "https://registry.npmjs.org/three/-/three-0.152.2.tgz",
+      "integrity": "sha512-Ff9zIpSfkkqcBcpdiFo2f35vA9ZucO+N8TNacJOqaEE6DrB0eufItVMib8bK8Pcju/ZNT6a7blE1GhTpkdsILw=="
     },
     "node_modules/thunky": {
       "version": "1.1.0",
@@ -4066,9 +4066,9 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "8.14.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
-      "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
+      "version": "8.15.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.15.1.tgz",
+      "integrity": "sha512-W5OZiCjXEmk0yZ66ZN82beM5Sz7l7coYxpRkzS+p9PP+ToQry8szKh+61eNktr7EA9DOwvFGhfC605jDHbP6QQ==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
diff --git a/javascript/MaterialXView/package.json b/javascript/MaterialXView/package.json
index 8912357208..9518156883 100644
--- a/javascript/MaterialXView/package.json
+++ b/javascript/MaterialXView/package.json
@@ -11,7 +11,7 @@
   "license": "ISC",
   "dependencies": {
     "dat.gui": "^0.7.9",
-    "three": "^0.136.0",
+    "three": "^0.152.2",
     "webpack": "^5.89.0"
   },
   "devDependencies": {
diff --git a/javascript/MaterialXView/source/helper.js b/javascript/MaterialXView/source/helper.js
index 111dfd9b5d..98441a605f 100644
--- a/javascript/MaterialXView/source/helper.js
+++ b/javascript/MaterialXView/source/helper.js
@@ -19,59 +19,15 @@ const IMAGE_PATH_SEPARATOR = "/";
  */
 export function prepareEnvTexture(texture, capabilities)
 {
-    const rgbaTexture = RGBToRGBA_Float(texture);
-    rgbaTexture.wrapS = THREE.RepeatWrapping;
-    rgbaTexture.anisotropy = capabilities.getMaxAnisotropy();
-    rgbaTexture.minFilter = THREE.LinearMipmapLinearFilter;
-    rgbaTexture.magFilter = THREE.LinearFilter;
-    rgbaTexture.generateMipmaps = true;
-    rgbaTexture.needsUpdate = true;
+    let newTexture = new THREE.DataTexture(texture.image.data, texture.image.width, texture.image.height, texture.format, texture.type);
+    newTexture.wrapS = THREE.RepeatWrapping;
+    newTexture.anisotropy = capabilities.getMaxAnisotropy();
+    newTexture.minFilter = THREE.LinearMipmapLinearFilter;
+    newTexture.magFilter = THREE.LinearFilter;
+    newTexture.generateMipmaps = true;
+    newTexture.needsUpdate = true;
 
-    return rgbaTexture;
-}
-
-/**
- * Create a new (half)float texture containing an alpha channel with a value of 1 from a RGB (half)float texture.
- * @param {THREE.Texture} texture
- */
-function RGBToRGBA_Float(texture)
-{
-    const w = texture.image.width;
-    const h = texture.image.height;
-    const dataSize = texture.image.data.length; 
-    const stride = dataSize / (w *h);
-    // No need to convert to RGBA if already 4 channel.
-    if (stride == 3)
-    {
-        const rgbData = texture.image.data;
-        const length = (rgbData.length / 3) * 4;
-        let rgbaData;
-
-        switch (texture.type)
-        {
-            case THREE.FloatType:
-                rgbaData = new Float32Array(length);
-                break;
-            case THREE.HalfFloatType:
-                rgbaData = new Uint16Array(length);
-                break;
-            default:
-                break;
-        }
-
-        if (rgbaData)
-        {
-            for (let i = 0; i < length / 4; i++)
-            {
-                rgbaData[(i * 4) + 0] = rgbData[(i * 3) + 0];
-                rgbaData[(i * 4) + 1] = rgbData[(i * 3) + 1];
-                rgbaData[(i * 4) + 2] = rgbData[(i * 3) + 2];
-                rgbaData[(i * 4) + 3] = 1.0;
-            }
-            return new THREE.DataTexture(rgbaData, texture.image.width, texture.image.height, THREE.RGBAFormat, texture.type);
-        }
-    }
-    return texture;
+    return newTexture;
 }
 
 /**
diff --git a/javascript/MaterialXView/source/index.js b/javascript/MaterialXView/source/index.js
index 56e2e1f5a2..fa729ce4a6 100644
--- a/javascript/MaterialXView/source/index.js
+++ b/javascript/MaterialXView/source/index.js
@@ -83,10 +83,10 @@ function init()
     viewer.getEditor().initialize();
 
     const hdrLoader = viewer.getHdrLoader();
-    const fileLooder = viewer.getFileLoader();
+    const fileLoader = viewer.getFileLoader();
     Promise.all([
         new Promise(resolve => hdrLoader.setDataType(THREE.FloatType).load('Lights/san_giuseppe_bridge_split.hdr', resolve)),
-        new Promise(resolve => fileLooder.load('Lights/san_giuseppe_bridge_split.mtlx', resolve)),
+        new Promise(resolve => fileLoader.load('Lights/san_giuseppe_bridge_split.mtlx', resolve)),
         new Promise(resolve => hdrLoader.setDataType(THREE.FloatType).load('Lights/irradiance/san_giuseppe_bridge_split.hdr', resolve)),
         new Promise(function (resolve) {
             MaterialX().then((module) => {

From 1ef4619977c146549032122cabcd1baaa1a1ddd4 Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Sat, 16 Dec 2023 22:29:59 -0800
Subject: [PATCH 47/66] Web viewer HDRI improvements

- Load HDR images in half-float format, improving render performance and browser compatibility.
- Clarify HDR image names.
---
 javascript/MaterialXView/source/index.js  |  8 ++++----
 javascript/MaterialXView/source/viewer.js | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/javascript/MaterialXView/source/index.js b/javascript/MaterialXView/source/index.js
index fa729ce4a6..6f0b6e44b3 100644
--- a/javascript/MaterialXView/source/index.js
+++ b/javascript/MaterialXView/source/index.js
@@ -85,18 +85,18 @@ function init()
     const hdrLoader = viewer.getHdrLoader();
     const fileLoader = viewer.getFileLoader();
     Promise.all([
-        new Promise(resolve => hdrLoader.setDataType(THREE.FloatType).load('Lights/san_giuseppe_bridge_split.hdr', resolve)),
+        new Promise(resolve => hdrLoader.load('Lights/san_giuseppe_bridge_split.hdr', resolve)),
+        new Promise(resolve => hdrLoader.load('Lights/irradiance/san_giuseppe_bridge_split.hdr', resolve)),
         new Promise(resolve => fileLoader.load('Lights/san_giuseppe_bridge_split.mtlx', resolve)),
-        new Promise(resolve => hdrLoader.setDataType(THREE.FloatType).load('Lights/irradiance/san_giuseppe_bridge_split.hdr', resolve)),
         new Promise(function (resolve) {
             MaterialX().then((module) => {
                 resolve(module);
             });
         }) 
-    ]).then(async ([loadedRadianceTexture, loadedLightSetup, loadedIrradianceTexture, mxIn]) => 
+    ]).then(async ([radianceTexture, irradianceTexture, lightRigXml, mxIn]) => 
     {
         // Initialize viewer + lighting
-        await viewer.initialize(mxIn, renderer, loadedRadianceTexture, loadedLightSetup, loadedIrradianceTexture);
+        await viewer.initialize(mxIn, renderer, radianceTexture, irradianceTexture, lightRigXml);
 
         // Load geometry  
         let scene = viewer.getScene();
diff --git a/javascript/MaterialXView/source/viewer.js b/javascript/MaterialXView/source/viewer.js
index d1adfd9ef4..58e4613bae 100644
--- a/javascript/MaterialXView/source/viewer.js
+++ b/javascript/MaterialXView/source/viewer.js
@@ -1035,7 +1035,7 @@ export class Viewer
     // Create shader generator, generation context and "base" document which
     // contains the standard definition libraries and lighting elements.
     //
-    async initialize(mtlxIn, renderer, loadedRadianceTexture, loadedLightSetup, loadedIrradianceTexture)
+    async initialize(mtlxIn, renderer, radianceTexture, irradianceTexture, lightRigXml)
     {
         this.mx = mtlxIn;
 
@@ -1047,30 +1047,30 @@ export class Viewer
         this.stdlib = this.mx.loadStandardLibraries(this.genContext);
         this.document.importLibrary(this.stdlib);
 
-        this.initializeLighting(renderer, loadedRadianceTexture, loadedLightSetup, loadedIrradianceTexture);
+        this.initializeLighting(renderer, radianceTexture, irradianceTexture, lightRigXml);
 
-        loadedRadianceTexture.mapping = THREE.EquirectangularReflectionMapping;
-        this.getScene().setBackgroundTexture(loadedRadianceTexture);
+        radianceTexture.mapping = THREE.EquirectangularReflectionMapping;
+        this.getScene().setBackgroundTexture(radianceTexture);
     }
 
     //
     // Load in lighting rig document and register lights with generation context
     // Initialize environment lighting (IBLs).
     //
-    async initializeLighting(renderer, loadedRadianceTexture, loadedLightSetup, loadedIrradianceTexture)
+    async initializeLighting(renderer, radianceTexture, irradianceTexture, lightRigXml)
     {
         // Load lighting setup into document
         const mx = this.getMx();
         this.lightRigDoc = mx.createDocument();
-        await mx.readFromXmlString(this.lightRigDoc, loadedLightSetup);
+        await mx.readFromXmlString(this.lightRigDoc, lightRigXml);
         this.document.importLibrary(this.lightRigDoc);
 
         // Register lights with generation context
         this.lights = findLights(this.document);
         this.lightData = registerLights(mx, this.lights, this.genContext);
 
-        this.radianceTexture = prepareEnvTexture(loadedRadianceTexture, renderer.capabilities);
-        this.irradianceTexture = prepareEnvTexture(loadedIrradianceTexture, renderer.capabilities);
+        this.radianceTexture = prepareEnvTexture(radianceTexture, renderer.capabilities);
+        this.irradianceTexture = prepareEnvTexture(irradianceTexture, renderer.capabilities);
     }
 
     getEditor() {

From 95d9ee0a46c6df509f7c92f7fefc684cd9d4c092 Mon Sep 17 00:00:00 2001
From: ld-kerley <154285602+ld-kerley@users.noreply.github.com>
Date: Mon, 18 Dec 2023 18:14:40 -0800
Subject: [PATCH 48/66] Fix for custom node groups in graph editor menu (#1617)

Currently if you have node definitions added to groups that aren't in the fixed list that MaterialXGraphEditor understands, then they won't be added to the menu.
---
 source/MaterialXGraphEditor/Graph.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/source/MaterialXGraphEditor/Graph.cpp b/source/MaterialXGraphEditor/Graph.cpp
index fc682e8f05..f0d1791143 100644
--- a/source/MaterialXGraphEditor/Graph.cpp
+++ b/source/MaterialXGraphEditor/Graph.cpp
@@ -1248,6 +1248,7 @@ void Graph::createNodeUIList(mx::DocumentPtr doc)
 
     auto nodeDefs = doc->getNodeDefs();
     std::unordered_map> groupToNodeDef;
+    std::vector groupList = std::vector(NODE_GROUP_ORDER.begin(), NODE_GROUP_ORDER.end());
 
     for (const auto& nodeDef : nodeDefs)
     {
@@ -1257,6 +1258,12 @@ void Graph::createNodeUIList(mx::DocumentPtr doc)
             group = NODE_GROUP_ORDER.back();
         }
 
+        // If the group is not in the groupList already (seeded by NODE_GROUP_ORDER) then add it.
+        if (std::find(groupList.begin(), groupList.end(), group) == groupList.end())
+        {
+            groupList.emplace_back(group);
+        }
+
         if (groupToNodeDef.find(group) == groupToNodeDef.end())
         {
             groupToNodeDef[group] = std::vector();
@@ -1264,7 +1271,7 @@ void Graph::createNodeUIList(mx::DocumentPtr doc)
         groupToNodeDef[group].push_back(nodeDef);
     }
 
-    for (const auto& group : NODE_GROUP_ORDER)
+    for (const auto& group : groupList)
     {
         auto it = groupToNodeDef.find(group);
         if (it != groupToNodeDef.end())

From cbff01a8d27a5017166dfdbb9a77e96b51827c69 Mon Sep 17 00:00:00 2001
From: Bernard Kwok 
Date: Tue, 19 Dec 2023 17:08:46 -0500
Subject: [PATCH 49/66] Update UI library used for Web Viewer (#1618)

- Switch to `lil-gui` which fixes a number of dat-gui issues including all input which did not show up anymore (regression).
- Same GUI lib as used for ThreeJS examples for consistency.
---
 javascript/MaterialXView/package-lock.json |  6 ++++++
 javascript/MaterialXView/package.json      |  2 +-
 javascript/MaterialXView/source/viewer.js  | 20 ++++----------------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/javascript/MaterialXView/package-lock.json b/javascript/MaterialXView/package-lock.json
index d5338a3517..2755bef7ea 100644
--- a/javascript/MaterialXView/package-lock.json
+++ b/javascript/MaterialXView/package-lock.json
@@ -10,6 +10,7 @@
       "license": "ISC",
       "dependencies": {
         "dat.gui": "^0.7.9",
+        "lil-gui": "^0.19.1",
         "three": "^0.152.2",
         "webpack": "^5.89.0"
       },
@@ -2246,6 +2247,11 @@
         "shell-quote": "^1.8.1"
       }
     },
+    "node_modules/lil-gui": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/lil-gui/-/lil-gui-0.19.1.tgz",
+      "integrity": "sha512-9dbIg+UxS8RIROI6OH5gV2KrVE0Cn37bcLOQGF2GKN8ibTxDrUSLzzZfkQR82LnZsgs7DEZOOGfn3zhtd6hk0Q=="
+    },
     "node_modules/loader-runner": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
diff --git a/javascript/MaterialXView/package.json b/javascript/MaterialXView/package.json
index 9518156883..4c369406bd 100644
--- a/javascript/MaterialXView/package.json
+++ b/javascript/MaterialXView/package.json
@@ -10,7 +10,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "dat.gui": "^0.7.9",
+    "lil-gui": "^0.19.1",
     "three": "^0.152.2",
     "webpack": "^5.89.0"
   },
diff --git a/javascript/MaterialXView/source/viewer.js b/javascript/MaterialXView/source/viewer.js
index 58e4613bae..b986406d76 100644
--- a/javascript/MaterialXView/source/viewer.js
+++ b/javascript/MaterialXView/source/viewer.js
@@ -9,7 +9,7 @@ import { RGBELoader } from 'three/examples/jsm/loaders/RGBELoader.js';
 
 import { prepareEnvTexture, getLightRotation, findLights, registerLights, getUniformValues } from './helper.js'
 import { Group } from 'three';
-import { GUI } from 'dat.gui';
+import GUI from 'lil-gui'; 
 
 const ALL_GEOMETRY_SPECIFIER = "*";
 const NO_GEOMETRY_SPECIFIER = "";
@@ -445,13 +445,10 @@ export class Editor
     //
     clearFolders()
     {
-        Array.from(document.getElementsByClassName('folder')).forEach(
+        Array.from(document.getElementsByClassName('lil-gui')).forEach(
             function (element, index, array) {
                 if (element.className) {
-                    let child = element.firstElementChild;
-                    if (child && child.className == 'dg') {
-                        element.remove();
-                    }
+                    element.remove();
                 }
             }
         );
@@ -466,16 +463,7 @@ export class Editor
         // Search document to find GUI elements and remove them
         // If not done then multiple GUIs will be created from different
         // threads.
-        Array.from(document.getElementsByClassName('dg')).forEach(
-            function (element, index, array) {
-                if (element.className) {
-                    element.remove();
-                }
-            }
-        );
-    
-        // Create new GUI.
-        this._gui = new GUI();
+        this.clearFolders();
         this._gui.open();
         
         return this._gui;

From 00e5f734315db84db28b1d3bcab63755bbc4e7d9 Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Tue, 19 Dec 2023 15:27:31 -0800
Subject: [PATCH 50/66] Minor improvements to web viewer

- Assign a title to the Property Editor for clarity.
- Launch the viewer with the Property Editor closed.
---
 javascript/MaterialXView/source/viewer.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/javascript/MaterialXView/source/viewer.js b/javascript/MaterialXView/source/viewer.js
index b986406d76..e5990b8566 100644
--- a/javascript/MaterialXView/source/viewer.js
+++ b/javascript/MaterialXView/source/viewer.js
@@ -460,11 +460,9 @@ export class Editor
     // Create the editor
     initialize() 
     {
-        // Search document to find GUI elements and remove them
-        // If not done then multiple GUIs will be created from different
-        // threads.
         this.clearFolders();
-        this._gui.open();
+        this._gui.title("Property Editor");
+        this._gui.close();
         
         return this._gui;
     }

From 39138cf570a9857570d995c38e6120451696a6d7 Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Tue, 19 Dec 2023 17:19:08 -0800
Subject: [PATCH 51/66] Additional improvements to web viewer

- Merge separate code paths for GUI initialization and folder clearing.
- Use the GUI constructor for title assignment.
---
 javascript/MaterialXView/source/index.js  |  4 +--
 javascript/MaterialXView/source/viewer.js | 43 ++++++++---------------
 2 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/javascript/MaterialXView/source/index.js b/javascript/MaterialXView/source/index.js
index 6f0b6e44b3..ddd1ec8ffc 100644
--- a/javascript/MaterialXView/source/index.js
+++ b/javascript/MaterialXView/source/index.js
@@ -41,7 +41,7 @@ function init()
     materialsSelect.value = materialFilename;
     materialsSelect.addEventListener('change', (e) => {
         materialFilename = e.target.value;
-        viewer.getEditor().clearFolders();
+        viewer.getEditor().initialize();
         viewer.getMaterial().loadMaterials(viewer, materialFilename);
         viewer.getEditor().updateProperties(0.9);
         viewer.getScene().setUpdateTransforms();
@@ -122,7 +122,7 @@ function init()
 
     setLoadingCallback(file => {
         materialFilename = file.fullPath || file.name;
-        viewer.getEditor().clearFolders();
+        viewer.getEditor().initialize();
         viewer.getMaterial().loadMaterials(viewer, materialFilename);
         viewer.getEditor().updateProperties(0.9);
         viewer.getScene().setUpdateTransforms();
diff --git a/javascript/MaterialXView/source/viewer.js b/javascript/MaterialXView/source/viewer.js
index e5990b8566..01006530c8 100644
--- a/javascript/MaterialXView/source/viewer.js
+++ b/javascript/MaterialXView/source/viewer.js
@@ -416,6 +416,21 @@ export class Scene
 */
 export class Editor
 {
+    // Initialize the editor, clearing any elements from previous materials.
+    initialize()
+    {
+        Array.from(document.getElementsByClassName('lil-gui')).forEach(
+            function (element, index, array) {
+                if (element.className) {
+                    element.remove();
+                }
+            }
+        );
+
+        this._gui = new GUI( { title: "Property Editor" } );
+        this._gui.close();
+    }
+
     // Update ui properties
     // - Hide close button
     // - Update transparency so scene shows through if overlapping
@@ -439,34 +454,6 @@ export class Editor
         }
     }
 
-    //
-    // Clear folders with children contain elements for any previous material
-    // and recreate top gui.
-    //
-    clearFolders()
-    {
-        Array.from(document.getElementsByClassName('lil-gui')).forEach(
-            function (element, index, array) {
-                if (element.className) {
-                    element.remove();
-                }
-            }
-        );
-
-        // Create new GUI.
-        this._gui = new GUI();
-    }
-
-    // Create the editor
-    initialize() 
-    {
-        this.clearFolders();
-        this._gui.title("Property Editor");
-        this._gui.close();
-        
-        return this._gui;
-    }
-    
     getGUI() 
     {
         return this._gui;

From 77aaa8a4bc241b397ac9870467ffb9fb84d7ab51 Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Wed, 20 Dec 2023 10:00:55 -0800
Subject: [PATCH 52/66] Update JavaScript packages

This changelist updates all referenced JavaScript packages to their latest version via 'npm update'.
---
 javascript/MaterialXTest/package-lock.json | 163 +++++++++++----------
 javascript/MaterialXTest/package.json      |   4 +-
 javascript/MaterialXView/package-lock.json |  47 +++---
 javascript/MaterialXView/package.json      |   2 +-
 4 files changed, 110 insertions(+), 106 deletions(-)

diff --git a/javascript/MaterialXTest/package-lock.json b/javascript/MaterialXTest/package-lock.json
index 5c3b779bc7..e7d6980fd8 100644
--- a/javascript/MaterialXTest/package-lock.json
+++ b/javascript/MaterialXTest/package-lock.json
@@ -9,8 +9,8 @@
       "version": "1.0.0",
       "license": "ISC",
       "devDependencies": {
-        "@babel/core": "^7.23.5",
-        "@babel/preset-env": "^7.23.5",
+        "@babel/core": "^7.23.6",
+        "@babel/preset-env": "^7.23.6",
         "@babel/register": "^7.22.15",
         "chai": "^4.3.10",
         "copyfiles": "^2.4.1",
@@ -59,21 +59,21 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.5.tgz",
-      "integrity": "sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.6.tgz",
+      "integrity": "sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.5",
-        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/generator": "^7.23.6",
+        "@babel/helper-compilation-targets": "^7.23.6",
         "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.5",
-        "@babel/parser": "^7.23.5",
+        "@babel/helpers": "^7.23.6",
+        "@babel/parser": "^7.23.6",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.5",
-        "@babel/types": "^7.23.5",
+        "@babel/traverse": "^7.23.6",
+        "@babel/types": "^7.23.6",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -89,12 +89,12 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.5.tgz",
-      "integrity": "sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
+      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.23.5",
+        "@babel/types": "^7.23.6",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -128,14 +128,14 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
-      "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
+      "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.22.9",
-        "@babel/helper-validator-option": "^7.22.15",
-        "browserslist": "^4.21.9",
+        "@babel/compat-data": "^7.23.5",
+        "@babel/helper-validator-option": "^7.23.5",
+        "browserslist": "^4.22.2",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -144,9 +144,9 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.5.tgz",
-      "integrity": "sha512-QELlRWxSpgdwdJzSJn4WAhKC+hvw/AtHbbrIoncKHkhKKR/luAlKkgBDcri1EzWAo8f8VvYVryEHN4tax/V67A==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.6.tgz",
+      "integrity": "sha512-cBXU1vZni/CpGF29iTu4YRbOZt3Wat6zCoMDxRF1MayiEc4URxOj31tT65HUM0CRpMowA3HCJaAOVOUnMf96cw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
@@ -184,9 +184,9 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz",
-      "integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==",
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.4.tgz",
+      "integrity": "sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.6",
@@ -409,14 +409,14 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.5.tgz",
-      "integrity": "sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.6.tgz",
+      "integrity": "sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA==",
       "dev": true,
       "dependencies": {
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.5",
-        "@babel/types": "^7.23.5"
+        "@babel/traverse": "^7.23.6",
+        "@babel/types": "^7.23.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -437,9 +437,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.5.tgz",
-      "integrity": "sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
+      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -990,12 +990,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.3.tgz",
-      "integrity": "sha512-X8jSm8X1CMwxmK878qsUGJRmbysKNbdpTv/O1/v0LuY/ZkZrng5WYiekYSdg9m09OTmDDUWeEDsTE+17WYbAZw==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz",
+      "integrity": "sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1516,13 +1517,13 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.5.tgz",
-      "integrity": "sha512-0d/uxVD6tFGWXGDSfyMD1p2otoaKmu6+GD+NfAx0tMaH+dxORnp7T9TaVQ6mKyya7iBtCIVxHjWT7MuzzM9z+A==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.6.tgz",
+      "integrity": "sha512-2XPn/BqKkZCpzYhUUNZ1ssXw7DcXfKQEjv/uXZUXgaebCMYmkEsfZ2yY+vv+xtXv50WmL5SGhyB6/xsWxIvvOQ==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.23.5",
-        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-compilation-targets": "^7.23.6",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-option": "^7.23.5",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
@@ -1562,7 +1563,7 @@
         "@babel/plugin-transform-dynamic-import": "^7.23.4",
         "@babel/plugin-transform-exponentiation-operator": "^7.23.3",
         "@babel/plugin-transform-export-namespace-from": "^7.23.4",
-        "@babel/plugin-transform-for-of": "^7.23.3",
+        "@babel/plugin-transform-for-of": "^7.23.6",
         "@babel/plugin-transform-function-name": "^7.23.3",
         "@babel/plugin-transform-json-strings": "^7.23.4",
         "@babel/plugin-transform-literals": "^7.23.3",
@@ -1649,9 +1650,9 @@
       "dev": true
     },
     "node_modules/@babel/runtime": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.5.tgz",
-      "integrity": "sha512-NdUTHcPe4C99WxPub+K9l9tK5/lV4UXIoaHSYgzco9BCyjKAAwzdBI+wWtYqHt7LJdbo74ZjRPJgzVweq1sz0w==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.6.tgz",
+      "integrity": "sha512-zHd0eUrf5GZoOWVCXp6koAKQTfZV07eit6bGPmJgnZdnSAvvZee6zniW2XMF7Cmc4ISOOnPy3QaSiIJGJkVEDQ==",
       "dev": true,
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
@@ -1675,20 +1676,20 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.5.tgz",
-      "integrity": "sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.6.tgz",
+      "integrity": "sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.5",
+        "@babel/generator": "^7.23.6",
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.5",
-        "@babel/types": "^7.23.5",
-        "debug": "^4.1.0",
+        "@babel/parser": "^7.23.6",
+        "@babel/types": "^7.23.6",
+        "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1696,9 +1697,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.5.tgz",
-      "integrity": "sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
+      "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-string-parser": "^7.23.4",
@@ -1788,9 +1789,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.10.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.4.tgz",
-      "integrity": "sha512-D08YG6rr8X90YB56tSIuBaddy/UXAA9RKJoFvrsnogAum/0pmjkgi4+2nx96A330FmioegBWmEYQ+syqCFaveg==",
+      "version": "20.10.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.5.tgz",
+      "integrity": "sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==",
       "dev": true,
       "dependencies": {
         "undici-types": "~5.26.4"
@@ -1868,13 +1869,13 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz",
-      "integrity": "sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==",
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.7.tgz",
+      "integrity": "sha512-LidDk/tEGDfuHW2DWh/Hgo4rmnw3cduK6ZkOI1NPFceSK3n/yAGeOsNT7FLnSGHkXj3RHGSEVkN3FsCTY6w2CQ==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.6",
-        "@babel/helper-define-polyfill-provider": "^0.4.3",
+        "@babel/helper-define-polyfill-provider": "^0.4.4",
         "semver": "^6.3.1"
       },
       "peerDependencies": {
@@ -1882,12 +1883,12 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.8.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.6.tgz",
-      "integrity": "sha512-leDIc4l4tUgU7str5BWLS2h8q2N4Nf6lGZP6UrNDxdtfF2g69eJ5L0H7S8A5Ln/arfFAfHor5InAdZuIOwZdgQ==",
+      "version": "0.8.7",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.7.tgz",
+      "integrity": "sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.4.3",
+        "@babel/helper-define-polyfill-provider": "^0.4.4",
         "core-js-compat": "^3.33.1"
       },
       "peerDependencies": {
@@ -1895,12 +1896,12 @@
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz",
-      "integrity": "sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.4.tgz",
+      "integrity": "sha512-S/x2iOCvDaCASLYsOOgWOq4bCfKYVqvO/uxjkaYyZ3rVsVE3CeAI/c84NpyuBBymEgNvHgjEot3a9/Z/kXvqsg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.4.3"
+        "@babel/helper-define-polyfill-provider": "^0.4.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -2071,9 +2072,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001566",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001566.tgz",
-      "integrity": "sha512-ggIhCsTxmITBAMmK8yZjEhCO5/47jKXPu6Dha/wuCS4JePVL+3uiDEBuhu2aIoT+bqTOR8L76Ip1ARL9xYsEJA==",
+      "version": "1.0.30001570",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001570.tgz",
+      "integrity": "sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw==",
       "dev": true,
       "funding": [
         {
@@ -2462,9 +2463,9 @@
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.609",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.609.tgz",
-      "integrity": "sha512-ihiCP7PJmjoGNuLpl7TjNA8pCQWu09vGyjlPYw1Rqww4gvNuCcmvl+44G+2QyJ6S2K4o+wbTS++Xz0YN8Q9ERw==",
+      "version": "1.4.615",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.615.tgz",
+      "integrity": "sha512-/bKPPcgZVUziECqDc+0HkT87+0zhaWSZHNXqF8FLd2lQcptpmUFwoCSWjCdOng9Gdq+afKArPdEg/0ZW461Eng==",
       "dev": true
     },
     "node_modules/emoji-regex": {
@@ -4012,9 +4013,9 @@
       }
     },
     "node_modules/regenerator-runtime": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
-      "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==",
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
       "dev": true
     },
     "node_modules/regenerator-transform": {
diff --git a/javascript/MaterialXTest/package.json b/javascript/MaterialXTest/package.json
index cc67644462..122ec55338 100644
--- a/javascript/MaterialXTest/package.json
+++ b/javascript/MaterialXTest/package.json
@@ -16,8 +16,8 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@babel/core": "^7.23.5",
-    "@babel/preset-env": "^7.23.5",
+    "@babel/core": "^7.23.6",
+    "@babel/preset-env": "^7.23.6",
     "@babel/register": "^7.22.15",
     "chai": "^4.3.10",
     "copyfiles": "^2.4.1",
diff --git a/javascript/MaterialXView/package-lock.json b/javascript/MaterialXView/package-lock.json
index 2755bef7ea..474a6ff984 100644
--- a/javascript/MaterialXView/package-lock.json
+++ b/javascript/MaterialXView/package-lock.json
@@ -9,14 +9,13 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "dat.gui": "^0.7.9",
         "lil-gui": "^0.19.1",
         "three": "^0.152.2",
         "webpack": "^5.89.0"
       },
       "devDependencies": {
         "copy-webpack-plugin": "^8.1.1",
-        "html-webpack-plugin": "^5.5.4",
+        "html-webpack-plugin": "^5.6.0",
         "webpack-cli": "^4.10.0",
         "webpack-dev-server": "^4.15.1"
       }
@@ -162,9 +161,9 @@
       }
     },
     "node_modules/@types/eslint": {
-      "version": "8.44.9",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.9.tgz",
-      "integrity": "sha512-6yBxcvwnnYoYT1Uk2d+jvIfsuP4mb2EdIxFnrPABj5a/838qe5bGkNLFOiipX4ULQ7XVQvTxOh7jO+BTAiqsEw==",
+      "version": "8.56.0",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.0.tgz",
+      "integrity": "sha512-FlsN0p4FhuYRjIxpbdXovvHQhtlG05O1GG/RNWvdAxTboR438IOTwmrY/vLA+Xfgg06BTkP045M3vpFwTMv1dg==",
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -241,9 +240,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.10.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.4.tgz",
-      "integrity": "sha512-D08YG6rr8X90YB56tSIuBaddy/UXAA9RKJoFvrsnogAum/0pmjkgi4+2nx96A330FmioegBWmEYQ+syqCFaveg==",
+      "version": "20.10.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.5.tgz",
+      "integrity": "sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -1061,11 +1060,6 @@
         "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/dat.gui": {
-      "version": "0.7.9",
-      "resolved": "https://registry.npmjs.org/dat.gui/-/dat.gui-0.7.9.tgz",
-      "integrity": "sha512-sCNc1OHobc+Erc1HqiswYgHdVNpSJUlk/Hz8vzOCsER7rl+oF/4+v8GXFUyCgtXpoCX6+bnmg07DedLvBLwYKQ=="
-    },
     "node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -1246,9 +1240,9 @@
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.613",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.613.tgz",
-      "integrity": "sha512-r4x5+FowKG6q+/Wj0W9nidx7QO31BJwmR2uEo+Qh3YLGQ8SbBAFuDFpTxzly/I2gsbrFwBuIjrMp423L3O5U3w=="
+      "version": "1.4.615",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.615.tgz",
+      "integrity": "sha512-/bKPPcgZVUziECqDc+0HkT87+0zhaWSZHNXqF8FLd2lQcptpmUFwoCSWjCdOng9Gdq+afKArPdEg/0ZW461Eng=="
     },
     "node_modules/encodeurl": {
       "version": "1.0.2",
@@ -1480,9 +1474,9 @@
       }
     },
     "node_modules/fastq": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz",
+      "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==",
       "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"
@@ -1877,9 +1871,9 @@
       }
     },
     "node_modules/html-webpack-plugin": {
-      "version": "5.5.4",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.4.tgz",
-      "integrity": "sha512-3wNSaVVxdxcu0jd4FpQFoICdqgxs4zIQQvj+2yQKFfBOnLETQ6X5CDWdeasuGlSsooFlMkEioWDTqBv1wvw5Iw==",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz",
+      "integrity": "sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==",
       "dev": true,
       "dependencies": {
         "@types/html-minifier-terser": "^6.0.0",
@@ -1896,7 +1890,16 @@
         "url": "https://opencollective.com/html-webpack-plugin"
       },
       "peerDependencies": {
+        "@rspack/core": "0.x || 1.x",
         "webpack": "^5.20.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
       }
     },
     "node_modules/htmlparser2": {
diff --git a/javascript/MaterialXView/package.json b/javascript/MaterialXView/package.json
index 4c369406bd..01049bf6c9 100644
--- a/javascript/MaterialXView/package.json
+++ b/javascript/MaterialXView/package.json
@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "copy-webpack-plugin": "^8.1.1",
-    "html-webpack-plugin": "^5.5.4",
+    "html-webpack-plugin": "^5.6.0",
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.15.1"
   }

From 5bd76a89efac609097674528ae781a586340ef22 Mon Sep 17 00:00:00 2001
From: Bernard Kwok 
Date: Fri, 22 Dec 2023 14:19:15 -0500
Subject: [PATCH 53/66] Add support for UI attributes in web viewer (#1623)

- ui min, max, step support for property editor inputs
- label ui advanced folders
- enable complete vs reduced to get exposure of consistent inputs as with other utils.
- fix nodedef input lookup to handle non-root nodes
- use x,y,z,w for vector input names vs full name and ".0".
---
 javascript/MaterialXView/source/viewer.js | 139 ++++++++++++++++++++--
 1 file changed, 126 insertions(+), 13 deletions(-)

diff --git a/javascript/MaterialXView/source/viewer.js b/javascript/MaterialXView/source/viewer.js
index 01006530c8..34474aeede 100644
--- a/javascript/MaterialXView/source/viewer.js
+++ b/javascript/MaterialXView/source/viewer.js
@@ -723,8 +723,10 @@ export class Material
         var startTranspCheckTime = performance.now();
         const isTransparent = mx.isTransparentSurface(elem, gen.getTarget());
         genContext.getOptions().hwTransparency = isTransparent;
-        // Always set to reduced as the parsing of uniforms can be very expensive in WebGL
-        genContext.getOptions().shaderInterfaceType = mx.ShaderInterfaceType.SHADER_INTERFACE_REDUCED;
+        // Always set to complete. 
+        // Can consider option to set to reduced as the parsing of large numbers of uniforms (e.g. on shading models)
+        // can be quite expensive.
+        genContext.getOptions().shaderInterfaceType = mx.ShaderInterfaceType.SHADER_INTERFACE_COMPLETE;
 
         if (logDetailedTime)
             console.log("  - Transparency check time: ", performance.now() -  startTranspCheckTime, "ms"); 
@@ -776,7 +778,7 @@ export class Material
 
         // Update property editor
         const gui = viewer.getEditor().getGUI();
-        this.updateEditor(elem, shader, newMaterial, gui);
+        this.updateEditor(elem, shader, newMaterial, gui, viewer);
 
         if (logDetailedTime)
             console.log("- Per material generate time: ", performance.now() - startGenerateMat, "ms");
@@ -790,6 +792,9 @@ export class Material
     //
     updateEditor(elem, shader, material, gui)
     {
+        const DEFAULT_MIN = 0;
+        const DEFAULT_MAX = 100;
+
         var startTime = performance.now();
 
         const elemPath = elem.getNamePath();
@@ -825,8 +830,13 @@ export class Material
                         continue;
                     }
 
-                    let currentNode = currentElem ? currentElem.getParent() : null;
-                    let uiname;
+                    let currentNode = null;
+                    if (currentElem.getParent() && currentElem.getParent().getNamePath() != "")
+                    { 
+                        currentNode = currentElem.getParent();
+                    }
+                    let uiname = "";
+                    let nodeDefInput = null;
                     if (currentNode) {
 
                         let currentNodePath = currentNode.getNamePath();
@@ -843,15 +853,25 @@ export class Material
                         // Check for ui attributes
                         var nodeDef = currentNode.getNodeDef();
                         if (nodeDef) {
-                            let input = nodeDef.getActiveInput(name);
-                            if (input) {
-                                uiname = input.getAttribute('uiname');
-                                let uifolderName = input.getAttribute('uifolder');
+                            // Remove node name from shader uniform name for non root nodes
+                            let lookup_name = name.replace(currentNode.getName() + '_', '');
+                            nodeDefInput = nodeDef.getActiveInput(lookup_name);
+                            if (nodeDefInput) 
+                            {
+                                uiname = nodeDefInput.getAttribute('uiname');
+                                let uifolderName = nodeDefInput.getAttribute('uifolder');
                                 if (uifolderName && uifolderName.length) {
                                     let newFolderName = currentNodePath + '/' + uifolderName;
                                     currentFolder = folderList[newFolderName];
                                     if (!currentFolder) {
-                                        currentFolder = matUI.addFolder(uifolderName);
+                                        if (nodeDefInput.hasAttribute('uiadvanced'))
+                                        {
+                                            currentFolder = matUI.addFolder(uifolderName + " (Advanced)");
+                                        }
+                                        else
+                                        {
+                                            currentFolder = matUI.addFolder(uifolderName);
+                                        }
                                         folderList[newFolderName] = currentFolder;
                                     }
                                 }
@@ -896,14 +916,86 @@ export class Material
                         case 'float':
                             uniformToUpdate = material.uniforms[name];
                             if (uniformToUpdate && value != null) {
-                                currentFolder.add(material.uniforms[name], 'value').name(path);
+
+                                var minValue = DEFAULT_MIN;
+                                if (value < minValue)
+                                {
+                                    minValue = value;
+                                }
+                                var maxValue = DEFAULT_MAX;
+                                if (value > maxValue)
+                                {
+                                    maxValue = value;
+                                }
+                                var step = 0;
+                                if (nodeDefInput) {
+                                    if (nodeDefInput.hasAttribute('uimin'))
+                                        minValue = parseFloat(nodeDefInput.getAttribute('uimin'));
+                                    if (nodeDefInput.hasAttribute('uimax'))
+                                        maxValue = parseFloat(nodeDefInput.getAttribute('uimax'));
+                                    if (nodeDefInput.hasAttribute('uistep'))
+                                        step = parseFloat(nodeDefInput.getAttribute('uistep'));
+                                }
+                                if (step == 0)
+                                {
+                                    step = (maxValue - minValue) / 1000.0;
+                                }
+                                currentFolder.add(material.uniforms[name], 'value', minValue, maxValue, step).name(path);
                             }
                             break;
 
                         case 'integer':
                             uniformToUpdate = material.uniforms[name];
                             if (uniformToUpdate && value != null) {
-                                currentFolder.add(material.uniforms[name], 'value').name(path);
+
+                                var minValue = DEFAULT_MIN;
+                                if (value < minValue)
+                                {
+                                    minValue = value;
+                                }
+                                var maxValue = DEFAULT_MAX;
+                                if (value > maxValue)
+                                {
+                                    maxValue = value;
+                                }
+                                var step = 0;
+                                var enumList = []
+                                if (nodeDefInput) {
+                                    if (nodeDefInput.hasAttribute('enum'))
+                                    {
+                                        enumList = nodeDefInput.getAttribute('enum').split(',');
+                                    }
+                                    else
+                                    {
+                                        if (nodeDefInput.hasAttribute('uimin'))
+                                            minValue = parseInt(nodeDefInput.getAttribute('uimin'));
+                                        if (nodeDefInput.hasAttribute('uimax'))
+                                            maxValue = parseInt(nodeDefInput.getAttribute('uimax'));
+                                        if (nodeDefInput.hasAttribute('uistep'))
+                                            step = parseInt(nodeDefInput.getAttribute('uistep'));
+                                    }
+                                }
+                                if (enumList.length == 0)
+                                {
+                                    if (step == 0)
+                                    {
+                                        step = 1 / (maxValue - minValue);
+                                        step = Math.ceil(step);
+                                        if (step == 0)
+                                        {
+                                            step = 1;
+                                        }
+                                    }
+                                }
+                                if (enumList.length == 0)
+                                {
+                                    currentFolder.add(material.uniforms[name], 'value', minValue, maxValue, step).name(path);
+                                }    
+                                else
+                                {
+                                    // TODO: Add enum support
+                                    currentFolder.add(material.uniforms[name], 'value' ).name(path);
+                                }
                             }
                             break;
 
@@ -919,9 +1011,30 @@ export class Material
                         case 'vector4':
                             uniformToUpdate = material.uniforms[name];
                             if (uniformToUpdate && value != null) {
+                                var minValue = [DEFAULT_MIN, DEFAULT_MIN, DEFAULT_MIN, DEFAULT_MIN];
+                                var maxValue = [DEFAULT_MAX, DEFAULT_MAX, DEFAULT_MAX, DEFAULT_MAX];
+                                var step = [0, 0, 0, 0];
+
+                                if (nodeDefInput) 
+                                {
+                                    if (nodeDefInput.hasAttribute('uimin'))
+                                        minValue = nodeDefInput.getAttribute('uimin').split(',').map(Number);
+                                    if (nodeDefInput.hasAttribute('uimax'))
+                                        maxValue = nodeDefInput.getAttribute('uimax').split(',').map(Number);
+                                    if (nodeDefInput.hasAttribute('uistep'))
+                                            step = nodeDefInput.getAttribute('uistep').split(',').map(Number);
+                                }
+                                for (let i = 0; i < 4; ++i) {
+                                    if (step[i] == 0) {
+                                        step[i] = 1 / (maxValue[i] - minValue[i]);
+                                    }
+                                }
+
+                                const keyString = ["x", "y", "z", "w"];
                                 let vecFolder = currentFolder.addFolder(path);
                                 Object.keys(material.uniforms[name].value).forEach((key) => {
-                                    vecFolder.add(material.uniforms[name].value, key).name(path + "." + key);
+                                    let w = vecFolder.add(material.uniforms[name].value, 
+                                        key, minValue[key], maxValue[key], step[key]).name(keyString[key]);
                                 })
                             }
                             break;

From dddf104f8706c98fa6d8fc72a10c6b908f0260f0 Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Fri, 22 Dec 2023 17:29:56 -0800
Subject: [PATCH 54/66] Improvements to web property editor (#1624)

- Add support for uisoftmin and uisoftmax attributes.
- Minor coding style updates, harmonizing on Allman braces in new code.
- Remove legacy UI logic.
---
 javascript/MaterialXView/source/viewer.js | 89 ++++++++++++-----------
 1 file changed, 48 insertions(+), 41 deletions(-)

diff --git a/javascript/MaterialXView/source/viewer.js b/javascript/MaterialXView/source/viewer.js
index 34474aeede..b0bcd98fbf 100644
--- a/javascript/MaterialXView/source/viewer.js
+++ b/javascript/MaterialXView/source/viewer.js
@@ -442,16 +442,6 @@ export class Editor
                 element.style.opacity = targetOpacity;
             }
         );
-    
-        // Hide close button
-        if (this._hideCloseControl)
-        {
-            Array.from(document.getElementsByClassName('close-button')).forEach(
-                function (element, index, array) {
-                    element.style.display = "none";
-                }
-            );
-        }
     }
 
     getGUI() 
@@ -460,7 +450,6 @@ export class Editor
     }
 
     _gui = null;
-    _hideCloseControl = false;
 }
 
 class MaterialAssign
@@ -864,14 +853,7 @@ export class Material
                                     let newFolderName = currentNodePath + '/' + uifolderName;
                                     currentFolder = folderList[newFolderName];
                                     if (!currentFolder) {
-                                        if (nodeDefInput.hasAttribute('uiadvanced'))
-                                        {
-                                            currentFolder = matUI.addFolder(uifolderName + " (Advanced)");
-                                        }
-                                        else
-                                        {
-                                            currentFolder = matUI.addFolder(uifolderName);
-                                        }
+                                        currentFolder = matUI.addFolder(uifolderName);
                                         folderList[newFolderName] = currentFolder;
                                     }
                                 }
@@ -911,12 +893,12 @@ export class Material
                         }
                     }
 
-                    switch (variable.getType().getName()) {
-
+                    switch (variable.getType().getName())
+                    {
                         case 'float':
                             uniformToUpdate = material.uniforms[name];
-                            if (uniformToUpdate && value != null) {
-
+                            if (uniformToUpdate && value != null)
+                            {
                                 var minValue = DEFAULT_MIN;
                                 if (value < minValue)
                                 {
@@ -928,11 +910,18 @@ export class Material
                                     maxValue = value;
                                 }
                                 var step = 0;
-                                if (nodeDefInput) {
-                                    if (nodeDefInput.hasAttribute('uimin'))
+                                if (nodeDefInput)
+                                {
+                                    if (nodeDefInput.hasAttribute('uisoftmin'))
+                                        minValue = parseFloat(nodeDefInput.getAttribute('uisoftmin'));
+                                    else if (nodeDefInput.hasAttribute('uimin'))
                                         minValue = parseFloat(nodeDefInput.getAttribute('uimin'));
-                                    if (nodeDefInput.hasAttribute('uimax'))
+
+                                    if (nodeDefInput.hasAttribute('uisoftmax'))
+                                        maxValue = parseFloat(nodeDefInput.getAttribute('uisoftmax'));
+                                    else if (nodeDefInput.hasAttribute('uimax'))
                                         maxValue = parseFloat(nodeDefInput.getAttribute('uimax'));
+
                                     if (nodeDefInput.hasAttribute('uistep'))
                                         step = parseFloat(nodeDefInput.getAttribute('uistep'));
                                 }
@@ -946,8 +935,8 @@ export class Material
 
                         case 'integer':
                             uniformToUpdate = material.uniforms[name];
-                            if (uniformToUpdate && value != null) {
-
+                            if (uniformToUpdate && value != null)
+                            {
                                 var minValue = DEFAULT_MIN;
                                 if (value < minValue)
                                 {
@@ -960,17 +949,24 @@ export class Material
                                 }
                                 var step = 0;
                                 var enumList = []
-                                if (nodeDefInput) {
+                                if (nodeDefInput)
+                                {
                                     if (nodeDefInput.hasAttribute('enum'))
                                     {
                                         enumList = nodeDefInput.getAttribute('enum').split(',');
                                     }
                                     else
                                     {
-                                        if (nodeDefInput.hasAttribute('uimin'))
+                                        if (nodeDefInput.hasAttribute('uisoftmin'))
+                                            minValue = parseInt(nodeDefInput.getAttribute('uisoftmin'));
+                                        else if (nodeDefInput.hasAttribute('uimin'))
                                             minValue = parseInt(nodeDefInput.getAttribute('uimin'));
-                                        if (nodeDefInput.hasAttribute('uimax'))
+
+                                        if (nodeDefInput.hasAttribute('uisoftmax'))
+                                            maxValue = parseInt(nodeDefInput.getAttribute('uisoftmax'));
+                                        else if (nodeDefInput.hasAttribute('uimax'))
                                             maxValue = parseInt(nodeDefInput.getAttribute('uimax'));
+
                                         if (nodeDefInput.hasAttribute('uistep'))
                                             step = parseInt(nodeDefInput.getAttribute('uistep'));
                                     }
@@ -1001,7 +997,8 @@ export class Material
 
                         case 'boolean':
                             uniformToUpdate = material.uniforms[name];
-                            if (uniformToUpdate && value != null) {
+                            if (uniformToUpdate && value != null)
+                            {
                                 currentFolder.add(material.uniforms[name], 'value').name(path);
                             }
                             break;
@@ -1010,22 +1007,31 @@ export class Material
                         case 'vector3':
                         case 'vector4':
                             uniformToUpdate = material.uniforms[name];
-                            if (uniformToUpdate && value != null) {
+                            if (uniformToUpdate && value != null)
+                            {
                                 var minValue = [DEFAULT_MIN, DEFAULT_MIN, DEFAULT_MIN, DEFAULT_MIN];
                                 var maxValue = [DEFAULT_MAX, DEFAULT_MAX, DEFAULT_MAX, DEFAULT_MAX];
                                 var step = [0, 0, 0, 0];
 
                                 if (nodeDefInput) 
                                 {
-                                    if (nodeDefInput.hasAttribute('uimin'))
+                                    if (nodeDefInput.hasAttribute('uisoftmin'))
+                                        minValue = nodeDefInput.getAttribute('uisoftmin').split(',').map(Number);
+                                    else if (nodeDefInput.hasAttribute('uimin'))
                                         minValue = nodeDefInput.getAttribute('uimin').split(',').map(Number);
-                                    if (nodeDefInput.hasAttribute('uimax'))
+
+                                    if (nodeDefInput.hasAttribute('uisoftmax'))
+                                        maxValue = nodeDefInput.getAttribute('uisoftmax').split(',').map(Number);
+                                    else if (nodeDefInput.hasAttribute('uimax'))
                                         maxValue = nodeDefInput.getAttribute('uimax').split(',').map(Number);
+
                                     if (nodeDefInput.hasAttribute('uistep'))
                                             step = nodeDefInput.getAttribute('uistep').split(',').map(Number);
                                 }
-                                for (let i = 0; i < 4; ++i) {
-                                    if (step[i] == 0) {
+                                for (let i = 0; i < 4; ++i)
+                                {
+                                    if (step[i] == 0)
+                                    {
                                         step[i] = 1 / (maxValue[i] - minValue[i]);
                                     }
                                 }
@@ -1042,8 +1048,10 @@ export class Material
                         case 'color3':
                             // Irksome way to mape arrays to colors and back
                             uniformToUpdate = material.uniforms[name];
-                            if (uniformToUpdate && value != null) {
-                                var dummy = {
+                            if (uniformToUpdate && value != null)
+                            {
+                                var dummy =
+                                {
                                     color: 0xFF0000
                                 };
                                 const color3 = new THREE.Color(dummy.color);
@@ -1053,8 +1061,7 @@ export class Material
                                     .onChange(function (value) {
                                         const color3 = new THREE.Color(value);
                                         material.uniforms[name].value.set(color3.toArray());
-                                    }
-                                    );
+                                    });
                             }
                             break;
 

From eae062a038bcd8f8172b1725e93e35641dc73f61 Mon Sep 17 00:00:00 2001
From: Apoorva Joshi 
Date: Fri, 29 Dec 2023 07:02:58 +0100
Subject: [PATCH 55/66] Improvements to prefiltered environment maps (#1420)

This changelist adds support for prefiltering environment maps on the GPU, using filtered VNDF sampling for efficiency.

The MaterialX Viewer can be used to test the new functionality by unchecking the Environment FIS option in Advanced Settings.
---
 .../genglsl/lib/mx_environment_fis.glsl       |  10 --
 .../genglsl/lib/mx_environment_prefilter.glsl |   9 +-
 .../genglsl/lib/mx_microfacet_specular.glsl   |  24 +++++
 .../genglsl/lib/mx_prefilter_environment.glsl |  76 +++++++++++++
 .../JsMaterialXGenShader/JsGenOptions.cpp     |   1 +
 .../MaterialXGenGlsl/GlslShaderGenerator.cpp  |  13 ++-
 source/MaterialXGenMsl/MslShaderGenerator.cpp |  11 ++
 source/MaterialXGenShader/GenOptions.h        |   5 +
 .../MaterialXGenShader/HwShaderGenerator.cpp  |  13 +++
 source/MaterialXGenShader/HwShaderGenerator.h |   2 +
 source/MaterialXRender/ImageHandler.cpp       |   2 +-
 source/MaterialXRender/ImageHandler.h         |   2 +-
 source/MaterialXRender/LightHandler.h         |  27 +++++
 source/MaterialXRender/Util.cpp               |  20 ++++
 source/MaterialXRender/Util.h                 |   5 +
 .../MaterialXRenderGlsl/GLTextureHandler.cpp  |   2 +-
 source/MaterialXRenderGlsl/GLTextureHandler.h |   2 +-
 source/MaterialXRenderGlsl/GlslProgram.cpp    |  13 ++-
 .../MaterialXRenderMsl/MetalTextureHandler.h  |   2 +-
 .../MaterialXRenderMsl/MetalTextureHandler.mm |   6 +-
 .../MslPipelineStateObject.mm                 |   2 +-
 source/MaterialXView/RenderPipeline.h         |   1 +
 source/MaterialXView/RenderPipelineGL.cpp     | 102 +++++++++++++++++-
 source/MaterialXView/RenderPipelineGL.h       |   1 +
 source/MaterialXView/RenderPipelineMetal.h    |   2 +
 source/MaterialXView/RenderPipelineMetal.mm   |  98 ++++++++++++++++-
 source/MaterialXView/Viewer.cpp               |   5 +
 .../PyMaterialXGenShader/PyGenOptions.cpp     |   1 +
 28 files changed, 425 insertions(+), 32 deletions(-)
 create mode 100644 libraries/pbrlib/genglsl/lib/mx_prefilter_environment.glsl

diff --git a/libraries/pbrlib/genglsl/lib/mx_environment_fis.glsl b/libraries/pbrlib/genglsl/lib/mx_environment_fis.glsl
index 575991e28d..85c88c3280 100644
--- a/libraries/pbrlib/genglsl/lib/mx_environment_fis.glsl
+++ b/libraries/pbrlib/genglsl/lib/mx_environment_fis.glsl
@@ -1,15 +1,5 @@
 #include "mx_microfacet_specular.glsl"
 
-// https://developer.nvidia.com/gpugems/GPUGems3/gpugems3_ch20.html
-// Section 20.4 Equation 13
-float mx_latlong_compute_lod(vec3 dir, float pdf, float maxMipLevel, int envSamples)
-{
-    const float MIP_LEVEL_OFFSET = 1.5;
-    float effectiveMaxMipLevel = maxMipLevel - MIP_LEVEL_OFFSET;
-    float distortion = sqrt(1.0 - mx_square(dir.y));
-    return max(effectiveMaxMipLevel - 0.5 * log2(float(envSamples) * pdf * distortion), 0.0);
-}
-
 vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distribution, FresnelData fd)
 {
     // Generate tangent frame.
diff --git a/libraries/pbrlib/genglsl/lib/mx_environment_prefilter.glsl b/libraries/pbrlib/genglsl/lib/mx_environment_prefilter.glsl
index 6def6fb439..e448ae247e 100644
--- a/libraries/pbrlib/genglsl/lib/mx_environment_prefilter.glsl
+++ b/libraries/pbrlib/genglsl/lib/mx_environment_prefilter.glsl
@@ -1,12 +1,5 @@
 #include "mx_microfacet_specular.glsl"
 
-float mx_latlong_compute_lod(float alpha)
-{
-    // Select a mip level based on input alpha.
-    float lodBias = alpha < 0.25 ? sqrt(alpha) : 0.5*alpha + 0.375;
-    return lodBias * float($envRadianceMips);
-}
-
 vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distribution, FresnelData fd)
 {
     N = mx_forward_facing_normal(N, V);
@@ -19,7 +12,7 @@ vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distributio
     float G = mx_ggx_smith_G2(NdotV, NdotV, avgAlpha);
     vec3 FG = fd.refraction ? vec3(1.0) - (F * G) : F * G;
 
-    vec3 Li = mx_latlong_map_lookup(L, $envMatrix, mx_latlong_compute_lod(avgAlpha), $envRadiance);
+    vec3 Li = mx_latlong_map_lookup(L, $envMatrix, mx_latlong_alpha_to_lod(avgAlpha), $envRadiance);
     return Li * FG;
 }
 
diff --git a/libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl b/libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl
index 63aba17869..85430c00ca 100644
--- a/libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl
+++ b/libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl
@@ -593,3 +593,27 @@ vec3 mx_latlong_map_lookup(vec3 dir, mat4 transform, float lod, sampler2D envSam
     vec2 uv = mx_latlong_projection(envDir);
     return textureLod(envSampler, uv, lod).rgb;
 }
+
+// https://developer.nvidia.com/gpugems/GPUGems3/gpugems3_ch20.html
+// Section 20.4 Equation 13
+float mx_latlong_compute_lod(vec3 dir, float pdf, float maxMipLevel, int envSamples)
+{
+    const float MIP_LEVEL_OFFSET = 1.5;
+    float effectiveMaxMipLevel = maxMipLevel - MIP_LEVEL_OFFSET;
+    float distortion = sqrt(1.0 - mx_square(dir.y));
+    return max(effectiveMaxMipLevel - 0.5 * log2(float(envSamples) * pdf * distortion), 0.0);
+}
+
+float mx_latlong_alpha_to_lod(float alpha)
+{
+    // Return the mip level associated with the given alpha in a prefiltered environment.
+    float lodBias = (alpha < 0.25) ? sqrt(alpha) : 0.5 * alpha + 0.375;
+    return lodBias * float($envRadianceMips - 1);
+}
+
+float mx_latlong_lod_to_alpha(float lod)
+{
+    // Return the alpha associated with the given mip level in a prefiltered environment.
+    float lodBias = lod / float($envRadianceMips - 1);
+    return (lodBias < 0.5) ? mx_square(lodBias) : 2.0 * (lodBias - 0.375);
+}
diff --git a/libraries/pbrlib/genglsl/lib/mx_prefilter_environment.glsl b/libraries/pbrlib/genglsl/lib/mx_prefilter_environment.glsl
new file mode 100644
index 0000000000..fd608871ed
--- /dev/null
+++ b/libraries/pbrlib/genglsl/lib/mx_prefilter_environment.glsl
@@ -0,0 +1,76 @@
+#include "mx_microfacet_specular.glsl"
+
+// Construct an orthonormal basis from a unit vector.
+// https://graphics.pixar.com/library/OrthonormalB/paper.pdf
+mat3 mx_orthonormal_basis(vec3 N)
+{
+    float sign = (N.z < 0.0) ? -1.0 : 1.0;
+    float a = -1.0 / (sign + N.z);
+    float b = N.x * N.y * a;
+    vec3 X = vec3(1.0 + sign * N.x * N.x * a, sign * b, -sign * N.x);
+    vec3 Y = vec3(b, sign + N.y * N.y * a, -N.y);
+    return mat3(X, Y, N);
+}
+
+// The inverse of mx_latlong_projection.
+vec3 mx_latlong_map_projection_inverse(vec2 uv)
+{
+    float latitude = (uv.y - 0.5) * M_PI;
+    float longitude = (uv.x - 0.5) * M_PI * 2.0;
+
+    float x = -cos(latitude) * sin(longitude);
+    float y = -sin(latitude);
+    float z = cos(latitude) * cos(longitude);
+
+    return vec3(x, y, z);
+}
+
+vec3 mx_prefilter_environment()
+{
+    vec2 uv = gl_FragCoord.xy * pow(2.0, $envPrefilterMip) / vec2(2048.0, 1024.0);
+    float alpha = mx_latlong_lod_to_alpha(float($envPrefilterMip));
+    if ($envPrefilterMip == 0)
+    {
+        return textureLod($envRadiance, uv, 0).rgb;
+    }
+
+    // Compute world normal and transform.
+    vec3 worldN = mx_latlong_map_projection_inverse(uv);
+    mat3 tangentToWorld = mx_orthonormal_basis(worldN);
+
+    // Local normal and view vectors are constant and aligned.
+    vec3 V = vec3(0.0, 0.0, 1.0);
+    float NdotV = 1.0;
+    float G1V = mx_ggx_smith_G1(NdotV, alpha);
+
+    // Integrate the LD term for the given environment and alpha.
+    vec3 radiance = vec3(0.0, 0.0, 0.0);
+    float weight = 0.0;
+    int envRadianceSamples = 1024;
+    for (int i = 0; i < envRadianceSamples; i++)
+    {
+        vec2 Xi = mx_spherical_fibonacci(i, envRadianceSamples);
+
+        // Compute the half vector and incoming light direction.
+        vec3 H = mx_ggx_importance_sample_VNDF(Xi, V, vec2(alpha));
+        vec3 L = -V + 2.0 * H.z * H;
+
+        // Compute dot products for this sample.
+        float NdotL = clamp(L.z, M_FLOAT_EPS, 1.0);
+
+        // Compute the geometric term.
+        float G = mx_ggx_smith_G2(NdotL, NdotV, alpha);
+
+        // Sample the environment light from the given direction.
+        vec3 Lw = tangentToWorld * L;
+        float pdf = mx_ggx_NDF(H, vec2(alpha)) * G1V / (4.0 * NdotV);
+        float lod = mx_latlong_compute_lod(Lw, pdf, float($envRadianceMips - 1), envRadianceSamples);
+        vec3 sampleColor = mx_latlong_map_lookup(Lw, $envMatrix, lod, $envRadiance);
+
+        // Add the radiance contribution of this sample.
+        radiance += G * sampleColor;
+        weight += G;
+    }
+
+    return radiance / weight;
+}
diff --git a/source/JsMaterialX/JsMaterialXGenShader/JsGenOptions.cpp b/source/JsMaterialX/JsMaterialXGenShader/JsGenOptions.cpp
index 7e3313cdf7..9b28a6f534 100644
--- a/source/JsMaterialX/JsMaterialXGenShader/JsGenOptions.cpp
+++ b/source/JsMaterialX/JsMaterialXGenShader/JsGenOptions.cpp
@@ -42,5 +42,6 @@ EMSCRIPTEN_BINDINGS(GenOptions)
         .property("hwMaxActiveLightSources", &mx::GenOptions::hwMaxActiveLightSources)
         .property("hwNormalizeUdimTexCoords", &mx::GenOptions::hwNormalizeUdimTexCoords)
         .property("hwWriteAlbedoTable", &mx::GenOptions::hwWriteAlbedoTable)
+        .property("hwWriteEnvPrefilter", &mx::GenOptions::hwWriteEnvPrefilter)
         ;
 }
diff --git a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
index ea78e1bee3..b9351ddc08 100644
--- a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
+++ b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
@@ -553,7 +553,7 @@ void GlslShaderGenerator::emitPixelStage(const ShaderGraph& graph, GenContext& c
     bool lighting = requiresLighting(graph);
 
     // Define directional albedo approach
-    if (lighting || context.getOptions().hwWriteAlbedoTable)
+    if (lighting || context.getOptions().hwWriteAlbedoTable || context.getOptions().hwWriteEnvPrefilter)
     {
         emitLine("#define DIRECTIONAL_ALBEDO_METHOD " + std::to_string(int(context.getOptions().hwDirectionalAlbedoMethod)), stage, false);
         emitLineBreak(stage);
@@ -591,6 +591,13 @@ void GlslShaderGenerator::emitPixelStage(const ShaderGraph& graph, GenContext& c
         emitLineBreak(stage);
     }
 
+    // Emit environment prefiltering code
+    if (context.getOptions().hwWriteEnvPrefilter)
+    {
+        emitLibraryInclude("pbrlib/genglsl/lib/mx_prefilter_environment.glsl", context, stage);
+        emitLineBreak(stage);
+    }
+
     // Set the include file to use for uv transformations,
     // depending on the vertical flip flag.
     if (context.getOptions().fileTextureVerticalFlip)
@@ -636,6 +643,10 @@ void GlslShaderGenerator::emitPixelStage(const ShaderGraph& graph, GenContext& c
     {
         emitLine(outputSocket->getVariable() + " = vec4(mx_generate_dir_albedo_table(), 1.0)", stage);
     }
+    else if (context.getOptions().hwWriteEnvPrefilter)
+    {
+        emitLine(outputSocket->getVariable() + " = vec4(mx_prefilter_environment(), 1.0)", stage);
+    }
     else
     {
         // Add all function calls.
diff --git a/source/MaterialXGenMsl/MslShaderGenerator.cpp b/source/MaterialXGenMsl/MslShaderGenerator.cpp
index 7fe50fef4a..5749f0d211 100644
--- a/source/MaterialXGenMsl/MslShaderGenerator.cpp
+++ b/source/MaterialXGenMsl/MslShaderGenerator.cpp
@@ -1059,6 +1059,13 @@ void MslShaderGenerator::emitPixelStage(const ShaderGraph& graph, GenContext& co
             emitLineBreak(stage);
         }
 
+        // Emit environment prefiltering code
+        if (context.getOptions().hwWriteEnvPrefilter)
+        {
+            emitLibraryInclude("pbrlib/genglsl/lib/mx_prefilter_environment.glsl", context, stage);
+            emitLineBreak(stage);
+        }
+
         // Set the include file to use for uv transformations,
         // depending on the vertical flip flag.
         if (context.getOptions().fileTextureVerticalFlip)
@@ -1104,6 +1111,10 @@ void MslShaderGenerator::emitPixelStage(const ShaderGraph& graph, GenContext& co
         {
             emitLine(outputSocket->getVariable() + " = float4(mx_generate_dir_albedo_table(), 1.0)", stage);
         }
+        else if (context.getOptions().hwWriteEnvPrefilter)
+        {
+            emitLine(outputSocket->getVariable() + " = float4(mx_prefilter_environment(), 1.0)", stage);
+        }
         else
         {
             // Add all function calls.
diff --git a/source/MaterialXGenShader/GenOptions.h b/source/MaterialXGenShader/GenOptions.h
index 34a1efde0b..6af73d62a8 100644
--- a/source/MaterialXGenShader/GenOptions.h
+++ b/source/MaterialXGenShader/GenOptions.h
@@ -90,6 +90,7 @@ class MX_GENSHADER_API GenOptions
         hwMaxActiveLightSources(3),
         hwNormalizeUdimTexCoords(false),
         hwWriteAlbedoTable(false),
+        hwWriteEnvPrefilter(false),
         hwImplicitBitangents(true),
         emitColorTransforms(true)
     {
@@ -174,6 +175,10 @@ class MX_GENSHADER_API GenOptions
     /// Defaults to false.
     bool hwWriteAlbedoTable;
 
+    /// Enables the generation of a prefiltered environment map.
+    /// Defaults to false.
+    bool hwWriteEnvPrefilter;
+
     /// Calculate fallback bitangents from existing normals and tangents
     /// inside the bitangent node.
     bool hwImplicitBitangents;
diff --git a/source/MaterialXGenShader/HwShaderGenerator.cpp b/source/MaterialXGenShader/HwShaderGenerator.cpp
index 0db78eda27..6ba94d1280 100644
--- a/source/MaterialXGenShader/HwShaderGenerator.cpp
+++ b/source/MaterialXGenShader/HwShaderGenerator.cpp
@@ -59,6 +59,7 @@ const string T_ENV_RADIANCE                   = "$envRadiance";
 const string T_ENV_RADIANCE_MIPS              = "$envRadianceMips";
 const string T_ENV_RADIANCE_SAMPLES           = "$envRadianceSamples";
 const string T_ENV_IRRADIANCE                 = "$envIrradiance";
+const string T_ENV_PREFILTER_MIP              = "$envPrefilterMip";
 const string T_REFRACTION_TWO_SIDED           = "$refractionTwoSided";
 const string T_ALBEDO_TABLE                   = "$albedoTable";
 const string T_ALBEDO_TABLE_SIZE              = "$albedoTableSize";
@@ -113,6 +114,7 @@ const string ENV_RADIANCE                     = "u_envRadiance";
 const string ENV_RADIANCE_MIPS                = "u_envRadianceMips";
 const string ENV_RADIANCE_SAMPLES             = "u_envRadianceSamples";
 const string ENV_IRRADIANCE                   = "u_envIrradiance";
+const string ENV_PREFILTER_MIP                = "u_envPrefilterMip";
 const string REFRACTION_TWO_SIDED             = "u_refractionTwoSided";
 const string ALBEDO_TABLE                     = "u_albedoTable";
 const string ALBEDO_TABLE_SIZE                = "u_albedoTableSize";
@@ -222,6 +224,7 @@ HwShaderGenerator::HwShaderGenerator(SyntaxPtr syntax) :
     _tokenSubstitutions[HW::T_AMB_OCC_GAIN] = HW::AMB_OCC_GAIN;
     _tokenSubstitutions[HW::T_VERTEX_DATA_INSTANCE] = HW::VERTEX_DATA_INSTANCE;
     _tokenSubstitutions[HW::T_LIGHT_DATA_INSTANCE] = HW::LIGHT_DATA_INSTANCE;
+    _tokenSubstitutions[HW::T_ENV_PREFILTER_MIP] = HW::ENV_PREFILTER_MIP;
 
     // Setup closure contexts for defining closure functions
     //
@@ -359,6 +362,16 @@ ShaderPtr HwShaderGenerator::createShader(const string& name, ElementPtr element
         psPrivateUniforms->add(Type::INTEGER, HW::T_ALBEDO_TABLE_SIZE, Value::createValue(64));
     }
 
+    // Add uniforms for environment prefiltering.
+    if (context.getOptions().hwWriteEnvPrefilter)
+    {
+        psPrivateUniforms->add(Type::FILENAME, HW::T_ENV_RADIANCE);
+        psPrivateUniforms->add(Type::INTEGER, HW::T_ENV_PREFILTER_MIP, Value::createValue(1));
+        const Matrix44 yRotationPI = Matrix44::createScale(Vector3(-1, 1, -1));
+        psPrivateUniforms->add(Type::MATRIX44, HW::T_ENV_MATRIX, Value::createValue(yRotationPI));
+        psPrivateUniforms->add(Type::INTEGER, HW::T_ENV_RADIANCE_MIPS, Value::createValue(1));
+    }
+
     // Create uniforms for the published graph interface
     for (ShaderGraphInputSocket* inputSocket : graph->getInputSockets())
     {
diff --git a/source/MaterialXGenShader/HwShaderGenerator.h b/source/MaterialXGenShader/HwShaderGenerator.h
index bba572c631..f839ac56bd 100644
--- a/source/MaterialXGenShader/HwShaderGenerator.h
+++ b/source/MaterialXGenShader/HwShaderGenerator.h
@@ -126,6 +126,7 @@ extern MX_GENSHADER_API const string T_ENV_RADIANCE;
 extern MX_GENSHADER_API const string T_ENV_RADIANCE_MIPS;
 extern MX_GENSHADER_API const string T_ENV_RADIANCE_SAMPLES;
 extern MX_GENSHADER_API const string T_ENV_IRRADIANCE;
+extern MX_GENSHADER_API const string T_ENV_PREFILTER_MIP;
 extern MX_GENSHADER_API const string T_REFRACTION_TWO_SIDED;
 extern MX_GENSHADER_API const string T_ALBEDO_TABLE;
 extern MX_GENSHADER_API const string T_ALBEDO_TABLE_SIZE;
@@ -182,6 +183,7 @@ extern MX_GENSHADER_API const string ENV_RADIANCE;
 extern MX_GENSHADER_API const string ENV_RADIANCE_MIPS;
 extern MX_GENSHADER_API const string ENV_RADIANCE_SAMPLES;
 extern MX_GENSHADER_API const string ENV_IRRADIANCE;
+extern MX_GENSHADER_API const string ENV_PREFILTER_MIP;
 extern MX_GENSHADER_API const string REFRACTION_TWO_SIDED;
 extern MX_GENSHADER_API const string ALBEDO_TABLE;
 extern MX_GENSHADER_API const string ALBEDO_TABLE_SIZE;
diff --git a/source/MaterialXRender/ImageHandler.cpp b/source/MaterialXRender/ImageHandler.cpp
index 2d56207f32..b148bf63d9 100644
--- a/source/MaterialXRender/ImageHandler.cpp
+++ b/source/MaterialXRender/ImageHandler.cpp
@@ -165,7 +165,7 @@ void ImageHandler::unbindImages()
     }
 }
 
-bool ImageHandler::createRenderResources(ImagePtr, bool)
+bool ImageHandler::createRenderResources(ImagePtr, bool, bool)
 {
     return false;
 }
diff --git a/source/MaterialXRender/ImageHandler.h b/source/MaterialXRender/ImageHandler.h
index e8eaf99b2f..e5d2082f8d 100644
--- a/source/MaterialXRender/ImageHandler.h
+++ b/source/MaterialXRender/ImageHandler.h
@@ -230,7 +230,7 @@ class MX_RENDER_API ImageHandler
     }
 
     /// Create rendering resources for the given image.
-    virtual bool createRenderResources(ImagePtr image, bool generateMipMaps);
+    virtual bool createRenderResources(ImagePtr image, bool generateMipMaps, bool useAsRenderTarget = false);
 
     /// Release rendering resources for the given image, or for all cached images
     /// if no image pointer is specified.
diff --git a/source/MaterialXRender/LightHandler.h b/source/MaterialXRender/LightHandler.h
index 852ccfa41d..a080c72081 100644
--- a/source/MaterialXRender/LightHandler.h
+++ b/source/MaterialXRender/LightHandler.h
@@ -37,6 +37,7 @@ class MX_RENDER_API LightHandler
         _lightTransform(Matrix44::IDENTITY),
         _directLighting(true),
         _indirectLighting(true),
+        _usePrefilteredMap(false),
         _envSampleCount(DEFAULT_ENV_SAMPLE_COUNT),
         _refractionTwoSided(false)
     {
@@ -101,6 +102,30 @@ class MX_RENDER_API LightHandler
         return _envRadianceMap;
     }
 
+    /// Set the environment radiance map for the prefiltered environment lighting model.
+    void setEnvPrefilteredMap(ImagePtr map)
+    {
+        _envPrefilteredMap = map;
+    }
+
+    /// Return the environment radiance map for the prefiltered environment lighting model.
+    ImagePtr getEnvPrefilteredMap() const
+    {
+        return _envPrefilteredMap;
+    }
+
+    /// Set whether to use the prefiltered environment lighting model.
+    void setUsePrefilteredMap(bool val)
+    {
+        _usePrefilteredMap = val;
+    }
+
+    /// Return whether to use the prefiltered environment lighting model.
+    bool getUsePrefilteredMap()
+    {
+        return _usePrefilteredMap;
+    }
+
     /// Set the environment irradiance map
     void setEnvIrradianceMap(ImagePtr map)
     {
@@ -216,8 +241,10 @@ class MX_RENDER_API LightHandler
     Matrix44 _lightTransform;
     bool _directLighting;
     bool _indirectLighting;
+    bool _usePrefilteredMap;
 
     ImagePtr _envRadianceMap;
+    ImagePtr _envPrefilteredMap;
     ImagePtr _envIrradianceMap;
     int _envSampleCount;
 
diff --git a/source/MaterialXRender/Util.cpp b/source/MaterialXRender/Util.cpp
index e8ec0f7c48..f33c67173e 100644
--- a/source/MaterialXRender/Util.cpp
+++ b/source/MaterialXRender/Util.cpp
@@ -76,6 +76,26 @@ ShaderPtr createAlbedoTableShader(GenContext& context,
     return shader;
 }
 
+ShaderPtr createEnvPrefilterShader(GenContext& context,
+                                        DocumentPtr stdLib,
+                                        const string& shaderName)
+{
+    // Construct a dummy nodegraph.
+    DocumentPtr doc = createDocument();
+    doc->importLibrary(stdLib);
+    NodeGraphPtr nodeGraph = doc->addNodeGraph();
+    NodePtr constant = nodeGraph->addNode("constant");
+    OutputPtr output = nodeGraph->addOutput();
+    output->setConnectedNode(constant);
+
+    // Generate the shader
+    GenContext tableContext = context;
+    tableContext.getOptions().hwWriteEnvPrefilter = true;
+    ShaderPtr shader = createShader(shaderName, tableContext, output);
+
+    return shader;
+}
+
 ShaderPtr createBlurShader(GenContext& context,
                            DocumentPtr stdLib,
                            const string& shaderName,
diff --git a/source/MaterialXRender/Util.h b/source/MaterialXRender/Util.h
index 922c06e529..bf1a3d543c 100644
--- a/source/MaterialXRender/Util.h
+++ b/source/MaterialXRender/Util.h
@@ -47,6 +47,11 @@ MX_RENDER_API ShaderPtr createAlbedoTableShader(GenContext& context,
                                                 DocumentPtr stdLib,
                                                 const string& shaderName);
 
+/// Create a shader that generates a prefiltered environment map.
+MX_RENDER_API ShaderPtr createEnvPrefilterShader(GenContext& context,
+                                                 DocumentPtr stdLib,
+                                                 const string& shaderName);
+
 /// Create a blur shader, using the given standard libraries for code generation.
 MX_RENDER_API ShaderPtr createBlurShader(GenContext& context,
                                          DocumentPtr stdLib,
diff --git a/source/MaterialXRenderGlsl/GLTextureHandler.cpp b/source/MaterialXRenderGlsl/GLTextureHandler.cpp
index 314a78c257..02a0a53927 100644
--- a/source/MaterialXRenderGlsl/GLTextureHandler.cpp
+++ b/source/MaterialXRenderGlsl/GLTextureHandler.cpp
@@ -91,7 +91,7 @@ bool GLTextureHandler::unbindImage(ImagePtr image)
     return false;
 }
 
-bool GLTextureHandler::createRenderResources(ImagePtr image, bool generateMipMaps)
+bool GLTextureHandler::createRenderResources(ImagePtr image, bool generateMipMaps, bool)
 {
     if (image->getResourceId() == GlslProgram::UNDEFINED_OPENGL_RESOURCE_ID)
     {
diff --git a/source/MaterialXRenderGlsl/GLTextureHandler.h b/source/MaterialXRenderGlsl/GLTextureHandler.h
index 942d6dc446..13eaab098f 100644
--- a/source/MaterialXRenderGlsl/GLTextureHandler.h
+++ b/source/MaterialXRenderGlsl/GLTextureHandler.h
@@ -37,7 +37,7 @@ class MX_RENDERGLSL_API GLTextureHandler : public ImageHandler
     bool unbindImage(ImagePtr image) override;
 
     /// Create rendering resources for the given image.
-    bool createRenderResources(ImagePtr image, bool generateMipMaps) override;
+    bool createRenderResources(ImagePtr image, bool generateMipMaps, bool useAsRenderTarget = false) override;
 
     /// Release rendering resources for the given image, or for all cached images
     /// if no image pointer is specified.
diff --git a/source/MaterialXRenderGlsl/GlslProgram.cpp b/source/MaterialXRenderGlsl/GlslProgram.cpp
index 4497019e91..eecab8036e 100644
--- a/source/MaterialXRenderGlsl/GlslProgram.cpp
+++ b/source/MaterialXRenderGlsl/GlslProgram.cpp
@@ -578,9 +578,20 @@ void GlslProgram::bindLighting(LightHandlerPtr lightHandler, ImageHandlerPtr ima
     Matrix44 envRotation = Matrix44::createRotationY(PI) * lightHandler->getLightTransform().getTranspose();
     bindUniform(HW::ENV_MATRIX, Value::createValue(envRotation), false);
     bindUniform(HW::ENV_RADIANCE_SAMPLES, Value::createValue(lightHandler->getEnvSampleCount()), false);
+    ImagePtr envRadiance = nullptr;
+    if (lightHandler->getIndirectLighting())
+    {
+        envRadiance = lightHandler->getUsePrefilteredMap() ?
+            lightHandler->getEnvPrefilteredMap() :
+            lightHandler->getEnvRadianceMap();
+    }
+    else
+    {
+        envRadiance = imageHandler->getZeroImage();
+    }
     ImageMap envImages =
     {
-        { HW::ENV_RADIANCE, lightHandler->getIndirectLighting() ? lightHandler->getEnvRadianceMap() : imageHandler->getZeroImage() },
+        { HW::ENV_RADIANCE, envRadiance },
         { HW::ENV_IRRADIANCE, lightHandler->getIndirectLighting() ? lightHandler->getEnvIrradianceMap() : imageHandler->getZeroImage() }
     };
     for (const auto& env : envImages)
diff --git a/source/MaterialXRenderMsl/MetalTextureHandler.h b/source/MaterialXRenderMsl/MetalTextureHandler.h
index 4c329f3f6d..c78469a4ce 100644
--- a/source/MaterialXRenderMsl/MetalTextureHandler.h
+++ b/source/MaterialXRenderMsl/MetalTextureHandler.h
@@ -57,7 +57,7 @@ class MX_RENDERMSL_API MetalTextureHandler : public ImageHandler
     id getMTLSamplerStateForImage(unsigned int index);
     
     /// Create rendering resources for the given image.
-    bool createRenderResources(ImagePtr image, bool generateMipMaps) override;
+    bool createRenderResources(ImagePtr image, bool generateMipMaps, bool useAsRenderTarget = false) override;
 
     /// Release rendering resources for the given image, or for all cached images
     /// if no image pointer is specified.
diff --git a/source/MaterialXRenderMsl/MetalTextureHandler.mm b/source/MaterialXRenderMsl/MetalTextureHandler.mm
index 745019ac92..ab8da46f1f 100644
--- a/source/MaterialXRenderMsl/MetalTextureHandler.mm
+++ b/source/MaterialXRenderMsl/MetalTextureHandler.mm
@@ -128,7 +128,7 @@
     return false;
 }
 
-bool MetalTextureHandler::createRenderResources(ImagePtr image, bool generateMipMaps)
+bool MetalTextureHandler::createRenderResources(ImagePtr image, bool generateMipMaps, bool useAsRenderTarget)
 {
     id texture = nil;
     
@@ -149,9 +149,7 @@
         texDesc.height = image->getHeight();
         texDesc.mipmapLevelCount = generateMipMaps ? image->getMaxMipCount() : 1;
         texDesc.usage = MTLTextureUsageShaderRead |
-            // For now, we set generate mip maps flag off,
-            // when we want to use the texture as render target
-            (!generateMipMaps ? MTLTextureUsageRenderTarget : 0);
+                    (useAsRenderTarget ? MTLTextureUsageRenderTarget : 0);
         texDesc.resourceOptions = MTLResourceStorageModePrivate;
         texDesc.pixelFormat = pixelFormat;
         if(generateMipMaps)
diff --git a/source/MaterialXRenderMsl/MslPipelineStateObject.mm b/source/MaterialXRenderMsl/MslPipelineStateObject.mm
index 4f8378ae46..f0cc8e47bb 100644
--- a/source/MaterialXRenderMsl/MslPipelineStateObject.mm
+++ b/source/MaterialXRenderMsl/MslPipelineStateObject.mm
@@ -594,7 +594,7 @@ int GetStrideOfMetalType(MTLDataType type)
                 // Bind environment lights.
                 ImageMap envLights =
                 {
-                    { HW::ENV_RADIANCE,   lightHandler->getEnvRadianceMap() },
+                    { HW::ENV_RADIANCE,   lightHandler->getUsePrefilteredMap() ? lightHandler->getEnvPrefilteredMap() : lightHandler->getEnvRadianceMap() },
                     { HW::ENV_IRRADIANCE, lightHandler->getEnvIrradianceMap() }
                 };
                 for (const auto& env : envLights)
diff --git a/source/MaterialXView/RenderPipeline.h b/source/MaterialXView/RenderPipeline.h
index 87baac3fa4..3b7e7a48b7 100644
--- a/source/MaterialXView/RenderPipeline.h
+++ b/source/MaterialXView/RenderPipeline.h
@@ -50,6 +50,7 @@ class RenderPipeline
     virtual void bakeTextures() = 0;
 
     virtual void updateAlbedoTable(int tableSize) = 0;
+    virtual void updatePrefilteredMap() = 0;
     virtual std::shared_ptr createTextureBaker(unsigned int width,
                                                      unsigned int height,
                                                      mx::Image::BaseType baseType) = 0;
diff --git a/source/MaterialXView/RenderPipelineGL.cpp b/source/MaterialXView/RenderPipelineGL.cpp
index f08704d0a3..68ac0be040 100644
--- a/source/MaterialXView/RenderPipelineGL.cpp
+++ b/source/MaterialXView/RenderPipelineGL.cpp
@@ -110,6 +110,100 @@ void GLRenderPipeline::updateAlbedoTable(int tableSize)
     glDrawBuffer(GL_BACK);
 }
 
+void GLRenderPipeline::updatePrefilteredMap()
+{
+    auto& genContext    = _viewer->_genContext;
+    auto& lightHandler  = _viewer->_lightHandler;
+    auto& imageHandler  = _viewer->_imageHandler;
+
+    if (lightHandler->getEnvPrefilteredMap())
+    {
+        return;
+    }
+
+    // Create the prefilter shader.
+    mx::GlslMaterialPtr material = nullptr;
+    try
+    {
+        mx::ShaderPtr hwShader = mx::createEnvPrefilterShader(genContext, _viewer->_stdLib, "__ENV_PREFILTER__");
+        material = mx::GlslMaterial::create();
+        material->generateShader(hwShader);
+    }
+    catch (std::exception& e)
+    {
+        new ng::MessageDialog(_viewer, ng::MessageDialog::Type::Warning, "Failed to generate prefilter shader", e.what());
+    }
+
+    mx::ImagePtr srcTex = lightHandler->getEnvRadianceMap();
+
+    int w = srcTex->getWidth();
+    int h = srcTex->getHeight();
+    int numMips = srcTex->getMaxMipCount();
+
+    // Create texture to hold the prefiltered environment.
+    mx::GLTextureHandlerPtr glImageHandler = std::dynamic_pointer_cast(imageHandler);
+    mx::ImagePtr outTex = mx::Image::create(w, h, 3, mx::Image::BaseType::HALF);
+    glImageHandler->createRenderResources(outTex, true, true);
+
+	mx::GlslProgramPtr program = material->getProgram();
+
+    try
+    {
+        int i = 0;
+        while (w > 0 && h > 0)
+        {
+            // Create framebuffer
+            unsigned int framebuffer;
+            glGenFramebuffers(1, &framebuffer);
+            glBindFramebuffer(GL_FRAMEBUFFER, framebuffer); 
+            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, outTex->getResourceId(), i);
+            glViewport(0, 0, w, h);
+            material->bindShader();
+
+            // Bind the source texture
+            mx::ImageSamplingProperties samplingProperties;
+            samplingProperties.uaddressMode = mx::ImageSamplingProperties::AddressMode::PERIODIC;
+            samplingProperties.vaddressMode = mx::ImageSamplingProperties::AddressMode::CLAMP;
+            samplingProperties.filterType = mx::ImageSamplingProperties::FilterType::LINEAR;
+            imageHandler->bindImage(srcTex, samplingProperties);
+            int textureLocation = glImageHandler->getBoundTextureLocation(srcTex->getResourceId());
+            assert(textureLocation >= 0);
+            material->getProgram()->bindUniform(mx::HW::ENV_RADIANCE, mx::Value::createValue(textureLocation));
+            // Bind other uniforms
+            program->bindUniform(mx::HW::ENV_PREFILTER_MIP, mx::Value::createValue(i));
+            const mx::Matrix44 yRotationPI = mx::Matrix44::createScale(mx::Vector3(-1, 1, -1));
+            program->bindUniform(mx::HW::ENV_MATRIX, mx::Value::createValue(yRotationPI));
+            program->bindUniform(mx::HW::ENV_RADIANCE_MIPS, mx::Value::createValue(numMips));
+
+            _viewer->renderScreenSpaceQuad(material);
+
+            glDeleteFramebuffers(1, &framebuffer); 
+
+            w /= 2;
+            h /= 2;
+            i++;
+        }
+    }
+    catch (mx::ExceptionRenderError& e)
+    {
+        for (const std::string& error : e.errorLog())
+        {
+            std::cerr << error << std::endl;
+        }
+        new ng::MessageDialog(_viewer, ng::MessageDialog::Type::Warning, "Failed to render prefiltered environment", e.what());
+    }
+    catch (std::exception& e)
+    {
+        new ng::MessageDialog(_viewer, ng::MessageDialog::Type::Warning, "Failed to render prefiltered environment", e.what());
+    }
+
+    // Clean up.
+    glViewport(0, 0, _viewer->m_fbsize[0], _viewer->m_fbsize[1]);
+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
+
+    lightHandler->setEnvPrefilteredMap(outTex);
+}
+
 mx::ImagePtr GLRenderPipeline::getShadowMap(int shadowMapSize)
 {
     auto& genContext      = _viewer->_genContext;
@@ -219,7 +313,13 @@ void GLRenderPipeline::renderFrame(void*, int shadowMapSize, const char* dirLigh
     float lightRotation = _viewer->_lightRotation;
     auto& searchPath    = _viewer->_searchPath;
     auto& geometryHandler    = _viewer->_geometryHandler;
-    
+
+    // Update prefiltered environment.
+    if (lightHandler->getUsePrefilteredMap() && !_viewer->_materialAssignments.empty())
+    {
+        updatePrefilteredMap();
+    }
+
     // Initialize OpenGL state
     glDisable(GL_BLEND);
     glEnable(GL_DEPTH_TEST);
diff --git a/source/MaterialXView/RenderPipelineGL.h b/source/MaterialXView/RenderPipelineGL.h
index fcb64a6436..00ebcbc6eb 100644
--- a/source/MaterialXView/RenderPipelineGL.h
+++ b/source/MaterialXView/RenderPipelineGL.h
@@ -31,6 +31,7 @@ class GLRenderPipeline : public RenderPipeline
     mx::ImageHandlerPtr createImageHandler() override;
     mx::MaterialPtr     createMaterial() override;
     void updateAlbedoTable(int tableSize) override;
+    void updatePrefilteredMap() override;
     std::shared_ptr createTextureBaker(unsigned int width,
                                              unsigned int height,
                                              mx::Image::BaseType baseType) override;
diff --git a/source/MaterialXView/RenderPipelineMetal.h b/source/MaterialXView/RenderPipelineMetal.h
index 1ed8c063bd..9cd2b2f6b3 100644
--- a/source/MaterialXView/RenderPipelineMetal.h
+++ b/source/MaterialXView/RenderPipelineMetal.h
@@ -40,6 +40,7 @@ class MetalRenderPipeline : public RenderPipeline
     mx::ImageHandlerPtr createImageHandler() override;
     mx::MaterialPtr     createMaterial() override;
     void updateAlbedoTable(int tableSize) override;
+    void updatePrefilteredMap() override;
     void renderFrame(void* color_texture, int shadowMapSize, const char* dirLightNodeCat) override;
     void bakeTextures() override;
     mx::ImagePtr getFrameImage() override;
@@ -50,6 +51,7 @@ class MetalRenderPipeline : public RenderPipeline
   protected:
     mx::ImagePtr getShadowMap(int shadowMapSize) override;
     mx::MetalFramebufferPtr  _shadowMapFramebuffer;
+    mx::MetalFramebufferPtr  _prefilterFramebuffer;
     mx::ImagePtr             _shadowMap[SHADOWMAP_TEX_COUNT];
 };
     
diff --git a/source/MaterialXView/RenderPipelineMetal.mm b/source/MaterialXView/RenderPipelineMetal.mm
index 026e35720a..0dc85b8aa4 100644
--- a/source/MaterialXView/RenderPipelineMetal.mm
+++ b/source/MaterialXView/RenderPipelineMetal.mm
@@ -155,6 +155,96 @@
     }
 }
 
+void MetalRenderPipeline::updatePrefilteredMap()
+{
+    auto& genContext    = _viewer->_genContext;
+    auto& lightHandler  = _viewer->_lightHandler;
+    auto& imageHandler  = _viewer->_imageHandler;
+
+    if (lightHandler->getEnvPrefilteredMap())
+    {
+        return;
+    }
+
+    mx::ImagePtr srcTex = lightHandler->getEnvRadianceMap();
+    int w = srcTex->getWidth();
+    int h = srcTex->getHeight();
+
+    mx::MetalTextureHandlerPtr mtlImageHandler = std::dynamic_pointer_cast(imageHandler);
+    mx::ImagePtr outTex = mx::Image::create(w, h, 3, mx::Image::BaseType::HALF);
+    mtlImageHandler->createRenderResources(outTex, true, true);
+    id metalTex = mtlImageHandler->getAssociatedMetalTexture(outTex);
+
+    // Create framebuffer.
+    _prefilterFramebuffer = mx::MetalFramebuffer::create(
+        MTL(device),
+        w, h,
+        4,
+        mx::Image::BaseType::HALF,
+        metalTex
+    );
+
+    MTL_PUSH_FRAMEBUFFER(_prefilterFramebuffer);
+
+    // Create shader.
+    mx::ShaderPtr hwShader = mx::createEnvPrefilterShader(genContext, _viewer->_stdLib, "__ENV_PREFILTER__");
+    mx::MslMaterialPtr material = mx::MslMaterial::create();
+    try
+    {
+        material->generateShader(hwShader);
+    }
+    catch (std::exception& e)
+    {
+        new ng::MessageDialog(_viewer, ng::MessageDialog::Type::Warning, "Failed to generate convolution shader", e.what());
+    }
+
+    int i = 0;
+
+    while (w > 0 && h > 0)
+    {
+        MTL(beginCommandBuffer());
+        MTLRenderPassDescriptor* desc = [MTLRenderPassDescriptor new];
+        [desc.colorAttachments[0] setTexture:metalTex];
+        [desc.colorAttachments[0] setLevel:i];
+        [desc.colorAttachments[0] setLoadAction:MTLLoadActionDontCare];
+        [desc.colorAttachments[0] setStoreAction:MTLStoreActionStore];
+        [desc.depthAttachment setTexture:_prefilterFramebuffer->getDepthTexture()];
+        [desc.depthAttachment setLoadAction:MTLLoadActionDontCare];
+        [desc.depthAttachment setStoreAction:MTLStoreActionDontCare];
+        [desc setStencilAttachment:nil];
+        
+        MTL(beginEncoder(desc));
+        [MTL(renderCmdEncoder) setDepthStencilState:MTL_DEPTHSTENCIL_STATE(opaque)];
+
+        _prefilterFramebuffer->bind(desc);
+        material->bindShader();
+        material->getProgram()->bindUniform(mx::HW::ENV_PREFILTER_MIP, mx::Value::createValue(i));
+
+        bool prevValue = lightHandler->getUsePrefilteredMap();
+        lightHandler->setUsePrefilteredMap(false);
+        material->getProgram()->prepareUsedResources(
+                        MTL(renderCmdEncoder),
+                        _viewer->_identityCamera,
+                        nullptr,
+                        imageHandler,
+                        lightHandler);
+        lightHandler->setUsePrefilteredMap(prevValue);
+
+        _viewer->renderScreenSpaceQuad(material);
+
+        MTL(endCommandBuffer());
+        [desc release];
+
+        w /= 2;
+        h /= 2;
+        i++;
+    }
+
+    MTL_POP_FRAMEBUFFER();
+
+    lightHandler->setEnvPrefilteredMap(outTex);
+}
+
 mx::ImagePtr MetalRenderPipeline::getShadowMap(int shadowMapSize)
 {
     auto& genContext      = _viewer->_genContext;
@@ -175,7 +265,7 @@
            !mtlImageHandler->getAssociatedMetalTexture(_shadowMap[i]))
         {
             _shadowMap[i] = mx::Image::create(shadowMapSize, shadowMapSize, 2, mx::Image::BaseType::FLOAT);
-            _viewer->_imageHandler->createRenderResources(_shadowMap[i], false);
+            _viewer->_imageHandler->createRenderResources(_shadowMap[i], false, true);
         }
         
         shadowMapTex[i] =
@@ -315,6 +405,12 @@
     auto& searchPath    = _viewer->_searchPath;
     auto& geometryHandler    = _viewer->_geometryHandler;
     
+    // Update prefiltered environment.
+    if (lightHandler->getUsePrefilteredMap() && !_viewer->_materialAssignments.empty())
+    {
+        updatePrefilteredMap();
+    }
+
     // Update lighting state.
     lightHandler->setLightTransform(mx::Matrix44::createRotationY(lightRotation / 180.0f * M_PI));
 
diff --git a/source/MaterialXView/Viewer.cpp b/source/MaterialXView/Viewer.cpp
index c06846f2ce..eeaf7a82b0 100644
--- a/source/MaterialXView/Viewer.cpp
+++ b/source/MaterialXView/Viewer.cpp
@@ -485,9 +485,12 @@ void Viewer::loadEnvironmentLight()
 
     // Release any existing environment maps and store the new ones.
     _imageHandler->releaseRenderResources(_lightHandler->getEnvRadianceMap());
+    _imageHandler->releaseRenderResources(_lightHandler->getEnvPrefilteredMap());
     _imageHandler->releaseRenderResources(_lightHandler->getEnvIrradianceMap());
+
     _lightHandler->setEnvRadianceMap(envRadianceMap);
     _lightHandler->setEnvIrradianceMap(envIrradianceMap);
+    _lightHandler->setEnvPrefilteredMap(nullptr);
 
     // Look for a light rig using an expected filename convention.
     if (!_splitDirectLight)
@@ -746,12 +749,14 @@ void Viewer::createAdvancedSettings(Widget* parent)
 
     ng::CheckBox* importanceSampleBox = new ng::CheckBox(advancedPopup, "Environment FIS");
     importanceSampleBox->set_checked(_genContext.getOptions().hwSpecularEnvironmentMethod == mx::SPECULAR_ENVIRONMENT_FIS);
+    _lightHandler->setUsePrefilteredMap(_genContext.getOptions().hwSpecularEnvironmentMethod != mx::SPECULAR_ENVIRONMENT_FIS);
     importanceSampleBox->set_callback([this](bool enable)
     {
         _genContext.getOptions().hwSpecularEnvironmentMethod = enable ? mx::SPECULAR_ENVIRONMENT_FIS : mx::SPECULAR_ENVIRONMENT_PREFILTER;
 #ifndef MATERIALXVIEW_METAL_BACKEND
         _genContextEssl.getOptions().hwSpecularEnvironmentMethod = _genContext.getOptions().hwSpecularEnvironmentMethod;
 #endif
+        _lightHandler->setUsePrefilteredMap(!enable);
         reloadShaders();
     });
 
diff --git a/source/PyMaterialX/PyMaterialXGenShader/PyGenOptions.cpp b/source/PyMaterialX/PyMaterialXGenShader/PyGenOptions.cpp
index 75b5fb11bb..c40728ad26 100644
--- a/source/PyMaterialX/PyMaterialXGenShader/PyGenOptions.cpp
+++ b/source/PyMaterialX/PyMaterialXGenShader/PyGenOptions.cpp
@@ -38,6 +38,7 @@ void bindPyGenOptions(py::module& mod)
         .def_readwrite("hwNormalizeUdimTexCoords", &mx::GenOptions::hwNormalizeUdimTexCoords)
         .def_readwrite("hwAmbientOcclusion", &mx::GenOptions::hwAmbientOcclusion)        
         .def_readwrite("hwWriteAlbedoTable", &mx::GenOptions::hwWriteAlbedoTable)
+        .def_readwrite("hwWriteEnvPrefilter", &mx::GenOptions::hwWriteEnvPrefilter)
         .def_readwrite("hwImplicitBitangents", &mx::GenOptions::hwImplicitBitangents)
         .def_readwrite("emitColorTransforms", &mx::GenOptions::emitColorTransforms)
         .def(py::init<>());

From 438f65ddb800ace92f5082607d9e30ffeac3e42d Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Sat, 30 Dec 2023 11:23:55 -0800
Subject: [PATCH 56/66] Clarify GLSL data generation shaders

- Use the word "generate" consistently in GLSL data generation files and functions, e.g. mx_generate_albedo_table.glsl, mx_generate_prefilter_env.glsl.
- Improve documentation for GLSL data generation functions.
- Replace constant texture dimensions with the textureSize call.
---
 ...ble.glsl => mx_generate_albedo_table.glsl} |  0
 ...nt.glsl => mx_generate_prefilter_env.glsl} | 19 +++++++------------
 .../genglsl/lib/mx_microfacet_specular.glsl   |  5 +++--
 .../MaterialXGenGlsl/GlslShaderGenerator.cpp  |  6 +++---
 source/MaterialXGenMsl/MslShaderGenerator.cpp |  6 +++---
 5 files changed, 16 insertions(+), 20 deletions(-)
 rename libraries/pbrlib/genglsl/lib/{mx_table.glsl => mx_generate_albedo_table.glsl} (100%)
 rename libraries/pbrlib/genglsl/lib/{mx_prefilter_environment.glsl => mx_generate_prefilter_env.glsl} (90%)

diff --git a/libraries/pbrlib/genglsl/lib/mx_table.glsl b/libraries/pbrlib/genglsl/lib/mx_generate_albedo_table.glsl
similarity index 100%
rename from libraries/pbrlib/genglsl/lib/mx_table.glsl
rename to libraries/pbrlib/genglsl/lib/mx_generate_albedo_table.glsl
diff --git a/libraries/pbrlib/genglsl/lib/mx_prefilter_environment.glsl b/libraries/pbrlib/genglsl/lib/mx_generate_prefilter_env.glsl
similarity index 90%
rename from libraries/pbrlib/genglsl/lib/mx_prefilter_environment.glsl
rename to libraries/pbrlib/genglsl/lib/mx_generate_prefilter_env.glsl
index fd608871ed..e437e886af 100644
--- a/libraries/pbrlib/genglsl/lib/mx_prefilter_environment.glsl
+++ b/libraries/pbrlib/genglsl/lib/mx_generate_prefilter_env.glsl
@@ -25,22 +25,17 @@ vec3 mx_latlong_map_projection_inverse(vec2 uv)
     return vec3(x, y, z);
 }
 
-vec3 mx_prefilter_environment()
+vec3 mx_generate_prefilter_env()
 {
-    vec2 uv = gl_FragCoord.xy * pow(2.0, $envPrefilterMip) / vec2(2048.0, 1024.0);
-    float alpha = mx_latlong_lod_to_alpha(float($envPrefilterMip));
-    if ($envPrefilterMip == 0)
-    {
-        return textureLod($envRadiance, uv, 0).rgb;
-    }
+    // The tangent view vector is aligned with the normal.
+    vec3 V = vec3(0.0, 0.0, 1.0);
+    float NdotV = 1.0;
 
-    // Compute world normal and transform.
+    // Compute derived properties.
+    vec2 uv = gl_FragCoord.xy * pow(2.0, $envPrefilterMip) / vec2(textureSize($envRadiance, 0));
     vec3 worldN = mx_latlong_map_projection_inverse(uv);
     mat3 tangentToWorld = mx_orthonormal_basis(worldN);
-
-    // Local normal and view vectors are constant and aligned.
-    vec3 V = vec3(0.0, 0.0, 1.0);
-    float NdotV = 1.0;
+    float alpha = mx_latlong_lod_to_alpha(float($envPrefilterMip));
     float G1V = mx_ggx_smith_G1(NdotV, alpha);
 
     // Integrate the LD term for the given environment and alpha.
diff --git a/libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl b/libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl
index 85430c00ca..a27f717a24 100644
--- a/libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl
+++ b/libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl
@@ -594,6 +594,7 @@ vec3 mx_latlong_map_lookup(vec3 dir, mat4 transform, float lod, sampler2D envSam
     return textureLod(envSampler, uv, lod).rgb;
 }
 
+// Return the mip level with the appropriate coverage for a filtered importance sample.
 // https://developer.nvidia.com/gpugems/GPUGems3/gpugems3_ch20.html
 // Section 20.4 Equation 13
 float mx_latlong_compute_lod(vec3 dir, float pdf, float maxMipLevel, int envSamples)
@@ -604,16 +605,16 @@ float mx_latlong_compute_lod(vec3 dir, float pdf, float maxMipLevel, int envSamp
     return max(effectiveMaxMipLevel - 0.5 * log2(float(envSamples) * pdf * distortion), 0.0);
 }
 
+// Return the mip level associated with the given alpha in a prefiltered environment.
 float mx_latlong_alpha_to_lod(float alpha)
 {
-    // Return the mip level associated with the given alpha in a prefiltered environment.
     float lodBias = (alpha < 0.25) ? sqrt(alpha) : 0.5 * alpha + 0.375;
     return lodBias * float($envRadianceMips - 1);
 }
 
+// Return the alpha associated with the given mip level in a prefiltered environment.
 float mx_latlong_lod_to_alpha(float lod)
 {
-    // Return the alpha associated with the given mip level in a prefiltered environment.
     float lodBias = lod / float($envRadianceMips - 1);
     return (lodBias < 0.5) ? mx_square(lodBias) : 2.0 * (lodBias - 0.375);
 }
diff --git a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
index b9351ddc08..e506c700c7 100644
--- a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
+++ b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
@@ -587,14 +587,14 @@ void GlslShaderGenerator::emitPixelStage(const ShaderGraph& graph, GenContext& c
     // Emit directional albedo table code.
     if (context.getOptions().hwWriteAlbedoTable)
     {
-        emitLibraryInclude("pbrlib/genglsl/lib/mx_table.glsl", context, stage);
+        emitLibraryInclude("pbrlib/genglsl/lib/mx_generate_albedo_table.glsl", context, stage);
         emitLineBreak(stage);
     }
 
     // Emit environment prefiltering code
     if (context.getOptions().hwWriteEnvPrefilter)
     {
-        emitLibraryInclude("pbrlib/genglsl/lib/mx_prefilter_environment.glsl", context, stage);
+        emitLibraryInclude("pbrlib/genglsl/lib/mx_generate_prefilter_env.glsl", context, stage);
         emitLineBreak(stage);
     }
 
@@ -645,7 +645,7 @@ void GlslShaderGenerator::emitPixelStage(const ShaderGraph& graph, GenContext& c
     }
     else if (context.getOptions().hwWriteEnvPrefilter)
     {
-        emitLine(outputSocket->getVariable() + " = vec4(mx_prefilter_environment(), 1.0)", stage);
+        emitLine(outputSocket->getVariable() + " = vec4(mx_generate_prefilter_env(), 1.0)", stage);
     }
     else
     {
diff --git a/source/MaterialXGenMsl/MslShaderGenerator.cpp b/source/MaterialXGenMsl/MslShaderGenerator.cpp
index 5749f0d211..10c368177c 100644
--- a/source/MaterialXGenMsl/MslShaderGenerator.cpp
+++ b/source/MaterialXGenMsl/MslShaderGenerator.cpp
@@ -1055,14 +1055,14 @@ void MslShaderGenerator::emitPixelStage(const ShaderGraph& graph, GenContext& co
         // Emit directional albedo table code.
         if (context.getOptions().hwWriteAlbedoTable)
         {
-            emitLibraryInclude("pbrlib/genglsl/lib/mx_table.glsl", context, stage);
+            emitLibraryInclude("pbrlib/genglsl/lib/mx_generate_albedo_table.glsl", context, stage);
             emitLineBreak(stage);
         }
 
         // Emit environment prefiltering code
         if (context.getOptions().hwWriteEnvPrefilter)
         {
-            emitLibraryInclude("pbrlib/genglsl/lib/mx_prefilter_environment.glsl", context, stage);
+            emitLibraryInclude("pbrlib/genglsl/lib/mx_generate_prefilter_env.glsl", context, stage);
             emitLineBreak(stage);
         }
 
@@ -1113,7 +1113,7 @@ void MslShaderGenerator::emitPixelStage(const ShaderGraph& graph, GenContext& co
         }
         else if (context.getOptions().hwWriteEnvPrefilter)
         {
-            emitLine(outputSocket->getVariable() + " = float4(mx_prefilter_environment(), 1.0)", stage);
+            emitLine(outputSocket->getVariable() + " = float4(mx_generate_prefilter_env(), 1.0)", stage);
         }
         else
         {

From d4c6f60984b9ec4d7be69d8402b97b0d18e63591 Mon Sep 17 00:00:00 2001
From: ld-kerley <154285602+ld-kerley@users.noreply.github.com>
Date: Tue, 2 Jan 2024 12:11:01 -0800
Subject: [PATCH 57/66] Fix missing MSL case in PyMaterialX build (#1630)

Fix missing MATERIALX_BUILD_GEN_MSL in CMakeLists.txt for PyMaterialX.
---
 source/PyMaterialX/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/PyMaterialX/CMakeLists.txt b/source/PyMaterialX/CMakeLists.txt
index eda1ba0db4..2bbe2c9506 100644
--- a/source/PyMaterialX/CMakeLists.txt
+++ b/source/PyMaterialX/CMakeLists.txt
@@ -44,7 +44,7 @@ endif()
 
 add_subdirectory(PyMaterialXCore)
 add_subdirectory(PyMaterialXFormat)
-if (MATERIALX_BUILD_GEN_GLSL OR MATERIALX_BUILD_GEN_OSL OR MATERIALX_BUILD_GEN_MDL)
+if (MATERIALX_BUILD_GEN_GLSL OR MATERIALX_BUILD_GEN_OSL OR MATERIALX_BUILD_GEN_MDL OR MATERIALX_BUILD_GEN_MSL)
     add_subdirectory(PyMaterialXGenShader)
     if (MATERIALX_BUILD_GEN_GLSL)
         add_subdirectory(PyMaterialXGenGlsl)

From 473d563896a4accb1d570726704ba7aba137779a Mon Sep 17 00:00:00 2001
From: Bernard Kwok 
Date: Wed, 3 Jan 2024 19:22:12 -0500
Subject: [PATCH 58/66] Add enumeration support to web viewer (#1632)

- Scan for `enum` and `enumvalues` if attributes exist on input. If no `enumvalues` exist then map to "default" of 0..<enum list size>.
- Create a drop-down for each enumerated input.
---
 javascript/MaterialXView/source/viewer.js | 34 +++++++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/javascript/MaterialXView/source/viewer.js b/javascript/MaterialXView/source/viewer.js
index b0bcd98fbf..3eff576be3 100644
--- a/javascript/MaterialXView/source/viewer.js
+++ b/javascript/MaterialXView/source/viewer.js
@@ -949,11 +949,17 @@ export class Material
                                 }
                                 var step = 0;
                                 var enumList = []
+                                var enumValues = []
                                 if (nodeDefInput)
                                 {
                                     if (nodeDefInput.hasAttribute('enum'))
                                     {
+                                        // Get enum and enum values attributes (if present)
                                         enumList = nodeDefInput.getAttribute('enum').split(',');
+                                        if (nodeDefInput.hasAttribute('enumvalues'))
+                                        {
+                                            enumValues = nodeDefInput.getAttribute('enumvalues').split(',').map(Number);
+                                        }
                                     }
                                     else
                                     {
@@ -989,8 +995,30 @@ export class Material
                                 }    
                                 else
                                 {
-                                    // TODO: Add enum support
-                                    currentFolder.add(material.uniforms[name], 'value' ).name(path);
+                                    // Map enumList strings to values
+                                    // Map to 0..N if no values are specified via enumvalues attribute
+                                    if (enumValues.length == 0)
+                                    {                                
+                                        for (let i = 0; i < enumList.length; ++i)
+                                        {
+                                            enumValues.push(i);
+                                        }
+                                    }
+                                    const enumeration = {};
+                                    enumList.forEach((str, index) => {
+                                        enumeration[str] = enumValues[index];
+                                    });
+                                
+                                    // Function to handle enum drop-down
+                                    function handleDropdownChange(value) {
+                                        if (material.uniforms[name])
+                                        {
+                                            material.uniforms[name].value = value;
+                                        } 
+                                    }                                    
+                                    const defaultOption = enumList[value]; // Set the default selected option
+                                    const dropdownController = gui.add(enumeration, defaultOption, enumeration).name(path);
+                                    dropdownController.onChange(handleDropdownChange);                                
                                 }
                             }
                             break;
@@ -1046,7 +1074,7 @@ export class Material
                             break;
 
                         case 'color3':
-                            // Irksome way to mape arrays to colors and back
+                            // Irksome way to map arrays to colors and back
                             uniformToUpdate = material.uniforms[name];
                             if (uniformToUpdate && value != null)
                             {

From 39d6d5b614d7f9e77fe82d36f18c70f5139a81a3 Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Wed, 3 Jan 2024 16:23:31 -0800
Subject: [PATCH 59/66] Initial nprlib with viewdirection node (#1631)

This changelist introduces an NPR (non-photorealistic rendering) data library to MaterialX, initially consisting of a single `viewdirection` node.

The NPR data library is designed for the portable expression of artistic, non-physically-based materials, with common examples being cartoon shading, architectural diagrams, and edge highlighting.  In future versions of MaterialX, we expect this data library to be extended with additional primitives and artist-facing graphs as they are requested by the graphics community and approved by the MaterialX TSC.

For shader generation, MaterialX initially supports the NPR data library in GLSL, ESSL, MSL, and OSL, with MDL being omitted for now, based on intentional restrictions in its design philosophy.
---
 .../nprlib/genglsl/nprlib_genglsl_impl.mtlx   | 17 ++++++
 .../nprlib/genmdl/nprlib_genmdl_impl.mtlx     | 17 ++++++
 .../nprlib/genmsl/nprlib_genmsl_impl.mtlx     | 17 ++++++
 .../nprlib/genosl/nprlib_genosl_impl.mtlx     | 17 ++++++
 libraries/nprlib/nprlib_defs.mtlx             | 23 ++++++++
 ...nvmap_shader.mtlx => environment_map.mtlx} | 21 +++----
 resources/Materials/TestSuite/_options.mtlx   |  2 +-
 .../TestSuite/nprlib/edge_brighten.mtlx       | 28 ++++++++++
 .../Materials/TestSuite/nprlib/starfield.mtlx | 25 +++++++++
 .../MaterialXGenGlsl/GlslShaderGenerator.cpp  |  3 +
 .../Nodes/ViewDirectionNodeGlsl.cpp           | 55 +++++++++++++++++++
 .../Nodes/ViewDirectionNodeGlsl.h             | 26 +++++++++
 .../MaterialXGenMdl/mdl/materialx/stdlib.mdl  | 16 ++++++
 source/MaterialXGenMsl/MslShaderGenerator.cpp |  3 +
 .../Nodes/ViewDirectionNodeMsl.cpp            | 55 +++++++++++++++++++
 .../Nodes/ViewDirectionNodeMsl.h              | 26 +++++++++
 source/MaterialXRender/ShaderMaterial.cpp     |  2 +-
 source/MaterialXView/Viewer.cpp               | 54 +-----------------
 18 files changed, 338 insertions(+), 69 deletions(-)
 create mode 100644 libraries/nprlib/genglsl/nprlib_genglsl_impl.mtlx
 create mode 100644 libraries/nprlib/genmdl/nprlib_genmdl_impl.mtlx
 create mode 100644 libraries/nprlib/genmsl/nprlib_genmsl_impl.mtlx
 create mode 100644 libraries/nprlib/genosl/nprlib_genosl_impl.mtlx
 create mode 100644 libraries/nprlib/nprlib_defs.mtlx
 rename resources/Lights/{envmap_shader.mtlx => environment_map.mtlx} (69%)
 create mode 100644 resources/Materials/TestSuite/nprlib/edge_brighten.mtlx
 create mode 100644 resources/Materials/TestSuite/nprlib/starfield.mtlx
 create mode 100644 source/MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.cpp
 create mode 100644 source/MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.h
 create mode 100644 source/MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.cpp
 create mode 100644 source/MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.h

diff --git a/libraries/nprlib/genglsl/nprlib_genglsl_impl.mtlx b/libraries/nprlib/genglsl/nprlib_genglsl_impl.mtlx
new file mode 100644
index 0000000000..7ddc4cee83
--- /dev/null
+++ b/libraries/nprlib/genglsl/nprlib_genglsl_impl.mtlx
@@ -0,0 +1,17 @@
+
+
+  
+
+  
+  
+  
+
+  
+  
+
+
diff --git a/libraries/nprlib/genmdl/nprlib_genmdl_impl.mtlx b/libraries/nprlib/genmdl/nprlib_genmdl_impl.mtlx
new file mode 100644
index 0000000000..b6472e0c51
--- /dev/null
+++ b/libraries/nprlib/genmdl/nprlib_genmdl_impl.mtlx
@@ -0,0 +1,17 @@
+
+
+  
+
+  
+  
+  
+
+  
+  
+
+
diff --git a/libraries/nprlib/genmsl/nprlib_genmsl_impl.mtlx b/libraries/nprlib/genmsl/nprlib_genmsl_impl.mtlx
new file mode 100644
index 0000000000..b8f9a4e3aa
--- /dev/null
+++ b/libraries/nprlib/genmsl/nprlib_genmsl_impl.mtlx
@@ -0,0 +1,17 @@
+
+
+  
+
+  
+  
+  
+
+  
+  
+
+
diff --git a/libraries/nprlib/genosl/nprlib_genosl_impl.mtlx b/libraries/nprlib/genosl/nprlib_genosl_impl.mtlx
new file mode 100644
index 0000000000..0b077b6406
--- /dev/null
+++ b/libraries/nprlib/genosl/nprlib_genosl_impl.mtlx
@@ -0,0 +1,17 @@
+
+
+  
+
+  
+  
+  
+
+  
+  
+
+
diff --git a/libraries/nprlib/nprlib_defs.mtlx b/libraries/nprlib/nprlib_defs.mtlx
new file mode 100644
index 0000000000..e724658ae5
--- /dev/null
+++ b/libraries/nprlib/nprlib_defs.mtlx
@@ -0,0 +1,23 @@
+
+
+  
+
+  
+  
+  
+
+  
+  
+    
+    
+  
+
+
diff --git a/resources/Lights/envmap_shader.mtlx b/resources/Lights/environment_map.mtlx
similarity index 69%
rename from resources/Lights/envmap_shader.mtlx
rename to resources/Lights/environment_map.mtlx
index 8c9c6ec0f5..abd14d546b 100644
--- a/resources/Lights/envmap_shader.mtlx
+++ b/resources/Lights/environment_map.mtlx
@@ -1,17 +1,10 @@
 
-
+
 
-  
-  
-  
-    
-  
-  
-  
-  
+  
 
     
-    
+    
 
     
     
@@ -46,11 +39,11 @@
       
     
     
-      
+      
       
-      
-      
-      
+      
+      
+      
     
 
     
diff --git a/resources/Materials/TestSuite/_options.mtlx b/resources/Materials/TestSuite/_options.mtlx
index bb29fbd7c1..1da00394e6 100644
--- a/resources/Materials/TestSuite/_options.mtlx
+++ b/resources/Materials/TestSuite/_options.mtlx
@@ -91,7 +91,7 @@
     
 
     
-    
+    
 
     
     
diff --git a/resources/Materials/TestSuite/nprlib/edge_brighten.mtlx b/resources/Materials/TestSuite/nprlib/edge_brighten.mtlx
new file mode 100644
index 0000000000..7e9aca7f22
--- /dev/null
+++ b/resources/Materials/TestSuite/nprlib/edge_brighten.mtlx
@@ -0,0 +1,28 @@
+
+
+  
+    
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+    
+    
+      
+      
+    
+    
+      
+      
+      
+    
+    
+  
+
diff --git a/resources/Materials/TestSuite/nprlib/starfield.mtlx b/resources/Materials/TestSuite/nprlib/starfield.mtlx
new file mode 100644
index 0000000000..6898054a6d
--- /dev/null
+++ b/resources/Materials/TestSuite/nprlib/starfield.mtlx
@@ -0,0 +1,25 @@
+
+
+  
+    
+    
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+    
+    
+  
+
diff --git a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
index e506c700c7..5b20ee1b03 100644
--- a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
+++ b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -196,6 +197,8 @@ GlslShaderGenerator::GlslShaderGenerator() :
     registerImplementation("IM_frame_float_" + GlslShaderGenerator::TARGET, FrameNodeGlsl::create);
     // 
     registerImplementation("IM_time_float_" + GlslShaderGenerator::TARGET, TimeNodeGlsl::create);
+    // 
+    registerImplementation("IM_viewdirection_vector3_" + GlslShaderGenerator::TARGET, ViewDirectionNodeGlsl::create);
 
     // 
     registerImplementation("IM_surface_" + GlslShaderGenerator::TARGET, SurfaceNodeGlsl::create);
diff --git a/source/MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.cpp
new file mode 100644
index 0000000000..198465c9af
--- /dev/null
+++ b/source/MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.cpp
@@ -0,0 +1,55 @@
+//
+// Copyright Contributors to the MaterialX Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#include 
+
+#include 
+
+MATERIALX_NAMESPACE_BEGIN
+
+ShaderNodeImplPtr ViewDirectionNodeGlsl::create()
+{
+    return std::make_shared();
+}
+
+void ViewDirectionNodeGlsl::createVariables(const ShaderNode&, GenContext&, Shader& shader) const
+{
+    ShaderStage& vs = shader.getStage(Stage::VERTEX);
+    ShaderStage& ps = shader.getStage(Stage::PIXEL);
+
+    addStageInput(HW::VERTEX_INPUTS, Type::VECTOR3, HW::T_IN_POSITION, vs);
+    addStageConnector(HW::VERTEX_DATA, Type::VECTOR3, HW::T_POSITION_WORLD, vs, ps);
+    addStageUniform(HW::PRIVATE_UNIFORMS, Type::VECTOR3, HW::T_VIEW_POSITION, ps);
+}
+
+void ViewDirectionNodeGlsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
+{
+    const ShaderGenerator& shadergen = context.getShaderGenerator();
+
+    DEFINE_SHADER_STAGE(stage, Stage::VERTEX)
+    {
+        VariableBlock& vertexData = stage.getOutputBlock(HW::VERTEX_DATA);
+        const string prefix = vertexData.getInstance() + ".";
+        ShaderPort* position = vertexData[HW::T_POSITION_WORLD];
+        if (!position->isEmitted())
+        {
+            position->setEmitted();
+            shadergen.emitLine(prefix + position->getVariable() + " = hPositionWorld.xyz", stage);
+        }
+    }
+
+    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
+    {
+        VariableBlock& vertexData = stage.getInputBlock(HW::VERTEX_DATA);
+        const string prefix = vertexData.getInstance() + ".";
+        ShaderPort* position = vertexData[HW::T_POSITION_WORLD];
+        shadergen.emitLineBegin(stage);
+        shadergen.emitOutput(node.getOutput(), true, false, context, stage);
+        shadergen.emitString(" = normalize(" + prefix + position->getVariable() + " - " + HW::T_VIEW_POSITION + ")", stage);
+        shadergen.emitLineEnd(stage);
+    }
+}
+
+MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.h b/source/MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.h
new file mode 100644
index 0000000000..24cafe2f1d
--- /dev/null
+++ b/source/MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.h
@@ -0,0 +1,26 @@
+//
+// Copyright Contributors to the MaterialX Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#ifndef MATERIALX_VIEWDIRECTIONNODEGLSL_H
+#define MATERIALX_VIEWDIRECTIONNODEGLSL_H
+
+#include 
+
+MATERIALX_NAMESPACE_BEGIN
+
+/// ViewDirection node implementation for GLSL
+class MX_GENGLSL_API ViewDirectionNodeGlsl : public GlslImplementation
+{
+  public:
+    static ShaderNodeImplPtr create();
+
+    void createVariables(const ShaderNode& node, GenContext& context, Shader& shader) const override;
+
+    void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
+};
+
+MATERIALX_NAMESPACE_END
+
+#endif
diff --git a/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl b/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl
index 4ba4f0875a..4cae1547aa 100644
--- a/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl
+++ b/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl
@@ -1366,6 +1366,22 @@ export float mx_time_float(
 	return ::state::animation_time();
 }
 
+export float3 mx_viewdirection_vector3(
+	uniform mx_coordinatespace_type mxp_space = mx_coordinatespace_type(mx_coordinatespace_type_world)	
+	[[
+		anno::description("Enumeration {model,object,world}."),
+        anno::unused()
+	]]
+)
+	[[
+		anno::description("Node Group: nprlib")
+	]]
+{
+	// Not implemented: mx_viewdirection_vector3
+	float3 defaultValue = float3(0.0, 0.0, 1.0);
+	return defaultValue;
+}
+
 export color mx_modulo_color3(
 	color mxp_in1 = color(0.0, 0.0, 0.0),
 	color mxp_in2 = color(1.0, 1.0, 1.0)
diff --git a/source/MaterialXGenMsl/MslShaderGenerator.cpp b/source/MaterialXGenMsl/MslShaderGenerator.cpp
index 10c368177c..7a2461a5a8 100644
--- a/source/MaterialXGenMsl/MslShaderGenerator.cpp
+++ b/source/MaterialXGenMsl/MslShaderGenerator.cpp
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -200,6 +201,8 @@ MslShaderGenerator::MslShaderGenerator() :
     registerImplementation("IM_frame_float_" + MslShaderGenerator::TARGET, FrameNodeMsl::create);
     // 
     registerImplementation("IM_time_float_" + MslShaderGenerator::TARGET, TimeNodeMsl::create);
+    // 
+    registerImplementation("IM_viewdirection_vector3_" + MslShaderGenerator::TARGET, ViewDirectionNodeMsl::create);
 
     // 
     registerImplementation("IM_surface_" + MslShaderGenerator::TARGET, SurfaceNodeMsl::create);
diff --git a/source/MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.cpp b/source/MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.cpp
new file mode 100644
index 0000000000..84a6b02b4f
--- /dev/null
+++ b/source/MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.cpp
@@ -0,0 +1,55 @@
+//
+// Copyright Contributors to the MaterialX Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#include 
+
+#include 
+
+MATERIALX_NAMESPACE_BEGIN
+
+ShaderNodeImplPtr ViewDirectionNodeMsl::create()
+{
+    return std::make_shared();
+}
+
+void ViewDirectionNodeMsl::createVariables(const ShaderNode&, GenContext&, Shader& shader) const
+{
+    ShaderStage& vs = shader.getStage(Stage::VERTEX);
+    ShaderStage& ps = shader.getStage(Stage::PIXEL);
+
+    addStageInput(HW::VERTEX_INPUTS, Type::VECTOR3, HW::T_IN_POSITION, vs);
+    addStageConnector(HW::VERTEX_DATA, Type::VECTOR3, HW::T_POSITION_WORLD, vs, ps);
+    addStageUniform(HW::PRIVATE_UNIFORMS, Type::VECTOR3, HW::T_VIEW_POSITION, ps);
+}
+
+void ViewDirectionNodeMsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
+{
+    const ShaderGenerator& shadergen = context.getShaderGenerator();
+
+    DEFINE_SHADER_STAGE(stage, Stage::VERTEX)
+    {
+        VariableBlock& vertexData = stage.getOutputBlock(HW::VERTEX_DATA);
+        const string prefix = vertexData.getInstance() + ".";
+        ShaderPort* position = vertexData[HW::T_POSITION_WORLD];
+        if (!position->isEmitted())
+        {
+            position->setEmitted();
+            shadergen.emitLine(prefix + position->getVariable() + " = hPositionWorld.xyz", stage);
+        }
+    }
+
+    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
+    {
+        VariableBlock& vertexData = stage.getInputBlock(HW::VERTEX_DATA);
+        const string prefix = vertexData.getInstance() + ".";
+        ShaderPort* position = vertexData[HW::T_POSITION_WORLD];
+        shadergen.emitLineBegin(stage);
+        shadergen.emitOutput(node.getOutput(), true, false, context, stage);
+        shadergen.emitString(" = normalize(" + prefix + position->getVariable() + " - " + HW::T_VIEW_POSITION + ")", stage);
+        shadergen.emitLineEnd(stage);
+    }
+}
+
+MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.h b/source/MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.h
new file mode 100644
index 0000000000..be7a40108a
--- /dev/null
+++ b/source/MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.h
@@ -0,0 +1,26 @@
+//
+// Copyright Contributors to the MaterialX Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#ifndef MATERIALX_VIEWDIRECTIONNODEMSL_H
+#define MATERIALX_VIEWDIRECTIONNODEMSL_H
+
+#include 
+
+MATERIALX_NAMESPACE_BEGIN
+
+/// ViewDirection node implementation for MSL
+class MX_GENMSL_API ViewDirectionNodeMsl : public MslImplementation
+{
+  public:
+    static ShaderNodeImplPtr create();
+
+    void createVariables(const ShaderNode& node, GenContext& context, Shader& shader) const override;
+
+    void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
+};
+
+MATERIALX_NAMESPACE_END
+
+#endif
diff --git a/source/MaterialXRender/ShaderMaterial.cpp b/source/MaterialXRender/ShaderMaterial.cpp
index 4e8ccc491f..c61c6d3c04 100644
--- a/source/MaterialXRender/ShaderMaterial.cpp
+++ b/source/MaterialXRender/ShaderMaterial.cpp
@@ -73,7 +73,7 @@ bool ShaderMaterial::generateEnvironmentShader(GenContext& context,
     readFromXmlFile(envDoc, filename);
     doc->importLibrary(envDoc);
 
-    NodeGraphPtr envGraph = doc->getNodeGraph("environmentDraw");
+    NodeGraphPtr envGraph = doc->getNodeGraph("envMap");
     if (!envGraph)
     {
         return false;
diff --git a/source/MaterialXView/Viewer.cpp b/source/MaterialXView/Viewer.cpp
index eeaf7a82b0..f6da076f17 100644
--- a/source/MaterialXView/Viewer.cpp
+++ b/source/MaterialXView/Viewer.cpp
@@ -137,55 +137,6 @@ void applyModifiers(mx::DocumentPtr doc, const DocumentModifiers& modifiers)
     }
 }
 
-// ViewDir implementation for GLSL
-// as needed for the environment shader.
-template
-class ViewDir : public NodeGraphImpl
-{
-public:
-    static  mx::ShaderNodeImplPtr create()
-    {
-        return std::make_shared();
-    }
-
-    void createVariables(const  mx::ShaderNode&, mx::GenContext&, mx::Shader& shader) const override
-    {
-        mx::ShaderStage& vs = shader.getStage(mx::Stage::VERTEX);
-        mx::ShaderStage& ps = shader.getStage(mx::Stage::PIXEL);
-        addStageInput(mx::HW::VERTEX_INPUTS, mx::Type::VECTOR3, mx::HW::T_IN_POSITION, vs);
-        addStageConnector(mx::HW::VERTEX_DATA, mx::Type::VECTOR3, mx::HW::T_POSITION_WORLD, vs, ps);
-        addStageUniform(mx::HW::PRIVATE_UNIFORMS, mx::Type::VECTOR3, mx::HW::T_VIEW_POSITION, ps);
-    }
-
-    void emitFunctionCall(const  mx::ShaderNode& node, mx::GenContext& context, mx::ShaderStage& stage) const override
-    {
-        const mx::ShaderGenerator& shadergen = context.getShaderGenerator();
-
-        DEFINE_SHADER_STAGE(stage, mx::Stage::VERTEX)
-        {
-            mx::VariableBlock& vertexData = stage.getOutputBlock(mx::HW::VERTEX_DATA);
-            const mx::string prefix = vertexData.getInstance() + ".";
-            mx::ShaderPort* position = vertexData[mx::HW::T_POSITION_WORLD];
-            if (!position->isEmitted())
-            {
-                position->setEmitted();
-                shadergen.emitLine(prefix + position->getVariable() + " = hPositionWorld.xyz", stage);
-            }
-        }
-
-        DEFINE_SHADER_STAGE(stage, mx::Stage::PIXEL)
-        {
-            mx::VariableBlock& vertexData = stage.getInputBlock(mx::HW::VERTEX_DATA);
-            const mx::string prefix = vertexData.getInstance() + ".";
-            mx::ShaderPort* position = vertexData[mx::HW::T_POSITION_WORLD];
-            shadergen.emitLineBegin(stage);
-            shadergen.emitOutput(node.getOutput(), true, false, context, stage);
-            shadergen.emitString(" = normalize(" + prefix + position->getVariable() + " - " + mx::HW::T_VIEW_POSITION + ")", stage);
-            shadergen.emitLineEnd(stage);
-        }
-    }
-};
-
 } // anonymous namespace
 
 //
@@ -297,10 +248,8 @@ Viewer::Viewer(const std::string& materialFilename,
     _renderPipeline = MetalRenderPipeline::create(this);
     _renderPipeline->initialize(ng::metal_device(),
                                 ng::metal_command_queue());
-    _genContext.getShaderGenerator().registerImplementation("IM_viewdir_vector3_" + _genContext.getShaderGenerator().getTarget(), ViewDir::create);
 #else
     _renderPipeline = GLRenderPipeline::create(this);
-    _genContext.getShaderGenerator().registerImplementation("IM_viewdir_vector3_" + _genContext.getShaderGenerator().getTarget(), ViewDir::create);
     
     // Set Essl generator options
     _genContextEssl.getOptions().targetColorSpaceOverride = "lin_rec709";
@@ -317,7 +266,6 @@ Viewer::Viewer(const std::string& materialFilename,
     _genContextMdl.getOptions().targetColorSpaceOverride = "lin_rec709";
     _genContextMdl.getOptions().fileTextureVerticalFlip = false;
 #endif
-    // Register the API Spcefic implementation for  used by the environment shader.
 }
 
 void Viewer::initialize()
@@ -2395,7 +2343,7 @@ mx::MaterialPtr Viewer::getEnvironmentMaterial()
 {
     if (!_envMaterial)
     {
-        mx::FilePath envFilename = _searchPath.find(mx::FilePath("resources/Lights/envmap_shader.mtlx"));
+        mx::FilePath envFilename = _searchPath.find(mx::FilePath("resources/Lights/environment_map.mtlx"));
         try
         {
             _envMaterial = _renderPipeline->createMaterial();

From 8ab122f8cda6a98a094294b1494e423589afdfc9 Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Wed, 3 Jan 2024 17:39:05 -0800
Subject: [PATCH 60/66] Improve shader generation for viewdirection

This changelist improves shader generation logic for the new viewdirection node, allowing it to work correctly in derived hardware languages such as ESSL.
---
 source/MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.cpp | 6 +++---
 source/MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.cpp   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.cpp
index 198465c9af..f9714b5d33 100644
--- a/source/MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.cpp
+++ b/source/MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.cpp
@@ -26,12 +26,12 @@ void ViewDirectionNodeGlsl::createVariables(const ShaderNode&, GenContext&, Shad
 
 void ViewDirectionNodeGlsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
 {
-    const ShaderGenerator& shadergen = context.getShaderGenerator();
+    const GlslShaderGenerator& shadergen = static_cast(context.getShaderGenerator());
 
     DEFINE_SHADER_STAGE(stage, Stage::VERTEX)
     {
         VariableBlock& vertexData = stage.getOutputBlock(HW::VERTEX_DATA);
-        const string prefix = vertexData.getInstance() + ".";
+        const string prefix = shadergen.getVertexDataPrefix(vertexData);
         ShaderPort* position = vertexData[HW::T_POSITION_WORLD];
         if (!position->isEmitted())
         {
@@ -43,7 +43,7 @@ void ViewDirectionNodeGlsl::emitFunctionCall(const ShaderNode& node, GenContext&
     DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
     {
         VariableBlock& vertexData = stage.getInputBlock(HW::VERTEX_DATA);
-        const string prefix = vertexData.getInstance() + ".";
+        const string prefix = shadergen.getVertexDataPrefix(vertexData);
         ShaderPort* position = vertexData[HW::T_POSITION_WORLD];
         shadergen.emitLineBegin(stage);
         shadergen.emitOutput(node.getOutput(), true, false, context, stage);
diff --git a/source/MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.cpp b/source/MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.cpp
index 84a6b02b4f..1443b5c320 100644
--- a/source/MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.cpp
+++ b/source/MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.cpp
@@ -26,12 +26,12 @@ void ViewDirectionNodeMsl::createVariables(const ShaderNode&, GenContext&, Shade
 
 void ViewDirectionNodeMsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
 {
-    const ShaderGenerator& shadergen = context.getShaderGenerator();
+    const MslShaderGenerator& shadergen = static_cast(context.getShaderGenerator());
 
     DEFINE_SHADER_STAGE(stage, Stage::VERTEX)
     {
         VariableBlock& vertexData = stage.getOutputBlock(HW::VERTEX_DATA);
-        const string prefix = vertexData.getInstance() + ".";
+        const string prefix = shadergen.getVertexDataPrefix(vertexData);
         ShaderPort* position = vertexData[HW::T_POSITION_WORLD];
         if (!position->isEmitted())
         {
@@ -43,7 +43,7 @@ void ViewDirectionNodeMsl::emitFunctionCall(const ShaderNode& node, GenContext&
     DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
     {
         VariableBlock& vertexData = stage.getInputBlock(HW::VERTEX_DATA);
-        const string prefix = vertexData.getInstance() + ".";
+        const string prefix = shadergen.getVertexDataPrefix(vertexData);
         ShaderPort* position = vertexData[HW::T_POSITION_WORLD];
         shadergen.emitLineBegin(stage);
         shadergen.emitOutput(node.getOutput(), true, false, context, stage);

From 5def239b82c20a7bf4875686e03743bc421a68f6 Mon Sep 17 00:00:00 2001
From: Frieder Erdmann <55715326+friedererdmann@users.noreply.github.com>
Date: Thu, 4 Jan 2024 04:03:03 +0100
Subject: [PATCH 61/66] Add creatematrix nodes to build matrices from vectors
 (#1553)

I'm opening this PR to add creatematrix, a constructor for Matrix33 from 3 Vector3s, Matrix44 from 4 Vector3s and Matrix44 from 4 Vector4s from the specification document (https://github.com/AcademySoftwareFoundation/MaterialX/blob/main/documents/Specification/MaterialX.Specification.md#math-nodes).
---
 .../mx_creatematrix_vector3_matrix33.glsl     |  6 +++
 .../mx_creatematrix_vector3_matrix44.glsl     |  7 ++++
 .../mx_creatematrix_vector4_matrix44.glsl     |  7 ++++
 .../stdlib/genglsl/stdlib_genglsl_impl.mtlx   |  5 +++
 .../stdlib/genmdl/stdlib_genmdl_impl.mtlx     |  5 +++
 .../stdlib/genmsl/stdlib_genmsl_impl.mtlx     |  5 +++
 libraries/stdlib/genosl/mx_creatematrix.osl   | 23 +++++++++++
 .../stdlib/genosl/stdlib_genosl_impl.mtlx     |  5 +++
 libraries/stdlib/stdlib_defs.mtlx             | 27 +++++++++++++
 .../TestSuite/stdlib/math/matrix.mtlx         | 29 ++++++++++++++
 .../MaterialXGenMdl/mdl/materialx/stdlib.mdl  | 40 +++++++++++++++++++
 11 files changed, 159 insertions(+)
 create mode 100644 libraries/stdlib/genglsl/mx_creatematrix_vector3_matrix33.glsl
 create mode 100644 libraries/stdlib/genglsl/mx_creatematrix_vector3_matrix44.glsl
 create mode 100644 libraries/stdlib/genglsl/mx_creatematrix_vector4_matrix44.glsl
 create mode 100644 libraries/stdlib/genosl/mx_creatematrix.osl
 create mode 100644 resources/Materials/TestSuite/stdlib/math/matrix.mtlx

diff --git a/libraries/stdlib/genglsl/mx_creatematrix_vector3_matrix33.glsl b/libraries/stdlib/genglsl/mx_creatematrix_vector3_matrix33.glsl
new file mode 100644
index 0000000000..aa10ef5b98
--- /dev/null
+++ b/libraries/stdlib/genglsl/mx_creatematrix_vector3_matrix33.glsl
@@ -0,0 +1,6 @@
+void mx_creatematrix_vector3_matrix33(vec3 in1, vec3 in2, vec3 in3, out mat3 result)
+{
+    result = mat3(in1.x, in1.y, in1.z,
+                  in2.x, in2.y, in2.z,
+                  in3.x, in3.y, in3.z);
+}
diff --git a/libraries/stdlib/genglsl/mx_creatematrix_vector3_matrix44.glsl b/libraries/stdlib/genglsl/mx_creatematrix_vector3_matrix44.glsl
new file mode 100644
index 0000000000..194fad421a
--- /dev/null
+++ b/libraries/stdlib/genglsl/mx_creatematrix_vector3_matrix44.glsl
@@ -0,0 +1,7 @@
+void mx_creatematrix_vector3_matrix44(vec3 in1, vec3 in2, vec3 in3, vec3 in4, out mat4 result)
+{
+    result = mat4(in1.x, in1.y, in1.z, 0.0,
+                  in2.x, in2.y, in2.z, 0.0,
+                  in3.x, in3.y, in3.z, 0.0,
+                  in4.x, in4.y, in4.z, 1.0);
+}
diff --git a/libraries/stdlib/genglsl/mx_creatematrix_vector4_matrix44.glsl b/libraries/stdlib/genglsl/mx_creatematrix_vector4_matrix44.glsl
new file mode 100644
index 0000000000..665a22212b
--- /dev/null
+++ b/libraries/stdlib/genglsl/mx_creatematrix_vector4_matrix44.glsl
@@ -0,0 +1,7 @@
+void mx_creatematrix_vector4_matrix44(vec4 in1, vec4 in2, vec4 in3, vec4 in4, out mat4 result)
+{
+    result = mat4(in1.x, in1.y, in1.z, in1.w,
+                  in2.x, in2.y, in2.z, in2.w,
+                  in3.x, in3.y, in3.z, in3.w,
+                  in4.x, in4.y, in4.z, in4.w);
+}
diff --git a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
index 07aae6ce66..6f67b21d33 100644
--- a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
+++ b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
@@ -748,6 +748,11 @@
   
   
 
+  
+  
+  
+  
+
   
   
   
diff --git a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
index 022f0896f1..6c550c92db 100644
--- a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
+++ b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
@@ -754,6 +754,11 @@
   
   
 
+  
+  
+  
+  
+
   
   
   
diff --git a/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx b/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
index dea1c49636..40be6f8c46 100644
--- a/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
+++ b/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
@@ -748,6 +748,11 @@
   
   
 
+  
+  
+  
+  
+
   
   
   
diff --git a/libraries/stdlib/genosl/mx_creatematrix.osl b/libraries/stdlib/genosl/mx_creatematrix.osl
new file mode 100644
index 0000000000..933dce00ba
--- /dev/null
+++ b/libraries/stdlib/genosl/mx_creatematrix.osl
@@ -0,0 +1,23 @@
+void mx_creatematrix_vector3_matrix33(vector in1, vector in2, vector in3, out matrix result)
+{
+    result = matrix(in1.x, in1.y, in1.z,  0.0,
+                    in2.x, in2.y, in2.z,  0.0,
+                    in3.x, in3.y, in3.z,  0.0,
+                    0.0,   0.0,   0.0,    1.0);
+}
+
+void mx_creatematrix_vector3_matrix44(vector3 in1, vector3 in2, vector3 in3, vector3 in4, out matrix result)
+{
+    result = matrix(in1.x, in1.y, in1.z,  0.0,
+                    in2.x, in2.y, in2.z,  0.0,
+                    in3.x, in3.y, in3.z,  0.0,
+                    in4.x, in4.y, in4.z,  1.0);
+}
+
+void mx_creatematrix_vector4_matrix44(vector4 in1, vector4 in2, vector4 in3, vector4 in4, out matrix result)
+{
+    result = matrix(in1.x, in1.y, in1.z,  in1.w,
+                    in2.x, in2.y, in2.z,  in2.w,
+                    in3.x, in3.y, in3.z,  in3.w,
+                    in4.x, in4.y, in4.z,  in4.w);
+}
diff --git a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
index 42828ce641..a984d912b8 100644
--- a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
+++ b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
@@ -751,6 +751,11 @@
   
   
 
+  
+  
+  
+  
+
   
   
   
diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx
index 3f187e2be1..90ccb57a98 100644
--- a/libraries/stdlib/stdlib_defs.mtlx
+++ b/libraries/stdlib/stdlib_defs.mtlx
@@ -4359,6 +4359,33 @@
     
   
 
+  
+  
+    
+    
+    
+    
+  
+
+  
+    
+    
+    
+    
+    
+  
+
+  
+    
+    
+    
+    
+    
+  
+
   
-    registerImplementation("IM_position_vector3_" + GlslShaderGenerator::TARGET, PositionNodeGlsl::create);
+    registerImplementation("IM_position_vector3_" + GlslShaderGenerator::TARGET, HwPositionNode::create);
     // 
-    registerImplementation("IM_normal_vector3_" + GlslShaderGenerator::TARGET, NormalNodeGlsl::create);
+    registerImplementation("IM_normal_vector3_" + GlslShaderGenerator::TARGET, HwNormalNode::create);
     // 
-    registerImplementation("IM_tangent_vector3_" + GlslShaderGenerator::TARGET, TangentNodeGlsl::create);
+    registerImplementation("IM_tangent_vector3_" + GlslShaderGenerator::TARGET, HwTangentNode::create);
     // 
-    registerImplementation("IM_bitangent_vector3_" + GlslShaderGenerator::TARGET, BitangentNodeGlsl::create);
+    registerImplementation("IM_bitangent_vector3_" + GlslShaderGenerator::TARGET, HwBitangentNode::create);
     // 
     registerImplementation("IM_texcoord_vector2_" + GlslShaderGenerator::TARGET, HwTexCoordNode::create);
     registerImplementation("IM_texcoord_vector3_" + GlslShaderGenerator::TARGET, HwTexCoordNode::create);
diff --git a/source/MaterialXGenGlsl/Nodes/BitangentNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/BitangentNodeGlsl.cpp
deleted file mode 100644
index 6f515824e7..0000000000
--- a/source/MaterialXGenGlsl/Nodes/BitangentNodeGlsl.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include 
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-ShaderNodeImplPtr BitangentNodeGlsl::create()
-{
-    return std::make_shared();
-}
-
-void BitangentNodeGlsl::createVariables(const ShaderNode& node, GenContext& context, Shader& shader) const
-{
-    const GenOptions& options = context.getOptions();
-
-    ShaderStage& vs = shader.getStage(Stage::VERTEX);
-    ShaderStage& ps = shader.getStage(Stage::PIXEL);
-
-    if (options.hwImplicitBitangents)
-    {
-        addStageInput(HW::VERTEX_INPUTS, Type::VECTOR3, HW::T_IN_NORMAL, vs);
-        addStageInput(HW::VERTEX_INPUTS, Type::VECTOR3, HW::T_IN_TANGENT, vs);
-    }
-    else
-    {
-        addStageInput(HW::VERTEX_INPUTS, Type::VECTOR3, HW::T_IN_BITANGENT, vs);
-    }
-
-    const ShaderInput* spaceInput = node.getInput(SPACE);
-    const int space = spaceInput ? spaceInput->getValue()->asA() : OBJECT_SPACE;
-    if (space == WORLD_SPACE)
-    {
-        addStageConnector(HW::VERTEX_DATA, Type::VECTOR3, HW::T_BITANGENT_WORLD, vs, ps);
-        addStageUniform(HW::PRIVATE_UNIFORMS, Type::MATRIX44, HW::T_WORLD_MATRIX, vs);
-
-        if (options.hwImplicitBitangents)
-        {
-            addStageConnector(HW::VERTEX_DATA, Type::VECTOR3, HW::T_NORMAL_WORLD, vs, ps);
-            addStageConnector(HW::VERTEX_DATA, Type::VECTOR3, HW::T_TANGENT_WORLD, vs, ps);
-            addStageUniform(HW::PRIVATE_UNIFORMS, Type::MATRIX44, HW::T_WORLD_INVERSE_TRANSPOSE_MATRIX, vs);
-        }
-    }
-    else
-    {
-        addStageConnector(HW::VERTEX_DATA, Type::VECTOR3, HW::T_BITANGENT_OBJECT, vs, ps);
-    }
-}
-
-void BitangentNodeGlsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
-{
-    const GlslShaderGenerator& shadergen = static_cast(context.getShaderGenerator());
-    const GenOptions& options = context.getOptions();
-
-    const ShaderInput* spaceInput = node.getInput(SPACE);
-    const int space = spaceInput ? spaceInput->getValue()->asA() : OBJECT_SPACE;
-
-    DEFINE_SHADER_STAGE(stage, Stage::VERTEX)
-    {
-        VariableBlock& vertexData = stage.getOutputBlock(HW::VERTEX_DATA);
-        const string prefix = shadergen.getVertexDataPrefix(vertexData);
-        if (space == WORLD_SPACE)
-        {
-            ShaderPort* bitangent = vertexData[HW::T_BITANGENT_WORLD];
-
-            if (!bitangent->isEmitted())
-            {
-                bitangent->setEmitted();
-
-                if (options.hwImplicitBitangents)
-                {
-                    ShaderPort* normal = vertexData[HW::T_NORMAL_WORLD];
-                    if (!normal->isEmitted())
-                    {
-                        normal->setEmitted();
-                        shadergen.emitLine(prefix + normal->getVariable() + " = normalize((" + HW::T_WORLD_INVERSE_TRANSPOSE_MATRIX + " * vec4(" + HW::T_IN_NORMAL + ", 0.0)).xyz)", stage);
-                    }
-                    ShaderPort* tangent = vertexData[HW::T_TANGENT_WORLD];
-                    if (!tangent->isEmitted())
-                    {
-                        tangent->setEmitted();
-                        shadergen.emitLine(prefix + tangent->getVariable() + " = normalize((" + HW::T_WORLD_MATRIX + " * vec4(" + HW::T_IN_TANGENT + ", 0.0)).xyz)", stage);
-                    }
-                    shadergen.emitLine(prefix + bitangent->getVariable() + " = cross(" + prefix + normal->getVariable() + ", " + prefix + tangent->getVariable() + ")", stage);
-                }
-                else
-                {
-                    shadergen.emitLine(prefix + bitangent->getVariable() + " = normalize((" + HW::T_WORLD_MATRIX + " * vec4(" + HW::T_IN_BITANGENT + ", 0.0)).xyz)", stage);
-                }
-            }
-        }
-        else
-        {
-            ShaderPort* bitangent = vertexData[HW::T_BITANGENT_OBJECT];
-            if (!bitangent->isEmitted())
-            {
-                bitangent->setEmitted();
-
-                if (options.hwImplicitBitangents)
-                {
-                    shadergen.emitLine(prefix + bitangent->getVariable() + " = cross(" + HW::T_IN_NORMAL + ", " + HW::T_IN_TANGENT + ")", stage);
-                }
-                else
-                {
-                    shadergen.emitLine(prefix + bitangent->getVariable() + " = " + HW::T_IN_BITANGENT, stage);
-                }
-            }
-        }
-    }
-
-    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
-    {
-        VariableBlock& vertexData = stage.getInputBlock(HW::VERTEX_DATA);
-        const string prefix = shadergen.getVertexDataPrefix(vertexData);
-        shadergen.emitLineBegin(stage);
-        shadergen.emitOutput(node.getOutput(), true, false, context, stage);
-        if (space == WORLD_SPACE)
-        {
-            const ShaderPort* bitangent = vertexData[HW::T_BITANGENT_WORLD];
-            shadergen.emitString(" = normalize(" + prefix + bitangent->getVariable() + ")", stage);
-        }
-        else
-        {
-            const ShaderPort* bitangent = vertexData[HW::T_BITANGENT_OBJECT];
-            shadergen.emitString(" = normalize(" + prefix + bitangent->getVariable() + ")", stage);
-        }
-        shadergen.emitLineEnd(stage);
-    }
-}
-
-MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenGlsl/Nodes/PositionNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/PositionNodeGlsl.cpp
deleted file mode 100644
index d37af520b2..0000000000
--- a/source/MaterialXGenGlsl/Nodes/PositionNodeGlsl.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include 
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-ShaderNodeImplPtr PositionNodeGlsl::create()
-{
-    return std::make_shared();
-}
-
-void PositionNodeGlsl::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
-{
-    ShaderStage vs = shader.getStage(Stage::VERTEX);
-    ShaderStage ps = shader.getStage(Stage::PIXEL);
-
-    addStageInput(HW::VERTEX_INPUTS, Type::VECTOR3, HW::T_IN_POSITION, vs);
-
-    const ShaderInput* spaceInput = node.getInput(SPACE);
-    const int space = spaceInput ? spaceInput->getValue()->asA() : OBJECT_SPACE;
-    if (space == WORLD_SPACE)
-    {
-        addStageConnector(HW::VERTEX_DATA, Type::VECTOR3, HW::T_POSITION_WORLD, vs, ps);
-    }
-    else
-    {
-        addStageConnector(HW::VERTEX_DATA, Type::VECTOR3, HW::T_POSITION_OBJECT, vs, ps);
-    }
-}
-
-void PositionNodeGlsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
-{
-    const GlslShaderGenerator& shadergen = static_cast(context.getShaderGenerator());
-
-    const ShaderInput* spaceInput = node.getInput(SPACE);
-    const int space = spaceInput ? spaceInput->getValue()->asA() : OBJECT_SPACE;
-
-    DEFINE_SHADER_STAGE(stage, Stage::VERTEX)
-    {
-        VariableBlock& vertexData = stage.getOutputBlock(HW::VERTEX_DATA);
-        const string prefix = shadergen.getVertexDataPrefix(vertexData);
-        if (space == WORLD_SPACE)
-        {
-            ShaderPort* position = vertexData[HW::T_POSITION_WORLD];
-            if (!position->isEmitted())
-            {
-                position->setEmitted();
-                shadergen.emitLine(prefix + position->getVariable() + " = hPositionWorld.xyz", stage);
-            }
-        }
-        else
-        {
-            ShaderPort* position = vertexData[HW::T_POSITION_OBJECT];
-            if (!position->isEmitted())
-            {
-                position->setEmitted();
-                shadergen.emitLine(prefix + position->getVariable() + " = " + HW::T_IN_POSITION, stage);
-            }
-        }
-    }
-
-    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
-    {
-        VariableBlock& vertexData = stage.getInputBlock(HW::VERTEX_DATA);
-        const string prefix = shadergen.getVertexDataPrefix(vertexData);
-        shadergen.emitLineBegin(stage);
-        shadergen.emitOutput(node.getOutput(), true, false, context, stage);
-        if (space == WORLD_SPACE)
-        {
-            const ShaderPort* position = vertexData[HW::T_POSITION_WORLD];
-            shadergen.emitString(" = " + prefix + position->getVariable(), stage);
-        }
-        else
-        {
-            const ShaderPort* position = vertexData[HW::T_POSITION_OBJECT];
-            shadergen.emitString(" = " + prefix + position->getVariable(), stage);
-        }
-        shadergen.emitLineEnd(stage);
-    }
-}
-
-MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenGlsl/Nodes/SurfaceNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/SurfaceNodeGlsl.cpp
index c83fbe1d78..c31b7ec663 100644
--- a/source/MaterialXGenGlsl/Nodes/SurfaceNodeGlsl.cpp
+++ b/source/MaterialXGenGlsl/Nodes/SurfaceNodeGlsl.cpp
@@ -45,7 +45,7 @@ void SurfaceNodeGlsl::createVariables(const ShaderNode&, GenContext& context, Sh
 {
     // TODO:
     // The surface shader needs position, normal, view position and light sources. We should solve this by adding some
-    // dependency mechanism so this implementation can be set to depend on the PositionNodeGlsl, NormalNodeGlsl
+    // dependency mechanism so this implementation can be set to depend on the HwPositionNode, HwNormalNode
     // ViewDirectionNodeGlsl and LightNodeGlsl nodes instead? This is where the MaterialX attribute "internalgeomprops"
     // is needed.
     //
diff --git a/source/MaterialXGenGlsl/Nodes/SurfaceShaderNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/SurfaceShaderNodeGlsl.cpp
index 00362b1cab..33d1b3407d 100644
--- a/source/MaterialXGenGlsl/Nodes/SurfaceShaderNodeGlsl.cpp
+++ b/source/MaterialXGenGlsl/Nodes/SurfaceShaderNodeGlsl.cpp
@@ -24,7 +24,7 @@ void SurfaceShaderNodeGlsl::createVariables(const ShaderNode&, GenContext& conte
 {
     // TODO:
     // The surface shader needs position, view position and light sources. We should solve this by adding some
-    // dependency mechanism so this implementation can be set to depend on the PositionNodeGlsl,
+    // dependency mechanism so this implementation can be set to depend on the HwPositionNode,
     // ViewDirectionNodeGlsl and LightNodeGlsl nodes instead? This is where the MaterialX attribute "internalgeomprops"
     // is needed.
     //
diff --git a/source/MaterialXGenMsl/MslShaderGenerator.cpp b/source/MaterialXGenMsl/MslShaderGenerator.cpp
index fd5a13d07a..4bfcac2733 100644
--- a/source/MaterialXGenMsl/MslShaderGenerator.cpp
+++ b/source/MaterialXGenMsl/MslShaderGenerator.cpp
@@ -6,10 +6,6 @@
 #include 
 
 #include 
-#include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
@@ -33,6 +29,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -169,13 +169,13 @@ MslShaderGenerator::MslShaderGenerator() :
     registerImplementation(elementNames, CombineNode::create);
 
     // 
-    registerImplementation("IM_position_vector3_" + MslShaderGenerator::TARGET, PositionNodeMsl::create);
+    registerImplementation("IM_position_vector3_" + MslShaderGenerator::TARGET, HwPositionNode::create);
     // 
-    registerImplementation("IM_normal_vector3_" + MslShaderGenerator::TARGET, NormalNodeMsl::create);
+    registerImplementation("IM_normal_vector3_" + MslShaderGenerator::TARGET, HwNormalNode::create);
     // 
-    registerImplementation("IM_tangent_vector3_" + MslShaderGenerator::TARGET, TangentNodeMsl::create);
+    registerImplementation("IM_tangent_vector3_" + MslShaderGenerator::TARGET, HwTangentNode::create);
     // 
-    registerImplementation("IM_bitangent_vector3_" + MslShaderGenerator::TARGET, BitangentNodeMsl::create);
+    registerImplementation("IM_bitangent_vector3_" + MslShaderGenerator::TARGET, HwBitangentNode::create);
     // 
     registerImplementation("IM_texcoord_vector2_" + MslShaderGenerator::TARGET, HwTexCoordNode::create);
     registerImplementation("IM_texcoord_vector3_" + MslShaderGenerator::TARGET, HwTexCoordNode::create);
diff --git a/source/MaterialXGenMsl/Nodes/BitangentNodeMsl.h b/source/MaterialXGenMsl/Nodes/BitangentNodeMsl.h
deleted file mode 100644
index 7239bb36d4..0000000000
--- a/source/MaterialXGenMsl/Nodes/BitangentNodeMsl.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#ifndef MATERIALX_BITANGENTNODEMSL_H
-#define MATERIALX_BITANGENTNODEMSL_H
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-/// Bitangent node implementation for MSL
-class MX_GENMSL_API BitangentNodeMsl : public MslImplementation
-{
-  public:
-    static ShaderNodeImplPtr create();
-
-    void createVariables(const ShaderNode& node, GenContext& context, Shader& shader) const override;
-
-    void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
-};
-
-MATERIALX_NAMESPACE_END
-
-#endif
diff --git a/source/MaterialXGenMsl/Nodes/NormalNodeMsl.cpp b/source/MaterialXGenMsl/Nodes/NormalNodeMsl.cpp
deleted file mode 100644
index 6250290960..0000000000
--- a/source/MaterialXGenMsl/Nodes/NormalNodeMsl.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include 
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-ShaderNodeImplPtr NormalNodeMsl::create()
-{
-    return std::make_shared();
-}
-
-void NormalNodeMsl::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
-{
-    ShaderStage& vs = shader.getStage(Stage::VERTEX);
-    ShaderStage& ps = shader.getStage(Stage::PIXEL);
-
-    addStageInput(HW::VERTEX_INPUTS, Type::VECTOR3, HW::T_IN_NORMAL, vs);
-
-    const ShaderInput* spaceInput = node.getInput(SPACE);
-    const int space = spaceInput ? spaceInput->getValue()->asA() : OBJECT_SPACE;
-    if (space == WORLD_SPACE)
-    {
-        addStageUniform(HW::PRIVATE_UNIFORMS, Type::MATRIX44, HW::T_WORLD_INVERSE_TRANSPOSE_MATRIX, vs);
-        addStageConnector(HW::VERTEX_DATA, Type::VECTOR3, HW::T_NORMAL_WORLD, vs, ps);
-    }
-    else
-    {
-        addStageConnector(HW::VERTEX_DATA, Type::VECTOR3, HW::T_NORMAL_OBJECT, vs, ps);
-    }
-}
-
-void NormalNodeMsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
-{
-    const MslShaderGenerator& shadergen = static_cast(context.getShaderGenerator());
-
-    const ShaderInput* spaceInput = node.getInput(SPACE);
-    const int space = spaceInput ? spaceInput->getValue()->asA() : OBJECT_SPACE;
-
-    DEFINE_SHADER_STAGE(stage, Stage::VERTEX)
-    {
-        VariableBlock& vertexData = stage.getOutputBlock(HW::VERTEX_DATA);
-        const string prefix = shadergen.getVertexDataPrefix(vertexData);
-        if (space == WORLD_SPACE)
-        {
-            ShaderPort* normal = vertexData[HW::T_NORMAL_WORLD];
-            if (!normal->isEmitted())
-            {
-                normal->setEmitted();
-                shadergen.emitLine(prefix + normal->getVariable() + " = normalize((" + HW::T_WORLD_INVERSE_TRANSPOSE_MATRIX + " * float4(" + HW::T_IN_NORMAL + ", 0.0)).xyz)", stage);
-            }
-        }
-        else
-        {
-            ShaderPort* normal = vertexData[HW::T_NORMAL_OBJECT];
-            if (!normal->isEmitted())
-            {
-                normal->setEmitted();
-                shadergen.emitLine(prefix + normal->getVariable() + " = " + HW::T_IN_NORMAL, stage);
-            }
-        }
-    }
-
-    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
-    {
-        VariableBlock& vertexData = stage.getInputBlock(HW::VERTEX_DATA);
-        const string prefix = shadergen.getVertexDataPrefix(vertexData);
-        shadergen.emitLineBegin(stage);
-        shadergen.emitOutput(node.getOutput(), true, false, context, stage);
-        if (space == WORLD_SPACE)
-        {
-            const ShaderPort* normal = vertexData[HW::T_NORMAL_WORLD];
-            shadergen.emitString(" = normalize(" + prefix + normal->getVariable() + ")", stage);
-        }
-        else
-        {
-            const ShaderPort* normal = vertexData[HW::T_NORMAL_OBJECT];
-            shadergen.emitString(" = normalize(" + prefix + normal->getVariable() + ")", stage);
-        }
-        shadergen.emitLineEnd(stage);
-    }
-}
-
-MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenMsl/Nodes/NormalNodeMsl.h b/source/MaterialXGenMsl/Nodes/NormalNodeMsl.h
deleted file mode 100644
index 7248613a74..0000000000
--- a/source/MaterialXGenMsl/Nodes/NormalNodeMsl.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#ifndef MATERIALX_NORMALNODEMSL_H
-#define MATERIALX_NORMALNODEMSL_H
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-/// Normal node implementation for MSL
-class MX_GENMSL_API NormalNodeMsl : public MslImplementation
-{
-  public:
-    static ShaderNodeImplPtr create();
-
-    void createVariables(const ShaderNode& node, GenContext& context, Shader& shader) const override;
-
-    void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
-};
-
-MATERIALX_NAMESPACE_END
-
-#endif
diff --git a/source/MaterialXGenMsl/Nodes/PositionNodeMsl.h b/source/MaterialXGenMsl/Nodes/PositionNodeMsl.h
deleted file mode 100644
index 1dada988be..0000000000
--- a/source/MaterialXGenMsl/Nodes/PositionNodeMsl.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#ifndef MATERIALX_POSITIONNODEMSL_H
-#define MATERIALX_POSITIONNODEMSL_H
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-/// Position node implementation for MSL
-class MX_GENMSL_API PositionNodeMsl : public MslImplementation
-{
-  public:
-    static ShaderNodeImplPtr create();
-
-    void createVariables(const ShaderNode& node, GenContext& context, Shader& shader) const override;
-
-    void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
-};
-
-MATERIALX_NAMESPACE_END
-
-#endif
diff --git a/source/MaterialXGenMsl/Nodes/SurfaceNodeMsl.cpp b/source/MaterialXGenMsl/Nodes/SurfaceNodeMsl.cpp
index c7fb7745b7..f67e5e211f 100644
--- a/source/MaterialXGenMsl/Nodes/SurfaceNodeMsl.cpp
+++ b/source/MaterialXGenMsl/Nodes/SurfaceNodeMsl.cpp
@@ -45,7 +45,7 @@ void SurfaceNodeMsl::createVariables(const ShaderNode&, GenContext& context, Sha
 {
     // TODO:
     // The surface shader needs position, normal, view position and light sources. We should solve this by adding some
-    // dependency mechanism so this implementation can be set to depend on the PositionNodeMsl, NormalNodeMsl
+    // dependency mechanism so this implementation can be set to depend on the HwPositionNode, HwNormalNode
     // ViewDirectionNodeMsl and LightNodeMsl nodes instead? This is where the MaterialX attribute "internalgeomprops"
     // is needed.
     //
diff --git a/source/MaterialXGenMsl/Nodes/SurfaceShaderNodeMsl.cpp b/source/MaterialXGenMsl/Nodes/SurfaceShaderNodeMsl.cpp
index a579c46f1b..f4d418bc9c 100644
--- a/source/MaterialXGenMsl/Nodes/SurfaceShaderNodeMsl.cpp
+++ b/source/MaterialXGenMsl/Nodes/SurfaceShaderNodeMsl.cpp
@@ -24,7 +24,7 @@ void SurfaceShaderNodeMsl::createVariables(const ShaderNode&, GenContext& contex
 {
     // TODO:
     // The surface shader needs position, view position and light sources. We should solve this by adding some
-    // dependency mechanism so this implementation can be set to depend on the PositionNodeMsl,
+    // dependency mechanism so this implementation can be set to depend on the HwPositionNode,
     // ViewDirectionNodeMsl and LightNodeMsl nodes instead? This is where the MaterialX attribute "internalgeomprops"
     // is needed.
     //
diff --git a/source/MaterialXGenMsl/Nodes/TangentNodeMsl.cpp b/source/MaterialXGenMsl/Nodes/TangentNodeMsl.cpp
deleted file mode 100644
index 5e557e4e30..0000000000
--- a/source/MaterialXGenMsl/Nodes/TangentNodeMsl.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include 
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-ShaderNodeImplPtr TangentNodeMsl::create()
-{
-    return std::make_shared();
-}
-
-void TangentNodeMsl::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
-{
-    ShaderStage& vs = shader.getStage(Stage::VERTEX);
-    ShaderStage& ps = shader.getStage(Stage::PIXEL);
-
-    addStageInput(HW::VERTEX_INPUTS, Type::VECTOR3, HW::T_IN_TANGENT, vs);
-
-    const ShaderInput* spaceInput = node.getInput(SPACE);
-    const int space = spaceInput ? spaceInput->getValue()->asA() : OBJECT_SPACE;
-    if (space == WORLD_SPACE)
-    {
-        addStageUniform(HW::PRIVATE_UNIFORMS, Type::MATRIX44, HW::T_WORLD_MATRIX, vs);
-        addStageConnector(HW::VERTEX_DATA, Type::VECTOR3, HW::T_TANGENT_WORLD, vs, ps);
-    }
-    else
-    {
-        addStageConnector(HW::VERTEX_DATA, Type::VECTOR3, HW::T_TANGENT_OBJECT, vs, ps);
-    }
-}
-
-void TangentNodeMsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
-{
-    const MslShaderGenerator& shadergen = static_cast(context.getShaderGenerator());
-
-    const ShaderInput* spaceInput = node.getInput(SPACE);
-    const int space = spaceInput ? spaceInput->getValue()->asA() : OBJECT_SPACE;
-
-    DEFINE_SHADER_STAGE(stage, Stage::VERTEX)
-    {
-        VariableBlock& vertexData = stage.getOutputBlock(HW::VERTEX_DATA);
-        const string prefix = shadergen.getVertexDataPrefix(vertexData);
-        if (space == WORLD_SPACE)
-        {
-            ShaderPort* tangent = vertexData[HW::T_TANGENT_WORLD];
-            if (!tangent->isEmitted())
-            {
-                tangent->setEmitted();
-                shadergen.emitLine(prefix + tangent->getVariable() + " = normalize((" + HW::T_WORLD_MATRIX + " * float4(" + HW::T_IN_TANGENT + ", 0.0)).xyz)", stage);
-            }
-        }
-        else
-        {
-            ShaderPort* tangent = vertexData[HW::T_TANGENT_OBJECT];
-            if (!tangent->isEmitted())
-            {
-                tangent->setEmitted();
-                shadergen.emitLine(prefix + tangent->getVariable() + " = " + HW::T_IN_TANGENT, stage);
-            }
-        }
-    }
-
-    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
-    {
-        VariableBlock& vertexData = stage.getInputBlock(HW::VERTEX_DATA);
-        const string prefix = shadergen.getVertexDataPrefix(vertexData);
-        shadergen.emitLineBegin(stage);
-        shadergen.emitOutput(node.getOutput(), true, false, context, stage);
-        if (space == WORLD_SPACE)
-        {
-            const ShaderPort* tangent = vertexData[HW::T_TANGENT_WORLD];
-            shadergen.emitString(" = normalize(" + prefix + tangent->getVariable() + ")", stage);
-        }
-        else
-        {
-            const ShaderPort* tangent = vertexData[HW::T_TANGENT_OBJECT];
-            shadergen.emitString(" = normalize(" + prefix + tangent->getVariable() + ")", stage);
-        }
-        shadergen.emitLineEnd(stage);
-    }
-}
-
-MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenMsl/Nodes/TangentNodeMsl.h b/source/MaterialXGenMsl/Nodes/TangentNodeMsl.h
deleted file mode 100644
index 42e2c7ef7c..0000000000
--- a/source/MaterialXGenMsl/Nodes/TangentNodeMsl.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#ifndef MATERIALX_TANGENTNODEMSL_H
-#define MATERIALX_TANGENTNODEMSL_H
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-/// Tangent node implementation for MSL
-class MX_GENMSL_API TangentNodeMsl : public MslImplementation
-{
-  public:
-    static ShaderNodeImplPtr create();
-
-    void createVariables(const ShaderNode& node, GenContext& context, Shader& shader) const override;
-
-    void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
-};
-
-MATERIALX_NAMESPACE_END
-
-#endif
diff --git a/source/MaterialXGenMsl/Nodes/BitangentNodeMsl.cpp b/source/MaterialXGenShader/Nodes/HwBitangentNode.cpp
similarity index 91%
rename from source/MaterialXGenMsl/Nodes/BitangentNodeMsl.cpp
rename to source/MaterialXGenShader/Nodes/HwBitangentNode.cpp
index 97ca079d35..83c43a3398 100644
--- a/source/MaterialXGenMsl/Nodes/BitangentNodeMsl.cpp
+++ b/source/MaterialXGenShader/Nodes/HwBitangentNode.cpp
@@ -3,18 +3,18 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include 
+#include 
 
 #include 
 
 MATERIALX_NAMESPACE_BEGIN
 
-ShaderNodeImplPtr BitangentNodeMsl::create()
+ShaderNodeImplPtr HwBitangentNode::create()
 {
-    return std::make_shared();
+    return std::make_shared();
 }
 
-void BitangentNodeMsl::createVariables(const ShaderNode& node, GenContext& context, Shader& shader) const
+void HwBitangentNode::createVariables(const ShaderNode& node, GenContext& context, Shader& shader) const
 {
     const GenOptions& options = context.getOptions();
 
@@ -51,9 +51,9 @@ void BitangentNodeMsl::createVariables(const ShaderNode& node, GenContext& conte
     }
 }
 
-void BitangentNodeMsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
+void HwBitangentNode::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
 {
-    const MslShaderGenerator& shadergen = static_cast(context.getShaderGenerator());
+    const HwShaderGenerator& shadergen = static_cast(context.getShaderGenerator());
     const GenOptions& options = context.getOptions();
 
     const ShaderInput* spaceInput = node.getInput(SPACE);
diff --git a/source/MaterialXGenGlsl/Nodes/NormalNodeGlsl.h b/source/MaterialXGenShader/Nodes/HwBitangentNode.h
similarity index 63%
rename from source/MaterialXGenGlsl/Nodes/NormalNodeGlsl.h
rename to source/MaterialXGenShader/Nodes/HwBitangentNode.h
index acb4d5085d..a8bfa0bf11 100644
--- a/source/MaterialXGenGlsl/Nodes/NormalNodeGlsl.h
+++ b/source/MaterialXGenShader/Nodes/HwBitangentNode.h
@@ -3,15 +3,15 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#ifndef MATERIALX_NORMALNODEGLSL_H
-#define MATERIALX_NORMALNODEGLSL_H
+#ifndef MATERIALX_HWBITANGENTNODE_H
+#define MATERIALX_HWBITANGENTNODE_H
 
-#include 
+#include 
 
 MATERIALX_NAMESPACE_BEGIN
 
-/// Normal node implementation for GLSL
-class MX_GENGLSL_API NormalNodeGlsl : public GlslImplementation
+/// Bitangent node implementation for hardware languages
+class MX_GENSHADER_API HwBitangentNode : public HwImplementation
 {
   public:
     static ShaderNodeImplPtr create();
diff --git a/source/MaterialXGenGlsl/Nodes/NormalNodeGlsl.cpp b/source/MaterialXGenShader/Nodes/HwNormalNode.cpp
similarity index 85%
rename from source/MaterialXGenGlsl/Nodes/NormalNodeGlsl.cpp
rename to source/MaterialXGenShader/Nodes/HwNormalNode.cpp
index d9e27b87df..01234dcb46 100644
--- a/source/MaterialXGenGlsl/Nodes/NormalNodeGlsl.cpp
+++ b/source/MaterialXGenShader/Nodes/HwNormalNode.cpp
@@ -3,18 +3,18 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include 
+#include 
 
 #include 
 
 MATERIALX_NAMESPACE_BEGIN
 
-ShaderNodeImplPtr NormalNodeGlsl::create()
+ShaderNodeImplPtr HwNormalNode::create()
 {
-    return std::make_shared();
+    return std::make_shared();
 }
 
-void NormalNodeGlsl::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
+void HwNormalNode::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
 {
     ShaderStage& vs = shader.getStage(Stage::VERTEX);
     ShaderStage& ps = shader.getStage(Stage::PIXEL);
@@ -34,9 +34,9 @@ void NormalNodeGlsl::createVariables(const ShaderNode& node, GenContext&, Shader
     }
 }
 
-void NormalNodeGlsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
+void HwNormalNode::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
 {
-    const GlslShaderGenerator& shadergen = static_cast(context.getShaderGenerator());
+    const HwShaderGenerator& shadergen = static_cast(context.getShaderGenerator());
 
     const ShaderInput* spaceInput = node.getInput(SPACE);
     const int space = spaceInput ? spaceInput->getValue()->asA() : OBJECT_SPACE;
diff --git a/source/MaterialXGenGlsl/Nodes/PositionNodeGlsl.h b/source/MaterialXGenShader/Nodes/HwNormalNode.h
similarity index 64%
rename from source/MaterialXGenGlsl/Nodes/PositionNodeGlsl.h
rename to source/MaterialXGenShader/Nodes/HwNormalNode.h
index 95dddbce8e..fb19050600 100644
--- a/source/MaterialXGenGlsl/Nodes/PositionNodeGlsl.h
+++ b/source/MaterialXGenShader/Nodes/HwNormalNode.h
@@ -3,15 +3,15 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#ifndef MATERIALX_POSITIONNODEGLSL_H
-#define MATERIALX_POSITIONNODEGLSL_H
+#ifndef MATERIALX_HWNORMALNODE_H
+#define MATERIALX_HWNORMALNODE_H
 
-#include 
+#include 
 
 MATERIALX_NAMESPACE_BEGIN
 
-/// Position node implementation for GLSL
-class MX_GENGLSL_API PositionNodeGlsl : public GlslImplementation
+/// Normal node implementation for hardware languages
+class MX_GENSHADER_API HwNormalNode : public HwImplementation
 {
   public:
     static ShaderNodeImplPtr create();
diff --git a/source/MaterialXGenMsl/Nodes/PositionNodeMsl.cpp b/source/MaterialXGenShader/Nodes/HwPositionNode.cpp
similarity index 84%
rename from source/MaterialXGenMsl/Nodes/PositionNodeMsl.cpp
rename to source/MaterialXGenShader/Nodes/HwPositionNode.cpp
index 6f45f4364b..df7c11f4e6 100644
--- a/source/MaterialXGenMsl/Nodes/PositionNodeMsl.cpp
+++ b/source/MaterialXGenShader/Nodes/HwPositionNode.cpp
@@ -3,18 +3,18 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include 
+#include 
 
 #include 
 
 MATERIALX_NAMESPACE_BEGIN
 
-ShaderNodeImplPtr PositionNodeMsl::create()
+ShaderNodeImplPtr HwPositionNode::create()
 {
-    return std::make_shared();
+    return std::make_shared();
 }
 
-void PositionNodeMsl::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
+void HwPositionNode::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
 {
     ShaderStage vs = shader.getStage(Stage::VERTEX);
     ShaderStage ps = shader.getStage(Stage::PIXEL);
@@ -33,9 +33,9 @@ void PositionNodeMsl::createVariables(const ShaderNode& node, GenContext&, Shade
     }
 }
 
-void PositionNodeMsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
+void HwPositionNode::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
 {
-    const MslShaderGenerator& shadergen = static_cast(context.getShaderGenerator());
+    const HwShaderGenerator& shadergen = static_cast(context.getShaderGenerator());
 
     const ShaderInput* spaceInput = node.getInput(SPACE);
     const int space = spaceInput ? spaceInput->getValue()->asA() : OBJECT_SPACE;
diff --git a/source/MaterialXGenGlsl/Nodes/TangentNodeGlsl.h b/source/MaterialXGenShader/Nodes/HwPositionNode.h
similarity index 63%
rename from source/MaterialXGenGlsl/Nodes/TangentNodeGlsl.h
rename to source/MaterialXGenShader/Nodes/HwPositionNode.h
index 90a5b3aaad..ae2ce5c3f5 100644
--- a/source/MaterialXGenGlsl/Nodes/TangentNodeGlsl.h
+++ b/source/MaterialXGenShader/Nodes/HwPositionNode.h
@@ -3,15 +3,15 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#ifndef MATERIALX_TANGENTNODEGLSL_H
-#define MATERIALX_TANGENTNODEGLSL_H
+#ifndef MATERIALX_HWPOSITIONNODE_H
+#define MATERIALX_HWPOSITIONNODE_H
 
-#include 
+#include 
 
 MATERIALX_NAMESPACE_BEGIN
 
-/// Tangent node implementation for GLSL
-class MX_GENGLSL_API TangentNodeGlsl : public GlslImplementation
+/// Position node implementation for hardware languages
+class MX_GENSHADER_API HwPositionNode : public HwImplementation
 {
   public:
     static ShaderNodeImplPtr create();
diff --git a/source/MaterialXGenGlsl/Nodes/TangentNodeGlsl.cpp b/source/MaterialXGenShader/Nodes/HwTangentNode.cpp
similarity index 85%
rename from source/MaterialXGenGlsl/Nodes/TangentNodeGlsl.cpp
rename to source/MaterialXGenShader/Nodes/HwTangentNode.cpp
index daffaf0e2c..6e80537932 100644
--- a/source/MaterialXGenGlsl/Nodes/TangentNodeGlsl.cpp
+++ b/source/MaterialXGenShader/Nodes/HwTangentNode.cpp
@@ -3,18 +3,18 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include 
+#include 
 
 #include 
 
 MATERIALX_NAMESPACE_BEGIN
 
-ShaderNodeImplPtr TangentNodeGlsl::create()
+ShaderNodeImplPtr HwTangentNode::create()
 {
-    return std::make_shared();
+    return std::make_shared();
 }
 
-void TangentNodeGlsl::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
+void HwTangentNode::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
 {
     ShaderStage& vs = shader.getStage(Stage::VERTEX);
     ShaderStage& ps = shader.getStage(Stage::PIXEL);
@@ -34,9 +34,9 @@ void TangentNodeGlsl::createVariables(const ShaderNode& node, GenContext&, Shade
     }
 }
 
-void TangentNodeGlsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
+void HwTangentNode::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
 {
-    const GlslShaderGenerator& shadergen = static_cast(context.getShaderGenerator());
+    const HwShaderGenerator& shadergen = static_cast(context.getShaderGenerator());
 
     const ShaderInput* spaceInput = node.getInput(SPACE);
     const int space = spaceInput ? spaceInput->getValue()->asA() : OBJECT_SPACE;
diff --git a/source/MaterialXGenGlsl/Nodes/BitangentNodeGlsl.h b/source/MaterialXGenShader/Nodes/HwTangentNode.h
similarity index 64%
rename from source/MaterialXGenGlsl/Nodes/BitangentNodeGlsl.h
rename to source/MaterialXGenShader/Nodes/HwTangentNode.h
index 905b2808e0..b36d7f3c56 100644
--- a/source/MaterialXGenGlsl/Nodes/BitangentNodeGlsl.h
+++ b/source/MaterialXGenShader/Nodes/HwTangentNode.h
@@ -3,15 +3,15 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#ifndef MATERIALX_BITANGENTNODEGLSL_H
-#define MATERIALX_BITANGENTNODEGLSL_H
+#ifndef MATERIALX_HWTANGENTNODE_H
+#define MATERIALX_HWTANGENTNODE_H
 
-#include 
+#include 
 
 MATERIALX_NAMESPACE_BEGIN
 
-/// Bitangent node implementation for GLSL
-class MX_GENGLSL_API BitangentNodeGlsl : public GlslImplementation
+/// Tangent node implementation for hardware languages
+class MX_GENSHADER_API HwTangentNode : public HwImplementation
 {
   public:
     static ShaderNodeImplPtr create();

From feecfe05a4fd15a71bb3d0c7c61cde744fc65d7d Mon Sep 17 00:00:00 2001
From: Jonathan Stone 
Date: Sat, 6 Jan 2024 22:05:46 -0800
Subject: [PATCH 66/66] Merge application node implementations

This changelist merges the implementations of application and NPR nodes across hardware shading languages, allowing a greater degree of code sharing.
---
 .../MaterialXGenGlsl/GlslShaderGenerator.cpp  | 12 ++--
 .../MaterialXGenGlsl/Nodes/FrameNodeGlsl.cpp  | 35 ------------
 .../Nodes/SurfaceNodeGlsl.cpp                 |  2 +-
 .../Nodes/SurfaceShaderNodeGlsl.cpp           |  2 +-
 .../MaterialXGenGlsl/Nodes/TimeNodeGlsl.cpp   | 38 -------------
 source/MaterialXGenGlsl/Nodes/TimeNodeGlsl.h  | 26 ---------
 .../Nodes/ViewDirectionNodeGlsl.cpp           | 55 -------------------
 source/MaterialXGenMsl/MslShaderGenerator.cpp | 12 ++--
 .../MaterialXGenMsl/Nodes/SurfaceNodeMsl.cpp  |  2 +-
 .../Nodes/SurfaceShaderNodeMsl.cpp            |  2 +-
 source/MaterialXGenMsl/Nodes/TimeNodeMsl.h    | 26 ---------
 .../Nodes/ViewDirectionNodeMsl.h              | 26 ---------
 .../Nodes/HwFrameNode.cpp}                    | 10 ++--
 .../Nodes/HwFrameNode.h}                      | 10 ++--
 .../Nodes/HwTimeNode.cpp}                     | 10 ++--
 .../Nodes/HwTimeNode.h}                       | 10 ++--
 .../Nodes/HwViewDirectionNode.cpp}            | 12 ++--
 .../Nodes/HwViewDirectionNode.h}              | 10 ++--
 18 files changed, 47 insertions(+), 253 deletions(-)
 delete mode 100644 source/MaterialXGenGlsl/Nodes/FrameNodeGlsl.cpp
 delete mode 100644 source/MaterialXGenGlsl/Nodes/TimeNodeGlsl.cpp
 delete mode 100644 source/MaterialXGenGlsl/Nodes/TimeNodeGlsl.h
 delete mode 100644 source/MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.cpp
 delete mode 100644 source/MaterialXGenMsl/Nodes/TimeNodeMsl.h
 delete mode 100644 source/MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.h
 rename source/{MaterialXGenMsl/Nodes/FrameNodeMsl.cpp => MaterialXGenShader/Nodes/HwFrameNode.cpp} (67%)
 rename source/{MaterialXGenGlsl/Nodes/FrameNodeGlsl.h => MaterialXGenShader/Nodes/HwFrameNode.h} (65%)
 rename source/{MaterialXGenMsl/Nodes/TimeNodeMsl.cpp => MaterialXGenShader/Nodes/HwTimeNode.cpp} (72%)
 rename source/{MaterialXGenMsl/Nodes/FrameNodeMsl.h => MaterialXGenShader/Nodes/HwTimeNode.h} (65%)
 rename source/{MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.cpp => MaterialXGenShader/Nodes/HwViewDirectionNode.cpp} (76%)
 rename source/{MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.h => MaterialXGenShader/Nodes/HwViewDirectionNode.h} (61%)

diff --git a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
index 015edbc3ce..f0126f10d9 100644
--- a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
+++ b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
@@ -8,9 +8,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
@@ -33,6 +30,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -194,11 +194,11 @@ GlslShaderGenerator::GlslShaderGenerator() :
     registerImplementation("IM_geompropvalue_string_" + GlslShaderGenerator::TARGET, GeomPropValueNodeGlslAsUniform::create);
 
     // 
-    registerImplementation("IM_frame_float_" + GlslShaderGenerator::TARGET, FrameNodeGlsl::create);
+    registerImplementation("IM_frame_float_" + GlslShaderGenerator::TARGET, HwFrameNode::create);
     // 
-    registerImplementation("IM_time_float_" + GlslShaderGenerator::TARGET, TimeNodeGlsl::create);
+    registerImplementation("IM_time_float_" + GlslShaderGenerator::TARGET, HwTimeNode::create);
     // 
-    registerImplementation("IM_viewdirection_vector3_" + GlslShaderGenerator::TARGET, ViewDirectionNodeGlsl::create);
+    registerImplementation("IM_viewdirection_vector3_" + GlslShaderGenerator::TARGET, HwViewDirectionNode::create);
 
     // 
     registerImplementation("IM_surface_" + GlslShaderGenerator::TARGET, SurfaceNodeGlsl::create);
diff --git a/source/MaterialXGenGlsl/Nodes/FrameNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/FrameNodeGlsl.cpp
deleted file mode 100644
index b6dbb2002b..0000000000
--- a/source/MaterialXGenGlsl/Nodes/FrameNodeGlsl.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include 
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-ShaderNodeImplPtr FrameNodeGlsl::create()
-{
-    return std::make_shared();
-}
-
-void FrameNodeGlsl::createVariables(const ShaderNode&, GenContext&, Shader& shader) const
-{
-    ShaderStage& ps = shader.getStage(Stage::PIXEL);
-    addStageUniform(HW::PRIVATE_UNIFORMS, Type::FLOAT, HW::T_FRAME, ps);
-}
-
-void FrameNodeGlsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
-{
-    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
-    {
-        const ShaderGenerator& shadergen = context.getShaderGenerator();
-        shadergen.emitLineBegin(stage);
-        shadergen.emitOutput(node.getOutput(), true, false, context, stage);
-        shadergen.emitString(" = " + HW::T_FRAME, stage);
-        shadergen.emitLineEnd(stage);
-    }
-}
-
-MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenGlsl/Nodes/SurfaceNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/SurfaceNodeGlsl.cpp
index c31b7ec663..2e222f6bcc 100644
--- a/source/MaterialXGenGlsl/Nodes/SurfaceNodeGlsl.cpp
+++ b/source/MaterialXGenGlsl/Nodes/SurfaceNodeGlsl.cpp
@@ -46,7 +46,7 @@ void SurfaceNodeGlsl::createVariables(const ShaderNode&, GenContext& context, Sh
     // TODO:
     // The surface shader needs position, normal, view position and light sources. We should solve this by adding some
     // dependency mechanism so this implementation can be set to depend on the HwPositionNode, HwNormalNode
-    // ViewDirectionNodeGlsl and LightNodeGlsl nodes instead? This is where the MaterialX attribute "internalgeomprops"
+    // HwViewDirectionNode and LightNodeGlsl nodes instead? This is where the MaterialX attribute "internalgeomprops"
     // is needed.
     //
     ShaderStage& vs = shader.getStage(Stage::VERTEX);
diff --git a/source/MaterialXGenGlsl/Nodes/SurfaceShaderNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/SurfaceShaderNodeGlsl.cpp
index 33d1b3407d..5e97b8ffc6 100644
--- a/source/MaterialXGenGlsl/Nodes/SurfaceShaderNodeGlsl.cpp
+++ b/source/MaterialXGenGlsl/Nodes/SurfaceShaderNodeGlsl.cpp
@@ -25,7 +25,7 @@ void SurfaceShaderNodeGlsl::createVariables(const ShaderNode&, GenContext& conte
     // TODO:
     // The surface shader needs position, view position and light sources. We should solve this by adding some
     // dependency mechanism so this implementation can be set to depend on the HwPositionNode,
-    // ViewDirectionNodeGlsl and LightNodeGlsl nodes instead? This is where the MaterialX attribute "internalgeomprops"
+    // HwViewDirectionNode and LightNodeGlsl nodes instead? This is where the MaterialX attribute "internalgeomprops"
     // is needed.
     //
     ShaderStage& vs = shader.getStage(Stage::VERTEX);
diff --git a/source/MaterialXGenGlsl/Nodes/TimeNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/TimeNodeGlsl.cpp
deleted file mode 100644
index e508391141..0000000000
--- a/source/MaterialXGenGlsl/Nodes/TimeNodeGlsl.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include 
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-ShaderNodeImplPtr TimeNodeGlsl::create()
-{
-    return std::make_shared();
-}
-
-void TimeNodeGlsl::createVariables(const ShaderNode&, GenContext&, Shader& shader) const
-{
-    ShaderStage& ps = shader.getStage(Stage::PIXEL);
-    addStageUniform(HW::PRIVATE_UNIFORMS, Type::FLOAT, HW::T_FRAME, ps);
-}
-
-void TimeNodeGlsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
-{
-    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
-    {
-        const ShaderGenerator& shadergen = context.getShaderGenerator();
-        shadergen.emitLineBegin(stage);
-        shadergen.emitOutput(node.getOutput(), true, false, context, stage);
-        shadergen.emitString(" = " + HW::T_FRAME + " / ", stage);
-        const ShaderInput* fpsInput = node.getInput("fps");
-        const string fps = fpsInput->getValue()->getValueString();
-        shadergen.emitString(fps, stage);
-        shadergen.emitLineEnd(stage);
-    }
-}
-
-MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenGlsl/Nodes/TimeNodeGlsl.h b/source/MaterialXGenGlsl/Nodes/TimeNodeGlsl.h
deleted file mode 100644
index c97f6b4741..0000000000
--- a/source/MaterialXGenGlsl/Nodes/TimeNodeGlsl.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#ifndef MATERIALX_TIMENODEGLSL_H
-#define MATERIALX_TIMENODEGLSL_H
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-/// Time node implementation for GLSL
-class MX_GENGLSL_API TimeNodeGlsl : public GlslImplementation
-{
-  public:
-    static ShaderNodeImplPtr create();
-
-    void createVariables(const ShaderNode& node, GenContext& context, Shader& shader) const override;
-
-    void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
-};
-
-MATERIALX_NAMESPACE_END
-
-#endif
diff --git a/source/MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.cpp
deleted file mode 100644
index f9714b5d33..0000000000
--- a/source/MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include 
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-ShaderNodeImplPtr ViewDirectionNodeGlsl::create()
-{
-    return std::make_shared();
-}
-
-void ViewDirectionNodeGlsl::createVariables(const ShaderNode&, GenContext&, Shader& shader) const
-{
-    ShaderStage& vs = shader.getStage(Stage::VERTEX);
-    ShaderStage& ps = shader.getStage(Stage::PIXEL);
-
-    addStageInput(HW::VERTEX_INPUTS, Type::VECTOR3, HW::T_IN_POSITION, vs);
-    addStageConnector(HW::VERTEX_DATA, Type::VECTOR3, HW::T_POSITION_WORLD, vs, ps);
-    addStageUniform(HW::PRIVATE_UNIFORMS, Type::VECTOR3, HW::T_VIEW_POSITION, ps);
-}
-
-void ViewDirectionNodeGlsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
-{
-    const GlslShaderGenerator& shadergen = static_cast(context.getShaderGenerator());
-
-    DEFINE_SHADER_STAGE(stage, Stage::VERTEX)
-    {
-        VariableBlock& vertexData = stage.getOutputBlock(HW::VERTEX_DATA);
-        const string prefix = shadergen.getVertexDataPrefix(vertexData);
-        ShaderPort* position = vertexData[HW::T_POSITION_WORLD];
-        if (!position->isEmitted())
-        {
-            position->setEmitted();
-            shadergen.emitLine(prefix + position->getVariable() + " = hPositionWorld.xyz", stage);
-        }
-    }
-
-    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
-    {
-        VariableBlock& vertexData = stage.getInputBlock(HW::VERTEX_DATA);
-        const string prefix = shadergen.getVertexDataPrefix(vertexData);
-        ShaderPort* position = vertexData[HW::T_POSITION_WORLD];
-        shadergen.emitLineBegin(stage);
-        shadergen.emitOutput(node.getOutput(), true, false, context, stage);
-        shadergen.emitString(" = normalize(" + prefix + position->getVariable() + " - " + HW::T_VIEW_POSITION + ")", stage);
-        shadergen.emitLineEnd(stage);
-    }
-}
-
-MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenMsl/MslShaderGenerator.cpp b/source/MaterialXGenMsl/MslShaderGenerator.cpp
index 4bfcac2733..e07c0fc6ad 100644
--- a/source/MaterialXGenMsl/MslShaderGenerator.cpp
+++ b/source/MaterialXGenMsl/MslShaderGenerator.cpp
@@ -8,9 +8,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
@@ -33,6 +30,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -198,11 +198,11 @@ MslShaderGenerator::MslShaderGenerator() :
     registerImplementation("IM_geompropvalue_string_" + MslShaderGenerator::TARGET, GeomPropValueNodeMslAsUniform::create);
 
     // 
-    registerImplementation("IM_frame_float_" + MslShaderGenerator::TARGET, FrameNodeMsl::create);
+    registerImplementation("IM_frame_float_" + MslShaderGenerator::TARGET, HwFrameNode::create);
     // 
-    registerImplementation("IM_time_float_" + MslShaderGenerator::TARGET, TimeNodeMsl::create);
+    registerImplementation("IM_time_float_" + MslShaderGenerator::TARGET, HwTimeNode::create);
     // 
-    registerImplementation("IM_viewdirection_vector3_" + MslShaderGenerator::TARGET, ViewDirectionNodeMsl::create);
+    registerImplementation("IM_viewdirection_vector3_" + MslShaderGenerator::TARGET, HwViewDirectionNode::create);
 
     // 
     registerImplementation("IM_surface_" + MslShaderGenerator::TARGET, SurfaceNodeMsl::create);
diff --git a/source/MaterialXGenMsl/Nodes/SurfaceNodeMsl.cpp b/source/MaterialXGenMsl/Nodes/SurfaceNodeMsl.cpp
index f67e5e211f..bd0cd91fb1 100644
--- a/source/MaterialXGenMsl/Nodes/SurfaceNodeMsl.cpp
+++ b/source/MaterialXGenMsl/Nodes/SurfaceNodeMsl.cpp
@@ -46,7 +46,7 @@ void SurfaceNodeMsl::createVariables(const ShaderNode&, GenContext& context, Sha
     // TODO:
     // The surface shader needs position, normal, view position and light sources. We should solve this by adding some
     // dependency mechanism so this implementation can be set to depend on the HwPositionNode, HwNormalNode
-    // ViewDirectionNodeMsl and LightNodeMsl nodes instead? This is where the MaterialX attribute "internalgeomprops"
+    // HwViewDirectionNode and LightNodeMsl nodes instead? This is where the MaterialX attribute "internalgeomprops"
     // is needed.
     //
     ShaderStage& vs = shader.getStage(Stage::VERTEX);
diff --git a/source/MaterialXGenMsl/Nodes/SurfaceShaderNodeMsl.cpp b/source/MaterialXGenMsl/Nodes/SurfaceShaderNodeMsl.cpp
index f4d418bc9c..a09796a557 100644
--- a/source/MaterialXGenMsl/Nodes/SurfaceShaderNodeMsl.cpp
+++ b/source/MaterialXGenMsl/Nodes/SurfaceShaderNodeMsl.cpp
@@ -25,7 +25,7 @@ void SurfaceShaderNodeMsl::createVariables(const ShaderNode&, GenContext& contex
     // TODO:
     // The surface shader needs position, view position and light sources. We should solve this by adding some
     // dependency mechanism so this implementation can be set to depend on the HwPositionNode,
-    // ViewDirectionNodeMsl and LightNodeMsl nodes instead? This is where the MaterialX attribute "internalgeomprops"
+    // HwViewDirectionNode and LightNodeMsl nodes instead? This is where the MaterialX attribute "internalgeomprops"
     // is needed.
     //
     ShaderStage& vs = shader.getStage(Stage::VERTEX);
diff --git a/source/MaterialXGenMsl/Nodes/TimeNodeMsl.h b/source/MaterialXGenMsl/Nodes/TimeNodeMsl.h
deleted file mode 100644
index 07c505a082..0000000000
--- a/source/MaterialXGenMsl/Nodes/TimeNodeMsl.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#ifndef MATERIALX_TIMENODEMSL_H
-#define MATERIALX_TIMENODEMSL_H
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-/// Time node implementation for MSL
-class MX_GENMSL_API TimeNodeMsl : public MslImplementation
-{
-  public:
-    static ShaderNodeImplPtr create();
-
-    void createVariables(const ShaderNode& node, GenContext& context, Shader& shader) const override;
-
-    void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
-};
-
-MATERIALX_NAMESPACE_END
-
-#endif
diff --git a/source/MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.h b/source/MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.h
deleted file mode 100644
index be7a40108a..0000000000
--- a/source/MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#ifndef MATERIALX_VIEWDIRECTIONNODEMSL_H
-#define MATERIALX_VIEWDIRECTIONNODEMSL_H
-
-#include 
-
-MATERIALX_NAMESPACE_BEGIN
-
-/// ViewDirection node implementation for MSL
-class MX_GENMSL_API ViewDirectionNodeMsl : public MslImplementation
-{
-  public:
-    static ShaderNodeImplPtr create();
-
-    void createVariables(const ShaderNode& node, GenContext& context, Shader& shader) const override;
-
-    void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
-};
-
-MATERIALX_NAMESPACE_END
-
-#endif
diff --git a/source/MaterialXGenMsl/Nodes/FrameNodeMsl.cpp b/source/MaterialXGenShader/Nodes/HwFrameNode.cpp
similarity index 67%
rename from source/MaterialXGenMsl/Nodes/FrameNodeMsl.cpp
rename to source/MaterialXGenShader/Nodes/HwFrameNode.cpp
index faac05027a..cd6a3319a8 100644
--- a/source/MaterialXGenMsl/Nodes/FrameNodeMsl.cpp
+++ b/source/MaterialXGenShader/Nodes/HwFrameNode.cpp
@@ -3,24 +3,24 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include 
+#include 
 
 #include 
 
 MATERIALX_NAMESPACE_BEGIN
 
-ShaderNodeImplPtr FrameNodeMsl::create()
+ShaderNodeImplPtr HwFrameNode::create()
 {
-    return std::make_shared();
+    return std::make_shared();
 }
 
-void FrameNodeMsl::createVariables(const ShaderNode&, GenContext&, Shader& shader) const
+void HwFrameNode::createVariables(const ShaderNode&, GenContext&, Shader& shader) const
 {
     ShaderStage& ps = shader.getStage(Stage::PIXEL);
     addStageUniform(HW::PRIVATE_UNIFORMS, Type::FLOAT, HW::T_FRAME, ps);
 }
 
-void FrameNodeMsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
+void HwFrameNode::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
 {
     DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
     {
diff --git a/source/MaterialXGenGlsl/Nodes/FrameNodeGlsl.h b/source/MaterialXGenShader/Nodes/HwFrameNode.h
similarity index 65%
rename from source/MaterialXGenGlsl/Nodes/FrameNodeGlsl.h
rename to source/MaterialXGenShader/Nodes/HwFrameNode.h
index f3a5197eae..4487a6a0b9 100644
--- a/source/MaterialXGenGlsl/Nodes/FrameNodeGlsl.h
+++ b/source/MaterialXGenShader/Nodes/HwFrameNode.h
@@ -3,15 +3,15 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#ifndef MATERIALX_FRAMENODEGLSL_H
-#define MATERIALX_FRAMENODEGLSL_H
+#ifndef MATERIALX_HWFRAMENODE_H
+#define MATERIALX_HWFRAMENODE_H
 
-#include 
+#include 
 
 MATERIALX_NAMESPACE_BEGIN
 
-/// Frame node implementation for GLSL
-class MX_GENGLSL_API FrameNodeGlsl : public GlslImplementation
+/// Frame node implementation for hardware languages
+class MX_GENSHADER_API HwFrameNode : public HwImplementation
 {
   public:
     static ShaderNodeImplPtr create();
diff --git a/source/MaterialXGenMsl/Nodes/TimeNodeMsl.cpp b/source/MaterialXGenShader/Nodes/HwTimeNode.cpp
similarity index 72%
rename from source/MaterialXGenMsl/Nodes/TimeNodeMsl.cpp
rename to source/MaterialXGenShader/Nodes/HwTimeNode.cpp
index 0c54861b40..8f802a0764 100644
--- a/source/MaterialXGenMsl/Nodes/TimeNodeMsl.cpp
+++ b/source/MaterialXGenShader/Nodes/HwTimeNode.cpp
@@ -3,24 +3,24 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include 
+#include 
 
 #include 
 
 MATERIALX_NAMESPACE_BEGIN
 
-ShaderNodeImplPtr TimeNodeMsl::create()
+ShaderNodeImplPtr HwTimeNode::create()
 {
-    return std::make_shared();
+    return std::make_shared();
 }
 
-void TimeNodeMsl::createVariables(const ShaderNode&, GenContext&, Shader& shader) const
+void HwTimeNode::createVariables(const ShaderNode&, GenContext&, Shader& shader) const
 {
     ShaderStage& ps = shader.getStage(Stage::PIXEL);
     addStageUniform(HW::PRIVATE_UNIFORMS, Type::FLOAT, HW::T_FRAME, ps);
 }
 
-void TimeNodeMsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
+void HwTimeNode::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
 {
     DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
     {
diff --git a/source/MaterialXGenMsl/Nodes/FrameNodeMsl.h b/source/MaterialXGenShader/Nodes/HwTimeNode.h
similarity index 65%
rename from source/MaterialXGenMsl/Nodes/FrameNodeMsl.h
rename to source/MaterialXGenShader/Nodes/HwTimeNode.h
index 4ad554102b..e5e1a2fcd4 100644
--- a/source/MaterialXGenMsl/Nodes/FrameNodeMsl.h
+++ b/source/MaterialXGenShader/Nodes/HwTimeNode.h
@@ -3,15 +3,15 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#ifndef MATERIALX_FRAMENODEMSL_H
-#define MATERIALX_FRAMENODEMSL_H
+#ifndef MATERIALX_HWTIMENODE_H
+#define MATERIALX_HWTIMENODE_H
 
-#include 
+#include 
 
 MATERIALX_NAMESPACE_BEGIN
 
-/// Frame node implementation for MSL
-class MX_GENMSL_API FrameNodeMsl : public MslImplementation
+/// Time node implementation for hardware languages
+class MX_GENSHADER_API HwTimeNode : public HwImplementation
 {
   public:
     static ShaderNodeImplPtr create();
diff --git a/source/MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.cpp b/source/MaterialXGenShader/Nodes/HwViewDirectionNode.cpp
similarity index 76%
rename from source/MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.cpp
rename to source/MaterialXGenShader/Nodes/HwViewDirectionNode.cpp
index 1443b5c320..819ac93029 100644
--- a/source/MaterialXGenMsl/Nodes/ViewDirectionNodeMsl.cpp
+++ b/source/MaterialXGenShader/Nodes/HwViewDirectionNode.cpp
@@ -3,18 +3,18 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include 
+#include 
 
 #include 
 
 MATERIALX_NAMESPACE_BEGIN
 
-ShaderNodeImplPtr ViewDirectionNodeMsl::create()
+ShaderNodeImplPtr HwViewDirectionNode::create()
 {
-    return std::make_shared();
+    return std::make_shared();
 }
 
-void ViewDirectionNodeMsl::createVariables(const ShaderNode&, GenContext&, Shader& shader) const
+void HwViewDirectionNode::createVariables(const ShaderNode&, GenContext&, Shader& shader) const
 {
     ShaderStage& vs = shader.getStage(Stage::VERTEX);
     ShaderStage& ps = shader.getStage(Stage::PIXEL);
@@ -24,9 +24,9 @@ void ViewDirectionNodeMsl::createVariables(const ShaderNode&, GenContext&, Shade
     addStageUniform(HW::PRIVATE_UNIFORMS, Type::VECTOR3, HW::T_VIEW_POSITION, ps);
 }
 
-void ViewDirectionNodeMsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
+void HwViewDirectionNode::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
 {
-    const MslShaderGenerator& shadergen = static_cast(context.getShaderGenerator());
+    const HwShaderGenerator& shadergen = static_cast(context.getShaderGenerator());
 
     DEFINE_SHADER_STAGE(stage, Stage::VERTEX)
     {
diff --git a/source/MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.h b/source/MaterialXGenShader/Nodes/HwViewDirectionNode.h
similarity index 61%
rename from source/MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.h
rename to source/MaterialXGenShader/Nodes/HwViewDirectionNode.h
index 24cafe2f1d..143d89d437 100644
--- a/source/MaterialXGenGlsl/Nodes/ViewDirectionNodeGlsl.h
+++ b/source/MaterialXGenShader/Nodes/HwViewDirectionNode.h
@@ -3,15 +3,15 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#ifndef MATERIALX_VIEWDIRECTIONNODEGLSL_H
-#define MATERIALX_VIEWDIRECTIONNODEGLSL_H
+#ifndef MATERIALX_HWVIEWDIRECTIONNODE_H
+#define MATERIALX_HWVIEWDIRECTIONNODE_H
 
-#include 
+#include 
 
 MATERIALX_NAMESPACE_BEGIN
 
-/// ViewDirection node implementation for GLSL
-class MX_GENGLSL_API ViewDirectionNodeGlsl : public GlslImplementation
+/// ViewDirection node implementation for hardware languages
+class MX_GENSHADER_API HwViewDirectionNode : public HwImplementation
 {
   public:
     static ShaderNodeImplPtr create();