ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed rotational IPOs (problems were caused by a different order of rotations in

Browse Source 
blender and irrlicht).
NOTE: all tracks that are using animations WILL NOT WORK PROPERLY till they have
been re-exported with the new track exporter (which will be done shortly).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6396 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2010-11-04 21:52:48 +00:00
parent af38843252
commit 158ca9fb20
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/animations/ipo.cpp
View File

@ -123,9 +123,9 @@ void Ipo::update(float dt, core::vector3df *xyz, core::vector3df *hpr,
case Ipo::IPO_LOCX : xyz->X = get(); break;
case Ipo::IPO_LOCY : xyz->Y = get(); break;
case Ipo::IPO_LOCZ : xyz->Z = get(); break;
case Ipo::IPO_ROTX : hpr->X = -get(); break; // the - signs are odd,
case Ipo::IPO_ROTY : hpr->Y = -get(); break; // but it works
case Ipo::IPO_ROTZ : hpr->Z = get(); break; // why no - ??
case Ipo::IPO_ROTX : hpr->X = get(); break;
case Ipo::IPO_ROTY : hpr->Y = get(); break;
case Ipo::IPO_ROTZ : hpr->Z = get(); break;
case Ipo::IPO_SCALEX : scale->X = get(); break;
case Ipo::IPO_SCALEY : scale->Y = get(); break;
case Ipo::IPO_SCALEZ : scale->Z = get(); break;

20
src/animations/three_d_animation.cpp
View File

@ -42,6 +42,7 @@ ThreeDAnimation::ThreeDAnimation(const Track &track,
m_body = NULL;
m_motion_state = NULL;
m_collision_shape = NULL;
m_hpr = AnimationBase::m_animated_node->getRotation();
std::string shape;
node.get("shape", &shape);
if(shape!="")
@ -123,12 +124,25 @@ ThreeDAnimation::~ThreeDAnimation()
void ThreeDAnimation::update(float dt)
{
core::vector3df xyz = m_animated_node->getPosition();
core::vector3df hpr = m_animated_node->getRotation();
core::vector3df scale = m_animated_node->getScale();
AnimationBase::update(dt, &xyz, &hpr, &scale); //updates all IPOs
AnimationBase::update(dt, &xyz, &m_hpr, &scale); //updates all IPOs
m_animated_node->setPosition(xyz);
m_animated_node->setRotation(hpr);
m_animated_node->setScale(scale);
// Note that the rotation order of irrlicht is different from the one
// in blender. So in order to reproduce the blender IPO rotations
// correctly, we have to get the rotations around each axis and combine
// them in the right order for irrlicht
core::matrix4 m;
m.makeIdentity();
core::matrix4 mx;
mx.setRotationDegrees(core::vector3df(m_hpr.X, 0, 0));
core::matrix4 my;
my.setRotationDegrees(core::vector3df(0, m_hpr.Y, 0));
core::matrix4 mz;
mz.setRotationDegrees(core::vector3df(0, 0, m_hpr.Z));
m = my*mz*mx;
core::vector3df hpr = m.getRotationDegrees();
m_animated_node->setRotation(hpr);
// Now update the position of the bullet body if there is one:
if(m_body)

5
src/animations/three_d_animation.hpp
View File

@ -52,6 +52,11 @@ private:
/** A user pointer to connect a bullet body with this object. */
UserPointer m_user_pointer;
/** We have to store the rotation value as computed in blender, since
* irrlicht uses a different order, so for rotation animations we
* can not use the value returned by getRotation from a scene node. */
core::vector3df m_hpr;
void createPhysicsBody(const std::string &shape);
public: