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

Stop Graph Editor from creating imgui.ini file #1570

Merged
merged 4 commits into from
Oct 14, 2023
Merged

Stop Graph Editor from creating imgui.ini file #1570

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b7055d
Stop creation of imgui.ini after saving material after saving then cl…
iukpo-lucasfilm Oct 13, 2023
3548573
Merge branch 'main' into Issue_1471
jstone-lucasfilm Oct 13, 2023
4efd559
Removed getConfigPath() function.
iukpo-lucasfilm Oct 14, 2023
ac810c9
Merge branch 'Issue_1471' of https://github.com/iukpo-lucasfilm/Mater…
iukpo-lucasfilm Oct 14, 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
51 changes: 7 additions & 44 deletions source/MaterialXGraphEditor/Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,44 +23,6 @@ static void errorCallback(int error, const char* description)
fprintf(stderr, "Glfw Error %d: %s\n", error, description);
}

mx::FilePath getConfigPath()
{
mx::FilePath configPath;
auto xdgConfigHome = mx::getEnviron("XDG_CONFIG_HOME");
auto homeDirectory = mx::getEnviron("HOME");
if (!xdgConfigHome.empty())
{
configPath = mx::FilePath(xdgConfigHome);
}
else if (!homeDirectory.empty())
{
#if defined(__APPLE__)
configPath = mx::FilePath(homeDirectory) / "Library" / "Preferences";
#else
configPath = mx::FilePath(homeDirectory) / ".config";
if (!configPath.exists())
{
configPath.createDirectory();
}
#endif
}
else
{
return {};
}

configPath = configPath / "MaterialX";
configPath.createDirectory();

if (!configPath.exists())
{
std::cerr << "Failed to create MaterialX config directory at " << configPath.asString() << std::endl;
return {};
}

return configPath / "GraphEditor.imgui.ini";
}

const std::string options =
" Options: \n"
" --material [FILENAME] Specify the filename of the MTLX document to be displayed in the graph editor\n"
Expand Down Expand Up @@ -197,13 +159,14 @@ int main(int argc, char* const argv[])
IMGUI_CHECKVERSION();
ImGui::CreateContext();
ImGuiIO& io = ImGui::GetIO();
io.Fonts->AddFontDefault();

mx::FilePath configPath = getConfigPath();
if (!configPath.isEmpty())
{
io.IniFilename = configPath.asString().c_str();
}
// Set ini and log filename to NULL. This will prevent the automatic creation of imgui.ini
// in the same folder as the saved material.
// TODO: Consider setting the ini and log file paths to an application directory.
io.IniFilename = NULL;
io.LogFilename = NULL;

io.Fonts->AddFontDefault();

// Setup Dear ImGui style
ImGui::StyleColorsDark();
Expand Down