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

Update ArcballCameraController

Browse Source
This commit is contained in:
Georg Hagen
2024-06-24 16:49:56 +02:00
parent f011a0a4f5
commit 61929e61d3
3 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
openVulkanoCpp/Controller/ArcballCameraController.cpp
View File

@@ -25,21 +25,18 @@ namespace OpenVulkano
void ArcballCameraController::Tick() void ArcballCameraController::Tick()
{ {
if (!GetCamera()) return; if (!GetCamera()) return;
auto input = Input::InputManager::GetInstance(); Input::InputManager* input = Input::InputManager::GetInstance();
Math::Vector4f_SIMD position = GetCamera()->GetPosition(); Math::Vector4f_SIMD position = GetCamera()->GetPosition();
float yaw = input->GetAxis(m_actionLookSide); yaw += input->GetAxis(m_actionLookSide);
float pitch = input->GetAxis(m_actionLookUp); pitch += input->GetAxis(m_actionLookUp);
// Handle issue with camera direction being the same as the up vector pitch = std::min(1.5f, std::max(-1.5f, pitch));
float cosAngle = dot(Math::Vector3f_SIMD(GetCamera()->GetViewDirection()), m_upVector);
if (cosAngle * Math::Utils::sign(pitch) > 0.99f) pitch = 0;
// Rotate the camera around the pivot point Math::Matrix4f rotateY = Math::Utils::rotate(yaw, Math::Vector3f_SIMD(0, 1, 0));
Math::Matrix4f rotationMatrixX = Math::Utils::rotate(yaw, m_upVector); Math::Vector4f x = rotateY * Math::Vector4f(1, 0, 0, 0);
position = (rotationMatrixX * (position - m_pivotPoint)) + m_pivotPoint; Math::Matrix4f rotateX = Math::Utils::rotate(pitch, Math::Vector3f_SIMD(x));
m_rightVector = Math::Vector3f_SIMD(rotationMatrixX * Math::Vector4f(m_rightVector, 0)); position = rotateX * rotateY * Math::Vector4f_SIMD(0, 0, 3, 0);
Math::Matrix4f rotationMatrixY = Math::Utils::rotate(pitch, m_rightVector); position += m_pivotPoint;
position = (rotationMatrixY * (position - m_pivotPoint)) + m_pivotPoint;
// Move the camera and the pivot point // Move the camera and the pivot point
Math::Vector3f_SIMD vec(input->GetAxis(m_actionSide), input->GetAxis(m_actionUp), -input->GetAxis(m_actionForward)); Math::Vector3f_SIMD vec(input->GetAxis(m_actionSide), input->GetAxis(m_actionUp), -input->GetAxis(m_actionForward));
@@ -60,12 +57,16 @@ namespace OpenVulkano
// Update the camera view // Update the camera view
GetCamera()->SetViewMatrix(Math::Utils::lookAt(reinterpret_cast<Math::Vector3f_SIMD&>(position), GetCamera()->SetViewMatrix(Math::Utils::lookAt(reinterpret_cast<Math::Vector3f_SIMD&>(position),
reinterpret_cast<Math::Vector3f_SIMD&>(m_pivotPoint), reinterpret_cast<Math::Vector3f_SIMD&>(m_pivotPoint),
m_upVector)); Math::Vector3f_SIMD(0,1,0)));
} }
void ArcballCameraController::SetActive() void ArcballCameraController::SetActive()
{ {
m_pivotPoint = GetCamera()->GetPosition() + Math::Vector4f(GetCamera()->GetViewDirection() * 3.0f, 0); Math::Vector3f viewDir = Math::Utils::normalize(GetCamera()->GetViewDirection());
m_pivotPoint = GetCamera()->GetPosition() + Math::Vector4f(viewDir * 3.0f, 0);
pitch = Math::Utils::asin(viewDir.y);
yaw = Math::Utils::atan(-viewDir.x, -viewDir.z);
} }
void ArcballCameraController::SetDefaultKeybindings() void ArcballCameraController::SetDefaultKeybindings()
@@ -80,7 +81,7 @@ namespace OpenVulkano
m_actionUp->BindKey(Input::InputKey::Touch::AXIS_PAN_TWO_FINGERS_Y, 0.03f); m_actionUp->BindKey(Input::InputKey::Touch::AXIS_PAN_TWO_FINGERS_Y, 0.03f);
m_actionLookUp->BindKey(Input::InputKey::Controller::AXIS_RIGHT_Y); m_actionLookUp->BindKey(Input::InputKey::Controller::AXIS_RIGHT_Y);
m_actionLookUp->BindAxisButtons(Input::InputKey::Keyboard::KEY_DOWN, Input::InputKey::Keyboard::KEY_UP); m_actionLookUp->BindAxisButtons(Input::InputKey::Keyboard::KEY_DOWN, Input::InputKey::Keyboard::KEY_UP);
m_actionLookUp->BindKey(Input::InputKey::Touch::AXIS_PAN_Y, 0.001f); m_actionLookUp->BindKey(Input::InputKey::Touch::AXIS_PAN_Y, -0.001f);
m_actionLookSide->BindKey(Input::InputKey::Controller::AXIS_RIGHT_X); m_actionLookSide->BindKey(Input::InputKey::Controller::AXIS_RIGHT_X);
m_actionLookSide->BindAxisButtons(Input::InputKey::Keyboard::KEY_RIGHT, Input::InputKey::Keyboard::KEY_LEFT); m_actionLookSide->BindAxisButtons(Input::InputKey::Keyboard::KEY_RIGHT, Input::InputKey::Keyboard::KEY_LEFT);
m_actionLookSide->BindKey(Input::InputKey::Touch::AXIS_PAN_X, -0.001f); m_actionLookSide->BindKey(Input::InputKey::Touch::AXIS_PAN_X, -0.001f);

2
openVulkanoCpp/Controller/ArcballCameraController.hpp
View File

@@ -18,8 +18,8 @@ namespace OpenVulkano
class ArcballCameraController final : public CameraController class ArcballCameraController final : public CameraController
{ {
Math::Vector3f_SIMD m_upVector{ 0, 1, 0 }, m_rightVector{ 1, 0, 0 };
Math::Vector4f_SIMD m_pivotPoint{ 0, 0, 0, 1 }; Math::Vector4f_SIMD m_pivotPoint{ 0, 0, 0, 1 };
float yaw = 0, pitch = 0;
Input::InputAction* m_actionForward = nullptr; Input::InputAction* m_actionForward = nullptr;
Input::InputAction* m_actionSide = nullptr; Input::InputAction* m_actionSide = nullptr;

9
openVulkanoCpp/Scene/Camera.hpp
View File

@@ -120,11 +120,18 @@ namespace OpenVulkano::Scene
[[nodiscard]] Math::Vector3f GetViewDirection() const [[nodiscard]] Math::Vector3f GetViewDirection() const
{ {
return { m_view[0][2], m_view[1][2], m_view[2][2] }; return { -m_view[0][2], -m_view[1][2], -m_view[2][2] };
}
[[nodiscard]] Math::Vector3f GetUpVector() const
{
return { m_view[0][1], m_view[1][1], m_view[1][2] };
} }
[[nodiscard]] auto GetForward() const { return GetViewDirection(); } [[nodiscard]] auto GetForward() const { return GetViewDirection(); }
[[nodiscard]] const Math::Matrix4f& GetViewMatrix() const { return m_view; }
[[nodiscard]] Math::Frustum GetFrustum() const [[nodiscard]] Math::Frustum GetFrustum() const
{ {
return {m_viewProjection}; return {m_viewProjection};