new button, water timescale

apps/openmw/mwgui/settingswindow.cpp

@@ -119,8 +119,10 @@ namespace MWGui
         getWidget(mStaticsShadows, "StaticsShadows");
         getWidget(mMiscShadows, "MiscShadows");
         getWidget(mShadowsDebug, "ShadowsDebug");
+        getWidget(mUnderwaterButton, "UnderwaterButton");
 
         mOkButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onOkButtonClicked);
+        mUnderwaterButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onButtonToggled);
         mShadersButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onShadersToggled);
         mFullscreenButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onButtonToggled);
         mWaterShaderButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onButtonToggled);
@@ -212,6 +214,7 @@ namespace MWGui
         mReflectObjectsButton->setCaptionWithReplacing(Settings::Manager::getBool("reflect statics", "Water") ? "#{sOn}" : "#{sOff}");
         mReflectActorsButton->setCaptionWithReplacing(Settings::Manager::getBool("reflect actors", "Water") ? "#{sOn}" : "#{sOff}");
         mReflectTerrainButton->setCaptionWithReplacing(Settings::Manager::getBool("reflect terrain", "Water") ? "#{sOn}" : "#{sOff}");
+        mUnderwaterButton->setCaptionWithReplacing(Settings::Manager::getBool("underwater effect", "Water") ? "#{sOn}" : "#{sOff}");
 
         mShadowsTextureSize->setCaption (Settings::Manager::getString ("texture size", "Shadows"));
         mShadowsLargeDistance->setCaptionWithReplacing(Settings::Manager::getBool("split", "Shadows") ? "#{sOn}" : "#{sOff}");
@@ -351,6 +354,10 @@ namespace MWGui
         {
             if (_sender == mWaterShaderButton)
                 Settings::Manager::setBool("shader", "Water", newState);
+            else if (_sender == mUnderwaterButton)
+            {
+                Settings::Manager::setBool("underwater effect", "Water", newState);
+            }
             else if (_sender == mReflectObjectsButton)
             {
                 Settings::Manager::setBool("reflect misc", "Water", newState);

apps/openmw/mwgui/settingswindow.hpp

@@ -43,6 +43,7 @@ namespace MWGui
             MyGUI::Button* mReflectActorsButton;
             MyGUI::Button* mReflectTerrainButton;
             MyGUI::Button* mShadersButton;
+            MyGUI::Button* mUnderwaterButton;
 
             MyGUI::Button* mShadowsEnabledButton;
             MyGUI::Button* mShadowsLargeDistance;

apps/openmw/mwrender/renderingmanager.cpp

@@ -108,6 +108,7 @@ RenderingManager::RenderingManager (OEngine::Render::OgreRenderer& _rend, const
     sh::Factory::getInstance ().setGlobalSetting ("fog", "true");
     sh::Factory::getInstance ().setGlobalSetting ("lighting", "true");
     sh::Factory::getInstance ().setGlobalSetting ("num_lights", Settings::Manager::getString ("num lights", "Objects"));
+    sh::Factory::getInstance ().setGlobalSetting ("underwater_effects", Settings::Manager::getString("underwater effect", "Water"));
 
     applyCompositors();
 
@@ -639,6 +640,11 @@ void RenderingManager::processChangedSettings(const Settings::CategorySettingVec
             sh::Factory::getInstance ().setGlobalSetting ("mrt_output", useMRT() ? "true" : "false");
             mObjects.rebuildStaticGeometry ();
         }
+        else if (it->second == "underwater effect" && it->first == "Water")
+        {
+            sh::Factory::getInstance ().setGlobalSetting ("underwater_effects", Settings::Manager::getString("underwater effect", "Water"));
+            mObjects.rebuildStaticGeometry ();
+        }
         else if (it->second == "shaders" && it->first == "Objects")
         {
             sh::Factory::getInstance ().setShadersEnabled (Settings::Manager::getBool("shaders", "Objects"));

apps/openmw/mwrender/water.cpp

@@ -18,6 +18,9 @@
 
 #include <extern/shiny/Main/Factory.hpp>
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
 using namespace Ogre;
 
 namespace MWRender
@@ -67,8 +70,6 @@ Water::Water (Ogre::Camera *camera, RenderingManager* rend, const ESM::Cell* cel
     createMaterial();
     mWater->setMaterial(mMaterial);
 
-    mUnderwaterEffect = Settings::Manager::getBool("underwater effect", "Water");
-
     Ogre::Entity* underwaterDome = mSceneManager->createEntity ("underwater_dome.mesh");
     underwaterDome->setRenderQueueGroup (RQG_UnderWater);
     mUnderwaterDome = mSceneManager->getRootSceneNode ()->createChildSceneNode ();
@@ -329,7 +330,7 @@ void Water::update(float dt)
     pos.y = -mWaterPlane.d;
     mUnderwaterDome->setPosition (pos);
 
-    mWaterTimer += dt;
+    mWaterTimer += dt / 30.0 * MWBase::Environment::get().getWorld()->getTimeScaleFactor();
     sh::Factory::getInstance ().setSharedParameter ("waterTimer", sh::makeProperty<sh::FloatValue>(new sh::FloatValue(mWaterTimer)));
 
     mRendering->getSkyManager ()->setGlareEnabled (!mIsUnderwater);

files/materials/objects.shader

@@ -17,7 +17,7 @@
 #endif
 
 
-#define UNDERWATER LIGHTING
+#define UNDERWATER @shGlobalSettingBool(underwater_effects) && LIGHTING
 
 
 #define HAS_VERTEXCOLOR @shPropertyBool(has_vertex_colour)

files/materials/terrain.shader

@@ -22,7 +22,7 @@
 #define NEED_DEPTH 1
 #endif
 
-#define UNDERWATER LIGHTING
+#define UNDERWATER @shGlobalSettingBool(underwater_effects) && LIGHTING
 
 
 #if NEED_DEPTH

files/mygui/openmw_settings_window.layout

@@ -188,6 +188,11 @@
                             <Widget type="Button" skin="MW_Button" position="4 56 34 24" align="Left Top" name="ReflectTerrainButton"/>
 
                         </Widget>
+
+                        <Widget type="TextBox" skin="SandText" position="42 200 120 24" align="Left Top">
+                            <Property key="Caption" value="Underwater effects (caustics, fog)"/>
+                        </Widget>
+                        <Widget type="Button" skin="MW_Button" position="4 200 34 24" align="Left Top" name="UnderwaterButton"/>
                     </Widget>
 
                     <Widget type="TabItem" skin="" position="4 28 344 272">