diff --git a/openVulkanoCpp/Controller/ArcballCameraController.cpp b/openVulkanoCpp/Controller/ArcballCameraController.cpp index 19af69b..65f1b2e 100644 --- a/openVulkanoCpp/Controller/ArcballCameraController.cpp +++ b/openVulkanoCpp/Controller/ArcballCameraController.cpp @@ -16,31 +16,36 @@ namespace OpenVulkano { constexpr float MAX_ZOOM = 40; constexpr float MIN_ZOOM = 7; - constexpr float ZOOM_RANGE = MAX_ZOOM - MIN_ZOOM; + [[maybe_unused]] constexpr float ZOOM_RANGE = MAX_ZOOM - MIN_ZOOM; } void ArcballCameraController::SetupInputActions() { - auto input = Input::InputManager::GetInstance(); - m_actionForward = input->GetAction("forward"); - m_actionSide = input->GetAction("side"); - m_actionUp = input->GetAction("up"); - m_actionLookUp = input->GetAction("look up"); + Input::InputManager* input = Input::InputManager::GetInstance(); + m_actionForward = input->GetAction("forward"); + m_actionSide = input->GetAction("side"); + m_actionUp = input->GetAction("up"); + m_actionLookUp = input->GetAction("look up"); m_actionLookSide = input->GetAction("look side"); m_actionForwardOrtho = input->GetAction("ArcForwardOrtho"); - m_actionSideOrtho = input->GetAction("ArcSideOrtho"); - m_actionUpOrtho = input->GetAction("ArcUpOrtho"); - m_actionZoomOrtho = input->GetAction("ArcZoomOrtho"); + m_actionSideOrtho = input->GetAction("ArcSideOrtho"); + m_actionUpOrtho = input->GetAction("ArcUpOrtho"); + m_actionZoomOrtho = input->GetAction("ArcZoomOrtho"); } void ArcballCameraController::HandleRotation() { Input::InputManager* input = Input::InputManager::GetInstance(); - float inYaw = (m_lockYaw) ? 0 : input->GetAxis(m_actionLookSide); - float inPitch = (m_lockPitch) ? 0 : input->GetAxis(m_actionLookUp); - if (inYaw != 0 || inPitch != 0 || m_distUpated) +#pragma clang diagnostic push +#pragma ide diagnostic ignored "ConstantConditionsOC" +#pragma ide diagnostic ignored "UnreachableCode" + float inYaw = m_lockYaw ? 0 : input->GetAxis(m_actionLookSide); + float inPitch = m_lockPitch ? 0 : input->GetAxis(m_actionLookUp); +#pragma clang diagnostic pop + + if (inYaw != 0 || inPitch != 0 || m_distUpdated) { m_yaw += inYaw; m_pitch = std::min(1.5f, std::max(-1.5f, m_pitch + inPitch)); @@ -51,7 +56,7 @@ namespace OpenVulkano m_framePosition = rotateX * rotateY * Math::Vector4f_SIMD(0, 0, m_frameDistance, 0); m_framePosition += m_pivotPoint; m_frameUpdated = true; - m_distUpated = false; + m_distUpdated = false; } } diff --git a/openVulkanoCpp/Controller/ArcballCameraController.hpp b/openVulkanoCpp/Controller/ArcballCameraController.hpp index 6bc898b..7023f39 100644 --- a/openVulkanoCpp/Controller/ArcballCameraController.hpp +++ b/openVulkanoCpp/Controller/ArcballCameraController.hpp @@ -32,7 +32,7 @@ namespace OpenVulkano Input::InputAction* m_actionZoomOrtho = nullptr; Math::Vector4f m_framePosition; - bool m_frameUpdated = false, m_distUpated = true; + bool m_frameUpdated = false, m_distUpdated = true; bool m_lockYaw = false, m_lockPitch = false; float m_movementSpeedModifier = 3; @@ -72,7 +72,7 @@ namespace OpenVulkano void SetYaw(float y) { m_yaw = y; } void SetPitch(float p) { m_pitch = p; } - void SetDistance(float dist) { m_distance = dist; m_distUpated = true; } + void SetDistance(float dist) { m_distance = dist; m_distUpdated = true; } void SetMovementSpeedModifier(float speed = 3) { m_movementSpeedModifier = speed; } }; }