✨ Refactor mouse event handling across scenes: unify MouseEvent usage with engine::ui::MouseEvent for consistency and improved integration

Author: adam4813

include/core/scenes/achievements_scene.hpp

@@ -8,21 +8,23 @@ namespace towerforge::ui {
 }
 
 namespace towerforge::core {
-
     class AchievementsScene : public GameScene {
     public:
-        AchievementsScene(Game* game, ui::AchievementsMenu& achievements_menu);
+        AchievementsScene(Game *game, ui::AchievementsMenu &achievements_menu);
+
         ~AchievementsScene() override = default;
 
         void Initialize() override;
+
         void Shutdown() override;
+
         void Update(float delta_time) override;
+
         void Render() override;
 
-    private:
-        void HandleInput();
+        void HandleMouseEvent(const engine::ui::MouseEvent &event) override;
 
-        ui::AchievementsMenu& achievements_menu_;
+    private:
+        ui::AchievementsMenu &achievements_menu_;
     };
-
 }

include/core/scenes/game_scene.hpp

@@ -2,22 +2,30 @@
 
 #include <functional>
 
-namespace towerforge::core {
+import engine;
 
+namespace towerforge::core {
     class Game;
 
     class GameScene {
     public:
-        explicit GameScene(Game* game) : game_(game) {}
+        explicit GameScene(Game *game) : game_(game) {
+        }
+
         virtual ~GameScene() = default;
 
         virtual void Initialize() = 0;
+
         virtual void Shutdown() = 0;
+
         virtual void Update(float delta_time) = 0;
+
+        virtual void HandleMouseEvent(const engine::ui::MouseEvent &event) {
+        }
+
         virtual void Render() = 0;
 
     protected:
-        Game* game_;
+        Game *game_;
     };
-
 }

include/core/scenes/ingame_scene.hpp

@@ -26,7 +26,6 @@ namespace towerforge::rendering {
 }
 
 namespace towerforge::core {
-
     // Forward declarations
     class ECSWorld;
     class SaveLoadManager;
@@ -36,23 +35,31 @@ namespace towerforge::core {
 
     class InGameScene : public GameScene {
     public:
-        explicit InGameScene(Game* game);
+        explicit InGameScene(Game *game);
+
         ~InGameScene() override;
 
         void Initialize() override;
+
         void Shutdown() override;
+
         void Update(float delta_time) override;
+
         void Render() override;
 
     protected:
-        void HandleInput();
+        void HandleMouseEvent(const engine::ui::MouseEvent &event) override;
+
         void CalculateTowerRating();
+
         void UpdateCameraBounds() const;
+
         ui::IncomeBreakdown CollectIncomeAnalytics() const;
+
         ui::PopulationBreakdown CollectPopulationAnalytics() const;
 
-        audio::AudioManager* audio_manager_;
-        AchievementManager* achievement_manager_;
+        audio::AudioManager *audio_manager_;
+        AchievementManager *achievement_manager_;
 
         // InGame systems
         std::unique_ptr<ECSWorld> ecs_world_;
@@ -94,5 +101,4 @@ namespace towerforge::core {
         const float time_step_;
         const float total_time_;
     };
-
 }

include/core/scenes/settings_scene.hpp

@@ -9,28 +9,30 @@ namespace towerforge::ui {
 }
 
 namespace towerforge::core {
-
     class SettingsScene : public GameScene {
     public:
-        SettingsScene(Game* game, ui::GeneralSettingsMenu& general_settings_menu,
-                     ui::AudioSettingsMenu& audio_settings_menu,
-                     ui::AccessibilitySettingsMenu& accessibility_settings_menu);
+        SettingsScene(Game *game, ui::GeneralSettingsMenu &general_settings_menu,
+                      ui::AudioSettingsMenu &audio_settings_menu,
+                      ui::AccessibilitySettingsMenu &accessibility_settings_menu);
+
         ~SettingsScene() override = default;
 
         void Initialize() override;
+
         void Shutdown() override;
+
         void Update(float delta_time) override;
+
         void Render() override;
 
+        void HandleMouseEvent(const engine::ui::MouseEvent &event) override;
+
     private:
-        void HandleInput();
+        ui::GeneralSettingsMenu &general_settings_menu_;
+        ui::AudioSettingsMenu &audio_settings_menu_;
+        ui::AccessibilitySettingsMenu &accessibility_settings_menu_;
 
-        ui::GeneralSettingsMenu& general_settings_menu_;
-        ui::AudioSettingsMenu& audio_settings_menu_;
-        ui::AccessibilitySettingsMenu& accessibility_settings_menu_;
-        
         bool in_audio_settings_ = false;
         bool in_accessibility_settings_ = false;
     };
-
 }

include/ui/accessibility_settings_menu.h

@@ -8,9 +8,6 @@
 import engine;
 
 namespace towerforge::ui {
-    // Forward declarations
-    struct MouseEvent;
-
     /**
      * @brief Accessibility settings menu for configuring accessibility features
      * 
@@ -57,7 +54,7 @@ namespace towerforge::ui {
          * @param event Mouse event data
          * @return true if event was consumed
          */
-        bool ProcessMouseEvent(const MouseEvent &event) const;
+        bool ProcessMouseEvent(const engine::ui::MouseEvent &event) const;
 
         /**
          * @brief Handle keyboard input for menu navigation

include/ui/achievements_menu.h

@@ -9,8 +9,6 @@
 import engine;
 
 namespace towerforge::ui {
-    struct MouseEvent;
-
     /**
      * @brief Achievements menu for displaying unlocked and locked achievements
      * 
@@ -52,7 +50,7 @@ namespace towerforge::ui {
          * @param event Mouse event data
          * @return true if event was consumed
          */
-        bool ProcessMouseEvent(const MouseEvent &event) const;
+        bool ProcessMouseEvent(const engine::ui::MouseEvent &event) const;
 
         /**
          * @brief Handle keyboard input for menu navigation
@@ -94,7 +92,7 @@ namespace towerforge::ui {
          * @return Unique pointer to the constructed container
          */
         std::unique_ptr<engine::ui::elements::Container> CreateAchievementItem(
-            const towerforge::core::Achievement& achievement,
+            const towerforge::core::Achievement &achievement,
             bool is_unlocked,
             float item_width) const;
 

include/ui/audio_settings_menu.h

@@ -9,8 +9,6 @@
 import engine;
 
 namespace towerforge::ui {
-    // Forward declaration
-    struct MouseEvent;
 
     /**
      * @brief Audio settings menu for adjusting volume levels
@@ -57,7 +55,7 @@ namespace towerforge::ui {
          * @param event Mouse event data
          * @return true if event was consumed
          */
-        bool ProcessMouseEvent(const MouseEvent &event) const;
+        bool ProcessMouseEvent(const engine::ui::MouseEvent &event) const;
 
         /**
          * @brief Handle keyboard input for menu navigation

include/ui/build_menu.h

@@ -10,7 +10,6 @@ import engine;
 namespace towerforge::ui {
     // Forward declarations
     class TooltipManager;
-    struct MouseEvent;
 
     /**
      * @brief Facility categories for organized building menu
@@ -148,7 +147,7 @@ namespace towerforge::ui {
         /**
          * @brief Handle mouse events
          */
-        bool ProcessMouseEvent(const MouseEvent &event) const;
+        bool ProcessMouseEvent(const engine::ui::MouseEvent &event) const;
 
     private:
         void UpdateLayout();

include/ui/general_settings_menu.h

@@ -8,8 +8,6 @@
 import engine;
 
 namespace towerforge::ui {
-    struct MouseEvent;
-
     /**
      * @brief Settings options available in the general settings menu
      */
@@ -58,7 +56,7 @@ namespace towerforge::ui {
          * @param event Mouse event data
          * @return true if event was consumed
          */
-        bool ProcessMouseEvent(const MouseEvent &event) const;
+        bool ProcessMouseEvent(const engine::ui::MouseEvent &event) const;
 
         /**
          * @brief Handle keyboard input for menu navigation

include/ui/hud/hud.h

@@ -6,9 +6,9 @@
 #include <functional>
 #include <variant>
 
-namespace towerforge::ui {
-	struct MouseEvent;
+import engine;
 
+namespace towerforge::ui {
 	// Forward declarations
 	class UIWindowManager;
 	class TooltipManager;
@@ -151,9 +151,9 @@ namespace towerforge::ui {
  */
 	class HUD {
 	public:
-	/**
-		 * @brief Callback type for action bar actions
-		 */
+		/**
+			 * @brief Callback type for action bar actions
+			 */
 		using ActionBarCallback = std::function<void(int action)>;
 		using DemolishFacilityCallback = std::function<void()>;
 
@@ -213,7 +213,7 @@ namespace towerforge::ui {
 	 * @param event Mouse event data
 	 * @return true if event was consumed by HUD
 	 */
-		bool ProcessMouseEvent(const MouseEvent &event) const;
+		bool ProcessMouseEvent(const engine::ui::MouseEvent &event) const;
 
 		/**
 	 * @brief Update tooltips based on mouse position