Merge pull request #144 from jmorton06/dev

Dev
jmorton06 · Nov 15, 2024 · 52b976d · 52b976d
2 parents 5b16bf1 + 5e5c87d
commit 52b976d
Show file tree

Hide file tree

Showing 32 changed files with 898 additions and 750 deletions.
diff --git a/Editor/Source/Editor.cpp b/Editor/Source/Editor.cpp
@@ -989,7 +989,7 @@ namespace Lumos
                 timer = 0.0;
                 stats = Engine::Get().Statistics();
             }
-
+#if 0
             auto size                  = ImGui::CalcTextSize("%.2f ms (%.i FPS)");
             float sizeOfGfxAPIDropDown = ImGui::GetFontSize() * 8;
             ImGui::SameLine(ImGui::GetWindowContentRegionMax().x - size.x - ImGui::GetStyle().ItemSpacing.x * 2.0f - sizeOfGfxAPIDropDown);
@@ -1079,6 +1079,14 @@ namespace Lumos
 
             ImGui::PopStyleColor(2);
             ImGui::PopStyleVar();
+#else
+            auto size = ImGui::CalcTextSize("%.2f ms (%.i FPS)");
+            ImGui::SameLine(ImGui::GetWindowContentRegionMax().x - size.x - ImGui::GetStyle().ItemSpacing.x * 2.0f);
+
+            int fps = int(Maths::Round(1000.0 / stats.FrameTime));
+            ImGui::Text("%.2f ms (%.i FPS)", stats.FrameTime, fps);
+            ImGui::PopStyleColor();
+#endif
 
             ImGui::EndMainMenuBar();
         }

diff --git a/Editor/Source/Editor.h b/Editor/Source/Editor.h
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <string>
 #include <Lumos/Maths/Transform.h>
 #include <Lumos/Utilities/IniFile.h>
 #include <Lumos/Graphics/Camera/EditorCamera.h>

diff --git a/Editor/premake5.lua b/Editor/premake5.lua
@@ -20,7 +20,6 @@ project "LumosEditor"
 	{
 		"%{IncludeDir.entt}",
 		"%{IncludeDir.GLFW}",
-		"%{IncludeDir.Glad}",
 		"%{IncludeDir.lua}",
 		"%{IncludeDir.stb}",
 		"%{IncludeDir.ImGui}",
@@ -73,7 +72,6 @@ project "LumosEditor"
 		defines
 		{
 			"LUMOS_PLATFORM_WINDOWS",
-			"LUMOS_RENDER_API_OPENGL",
 			"LUMOS_RENDER_API_VULKAN",
 			"VK_USE_PLATFORM_WIN32_KHR",
 			"WIN32_LEAN_AND_MEAN",
@@ -91,7 +89,6 @@ project "LumosEditor"
 		links
 		{
 			"glfw",
-			"OpenGL32",
 			"OpenAL32"
 		}
 
@@ -129,7 +126,6 @@ project "LumosEditor"
 		{
 			"LUMOS_PLATFORM_MACOS",
 			"LUMOS_PLATFORM_UNIX",
-			"LUMOS_RENDER_API_OPENGL",
 			"LUMOS_RENDER_API_VULKAN",
 			"VK_EXT_metal_surface",
 			"LUMOS_IMGUI",
@@ -138,7 +134,6 @@ project "LumosEditor"
 
 		linkoptions
 		{
-			"-framework OpenGL",
 			"-framework Cocoa",
 			"-framework IOKit",
 			"-framework CoreVideo",
@@ -275,7 +270,6 @@ project "LumosEditor"
 		{
 			"LUMOS_PLATFORM_LINUX",
 			"LUMOS_PLATFORM_UNIX",
-			"LUMOS_RENDER_API_OPENGL",
 			"LUMOS_RENDER_API_VULKAN",
 			"VK_USE_PLATFORM_XCB_KHR",
 			"LUMOS_IMGUI",