input_manager: init

furkansarihan · Nov 9, 2023 · d8c2583 · d8c2583
1 parent 0ebf19f
commit d8c2583
Show file tree

Hide file tree

Showing 8 changed files with 1,212 additions and 21 deletions.
diff --git a/dev/src/main.cpp b/dev/src/main.cpp
@@ -47,6 +47,7 @@ int main()
     DebugDrawer *debugDrawer = enigine.debugDrawer;
     UpdateManager *updateManager = enigine.updateManager;
     TaskManager *taskManager = enigine.taskManager;
+    InputManager *inputManager = enigine.inputManager;
     SoundEngine *soundEngine = enigine.soundEngine;
     Camera *mainCamera = enigine.mainCamera;
 
@@ -129,9 +130,8 @@ int main()
 
     car.m_controlVehicle = true;
     car.m_followVehicle = true;
-    // TODO: input manager
-    glfwSetWindowUserPointer(window, &car);
-    glfwSetKeyCallback(window, car.staticKeyCallback);
+    inputManager->addKeyListener(std::bind(&CarController::keyListener, &car,
+                                           std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5));
 
     // TODO: before character - parent transform - ?
     updateManager->add(&car);

diff --git a/src/car_controller/car_controller.cpp b/src/car_controller/car_controller.cpp
@@ -144,7 +144,7 @@ CarController::~CarController()
         delete m_tireSmokeParticles[i];
 }
 
-void CarController::keyCallback(GLFWwindow *window, int key, int scancode, int action, int mods)
+void CarController::keyListener(GLFWwindow *window, int key, int scancode, int action, int mods)
 {
     if (key == GLFW_KEY_1 && action == GLFW_PRESS)
     {
@@ -170,12 +170,6 @@ void CarController::keyCallback(GLFWwindow *window, int key, int scancode, int a
     }
 }
 
-void CarController::staticKeyCallback(GLFWwindow *window, int key, int scancode, int action, int mods)
-{
-    CarController *cc = (CarController *)glfwGetWindowUserPointer(window);
-    cc->keyCallback(window, key, scancode, action, mods);
-}
-
 void CarController::update(float deltaTime)
 {
     m_vehicle->update(deltaTime);

diff --git a/src/car_controller/car_controller.h b/src/car_controller/car_controller.h
@@ -107,8 +107,7 @@ class CarController : public Updatable
     void updateTireSmoke(int index, float deltaTime);
     glm::mat4 translateOffset(glm::vec3 offset);
     void followCar(float deltaTime);
-    void keyCallback(GLFWwindow *window, int key, int scancode, int action, int mods);
-    static void staticKeyCallback(GLFWwindow *window, int key, int scancode, int action, int mods);
+    void keyListener(GLFWwindow *window, int key, int scancode, int action, int mods);
 
 private:
     int m_keyForward = GLFW_KEY_W;

diff --git a/src/enigine.cpp b/src/enigine.cpp
@@ -6,14 +6,6 @@ Enigine::Enigine()
 
 Enigine::~Enigine()
 {
-    // cleanup imgui
-    ImGui_ImplOpenGL3_Shutdown();
-    ImGui_ImplGlfw_Shutdown();
-    ImGui::DestroyContext();
-    // cleanup glfw
-    glfwDestroyWindow(window);
-    glfwTerminate();
-
     // cleanup objects
     delete physicsWorld;
     delete debugDrawer;
@@ -22,12 +14,22 @@ Enigine::~Enigine()
     delete resourceManager;
     delete renderManager;
     delete taskManager;
+    delete inputManager;
     delete mainCamera;
 
     // cleanup ui
     for (int i = 0; i < rootUI->m_uiList.size(); i++)
         delete rootUI->m_uiList[i];
     delete rootUI;
+
+    // cleanup imgui
+    ImGui_ImplOpenGL3_Shutdown();
+    ImGui_ImplGlfw_Shutdown();
+    ImGui::DestroyContext();
+
+    // cleanup glfw
+    glfwDestroyWindow(window);
+    glfwTerminate();
 }
 
 // TODO: return init result enum
@@ -119,6 +121,7 @@ int Enigine::init()
     renderManager = new RenderManager(shaderManager, mainCamera, &cube, &quad, &icosahedron, q_vao);
     updateManager = new UpdateManager();
     taskManager = new TaskManager();
+    inputManager = new InputManager(window);
 
     // Time
     lastFrame = (float)glfwGetTime();
@@ -145,7 +148,7 @@ int Enigine::init()
     shadowmapUI = new ShadowmapUI(renderManager->m_shadowManager, renderManager->m_shadowmapManager);
     CameraUI *cameraUI = new CameraUI(mainCamera);
     ResourceUI *resourceUI = new ResourceUI(resourceManager);
-    renderUI = new RenderUI(window, renderManager, resourceManager);
+    renderUI = new RenderUI(inputManager, renderManager, resourceManager);
     PhysicsWorldUI *physicsWorldUI = new PhysicsWorldUI(physicsWorld, debugDrawer);
     rootUI->m_uiList.push_back(systemMonitorUI);
     rootUI->m_uiList.push_back(shadowmapUI);

diff --git a/src/enigine.h b/src/enigine.h
@@ -60,6 +60,7 @@ class Enigine
     RenderManager *renderManager;
     UpdateManager *updateManager;
     TaskManager *taskManager;
+    InputManager *inputManager;
 
     GLFWwindow *window;
     task_basic_info t_info;