From 843aebeafada561c372d31ba9cfba4ffe93eaa5b Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Sun, 26 Jan 2025 19:08:01 +0100 Subject: [PATCH] Remove includes --- .../Scene/MorphableCameraController.hpp | 45 ++++++++++--------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/openVulkanoCpp/Scene/MorphableCameraController.hpp b/openVulkanoCpp/Scene/MorphableCameraController.hpp index 4eaa80d..69cbca5 100644 --- a/openVulkanoCpp/Scene/MorphableCameraController.hpp +++ b/openVulkanoCpp/Scene/MorphableCameraController.hpp @@ -7,34 +7,39 @@ #include "MorphableCamera.hpp" #include "Controller/CameraController.hpp" -#include "Input/InputManager.hpp" -#include "Input/InputKey.hpp" -#include "Math/Math.hpp" -namespace OpenVulkano::Scene +namespace OpenVulkano { - class MorphableCameraController final : public CameraController + namespace Input { - double m_animationDuration; - double m_currentTime; - bool m_isMorphing; - bool m_targetMorphStatePerspective; // true for perspective, false for orthographic + class InputAction; + } - Input::InputAction* m_actionMorph; - bool m_wasMorphingKeyDown = false; + namespace Scene + { + class MorphableCameraController final : public CameraController + { + double m_animationDuration; + double m_currentTime; + bool m_isMorphing; + bool m_targetMorphStatePerspective; // true for perspective, false for orthographic - public: - MorphableCameraController(MorphableCamera* camera = nullptr); + Input::InputAction* m_actionMorph; + bool m_wasMorphingKeyDown = false; + + public: + MorphableCameraController(MorphableCamera* camera = nullptr); #pragma clang diagnostic push #pragma clang diagnostic ignored "-Woverloaded-virtual" - void Init(MorphableCamera* camera); + void Init(MorphableCamera* camera); #pragma clang diagnostic pop - void Tick() override; + void Tick() override; - void SetDuration(double duration) { m_animationDuration = duration; } - [[nodiscard]] double GetDuration() { return m_animationDuration; } - void SetTargetState(bool toPerspective); - void Reset() { m_currentTime = 0; } - }; + void SetDuration(const double duration) { m_animationDuration = duration; } + [[nodiscard]] double GetDuration() const { return m_animationDuration; } + void SetTargetState(bool toPerspective); + void Reset() { m_currentTime = 0; } + }; + } } \ No newline at end of file