piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8747 from iwubcode/map-freelook

Browse Source 
Support controlling Free Look via input bindings (motion controls, gamepad, etc!)
This commit is contained in:
JMC47
2021-04-01 01:05:00 -04:00
committed by GitHub
parent 06439a2d40 28e880efb6
commit ce8e87c64b
25 changed files with 420 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Source/Core/VideoCommon/FreeLookCamera.cpp
View File

@ -102,15 +102,20 @@ public:
void Rotate(const Common::Vec3& amt) override
{
if (amt.Length() == 0)
return;
m_rotation += amt;
using Common::Quaternion;
const auto quat =
m_rotate_quat =
(Quaternion::RotateX(m_rotation.x) * Quaternion::RotateY(m_rotation.y)).Normalized();
Rotate(quat);
}
void Rotate(const Common::Quaternion& quat) override { m_rotate_quat = quat; }
void Rotate(const Common::Quaternion& quat) override
{
Rotate(Common::FromQuaternionToEuler(quat));
}
void Reset() override
{
@ -153,15 +158,20 @@ public:
void Rotate(const Common::Vec3& amt) override
{
if (amt.Length() == 0)
return;
m_rotation += amt;
using Common::Quaternion;
const auto quat =
m_rotate_quat =
(Quaternion::RotateX(m_rotation.x) * Quaternion::RotateY(m_rotation.y)).Normalized();
Rotate(quat);
}
void Rotate(const Common::Quaternion& quat) override { m_rotate_quat = quat; }
void Rotate(const Common::Quaternion& quat) override
{
Rotate(Common::FromQuaternionToEuler(quat));
}
void Reset() override
{
@ -246,21 +256,27 @@ void FreeLookCamera::Rotate(const Common::Vec3& amt)
m_dirty = true;
}
void FreeLookCamera::Rotate(const Common::Quaternion& amt)
{
m_camera_controller->Rotate(amt);
m_dirty = true;
}
void FreeLookCamera::IncreaseFovX(float fov)
{
m_fov_x += fov;
m_fov_x = std::clamp(m_fov_x, m_fov_step_size, m_fov_x);
m_fov_x = std::clamp(m_fov_x, m_min_fov_multiplier, m_fov_x);
}
void FreeLookCamera::IncreaseFovY(float fov)
{
m_fov_y += fov;
m_fov_y = std::clamp(m_fov_y, m_fov_step_size, m_fov_y);
m_fov_y = std::clamp(m_fov_y, m_min_fov_multiplier, m_fov_y);
}
float FreeLookCamera::GetFovStepSize() const
{
return m_fov_step_size;
return 1.5f;
}
void FreeLookCamera::Reset()
@ -271,14 +287,15 @@ void FreeLookCamera::Reset()
m_dirty = true;
}
void FreeLookCamera::ModifySpeed(float multiplier)
void FreeLookCamera::ModifySpeed(float amt)
{
m_speed *= multiplier;
m_speed += amt;
m_speed = std::clamp(m_speed, 0.0f, m_speed);
}
void FreeLookCamera::ResetSpeed()
{
m_speed = 1.0f;
m_speed = 60.0f;
}
float FreeLookCamera::GetSpeed() const

5
Source/Core/VideoCommon/FreeLookCamera.h
View File

@ -52,6 +52,7 @@ public:
void MoveForward(float amt);
void Rotate(const Common::Vec3& amt);
void Rotate(const Common::Quaternion& amt);
void IncreaseFovX(float fov);
void IncreaseFovY(float fov);
@ -77,8 +78,8 @@ private:
std::optional<FreeLook::ControlType> m_current_type;
std::unique_ptr<CameraController> m_camera_controller;
float m_fov_step_size = 0.025f;
float m_speed = 1.0f;
float m_min_fov_multiplier = 0.025f;
float m_speed = 60.0f;
};
extern FreeLookCamera g_freelook_camera;