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

Filter out skinned shapes that don't match the bone name

Browse source
This commit is contained in:
Chris Robinson 2012-07-18 12:47:16 -07:00
parent db948969c9
commit 3b29d280b9
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
components/nifogre/ogre_nif_loader.cpp
View file

@ -926,12 +926,23 @@ EntityList NIFLoader::createEntities(Ogre::Entity *parent, const std::string &bo
if(meshes.size() == 0) if(meshes.size() == 0)
return entitylist; return entitylist;
std::string filter = "Tri "+bonename;
for(size_t i = 0;i < meshes.size();i++) for(size_t i = 0;i < meshes.size();i++)
{ {
entitylist.mEntities.push_back(sceneMgr->createEntity(meshes[i].first->getName())); Ogre::Entity *ent = sceneMgr->createEntity(meshes[i].first->getName());
Ogre::Entity *entity = entitylist.mEntities.back(); if(ent->hasSkeleton())
if(!entitylist.mSkelBase && entity->hasSkeleton()) {
entitylist.mSkelBase = entity; if(meshes[i].second.length() < filter.length() || filter.compare(meshes[i].second) != 0)
{
sceneMgr->destroyEntity(ent);
meshes.erase(meshes.begin()+i);
i--;
continue;
}
if(!entitylist.mSkelBase)
entitylist.mSkelBase = ent;
}
entitylist.mEntities.push_back(ent);
} }
if(entitylist.mSkelBase) if(entitylist.mSkelBase)
@ -946,7 +957,7 @@ EntityList NIFLoader::createEntities(Ogre::Entity *parent, const std::string &bo
parent->attachObjectToBone(bonename, entity); parent->attachObjectToBone(bonename, entity);
} }
else if(entity != entitylist.mSkelBase) else if(entity != entitylist.mSkelBase)
entitylist.mSkelBase->attachObjectToBone(meshes[i].second, entity); parent->attachObjectToBone(bonename, entity);
} }
} }
else else