mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-01 13:39:42 +00:00
Code Issues Releases Wiki Activity

Terrain: destroy no longer used materials

Browse source
This commit is contained in:
scrawl 2014-02-28 03:15:04 +01:00
parent 97c3efb3ba
commit 6a002d19b3
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
components/terrain/chunk.cpp
View file

@ -3,6 +3,10 @@
#include <OgreSceneNode.h> #include <OgreSceneNode.h>
#include <OgreHardwareBufferManager.h> #include <OgreHardwareBufferManager.h>
#include <OgreRenderQueue.h> #include <OgreRenderQueue.h>
#include <OgreMaterialManager.h>
#include <extern/shiny/Main/Factory.hpp>
#include "world.hpp" // FIXME: for LoadResponseData, move to backgroundloader.hpp #include "world.hpp" // FIXME: for LoadResponseData, move to backgroundloader.hpp
@ -63,6 +67,11 @@ namespace Terrain
Chunk::~Chunk() Chunk::~Chunk()
{ {
#if TERRAIN_USE_SHADER
sh::Factory::getInstance().destroyMaterialInstance(mMaterial->getName());
#endif
Ogre::MaterialManager::getSingleton().remove(mMaterial->getName());
OGRE_DELETE mVertexData; OGRE_DELETE mVertexData;
OGRE_DELETE mIndexData; OGRE_DELETE mIndexData;
} }

1
components/terrain/chunk.hpp
View file

@ -20,6 +20,7 @@ namespace Terrain
virtual ~Chunk(); virtual ~Chunk();
/// @note Takes ownership of \a material
void setMaterial (const Ogre::MaterialPtr& material); void setMaterial (const Ogre::MaterialPtr& material);
void setIndexBuffer(Ogre::HardwareIndexBufferSharedPtr buffer); void setIndexBuffer(Ogre::HardwareIndexBufferSharedPtr buffer);