mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-03 01:20:11 +00:00
Code Issues Projects Releases Wiki Activity

fixed some more settings bugs

Browse Source
This commit is contained in:
scrawl 2012-07-23 21:39:22 +02:00
parent 3ebc6fd590
commit 02a52c0ff1
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/openmw/mwgui/settingswindow.cpp
View File

@ -238,6 +238,12 @@ namespace MWGui
mReflectTerrainButton->setEnabled(false); mReflectTerrainButton->setEnabled(false);
} }
if (shaders == "off")
{
mUnderwaterButton->setEnabled (false);
mShadowsEnabledButton->setEnabled(false);
}
mFullscreenButton->setCaptionWithReplacing(Settings::Manager::getBool("fullscreen", "Video") ? "#{sOn}" : "#{sOff}"); mFullscreenButton->setCaptionWithReplacing(Settings::Manager::getBool("fullscreen", "Video") ? "#{sOn}" : "#{sOff}");
mVSyncButton->setCaptionWithReplacing(Settings::Manager::getBool("vsync", "Video") ? "#{sOn}": "#{sOff}"); mVSyncButton->setCaptionWithReplacing(Settings::Manager::getBool("vsync", "Video") ? "#{sOn}": "#{sOff}");
mFPSButton->setCaptionWithReplacing(fpsLevelToStr(Settings::Manager::getInt("fps", "HUD"))); mFPSButton->setCaptionWithReplacing(fpsLevelToStr(Settings::Manager::getInt("fps", "HUD")));
@ -409,7 +415,9 @@ namespace MWGui
mReflectObjectsButton->setEnabled(false); mReflectObjectsButton->setEnabled(false);
mReflectActorsButton->setEnabled(false); mReflectActorsButton->setEnabled(false);
mReflectTerrainButton->setEnabled(false); mReflectTerrainButton->setEnabled(false);
mUnderwaterButton->setEnabled(false);
Settings::Manager::setBool("shader", "Water", false); Settings::Manager::setBool("shader", "Water", false);
Settings::Manager::setBool("underwater effect", "Water", false);
// shadows not supported // shadows not supported
mShadowsEnabledButton->setEnabled(false); mShadowsEnabledButton->setEnabled(false);
@ -418,6 +426,9 @@ namespace MWGui
} }
else else
{ {
Settings::Manager::setBool("shaders", "Objects", true);
Settings::Manager::setString("shader mode", "General", val);
/
// re-enable // re-enable
if (MWRender::RenderingManager::waterShaderSupported()) if (MWRender::RenderingManager::waterShaderSupported())
{ {
@ -425,11 +436,9 @@ namespace MWGui
mReflectObjectsButton->setEnabled(true); mReflectObjectsButton->setEnabled(true);
mReflectActorsButton->setEnabled(true); mReflectActorsButton->setEnabled(true);
mReflectTerrainButton->setEnabled(true); mReflectTerrainButton->setEnabled(true);
mShadowsEnabledButton->setEnabled(true);
} }
mUnderwaterButton->setEnabled(true);
Settings::Manager::setBool("shaders", "Objects", true); mShadowsEnabledButton->setEnabled(true);
Settings::Manager::setString("shader mode", "General", val);
} }
apply(); apply();

2
apps/openmw/mwrender/renderingmanager.cpp
View File

@ -104,6 +104,8 @@ RenderingManager::RenderingManager (OEngine::Render::OgreRenderer& _rend, const
if (!Settings::Manager::getBool("shaders", "Objects")) if (!Settings::Manager::getBool("shaders", "Objects"))
Settings::Manager::setBool("enabled", "Shadows", false); Settings::Manager::setBool("enabled", "Shadows", false);
sh::Factory::getInstance ().setShadersEnabled (Settings::Manager::getBool("shaders", "Objects"));
sh::Factory::getInstance ().setGlobalSetting ("mrt_output", useMRT() ? "true" : "false"); sh::Factory::getInstance ().setGlobalSetting ("mrt_output", useMRT() ? "true" : "false");
sh::Factory::getInstance ().setGlobalSetting ("fog", "true"); sh::Factory::getInstance ().setGlobalSetting ("fog", "true");
sh::Factory::getInstance ().setGlobalSetting ("lighting", "true"); sh::Factory::getInstance ().setGlobalSetting ("lighting", "true");