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

Merge pull request #9362 from iwubcode/freelook_fix_crash 

VideoCommon: Fix crash that occurs on loading a fifo log when Free Look is enabled
This commit is contained in:
Léo Lam 2020-12-27 11:37:50 +01:00 committed by GitHub
parent ce599f9f46 16dc2fa379
commit 2917af03ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,6 +175,11 @@ private:
}; };
} // namespace } // namespace
FreeLookCamera::FreeLookCamera()
{
SetControlType(FreeLook::ControlType::SixAxis);
}
void FreeLookCamera::SetControlType(FreeLook::ControlType type) void FreeLookCamera::SetControlType(FreeLook::ControlType type)
{ {
if (m_current_type && *m_current_type == type) if (m_current_type && *m_current_type == type)

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

@ -41,6 +41,7 @@ public:
class FreeLookCamera class FreeLookCamera
{ {
public: public:
FreeLookCamera();
void SetControlType(FreeLook::ControlType type); void SetControlType(FreeLook::ControlType type);
Common::Matrix44 GetView(); Common::Matrix44 GetView();
Common::Vec2 GetFieldOfView() const; Common::Vec2 GetFieldOfView() const;

1
Source/Core/VideoCommon/RenderBase.cpp
View File

@ -111,6 +111,7 @@ Renderer::Renderer(int backbuffer_width, int backbuffer_height, float backbuffer
CalculateTargetSize(); CalculateTargetSize();
m_is_game_widescreen = SConfig::GetInstance().bWii && Config::Get(Config::SYSCONF_WIDESCREEN); m_is_game_widescreen = SConfig::GetInstance().bWii && Config::Get(Config::SYSCONF_WIDESCREEN);
g_freelook_camera.SetControlType(FreeLook::GetActiveConfig().camera_config.control_type);
} }
Renderer::~Renderer() = default; Renderer::~Renderer() = default;