ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VideoCommon: update fov multiplier variables and add constant variables for defaults to the Free Look camera

This commit is contained in:
iwubcode 2021-05-08 14:17:31 -05:00
parent 0bbea6d67b
commit aa07fde8a0
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,7 +162,7 @@ public:
void MoveForward(float amt) override void MoveForward(float amt) override
{ {
m_distance += -1 * amt; m_distance += -1 * amt;
m_distance = std::clamp(m_distance, 0.0f, m_distance); m_distance = std::max(m_distance, MIN_DISTANCE);
} }
void Rotate(const Common::Vec3& amt) override void Rotate(const Common::Vec3& amt) override
@ -187,7 +187,7 @@ public:
CameraControllerInput::Reset(); CameraControllerInput::Reset();
m_rotation = Common::Vec3{}; m_rotation = Common::Vec3{};
m_rotate_quat = Common::Quaternion::Identity(); m_rotate_quat = Common::Quaternion::Identity();
m_distance = 0; m_distance = MIN_DISTANCE;
} }
void DoState(PointerWrap& p) override void DoState(PointerWrap& p) override
@ -199,7 +199,8 @@ public:
} }
private: private:
float m_distance = 0; static constexpr float MIN_DISTANCE = 0.0f;
float m_distance = MIN_DISTANCE;
Common::Vec3 m_rotation = Common::Vec3{}; Common::Vec3 m_rotation = Common::Vec3{};
Common::Quaternion m_rotate_quat = Common::Quaternion::Identity(); Common::Quaternion m_rotate_quat = Common::Quaternion::Identity();
}; };
@ -207,26 +208,26 @@ private:
Common::Vec2 CameraControllerInput::GetFieldOfView() const Common::Vec2 CameraControllerInput::GetFieldOfView() const
{ {
return Common::Vec2{m_fov_x, m_fov_y}; return Common::Vec2{m_fov_x_multiplier, m_fov_y_multiplier};
} }
void CameraControllerInput::DoState(PointerWrap& p) void CameraControllerInput::DoState(PointerWrap& p)
{ {
p.Do(m_speed); p.Do(m_speed);
p.Do(m_fov_x); p.Do(m_fov_x_multiplier);
p.Do(m_fov_y); p.Do(m_fov_y_multiplier);
} }
void CameraControllerInput::IncreaseFovX(float fov) void CameraControllerInput::IncreaseFovX(float fov)
{ {
m_fov_x += fov; m_fov_x_multiplier += fov;
m_fov_x = std::clamp(m_fov_x, m_min_fov_multiplier, m_fov_x); m_fov_x_multiplier = std::max(m_fov_x_multiplier, MIN_FOV_MULTIPLIER);
} }
void CameraControllerInput::IncreaseFovY(float fov) void CameraControllerInput::IncreaseFovY(float fov)
{ {
m_fov_y += fov; m_fov_y_multiplier += fov;
m_fov_y = std::clamp(m_fov_y, m_min_fov_multiplier, m_fov_y); m_fov_y_multiplier = std::max(m_fov_y_multiplier, MIN_FOV_MULTIPLIER);
} }
float CameraControllerInput::GetFovStepSize() const float CameraControllerInput::GetFovStepSize() const
@ -236,20 +237,20 @@ float CameraControllerInput::GetFovStepSize() const
void CameraControllerInput::Reset() void CameraControllerInput::Reset()
{ {
m_fov_x = 1.0f; m_fov_x_multiplier = DEFAULT_FOV_MULTIPLIER;
m_fov_y = 1.0f; m_fov_y_multiplier = DEFAULT_FOV_MULTIPLIER;
m_dirty = true; m_dirty = true;
} }
void CameraControllerInput::ModifySpeed(float amt) void CameraControllerInput::ModifySpeed(float amt)
{ {
m_speed += amt; m_speed += amt;
m_speed = std::clamp(m_speed, 0.0f, m_speed); m_speed = std::max(m_speed, 0.0f);
} }
void CameraControllerInput::ResetSpeed() void CameraControllerInput::ResetSpeed()
{ {
m_speed = 60.0f; m_speed = DEFAULT_SPEED;
} }
float CameraControllerInput::GetSpeed() const float CameraControllerInput::GetSpeed() const

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

@ -65,11 +65,13 @@ public:
float GetSpeed() const; float GetSpeed() const;
private: private:
float m_fov_x = 1.0f; static constexpr float MIN_FOV_MULTIPLIER = 0.025f;
float m_fov_y = 1.0f; static constexpr float DEFAULT_SPEED = 60.0f;
static constexpr float DEFAULT_FOV_MULTIPLIER = 1.0f;
float m_min_fov_multiplier = 0.025f; float m_fov_x_multiplier = DEFAULT_FOV_MULTIPLIER;
float m_speed = 60.0f; float m_fov_y_multiplier = DEFAULT_FOV_MULTIPLIER;
float m_speed = DEFAULT_SPEED;
bool m_dirty = false; bool m_dirty = false;
}; };