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

removed the now unneccesary SG for transparent objects

Browse source
This commit is contained in:
scrawl 2012-04-08 14:37:36 +02:00
parent 030060e656
commit 113bbfa253
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwrender/objects.cpp
View file

@ -144,7 +144,7 @@ void Objects::insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh)
{ {
Ogre::StaticGeometry* sg = 0; Ogre::StaticGeometry* sg = 0;
if (transparent) /* if (transparent)
{ {
if( mStaticGeometryAlpha.find(ptr.getCell()) == mStaticGeometryAlpha.end()) if( mStaticGeometryAlpha.find(ptr.getCell()) == mStaticGeometryAlpha.end())
{ {
@ -155,7 +155,7 @@ void Objects::insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh)
else else
sg = mStaticGeometryAlpha[ptr.getCell()]; sg = mStaticGeometryAlpha[ptr.getCell()];
} }
else if (small) else*/ if (small)
{ {
if( mStaticGeometrySmall.find(ptr.getCell()) == mStaticGeometrySmall.end()) if( mStaticGeometrySmall.find(ptr.getCell()) == mStaticGeometrySmall.end())
{ {
@ -288,13 +288,13 @@ void Objects::removeCell(MWWorld::Ptr::CellStore* store)
mRenderer.getScene()->destroyStaticGeometry (sg); mRenderer.getScene()->destroyStaticGeometry (sg);
sg = 0; sg = 0;
} }
if(mStaticGeometryAlpha.find(store) != mStaticGeometryAlpha.end()) /*if(mStaticGeometryAlpha.find(store) != mStaticGeometryAlpha.end())
{ {
Ogre::StaticGeometry* sg = mStaticGeometryAlpha[store]; Ogre::StaticGeometry* sg = mStaticGeometryAlpha[store];
mStaticGeometryAlpha.erase(store); mStaticGeometryAlpha.erase(store);
mRenderer.getScene()->destroyStaticGeometry (sg); mRenderer.getScene()->destroyStaticGeometry (sg);
sg = 0; sg = 0;
} }*/
if(mBounds.find(store) != mBounds.end()) if(mBounds.find(store) != mBounds.end())
mBounds.erase(store); mBounds.erase(store);
@ -312,11 +312,11 @@ void Objects::buildStaticGeometry(ESMS::CellStore<MWWorld::RefData>& cell)
Ogre::StaticGeometry* sg = mStaticGeometrySmall[&cell]; Ogre::StaticGeometry* sg = mStaticGeometrySmall[&cell];
sg->build(); sg->build();
} }
if(mStaticGeometryAlpha.find(&cell) != mStaticGeometryAlpha.end()) /*if(mStaticGeometryAlpha.find(&cell) != mStaticGeometryAlpha.end())
{ {
Ogre::StaticGeometry* sg = mStaticGeometryAlpha[&cell]; Ogre::StaticGeometry* sg = mStaticGeometryAlpha[&cell];
sg->build(); sg->build();
} }*/
} }
Ogre::AxisAlignedBox Objects::getDimensions(MWWorld::Ptr::CellStore* cell) Ogre::AxisAlignedBox Objects::getDimensions(MWWorld::Ptr::CellStore* cell)

2
apps/openmw/mwrender/objects.hpp
View file

@ -15,7 +15,7 @@ class Objects{
std::map<MWWorld::Ptr::CellStore *, Ogre::SceneNode *> mCellSceneNodes; std::map<MWWorld::Ptr::CellStore *, Ogre::SceneNode *> mCellSceneNodes;
std::map<MWWorld::Ptr::CellStore *, Ogre::StaticGeometry*> mStaticGeometry; std::map<MWWorld::Ptr::CellStore *, Ogre::StaticGeometry*> mStaticGeometry;
std::map<MWWorld::Ptr::CellStore *, Ogre::StaticGeometry*> mStaticGeometrySmall; std::map<MWWorld::Ptr::CellStore *, Ogre::StaticGeometry*> mStaticGeometrySmall;
std::map<MWWorld::Ptr::CellStore *, Ogre::StaticGeometry*> mStaticGeometryAlpha; //std::map<MWWorld::Ptr::CellStore *, Ogre::StaticGeometry*> mStaticGeometryAlpha;
std::map<MWWorld::Ptr::CellStore *, Ogre::AxisAlignedBox> mBounds; std::map<MWWorld::Ptr::CellStore *, Ogre::AxisAlignedBox> mBounds;
std::vector<std::string> mLights; std::vector<std::string> mLights;
Ogre::SceneNode* mMwRoot; Ogre::SceneNode* mMwRoot;