From 122f7e9904849551be90691328047525b57ec9ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20L=C3=BCbe=C3=9F?= <simon.luebess@gmail.com>
Date: Tue, 28 Sep 2021 21:27:08 +0200
Subject: [PATCH] Replaced imgui with engine specific repository

---
 .gitmodules                     | 10 +++++-----
 BeefSpace.toml                  |  2 +-
 GlitchyEngine/BeefProj.toml     |  2 +-
 GlitchyEngine/vendor/imgui      |  1 +
 GlitchyEngine/vendor/imgui-beef |  1 -
 5 files changed, 8 insertions(+), 8 deletions(-)
 create mode 160000 GlitchyEngine/vendor/imgui
 delete mode 160000 GlitchyEngine/vendor/imgui-beef

diff --git a/.gitmodules b/.gitmodules
index 31cd895..eebbba3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "GlitchyEngine/vendor/directx"]
 	path = GlitchyEngine/vendor/directx
 	url = https://github.com/aharabada/directx-beef.git
-[submodule "GlitchyEngine/vendor/imgui-beef"]
-	path = GlitchyEngine/vendor/imgui-beef
-	url = https://github.com/aharabada/imgui-beef
 [submodule "GlitchyEngine/vendor/DirectXTK"]
 	path = GlitchyEngine/vendor/DirectXTK
 	url = https://github.com/aharabada/DirectXTK-beef.git
@@ -19,6 +16,9 @@
 [submodule "GlitchyEngine/vendor/gltf"]
 	path = GlitchyEngine/vendor/gltf
 	url = https://github.com/aharabada/cgltf-beef.git
-[submodule "GlitchyEngine\\vendor\\msdfgen"]
-	path = GlitchyEngine\\vendor\\msdfgen
+[submodule "GlitchyEngine/vendor/msdfgen"]
+	path = GlitchyEngine/vendor/msdfgen
 	url = https://github.com/aharabada/msdfgen-beef.git
+[submodule "GlitchyEngine/vendor/imgui"]
+	path = GlitchyEngine/vendor/imgui
+	url = https://github.com/aharabada/ImGui_GlitchyEngine.git
\ No newline at end of file
diff --git a/BeefSpace.toml b/BeefSpace.toml
index bc1fc4a..200a5c4 100644
--- a/BeefSpace.toml
+++ b/BeefSpace.toml
@@ -1,5 +1,5 @@
 FileVersion = 1
-Projects = {Sandbox = {Path = "Sandbox"}, GlitchyEngine = {Path = "GlitchyEngine"}, GlitchLog = {Path = "GlitchLog"}, DirectX = {Path = "GlitchyEngine/vendor/directx/DirectX"}, ImGui = {Path = "GlitchyEngine/vendor/imgui-beef/ImGui"}, ImGuiImplWin32 = {Path = "GlitchyEngine/vendor/imgui-beef/ImGuiImplWin32"}, ImGuiImplDX11 = {Path = "GlitchyEngine/vendor/imgui-beef/ImGuiImplDX11"}, DirectXTK = {Path = "GlitchyEngine/vendor/DirectXTK/DirectXTK-beef"}, LodePng = {Path = "vendor/lodepng-beef/lodepng-beef"}, FreeType = {Path = "GlitchyEngine/vendor/freetype"}, cgltf-beef = {Path = "GlitchyEngine/vendor/gltf/cgltf-beef"}, GlitchyEditor = {Path = "GlitchyEditor"}, msdfgen-beef = {Path = "GlitchyEngine/vendor/msdfgen/msdfgen-beef"}}
+Projects = {Sandbox = {Path = "Sandbox"}, GlitchyEngine = {Path = "GlitchyEngine"}, GlitchLog = {Path = "GlitchLog"}, DirectX = {Path = "GlitchyEngine/vendor/directx/DirectX"}, DirectXTK = {Path = "GlitchyEngine/vendor/DirectXTK/DirectXTK-beef"}, LodePng = {Path = "vendor/lodepng-beef/lodepng-beef"}, FreeType = {Path = "GlitchyEngine/vendor/freetype"}, cgltf-beef = {Path = "GlitchyEngine/vendor/gltf/cgltf-beef"}, GlitchyEditor = {Path = "GlitchyEditor"}, msdfgen-beef = {Path = "GlitchyEngine/vendor/msdfgen/msdfgen-beef"}, ImGui = {Path = "GlitchyEngine/vendor/imgui/ImGui"}, ImGuiImplDX11 = {Path = "GlitchyEngine/vendor/imgui/ImGuiImplDX11"}, ImGuiImplWin32 = {Path = "GlitchyEngine/vendor/imgui/ImGuiImplWin32"}, ImGuizmo = {Path = "GlitchyEngine/vendor/imgui/ImGuizmo"}}
 
 [Workspace]
 StartupProject = "GlitchyEditor"
diff --git a/GlitchyEngine/BeefProj.toml b/GlitchyEngine/BeefProj.toml
index 78b111d..c24ad3b 100644
--- a/GlitchyEngine/BeefProj.toml
+++ b/GlitchyEngine/BeefProj.toml
@@ -1,5 +1,5 @@
 FileVersion = 1
-Dependencies = {GlitchLog = "*", corlib = "*", DirectX = "*", ImGui = "*", ImGuiImplWin32 = "*", ImGuiImplDX11 = "*", DirectXTK = "*", FreeType = "*", cgltf-beef = "*", msdfgen-beef = "*"}
+Dependencies = {GlitchLog = "*", corlib = "*", DirectX = "*", DirectXTK = "*", FreeType = "*", cgltf-beef = "*", msdfgen-beef = "*", ImGui = "*", ImGuiImplDX11 = "*", ImGuiImplWin32 = "*", ImGuizmo = "*"}
 
 [Project]
 Name = "GlitchyEngine"
diff --git a/GlitchyEngine/vendor/imgui b/GlitchyEngine/vendor/imgui
new file mode 160000
index 0000000..6cf4698
--- /dev/null
+++ b/GlitchyEngine/vendor/imgui
@@ -0,0 +1 @@
+Subproject commit 6cf4698d6b579eedfd751b44913bd12560cd59b1
diff --git a/GlitchyEngine/vendor/imgui-beef b/GlitchyEngine/vendor/imgui-beef
deleted file mode 160000
index 47ffe62..0000000
--- a/GlitchyEngine/vendor/imgui-beef
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 47ffe62d4cd2e75f7d1e73e4a76dd05bb91232ed