diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp index f1d8d7550f..a6479c401d 100644 --- a/apps/openmw/mwrender/water.cpp +++ b/apps/openmw/mwrender/water.cpp @@ -169,6 +169,11 @@ Ogre::MaterialPtr Water::createMaterial() MaterialPtr mat = MaterialManager::getSingleton().create("Water", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME); mat->removeAllTechniques(); + // shader technique + Technique* tech = mat->createTechnique(); + Pass* pass = tech->createPass(); + + // fallback technique without shaders // also used for minimap (because it can't have reflecting water) Technique* old = mat->createTechnique(); diff --git a/files/CMakeLists.txt b/files/CMakeLists.txt index 70458a14a6..0a38ff8b50 100644 --- a/files/CMakeLists.txt +++ b/files/CMakeLists.txt @@ -4,8 +4,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/water/caustic_0.png "${OpenMW_BINARY_ 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/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) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/water/WaterNormal2.tga "${OpenMW_BINARY_DIR}/resources/water/WaterNormal2.tga" COPYONLY) diff --git a/files/water/Water02.jpg b/files/water/Water02.jpg deleted file mode 100644 index b914302446..0000000000 Binary files a/files/water/Water02.jpg and /dev/null differ diff --git a/files/water/WaterNormal1.tga b/files/water/WaterNormal1.tga deleted file mode 100644 index a9ca11b7ed..0000000000 Binary files a/files/water/WaterNormal1.tga and /dev/null differ diff --git a/files/water/WaterNormal2.tga b/files/water/WaterNormal2.tga new file mode 100644 index 0000000000..771d150419 Binary files /dev/null and b/files/water/WaterNormal2.tga differ diff --git a/files/water/water.material b/files/water/water.material index fd2589ddbc..673bbaf56a 100644 --- a/files/water/water.material +++ b/files/water/water.material @@ -45,7 +45,7 @@ material Water/Compositor texture_unit { - texture WaterNormal1.tga 2d + texture WaterNormal2.tga 2d tex_coord_set 1 //tex_address_mode clamp filtering linear linear linear diff --git a/files/water/waves2.dds b/files/water/waves2.dds deleted file mode 100644 index c379886fae..0000000000 Binary files a/files/water/waves2.dds and /dev/null differ