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

Fix restarting the race when karts are up-side-down

Browse Source
This commit is contained in:
Benau
2016-09-10 11:11:52 +08:00
parent fde9ccd53e
commit 7cfd9752d0
2 changed files with 8 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/karts/kart.cpp
View File

@@ -295,7 +295,10 @@ void Kart::reset()
// mode) - but only if they actually have a body (e.g. ghost karts
// don't have one).
if(m_body)
{
World::getWorld()->getPhysics()->removeKart(this);
World::getWorld()->getPhysics()->addKart(this);
}
m_min_nitro_time = 0.0f;
@@ -684,10 +687,8 @@ void Kart::createPhysics()
wheel.m_frictionSlip = m_kart_properties->getFrictionSlip();
wheel.m_rollInfluence = m_kart_properties->getStabilityRollInfluence();
}
// Obviously these allocs have to be properly managed/freed
btTransform t;
t.setIdentity();
World::getWorld()->getPhysics()->addKart(this);
// Body to be added in reset() which allows complete reset kart when
// restarting the race
} // createPhysics
@@ -1345,7 +1346,7 @@ void Kart::update(float dt)
float g = World::getWorld()->getTrack()->getGravity();
Vec3 gravity(0, -g, 0);
btRigidBody *body = getVehicle()->getRigidBody();
//body->setGravity(gravity);
body->setGravity(gravity);
}
// let kart fall a bit before rescuing
const Vec3 *min, *max;

64
src/modes/world.cpp
View File

@@ -693,70 +693,10 @@ void World::resetAllKarts()
}
}
bool all_finished=false;
// kart->isInRest() is not fully correct, since it only takes the
// velocity in count, which might be close to zero when the kart
// is just hitting the floor, before being pushed up again by
// the suspension. So we just do a longer initial simulation,
// which should be long enough for all karts to be firmly on ground.
// Do a longer initial simulation, which should be long enough for all
// karts to be firmly on ground.
for(int i=0; i<60; i++) m_physics->update(1.f/60.f);
// Stil wait will all karts are in rest (and handle the case that a kart
// fell through the ground, which can happen if a kart falls for a long
// time, therefore having a high speed when hitting the ground.
int count = 0;
while(!all_finished)
{
if (count++ > 100)
{
Log::error("World", "Infinite loop waiting for all_finished?");
break;
}
m_physics->update(1.f/60.f);
all_finished=true;
for ( KartList::iterator i=m_karts.begin(); i!=m_karts.end(); i++)
{
if ((*i)->isGhostKart()) continue;
if(!(*i)->isInRest())
{
Vec3 normal;
Vec3 hit_point;
const Material *material;
// We can't use (*i)->getXYZ(), since this is only defined
// after update() was called. Instead we have to get the
// real position of the rigid body.
btTransform t;
(*i)->getBody()->getMotionState()->getWorldTransform(t);
// This test can not be done only once before the loop, since
// it can happen that the kart falls through the track later!
Vec3 to = t.getOrigin()+Vec3(0, -10000, 0);
m_track->getTriangleMesh().castRay(t.getOrigin(), to,
&hit_point, &material,
&normal);
if(!material)
{
Log::error("World",
"No valid starting position for kart %d "
"on track %s.",
(int)(i-m_karts.begin()),
m_track->getIdent().c_str());
if (UserConfigParams::m_artist_debug_mode)
{
Log::warn("World", "Activating fly mode.");
(*i)->flyUp();
continue;
}
else
{
exit(-1);
}
}
all_finished=false;
break;
}
}
} // while
for ( KartList::iterator i=m_karts.begin(); i!=m_karts.end(); i++)
{
(*i)->kartIsInRestNow();