mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 09:09:41 +00:00
Code Issues Releases Wiki Activity

Don't offset the animation time to 0

Browse source
This commit is contained in:
Chris Robinson 2013-04-05 05:34:59 -07:00
parent dc9f5f93e7
commit 12fada2862
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
components/nifogre/ogrenifloader.cpp
View file

@ -167,7 +167,7 @@ static void fail(const std::string &msg)
static void buildAnimation(Ogre::Skeleton *skel, const std::string &name, const std::vector<const Nif::NiKeyframeController*> &ctrls, const std::vector<std::string> &targets, float startTime, float stopTime) static void buildAnimation(Ogre::Skeleton *skel, const std::string &name, const std::vector<const Nif::NiKeyframeController*> &ctrls, const std::vector<std::string> &targets, float startTime, float stopTime)
{ {
Ogre::Animation *anim = skel->createAnimation(name, stopTime-startTime); Ogre::Animation *anim = skel->createAnimation(name, stopTime);
for(size_t i = 0;i < ctrls.size();i++) for(size_t i = 0;i < ctrls.size();i++)
{ {
@ -246,7 +246,7 @@ static void buildAnimation(Ogre::Skeleton *skel, const std::string &name, const
} }
Ogre::TransformKeyFrame *kframe; Ogre::TransformKeyFrame *kframe;
kframe = nodetrack->createNodeKeyFrame(curtime-startTime); kframe = nodetrack->createNodeKeyFrame(curtime);
if(quatiter == quatkeys.mKeys.end() || quatiter == quatkeys.mKeys.begin()) if(quatiter == quatkeys.mKeys.end() || quatiter == quatkeys.mKeys.begin())
kframe->setRotation(curquat); kframe->setRotation(curquat);
else else
@ -441,16 +441,15 @@ void loadResource(Ogre::Resource *resource)
buildAnimation(skel, currentgroup, ctrls, targets, keyiter->first, lastkeyiter->first); buildAnimation(skel, currentgroup, ctrls, targets, keyiter->first, lastkeyiter->first);
TextKeyMap::const_iterator insiter = keyiter; TextKeyMap::const_iterator insiter(keyiter);
TextKeyMap groupkeys; TextKeyMap groupkeys;
do { do {
sep = insiter->second.find(':'); sep = insiter->second.find(':');
if(sep == currentgroup.length() && insiter->second.compare(0, sep, currentgroup) == 0) if(sep == currentgroup.length() && insiter->second.compare(0, sep, currentgroup) == 0)
groupkeys.insert(std::make_pair(insiter->first - keyiter->first, groupkeys.insert(std::make_pair(insiter->first, insiter->second.substr(sep+2)));
insiter->second.substr(sep+2)));
else if((sep == sizeof("soundgen")-1 && insiter->second.compare(0, sep, "soundgen") == 0) || else if((sep == sizeof("soundgen")-1 && insiter->second.compare(0, sep, "soundgen") == 0) ||
(sep == sizeof("sound")-1 && insiter->second.compare(0, sep, "sound") == 0)) (sep == sizeof("sound")-1 && insiter->second.compare(0, sep, "sound") == 0))
groupkeys.insert(std::make_pair(insiter->first - keyiter->first, insiter->second)); groupkeys.insert(std::make_pair(insiter->first, insiter->second));
} while(insiter++ != lastkeyiter); } while(insiter++ != lastkeyiter);
bindings.setUserAny(std::string(sTextKeyExtraDataID)+"@"+currentgroup, Ogre::Any(groupkeys)); bindings.setUserAny(std::string(sTextKeyExtraDataID)+"@"+currentgroup, Ogre::Any(groupkeys));