mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 10:23:53 +00:00
Code Issues Releases Wiki Activity

Check existing skeleton sources if the current one has no animation root

Browse source
This commit is contained in:
Chris Robinson 2013-02-05 17:15:40 -08:00
parent 16933e3926
commit 054ef3113a
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -108,10 +108,28 @@ void Animation::createEntityList(Ogre::SceneNode *node, const std::string &model
boneiter.getNext()->setManuallyControlled(true); boneiter.getNext()->setManuallyControlled(true);
Ogre::Bone *bone = insertSkeletonSource(skelinst->getName()); Ogre::Bone *bone = insertSkeletonSource(skelinst->getName());
if(!bone)
{
for(std::vector<Ogre::SkeletonPtr>::const_iterator iter(mSkeletonSources.begin());
!bone && iter != mSkeletonSources.end();iter++)
{
Ogre::Skeleton::BoneIterator boneiter = (*iter)->getBoneIterator();
while(boneiter.hasMoreElements())
{
bone = boneiter.getNext();
Ogre::UserObjectBindings &bindings = bone->getUserObjectBindings();
const Ogre::Any &data = bindings.getUserAny(NifOgre::sTextKeyExtraDataID);
if(!data.isEmpty() && Ogre::any_cast<bool>(data))
break;
bone = NULL;
}
}
}
if(bone) if(bone)
{ {
mAccumRoot = mInsert; mAccumRoot = mInsert;
mNonAccumRoot = skelinst->getBone(bone->getHandle()); mNonAccumRoot = skelinst->getBone(bone->getName());
mStartPosition = mNonAccumRoot->getInitialPosition(); mStartPosition = mNonAccumRoot->getInitialPosition();
mLastPosition = mStartPosition; mLastPosition = mStartPosition;