simple water without shaders that uses original MW textures

OpenMW · Apr 3, 2012 · b3a186e · b3a186e
1 parent c1693a0
commit b3a186e
Show file tree

Hide file tree

Showing 9 changed files with 95 additions and 341 deletions.
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
@@ -225,6 +225,7 @@ void LocalMap::render(const float x, const float y,
             vp->setShadowsEnabled(false);
             vp->setBackgroundColour(ColourValue(0, 0, 0));
             vp->setVisibilityMask(RV_Map);
+            vp->setMaterialScheme("Map");
 
             rtt->update();
 

diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
@@ -27,7 +27,8 @@ Water::Water (Ogre::Camera *camera, const ESM::Cell* cell) :
 
     mWater = mSceneManager->createEntity("water");
     mWater->setVisibilityFlags(RV_Water);
-    mWater->setMaterialName("Examples/Water0");
+
+    mWater->setMaterial(createMaterial());
 
     mVisibilityFlags = RV_Terrain * Settings::Manager::getBool("reflect terrain", "Water")
                         + RV_Statics * Settings::Manager::getBool("reflect statics", "Water")
@@ -163,4 +164,31 @@ void Water::postRenderTargetUpdate(const RenderTargetEvent& evt)
 	}
 }
 
+Ogre::MaterialPtr Water::createMaterial()
+{
+    MaterialPtr mat = MaterialManager::getSingleton().create("Water", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
+    mat->removeAllTechniques();
+
+    // fallback technique without shaders
+    // also used for minimap (because it can't have reflecting water)
+    Technique* old = mat->createTechnique();
+    old->setSchemeName("Map");
+    Pass* oldpass = old->createPass();
+    oldpass->setSceneBlending(SBT_TRANSPARENT_ALPHA);
+    oldpass->setDepthWriteEnabled(false);
+    oldpass->setDiffuse(0,0,0,1);
+    oldpass->setSelfIllumination(0.6, 0.7, 1.0);
+    oldpass->setAmbient(0,0,0);
+    TextureUnitState* oldtus = oldpass->createTextureUnitState();
+    std::string textureNames[32];
+    for (int i=0; i<32; ++i)
+    {
+        textureNames[i] = "textures\\water\\water" + StringConverter::toString(i, 2, '0') + ".dds";
+    }
+    oldtus->setAnimatedTextureName(textureNames, 32, 2);
+    oldtus->setTextureScale(0.1, 0.1);
+    oldtus->setAlphaOperation(LBX_SOURCE1, LBS_MANUAL, LBS_CURRENT, 0.7);
+    return mat;
+}
+
 } // namespace
diff --git a/apps/openmw/mwrender/water.hpp b/apps/openmw/mwrender/water.hpp
@@ -30,6 +30,8 @@ namespace MWRender {
         void preRenderTargetUpdate(const Ogre::RenderTargetEvent& evt);
         void postRenderTargetUpdate(const Ogre::RenderTargetEvent& evt);
 
+        Ogre::MaterialPtr createMaterial();
+
         Ogre::RenderTarget* mReflectionTarget;
         Ogre::RenderTarget* mRefractionTarget;
 

diff --git a/files/CMakeLists.txt b/files/CMakeLists.txt
@@ -1,13 +1,11 @@
 project(resources)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/water/caustic_0.png "${OpenMW_BINARY_DIR}/resources/water/caustic_0.png" COPYONLY) 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/water/Example_Fresnel.cg "${OpenMW_BINARY_DIR}/resources/water/Example_Fresnel.cg" COPYONLY) 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/water/Example_FresnelPS.asm "${OpenMW_BINARY_DIR}/resources/water/Example_FresnelPS.asm" COPYONLY) 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/water/GlassFP.cg "${OpenMW_BINARY_DIR}/resources/water/GlassFP.cg" COPYONLY) 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/water/GlassVP.cg "${OpenMW_BINARY_DIR}/resources/water/GlassVP.cg" COPYONLY) 
 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/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/water.material "${OpenMW_BINARY_DIR}/resources/water/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/Example_Fresnel.cg b/files/water/Example_Fresnel.cg
diff --git a/files/water/Example_FresnelPS.asm b/files/water/Example_FresnelPS.asm