Improvements to publishing API

resources/Materials/TestSuite/stdlib/definition/definition_from_nodegraph.mtlx

@@ -1,76 +1,29 @@
 <?xml version="1.0"?>
 <materialx version="1.38">
   <nodegraph name="test_colorcorrect">
-    <range name="AlphaClampAndGamma" type="float">
-      <input name="in" type="float" nodename="AlphaOffset" />
-      <input name="gamma" type="float" value="3" />
-      <input name="doclamp" type="boolean" value="true" />
-    </range>
     <multiply name="AlphaGain" type="float">
-      <input name="in1" type="float" nodename="extractAlphaForGain" />
+      <input name="in1" type="float" nodename="inputAlpha" />
+      <input name="in2" type="float" value="0.8" />
     </multiply>
     <add name="AlphaOffset" type="float">
       <input name="in1" type="float" nodename="AlphaGain" />
+      <input name="in2" type="float" value="1" />
     </add>
-    <range name="ColorClampAndGamma" type="color3">
-      <input name="in" type="color3" nodename="ColorOffset" />
-      <input name="gamma" type="color3" value="2, 1, 1" />
-    </range>
     <multiply name="ColorGain" type="color3">
-      <input name="in1" type="color3" nodename="HSV_adjust" />
+      <input name="in1" type="color3" nodename="inputColor" />
+      <input name="in2" type="color3" value="0.9, 0.9, 0.9" />
     </multiply>
     <add name="ColorOffset" type="color3">
       <input name="in1" type="color3" nodename="ColorGain" />
+      <input name="in2" type="color3" value="0.379147, 0.0341412, 0.0341412" />
     </add>
-    <combine2 name="CombineColorAlpha" type="color4">
-      <input name="in1" type="color3" nodename="ColorClampAndGamma" />
-      <input name="in2" type="float" nodename="AlphaClampAndGamma" />
-    </combine2>
-    <hsvadjust name="HSV_adjust" type="color3">
-      <input name="in" type="color3" nodename="extractColorForHsv" />
-    </hsvadjust>
-    <premult name="premultiplyColor" type="color4">
-      <input name="in" type="color4" nodename="CombineColorAlpha" />
-    </premult>
-    <ifequal name="if_premultiply_condition" type="color4">
-      <input name="value2" type="boolean" value="true" />
-      <input name="in1" type="color4" nodename="premultiplyColor" />
-      <input name="in2" type="color4" nodename="CombineColorAlpha" />
-    </ifequal>
-    <unpremult name="unpremultiply" type="color4">
-      <input name="in" type="color4" nodename="combineInput" />
-    </unpremult>
-    <ifequal name="if_unpremultiply_condition" type="color4">
-      <input name="value2" type="boolean" value="true" />
-      <input name="in1" type="color4" nodename="unpremultiply" />
-      <input name="in2" type="color4" nodename="combineInput" />
-    </ifequal>
-    <swizzle name="outputColor" type="color3">
-      <input name="in" type="color4" nodename="if_premultiply_condition" />
-      <input name="channels" type="string" value="rgb" />
-    </swizzle>
-    <swizzle name="outputAlpha" type="float">
-      <input name="in" type="color4" nodename="if_premultiply_condition" />
-      <input name="channels" type="string" value="a" />
-    </swizzle>
-    <swizzle name="extractColorForHsv" type="color3">
-      <input name="in" type="color4" nodename="if_unpremultiply_condition" />
-      <input name="channels" type="string" value="rgb" />
-    </swizzle>
-    <swizzle name="extractAlphaForGain" type="float">
-      <input name="in" type="color4" nodename="if_unpremultiply_condition" />
-    </swizzle>
     <constant name="inputColor" type="color3">
       <input name="value" type="color3" value="0.5, 0.5, 0.5" />
     </constant>
     <constant name="inputAlpha" type="float">
       <input name="value" type="float" value="1" />
     </constant>
-    <combine2 name="combineInput" type="color4">
-      <input name="in1" type="color3" nodename="inputColor" />
-      <input name="in2" type="float" nodename="inputAlpha" />
-    </combine2>
-    <output name="out" type="color3" nodename="outputColor" />
-    <output name="out1" type="float" nodename="outputAlpha" />
+    <output name="out" type="color3" nodename="ColorOffset" />
+    <output name="out1" type="float" nodename="AlphaOffset" />
   </nodegraph>
 </materialx>

source/MaterialXCore/Document.cpp

@@ -187,6 +187,12 @@ NodeDefPtr Document::addNodeDefFromGraph(const NodeGraphPtr nodeGraph, const str
         }
         graph = addNodeGraph(newGraphName);
         graph->copyContentFrom(nodeGraph);
+
+        for (auto graphChild : graph->getChildren())
+        {
+            graphChild->removeAttribute("xpos");
+            graphChild->removeAttribute("ypos");
+        }        
     }
     graph->setNodeDefString(nodeDefName);
 
@@ -208,9 +214,49 @@ NodeDefPtr Document::addNodeDefFromGraph(const NodeGraphPtr nodeGraph, const str
         }
     }
 
-    for (auto output : graph->getOutputs())
+    // Expose any existing interface.
+    // Any connection attributes on the existing interface should be removed from the definition.
+    // as well as any source URI
+
+    // Attributes which should not be copied over
+    StringSet filterAttributes = { PortElement::NODE_GRAPH_ATTRIBUTE, PortElement::NODE_NAME_ATTRIBUTE, 
+                                   PortElement::CHANNELS_ATTRIBUTE, PortElement::INTERFACE_NAME_ATTRIBUTE,
+                                   "xpos", "ypos" };
+
+    // Transfer input interface from the graph to the nodedef
+    for (InputPtr input : graph->getInputs())
+    {
+        InputPtr nodeDefInput = nodeDef->addInput(input->getName(), input->getType());
+        if (nodeDefInput)
+        {
+            nodeDefInput->copyContentFrom(input);
+            for (const string& filterAttribute : filterAttributes )
+            {
+                nodeDefInput->removeAttribute(filterAttribute);
+            }
+            nodeDefInput->setSourceUri(EMPTY_STRING);
+            input->setInterfaceName(nodeDefInput->getName());
+        }        
+    }
+    // Remove interface from the nodegraph
+    for (InputPtr input : graph->getInputs())
+    {
+        graph->removeInput(input->getName());
+    }
+
+    // Copy the output interface from the graph to the nodedef
+    for (OutputPtr output : graph->getOutputs())
     {
-        nodeDef->addOutput(output->getName(), output->getType());
+        OutputPtr nodeDefOutput = nodeDef->addOutput(output->getName(), output->getType());
+        if (nodeDefOutput)
+        {
+            nodeDefOutput->copyContentFrom(output);
+            for (const string& filterAttribute : filterAttributes)
+            {
+                nodeDefOutput->removeAttribute(filterAttribute);
+            }
+            nodeDefOutput->setSourceUri(EMPTY_STRING);
+        }
     }
 
     return nodeDef;

source/MaterialXCore/Document.h

@@ -339,9 +339,9 @@ class MX_CORE_API Document : public GraphElement
     /// @param node Node type for the new declaration
     /// @param version Version for the new declaration
     /// @param isDefaultVersion If a version is specified is thie definition the default version
+    /// @param nodeGroup Optional node group for the new declaration. The Default value is an emptry string.
     /// @param newGraphName Make a copy of this NodeGraph with the given name if a non-empty name is provided. Otherwise
     ///        modify the existing NodeGraph. Default value is an empty string.
-    /// @param nodeGroup Optional node group for the new declaration. The Default value is an emptry string.
     /// @return New declaration if successful.
     NodeDefPtr addNodeDefFromGraph(const NodeGraphPtr nodeGraph, const string& nodeDefName, const string& node, const string& version,
                                    bool isDefaultVersion, const string& nodeGroup, const string& newGraphName);

source/MaterialXCore/Node.cpp

@@ -657,34 +657,33 @@ void Node::addInputsFromNodeDef()
     }
 }
 
-void NodeGraph::addInterfaceName(const string& inputPath, const string& interfaceName)
+InputPtr NodeGraph::addInterfaceName(const string& inputPath, const string& interfaceName)
 {
     NodeDefPtr nodeDef = getNodeDef();
-    if (!nodeDef)
+    InterfaceElementPtr interfaceElement = ( nodeDef ? nodeDef->asA<InterfaceElement>() : getSelf()->asA<InterfaceElement>() );
+    if (interfaceElement->getChild(interfaceName))
     {
-        throw Exception("Cannot declare an interface for a nodegraph which is not associated with a node definition: " + getName());
-    }
-    if (nodeDef->getChild(interfaceName))
-    {
-        throw Exception("Interface: " + interfaceName + " has already been declared on the node definition: " + nodeDef->getName());
+        throw Exception("Interface: " + interfaceName + " has already been declared on the interface: " + interfaceElement->getNamePath());
     }
 
+    InputPtr interfaceInput = nullptr;
     ElementPtr elem = getDescendant(inputPath);
     InputPtr input = elem ? elem->asA<Input>() : nullptr;
     if (input && !input->getConnectedNode())
     {
         input->setInterfaceName(interfaceName);
-        InputPtr nodeDefInput = nodeDef->getInput(interfaceName);
-        if (!nodeDefInput)
+        interfaceInput = interfaceElement->getInput(interfaceName);
+        if (!interfaceInput)
         {
-            nodeDefInput = nodeDef->addInput(interfaceName, input->getType());
+            interfaceInput = interfaceElement->addInput(interfaceName, input->getType());
         }
         if (input->hasValue())
         {
-            nodeDefInput->setValueString(input->getValueString());
+            interfaceInput->setValueString(input->getValueString());
             input->removeAttribute(Input::VALUE_ATTRIBUTE);
         }
     }
+    return interfaceInput;
 }
 
 void NodeGraph::removeInterfaceName(const string& inputPath)
@@ -694,24 +693,44 @@ void NodeGraph::removeInterfaceName(const string& inputPath)
     if (input)
     {
         const string& interfaceName = input->getInterfaceName();
-        getNodeDef()->removeChild(interfaceName);
-        input->setInterfaceName(EMPTY_STRING);
+        if (!interfaceName.empty())
+        {
+            NodeDefPtr nodeDef = getNodeDef();
+            InterfaceElementPtr interface = ( nodeDef ? nodeDef->asA<InterfaceElement>() : getSelf()->asA<InterfaceElement>() );
+            ElementPtr interfaceElement = interface->getChild(interfaceName);
+            if (interfaceElement)
+            {
+                InputPtr interfaceInput = interfaceElement ? interfaceElement->asA<Input>() : nullptr;
+                if (interfaceInput && interfaceInput->hasValue())
+                {
+                    input->setValueString(interfaceInput->getValueString());
+                }
+                interface->removeChild(interfaceName);
+            }
+            input->setInterfaceName(EMPTY_STRING);
+        }
     }
 }
 
 void NodeGraph::modifyInterfaceName(const string& inputPath, const string& interfaceName)
 {
+    NodeDefPtr nodeDef = getNodeDef();
+    InterfaceElementPtr interfaceElement = ( nodeDef ? nodeDef->asA<InterfaceElement>() : getSelf()->asA<InterfaceElement>() );
+
     ElementPtr desc = getDescendant(inputPath);
     InputPtr input = desc ? desc->asA<Input>() : nullptr;
     if (input)
     {
         const string& previousName = input->getInterfaceName();
-        ElementPtr previousChild = getNodeDef()->getChild(previousName);
-        if (previousChild)
+        if (previousName != interfaceName)
         {
-            previousChild->setName(interfaceName);
+            ElementPtr previousChild = interfaceElement->getChild(previousName);
+            if (previousChild)
+            {
+                previousChild->setName(interfaceName);
+            }
+            input->setInterfaceName(interfaceName);
         }
-        input->setInterfaceName(interfaceName);
     }
 }
 

source/MaterialXCore/Node.h

@@ -369,7 +369,8 @@ class MX_CORE_API NodeGraph : public GraphElement
     /// Add an interface name to an existing NodeDef associated with this NodeGraph.
     /// @param inputPath Path to an input descendant of this graph.
     /// @param interfaceName The new interface name.
-    void addInterfaceName(const string& inputPath, const string& interfaceName);
+    /// @return Interface input.
+    InputPtr addInterfaceName(const string& inputPath, const string& interfaceName);
 
     /// Remove an interface name from an existing NodeDef associated with this NodeGraph.
     /// @param inputPath Path to an input descendant of this graph.