Rework arcball camera controller

This commit is contained in:
Georg Hagen
2024-07-02 15:05:06 +02:00
parent 2adf8d7b8e
commit 410f6b11a6
5 changed files with 116 additions and 33 deletions

View File

@@ -18,18 +18,31 @@ namespace OpenVulkano
class ArcballCameraController final : public CameraController
{
Math::Vector4f_SIMD m_pivotPoint{ 0, 0, 0, 1 };
float yaw = 0, pitch = 0;
bool lockYaw = false, lockPitch = false;
Math::Vector4f m_pivotPoint{ 0, 0, 0, 1 };
float m_yaw = 0, m_pitch = 0, m_distance = 3;
Input::InputAction* m_actionForward = nullptr;
Input::InputAction* m_actionSide = nullptr;
Input::InputAction* m_actionUp = nullptr;
Input::InputAction* m_actionLookUp = nullptr;
Input::InputAction* m_actionLookSide = nullptr;
Input::InputAction* m_actionForwardOrtho = nullptr;
Input::InputAction* m_actionSideOrtho = nullptr;
Input::InputAction* m_actionUpOrtho = nullptr;
Input::InputAction* m_actionZoomOrtho = nullptr;
Math::Vector4f m_framePosition;
bool m_frameUpdated = false;
bool m_lockYaw = false, m_lockPitch = false;
void SetupInputActions();
void HandleRotation();
void HandleMovement();
void HandleMovementOrtho();
public:
ArcballCameraController() { SetupInputActions(); }
@@ -37,9 +50,9 @@ namespace OpenVulkano
void Tick() override;
[[nodiscard]] const Math::Vector4f_SIMD& GetPivotPoint() const { return m_pivotPoint; }
[[nodiscard]] const Math::Vector4f& GetPivotPoint() const { return m_pivotPoint; }
void SetPivotPoint(const Math::Vector4f_SIMD& pivotPoint) { m_pivotPoint = pivotPoint; }
void SetPivotPoint(const Math::Vector4f& pivotPoint, bool updateDistance = false);
void SetActive() override;
@@ -47,13 +60,15 @@ namespace OpenVulkano
void Init(Scene::Camera *camera) override { CameraController::SetCamera(camera); SetActive(); }
void LockYaw(float value = INFINITY, bool locked = true) { lockYaw = locked; if (value != INFINITY) yaw = value; }
void LockPitch(float value = INFINITY, bool locked = true) { lockPitch = locked; if (value != INFINITY) pitch = value; }
void LockYaw(float value = INFINITY, bool locked = true) { m_lockYaw = locked; if (value != INFINITY) m_yaw = value; }
void LockPitch(float value = INFINITY, bool locked = true) { m_lockPitch = locked; if (value != INFINITY) m_pitch = value; }
[[nodiscard]] float GetYaw() const { return yaw; }
[[nodiscard]] float GetPitch() const { return pitch; }
[[nodiscard]] float GetYaw() const { return m_yaw; }
[[nodiscard]] float GetPitch() const { return m_pitch; }
[[nodiscard]] float GetDistance() const { return m_distance; }
void SetYaw(float y) { yaw = y; }
void SetPitch(float p) { pitch = p; }
void SetYaw(float y) { m_yaw = y; }
void SetPitch(float p) { m_pitch = p; }
void SetDistance(float dist) { m_distance = dist; }
};
}