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

First attempt at correcting the rescue animation.

Browse Source
This commit is contained in:
nixt
2014-07-04 12:43:34 +05:30
parent 437f8191f4
commit dbe4cd02fa
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/karts/rescue_animation.cpp
View File

@@ -45,10 +45,26 @@ RescueAnimation::RescueAnimation(AbstractKart *kart, bool is_auto_rescue)
m_kart->getAttachment()->clear();
// We get the final transform of the kart so that it is rotated
// accordingly during the rescue animation
World * world = World::getWorld();
unsigned int index = world->getRescuePositionIndex(m_kart);
btTransform t = world->getRescueTransform(index);
Vec3 up = t.getBasis().getColumn(1);
float target_pitch = atan2(up.getZ(), fabsf(up.getY()));
float target_roll = atan2(up.getX(), up.getY());
m_curr_rotation.setPitch(m_kart->getPitch());
m_curr_rotation.setRoll(m_kart->getRoll() );
m_curr_rotation.setRoll(m_kart->getRoll());
m_curr_rotation.setHeading(0);
m_add_rotation = -m_curr_rotation/m_timer;
Vec3 required_rotation;
required_rotation.setPitch(target_pitch - m_kart->getPitch());
required_rotation.setRoll(target_roll - m_kart->getRoll());
required_rotation.setHeading(0);
m_add_rotation = -required_rotation/m_timer;
m_curr_rotation.setHeading(m_kart->getHeading());
// Add a hit unless it was auto-rescue