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

Merge branch 'master' into leakfix

Browse source
This commit is contained in:
scrawl 2012-06-14 21:28:24 +02:00
commit b6744e6195
4 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -112,6 +112,8 @@ RenderingManager::RenderingManager (OEngine::Render::OgreRenderer& _rend, const
RenderingManager::~RenderingManager () RenderingManager::~RenderingManager ()
{ {
mRendering.removeWindowEventListener(this);
delete mPlayer; delete mPlayer;
delete mSkyManager; delete mSkyManager;
delete mDebugging; delete mDebugging;

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

@ -114,6 +114,9 @@ Water::~Water()
{ {
MeshManager::getSingleton().remove("water"); MeshManager::getSingleton().remove("water");
if (mReflectionTarget)
mReflectionTexture->getBuffer()->getRenderTarget()->removeListener(this);
mWaterNode->detachObject(mWater); mWaterNode->detachObject(mWater);
mSceneManager->destroyEntity(mWater); mSceneManager->destroyEntity(mWater);
mSceneManager->destroySceneNode(mWaterNode); mSceneManager->destroySceneNode(mWaterNode);

5
libs/openengine/ogre/renderer.cpp
View file

@ -156,6 +156,11 @@ void OgreRenderer::setWindowEventListener(Ogre::WindowEventListener* listener)
Ogre::WindowEventUtilities::addWindowEventListener(mWindow, listener); Ogre::WindowEventUtilities::addWindowEventListener(mWindow, listener);
} }
void OgreRenderer::removeWindowEventListener(Ogre::WindowEventListener* listener)
{
Ogre::WindowEventUtilities::removeWindowEventListener(mWindow, listener);
}
void OgreRenderer::setFov(float fov) void OgreRenderer::setFov(float fov)
{ {
mCamera->setFOVy(Degree(fov)); mCamera->setFOVy(Degree(fov));

1
libs/openengine/ogre/renderer.hpp
View file

@ -106,6 +106,7 @@ namespace OEngine
~OgreRenderer() { cleanup(); } ~OgreRenderer() { cleanup(); }
void setWindowEventListener(Ogre::WindowEventListener* listener); void setWindowEventListener(Ogre::WindowEventListener* listener);
void removeWindowEventListener(Ogre::WindowEventListener* listener);
/** Configure the renderer. This will load configuration files and /** Configure the renderer. This will load configuration files and
set up the Root and logging classes. */ set up the Root and logging classes. */