Update Project to C++20

KredeGC · Sep 8, 2024 · bc2d5b2 · bc2d5b2
1 parent 21eac5b
commit bc2d5b2
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 11 deletions.
diff --git a/Erebor/imgui.ini b/Erebor/imgui.ini
@@ -258,6 +258,6 @@ DockSpace         ID=0x3FC20BEE Window=0x9A404470 Pos=0,45 Size=1920,995 Split=Y
   DockNode        ID=0x0000000A Parent=0x3FC20BEE SizeRef=1920,350 Split=X Selected=0xBF096F38
     DockNode      ID=0x0000000B Parent=0x0000000A SizeRef=381,324 Selected=0x50413B2F
     DockNode      ID=0x00000008 Parent=0x0000000A SizeRef=1537,324 Split=X Selected=0xBF096F38
-      DockNode    ID=0x00000006 Parent=0x00000008 SizeRef=1048,350 Selected=0xBF096F38
+      DockNode    ID=0x00000006 Parent=0x00000008 SizeRef=1048,350 Selected=0x49278EEE
       DockNode    ID=0x0000000C Parent=0x00000008 SizeRef=487,350 Selected=0x7EA89797
 
diff --git a/Mahakam/premake5.lua b/Mahakam/premake5.lua
@@ -1,7 +1,7 @@
 project "Mahakam"
     kind "StaticLib"
     language "C++"
-    cppdialect "C++17"
+    cppdialect "C++20"
     staticruntime "off"
     pic "on"
 

diff --git a/Mahakam/src/Mahakam/Asset/AssetDatabase.cpp b/Mahakam/src/Mahakam/Asset/AssetDatabase.cpp
@@ -486,7 +486,7 @@ namespace Mahakam
 	{
 		if (!FileUtility::Exists(filepath))
 		{
-			MH_WARN("Could not import assets. Does the '{0}' folder exist?", filepath.u8string());
+			MH_WARN("Could not import assets. Does the '{0}' folder exist?", filepath.string());
 			return;
 		}
 

diff --git a/Mahakam/src/Mahakam/Core/Application.cpp b/Mahakam/src/Mahakam/Core/Application.cpp
@@ -74,6 +74,8 @@ namespace Mahakam
 
 	void Application::Run()
 	{
+		m_LastFrameTime = m_Window->GetTime();
+
 		while (m_Running)
 		{
 			double time = m_Window->GetTime();

diff --git a/Mahakam/src/Mahakam/Editor/Resource/ResourceRegistry.cpp b/Mahakam/src/Mahakam/Editor/Resource/ResourceRegistry.cpp
@@ -239,7 +239,7 @@ namespace Mahakam
 	{
 		if (!FileUtility::Exists(filepath))
 		{
-			MH_WARN("Could not import assets. Does the '{0}' folder exist?", filepath.u8string());
+			MH_WARN("Could not import assets. Does the '{0}' folder exist?", filepath.string());
 			return;
 		}
 

diff --git a/Mahakam/src/Mahakam/Scene/ComponentRegistry.h b/Mahakam/src/Mahakam/Scene/ComponentRegistry.h
@@ -47,6 +47,15 @@ namespace Mahakam
 #ifndef MH_STANDALONE
 				Icon = icon;
 				OnPropertyDraw = onPropertyDraw;
+#endif
+			}
+
+			template<typename T>
+			inline void SetEditor(const T* icon = nullptr, void (*onPropertyDraw)(Entity) = nullptr)
+			{
+#ifndef MH_STANDALONE
+				Icon = reinterpret_cast<const char*>(icon);
+				OnPropertyDraw = onPropertyDraw;
 #endif
 			}
 		};

diff --git a/Mahakam/src/Mahakam/Scene/SceneDef.h b/Mahakam/src/Mahakam/Scene/SceneDef.h
@@ -19,6 +19,10 @@ namespace Mahakam
 	class PhysicsContext;
 	class TextureCube;
 
+	// TODO: Scene should hold the AssetDatabase, AudioEngine and PhysicsEngine
+	// This way, when a scene is destroyed everything is destroyed with it
+	// Should be careful with assets though, so we don't unload assets that are used in multiple scenes
+
 	class Scene
 	{
 	private:

diff --git a/Mahakam/vendor/glslang/premake5.lua b/Mahakam/vendor/glslang/premake5.lua
@@ -1,7 +1,7 @@
 project "glslang"
 	kind "StaticLib"
 	language "C++"
-    cppdialect "C++17"
+    cppdialect "C++20"
     staticruntime "off"
     pic "on"
 

diff --git a/Mahakam/vendor/imgui/premake5.lua b/Mahakam/vendor/imgui/premake5.lua
@@ -1,7 +1,7 @@
 project "ImGui"
     kind "StaticLib"
     language "C++"
-    cppdialect "C++17"
+    cppdialect "C++20"
     staticruntime "off"
     pic "on"
 

diff --git a/Mahakam/vendor/imguizmo/premake5.lua b/Mahakam/vendor/imguizmo/premake5.lua
@@ -1,7 +1,7 @@
 project "ImGuizmo"
     kind "StaticLib"
     language "C++"
-    cppdialect "C++17"
+    cppdialect "C++20"
     staticruntime "off"
     pic "on"
 

diff --git a/Mahakam/vendor/spirv_cross/premake5.lua b/Mahakam/vendor/spirv_cross/premake5.lua
@@ -1,7 +1,7 @@
 project "spirv_cross"
 	kind "StaticLib"
 	language "C++"
-    cppdialect "C++17"
+    cppdialect "C++20"
     staticruntime "off"
     pic "on"
 

diff --git a/Sandbox/premake5.lua b/Sandbox/premake5.lua
@@ -1,7 +1,7 @@
 project "Sandbox"
     kind "SharedLib"
     language "C++"
-    cppdialect "C++17"
+    cppdialect "C++20"
     staticruntime "off"
     pic "on"
 

diff --git a/TODO.txt b/TODO.txt
@@ -0,0 +1,5 @@
+Make Erebor into an asset importer instead of an editor
+Make Sandbox the editor
+Editor windows should be part of Mahakam
+Scenes should hold the AssetDatabase, AudioEngine and PhysicsEngine
+Maybe replace Bullet with Jolt?
diff --git a/generate-standalone.bat b/generate-standalone.bat
@@ -1,2 +1,2 @@
-call vendor\bin\premake\premake5.exe vs2019 --toolset=msc --target=windows --standalone
+call vendor\bin\premake\premake5.exe vs2022 --toolset=msc --target=windows --standalone
 pause
diff --git a/generate.bat b/generate.bat
@@ -1,2 +1,2 @@
-call ..\premake5\bin\premake5.exe vs2019 --toolset=msc
+call ..\premake5\bin\premake5.exe vs2022 --toolset=msc
 pause
-Original file line number
+Diff line change
@@ Expand Up / @@ -486,7 +486,7 @@ namespace Mahakam @@
     	{
     		if (!FileUtility::Exists(filepath))
     		{
-    			MH_WARN("Could not import assets. Does the '{0}' folder exist?", filepath.u8string());
+    			MH_WARN("Could not import assets. Does the '{0}' folder exist?", filepath.string());
     			return;
     		}
@@ Expand Down @@