Some cleanup

OpenMW · Mar 19, 2012 · fe9e6a7 · fe9e6a7
1 parent 51fb9e6
commit fe9e6a7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 300 deletions.
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
@@ -40,14 +40,12 @@ namespace MWRender {
 
   Water::~Water() {
       Ogre::MeshManager::getSingleton().remove("water");
-      //mCamera->removeListener(this);
 
       mWaterNode->detachObject(mWater);
       mSceneManager->destroyEntity(mWater);
       mSceneManager->destroySceneNode(mWaterNode);
 
-    //Ogre::TextureManager::getSingleton().remove("refraction");
-    //Ogre::TextureManager::getSingleton().remove("reflection");
+
     Ogre::CompositorManager::getSingleton().removeCompositorChain(mViewport);
   }
 
@@ -63,23 +61,6 @@ namespace MWRender {
   }
 
 
-  void Water::preRenderTargetUpdate(const Ogre::RenderTargetEvent& evt) {
-    mWater->setVisible(false);
-
-    if (evt.source == mReflectionTarget) {
-      mCamera->enableReflection(mWaterPlane);
-    } else {
-    }
-  }
-
-  void Water::postRenderTargetUpdate(const Ogre::RenderTargetEvent& evt) {
-    mWater->setVisible(true);
-
-    if (evt.source == mReflectionTarget) {
-      mCamera->disableReflection();
-    } else {
-    }
-  }
 
   void Water::checkUnderwater(float  y) {
 
@@ -101,21 +82,7 @@ namespace MWRender {
   }
 
 
-  void Water::cameraPreRenderScene(Ogre::Camera *cam) {
-    Ogre::Vector3 pos = cam->getPosition();
-
-    if (pos != mOldCameraPos) {
-      mWaterNode->setPosition(pos.x, 0, pos.z);
-
-      mOldCameraPos = pos;
-    }
-  }
-
-  void Water::cameraPostRenderScene(Ogre::Camera *cam) {
-  }
-
-  void Water::cameraDestroyed(Ogre::Camera *cam) {
-  }
+
   Ogre::Vector3 Water::getSceneNodeCoordinates(int gridX, int gridY){
       Ogre::Vector3 out = Ogre::Vector3(gridX * CELL_SIZE + (CELL_SIZE / 2), mTop, -gridY * CELL_SIZE - (CELL_SIZE / 2));
 

diff --git a/apps/openmw/mwrender/water.hpp b/apps/openmw/mwrender/water.hpp
@@ -13,8 +13,7 @@ namespace MWRender {
     Ogre::SceneManager *mSceneManager;
     Ogre::Viewport *mViewport;
 
-    Ogre::RenderTarget *mRefractionTarget;
-    Ogre::RenderTarget *mReflectionTarget;
+
 
     Ogre::Plane mWaterPlane;
     Ogre::SceneNode *mWaterNode;
@@ -26,12 +25,7 @@ namespace MWRender {
 
 
 
-    void preRenderTargetUpdate(const Ogre::RenderTargetEvent&);
-    void postRenderTargetUpdate(const Ogre::RenderTargetEvent&);
-
-    void cameraPreRenderScene(Ogre::Camera *cam);
-    void cameraPostRenderScene(Ogre::Camera *cam);
-    void cameraDestroyed(Ogre::Camera *cam);
+
     Ogre::Vector3 getSceneNodeCoordinates(int gridX, int gridY);
 
   public:

diff --git a/files/CMakeLists.txt b/files/CMakeLists.txt
@@ -8,5 +8,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/water/GlassVP.cg "${OpenMW_BINARY_DIR
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/water/perlinvolume.dds "${OpenMW_BINARY_DIR}/resources/water/perlinvolume.dds" COPYONLY) 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/water/Water02.jpg "${OpenMW_BINARY_DIR}/resources/water/Water02.jpg" COPYONLY) 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/water/water.compositor "${OpenMW_BINARY_DIR}/resources/water/water.compositor" COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/water/water.material "${OpenMW_BINARY_DIR}/resources/water/water.material" COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/water/waves2.dds "${OpenMW_BINARY_DIR}/resources/water/waves2.dds" COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/water/Examples-Water.material "${OpenMW_BINARY_DIR}/resources/water/Examples-Water.material" COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/water/WaterNormal1.tga "${OpenMW_BINARY_DIR}/resources/water/WaterNormal1.tga" COPYONLY)
diff --git a/files/water/Water01.jpg b/files/water/Water01.jpg
diff --git a/files/water/water.material b/files/water/water.material
diff --git a/files/water/water1.cg b/files/water/water1.cg