From 8d56c747befe29090dc80cd0f48ccdaf8c0d8e5f Mon Sep 17 00:00:00 2001
From: Bram Verhulst <bram.verhulst@student.howest.be>
Date: Tue, 30 Apr 2024 09:01:59 +0200
Subject: [PATCH] Add fps

---
 .idea/.idea.Motherload/.idea/workspace.xml | 15 +++++++++++----
 Engine/BaseGame.cpp                        |  2 +-
 Game/Game.vcxproj                          |  4 ++--
 Game/Game.vcxproj.filters                  |  6 ++++++
 Game/GroundTileTypeManager.h               |  1 -
 Game/Levels/World/WorldLevel.cpp           |  6 ++++++
 Game/Levels/World/WorldLevel.h             |  2 ++
 Game/main.cpp                              |  2 +-
 8 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/.idea/.idea.Motherload/.idea/workspace.xml b/.idea/.idea.Motherload/.idea/workspace.xml
index 787edec..164e542 100644
--- a/.idea/.idea.Motherload/.idea/workspace.xml
+++ b/.idea/.idea.Motherload/.idea/workspace.xml
@@ -12,9 +12,14 @@
   <component name="ChangeListManager">
     <list default="true" id="26a0623a-44d5-441c-8048-32ff1dab3479" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/.idea.Motherload/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Motherload/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Game/GridSystem/WorldTile.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/GridSystem/WorldTile.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Game/Player.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Player.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Game/Player.h" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Player.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Engine/BaseGame.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Engine/BaseGame.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Game/Game.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Game.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Game/Game.vcxproj" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Game.vcxproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Game/Game.vcxproj.filters" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Game.vcxproj.filters" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Game/GroundTileTypeManager.h" beforeDir="false" afterPath="$PROJECT_DIR$/Game/GroundTileTypeManager.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Game/Levels/World/WorldLevel.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Levels/World/WorldLevel.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Game/Levels/World/WorldLevel.h" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Levels/World/WorldLevel.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Game/main.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/main.cpp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -73,7 +78,7 @@
   </component>
   <component name="PropertiesComponent">{
   &quot;keyToString&quot;: {
-    &quot;C++ Project.Game.executor&quot;: &quot;Debug&quot;,
+    &quot;C++ Project.Game.executor&quot;: &quot;Run&quot;,
     &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
     &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
@@ -222,6 +227,8 @@
       <workItem from="1713982171548" duration="3263000" />
       <workItem from="1713995813246" duration="2567000" />
       <workItem from="1714026889126" duration="4211000" />
+      <workItem from="1714046400732" duration="2462000" />
+      <workItem from="1714372163827" duration="2962000" />
     </task>
     <task id="LOCAL-00001" summary="Rework Tile detection system">
       <option name="closed" value="true" />
diff --git a/Engine/BaseGame.cpp b/Engine/BaseGame.cpp
index 9611a59..09d2d66 100644
--- a/Engine/BaseGame.cpp
+++ b/Engine/BaseGame.cpp
@@ -40,7 +40,7 @@ void BaseGame::InitializeGameEngine()
 #endif
 
 	// Initialize SDL
-	if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER | SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC/*| SDL_INIT_AUDIO*/) < 0)
+	if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER | SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC /*| SDL_INIT_AUDIO*/) < 0)
 	{
 		std::cerr << "BaseGame::Initialize( ), error when calling SDL_Init: " << SDL_GetError() << std::endl;
 		return;
diff --git a/Game/Game.vcxproj b/Game/Game.vcxproj
index a8fdbbb..19f9ab8 100644
--- a/Game/Game.vcxproj
+++ b/Game/Game.vcxproj
@@ -71,7 +71,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>C:\Users\Bram\Desktop\Programming 2\Exam\dae16-VerhulstBram\Game;C:\Users\Bram\Desktop\Programming 2\Exam\dae16-VerhulstBram\Engine\imgui;$(SolutionDir)\Libraries\SDLTtf\SDL2_ttf-2.20.2\include;$(SolutionDir)\Libraries\SDLMixer\SDL2_mixer-2.6.3\include;$(SolutionDir)\Libraries\SDLImage\SDL2_image-2.6.3\include;$(SolutionDir)\Libraries\SDLMain\SDL2-2.26.3\include;$(SolutionDir)\Engine;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)Game;$(SolutionDir)Engine\imgui;$(SolutionDir)\Libraries\SDLTtf\SDL2_ttf-2.20.2\include;$(SolutionDir)\Libraries\SDLMixer\SDL2_mixer-2.6.3\include;$(SolutionDir)\Libraries\SDLImage\SDL2_image-2.6.3\include;$(SolutionDir)\Libraries\SDLMain\SDL2-2.26.3\include;$(SolutionDir)\Engine;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)\x64\Debug;$(SolutionDir)\Libraries\SDLTtf\SDL2_ttf-2.20.2\lib\x64;$(SolutionDir)\Libraries\SDLMixer\SDL2_mixer-2.6.3\lib\x64;$(SolutionDir)\Libraries\SDLImage\SDL2_image-2.6.3\lib\x64;$(SolutionDir)\Libraries\SDLMain\SDL2-2.26.3\lib\x64;$(LibraryPath)</LibraryPath>
     <CustomBuildAfterTargets>BuildCompile</CustomBuildAfterTargets>
   </PropertyGroup>
@@ -496,6 +496,6 @@
     <LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>C:\Users\Bram\Desktop\Programming 2\Exam\dae16-VerhulstBram\Game;C:\Users\Bram\Desktop\Programming 2\Exam\dae16-VerhulstBram\Engine\imgui;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+    <IncludePath>$(SolutionDir)Game;$(SolutionDir)Engine\imgui;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Game/Game.vcxproj.filters b/Game/Game.vcxproj.filters
index e40b086..9b66999 100644
--- a/Game/Game.vcxproj.filters
+++ b/Game/Game.vcxproj.filters
@@ -69,6 +69,9 @@
     <ClCompile Include="Levels\World\WorldLevel.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="GroundTileTypeManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Game.h">
@@ -122,5 +125,8 @@
     <ClInclude Include="Levels\World\WorldLevel.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="GroundTileTypeManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Game/GroundTileTypeManager.h b/Game/GroundTileTypeManager.h
index 817b200..9562a99 100644
--- a/Game/GroundTileTypeManager.h
+++ b/Game/GroundTileTypeManager.h
@@ -54,4 +54,3 @@ private:
 	static GroundTileTypeManager* m_pInstance;
 	
 };
-
diff --git a/Game/Levels/World/WorldLevel.cpp b/Game/Levels/World/WorldLevel.cpp
index cf6ba0a..7a22797 100644
--- a/Game/Levels/World/WorldLevel.cpp
+++ b/Game/Levels/World/WorldLevel.cpp
@@ -72,6 +72,8 @@ WorldLevel::~WorldLevel() {
 	//delete m_pTextTexture;
 }
 void WorldLevel::Update(float elapsedSec) {
+	m_fps = 1 / elapsedSec;
+
 	int mouseX, mouseY;
 	SDL_GetMouseState(&mouseX, &mouseY);
 	m_mousePos = Vector2f { float(mouseX), float(mouseY) };
@@ -257,6 +259,10 @@ void WorldLevel::ProcessImGui() {
 			ImGui::EndMenu();
 		}
 
+		if (ImGui::BeginMenu(std::to_string(m_fps).c_str())) {
+			ImGui::EndMenu();
+		}
+
 		ImGui::EndMainMenuBar();
 	}
 
diff --git a/Game/Levels/World/WorldLevel.h b/Game/Levels/World/WorldLevel.h
index e6224e6..ed55c7d 100644
--- a/Game/Levels/World/WorldLevel.h
+++ b/Game/Levels/World/WorldLevel.h
@@ -29,6 +29,8 @@ public:
 	std::vector<Collision::CollisionRect> m_Rects;
 
 private:
+	double m_fps{ 0.0f };
+	
 	WorldGridManager m_gridManager {};
 	Player m_player;
 	Vector2f m_mousePos {};
diff --git a/Game/main.cpp b/Game/main.cpp
index 12645b8..ab3bf77 100644
--- a/Game/main.cpp
+++ b/Game/main.cpp
@@ -14,7 +14,7 @@ int SDL_main(int argv, char** args) {
 
 	new Button();
 
-	auto pGame { new Game { Window { "Motherload - Verhulst, Bram - 1DAEGD16E", Viewport.x, Viewport.y } } };
+	auto pGame { new Game { Window { "Motherload - Verhulst, Bram - 1DAEGD16E", Viewport.x, Viewport.y, false} } };
 	pGame->Run();
 	delete pGame;