dmsi190 · CheerWizard · Jan 30, 2024 · Feb 9, 2024
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,8 @@
 .vs
 build
 build-debug
-build-release
+build-release
+debug
+release
+editor_debug
+editor_release
diff --git a/.gitmodules b/.gitmodules
@@ -32,3 +32,9 @@
 [submodule "docs/css/doxygen-awesome-css"]
 	path = docs/css/doxygen-awesome-css
 	url = https://github.com/jothepro/doxygen-awesome-css.git
+[submodule "engine/thirdparty/imgui"]
+	path = engine/thirdparty/imgui
+	url = https://github.com/ocornut/imgui.git
+[submodule "engine/thirdparty/ImGuizmo"]
+	path = engine/thirdparty/ImGuizmo
+	url = https://github.com/CedricGuillemet/ImGuizmo.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,14 +5,8 @@ project(XPE-Engine)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -O3")
 
-# Add Loader
-add_subdirectory(loader)
-
 # Add Engine
 add_subdirectory(engine)
 
 # Add Samples
-add_subdirectory(samples)
-
-# Add cEditor
-# add_subdirectory(editor)
+add_subdirectory(samples)
diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt
diff --git a/editor/config/editor_config.json b/editor/config/editor_config.json
diff --git a/editor/res/fonts/Roboto-Bold.ttf b/editor/res/fonts/Roboto-Bold.ttf
diff --git a/editor/res/fonts/Roboto-Italic.ttf b/editor/res/fonts/Roboto-Italic.ttf
diff --git a/editor/res/materials/steel/albedo.png b/editor/res/materials/steel/albedo.png
diff --git a/editor/res/materials/steel/ao.png b/editor/res/materials/steel/ao.png
diff --git a/editor/res/materials/steel/bump.png b/editor/res/materials/steel/bump.png
diff --git a/editor/res/materials/steel/height.png b/editor/res/materials/steel/height.png
diff --git a/editor/res/materials/steel/metallic.png b/editor/res/materials/steel/metallic.png
diff --git a/editor/res/materials/steel/preview.jpg b/editor/res/materials/steel/preview.jpg
diff --git a/editor/res/materials/steel/roughness.png b/editor/res/materials/steel/roughness.png
diff --git a/editor/res/models/cube.bin b/editor/res/models/cube.bin
diff --git a/editor/res/models/cube.gltf b/editor/res/models/cube.gltf
diff --git a/editor/res/skybox/back.jpg b/editor/res/skybox/back.jpg
diff --git a/editor/res/skybox/bottom.jpg b/editor/res/skybox/bottom.jpg
diff --git a/editor/res/skybox/front.jpg b/editor/res/skybox/front.jpg
diff --git a/editor/res/skybox/left.jpg b/editor/res/skybox/left.jpg
diff --git a/editor/res/skybox/right.jpg b/editor/res/skybox/right.jpg
diff --git a/editor/res/skybox/top.jpg b/editor/res/skybox/top.jpg
diff --git a/editor/shaders/window.ps b/editor/shaders/window.ps
diff --git a/editor/shaders/window.vs b/editor/shaders/window.vs
diff --git a/editor/shaders/window2d.ps b/editor/shaders/window2d.ps
diff --git a/editor/shaders/window2d.vs b/editor/shaders/window2d.vs