Refactor: Remove ShaderNode's nodeDefName in favor of new OsoNode Impl class

Author: chellmuth

source/MaterialXGenOslNodes/CMakeLists.txt

@@ -1,6 +1,7 @@
 file(GLOB_RECURSE materialx_source
   "${CMAKE_CURRENT_SOURCE_DIR}/OslNodesShaderGenerator.cpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/OslNodesSyntax.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/Nodes/OsoNode.cpp"
 )
 file(GLOB_RECURSE materialx_headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h*")
 

source/MaterialXGenOslNodes/Nodes/OsoNode.cpp

@@ -0,0 +1,34 @@
+//
+// Copyright Contributors to the MaterialX Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#include <MaterialXGenOslNodes/Nodes/OsoNode.h>
+#include <MaterialXGenShader/GenContext.h>
+
+MATERIALX_NAMESPACE_BEGIN
+
+ShaderNodeImplPtr OsoNode::create()
+{
+    return std::make_shared<OsoNode>();
+}
+
+void OsoNode::initialize(const InterfaceElement& element, GenContext& context)
+{
+    ShaderNodeImpl::initialize(element, context);
+
+    if (!element.isA<Implementation>())
+    {
+        throw ExceptionShaderGenError("Element '" + element.getName() + "' is not an Implementation element");
+    }
+    const Implementation& impl = static_cast<const Implementation&>(element);
+
+    // Implementation's function attr is the oso filename, file attr is its directory
+    _osoName = impl.getFunction();
+    _osoPath = impl.getFile();
+
+    // Set hash using the oso name.
+    _hash = std::hash<string>{}(_osoName);
+}
+
+MATERIALX_NAMESPACE_END

source/MaterialXGenOslNodes/Nodes/OsoNode.h

@@ -0,0 +1,32 @@
+//
+// Copyright Contributors to the MaterialX Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#ifndef MATERIALX_OSONODE_H
+#define MATERIALX_OSONODE_H
+
+#include <MaterialXGenOslNodes/Export.h>
+
+#include <MaterialXGenShader/ShaderNodeImpl.h>
+
+MATERIALX_NAMESPACE_BEGIN
+
+class MX_GENOSLNODES_API OsoNode : public ShaderNodeImpl
+{
+public:
+    static ShaderNodeImplPtr create();
+
+    void initialize(const InterfaceElement& element, GenContext& context) override;
+
+    const string& getOsoName() const { return _osoName; }
+    const string& getOsoPath() const { return _osoPath; }
+
+private:
+    string _osoName;
+    string _osoPath;
+};
+
+MATERIALX_NAMESPACE_END
+
+#endif

source/MaterialXGenOslNodes/OslNodesShaderGenerator.cpp

@@ -5,12 +5,12 @@
 
 #include <MaterialXGenOslNodes/OslNodesShaderGenerator.h>
 #include <MaterialXGenOslNodes/OslNodesSyntax.h>
+#include <MaterialXGenOslNodes/Nodes/OsoNode.h>
 
 #include <MaterialXGenShader/GenContext.h>
 #include <MaterialXGenShader/Shader.h>
 #include <MaterialXGenShader/TypeDesc.h>
 #include <MaterialXGenShader/ShaderStage.h>
-#include <MaterialXGenShader/Nodes/SourceCodeNode.h>
 
 
 MATERIALX_NAMESPACE_BEGIN
@@ -26,6 +26,11 @@ OslNodesShaderGenerator::OslNodesShaderGenerator(TypeSystemPtr typeSystem) :
 {
 }
 
+ShaderNodeImplPtr OslNodesShaderGenerator::createShaderNodeImplForImplementation(const NodeDef& /* nodedef */) const
+{
+    return OsoNode::create();
+}
+
 static string paramString(const string& paramType, const string& paramName, const string& paramValue)
 {
     return "param " + paramType + " " + paramName + " " + paramValue + " ;";
@@ -106,21 +111,13 @@ ShaderPtr OslNodesShaderGenerator::generate(const string& name, ElementPtr eleme
         // Keep track of the root output, so we can connect it to our setCi node
         lastOutput = node->getOutput(0);
 
-        NodeDefPtr nodeDef = document->getNodeDef(node->getNodeDefName());
-        ImplementationPtr impl = nodeDef->getImplementation("genoslnodes")->asA<Implementation>();
-
-        if (!impl)
-        {
-            printf("Skipping test due to missing implementation\n");
-            return nullptr;
-        }
-
-        string osoName = impl->getFunction();
+        const ShaderNodeImpl& impl = node->getImplementation();
+        const OsoNode& osoNodeImpl = dynamic_cast<const OsoNode&>(impl);
 
-        string osoPath = impl->getFile();
+        const string osoPath = osoNodeImpl.getOsoPath();
         osoPaths.insert(osoPath);
 
-        emitLine("shader " + osoName + " " + nodeName + " ;", stage, false);
+        emitLine("shader " + osoNodeImpl.getOsoName() + " " + nodeName + " ;", stage, false);
         lastNodeName = nodeName;
     }
 

source/MaterialXGenOslNodes/OslNodesShaderGenerator.h

@@ -36,6 +36,8 @@ class MX_GENOSLNODES_API OslNodesShaderGenerator : public ShaderGenerator
         return std::make_shared<OslNodesShaderGenerator>(typeSystem ? typeSystem : TypeSystem::create());
     }
 
+    ShaderNodeImplPtr createShaderNodeImplForImplementation(const NodeDef& nodedef) const override;
+
     /// Return a unique identifier for the target this generator is for
     const string& getTarget() const override { return TARGET; }
 

source/MaterialXGenShader/ShaderNode.cpp

@@ -161,22 +161,16 @@ const string ShaderNode::GEOMETRIC_GROUPNAME = "geometric";
 //
 
 ShaderNode::ShaderNode(const ShaderGraph* parent, const string& name) :
-    ShaderNode(parent, name, "")
-{
-}
-
-ShaderNode::ShaderNode(const ShaderGraph* parent, const string& name, const string& nodeDefName) :
     _parent(parent),
     _name(name),
     _classification(0),
-    _impl(nullptr),
-    _nodeDefName(nodeDefName)
+    _impl(nullptr)
 {
 }
 
 ShaderNodePtr ShaderNode::create(const ShaderGraph* parent, const string& name, const NodeDef& nodeDef, GenContext& context)
 {
-    ShaderNodePtr newNode = std::make_shared<ShaderNode>(parent, name, nodeDef.getName());
+    ShaderNodePtr newNode = std::make_shared<ShaderNode>(parent, name);
 
     const ShaderGenerator& shadergen = context.getShaderGenerator();
 

source/MaterialXGenShader/ShaderNode.h

@@ -377,7 +377,6 @@ class MX_GENSHADER_API ShaderNode
   public:
     /// Constructor.
     ShaderNode(const ShaderGraph* parent, const string& name);
-    ShaderNode(const ShaderGraph* parent, const string& name, const string& nodeDefName);
 
     /// Create a new node from a nodedef.
     static ShaderNodePtr create(const ShaderGraph* parent, const string& name, const NodeDef& nodeDef,
@@ -435,12 +434,6 @@ class MX_GENSHADER_API ShaderNode
         return *_impl;
     }
 
-    // Return the NodeDef name associated with this node.
-    const string& getNodeDefName() const
-    {
-        return _nodeDefName;
-    }
-
     /// Initialize this shader node with all required data
     /// from the given node and nodedef.
     void initialize(const Node& node, const NodeDef& nodeDef, GenContext& context);
@@ -511,8 +504,6 @@ class MX_GENSHADER_API ShaderNode
     ShaderNodeImplPtr _impl;
     ShaderMetadataVecPtr _metadata;
 
-    string _nodeDefName;
-
     friend class ShaderGraph;
 };