immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed CEngine trying to use unsupported values as defaults, closes #552 

Also fixed the settings buttons not being disabled properly
master
krzys-h 2015-08-14 12:03:53 +02:00
parent 222517a5e7
commit 1d6c3cc748
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/graphics/engine/engine.cpp
View File

@ -288,6 +288,13 @@ bool CEngine::Create()
m_size = m_app->GetVideoConfig().size; m_size = m_app->GetVideoConfig().size;
m_mouseSize = Math::Point(0.04f, 0.04f * (m_size.x / m_size.y)); m_mouseSize = Math::Point(0.04f, 0.04f * (m_size.x / m_size.y));
// Use the setters to set defaults, because they automatically disable what is not supported
SetShadowMapping(m_shadowMapping);
SetShadowMappingQuality(m_qualityShadows);
SetShadowMappingOffscreen(m_offscreenShadowRendering);
SetShadowMappingOffscreenResolution(m_offscreenShadowRenderingResolution);
SetMultiSample(m_multisample);
m_modelManager = MakeUnique<COldModelManager>(this); m_modelManager = MakeUnique<COldModelManager>(this);
m_pyroManager = MakeUnique<CPyroManager>(); m_pyroManager = MakeUnique<CPyroManager>();
m_lightMan = MakeUnique<CLightManager>(this); m_lightMan = MakeUnique<CLightManager>(this);

3
src/ui/screen/screen_setup_graphics.cpp
View File

@ -417,13 +417,14 @@ void CScreenSetupGraphics::UpdateSetupButtons()
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_SHADOW_MAPPING)); pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_SHADOW_MAPPING));
if ( pc != 0 ) if ( pc != 0 )
{ {
pc->SetState(STATE_ENABLE, m_engine->IsShadowMappingSupported());
pc->SetState(STATE_CHECK, m_engine->GetShadowMapping()); pc->SetState(STATE_CHECK, m_engine->GetShadowMapping());
} }
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_SHADOW_MAPPING_QUALITY)); pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_SHADOW_MAPPING_QUALITY));
if ( pc != 0 ) if ( pc != 0 )
{ {
pc->SetState(STATE_ENABLE, m_engine->GetShadowMapping()); pc->SetState(STATE_ENABLE, m_engine->GetShadowMapping() && m_engine->IsShadowMappingQualitySupported());
pc->SetState(STATE_CHECK, m_engine->GetShadowMapping() && m_engine->GetShadowMappingQuality()); pc->SetState(STATE_CHECK, m_engine->GetShadowMapping() && m_engine->GetShadowMappingQuality());
} }