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

smoother animations

Browse source
This commit is contained in:
Jason Hooks 2012-08-17 17:10:21 -04:00
parent d14cc5a435
commit cc776810e2
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
components/nifogre/ogre_nif_loader.cpp
View file

@ -274,15 +274,26 @@ void loadResource(Ogre::Resource *resource)
if(scaleiter != scalekeys.mKeys.end()) if(scaleiter != scalekeys.mKeys.end())
lastscale = curscale = Ogre::Vector3(scaleiter->mValue) / startscale; lastscale = curscale = Ogre::Vector3(scaleiter->mValue) / startscale;
bool didlast = false; bool didlast = false;
//The times are right
while(!didlast) while(!didlast)
{ {
float curtime = kfc->timeStop; float curtime = kfc->timeStop;
if(quatiter != quatkeys.mKeys.end()) if(quatiter != quatkeys.mKeys.end()){
curtime = std::min(curtime, quatiter->mTime); curtime = std::min(curtime, quatiter->mTime);
if(traniter != trankeys.mKeys.end()) lastquat = curquat;
curquat = startquat.Inverse() * quatiter->mValue;
}
if(traniter != trankeys.mKeys.end()){
curtime = std::min(curtime, traniter->mTime); curtime = std::min(curtime, traniter->mTime);
if(scaleiter != scalekeys.mKeys.end()) lasttrans = curtrans;
curtrans = traniter->mValue - starttrans;
}
if(scaleiter != scalekeys.mKeys.end()){
curtime = std::min(curtime, scaleiter->mTime); curtime = std::min(curtime, scaleiter->mTime);
lastscale = curscale;
curscale = Ogre::Vector3(scaleiter->mValue) / startscale;
}
curtime = std::max(curtime, kfc->timeStart); curtime = std::max(curtime, kfc->timeStart);
if(curtime >= kfc->timeStop) if(curtime >= kfc->timeStop)
@ -295,20 +306,14 @@ void loadResource(Ogre::Resource *resource)
// current time // current time
while(quatiter != quatkeys.mKeys.end() && curtime >= quatiter->mTime) while(quatiter != quatkeys.mKeys.end() && curtime >= quatiter->mTime)
{ {
lastquat = curquat;
curquat = startquat.Inverse() * quatiter->mValue;
quatiter++; quatiter++;
} }
while(traniter != trankeys.mKeys.end() && curtime >= traniter->mTime) while(traniter != trankeys.mKeys.end() && curtime >= traniter->mTime)
{ {
lasttrans = curtrans;
curtrans = traniter->mValue - starttrans;
traniter++; traniter++;
} }
while(scaleiter != scalekeys.mKeys.end() && curtime >= scaleiter->mTime) while(scaleiter != scalekeys.mKeys.end() && curtime >= scaleiter->mTime)
{ {
lastscale = curscale;
curscale = Ogre::Vector3(scaleiter->mValue) / startscale;
scaleiter++; scaleiter++;
} }
@ -320,7 +325,7 @@ void loadResource(Ogre::Resource *resource)
{ {
QuaternionKeyList::VecType::const_iterator last = quatiter-1; QuaternionKeyList::VecType::const_iterator last = quatiter-1;
float diff = (curtime-last->mTime) / (quatiter->mTime-last->mTime); float diff = (curtime-last->mTime) / (quatiter->mTime-last->mTime);
kframe->setRotation(Ogre::Quaternion::nlerp(diff, lastquat, curquat)); kframe->setRotation(Ogre::Quaternion::Slerp(diff, lastquat, curquat, true));
} }
if(traniter == trankeys.mKeys.end() || traniter == trankeys.mKeys.begin() || (traniter-1)->mTime == curtime) if(traniter == trankeys.mKeys.end() || traniter == trankeys.mKeys.begin() || (traniter-1)->mTime == curtime)
kframe->setTranslate(curtrans); kframe->setTranslate(curtrans);