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

VideoCommon: Update Free Look camera with settings change...

This commit is contained in:
iwubcode 2020-06-18 23:44:17 -05:00
parent 670f34af60
commit a37fd8c5d9
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,25 +12,24 @@
#include "Common/MathUtil.h" #include "Common/MathUtil.h"
#include "Common/ChunkFile.h" #include "Common/ChunkFile.h"
#include "Core/Config/GraphicsSettings.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoCommon.h"
#include "VideoCommon/VideoConfig.h"
FreeLookCamera g_freelook_camera; FreeLookCamera g_freelook_camera;
namespace namespace
{ {
std::string to_string(FreelookControlType type) std::string to_string(FreeLook::ControlType type)
{ {
switch (type) switch (type)
{ {
case FreelookControlType::SixAxis: case FreeLook::ControlType::SixAxis:
return "Six Axis"; return "Six Axis";
case FreelookControlType::FPS: case FreeLook::ControlType::FPS:
return "First Person"; return "First Person";
case FreelookControlType::Orbital: case FreeLook::ControlType::Orbital:
return "Orbital"; return "Orbital";
} }
@ -176,22 +175,22 @@ private:
}; };
} // namespace } // namespace
void FreeLookCamera::SetControlType(FreelookControlType type) void FreeLookCamera::SetControlType(FreeLook::ControlType type)
{ {
if (m_current_type && *m_current_type == type) if (m_current_type && *m_current_type == type)
{ {
return; return;
} }
if (type == FreelookControlType::SixAxis) if (type == FreeLook::ControlType::SixAxis)
{ {
m_camera_controller = std::make_unique<SixAxisController>(); m_camera_controller = std::make_unique<SixAxisController>();
} }
else if (type == FreelookControlType::Orbital) else if (type == FreeLook::ControlType::Orbital)
{ {
m_camera_controller = std::make_unique<OrbitalController>(); m_camera_controller = std::make_unique<OrbitalController>();
} }
else else if (type == FreeLook::ControlType::FPS)
{ {
m_camera_controller = std::make_unique<FPSController>(); m_camera_controller = std::make_unique<FPSController>();
} }

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

@ -8,7 +8,7 @@
#include <optional> #include <optional>
#include "Common/Matrix.h" #include "Common/Matrix.h"
#include "VideoCommon/VideoConfig.h" #include "Core/FreeLookConfig.h"
class PointerWrap; class PointerWrap;
@ -41,7 +41,7 @@ public:
class FreeLookCamera class FreeLookCamera
{ {
public: public:
void SetControlType(FreelookControlType type); void SetControlType(FreeLook::ControlType type);
Common::Matrix44 GetView(); Common::Matrix44 GetView();
Common::Vec2 GetFieldOfView() const; Common::Vec2 GetFieldOfView() const;
@ -70,7 +70,7 @@ private:
bool m_dirty = false; bool m_dirty = false;
float m_fov_x = 1.0f; float m_fov_x = 1.0f;
float m_fov_y = 1.0f; float m_fov_y = 1.0f;
std::optional<FreelookControlType> m_current_type; std::optional<FreeLook::ControlType> m_current_type;
std::unique_ptr<CameraController> m_camera_controller; std::unique_ptr<CameraController> m_camera_controller;
float m_fov_step_size = 0.025f; float m_fov_step_size = 0.025f;