teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Don't store camera nodes, we don't need them.

Browse source
This commit is contained in:
Chris Robinson 2013-05-06 21:46:11 -07:00
parent 90e29c83c0
commit 6a3ba41170
3 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwrender/animation.cpp
View file

@ -51,7 +51,6 @@ void Animation::destroyObjectList(Ogre::SceneManager *sceneMgr, NifOgre::ObjectL
for(size_t i = 0;i < objects.mEntities.size();i++) for(size_t i = 0;i < objects.mEntities.size();i++)
sceneMgr->destroyEntity(objects.mEntities[i]); sceneMgr->destroyEntity(objects.mEntities[i]);
objects.mControllers.clear(); objects.mControllers.clear();
objects.mCameras.clear();
objects.mParticles.clear(); objects.mParticles.clear();
objects.mEntities.clear(); objects.mEntities.clear();
objects.mSkelBase = NULL; objects.mSkelBase = NULL;

4
components/nifogre/ogrenifloader.cpp
View file

@ -748,9 +748,7 @@ class NIFObjectLoader
if(node->recType == Nif::RC_NiCamera) if(node->recType == Nif::RC_NiCamera)
{ {
int trgtid = NIFSkeletonLoader::lookupOgreBoneHandle(name, node->recIndex); /* Ignored */
Ogre::Bone *trgtbone = objectlist.mSkelBase->getSkeleton()->getBone(trgtid);
objectlist.mCameras.push_back(trgtbone);
} }
if(node->recType == Nif::RC_NiTriShape && !(flags&0x80000000)) if(node->recType == Nif::RC_NiTriShape && !(flags&0x80000000))

6
components/nifogre/ogrenifloader.hpp
View file

@ -44,12 +44,6 @@ struct ObjectList {
std::vector<Ogre::Entity*> mEntities; std::vector<Ogre::Entity*> mEntities;
std::vector<Ogre::ParticleSystem*> mParticles; std::vector<Ogre::ParticleSystem*> mParticles;
// We could actually have Ogre::Camera objects, but that means more
// maintenance when switching cameras. The information in the NiCamera node
// is pretty much useless too anyway. So instead, this is just a list of
// bones in the mSkelBase which are NiCamera nodes.
std::vector<Ogre::Bone*> mCameras;
std::map<int,TextKeyMap> mTextKeys; std::map<int,TextKeyMap> mTextKeys;
std::vector<Ogre::Controller<Ogre::Real> > mControllers; std::vector<Ogre::Controller<Ogre::Real> > mControllers;