Merge branch 'master' of https://github.com/carboncopies/BrainGenix-ERS

carboncopies · Jun 30, 2022 · af6adb0 · af6adb0
2 parents 21ea0d5 + 1e52db7
commit af6adb0
Show file tree

Hide file tree

Showing 107 changed files with 713 additions and 621 deletions.
diff --git a/CMakeLists.txt b/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)

diff --git a/Source/Core/Editor/CMakeLists.txt b/Source/Core/Editor/CMakeLists.txt
@@ -38,6 +38,8 @@ target_link_libraries(VisualEditor
     ERS_Editor_UserProfileManager
     ERS_Editor_3DCursor
 
+    ERS_SceneManager
+
     Menu_File
     Menu_View
     Menu_Window

diff --git a/Source/Core/Editor/GUI.h b/Source/Core/Editor/GUI.h
@@ -12,13 +12,11 @@
 #include <GLFW/glfw3.h>
 
 #include <imgui.h>
-
-#include <implot.h>
-
-
 #include <backends/imgui_impl_glfw.h>
 #include <backends/imgui_impl_opengl3.h>
 
+#include <implot.h>
+
 #include <ImGuizmo.h>
 
 // Internal Libraries (BG convention: use <> instead of "")
@@ -29,12 +27,12 @@
 #include <ERS_STRUCT_ProjectUtils.h>
 #include <ERS_STRUCT_HumanInputDeviceUtils.h>
 
-#include <ERS_Editor_FontManager.h>
 #include <ERS_Editor_ThemeManager.h>
+#include <ERS_Editor_FontManager.h>
 #include <ERS_Editor_UserProfileManager.h>
+#include <ERS_Editor_3DCursor.h>
 
 #include <ERS_SceneManager.h>
-#include <ERS_Editor_3DCursor.h>
 
 #include <GUI_Menu_File.h>
 #include <GUI_Menu_View.h>

diff --git a/Source/Core/Editor/MenuEntries/GUI_Menu_Window/GUI_Menu_Window.cpp b/Source/Core/Editor/MenuEntries/GUI_Menu_Window/GUI_Menu_Window.cpp
diff --git a/...ce/Core/Editor/MenuEntries/CMakeLists.txt → Source/Core/Editor/Menus/CMakeLists.txt b/...ce/Core/Editor/MenuEntries/CMakeLists.txt → Source/Core/Editor/Menus/CMakeLists.txt
diff --git a/...MenuEntries/GUI_Menu_Debug/CMakeLists.txt → ...ditor/Menus/GUI_Menu_Debug/CMakeLists.txt b/...MenuEntries/GUI_Menu_Debug/CMakeLists.txt → ...ditor/Menus/GUI_Menu_Debug/CMakeLists.txt
@@ -21,16 +21,17 @@ add_library(Menu_Debug
 # Link 3rd Party Libs
 target_link_libraries(Menu_Debug
     glad
-    glfw
     IMGUI
     )
 
 # Link Internal Libs
 target_link_libraries(Menu_Debug
 
-    Window_TestEditor
+    GUI_Window_TestEditor
 
     ERS_STRUCT_SystemUtils
+
+    ERS_CLASS_LoggingSystem
     )
 
 target_include_directories(Menu_Debug PUBLIC ./)
diff --git a/.../GUI_Menu_Debug/ERS_CLASS_OpenGLDebug.cpp → .../GUI_Menu_Debug/ERS_CLASS_OpenGLDebug.cpp b/.../GUI_Menu_Debug/ERS_CLASS_OpenGLDebug.cpp → .../GUI_Menu_Debug/ERS_CLASS_OpenGLDebug.cpp
diff --git a/...es/GUI_Menu_Debug/ERS_CLASS_OpenGLDebug.h → ...us/GUI_Menu_Debug/ERS_CLASS_OpenGLDebug.h b/...es/GUI_Menu_Debug/ERS_CLASS_OpenGLDebug.h → ...us/GUI_Menu_Debug/ERS_CLASS_OpenGLDebug.h
diff --git a/...Entries/GUI_Menu_Debug/GUI_Menu_Debug.cpp → ...r/Menus/GUI_Menu_Debug/GUI_Menu_Debug.cpp b/...Entries/GUI_Menu_Debug/GUI_Menu_Debug.cpp → ...r/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_);

diff --git a/...nuEntries/GUI_Menu_Debug/GUI_Menu_Debug.h → ...tor/Menus/GUI_Menu_Debug/GUI_Menu_Debug.h b/...nuEntries/GUI_Menu_Debug/GUI_Menu_Debug.h → ...tor/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*/

diff --git a/.../MenuEntries/GUI_Menu_File/CMakeLists.txt → ...Editor/Menus/GUI_Menu_File/CMakeLists.txt b/.../MenuEntries/GUI_Menu_File/CMakeLists.txt → ...Editor/Menus/GUI_Menu_File/CMakeLists.txt
@@ -20,9 +20,8 @@ add_library(Menu_File
 
 # Link 3rd Party Libs
 target_link_libraries(Menu_File
-    glad
-    glfw
     IMGUI
+    yaml-cpp
     )
 
 # Link Internal Libs
@@ -33,14 +32,15 @@ target_link_libraries(Menu_File
 
     ERS_Editor_ImportAsset
 
-    ERS_SceneWriter
     ERS_ProjectLoader
-
+    ERS_SceneWriter
     ERS_SceneManager
+
     ERS_STRUCT_Scene
 
-    Window_ProjectSettings
-    Window_ShaderEditor
+    GUI_Window_ProjectSettings
+    GUI_Window_ShaderEditor
+
     ERS_CLASS_VisualRenderer
     )
 

diff --git a/...nuEntries/GUI_Menu_File/GUI_Menu_File.cpp → ...tor/Menus/GUI_Menu_File/GUI_Menu_File.cpp b/...nuEntries/GUI_Menu_File/GUI_Menu_File.cpp → ...tor/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();
 
 

diff --git a/...MenuEntries/GUI_Menu_File/GUI_Menu_File.h → ...ditor/Menus/GUI_Menu_File/GUI_Menu_File.h b/...MenuEntries/GUI_Menu_File/GUI_Menu_File.h → ...ditor/Menus/GUI_Menu_File/GUI_Menu_File.h
@@ -22,10 +22,10 @@
 #include <ERS_CLASS_LoggingSystem.h>
 #include <ERS_STRUCT_SystemUtils.h>
 #include <ERS_STRUCT_ProjectUtils.h>
-#include <ERS_ProjectLoader.h>
 
 #include <GUI_ImportAsset.h>
 
+#include <ERS_ProjectLoader.h>
 #include <ERS_SceneWriter.h>
 #include <ERS_SceneManager.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:

diff --git a/...ntries/GUI_Menu_File/Utils/CMakeLists.txt → .../Menus/GUI_Menu_File/Utils/CMakeLists.txt b/...ntries/GUI_Menu_File/Utils/CMakeLists.txt → .../Menus/GUI_Menu_File/Utils/CMakeLists.txt
diff --git a/...nu_File/Utils/Import_Asset/CMakeLists.txt → ...nu_File/Utils/Import_Asset/CMakeLists.txt b/...nu_File/Utils/Import_Asset/CMakeLists.txt → ...nu_File/Utils/Import_Asset/CMakeLists.txt
@@ -24,16 +24,25 @@ set_property(TARGET ERS_Editor_ImportAsset PROPERTY CXX_STANDARD 17)
 # Link 3rd Party Libs
 target_link_libraries(ERS_Editor_ImportAsset
     yaml-cpp
+    glm
     IMGUI
     ImGuiFileDialog
+    assimp
+    FreeImage
     )
 
 # Link Internal Libs
 target_link_libraries(ERS_Editor_ImportAsset
     ERS_CLASS_LoggingSystem
 
     ERS_STRUCT_SystemUtils
-    Window_ImportProgressBar
+    ERS_STRUCT_Mesh
+    ERS_STRUCT_Texture
+    ERS_STRUCT_Vertex
+    ERS_STRUCT_Model
+    ERS_STRUCT_IOData
+
+    GUI_Window_ImportProgressBar
     )
 
 target_include_directories(ERS_Editor_ImportAsset PUBLIC ./)
diff --git a/...s/Import_Asset/ERS_Editor_ImportAsset.cpp → ...s/Import_Asset/ERS_Editor_ImportAsset.cpp b/...s/Import_Asset/ERS_Editor_ImportAsset.cpp → ...s/Import_Asset/ERS_Editor_ImportAsset.cpp
diff --git a/...ils/Import_Asset/ERS_Editor_ImportAsset.h → ...ils/Import_Asset/ERS_Editor_ImportAsset.h b/...ils/Import_Asset/ERS_Editor_ImportAsset.h → ...ils/Import_Asset/ERS_Editor_ImportAsset.h
diff --git a/...Import_Asset/ERS_Editor_ModelImporter.cpp → ...Import_Asset/ERS_Editor_ModelImporter.cpp b/...Import_Asset/ERS_Editor_ModelImporter.cpp → ...Import_Asset/ERS_Editor_ModelImporter.cpp
diff --git a/...s/Import_Asset/ERS_Editor_ModelImporter.h → ...s/Import_Asset/ERS_Editor_ModelImporter.h b/...s/Import_Asset/ERS_Editor_ModelImporter.h → ...s/Import_Asset/ERS_Editor_ModelImporter.h
diff --git a/...le/Utils/Import_Asset/GUI_ImportAsset.cpp → ...le/Utils/Import_Asset/GUI_ImportAsset.cpp b/...le/Utils/Import_Asset/GUI_ImportAsset.cpp → ...le/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();
 
 
 }

diff --git a/...File/Utils/Import_Asset/GUI_ImportAsset.h → ...File/Utils/Import_Asset/GUI_ImportAsset.h b/...File/Utils/Import_Asset/GUI_ImportAsset.h → ...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: