GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Silence warnings

Browse Source
This commit is contained in:
Georg Hagen
2025-05-23 00:57:43 +02:00
parent fb1c52265a
commit 33f53a533c
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
openVulkanoCpp/Controller/ArcballCameraController.cpp
View File

@@ -16,12 +16,12 @@ namespace OpenVulkano
{ {
constexpr float MAX_ZOOM = 40; constexpr float MAX_ZOOM = 40;
constexpr float MIN_ZOOM = 7; 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() void ArcballCameraController::SetupInputActions()
{ {
auto input = Input::InputManager::GetInstance(); Input::InputManager* input = Input::InputManager::GetInstance();
m_actionForward = input->GetAction("forward"); m_actionForward = input->GetAction("forward");
m_actionSide = input->GetAction("side"); m_actionSide = input->GetAction("side");
m_actionUp = input->GetAction("up"); m_actionUp = input->GetAction("up");
@@ -37,10 +37,15 @@ namespace OpenVulkano
void ArcballCameraController::HandleRotation() void ArcballCameraController::HandleRotation()
{ {
Input::InputManager* input = Input::InputManager::GetInstance(); 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_yaw += inYaw;
m_pitch = std::min(1.5f, std::max(-1.5f, m_pitch + inPitch)); 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 = rotateX * rotateY * Math::Vector4f_SIMD(0, 0, m_frameDistance, 0);
m_framePosition += m_pivotPoint; m_framePosition += m_pivotPoint;
m_frameUpdated = true; m_frameUpdated = true;
m_distUpated = false; m_distUpdated = false;
} }
} }

4
openVulkanoCpp/Controller/ArcballCameraController.hpp
View File

@@ -32,7 +32,7 @@ namespace OpenVulkano
Input::InputAction* m_actionZoomOrtho = nullptr; Input::InputAction* m_actionZoomOrtho = nullptr;
Math::Vector4f m_framePosition; 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; bool m_lockYaw = false, m_lockPitch = false;
float m_movementSpeedModifier = 3; float m_movementSpeedModifier = 3;
@@ -72,7 +72,7 @@ namespace OpenVulkano
void SetYaw(float y) { m_yaw = y; } void SetYaw(float y) { m_yaw = y; }
void SetPitch(float p) { m_pitch = p; } 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; } void SetMovementSpeedModifier(float speed = 3) { m_movementSpeedModifier = speed; }
}; };
} }