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

Make rands in direct hits use floats correctly (they were ints at the wrong

Browse Source 
time, so results were 0.0f always) and limit minimal distance in non direct
hits (maybe should use other value, just a matter of testing).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4417 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
mbjornstk
2010-01-08 02:35:01 +00:00
parent 0f964187fe
commit 0b09240e5e
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/karts/kart.cpp
View File

@@ -506,15 +506,16 @@ void Kart::handleExplosion(const Vec3& pos, bool direct_hit)
float sign_c = (sign_bits & (0x1 << 10)) ? 1.0f : -1.0f;
float sign_d = (sign_bits & (0x1 << 11)) ? 1.0f : -1.0f;
float sign_e = (sign_bits & (0x1 << 12)) ? 1.0f : -1.0f;
btVector3 diff(sign_a * (float)(rand()%16/16), sign_b * (float)(rand()%16/16), 2.0f);
btVector3 diff(sign_a * float(rand()%16) / 16.0f, sign_b * float(rand()%16) / 16.0f, 2.0f);
diff.normalize();
diff*=stk_config->m_explosion_impulse/5.0f;
diff *= stk_config->m_explosion_impulse / 5.0f;
m_uprightConstraint->setDisableTime(10.0f);
getVehicle()->getRigidBody()->applyCentralImpulse(diff);
getVehicle()->getRigidBody()->applyTorqueImpulse(btVector3(sign_c * float(rand()%32*5),
sign_d * float(rand()%32*5),
sign_e * float(rand()%32*5)));
btVector3 torque(sign_c * float(rand()%32) * 5.0f, sign_d * float(rand()%32) * 5.0f, sign_e * float(rand()%32) * 5.0f);
getVehicle()->getRigidBody()->applyTorqueImpulse(torque);
m_stars_effect->showFor(6.0f);
}
else // only affected by a distant explosion
@@ -522,9 +523,12 @@ void Kart::handleExplosion(const Vec3& pos, bool direct_hit)
btVector3 diff=getXYZ()-pos;
//if the z component is negative, the resulting impulse could push the
// kart through the floor. So in this case ignore z.
if(diff.getZ()<0) diff.setZ(0.0f);
if(diff.getZ()<0.0f) diff.setZ(0.0f);
float len2=diff.length2();
// Protect against "near zero" distances
len2 = (len2 > 0.5f) ? len2 : 0.5f;
// The correct formulae would be to first normalise diff,
// then apply the impulse (which decreases 1/r^2 depending
// on the distance r), so: