Skip to content
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

Jump to bottom

Auto layout fix for subgraphs #1389

Merged
merged 4 commits into from
Jun 27, 2023
Merged

Auto layout fix for subgraphs #1389

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5dfeeb
auto layout fix for subgraphs
lfl-eholthouser Jun 26, 2023
2edec2c
Minor spacing fix
jstone-lucasfilm Jun 27, 2023
15ff1ad
Minor spacing fix
jstone-lucasfilm Jun 27, 2023
a9ef2e7
Minor spacing fix
jstone-lucasfilm Jun 27, 2023
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
45 changes: 24 additions & 21 deletions source/MaterialXGraphEditor/Graph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,12 +481,18 @@ ImVec2 Graph::layoutPosition(UiNodePtr layoutNode, ImVec2 startingPos, bool init
// don't set position of group nodes
if (node->getMessage().empty())
{
float x = std::stof(node->getMxElement()->getAttribute("xpos"));
float y = std::stof(node->getMxElement()->getAttribute("ypos"));
x *= DEFAULT_NODE_SIZE.x;
y *= DEFAULT_NODE_SIZE.y;
ed::SetNodePosition(node->getId(), ImVec2(x, y));
node->setPos(ImVec2(x, y));
if (node->getMxElement()->hasAttribute("xpos"))
{
float x = std::stof(node->getMxElement()->getAttribute("xpos"));
if (node->getMxElement()->hasAttribute("ypos"))
{
float y = std::stof(node->getMxElement()->getAttribute("ypos"));
x *= DEFAULT_NODE_SIZE.x;
y *= DEFAULT_NODE_SIZE.y;
ed::SetNodePosition(node->getId(), ImVec2(x, y));
node->setPos(ImVec2(x, y));
}
}
}
}
}
Expand Down Expand Up @@ -831,7 +837,7 @@ void Graph::updateMaterials(mx::InputPtr input, mx::ValuePtr value)
// set the value of the selected node constants in the node property editor
void Graph::setConstant(UiNodePtr node, mx::InputPtr& input, const mx::UIProperties& uiProperties)
{
std::string inName = !uiProperties.uiName.empty()? uiProperties.uiName : input->getName();
std::string inName = !uiProperties.uiName.empty() ? uiProperties.uiName : input->getName();
ImGui::PushItemWidth(-1);

mx::ValuePtr minVal = uiProperties.uiMin;
Expand Down Expand Up @@ -2940,7 +2946,7 @@ void Graph::graphButtons()
}
ImGui::EndMenu();
}

if (ImGui::BeginMenu("Graph"))
{
if (ImGui::MenuItem("Auto Layout"))
Expand All @@ -2949,15 +2955,15 @@ void Graph::graphButtons()
}
ImGui::EndMenu();
}

if (ImGui::BeginMenu("Viewer"))
{
if (ImGui::MenuItem("Load Geometry"))
{
loadGeometry();
}
ImGui::EndMenu();
}
}

if (ImGui::Button("Help"))
{
Expand Down Expand Up @@ -3145,7 +3151,7 @@ void Graph::propertyEditor()
}

const float TEXT_BASE_HEIGHT = ImGui::GetTextLineHeightWithSpacing() * 1.3f;
const int SCROLL_LINE_COUNT= 20;
const int SCROLL_LINE_COUNT = 20;
ImGuiTableFlags tableFlags = ImGuiTableFlags_ScrollY | ImGuiTableFlags_Resizable | ImGuiTableFlags_NoSavedSettings |
ImGuiTableFlags_BordersOuterH | ImGuiTableFlags_NoBordersInBody;

Expand Down Expand Up @@ -3245,7 +3251,7 @@ void Graph::propertyEditor()
if (count)
{
bool haveTable = ImGui::BeginTable("inputs_input_table", 2, tableFlags,
ImVec2(0.0f, TEXT_BASE_HEIGHT * std::min(SCROLL_LINE_COUNT, count)));
ImVec2(0.0f, TEXT_BASE_HEIGHT * std::min(SCROLL_LINE_COUNT, count)));
if (haveTable)
{
ImGui::SetWindowFontScale(_fontScale);
Expand Down Expand Up @@ -3302,7 +3308,7 @@ void Graph::propertyEditor()
if (count)
{
bool haveTable = ImGui::BeginTable("inputs_nodegraph_table", 2, tableFlags,
ImVec2(0.0f, TEXT_BASE_HEIGHT * std::min(SCROLL_LINE_COUNT, count)));
ImVec2(0.0f, TEXT_BASE_HEIGHT * std::min(SCROLL_LINE_COUNT, count)));
if (haveTable)
{
ImGui::SetWindowFontScale(_fontScale);
Expand Down Expand Up @@ -3365,7 +3371,7 @@ void Graph::propertyEditor()
// Helper to display basic user controls.
void Graph::showHelp() const
{
ImGui::Text("MATERIALX GRAPH EDITOR HELP");
ImGui::Text("MATERIALX GRAPH EDITOR HELP");
if (ImGui::CollapsingHeader("Graph"))
{
if (ImGui::TreeNode("Navigation"))
Expand Down Expand Up @@ -3437,9 +3443,9 @@ void Graph::addNodePopup(bool cursor)
{
std::string str(it->second[i][0]);
std::string nodeName = it->second[i][0];
//allow spaces to be used to search for node names
// allow spaces to be used to search for node names
std::replace(subs.begin(), subs.end(), ' ', '_');

if (str.find(subs) != std::string::npos)
{
if (ImGui::MenuItem(getNodeDefId(nodeName).c_str()) || (ImGui::IsItemFocused() && ImGui::IsKeyPressedMap(ImGuiKey_Enter)))
Expand Down Expand Up @@ -3819,12 +3825,9 @@ void Graph::drawGraph(ImVec2 mousePos)

if (outputNum.size() == 0 && _graphNodes[0]->getMxElement())
{
if (_graphNodes[0]->getMxElement()->hasAttribute("xpos"))
for (UiNodePtr node : _graphNodes)
{
for (UiNodePtr node : _graphNodes)
{
layoutPosition(node, ImVec2(0, 0), true, 0);
}
layoutPosition(node, ImVec2(0, 0), true, 0);
}
}
}
Expand Down