mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 03:35:27 +00:00
Code Issues Projects Releases Wiki Activity

Search more aggressively for an animation velocity

Browse Source
This commit is contained in:
Chris Robinson 2013-05-10 19:31:33 -07:00
parent 5a9c1e1245
commit 56eede2610
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/openmw/mwrender/animation.cpp
View File

@ -546,8 +546,9 @@ bool Animation::resetActiveGroups()
bool ismoving = false; bool ismoving = false;
const NifOgre::TextKeyMap &keys = state->second.mSource->mTextKeys; const AnimSource *animsrc = state->second.mSource;
std::vector<Ogre::Controller<Ogre::Real> >&ctrls = state->second.mSource->mControllers[0]; const NifOgre::TextKeyMap &keys = animsrc->mTextKeys;
const std::vector<Ogre::Controller<Ogre::Real> >&ctrls = animsrc->mControllers[0];
for(size_t i = 0;i < ctrls.size();i++) for(size_t i = 0;i < ctrls.size();i++)
{ {
NifOgre::NodeTargetValue<Ogre::Real> *dstval; NifOgre::NodeTargetValue<Ogre::Real> *dstval;
@ -562,6 +563,23 @@ bool Animation::resetActiveGroups()
} }
} }
// If there's no velocity, keep looking
while(!(mAnimVelocity > 1.0f) && animsrc-- != &mAnimSources[0])
{
const NifOgre::TextKeyMap &keys = animsrc->mTextKeys;
const std::vector<Ogre::Controller<Ogre::Real> >&ctrls = animsrc->mControllers[0];
for(size_t i = 0;i < ctrls.size();i++)
{
NifOgre::NodeTargetValue<Ogre::Real> *dstval;
dstval = static_cast<NifOgre::NodeTargetValue<Ogre::Real>*>(ctrls[i].getDestination().getPointer());
if(dstval->getNode() == mNonAccumRoot)
{
mAnimVelocity = calcAnimVelocity(keys, dstval, mAccumulate, state->first);
break;
}
}
}
return ismoving; return ismoving;
} }