mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 13:53:53 +00:00
Code Issues Releases Wiki Activity

Fix setting and getting KeyframeController transforms

Browse source
This commit is contained in:
Chris Robinson 2013-04-24 04:12:27 -07:00
parent 102b3bdef9
commit 68a9a4de5f
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
components/nifogre/ogrenifloader.cpp
View file

@ -173,8 +173,6 @@ public:
{
if(time <= keys.front().mTime)
return keys.front().mValue;
if(time >= keys.back().mTime)
return keys.back().mValue;
Nif::FloatKeyList::VecType::const_iterator iter(keys.begin()+1);
for(;iter != keys.end();iter++)
@ -193,8 +191,6 @@ public:
{
if(time <= keys.front().mTime)
return keys.front().mValue;
if(time >= keys.back().mTime)
return keys.back().mValue;
Nif::Vector3KeyList::VecType::const_iterator iter(keys.begin()+1);
for(;iter != keys.end();iter++)
@ -213,8 +209,6 @@ public:
{
if(time <= keys.front().mTime)
return keys.front().mValue;
if(time >= keys.back().mTime)
return keys.back().mValue;
Nif::QuaternionKeyList::VecType::const_iterator iter(keys.begin()+1);
for(;iter != keys.end();iter++)
@ -241,21 +235,21 @@ public:
{
if(mRotations.mKeys.size() > 0)
return interpKey(mRotations.mKeys, time);
return Ogre::Quaternion();
return mNode->getOrientation();
}
virtual Ogre::Vector3 getTranslation(float time) const
{
if(mTranslations.mKeys.size() > 0)
return interpKey(mTranslations.mKeys, time);
return Ogre::Vector3(0.0f);
return mNode->getPosition();
}
virtual Ogre::Vector3 getScale(float time) const
{
if(mScales.mKeys.size() > 0)
return Ogre::Vector3(interpKey(mScales.mKeys, time));
return Ogre::Vector3(1.0f);
return mNode->getScale();
}
virtual Ogre::Real getValue() const
@ -266,9 +260,12 @@ public:
virtual void setValue(Ogre::Real time)
{
mNode->setOrientation(Value::getRotation(time));
mNode->setPosition(Value::getTranslation(time));
mNode->setScale(Value::getScale(time));
if(mRotations.mKeys.size() > 0)
mNode->setOrientation(interpKey(mRotations.mKeys, time));
if(mTranslations.mKeys.size() > 0)
mNode->setPosition(interpKey(mTranslations.mKeys, time));
if(mScales.mKeys.size() > 0)
mNode->setScale(Ogre::Vector3(interpKey(mScales.mKeys, time)));
}
};