Skip to content

Consolidate edge creation in Graph Editor #2793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jstone-lucasfilm wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Consolidate edge creation in Graph Editor #2793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5049d04
Consolidate edge creation in Graph Editor
jstone-lucasfilm Mar 1, 2026
5bc3f38
Merge branch 'main' into dev_graph_edge_creation
jstone-lucasfilm Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
162 changes: 80 additions & 82 deletions source/MaterialXGraphEditor/Graph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,17 @@ void Graph::setRenderMaterial(UiNodePtr node)
mtlxNodeGraph = parent->asA<mx::NodeGraph>();
else if (parent->isA<mx::Node>())
mtlxNode = parent->asA<mx::Node>();
else if (parent->isA<mx::Document>())
{
// Document-scope outputs are directly renderable.
if (_currRenderNode != node)
{
_currRenderNode = node;
_frameCount = ImGui::GetFrameCount();
_renderer->setMaterialCompilation(true);
}
return;
}
}
mx::StringSet testPaths;
if (mtlxNode)
Expand Down Expand Up @@ -1161,67 +1172,33 @@ void Graph::buildUiBaseGraph(mx::DocumentPtr doc)
setUiNodeInfo(currNode, output->getType(), output->getCategory());
}

// Create edges for nodegraphs
for (mx::NodeGraphPtr graph : nodeGraphs)
// Create edges for nodegraph and node inputs
for (size_t i = 0; i < _state.nodes.size(); i++)
{
int downNum = findNode(graph->getName(), "nodegraph");
if (downNum < 0)
UiNodePtr& uiNode = _state.nodes[i];
mx::ElementPtr elem = uiNode->getElement();
mx::InterfaceElementPtr interface = elem ? elem->asA<mx::InterfaceElement>() : nullptr;
if (!interface)
{
continue;
}
for (mx::InputPtr input : graph->getActiveInputs())
{
int upNum = -1;
mx::string nodeGraphName = input->getNodeGraphString();
mx::NodePtr connectedNode = input->getConnectedNode();
if (!nodeGraphName.empty())
{
upNum = findNode(nodeGraphName, "nodegraph");
}
else if (connectedNode)
{
upNum = findNode(connectedNode->getName(), "node");
}

int downNum = static_cast<int>(i);

for (mx::InputPtr input : interface->getActiveInputs())
{
int upNum = findUpstreamNode(input);
if (upNum >= 0)
{
createEdge(_state.nodes[upNum], _state.nodes[downNum], input);
}
}
}

// Create edges for surface and material nodes
for (mx::NodePtr node : docNodes)
// Create edges for document-scope outputs
for (mx::OutputPtr output : outputNodes)
{
mx::NodeDefPtr nD = node->getNodeDef(node->getName());
for (mx::InputPtr input : node->getActiveInputs())
{
mx::string nodeGraphName = input->getNodeGraphString();
mx::NodePtr connectedNode = input->getConnectedNode();
mx::OutputPtr connectedOutput = input->getConnectedOutput();
int upNum = -1;
int downNum = findNode(node->getName(), "node");
if (!nodeGraphName.empty())
{
upNum = findNode(nodeGraphName, "nodegraph");
}
else if (connectedNode)
{
upNum = findNode(connectedNode->getName(), "node");
}
else if (connectedOutput)
{
upNum = findNode(connectedOutput->getName(), "output");
}
else if (!input->getInterfaceName().empty())
{
upNum = findNode(input->getInterfaceName(), "input");
}
if (upNum >= 0 && downNum >= 0)
{
createEdge(_state.nodes[upNum], _state.nodes[downNum], input);
}
}
createEdgeForOutput(output);
}
}

Expand All @@ -1232,7 +1209,6 @@ void Graph::buildUiNodeGraph(const mx::NodeGraphPtr& nodeGraphs)
mx::NodeGraphPtr nodeGraph = nodeGraphs;
std::vector<mx::ElementPtr> children = nodeGraph->topologicalSort();
mx::NodeDefPtr nodeDef = nodeGraph->getNodeDef();
mx::NodeDefPtr currNodeDef;

// Create input nodes
if (nodeDef)
Expand Down Expand Up @@ -1285,13 +1261,13 @@ void Graph::buildUiNodeGraph(const mx::NodeGraphPtr& nodeGraphs)
mx::ElementPtr connectingElem = edge.getConnectingElement();

mx::NodePtr upstreamNode = upstreamElem->asA<mx::Node>();
mx::NodePtr downstreamNode = downstreamElem->asA<mx::Node>();
mx::InputPtr upstreamInput = upstreamElem->asA<mx::Input>();
mx::InputPtr downstreamInput = downstreamElem->asA<mx::Input>();
mx::OutputPtr upstreamOutput = upstreamElem->asA<mx::Output>();
mx::NodePtr downstreamNode = downstreamElem->asA<mx::Node>();
mx::InputPtr downstreamInput = downstreamElem->asA<mx::Input>();
mx::OutputPtr downstreamOutput = downstreamElem->asA<mx::Output>();
std::string downName = downstreamElem->getName();
std::string upName = upstreamElem->getName();
std::string downName = downstreamElem->getName();
std::string upstreamType;
std::string downstreamType;
if (upstreamNode)
Expand Down Expand Up @@ -1363,44 +1339,23 @@ void Graph::buildUiNodeGraph(const mx::NodeGraphPtr& nodeGraphs)
mx::OutputPtr output = elem->asA<mx::Output>();
if (node)
{
int downNum = findNode(node->getName(), "node");
if (downNum < 0)
{
continue;
}
for (mx::InputPtr input : node->getActiveInputs())
{
mx::NodePtr connectedNode = input->getConnectedNode();
int downNum = findNode(node->getName(), "node");
if (downNum < 0)
int upNum = findUpstreamNode(input);
if (upNum >= 0)
{
continue;
}
if (connectedNode)
{
int upNum = findNode(connectedNode->getName(), "node");
if (upNum >= 0)
{
createEdge(_state.nodes[upNum], _state.nodes[downNum], input);
}
}
else if (input->getInterfaceInput())
{
int upNum = findNode(input->getInterfaceInput()->getName(), "input");
if (upNum >= 0)
{
createEdge(_state.nodes[upNum], _state.nodes[downNum], input);
}
createEdge(_state.nodes[upNum], _state.nodes[downNum], input);
}
}
}
else if (output)
{
mx::NodePtr connectedNode = output->getConnectedNode();
if (connectedNode)
{
int upNum = findNode(connectedNode->getName(), "node");
int downNum = findNode(output->getName(), "output");
if (upNum >= 0 && downNum >= 0)
{
createEdge(_state.nodes[upNum], _state.nodes[downNum], nullptr);
}
}
createEdgeForOutput(output);
}
}
}
Expand Down Expand Up @@ -1435,6 +1390,35 @@ int Graph::findNode(const std::string& name, const std::string& type)
return -1;
}

int Graph::findUpstreamNode(mx::InputPtr input)
{
const mx::string& nodeGraphName = input->getNodeGraphString();
if (!nodeGraphName.empty())
{
return findNode(nodeGraphName, "nodegraph");
}

mx::NodePtr connectedNode = input->getConnectedNode();
if (connectedNode)
{
return findNode(connectedNode->getName(), "node");
}

mx::OutputPtr connectedOutput = input->getConnectedOutput();
if (connectedOutput)
{
return findNode(connectedOutput->getName(), "output");
}

const mx::string& interfaceName = input->getInterfaceName();
if (!interfaceName.empty())
{
return findNode(interfaceName, "input");
}

return -1;
}

void Graph::positionPasteBin(ImVec2 pos)
{
ImVec2 totalPos = ImVec2(0, 0);
Expand Down Expand Up @@ -1486,6 +1470,20 @@ bool Graph::createEdge(UiNodePtr upNode, UiNodePtr downNode, mx::InputPtr connec
return true;
}

void Graph::createEdgeForOutput(mx::OutputPtr output)
{
mx::NodePtr connectedNode = output->getConnectedNode();
if (connectedNode)
{
int upNum = findNode(connectedNode->getName(), "node");
int downNum = findNode(output->getName(), "output");
if (upNum >= 0 && downNum >= 0)
{
createEdge(_state.nodes[upNum], _state.nodes[downNum], nullptr);
}
}
}

void Graph::copyUiNode(UiNodePtr node)
{
UiNodePtr copyNode = std::make_shared<UiNode>(mx::EMPTY_STRING, int(_state.nextUiId + 1));
Expand Down
6 changes: 6 additions & 0 deletions source/MaterialXGraphEditor/Graph.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,9 @@ class Graph
// account for input/output UiNodes with same names as MaterialX nodes
int findNode(const std::string& name, const std::string& type);

// Return the node position of the upstream connection from the given input.
int findUpstreamNode(mx::InputPtr input);

// Add node to graphNodes based on nodedef information
void addNode(const std::string& category, const std::string& name, const std::string& type);

Expand All @@ -196,6 +199,9 @@ class Graph
// Returns true if the edge was created, false if invalid or already exists.
bool createEdge(UiNodePtr upNode, UiNodePtr downNode, mx::InputPtr connectingInput);

// Create an edge from an output element to its connected upstream node.
void createEdgeForOutput(mx::OutputPtr output);

// Remove node edge based on connecting input
void removeEdge(int downNode, int upNode, UiPinPtr pin);

Expand Down