Merge pull request #305 from carboncopies/303-create-batch-import-system

303 create batch import system
carboncopies · Aug 16, 2022 · ad37e1a · ad37e1a
2 parents 47f3c06 + 07a13f7
commit ad37e1a
Show file tree

Hide file tree

Showing 32 changed files with 1,369 additions and 939 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -57,6 +57,8 @@ add_subdirectory(${SRC_DIR}/Core/Utils/ERS_CLASS_HardwareInformation)
 add_subdirectory(${SRC_DIR}/Core/Utils/ERS_CLASS_InputOutputSubsystem)
 add_subdirectory(${SRC_DIR}/Core/Utils/ERS_CLASS_ArgumentParser)
 add_subdirectory(${SRC_DIR}/Core/Utils/ERS_CLASS_GPURequest)
+add_subdirectory(${SRC_DIR}/Core/Utils/ERS_CLASS_ExternalModelLoader)
+add_subdirectory(${SRC_DIR}/Core/Utils/ERS_CLASS_ModelImporter)
 
 add_subdirectory(${SRC_DIR}/Core/Manager/ERS_FramerateManager)
 add_subdirectory(${SRC_DIR}/Core/Manager/ERS_SceneManager)
@@ -93,6 +95,7 @@ add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_SystemUtils)
 add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_ProjectUtils)
 add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_Project)
 add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_ControllerSettings)
+add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_ModelWriterData)
 add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_ShaderProgramAssetIDs)
 add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_RGBColor)
 add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_Viewport)
@@ -132,6 +135,7 @@ target_link_libraries(${PROJECT_NAME}
   # Internal Libs
   ERS_CLASS_GPURequest
   ERS_CLASS_LoggingSystem
+  ERS_CLASS_ModelImporter
 
 
   ERS_CLASS_HardwareInformation

diff --git a/Source/Core/Editor/Menus/GUI_Menu_File/CMakeLists.txt b/Source/Core/Editor/Menus/GUI_Menu_File/CMakeLists.txt
@@ -2,9 +2,6 @@
 # This file is part of the BrainGenix-ERS Environment Rendering System #
 ########################################################################
 
-# Add Subdirs
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Utils)
-
 # Create Library (Name Should Be Parent Dir Name)
 add_library(Menu_File
 
@@ -30,7 +27,6 @@ target_link_libraries(Menu_File
     ERS_STRUCT_SystemUtils
     ERS_STRUCT_ProjectUtils
 
-    ERS_Editor_ImportAsset
     ERS_Editor_WindowManager
 
     ERS_ProjectLoader

diff --git a/Source/Core/Editor/Menus/GUI_Menu_File/GUI_Menu_File.cpp b/Source/Core/Editor/Menus/GUI_Menu_File/GUI_Menu_File.cpp
@@ -15,7 +15,6 @@ GUI_Menu_File::GUI_Menu_File(ERS_STRUCT_SystemUtils* SystemUtils, ERS_CLASS_Scen
     SystemUtils_->Logger_->Log("Editor Setting Up File Menu", 4);
 
     SceneWriter_ = std::make_unique<SceneWriter>(SystemUtils_);
-    ImportAsset_ = std::make_unique<GUI_ImportAsset>(SystemUtils_);
 
 
 }
@@ -54,11 +53,12 @@ void GUI_Menu_File::Draw() {
 
         ImGui::MenuItem("Project Settings", "", &Windows_->GUI_Window_ProjectSettings_->Enabled_);
         ImGui::MenuItem("About", "", &Windows_->GUI_Window_About_->Enabled_);
+
         ImGui::Separator();
 
-        if (ImGui::MenuItem("Import Model")) {
-            ImportAsset_->OpenFileDialog();
-        }
+        ImGui::MenuItem("Import Model", "", &Windows_->GUI_Window_ImportModel_->Enabled_);
+        ImGui::MenuItem("Import Models In Directory", "", &Windows_->GUI_Window_ImportModelDirectory_->Enabled_);
+
         ImGui::Separator();
 
         // Exit Options
@@ -71,7 +71,5 @@ void GUI_Menu_File::Draw() {
     }
 
 
-    // Draw Subwindows
-    ImportAsset_->Draw();
 
 }
diff --git a/Source/Core/Editor/Menus/GUI_Menu_File/GUI_Menu_File.h b/Source/Core/Editor/Menus/GUI_Menu_File/GUI_Menu_File.h
@@ -23,7 +23,6 @@
 #include <ERS_STRUCT_SystemUtils.h>
 #include <ERS_STRUCT_ProjectUtils.h>
 
-#include <GUI_ImportAsset.h>
 
 #include <ERS_ProjectLoader.h>
 #include <ERS_SceneWriter.h>
@@ -50,7 +49,6 @@ 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*/
     ERS_STRUCT_ProjectUtils* ProjectUtils_; /**<Pointer To Project Utils Instance*/
 
 

diff --git a/Source/Core/Editor/Menus/GUI_Menu_File/Utils/CMakeLists.txt b/Source/Core/Editor/Menus/GUI_Menu_File/Utils/CMakeLists.txt