Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

303 create batch import system #305

Merged
merged 133 commits into from
Aug 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
133 commits
Select commit Hold shift + click to select a range
ddde74c
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
bada8c2
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
b5525d8
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
06481e9
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
509b774
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
678ee87
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
7bb9250
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
4457cb1
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
17cdcd1
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
efb09a7
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
4e02a40
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
a0fb4da
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
9b3c145
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
de2f907
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
ea077bf
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
8a46956
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
1f6de37
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
180ef00
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
83d0289
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
72af21d
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
ffd7fec
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
f011aa5
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
c9a0845
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
b417689
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
f646e1e
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
972040c
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
1e45947
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
6021a7b
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
9dad5cf
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
4ac4339
Move ImportAsset To Window Class
datacrystals Aug 15, 2022
6437bd2
Move ImportAsset To Window Class
datacrystals Aug 16, 2022
806de21
Move ImportAsset To Window Class
datacrystals Aug 16, 2022
5a485c3
Move ImportAsset To Window Class
datacrystals Aug 16, 2022
273c4c0
Move ImportAsset To Window Class
datacrystals Aug 16, 2022
59b01d0
Move ImportAsset To Window Class
datacrystals Aug 16, 2022
7dcaffb
Move ImportAsset To Window Class
datacrystals Aug 16, 2022
682380f
Add Todo
datacrystals Aug 16, 2022
735fe63
Add Todo
datacrystals Aug 16, 2022
802d912
Move ImportAsset To Window Class
datacrystals Aug 16, 2022
54c313a
Move ImportAsset To Window Class
datacrystals Aug 16, 2022
d2f33ab
Move ImportAsset To Window Class
datacrystals Aug 16, 2022
0003720
Move ImportAsset To Window Class
datacrystals Aug 16, 2022
b409339
Move ImportAsset To Window Class
datacrystals Aug 16, 2022
30304dc
Refactor Import System
datacrystals Aug 16, 2022
87e2e2d
Refactor Import System
datacrystals Aug 16, 2022
44fcc6d
Refactor Import System
datacrystals Aug 16, 2022
bf1d389
Refactor Import System
datacrystals Aug 16, 2022
1a9ea5b
Refactor Import System
datacrystals Aug 16, 2022
afbbe04
Refactor Import System
datacrystals Aug 16, 2022
79f4820
Refactor Import System
datacrystals Aug 16, 2022
43ba1f1
Refactor Import System
datacrystals Aug 16, 2022
e9e3351
Refactor Import System
datacrystals Aug 16, 2022
841d962
Refactor Import System
datacrystals Aug 16, 2022
b25731b
Refactor Import System
datacrystals Aug 16, 2022
73a14ee
Refactor Import System
datacrystals Aug 16, 2022
25ec945
Refactor Import System
datacrystals Aug 16, 2022
75bb58e
Refactor Import System
datacrystals Aug 16, 2022
b1efd60
Refactor Import System
datacrystals Aug 16, 2022
53fcd01
Refactor Import System
datacrystals Aug 16, 2022
6fa44f2
Refactor Import System
datacrystals Aug 16, 2022
a41bbcb
Refactor Import System
datacrystals Aug 16, 2022
40aa18c
Refactor Import System
datacrystals Aug 16, 2022
f6b1f7f
Refactor Import System
datacrystals Aug 16, 2022
86ca1ba
Refactor Import System
datacrystals Aug 16, 2022
709697a
Refactor Import System
datacrystals Aug 16, 2022
e76ebb9
Refactor Import System
datacrystals Aug 16, 2022
9c16b69
Refactor Import System
datacrystals Aug 16, 2022
1f582f5
Refactor Import System
datacrystals Aug 16, 2022
1f8f93d
Refactor Import System
datacrystals Aug 16, 2022
c44f832
Refactor Import System
datacrystals Aug 16, 2022
a3a36bb
Refactor Import System
datacrystals Aug 16, 2022
24d8bed
Refactor Import System
datacrystals Aug 16, 2022
2ca96eb
Refactor Import System
datacrystals Aug 16, 2022
86d8a2a
Refactor Import System
datacrystals Aug 16, 2022
97e3ce4
Refactor Import System
datacrystals Aug 16, 2022
206c3e0
Refactor Import System
datacrystals Aug 16, 2022
b5b33ec
Refactor Import System
datacrystals Aug 16, 2022
726a28d
Refactor Import System
datacrystals Aug 16, 2022
e922687
Refactor Import System
datacrystals Aug 16, 2022
cfec542
Refactor Import System
datacrystals Aug 16, 2022
7ae538f
Refactor Import System
datacrystals Aug 16, 2022
229ee85
Refactor Import System
datacrystals Aug 16, 2022
f7400ce
Refactor Import System
datacrystals Aug 16, 2022
8fcde1a
Refactor Import System
datacrystals Aug 16, 2022
0f0de3b
Refactor Import System
datacrystals Aug 16, 2022
ad07ece
Refactor Import System
datacrystals Aug 16, 2022
c678d85
Refactor Import System
datacrystals Aug 16, 2022
dc4a336
Refactor Import System
datacrystals Aug 16, 2022
5f8bf6b
Refactor Import System
datacrystals Aug 16, 2022
3bde193
Refactor Import System
datacrystals Aug 16, 2022
ef7bbe2
Refactor Import System
datacrystals Aug 16, 2022
7538bcf
Refactor Import System
datacrystals Aug 16, 2022
b6eb896
Refactor Import System
datacrystals Aug 16, 2022
07517c0
Refactor Import System
datacrystals Aug 16, 2022
4ea4fbd
Refactor Import System
datacrystals Aug 16, 2022
d144156
Refactor Import System
datacrystals Aug 16, 2022
1aa21f5
Refactor Import System
datacrystals Aug 16, 2022
c4cf657
Refactor Import System
datacrystals Aug 16, 2022
f0a3ec3
Refactor Import System
datacrystals Aug 16, 2022
d45cd19
Refactor Import System
datacrystals Aug 16, 2022
47d7dff
Refactor Import System
datacrystals Aug 16, 2022
ff9636d
Refactor Import System
datacrystals Aug 16, 2022
ca8bf39
Refactor Import System
datacrystals Aug 16, 2022
736cb04
Refactor Import System
datacrystals Aug 16, 2022
73c5427
Refactor Import System
datacrystals Aug 16, 2022
a8e4a91
Refactor Import System
datacrystals Aug 16, 2022
23d3485
Refactor Import System
datacrystals Aug 16, 2022
fa52377
Refactor Import System
datacrystals Aug 16, 2022
1c054b9
Refactor Import System
datacrystals Aug 16, 2022
2a5dbec
Refactor Import System
datacrystals Aug 16, 2022
5fcd23a
Refactor Import System
datacrystals Aug 16, 2022
2b0d506
Refactor Import System
datacrystals Aug 16, 2022
822a67e
Refactor Import System
datacrystals Aug 16, 2022
1a3e2d7
Refactor Import System
datacrystals Aug 16, 2022
1b1330c
Refactor Import System
datacrystals Aug 16, 2022
cd08160
Refactor Import System
datacrystals Aug 16, 2022
06a58d0
Refactor Import System
datacrystals Aug 16, 2022
aae97c5
Refactor Import System
datacrystals Aug 16, 2022
c3961a6
Refactor Import System
datacrystals Aug 16, 2022
c7ce927
Refactor Import System
datacrystals Aug 16, 2022
4329e42
Refactor Import System
datacrystals Aug 16, 2022
331fdfa
Refactor Import System
datacrystals Aug 16, 2022
1980965
Refactor Import System
datacrystals Aug 16, 2022
e872cd4
Refactor Import System
datacrystals Aug 16, 2022
134439a
Refactor Import System
datacrystals Aug 16, 2022
d021f01
Refactor Import System
datacrystals Aug 16, 2022
2217274
Refactor Import System
datacrystals Aug 16, 2022
6829ad9
Refactor Import System
datacrystals Aug 16, 2022
5092dab
Refactor Import System
datacrystals Aug 16, 2022
982c6b1
Refactor Import System
datacrystals Aug 16, 2022
4848d94
Refactor Import System
datacrystals Aug 16, 2022
69b930e
Refactor Import System
datacrystals Aug 16, 2022
07a13f7
Refactor Import System
datacrystals Aug 16, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -132,6 +135,7 @@ target_link_libraries(${PROJECT_NAME}
# Internal Libs
ERS_CLASS_GPURequest
ERS_CLASS_LoggingSystem
ERS_CLASS_ModelImporter


ERS_CLASS_HardwareInformation
Expand Down
4 changes: 0 additions & 4 deletions Source/Core/Editor/Menus/GUI_Menu_File/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -30,7 +27,6 @@ target_link_libraries(Menu_File
ERS_STRUCT_SystemUtils
ERS_STRUCT_ProjectUtils

ERS_Editor_ImportAsset
ERS_Editor_WindowManager

ERS_ProjectLoader
Expand Down
10 changes: 4 additions & 6 deletions Source/Core/Editor/Menus/GUI_Menu_File/GUI_Menu_File.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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_);


}
Expand Down Expand Up @@ -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
Expand All @@ -71,7 +71,5 @@ void GUI_Menu_File::Draw() {
}


// Draw Subwindows
ImportAsset_->Draw();

}
2 changes: 0 additions & 2 deletions Source/Core/Editor/Menus/GUI_Menu_File/GUI_Menu_File.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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*/


Expand Down
5 changes: 0 additions & 5 deletions Source/Core/Editor/Menus/GUI_Menu_File/Utils/CMakeLists.txt

This file was deleted.

Loading