Adapt for runtime path setting for the framework

Author: Madman10K

Framework/C/CDefines.h

@@ -32,36 +32,6 @@ extern "C"
 #define X11_WINDOW_TYPE_DND "_NET_WM_WINDOW_TYPE_DND"
 #define X11_WINDOW_TYPE_NORMAL "_NET_WM_WINDOW_TYPE_NORMAL"
 
-// Default defines for these directories. They will only be defined while compiling for production
-#ifndef UIMGUI_FRAMEWORK_LIBRARY_DIR
-    #define UIMGUI_FRAMEWORK_LIBRARY_DIR "."
-#endif
-
-#ifndef UIMGUI_APPLICATION_DIR
-    #define UIMGUI_APPLICATION_DIR "."
-#endif
-
-#ifndef UIMGUI_APPLICATION_LIBRARY_DIR
-    #define UIMGUI_APPLICATION_LIBRARY_DIR "."
-#endif
-
-#ifndef UIMGUI_CONFIG_DIR
-    #define UIMGUI_CONFIG_DIR "../Config/"
-    #define UIMGUI_PROJECT_DIR "../"
-#endif
-
-#ifndef UIMGUI_CONTENT_DIR
-    #define UIMGUI_CONTENT_DIR "../Content/"
-#endif
-
-#ifndef UIMGUI_FRAMEWORK_INCLUDE_DIR
-    #define UIMGUI_FRAMEWORK_INCLUDE_DIR "../Framework/"
-#endif
-
-#ifndef UIMGUI_APPLICATION_INCLUDE_DIR
-    #define UIMGUI_APPLICATION_INCLUDE_DIR "../Source/"
-#endif
-
 /**
  * @brief The ComponentState enum defines 3 fields that represent the event state of the given component, the given
  * component can then check its own state(if in PAUSED or RUNNING state) and call specific components of its event

Framework/C/Components/CInstance.cpp

@@ -2,17 +2,17 @@
 #include <Instance.hpp>
 #include <Global.hpp>
 
+#define INIT_INFO UImGui::internalGlobal.instance->initInfo
+
 void UImGui_Instance_setCInitInfo(UImGui_CInitInfo* initInfo)
 {
-    UImGui::internalGlobal.instance->initInfo.cInitInfo = initInfo;
+    INIT_INFO.cInitInfo = initInfo;
 }
 
 void* UImGui_Instance_getCppInitInfoGlobalData(bool* bAllocatedOnHeap)
 {
-    auto& initInfo = UImGui::internalGlobal.instance->initInfo;
-
-    *bAllocatedOnHeap = initInfo.bGlobalAllocatedOnHeap;
-    return initInfo.globalData;
+    *bAllocatedOnHeap = INIT_INFO.bGlobalAllocatedOnHeap;
+    return INIT_INFO.globalData;
 }
 
 char** UImGui_Instance_getCLIArguments(int* argc)
@@ -21,4 +21,44 @@ char** UImGui_Instance_getCLIArguments(int* argc)
     *argc = instance->argc;
 
     return instance->argv;
+}
+
+UImGui_String UImGui_InitInfo_getFrameworkLibraryDir()
+{
+    return INIT_INFO.frameworkLibraryDir.c_str();
+}
+
+UImGui_String UImGui_InitInfo_getApplicationDir()
+{
+    return INIT_INFO.applicationDir.c_str();
+}
+
+UImGui_String UImGui_InitInfo_getApplicationLibraryDir()
+{
+    return INIT_INFO.applicationLibraryDir.c_str();
+}
+
+UImGui_String UImGui_InitInfo_getConfigDir()
+{
+    return INIT_INFO.configDir.c_str();
+}
+
+UImGui_String UImGui_InitInfo_getProjectDir()
+{
+    return INIT_INFO.projectDir.c_str();
+}
+
+UImGui_String UImGui_InitInfo_getContentDir()
+{
+    return INIT_INFO.contentDir.c_str();
+}
+
+UImGui_String UImGui_InitInfo_getFrameworkIncludeDir()
+{
+    return INIT_INFO.frameworkIncludeDir.c_str();
+}
+
+UImGui_String UImGui_InitInfo_getApplicationIncludeDir()
+{
+    return INIT_INFO.applicationIncludeDir.c_str();
 }

Framework/C/Components/CInstance.h

@@ -49,6 +49,27 @@ extern "C"
 
     // Event Safety - Any time
     UIMGUI_PUBLIC_API char** UImGui_Instance_getCLIArguments(int* argc);
+
+    // Event Safety - Any time
+    UIMGUI_PUBLIC_API UImGui_String UImGui_InitInfo_getFrameworkLibraryDir();
+    // Event Safety - Any time
+    UIMGUI_PUBLIC_API UImGui_String UImGui_InitInfo_getApplicationDir();
+    // Event Safety - Any time
+    UIMGUI_PUBLIC_API UImGui_String UImGui_InitInfo_getApplicationLibraryDir();
+
+    // Event Safety - Any time
+    UIMGUI_PUBLIC_API UImGui_String UImGui_InitInfo_getConfigDir();
+    // Event Safety - Any time
+    UIMGUI_PUBLIC_API UImGui_String UImGui_InitInfo_getProjectDir();
+
+    // Event Safety - Any time
+    UIMGUI_PUBLIC_API UImGui_String UImGui_InitInfo_getContentDir();
+
+    // Event Safety - Any time
+    UIMGUI_PUBLIC_API UImGui_String UImGui_InitInfo_getFrameworkIncludeDir();
+    // Event Safety - Any time
+    UIMGUI_PUBLIC_API UImGui_String UImGui_InitInfo_getApplicationIncludeDir();
+
 #ifdef __cplusplus
 };
 #endif

Framework/Core/Components/Instance.hpp

@@ -32,6 +32,18 @@ namespace UImGui
         bool bGlobalAllocatedOnHeap = true; // Set this to false if the global is a stack pointer
 
         UImGui_CInitInfo* cInitInfo = nullptr;
+
+        FString frameworkLibraryDir = ".";
+        FString applicationDir = ".";
+        FString applicationLibraryDir = ".";
+
+        FString configDir = "../Config/";
+        FString projectDir = "../";
+
+        FString contentDir = "../Content/";
+
+        FString frameworkIncludeDir = "../Framework/";
+        FString applicationIncludeDir = "../Source/";
     };
 
     /**

Framework/Core/Global.cpp

@@ -24,6 +24,4 @@ UImGui::Global::~Global() noexcept
 void UImGui::Global::init() noexcept
 {
     window.createWindow();
-
-    modulesManagerr.init();
 }

Framework/Modules/Manager/ModulesManager.cpp

@@ -18,13 +18,16 @@
     Modules::data().x = mod[#x].as<bool>();         \
 }
 
+#include <Utilities.hpp>
+#include <Components/Instance.hpp>
 
-void UImGui::ModulesManager::init()
+
+void UImGui::ModulesManager::init(const FString& configDir)
 {
     YAML::Node node;
     try
     {
-        node = YAML::LoadFile(UIMGUI_CONFIG_DIR"Core/Modules.yaml");
+        node = YAML::LoadFile(configDir + "Core/Modules.yaml");
     }
     catch (YAML::BadFile&)
     {
@@ -35,7 +38,7 @@ void UImGui::ModulesManager::init()
     if (node["undo-max-transactions"])
         settings.maxTransactions = node["undo-max-transactions"].as<size_t>();
 
-    initModules();
+    initModules(UImGui_InitInfo_getProjectDir());
 
     // Put this one after we have initialized the locale module
 #ifdef UIMGUI_LOCALE_MODULE_ENABLED
@@ -44,7 +47,7 @@ void UImGui::ModulesManager::init()
 #endif
 }
 
-void UImGui::ModulesManager::save() const noexcept
+void UImGui::ModulesManager::save(const FString& configDir) const noexcept
 {
     YAML::Emitter out;
     out << YAML::BeginMap;
@@ -55,7 +58,7 @@ void UImGui::ModulesManager::save() const noexcept
 #endif
     out << YAML::EndMap;
 
-    std::ofstream fout(UIMGUI_CONFIG_DIR"Core/Modules.yaml");
+    std::ofstream fout(configDir + "Core/Modules.yaml");
     fout << out.c_str();
 }
 
@@ -66,20 +69,20 @@ UImGui::ModuleSettings& UImGui::Modules::data() noexcept
 
 void UImGui::Modules::save() noexcept
 {
-    Modules::get().save();
+    Modules::get().save(UImGui::Utility::getGlobal().instance->initInfo.configDir);
 }
 
 UImGui::ModulesManager& UImGui::Modules::get() noexcept
 {
     return internalGlobal.modulesManagerr;
 }
 
-void UImGui::ModulesManager::initModules()
+void UImGui::ModulesManager::initModules(const FString& projectDir)
 {
     YAML::Node node;
     try
     {
-        node = YAML::LoadFile(UIMGUI_PROJECT_DIR"uvproj.yaml");
+        node = YAML::LoadFile(projectDir + "uvproj.yaml");
     }
     catch (YAML::BadFile&)
     {

Framework/Modules/Manager/ModulesManager.hpp

@@ -50,6 +50,7 @@ namespace UImGui
     private:
         friend class Modules;
         friend class Global;
+        friend class RendererInternal;
 
         friend class Locale;
         friend class LocaleManager;
@@ -82,9 +83,9 @@ namespace UImGui
         StateTracker stateTracker{};
 #endif
 
-        void init();
-        void initModules();
-        void save() const noexcept;
+        void init(const FString& configDir);
+        void initModules(const FString& projectDir);
+        void save(const FString& configDir) const noexcept;
     };
 
     class UIMGUI_PUBLIC_API Modules

Framework/Renderer/ImGui/ImGui.cpp

@@ -59,7 +59,7 @@ void UImGui::GUIRenderer::shutdown(const FString& ini)
         }
     }
 
-    ImGui::SaveIniSettingsToDisk((UIMGUI_CONFIG_DIR"Core/" + ini + ".ini").c_str());
+    ImGui::SaveIniSettingsToDisk((UImGui::internalGlobal.instance->initInfo.configDir + "Core/" + ini + ".ini").c_str());
     ImGui_ImplOpenGL3_Shutdown();
     ImGui_ImplGlfw_Shutdown();
 #ifdef UIMGUI_PLOTTING_MODULE_ENABLED
@@ -84,7 +84,7 @@ void UImGui::GUIRenderer::init(GLFWwindow* glfwwindow, const FString& ini)
     io.ConfigViewportsNoTaskBarIcon = true;
     io.ConfigUseDefaultMouseCursors = true;
 
-    ImGui::LoadIniSettingsFromDisk((UIMGUI_CONFIG_DIR"Core/" + ini + ".ini").c_str());
+    ImGui::LoadIniSettingsFromDisk((UImGui::internalGlobal.instance->initInfo.configDir + "Core/" + ini + ".ini").c_str());
     ImGui::StyleColorsDark();
     ImGui::StyleColorsClassic();
     ImGuiStyle& style = ImGui::GetStyle();

Framework/Renderer/Renderer.cpp

@@ -9,6 +9,8 @@
 
 void UImGui::RendererInternal::start() noexcept
 {
+    loadConfig();
+
     // Normally we would just use the Renderer::get but since we assign a pointer here we need to avoid the SEGFAULT and
     // other madness the normal solution entails
     internalGlobal.renderer = this;
@@ -27,6 +29,7 @@ void UImGui::RendererInternal::start() noexcept
     gpuName = (char*)glGetString(GL_RENDERER);
 
     GUIRenderer::init(Window::get().windowMain, Window::get().windowData.layoutLocation);
+    UImGui::internalGlobal.modulesManagerr.init(UImGui::internalGlobal.instance->initInfo.configDir);
 
     double lastTime = 0.0f;
     while (!glfwWindowShouldClose(Window::get().windowMain))
@@ -64,7 +67,7 @@ void UImGui::RendererInternal::loadConfig()
     YAML::Node node;
     try
     {
-        node = YAML::LoadFile(UIMGUI_CONFIG_DIR"Core/Renderer.yaml");
+        node = YAML::LoadFile(UImGui::internalGlobal.instance->initInfo.configDir + "Core/Renderer.yaml");
     }
     catch (YAML::BadFile&)
     {
@@ -95,7 +98,7 @@ void UImGui::RendererInternal::saveConfig() const noexcept
     out << YAML::Key << "sample-rate-shading" << YAML::Value << data.bSampleRateShading;
     out << YAML::Key << "sample-rate-shading-mult" << YAML::Value << data.sampleRateShadingMult;
 
-    std::ofstream fout(UIMGUI_CONFIG_DIR"Core/Renderer.yaml");
+    std::ofstream fout(UImGui::internalGlobal.instance->initInfo.configDir + "Core/Renderer.yaml");
     fout << out.c_str();
     fout.close();
 }

Framework/Renderer/Renderer.hpp

@@ -15,7 +15,7 @@ namespace UImGui
         RendererInternal() = default;
 
         void start() noexcept;
-        void stop() noexcept;
+        static void stop() noexcept;
     private:
         friend class Renderer;
 

Framework/Renderer/Utils/Window.cpp

@@ -21,6 +21,8 @@
 #include <Interfaces/RendererInterface.hpp>
 #include <Interfaces/WindowInterface.hpp>
 
+#include <Components/Instance.hpp>
+
 #define _NET_WM_STATE_ADD 1
 
 UImGui::WindowInternal::WindowInternal() noexcept
@@ -42,7 +44,7 @@ bool& UImGui::WindowInternal::resized() noexcept
 
 void UImGui::WindowInternal::saveConfig(bool bSaveKeybindings) noexcept
 {
-    std::ofstream fout(UIMGUI_CONFIG_DIR"Core/Window.yaml");
+    std::ofstream fout(UImGui::internalGlobal.instance->initInfo.configDir + "Core/Window.yaml");
     {
         YAML::Emitter out;
         out << YAML::BeginMap;
@@ -86,7 +88,7 @@ void UImGui::WindowInternal::saveConfig(bool bSaveKeybindings) noexcept
         }
         out << YAML::EndSeq << YAML::EndMap;
 
-        fout = std::ofstream(UIMGUI_CONFIG_DIR"Core/Keybindings.yaml");
+        fout = std::ofstream(UImGui::internalGlobal.instance->initInfo.configDir + "Core/Keybindings.yaml");
         fout << out.c_str();
         fout.close();
     }
@@ -299,7 +301,7 @@ void UImGui::WindowInternal::openConfig()
 
     try
     {
-        out = YAML::LoadFile(UIMGUI_CONFIG_DIR"Core/Window.yaml");
+        out = YAML::LoadFile(UImGui::internalGlobal.instance->initInfo.configDir + "Core/Window.yaml");
     }
     catch (YAML::BadFile&)
     {
@@ -329,7 +331,7 @@ void UImGui::WindowInternal::openConfig()
 
     try
     {
-        out = YAML::LoadFile(UIMGUI_CONFIG_DIR"Core/Keybindings.yaml");
+        out = YAML::LoadFile(UImGui::internalGlobal.instance->initInfo.configDir + "Core/Keybindings.yaml");
     }
     catch (YAML::BadFile&)
     {
@@ -373,7 +375,7 @@ finish_inner_loop:;
 void UImGui::WindowInternal::setIcon(UImGui::String name) noexcept
 {
     GLFWimage images[1];
-    images[0].pixels = stbi_load((UImGui::FString(UIMGUI_CONTENT_DIR) + name).c_str(), &images[0].width, &images[0].height, nullptr, 4);
+    images[0].pixels = stbi_load((UImGui::internalGlobal.instance->initInfo.contentDir + name).c_str(), &images[0].width, &images[0].height, nullptr, 4);
     glfwSetWindowIcon(windowMain, 1, images);
     stbi_image_free(images[0].pixels);
 }