mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-02 06:45:33 +00:00
Code Issues Releases Wiki Activity

fix underwater effect staying active when teleporting from underwater to a cell that doesn't have water

Browse source
This commit is contained in:
scrawl 2012-04-19 23:25:58 +02:00
parent c6da3872b4
commit 7400b7f313
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -512,11 +512,13 @@ Shadows* RenderingManager::getShadows()
void RenderingManager::switchToInterior() void RenderingManager::switchToInterior()
{ {
mObjects.setInterior(true); mObjects.setInterior(true);
mRendering.getScene()->setCameraRelativeRendering(false);
} }
void RenderingManager::switchToExterior() void RenderingManager::switchToExterior()
{ {
mObjects.setInterior(false); mObjects.setInterior(false);
mRendering.getScene()->setCameraRelativeRendering(true);
} }
} // namespace } // namespace

7
apps/openmw/mwrender/water.cpp
View file

@ -176,7 +176,12 @@ void Water::toggle()
void Water::checkUnderwater(float y) void Water::checkUnderwater(float y)
{ {
if (!mActive) return; if (!mActive)
{
CompositorManager::getSingleton().setCompositorEnabled(mViewport, mCompositorName, false);
return;
}
if ((mIsUnderwater && y > mTop) || !mWater->isVisible() || mCamera->getPolygonMode() != Ogre::PM_SOLID) if ((mIsUnderwater && y > mTop) || !mWater->isVisible() || mCamera->getPolygonMode() != Ogre::PM_SOLID)
{ {
CompositorManager::getSingleton().setCompositorEnabled(mViewport, mCompositorName, false); CompositorManager::getSingleton().setCompositorEnabled(mViewport, mCompositorName, false);