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

Improve flying mode, part 2

Browse Source
This commit is contained in:
Marianne Gagnon
2014-04-28 19:55:41 -04:00
parent 389ec42bde
commit 8d2b56a34a
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/karts/kart.cpp
View File

@@ -2272,14 +2272,16 @@ void Kart::updateSliding()
*/
void Kart::updateFlying()
{
m_body->setLinearVelocity(m_body->getLinearVelocity() * 0.99f);
if (m_controls.m_accel)
{
btVector3 velocity = m_body->getLinearVelocity();
if (velocity.length() < 50)
if (velocity.length() < 25)
{
float orientation = getHeading();
m_body->applyCentralImpulse(btVector3(60.0f*sin(orientation), 0.0,
60.0f*cos(orientation)));
m_body->applyCentralImpulse(btVector3(100.0f*sin(orientation), 0.0,
100.0f*cos(orientation)));
}
}
else if (m_controls.m_brake)
@@ -2288,8 +2290,8 @@ void Kart::updateFlying()
if (velocity.length() > -15)
{
float orientation = getHeading();
m_body->applyCentralImpulse(btVector3(-60.0f*sin(orientation), 0.0,
-60.0f*cos(orientation)));
m_body->applyCentralImpulse(btVector3(-100.0f*sin(orientation), 0.0,
-100.0*cos(orientation)));
}
}
@@ -2298,13 +2300,6 @@ void Kart::updateFlying()
m_body->applyTorque(btVector3(0.0, m_controls.m_steer * 3500.0f, 0.0));
}
if (!m_controls.m_brake && !m_controls.m_accel && (m_controls.m_steer > -0.9f && m_controls.m_steer < 0.1f))
{
btVector3 velocity = m_body->getLinearVelocity();
velocity = velocity * 0.96f;
m_body->setLinearVelocity(velocity);
}
// dampen any roll while flying, makes the kart hard to control
btVector3 velocity = m_body->getAngularVelocity();
velocity.setX(0);