implemented toggleWater (twa); formatting again

apps/openmw/mwrender/renderingmanager.cpp

@@ -92,19 +92,26 @@ OEngine::Render::Fader* RenderingManager::getFader()
     return mRendering.getFader();
 }
 
-void RenderingManager::removeCell (MWWorld::Ptr::CellStore *store){
-
+void RenderingManager::removeCell (MWWorld::Ptr::CellStore *store)
+{
     mObjects.removeCell(store);
     mActors.removeCell(store);
-    
 }
-void RenderingManager::removeWater (){
+
+void RenderingManager::removeWater ()
+{
     if(mWater){
         delete mWater;
         mWater = 0;
     }
 }
 
+void RenderingManager::toggleWater()
+{
+    if (mWater)
+        mWater->toggle();
+}
+
 void RenderingManager::cellAdded (MWWorld::Ptr::CellStore *store)
 {
     mObjects.buildStaticGeometry (*store);

apps/openmw/mwrender/renderingmanager.hpp

@@ -91,8 +91,10 @@ class RenderingManager: private RenderingInterface {
     void moveObject (const MWWorld::Ptr& ptr, const Ogre::Vector3& position);
     void scaleObject (const MWWorld::Ptr& ptr, const Ogre::Vector3& scale);
     void rotateObject (const MWWorld::Ptr& ptr, const::Ogre::Quaternion& orientation);
+
     void checkUnderwater();
     void setWaterHeight(const float height);
+    void toggleWater();
 
     /// \param store Cell the object was in previously (\a ptr has already been updated to the new cell).
     void moveObjectToCell (const MWWorld::Ptr& ptr, const Ogre::Vector3& position, MWWorld::Ptr::CellStore *store);

apps/openmw/mwrender/water.cpp

@@ -2,7 +2,10 @@
 
 namespace MWRender
 {
-    Water::Water (Ogre::Camera *camera, const ESM::Cell* cell) : mCamera (camera), mViewport (camera->getViewport()), mSceneManager (camera->getSceneManager())
+
+Water::Water (Ogre::Camera *camera, const ESM::Cell* cell) :
+    mCamera (camera), mViewport (camera->getViewport()), mSceneManager (camera->getSceneManager()),
+    mIsUnderwater(false)
 {
     try
     {
@@ -18,7 +21,6 @@ namespace MWRender
 
     Ogre::MeshManager::getSingleton().createPlane("water", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,  mWaterPlane, CELL_SIZE*5, CELL_SIZE * 5, 10, 10, true, 1, 3,5, Ogre::Vector3::UNIT_Z);
 
-
     mWater = mSceneManager->createEntity("water");
 
     mWater->setMaterialName("Examples/Water0");
@@ -61,10 +63,14 @@ namespace MWRender
     mWaterNode->setPosition(0, height, 0);
 }
 
+void Water::toggle()
+{
+    mWater->setVisible(!mWater->getVisible());
+}
 
 void Water::checkUnderwater(float y)
 {
-        if (mIsUnderwater && y > mTop)
+    if ((mIsUnderwater && y > mTop) || !mWater->isVisible())
     {
         try {
             Ogre::CompositorManager::getSingleton().setCompositorEnabled(mViewport, "Water", false);
@@ -72,7 +78,7 @@ namespace MWRender
         mIsUnderwater = false;
     } 
 
-        if (!mIsUnderwater && y < mTop)
+    if (!mIsUnderwater && y < mTop && mWater->isVisible())
     {
         try {
             Ogre::CompositorManager::getSingleton().setCompositorEnabled(mViewport, "Water", true);
@@ -85,4 +91,5 @@ namespace MWRender
 {
     return Ogre::Vector3(gridX * CELL_SIZE + (CELL_SIZE / 2), mTop, -gridY * CELL_SIZE - (CELL_SIZE / 2));
 }
-}
+
+} // namespace

apps/openmw/mwrender/water.hpp

@@ -7,37 +7,34 @@
 namespace MWRender {
 
     /// Water rendering 	
-  class Water : Ogre::RenderTargetListener, Ogre::Camera::Listener {
+    class Water : Ogre::RenderTargetListener, Ogre::Camera::Listener
+    {
         static const int CELL_SIZE = 8192;
         Ogre::Camera *mCamera;
         Ogre::SceneManager *mSceneManager;
         Ogre::Viewport *mViewport;
 
- 
-
         Ogre::Plane mWaterPlane;
         Ogre::SceneNode *mWaterNode;
         Ogre::Entity *mWater;
 
-    Ogre::Vector3 mOldCameraPos;
         bool mIsUnderwater;
         int mTop;
 
-
-
-    
         Ogre::Vector3 getSceneNodeCoordinates(int gridX, int gridY);
 
     public:
-    
         Water (Ogre::Camera *camera, const ESM::Cell* cell);
         ~Water();
 
+        void toggle();
+
         void checkUnderwater(float y);
         void changeCell(const ESM::Cell* cell);
         void setHeight(const float height);
 
     };
+
 }
 
 #endif

apps/openmw/mwscript/docs/vmformat.txt

@@ -126,4 +126,5 @@ op 0x2000140: ChangeWeather
 op 0x2000141: GetWaterLevel
 op 0x2000142: SetWaterLevel
 op 0x2000143: ModWaterLevel
-opcodes 0x2000142-0x3ffffff unused
+op 0x2000144: ToggleWater, twa
+opcodes 0x2000145-0x3ffffff unused

apps/openmw/mwscript/miscextensions.cpp

@@ -175,6 +175,19 @@ namespace MWScript
                 }
         };
 
+        class OpToggleWater : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    InterpreterContext& context =
+                        static_cast<InterpreterContext&> (runtime.getContext());
+
+                    context.getWorld().toggleWater();
+                }
+        };
+
         const int opcodeXBox = 0x200000c;
         const int opcodeOnActivate = 0x200000d;
         const int opcodeActivate = 0x2000075;
@@ -187,6 +200,7 @@ namespace MWScript
         const int opcodeFadeIn = 0x200013c;
         const int opcodeFadeOut = 0x200013d;
         const int opcodeFadeTo = 0x200013e;
+        const int opcodeToggleWater = 0x2000144;
 
         void registerExtensions (Compiler::Extensions& extensions)
         {
@@ -204,6 +218,8 @@ namespace MWScript
             extensions.registerInstruction ("fadein", "f", opcodeFadeIn);
             extensions.registerInstruction ("fadeout", "f", opcodeFadeOut);
             extensions.registerInstruction ("fadeto", "ff", opcodeFadeTo);
+            extensions.registerInstruction ("togglewater", "", opcodeToggleWater);
+            extensions.registerInstruction ("twa", "", opcodeToggleWater);
         }
 
         void installOpcodes (Interpreter::Interpreter& interpreter)
@@ -220,6 +236,7 @@ namespace MWScript
             interpreter.installSegment5 (opcodeFadeIn, new OpFadeIn);
             interpreter.installSegment5 (opcodeFadeOut, new OpFadeOut);
             interpreter.installSegment5 (opcodeFadeTo, new OpFadeTo);
+            interpreter.installSegment5 (opcodeToggleWater, new OpToggleWater);
         }
     }
 }

apps/openmw/mwworld/world.cpp

@@ -761,4 +761,9 @@ namespace MWWorld
         mRendering->setWaterHeight(height);
     }
 
+    void World::toggleWater()
+    {
+        mRendering->toggleWater();
+    }
+
 }

apps/openmw/mwworld/world.hpp

@@ -114,6 +114,7 @@ namespace MWWorld
             Ptr::CellStore *getInterior (const std::string& name);
 
             void setWaterHeight(const float height);
+            void toggleWater();
             
             void adjustSky();