100 add layout menu to create preset editor layouts

Source/Core/Editor/CMakeLists.txt

@@ -38,6 +38,7 @@ target_link_libraries(VisualEditor
     ERS_Editor_UserProfileManager
     ERS_Editor_3DCursor
     ERS_Editor_WindowManager
+    ERS_Editor_LayoutManager
 
     ERS_SceneManager
 

Source/Core/Editor/GUI.cpp

@@ -42,13 +42,16 @@ GUISystem::GUISystem(ERS_STRUCT_SystemUtils* SystemUtils, GLFWwindow* Window, Cu
     WindowManager_ = std::make_unique<ERS_CLASS_WindowManager>(SystemUtils_);
     WindowManager_->GenerateWindowStruct(ProjectUtils_, HIDUtils_, VisualRenderer_, ThemeManager_.get(), FontManager_.get(), Cursors3D_, SceneManager_);
 
+
+    LayoutManager_ = std::make_unique<ERS_CLASS_LayoutManager>(SystemUtils, WindowManager_.get());
+
 
     // Initialize Windows
     SystemUtils_->Logger_->Log("Initializing Editor Menus", 5);
     Menu_File_ = std::make_unique<GUI_Menu_File>(SystemUtils_, SceneManager_, ProjectUtils_, WindowManager_->GetWindowsStruct());
     Menu_Window_ = std::make_unique<GUI_Menu_Window>(SystemUtils_, WindowManager_->GetWindowsStruct(), VisualRenderer_);
     Menu_Debug_ = std::make_unique<GUI_Menu_Debug>(SystemUtils_, WindowManager_->GetWindowsStruct(), WindowManager_.get());
-    Menu_Settings_ = std::make_unique<GUI_Menu_Settings>(SystemUtils_, HIDUtils_, WindowManager_->GetWindowsStruct());
+    Menu_Settings_ = std::make_unique<GUI_Menu_Settings>(SystemUtils_, HIDUtils_, WindowManager_->GetWindowsStruct(), LayoutManager_.get());
 
     // Disable Dragging Except By Title Bar
     ImGuiIO& IO = ImGui::GetIO();
@@ -107,6 +110,7 @@ void GUISystem::UpdateGUI() {
     ImGui::EndMainMenuBar();
     }
 
+
     // Updates all the windows, draws their content if enabled
     WindowManager_->UpdateAllWindows();
 

Source/Core/Editor/GUI.h

@@ -32,6 +32,7 @@
 #include <ERS_Editor_UserProfileManager.h>
 #include <ERS_Editor_3DCursor.h>
 #include <ERS_Editor_WindowManager.h>
+#include <ERS_Editor_LayoutManager.h>
 
 #include <ERS_SceneManager.h>
 
@@ -63,7 +64,9 @@ class GUISystem {
 
     std::unique_ptr<ERS_CLASS_FontManager>        FontManager_;        /**<Pointer To FontManager Instance*/
     std::unique_ptr<ERS_CLASS_UserProfileManager> UserProfileManager_; /**<Pointer To User Profile Manager Instance*/
+    std::unique_ptr<ERS_CLASS_LayoutManager>      LayoutManager_;      /**<Instance of the layout manager class*/
     std::unique_ptr<ERS_CLASS_WindowManager>      WindowManager_;      /**<Class owning all gui windows*/
+
 
 public:
 

Source/Core/Editor/Menus/GUI_Menu_Settings/CMakeLists.txt

@@ -27,6 +27,7 @@ target_link_libraries(Menu_Settings
     ERS_STRUCT_ProjectUtils
 
     ERS_Editor_WindowManager
+    ERS_Editor_LayoutManager
 
     GUI_Window_ControllerSettings
 

Source/Core/Editor/Menus/GUI_Menu_Settings/GUI_Menu_Settings.cpp

@@ -5,11 +5,12 @@
 #include <GUI_Menu_Settings.h>
 
 
-GUI_Menu_Settings::GUI_Menu_Settings(ERS_STRUCT_SystemUtils* SystemUtils, ERS_STRUCT_HumanInputDeviceUtils* HIDUtils, ERS_STRUCT_Windows* Windows) {
+GUI_Menu_Settings::GUI_Menu_Settings(ERS_STRUCT_SystemUtils* SystemUtils, ERS_STRUCT_HumanInputDeviceUtils* HIDUtils, ERS_STRUCT_Windows* Windows, ERS_CLASS_LayoutManager* LayoutManager) {
 
     SystemUtils_ = SystemUtils;
     HIDUtils_ = HIDUtils;
     Windows_ = Windows;
+    LayoutManager_ = LayoutManager;
 
     SystemUtils_->Logger_->Log("Editor Setting Up Settings Menu", 4);
 
@@ -28,10 +29,54 @@ void GUI_Menu_Settings::Draw() {
     // File Menu
     if (ImGui::BeginMenu("Settings")) {
 
+
+
+
+
         // Interface Config
         ImGui::MenuItem("Color Theme", "", &Windows_->GUI_Window_ThemeSelector_->Enabled_);
         ImGui::MenuItem("System Font", "", &Windows_->GUI_Window_FontSelector_->Enabled_);
 
+
+
+        // Layout Menu
+        ImGui::Separator();
+        if (ImGui::BeginMenu("Editor Layout")) {
+
+
+            // Create Submenu with layouts which the user can select from
+            if (ImGui::BeginMenu("Select Layouts")) {
+
+                std::string ActiveLayoutName = LayoutManager_->GetActiveLayoutName();
+                std::vector<std::string> LayoutNames = LayoutManager_->GetLayoutNames();
+                for (unsigned int i = 0; i < LayoutNames.size(); i++) {
+                    if (ImGui::Selectable(LayoutNames[i].c_str(), (LayoutNames[i] == ActiveLayoutName))) {
+                        LayoutManager_->ApplyLayout(LayoutNames[i]);
+                    }
+                }
+
+            ImGui::EndMenu();
+            }
+
+            // Normal buttons that the user can select
+            if (ImGui::MenuItem("Save Active Layout")) {
+                std::string ActiveLayoutName = LayoutManager_->GetActiveLayoutName();
+                LayoutManager_->SaveLayout(ActiveLayoutName);
+            }
+
+            if (ImGui::MenuItem("Create New Layout")) {
+                LayoutManager_->CreateLayout(std::string("Untitled Layout"));
+            }
+
+            if (ImGui::MenuItem("Rename Active Layout")) {
+                // Todo later - not part of layout manager
+            }
+
+
+        ImGui::EndMenu();
+        }
+
+
         ImGui::Separator();
         if (ImGui::BeginMenu("Editor Settings")) {
             ImGui::MenuItem("Editor Camera Settings", "", &Windows_->GUI_Window_EditorCameraSettings_->Enabled_);
@@ -46,6 +91,8 @@ void GUI_Menu_Settings::Draw() {
         }
 
         ImGui::Separator();
+
+        // Controller Settings
         if (ImGui::BeginMenu("Game Controllers")) {
 
             // Refresh

Source/Core/Editor/Menus/GUI_Menu_Settings/GUI_Menu_Settings.h

@@ -21,6 +21,7 @@
 #include <ERS_STRUCT_ProjectUtils.h>
 #include <ERS_STRUCT_Windows.h>
 
+#include <ERS_Editor_LayoutManager.h>
 
 #include <GUI_Window_ControllerSettings.h>
 
@@ -33,11 +34,10 @@ class GUI_Menu_Settings {
 
 private:
 
-    ERS_STRUCT_SystemUtils*           SystemUtils_ = nullptr; /**<SystemUtils Instance, Used To Get Systems From Other Classes*/
-    ERS_STRUCT_HumanInputDeviceUtils* HIDUtils_    = nullptr; /**<HID Utils Pointer*/
-    ERS_STRUCT_Windows*               Windows_     = nullptr; /**<Struct Containing the system's windows*/
-
-
+    ERS_STRUCT_SystemUtils*           SystemUtils_   = nullptr; /**<SystemUtils Instance, Used To Get Systems From Other Classes*/
+    ERS_STRUCT_HumanInputDeviceUtils* HIDUtils_      = nullptr; /**<HID Utils Pointer*/
+    ERS_STRUCT_Windows*               Windows_       = nullptr; /**<Struct Containing the system's windows*/
+    ERS_CLASS_LayoutManager*          LayoutManager_;           /**<Pointer to layout manager*/
 
 public:
 
@@ -47,7 +47,7 @@ class GUI_Menu_Settings {
      * 
      * @param SystemUtils 
      */
-    GUI_Menu_Settings(ERS_STRUCT_SystemUtils* SystemUtils, ERS_STRUCT_HumanInputDeviceUtils* HIDUtils, ERS_STRUCT_Windows* Windows);
+    GUI_Menu_Settings(ERS_STRUCT_SystemUtils* SystemUtils, ERS_STRUCT_HumanInputDeviceUtils* HIDUtils, ERS_STRUCT_Windows* Windows, ERS_CLASS_LayoutManager* LayoutManager);
 
 
     /**

Source/Core/Editor/Utils/ERS_Editor_LayoutManager/CMakeLists.txt

@@ -24,6 +24,9 @@ target_link_libraries(ERS_Editor_LayoutManager
 
 # Link Internal Libs
 target_link_libraries(ERS_Editor_LayoutManager
+    ERS_STRUCT_SystemUtils
+
+    ERS_Editor_WindowManager
     ERS_CLASS_LoggingSystem
     )
 

Source/Core/Editor/Utils/ERS_Editor_LayoutManager/ERS_Editor_LayoutManager.cpp

@@ -3,17 +3,19 @@
 //======================================================================//
 
 #include <ERS_Editor_LayoutManager.h>
-#include <filesystem>
-#include <imgui.h>
-#include <fstream>
 
-ERS_CLASS_LayoutManager::ERS_CLASS_LayoutManager(ERS_CLASS_LoggingSystem* Logger, const char* LayoutDirectory) {
 
-    Logger_ = Logger;
+ERS_CLASS_LayoutManager::ERS_CLASS_LayoutManager(ERS_STRUCT_SystemUtils* SystemUtils, ERS_CLASS_WindowManager* WindowManager, const char* LayoutDirectory) {
+
+    SystemUtils_ = SystemUtils;
+    Logger_ = SystemUtils_->Logger_.get();
     LayoutDirectory_ = LayoutDirectory;
+    WindowManager_ = WindowManager;
     Logger_->Log("Initializing Layout Manager", 5);
 
- }
+    LoadLayouts();
+
+}
 
 
 ERS_CLASS_LayoutManager::~ERS_CLASS_LayoutManager() {
@@ -32,7 +34,7 @@ void ERS_CLASS_LayoutManager::LoadLayouts() {
 
         // Load YAML::Node
         YAML::Node LayoutNode = YAML::LoadFile(FilePath.c_str());
-        
+
         // Build Temp Layout
         ERS_STRUCT_EditorLayout Layout;
         Layout.index = Index;
@@ -47,6 +49,18 @@ void ERS_CLASS_LayoutManager::LoadLayouts() {
         IniStr = LayoutNode["ImGuiIni"].as<std::string>();
         Layout.IniString = IniStr;
 
+        // Load the Window names and status
+        std::vector<std::string> WindowNames = WindowManager_->GetWindowNames();
+
+        for (auto i : WindowNames) {
+            if (LayoutNode[i].as<std::string>() == "False") {
+                Layout.WindowNameStatus.insert(std::make_pair(i, false));
+            }
+            else {
+                Layout.WindowNameStatus.insert(std::make_pair(i, true));
+            }
+        }
+
         // Add To Names and Layouts Vector
         LayoutNames_.push_back(LayoutName);
         Layouts_.push_back(Layout);
@@ -84,6 +98,19 @@ void ERS_CLASS_LayoutManager::SaveLayout(std::string LayoutName) {
     Layout["ImGuiIni"] = IniStr;
     Layout["DisplayName"] = LayoutName;
 
+    // Load the Window names and status
+    std::vector<std::string> WindowNames = WindowManager_->GetWindowNames();
+
+    for (auto i : WindowNames) {
+        bool status;
+        if (WindowManager_->GetWindowStatus(i, &status)) {
+            Layout[i] = "True";
+        }
+        else {
+            Layout[i] = "False";
+        }
+    }
+
     // Export the YAML string
     YAML::Emitter LayoutYAML;
     LayoutYAML << YAML::BeginMap;
@@ -99,11 +126,17 @@ void ERS_CLASS_LayoutManager::SaveLayout(std::string LayoutName) {
     // Write the string into a YAML file in the directory
     std::ofstream file(std::string(LayoutDirectory_) + "/" + LayoutName + ".yaml");
 
-    if (!file.fail())
+    if (!file.fail()) {
         file << YAMLstring;
+    } else {
+        Logger_->Log("Failed To Open File, Is Layout Directory Valid?", 8);
+    }
 
     file.close();
 
+    // Update Active Layout String
+    ActiveLayoutName_ = LayoutName;
+
 }
 
 void ERS_CLASS_LayoutManager::ApplyLayout(std::string LayoutName) {
@@ -136,4 +169,26 @@ void ERS_CLASS_LayoutManager::ApplyLayout(int LayoutID) {
 
     ImGui::LoadIniSettingsFromMemory(Layout.IniString.c_str());
 
+    for (auto i : Layout.WindowNameStatus) {
+        WindowManager_->SetWindowStatus(i.first, i.second);
+    }
+}
+
+
+std::string ERS_CLASS_LayoutManager::GetActiveLayoutName() {
+    return ActiveLayoutName_;
 }
+
+
+std::vector<std::string> ERS_CLASS_LayoutManager::GetLayoutNames() {
+    return LayoutNames_;
+}
+
+void ERS_CLASS_LayoutManager::CreateLayout(std::string Name) {
+
+    // Add Name To Layouts List
+    LayoutNames_.push_back(Name);
+
+    // Save Layout
+    SaveLayout(Name);
+}