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

Search the textkeys to check if an animation group exists

Browse source
This commit is contained in:
Chris Robinson 2013-04-22 20:59:55 -07:00
parent a2fc43c7df
commit 7279e015e9
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -169,11 +169,28 @@ Ogre::Node *Animation::getNode(const std::string &name)
} }
NifOgre::TextKeyMap::const_iterator Animation::findGroupStart(const NifOgre::TextKeyMap &keys, const std::string &groupname)
{
NifOgre::TextKeyMap::const_iterator iter(keys.begin());
for(;iter != keys.end();iter++)
{
if(iter->second.compare(0, groupname.size(), groupname) == 0 &&
iter->second.compare(groupname.size(), 2, ": ") == 0)
break;
}
return iter;
}
bool Animation::hasAnimation(const std::string &anim) bool Animation::hasAnimation(const std::string &anim)
{ {
for(std::vector<NifOgre::ObjectList>::const_iterator iter(mObjectLists.begin());iter != mObjectLists.end();iter++) for(std::vector<NifOgre::ObjectList>::const_iterator iter(mObjectLists.begin());iter != mObjectLists.end();iter++)
{ {
if(iter->mSkelBase && iter->mSkelBase->hasAnimationState(anim)) if(iter->mTextKeys.size() == 0)
continue;
const NifOgre::TextKeyMap &keys = iter->mTextKeys.begin()->second;
if(findGroupStart(keys, anim) != keys.end())
return true; return true;
} }
return false; return false;

2
apps/openmw/mwrender/animation.hpp
View file

@ -78,6 +78,8 @@ protected:
* returns the wanted movement vector from the previous update. */ * returns the wanted movement vector from the previous update. */
Ogre::Vector3 updatePosition(); Ogre::Vector3 updatePosition();
static NifOgre::TextKeyMap::const_iterator findGroupStart(const NifOgre::TextKeyMap &keys, const std::string &groupname);
/* Resets the animation to the time of the specified start marker, without /* Resets the animation to the time of the specified start marker, without
* moving anything, and set the end time to the specified stop marker. If * moving anything, and set the end time to the specified stop marker. If
* the marker is not found, or if the markers are the same, it returns * the marker is not found, or if the markers are the same, it returns