Cleaned up Leap class

SetEnabledDebugDrawing is now being called in the main.cpp instead of the Leap.cpp Removed m_Renderer variable in the Leap class
LeeVangraefschepe · Nov 12, 2023 · 29d1cd7 · 29d1cd7
1 parent 118668e
commit 29d1cd7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/LeapEngine/Leap.cpp b/LeapEngine/Leap.cpp
@@ -52,8 +52,7 @@ leap::LeapEngine::LeapEngine(int width, int height, const std::string& title)
     Debug::Log("LeapEngine Log: Registering default physics (PhysX)");
     ServiceLocator::RegisterPhysics<physics::PhysXEngine>();
 
-    m_pRenderer = &ServiceLocator::GetRenderer();
-    m_pRenderer->Initialize();
+    ServiceLocator::GetRenderer().Initialize();
 
     // Set default icon
     Debug::Log("LeapEngine Log: Setting default window icon");
@@ -69,8 +68,8 @@ leap::LeapEngine::~LeapEngine()
 
 void leap::LeapEngine::Run(int desiredFPS)
 {
-    auto& input = input::InputManager::GetInstance();
-    auto& gameContext = GameContext::GetInstance();
+    auto& input{ input::InputManager::GetInstance() };
+    auto& gameContext{ GameContext::GetInstance() };
 
     Debug::Log("LeapEngine Log: Loading default scene");
     auto& sceneManager = SceneManager::GetInstance();
@@ -80,16 +79,16 @@ void leap::LeapEngine::Run(int desiredFPS)
     const int frameTimeNs{ 1'000'000'000 / desiredFPS };
     float fixedTotalTime{};
 
-    auto& audio = ServiceLocator::GetAudio();
-    auto& physics = ServiceLocator::GetPhysics();
+    auto& audio{ ServiceLocator::GetAudio() };
+    auto& physics{ ServiceLocator::GetPhysics() };
     physics.SetSyncFunc(PhysicsSync::SetTransform, PhysicsSync::GetTransform);
     physics.OnCollisionEnter().AddListener(PhysicsSync::OnCollisionEnter);
     physics.OnCollisionStay().AddListener(PhysicsSync::OnCollisionStay);
     physics.OnCollisionExit().AddListener(PhysicsSync::OnCollisionExit);
     physics.OnTriggerEnter().AddListener(PhysicsSync::OnTriggerEnter);
     physics.OnTriggerStay().AddListener(PhysicsSync::OnTriggerStay);
     physics.OnTriggerExit().AddListener(PhysicsSync::OnTriggerExit);
-    physics.SetEnabledDebugDrawing(true);
+    auto& renderer{ ServiceLocator::GetRenderer() };
 
     while (!glfwWindowShouldClose(m_pWindow))
     {
@@ -118,12 +117,12 @@ void leap::LeapEngine::Run(int desiredFPS)
 
         sceneManager.LateUpdate();
 
-        m_pRenderer->GuiDraw();
+        renderer.GuiDraw();
         sceneManager.OnGUI();
         gameContext.OnGUI();
 
-        m_pRenderer->DrawLines(physics.GetDebugDrawings());
-        m_pRenderer->Draw();
+        renderer.DrawLines(physics.GetDebugDrawings());
+        renderer.Draw();
         glfwSwapBuffers(m_pWindow);
 
         sceneManager.OnFrameEnd();

diff --git a/LeapEngine/Leap.h b/LeapEngine/Leap.h
@@ -25,6 +25,5 @@ namespace leap
 
 	private:
 		GLFWwindow* m_pWindow{};
-		leap::graphics::IRenderer* m_pRenderer{};
 	};
 }
diff --git a/UnnamedAdventureGame/main.cpp b/UnnamedAdventureGame/main.cpp
@@ -4,6 +4,8 @@
 #include "GameContext/Logger/ImGuiLogger.h"
 #include "SceneGraph/SceneManager.h"
 #include "Scenes/MainMenuScene.h"
+#include <ServiceLocator/ServiceLocator.h>
+#include <Interfaces/IPhysics.h>
 
 #if _DEBUG
 #include <vld.h>
@@ -13,6 +15,7 @@ int main()
 {
 	leap::GameContext::GetInstance().AddLogger<leap::ImGuiLogger>();
 	leap::LeapEngine engine{ 1280, 720, "Leap game engine" };
+	leap::ServiceLocator::GetPhysics().SetEnabledDebugDrawing(true);
 	leap::SceneManager::GetInstance().AddScene("Test scene", unag::MainMenuScene::Load);
 	engine.Run(60);
 	return 0;