AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tie fullscreen state into the CVar

This commit is contained in:
Phillip Stephens 2021-06-06 13:59:53 -07:00
parent a6076eb5f9
commit 995dc184b0
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Runtime/CMain.cpp
View File

@ -356,8 +356,6 @@ public:
m_errorString = "Project directory not specified"s; m_errorString = "Project directory not specified"s;
} }
m_cvarManager.proc();
if (m_windowCallback.m_windowInvalid) { if (m_windowCallback.m_windowInvalid) {
m_running.store(false); m_running.store(false);
return; return;
@ -376,11 +374,20 @@ public:
CGraphics::SetViewportResolution({rect.size[0], rect.size[1]}); CGraphics::SetViewportResolution({rect.size[0], rect.size[1]});
} }
// Check if fullscreen has been toggled, if so set the fullscreen cvar accordingly
if (m_windowCallback.m_fullscreenToggleRequested) { if (m_windowCallback.m_fullscreenToggleRequested) {
m_window->setFullscreen(!m_window->isFullscreen()); m_cvarCommons.m_fullscreen->fromBoolean(!m_cvarCommons.getFullscreen());
m_windowCallback.m_fullscreenToggleRequested = false; m_windowCallback.m_fullscreenToggleRequested = false;
} }
// Check if the user has modified the fullscreen CVar, if so set fullscreen state accordingly
if (m_cvarCommons.m_fullscreen->isModified()) {
m_window->setFullscreen(m_cvarCommons.getFullscreen());
}
// Let CVarManager inform all CVar listeners of the CVar's state and clear all mdoified flags if necessary
m_cvarManager.proc();
boo::IGraphicsDataFactory* gfxF = m_window->getMainContextDataFactory(); boo::IGraphicsDataFactory* gfxF = m_window->getMainContextDataFactory();
float scale = std::floor(m_window->getVirtualPixelFactor() * 4.f) / 4.f; float scale = std::floor(m_window->getVirtualPixelFactor() * 4.f) / 4.f;
if (!g_mainMP1 && m_proj) { if (!g_mainMP1 && m_proj) {