piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Core / VideoCommon: refactor FreeLookCamera to have the underlying controller handle all the logic (field-of-view, movement, etc)

Browse Source
This commit is contained in:
iwubcode
2021-04-24 22:59:35 -05:00
parent ff1cb5a1c0
commit e70157474b
5 changed files with 147 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,12 +35,12 @@ std::string to_string(FreeLook::ControlType type)
return "";
}
class SixAxisController final : public CameraController
class SixAxisController final : public CameraControllerInput
{
public:
SixAxisController() = default;
Common::Matrix44 GetView() override { return m_mat; }
Common::Matrix44 GetView() const override { return m_mat; }
void MoveVertical(float amt) override
{
@ -64,18 +64,26 @@ public:
m_mat = Common::Matrix44::FromQuaternion(quat) * m_mat;
}
void Reset() override { m_mat = Common::Matrix44::Identity(); }
void Reset() override
{
CameraControllerInput::Reset();
m_mat = Common::Matrix44::Identity();
}
void DoState(PointerWrap& p) override { p.Do(m_mat); }
void DoState(PointerWrap& p) override
{
CameraControllerInput::DoState(p);
p.Do(m_mat);
}
private:
Common::Matrix44 m_mat = Common::Matrix44::Identity();
};
class FPSController final : public CameraController
class FPSController final : public CameraControllerInput
{
public:
Common::Matrix44 GetView() override
Common::Matrix44 GetView() const override
{
return Common::Matrix44::FromQuaternion(m_rotate_quat) *
Common::Matrix44::Translate(m_position);
@ -118,6 +126,7 @@ public:
void Reset() override
{
CameraControllerInput::Reset();
m_position = Common::Vec3{};
m_rotation = Common::Vec3{};
m_rotate_quat = Common::Quaternion::Identity();
@ -125,6 +134,7 @@ public:
void DoState(PointerWrap& p) override
{
CameraControllerInput::DoState(p);
p.Do(m_rotation);
p.Do(m_rotate_quat);
p.Do(m_position);
@ -136,10 +146,10 @@ private:
Common::Vec3 m_position = Common::Vec3{};
};
class OrbitalController final : public CameraController
class OrbitalController final : public CameraControllerInput
{
public:
Common::Matrix44 GetView() override
Common::Matrix44 GetView() const override
{
return Common::Matrix44::Translate(Common::Vec3{0, 0, -m_distance}) *
Common::Matrix44::FromQuaternion(m_rotate_quat);
@ -174,6 +184,7 @@ public:
void Reset() override
{
CameraControllerInput::Reset();
m_rotation = Common::Vec3{};
m_rotate_quat = Common::Quaternion::Identity();
m_distance = 0;
@ -181,6 +192,7 @@ public:
void DoState(PointerWrap& p) override
{
CameraControllerInput::DoState(p);
p.Do(m_rotation);
p.Do(m_rotate_quat);
p.Do(m_distance);
@ -193,6 +205,58 @@ private:
};
} // namespace
Common::Vec2 CameraControllerInput::GetFieldOfView() const
{
return Common::Vec2{m_fov_x, m_fov_y};
}
void CameraControllerInput::DoState(PointerWrap& p)
{
p.Do(m_speed);
p.Do(m_fov_x);
p.Do(m_fov_y);
}
void CameraControllerInput::IncreaseFovX(float fov)
{
m_fov_x += fov;
m_fov_x = std::clamp(m_fov_x, m_min_fov_multiplier, m_fov_x);
}
void CameraControllerInput::IncreaseFovY(float fov)
{
m_fov_y += fov;
m_fov_y = std::clamp(m_fov_y, m_min_fov_multiplier, m_fov_y);
}
float CameraControllerInput::GetFovStepSize() const
{
return 1.5f;
}
void CameraControllerInput::Reset()
{
m_fov_x = 1.0f;
m_fov_y = 1.0f;
m_dirty = true;
}
void CameraControllerInput::ModifySpeed(float amt)
{
m_speed += amt;
m_speed = std::clamp(m_speed, 0.0f, m_speed);
}
void CameraControllerInput::ResetSpeed()
{
m_speed = 60.0f;
}
float CameraControllerInput::GetSpeed() const
{
return m_speed;
}
FreeLookCamera::FreeLookCamera()
{
SetControlType(FreeLook::ControlType::SixAxis);
@ -221,95 +285,21 @@ void FreeLookCamera::SetControlType(FreeLook::ControlType type)
m_current_type = type;
}
Common::Matrix44 FreeLookCamera::GetView()
Common::Matrix44 FreeLookCamera::GetView() const
{
return m_camera_controller->GetView();
}
Common::Vec2 FreeLookCamera::GetFieldOfView() const
{
return Common::Vec2{m_fov_x, m_fov_y};
}
void FreeLookCamera::MoveVertical(float amt)
{
m_camera_controller->MoveVertical(amt);
m_dirty = true;
}
void FreeLookCamera::MoveHorizontal(float amt)
{
m_camera_controller->MoveHorizontal(amt);
m_dirty = true;
}
void FreeLookCamera::MoveForward(float amt)
{
m_camera_controller->MoveForward(amt);
m_dirty = true;
}
void FreeLookCamera::Rotate(const Common::Vec3& amt)
{
m_camera_controller->Rotate(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_min_fov_multiplier, m_fov_x);
}
void FreeLookCamera::IncreaseFovY(float fov)
{
m_fov_y += fov;
m_fov_y = std::clamp(m_fov_y, m_min_fov_multiplier, m_fov_y);
}
float FreeLookCamera::GetFovStepSize() const
{
return 1.5f;
}
void FreeLookCamera::Reset()
{
m_camera_controller->Reset();
m_fov_x = 1.0f;
m_fov_y = 1.0f;
m_dirty = true;
}
void FreeLookCamera::ModifySpeed(float amt)
{
m_speed += amt;
m_speed = std::clamp(m_speed, 0.0f, m_speed);
}
void FreeLookCamera::ResetSpeed()
{
m_speed = 60.0f;
}
float FreeLookCamera::GetSpeed() const
{
return m_speed;
return m_camera_controller->GetFieldOfView();
}
void FreeLookCamera::DoState(PointerWrap& p)
{
if (p.mode == PointerWrap::MODE_WRITE || p.mode == PointerWrap::MODE_MEASURE)
{
p.Do(m_speed);
p.Do(m_current_type);
p.Do(m_fov_x);
p.Do(m_fov_y);
if (m_camera_controller)
{
m_camera_controller->DoState(p);
@ -318,10 +308,7 @@ void FreeLookCamera::DoState(PointerWrap& p)
else
{
const auto old_type = m_current_type;
p.Do(m_speed);
p.Do(m_current_type);
p.Do(m_fov_x);
p.Do(m_fov_y);
if (old_type == m_current_type)
{
m_camera_controller->DoState(p);
@ -340,17 +327,12 @@ void FreeLookCamera::DoState(PointerWrap& p)
}
}
bool FreeLookCamera::IsDirty() const
{
return m_dirty;
}
void FreeLookCamera::SetClean()
{
m_dirty = false;
}
bool FreeLookCamera::IsActive() const
{
return FreeLook::GetActiveConfig().enabled;
}
CameraController* FreeLookCamera::GetController() const
{
return m_camera_controller.get();
}