Merge pull request #239 from carboncopies/238-move-ers-gui-widget-to-…

…window-directory

238 move ers gui widget to window directory

CMakeLists.txt

@@ -66,9 +66,8 @@ add_subdirectory(${SRC_DIR}/Core/Editor/Utils/ERS_Editor_ThemeManager)
 add_subdirectory(${SRC_DIR}/Core/Editor/Utils/ERS_Editor_FontManager)
 add_subdirectory(${SRC_DIR}/Core/Editor/Utils/ERS_Editor_UserProfileManager)
 add_subdirectory(${SRC_DIR}/Core/Editor/Utils/ERS_Editor_3DCursor)
-add_subdirectory(${SRC_DIR}/Core/Editor/Widgets)
 add_subdirectory(${SRC_DIR}/Core/Editor/Windows)
-add_subdirectory(${SRC_DIR}/Core/Editor/MenuEntries)
+add_subdirectory(${SRC_DIR}/Core/Editor/Menus)
 
 add_subdirectory(${SRC_DIR}/Core/Renderer/ERS_CLASS_RendererManager)
 add_subdirectory(${SRC_DIR}/Core/Renderer/ERS_CLASS_VisualRenderer)

Source/Core/Editor/MenuEntries/GUI_Menu_Debug/CMakeLists.txt → Source/Core/Editor/Menus/GUI_Menu_Debug/CMakeLists.txt

@@ -28,7 +28,7 @@ target_link_libraries(Menu_Debug
 # Link Internal Libs
 target_link_libraries(Menu_Debug
 
-    Window_TestEditor
+    GUI_Window_TestEditor
 
     ERS_STRUCT_SystemUtils
     )

Source/Core/Editor/MenuEntries/GUI_Menu_Debug/GUI_Menu_Debug.cpp → Source/Core/Editor/Menus/GUI_Menu_Debug/GUI_Menu_Debug.cpp

@@ -16,7 +16,7 @@ GUI_Menu_Debug::GUI_Menu_Debug(ERS_STRUCT_SystemUtils* SystemUtils) {
 
     // Setup Window Instances
     SystemUtils_->Logger_->Log("Initialiizng Debug Menu Window Instances", 5);
-    TestEditor_ = std::make_unique<Window_TestEditor>(SystemUtils_);
+    TestEditor_ = std::make_unique<GUI_Window_TestEditor>(SystemUtils_);
 
     // Setup OpenGL Debug Submenu
     ERS_CLASS_OpenGLDebug_ = std::make_unique<ERS_CLASS_OpenGLDebug>(SystemUtils_);

Source/Core/Editor/MenuEntries/GUI_Menu_Debug/GUI_Menu_Debug.h → Source/Core/Editor/Menus/GUI_Menu_Debug/GUI_Menu_Debug.h

@@ -37,7 +37,7 @@ class GUI_Menu_Debug {
 
     ERS_STRUCT_SystemUtils* SystemUtils_; /**<SystemUtils Instance, Used To Get Systems From Other Classes*/
     std::unique_ptr<ERS_CLASS_OpenGLDebug> ERS_CLASS_OpenGLDebug_; /**<Class used to draw the opengl debug menu into the main debug menu*/
-    std::unique_ptr<Window_TestEditor> TestEditor_; /**<GUI Window Test Editor Instance*/
+    std::unique_ptr<GUI_Window_TestEditor> TestEditor_; /**<GUI Window Test Editor Instance*/
 
     bool ShowImGuiDemoWindow_ = false; /**<Show/hide ImGui DemoWindow*/
     bool DebugMenuEnabled_ = false; /**Enable/Disable Debug Menu*/

Source/Core/Editor/MenuEntries/GUI_Menu_File/CMakeLists.txt → Source/Core/Editor/Menus/GUI_Menu_File/CMakeLists.txt

@@ -39,8 +39,8 @@ target_link_libraries(Menu_File
     ERS_SceneManager
     ERS_STRUCT_Scene
 
-    Window_ProjectSettings
-    Window_ShaderEditor
+    GUI_Window_ProjectSettings
+    GUI_Window_ShaderEditor
     ERS_CLASS_VisualRenderer
     )
 

Source/Core/Editor/MenuEntries/GUI_Menu_File/GUI_Menu_File.cpp → Source/Core/Editor/Menus/GUI_Menu_File/GUI_Menu_File.cpp

@@ -15,8 +15,8 @@ GUI_Menu_File::GUI_Menu_File(ERS_STRUCT_SystemUtils* SystemUtils, ERS_CLASS_Scen
 
     SceneWriter_ = std::make_unique<SceneWriter>(SystemUtils_);
     ImportAsset_ = std::make_unique<GUI_ImportAsset>(SystemUtils_);
-    ShaderEditor_ = std::make_unique<Window_ShaderEditor>(SystemUtils_, ProjectUtils_, VisualRenderer_);
-    Window_ProjectSettings_ = std::make_unique<Window_ProjectSettings>(ProjectUtils, SystemUtils);
+    ShaderEditor_ = std::make_unique<GUI_Window_ShaderEditor>(SystemUtils_, ProjectUtils_, VisualRenderer_);
+    GUI_Window_ProjectSettings_ = std::make_unique<GUI_Window_ProjectSettings>(ProjectUtils, SystemUtils);
 
 }
 
@@ -36,7 +36,7 @@ void GUI_Menu_File::Draw() {
             ProjectUtils_->ProjectManager_->WriteProject(1);
         }
         if (ImGui::MenuItem("Project Settings")) {
-            Window_ProjectSettings_->Enabled_ = !Window_ProjectSettings_->Enabled_;
+            GUI_Window_ProjectSettings_->Enabled_ = !GUI_Window_ProjectSettings_->Enabled_;
         }
         ImGui::Separator();
 
@@ -82,7 +82,7 @@ void GUI_Menu_File::Draw() {
 
     // Draw Subwindows
     ImportAsset_->Draw();
-    Window_ProjectSettings_->Draw();
+    GUI_Window_ProjectSettings_->Draw();
     ShaderEditor_->Draw();
 
 

Source/Core/Editor/MenuEntries/GUI_Menu_File/GUI_Menu_File.h → Source/Core/Editor/Menus/GUI_Menu_File/GUI_Menu_File.h

@@ -48,9 +48,9 @@ class GUI_Menu_File {
     std::unique_ptr<SceneWriter> SceneWriter_; /**<Scene Writer Instance Pointer*/
     ERS_CLASS_SceneManager* SceneManager_; /**<Scene Manager Instance Pointer*/
     std::unique_ptr<GUI_ImportAsset> ImportAsset_; /**<Pointer To Asset Importer System*/
-    std::unique_ptr<Window_ProjectSettings> Window_ProjectSettings_; /**<Project Settings Window*/
+    std::unique_ptr<GUI_Window_ProjectSettings> GUI_Window_ProjectSettings_; /**<Project Settings Window*/
     ERS_STRUCT_ProjectUtils* ProjectUtils_; /**<Pointer To Project Utils Instance*/
-    std::unique_ptr<Window_ShaderEditor> ShaderEditor_; /**<Pointer To Shader Editor Window Instance*/
+    std::unique_ptr<GUI_Window_ShaderEditor> ShaderEditor_; /**<Pointer To Shader Editor Window Instance*/
 
 
 public:

Source/Core/Editor/MenuEntries/GUI_Menu_File/Utils/Import_Asset/CMakeLists.txt → Source/Core/Editor/Menus/GUI_Menu_File/Utils/Import_Asset/CMakeLists.txt

@@ -33,7 +33,7 @@ target_link_libraries(ERS_Editor_ImportAsset
     ERS_CLASS_LoggingSystem
 
     ERS_STRUCT_SystemUtils
-    Window_ImportProgressBar
+    GUI_Window_ImportProgressBar
     )
 
 target_include_directories(ERS_Editor_ImportAsset PUBLIC ./)

Source/Core/Editor/MenuEntries/GUI_Menu_File/Utils/Import_Asset/GUI_ImportAsset.cpp → Source/Core/Editor/Menus/GUI_Menu_File/Utils/Import_Asset/GUI_ImportAsset.cpp

@@ -10,7 +10,7 @@ GUI_ImportAsset::GUI_ImportAsset(ERS_STRUCT_SystemUtils* SystemUtils) {
     SystemUtils_ = SystemUtils;
     SystemUtils_->Logger_->Log("Initializing Asset Importer GUI", 5);
 
-    Window_ImportProgressBar_ = std::make_unique<Window_ImportProgressBar>(SystemUtils_);
+    GUI_Window_ImportProgressBar_ = std::make_unique<GUI_Window_ImportProgressBar>(SystemUtils_);
     AssetImportBackend_ = std::make_unique<ERS_CLASS_ImportAsset>(SystemUtils_);
 
 }
@@ -40,7 +40,7 @@ void GUI_ImportAsset::Draw() {
 
             // Add To Queue, Launch Import
             AssetImportBackend_->AddToImportQueue(FilePaths);
-            Window_ImportProgressBar_->Enabled_ = true;
+            GUI_Window_ImportProgressBar_->Enabled_ = true;
 
         }
 
@@ -49,12 +49,12 @@ void GUI_ImportAsset::Draw() {
 
 
     // Update Window Stats
-    if (Window_ImportProgressBar_->Enabled_) {
-        Window_ImportProgressBar_->UpdateTotalItems(AssetImportBackend_->GetTotalItemsImported(), AssetImportBackend_->GetTotalItemsToImport());
-        Window_ImportProgressBar_->UpdateJobState(AssetImportBackend_->HasJobFinished());
+    if (GUI_Window_ImportProgressBar_->Enabled_) {
+        GUI_Window_ImportProgressBar_->UpdateTotalItems(AssetImportBackend_->GetTotalItemsImported(), AssetImportBackend_->GetTotalItemsToImport());
+        GUI_Window_ImportProgressBar_->UpdateJobState(AssetImportBackend_->HasJobFinished());
     }
 
-    Window_ImportProgressBar_->Draw();
+    GUI_Window_ImportProgressBar_->Draw();
 
 
 }

Source/Core/Editor/MenuEntries/GUI_Menu_File/Utils/Import_Asset/GUI_ImportAsset.h → Source/Core/Editor/Menus/GUI_Menu_File/Utils/Import_Asset/GUI_ImportAsset.h

@@ -30,7 +30,7 @@ class GUI_ImportAsset {
 private:
 
     ERS_STRUCT_SystemUtils* SystemUtils_; /**<used to get access to system utilites like IOmanager, logger, etc.*/
-    std::unique_ptr<Window_ImportProgressBar> Window_ImportProgressBar_; /**<Pointer To Window Import Progres Bar*/
+    std::unique_ptr<GUI_Window_ImportProgressBar> GUI_Window_ImportProgressBar_; /**<Pointer To Window Import Progres Bar*/
     std::unique_ptr<ERS_CLASS_ImportAsset> AssetImportBackend_; /**<Backend used to handle actual importing, threads, etc.*/
 
 public:

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

@@ -28,7 +28,7 @@ target_link_libraries(Menu_Settings
     ERS_STRUCT_HumanInputDeviceUtils
     ERS_STRUCT_ProjectUtils
 
-    Window_ControllerSettings
+    GUI_Window_ControllerSettings
 
     )
 

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

@@ -12,7 +12,7 @@ GUI_Menu_Settings::GUI_Menu_Settings(ERS_STRUCT_SystemUtils* SystemUtils, ERS_ST
     ProjectUtils_ = ProjectUtils;
     SystemUtils_->Logger_->Log("Editor Setting Up Settings Menu", 4);
 
-    Window_ControllerSettings_ = std::make_unique<Window_ControllerSettings>(SystemUtils_, HIDUtils_, ProjectUtils_);
+    GUI_Window_ControllerSettings_ = std::make_unique<GUI_Window_ControllerSettings>(SystemUtils_, HIDUtils_, ProjectUtils_);
 
 }
 
@@ -37,7 +37,7 @@ void GUI_Menu_Settings::Draw() {
 
             // Open Settings MEnu
             if (ImGui::MenuItem("Game Controller Settings")) {
-                Window_ControllerSettings_->Enabled_ = !Window_ControllerSettings_->Enabled_;
+                GUI_Window_ControllerSettings_->Enabled_ = !GUI_Window_ControllerSettings_->Enabled_;
             }
 
         ImGui::EndMenu();
@@ -49,6 +49,6 @@ void GUI_Menu_Settings::Draw() {
 
 
     // Draw Subwindows
-    Window_ControllerSettings_->Draw();
+    GUI_Window_ControllerSettings_->Draw();
 
 }

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

@@ -36,7 +36,7 @@ class GUI_Menu_Settings {
     ERS_STRUCT_ProjectUtils* ProjectUtils_; /**<Project Utils Structure*/
 
 
-    std::unique_ptr<Window_ControllerSettings> Window_ControllerSettings_; /**<ERS GUI Window*/
+    std::unique_ptr<GUI_Window_ControllerSettings> GUI_Window_ControllerSettings_; /**<ERS GUI Window*/
 
 
 public:

Source/Core/Editor/MenuEntries/GUI_Menu_View/CMakeLists.txt → Source/Core/Editor/Menus/GUI_Menu_View/CMakeLists.txt

@@ -31,9 +31,9 @@ target_link_libraries(Menu_View
     ERS_Editor_ThemeManager
     ERS_Editor_FontManager
 
-    Window_About
+    GUI_Window_About
 
-    Window_ThemeSelector
+    GUI_Window_ThemeSelector
     )
 
 target_include_directories(Menu_View PUBLIC ./)

Source/Core/Editor/MenuEntries/GUI_Menu_View/GUI_Menu_View.cpp → Source/Core/Editor/Menus/GUI_Menu_View/GUI_Menu_View.cpp

@@ -12,8 +12,8 @@ GUI_Menu_View::GUI_Menu_View(ERS_STRUCT_SystemUtils* SystemUtils, ERS_CLASS_Them
     FontManager_ = FontManager;
     SystemUtils_->Logger_->Log("Editor Setting Up View Menu", 4);
 
-    Window_ThemeSelector_ = std::make_unique<Window_ThemeSelector>(ThemeManager_); 
-    Window_About_ = std::make_unique<Window_About>(SystemUtils_);
+    GUI_Window_ThemeSelector_ = std::make_unique<GUI_Window_ThemeSelector>(ThemeManager_); 
+    GUI_GUI_Window_About_ = std::make_unique<GUI_Window_About>(SystemUtils_);
 
 
 }
@@ -31,7 +31,7 @@ void GUI_Menu_View::Draw() {
 
 
         if (ImGui::MenuItem("Color Theme")) {
-            Window_ThemeSelector_->Enabled_ = true;
+            GUI_Window_ThemeSelector_->Enabled_ = true;
         }
 
         if (ImGui::MenuItem("System Font")) {
@@ -41,7 +41,7 @@ void GUI_Menu_View::Draw() {
         ImGui::Separator();
 
         if (ImGui::MenuItem("About")) {
-            Window_About_->Enabled_ = true;
+            GUI_GUI_Window_About_->Enabled_ = true;
         }
 
 
@@ -50,8 +50,8 @@ void GUI_Menu_View::Draw() {
 
 
     // Draw Windows
-    Window_ThemeSelector_->Draw();
-    Window_About_->Draw();
+    GUI_Window_ThemeSelector_->Draw();
+    GUI_GUI_Window_About_->Draw();
     FontManager_->FontSelectorWindow(&ShowFontPicker_);
 
 }

Source/Core/Editor/MenuEntries/GUI_Menu_View/GUI_Menu_View.h → Source/Core/Editor/Menus/GUI_Menu_View/GUI_Menu_View.h

@@ -38,9 +38,9 @@ class GUI_Menu_View {
 
     ERS_STRUCT_SystemUtils* SystemUtils_; /**<SystemUtils Instance, Used To Get Systems From Other Classes*/
     ERS_CLASS_ThemeManager* ThemeManager_; /**<Theme Manager Instance Ptr*/
-    std::unique_ptr<Window_ThemeSelector> Window_ThemeSelector_; /**<Theme Selector Window*/
+    std::unique_ptr<GUI_Window_ThemeSelector> GUI_Window_ThemeSelector_; /**<Theme Selector Window*/
     ERS_CLASS_FontManager* FontManager_; /**<Pointer To FontManager Instance*/
-    std::unique_ptr<Window_About> Window_About_; /**<Pointer to about window*/
+    std::unique_ptr<GUI_Window_About> GUI_GUI_Window_About_; /**<Pointer to about window*/
 
     // Window Show/Hide Vars
     bool ShowFontPicker_ = false; /**<Control Varaible to show/hide font picker window*/