Change API name to final name. Add in JS binding.

source/JsMaterialX/JsMaterialXCore/JsInterface.cpp

@@ -54,6 +54,7 @@ EMSCRIPTEN_BINDINGS(interface)
  .function("setConnectedOutput", &mx::Input::setConnectedOutput)
  .function("getConnectedOutput", &mx::Input::getConnectedOutput)
  .function("getInterfaceInput", &mx::Input::getInterfaceInput)
+ .function("setConnectedInterfaceName", &mx::Input::setConnectedInterfaceName)
  .class_property("CATEGORY", &mx::Input::CATEGORY)
  .class_property("DEFAULT_GEOM_PROP_ATTRIBUTE", &mx::Input::DEFAULT_GEOM_PROP_ATTRIBUTE);
 

source/MaterialXCore/Interface.cpp

@@ -306,7 +306,7 @@ NodePtr Input::getConnectedNode() const
  return PortElement::getConnectedNode();
 }
 
-void Input::setConnectedInterface(const string& interfaceName)
+void Input::setConnectedInterfaceName(const string& interfaceName)
 {
  if (!interfaceName.empty())
  {

source/MaterialXCore/Interface.h

@@ -249,7 +249,7 @@ class MX_CORE_API Input : public PortElement
 
  /// Connects this input to a corresponding interface with the given name.
  /// If the interface name specified is an empty string then any existing connection is removed.
- void setConnectedInterface(const string& interfaceName);
+ void setConnectedInterfaceName(const string& interfaceName);
 
  /// Return the input on the parent graph corresponding to the interface name
  /// for this input.

source/MaterialXGraphEditor/Graph.cpp

@@ -1834,7 +1834,7 @@ void Graph::copyInputs()
  else if (upNode->getInput())
  {
 
- copyNode->inputPins[count]->_input->setConnectedInterface(upNode->getName());
+ copyNode->inputPins[count]->_input->setConnectedInterfaceName(upNode->getName());
  }
  else
  {
@@ -1860,7 +1860,7 @@ void Graph::copyInputs()
  {
  if (upNode->getInput())
  {
- copyNode->inputPins[count]->_input->setConnectedInterface(upNode->getName());
+ copyNode->inputPins[count]->_input->setConnectedInterfaceName(upNode->getName());
  }
  else
  {
@@ -1884,7 +1884,7 @@ void Graph::copyInputs()
  {
  if (pin->_input->getInterfaceInput())
  {
- copyNode->inputPins[count]->_input->setConnectedInterface(mx::EMPTY_STRING);
+ copyNode->inputPins[count]->_input->setConnectedInterfaceName(mx::EMPTY_STRING);
  }
  copyNode->inputPins[count]->setConnected(false);
  setDefaults(copyNode->inputPins[count]->_input);
@@ -2624,7 +2624,7 @@ void Graph::addLink(ed::PinId startPinId, ed::PinId endPinId)
  }
  else if (uiUpNode->getInput() != nullptr)
  {
- pin->_input->setConnectedInterface(uiUpNode->getName());
+ pin->_input->setConnectedInterfaceName(uiUpNode->getName());
  }
  else
  {
@@ -2650,7 +2650,7 @@ void Graph::addLink(ed::PinId startPinId, ed::PinId endPinId)
  {
  if (uiUpNode->getInput())
  {
- pin->_input->setConnectedInterface(uiUpNode->getName());
+ pin->_input->setConnectedInterfaceName(uiUpNode->getName());
  }
  else
  {
@@ -2775,7 +2775,7 @@ void Graph::deleteLinkInfo(int startAttr, int endAttr)
  if (_graphNodes[upNode]->getInput())
  {
  // Remove interface value in order to set the default of the input
- pin->_input->setConnectedInterface(mx::EMPTY_STRING);
+ pin->_input->setConnectedInterfaceName(mx::EMPTY_STRING);
  setDefaults(pin->_input);
  setDefaults(_graphNodes[upNode]->getInput());
  }
@@ -2808,7 +2808,7 @@ void Graph::deleteLinkInfo(int startAttr, int endAttr)
  removeEdge(downNode, upNode, pin);
  if (_graphNodes[upNode]->getInput())
  {
- _graphNodes[downNode]->getNodeGraph()->getInput(pin->_name)->setConnectedInterface(mx::EMPTY_STRING);
+ _graphNodes[downNode]->getNodeGraph()->getInput(pin->_name)->setConnectedInterfaceName(mx::EMPTY_STRING);
  setDefaults(_graphNodes[upNode]->getInput());
  }
  for (UiPinPtr connect : pin->_connections)
@@ -2905,7 +2905,7 @@ void Graph::deleteNode(UiNodePtr node)
  if (node->getInput())
  {
  // Remove interface in order to set the default of the input
- pin->_input->setConnectedInterface(mx::EMPTY_STRING);
+ pin->_input->setConnectedInterfaceName(mx::EMPTY_STRING);
  setDefaults(pin->_input);
  setDefaults(node->getInput());
  }
@@ -2914,7 +2914,7 @@ void Graph::deleteNode(UiNodePtr node)
  {
  if (node->getInput())
  {
- pin->_pinNode->getNodeGraph()->getInput(pin->_name)->setConnectedInterface(mx::EMPTY_STRING);
+ pin->_pinNode->getNodeGraph()->getInput(pin->_name)->setConnectedInterfaceName(mx::EMPTY_STRING);
  setDefaults(node->getInput());
  }
  pin->_input->setConnectedNode(nullptr);
@@ -3318,7 +3318,7 @@ void Graph::propertyEditor()
  {
  _currUiNode->getInput()->setName(name);
  mx::ValuePtr val = _currUiNode->getInput()->getValue();
- input->setConnectedInterface(name);
+ input->setConnectedInterfaceName(name);
  mx::InputPtr pt = input->getInterfaceInput();
  }
  }

source/MaterialXTest/MaterialXCore/Node.cpp

@@ -59,7 +59,7 @@ TEST_CASE("Interface Input Validation", "[node]")
  }
  REQUIRE(!valid);
 
- addInput->setConnectedInterface(graphInput->getName());
+ addInput->setConnectedInterfaceName(graphInput->getName());
  mx::InputPtr interfaceInput = addInput->getInterfaceInput();
  REQUIRE((interfaceInput && interfaceInput->getNamePath() == graphInput->getNamePath()));
  REQUIRE(!addInput->getValue());
@@ -70,7 +70,7 @@ TEST_CASE("Interface Input Validation", "[node]")
  }
  REQUIRE(valid);
 
- addInput->setConnectedInterface(mx::EMPTY_STRING);
+ addInput->setConnectedInterfaceName(mx::EMPTY_STRING);
  addInput->setValueString("2, 2, 2");
  interfaceInput = addInput->getInterfaceInput();
  REQUIRE(!interfaceInput);

source/PyMaterialX/PyMaterialXCore/PyInterface.cpp

@@ -39,7 +39,7 @@ void bindPyInterface(py::module& mod)
  .def("getDefaultGeomPropString", &mx::Input::getDefaultGeomPropString)
  .def("getDefaultGeomProp", &mx::Input::getDefaultGeomProp)
  .def("getConnectedNode", &mx::Input::getConnectedNode)
- .def("setConnectedInterface", &mx::Input::setConnectedInterface)
+ .def("setConnectedInterfaceName", &mx::Input::setConnectedInterfaceName)
  .def("getInterfaceInput", &mx::Input::getInterfaceInput)
  .def_readonly_static("CATEGORY", &mx::Input::CATEGORY);