mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 20:11:36 +00:00
Code Issues Releases Wiki Activity

Ensure mCurGroup always has valid iterators, and only get the animation state when animation keys exist

Browse source
This commit is contained in:
Chris Robinson 2013-01-07 21:00:21 -08:00
parent d8dbd5e206
commit 2a9dc5ad94
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,17 +49,6 @@ void Animation::createEntityList(Ogre::SceneNode *node, const std::string &model
mEntityList = NifOgre::NIFLoader::createEntities(mInsert, model); mEntityList = NifOgre::NIFLoader::createEntities(mInsert, model);
if(mEntityList.mSkelBase) if(mEntityList.mSkelBase)
{ {
Ogre::AnimationStateSet *aset = mEntityList.mSkelBase->getAllAnimationStates();
Ogre::AnimationStateIterator as = aset->getAnimationStateIterator();
while(as.hasMoreElements())
{
Ogre::AnimationState *state = as.getNext();
state->setEnabled(true);
state->setLoop(false);
if(!mAnimState)
mAnimState = state;
}
Ogre::SkeletonInstance *skelinst = mEntityList.mSkelBase->getSkeleton(); Ogre::SkeletonInstance *skelinst = mEntityList.mSkelBase->getSkeleton();
// Would be nice if Ogre::SkeletonInstance allowed access to the 'master' Ogre::SkeletonPtr. // Would be nice if Ogre::SkeletonInstance allowed access to the 'master' Ogre::SkeletonPtr.
Ogre::SkeletonManager &skelMgr = Ogre::SkeletonManager::getSingleton(); Ogre::SkeletonManager &skelMgr = Ogre::SkeletonManager::getSingleton();
@ -72,7 +61,7 @@ void Animation::createEntityList(Ogre::SceneNode *node, const std::string &model
if(!data.isEmpty()) if(!data.isEmpty())
{ {
mTextKeys = Ogre::any_cast<NifOgre::TextKeyMap>(data); mTextKeys = Ogre::any_cast<NifOgre::TextKeyMap>(data);
mNextGroup = mCurGroup = GroupTimes(mTextKeys.end()); mNextGroup = mCurGroup = GroupTimes(mTextKeys.begin());
mAccumRoot = skelinst->getRootBone(); mAccumRoot = skelinst->getRootBone();
mAccumRoot->setManuallyControlled(true); mAccumRoot->setManuallyControlled(true);
@ -84,11 +73,23 @@ void Animation::createEntityList(Ogre::SceneNode *node, const std::string &model
} }
} }
if(mTextKeys.size() > 0)
{
NifOgre::TextKeyMap::iterator keyiter; NifOgre::TextKeyMap::iterator keyiter;
for(keyiter = mTextKeys.begin();keyiter != mTextKeys.end();keyiter++) for(keyiter = mTextKeys.begin();keyiter != mTextKeys.end();keyiter++)
{
std::transform(keyiter->second.begin(), keyiter->second.end(), std::transform(keyiter->second.begin(), keyiter->second.end(),
keyiter->second.begin(), ::tolower); keyiter->second.begin(), ::tolower);
Ogre::AnimationStateSet *aset = mEntityList.mSkelBase->getAllAnimationStates();
Ogre::AnimationStateIterator as = aset->getAnimationStateIterator();
while(as.hasMoreElements())
{
Ogre::AnimationState *state = as.getNext();
state->setEnabled(true);
state->setLoop(false);
if(!mAnimState)
mAnimState = state;
}
} }
} }
} }
@ -179,6 +180,7 @@ void Animation::playGroup(std::string groupname, int mode, int loops)
{ {
times.mStart = times.mLoopStart = mTextKeys.begin(); times.mStart = times.mLoopStart = mTextKeys.begin();
times.mLoopStop = times.mStop = mTextKeys.end(); times.mLoopStop = times.mStop = mTextKeys.end();
times.mLoopStop--; times.mStop--;
} }
else if(!findGroupTimes(groupname, &times)) else if(!findGroupTimes(groupname, &times))
{ {