From 113bbfa253eac94ef1d46ed78928cd97538b8d94 Mon Sep 17 00:00:00 2001 From: scrawl Date: Sun, 8 Apr 2012 14:37:36 +0200 Subject: [PATCH] removed the now unneccesary SG for transparent objects --- apps/openmw/mwrender/objects.cpp | 12 ++++++------ apps/openmw/mwrender/objects.hpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp index a388d3163..b633330fa 100644 --- a/apps/openmw/mwrender/objects.cpp +++ b/apps/openmw/mwrender/objects.cpp @@ -144,7 +144,7 @@ void Objects::insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh) { Ogre::StaticGeometry* sg = 0; - if (transparent) +/* if (transparent) { if( mStaticGeometryAlpha.find(ptr.getCell()) == mStaticGeometryAlpha.end()) { @@ -155,7 +155,7 @@ void Objects::insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh) else sg = mStaticGeometryAlpha[ptr.getCell()]; } - else if (small) + else*/ if (small) { if( mStaticGeometrySmall.find(ptr.getCell()) == mStaticGeometrySmall.end()) { @@ -288,13 +288,13 @@ void Objects::removeCell(MWWorld::Ptr::CellStore* store) mRenderer.getScene()->destroyStaticGeometry (sg); sg = 0; } - if(mStaticGeometryAlpha.find(store) != mStaticGeometryAlpha.end()) + /*if(mStaticGeometryAlpha.find(store) != mStaticGeometryAlpha.end()) { Ogre::StaticGeometry* sg = mStaticGeometryAlpha[store]; mStaticGeometryAlpha.erase(store); mRenderer.getScene()->destroyStaticGeometry (sg); sg = 0; - } + }*/ if(mBounds.find(store) != mBounds.end()) mBounds.erase(store); @@ -312,11 +312,11 @@ void Objects::buildStaticGeometry(ESMS::CellStore& cell) Ogre::StaticGeometry* sg = mStaticGeometrySmall[&cell]; sg->build(); } - if(mStaticGeometryAlpha.find(&cell) != mStaticGeometryAlpha.end()) + /*if(mStaticGeometryAlpha.find(&cell) != mStaticGeometryAlpha.end()) { Ogre::StaticGeometry* sg = mStaticGeometryAlpha[&cell]; sg->build(); - } + }*/ } Ogre::AxisAlignedBox Objects::getDimensions(MWWorld::Ptr::CellStore* cell) diff --git a/apps/openmw/mwrender/objects.hpp b/apps/openmw/mwrender/objects.hpp index 4326ce326..0c19f9f33 100644 --- a/apps/openmw/mwrender/objects.hpp +++ b/apps/openmw/mwrender/objects.hpp @@ -15,7 +15,7 @@ class Objects{ std::map mCellSceneNodes; std::map mStaticGeometry; std::map mStaticGeometrySmall; - std::map mStaticGeometryAlpha; + //std::map mStaticGeometryAlpha; std::map mBounds; std::vector mLights; Ogre::SceneNode* mMwRoot;