improve the mouse movement

Author: rfdickerson

src/core/EventManager.hpp

@@ -6,6 +6,8 @@ namespace reactor {
 
 enum class EventType {
     MouseMoved,
+    MouseButtonPressed,
+    MouseButtonReleased,
     KeyPressed,
     KeyReleased,
 };
@@ -16,6 +18,10 @@ struct Event {
         struct {
             double x, y;
         } mouseMove;
+        struct {
+            int button;
+            double x, y;
+        } mouseButton;
         struct {
             int key;
         } keyboard;

src/core/OrbitController.cpp

@@ -22,9 +22,19 @@ void OrbitController::onEvent(const Event &event) {
              float max_elev = glm::radians(85.0f);
              m_elevation = glm::clamp(m_elevation, -max_elev, max_elev);
              updateCamera();
+             m_lastX = event.mouseMove.x;
+             m_lastY = event.mouseMove.y;
+         }
+         break;
+     case EventType::MouseButtonPressed:
+         if (event.mouseButton.button == 0) {
+             m_rotating = true;
+         }
+         break;
+     case EventType::MouseButtonReleased:
+         if (event.mouseButton.button == 0) {
+             m_rotating = false;
          }
-         m_lastX = event.mouseMove.x;
-         m_lastY = event.mouseMove.y;
          break;
      case EventType::KeyPressed:
          break;

src/core/OrbitController.hpp

@@ -17,7 +17,7 @@ class OrbitController final : public IEventListener {
     float m_azimuth = 0.0f;
     float m_elevation = 0.0f;
 
-    bool m_rotating = true;
+    bool m_rotating = false;
     double m_lastX = 0.0;
     double m_lastY = 0.0;
 

src/core/Window.cpp

@@ -24,7 +24,8 @@ m_width(width), m_height(height), m_title(title), m_eventManager(eventManager) {
         glfwSetFramebufferSizeCallback(m_window, framebufferResizeCallback);
 
         glfwSetKeyCallback(m_window, keyCallback);
-        glfwSetCursorPosCallback(m_window, mouseButtonCallback);
+        glfwSetCursorPosCallback(m_window, cursorPosCallback);
+        glfwSetMouseButtonCallback(m_window, mouseButtonCallback);
     }
 
     // The destructor cleans up GLFW resources.
@@ -83,9 +84,28 @@ m_width(width), m_height(height), m_title(title), m_eventManager(eventManager) {
         }
 
     }
-    void Window::mouseButtonCallback(GLFWwindow *window, double xpos, double ypos) {
+
+    void Window::mouseButtonCallback(GLFWwindow *window, int button, int action, int mods) {
+        auto* windowInstance = static_cast<Window*>(glfwGetWindowUserPointer(window));
+        if (!windowInstance) return;
+
+        Event event{};
+        if (action == GLFW_PRESS) {
+            event.type = EventType::MouseButtonPressed;
+            event.mouseButton.button = button;
+            windowInstance->m_eventManager.post(event);
+        } else if (action == GLFW_RELEASE) {
+            event.type = EventType::MouseButtonReleased;
+            event.mouseButton.button = button;
+        }
+
+        windowInstance->m_eventManager.post(event);
+    }
+
+    void Window::cursorPosCallback(GLFWwindow *window, double xpos, double ypos) {
         auto* windowInstance = static_cast<Window*>(glfwGetWindowUserPointer(window));
         if (!windowInstance) return;
+
         Event event{};
         event.type = EventType::MouseMoved;
         event.mouseMove.x = xpos;

src/core/Window.hpp

@@ -52,7 +52,8 @@ namespace reactor {
         // This is the static callback function that GLFW will call on resize events.
         static void framebufferResizeCallback(GLFWwindow* window, int width, int height);
         static void keyCallback(GLFWwindow* window, int key, int scancode, int action, int mods);
-        static void mouseButtonCallback(GLFWwindow* window, double xpos, double ypos);
+        static void mouseButtonCallback(GLFWwindow* window, int button, int action, int mods);
+        static void cursorPosCallback(GLFWwindow* window, double xpos, double ypos);
 
         GLFWwindow* m_window = nullptr;
         EventManager& m_eventManager;

src/imgui/Imgui.cpp

@@ -85,9 +85,9 @@ void Imgui::createFrame() {
     ImGui::NewFrame();
     //ImGui::ShowDemoWindow();
         ImGui::Begin("Composite");
-        ImGui::SliderFloat("Exposure", &m_exposure, 0.0, 1.0);
-        ImGui::SliderFloat("Contrast", &m_contrast, 0.0, 1.0);
-        ImGui::SliderFloat("Saturation", &m_saturation, 0.0, 1.0);
+        ImGui::SliderFloat("Exposure", &m_exposure, 0.0, 2.0);
+        ImGui::SliderFloat("Contrast", &m_contrast, 0.0, 2.0);
+        ImGui::SliderFloat("Saturation", &m_saturation, 0.0, 2.0);
 
         ImGui::End();
 }

src/vulkan/VulkanRenderer.cpp

@@ -28,6 +28,8 @@ VulkanRenderer::VulkanRenderer(const RendererConfig &config) : m_config(config)
     m_camera = std::make_unique<Camera>();
     m_orbitController = std::make_unique<OrbitController>(*m_camera);
     m_eventManager->subscribe(EventType::MouseMoved, m_orbitController.get());
+    m_eventManager->subscribe(EventType::MouseButtonPressed, m_orbitController.get());
+    m_eventManager->subscribe(EventType::MouseButtonReleased, m_orbitController.get());
 }
 
 void VulkanRenderer::createCoreVulkanObjects() {