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

Fixed byg and naming inconsistencies in kart pushing, more

Browse Source 
tuning towards collision impulse.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10875 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2012-02-19 21:41:54 +00:00
parent d2596b5d67
commit 5feea5c8f2
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/stk_config.xml
View File

@@ -312,7 +312,7 @@
bevelling, and uses a simple box shape.
As an example, a value of 1 for x and z will result in a
sharp 'arrow' like shape. -->
<collision impulse="3000" impulse-time="0.1" terrain-impulse="8000"
<collision impulse="5000" impulse-time="0.1" terrain-impulse="8000"
restitution="1.0" bevel-factor="0.5 0.0 0.5" />
<!-- Kart-specific plunger and rubber band handling: max-length is

30
src/physics/physics.cpp
View File

@@ -243,17 +243,19 @@ void Physics::KartKartCollision(Kart *kart_a, const Vec3 &contact_point_a,
// crashes, but avoids pushing both karts in corner cases
// - pun intended ;) ).
if(contact_point_a.getX() < contact_point_b.getX())
{
left_kart = kart_a;
right_kart = kart_b;
}
else
{
left_kart = kart_b;
right_kart = kart_a;
}
else
{
left_kart = kart_a;
right_kart = kart_b;
}
// Add a scaling factor depending on the mass (avoid div by zero)
// Add a scaling factor depending on the mass (avoid div by zero).
// The value of f_right is applied to the right kart, and f_left
// to the left kart. f_left = 1 / f_right
float f_right = right_kart->getKartProperties()->getMass() > 0
? left_kart->getKartProperties()->getMass()
/ right_kart->getKartProperties()->getMass()
@@ -290,15 +292,15 @@ void Physics::KartKartCollision(Kart *kart_a, const Vec3 &contact_point_a,
// More driving towards left --> left kart gets bigger impulse
if(vel_diff<0)
{
f_right *= vel_left == 0 ? 2.0f : (1.0f - vel_diff/fabsf(vel_left));
if(f_right > 2.0f)
f_right = 2.0f;
f_left *= vel_left == 0 ? 2.0f : (1.0f - vel_diff/fabsf(vel_left));
if(f_left > 2.0f)
f_left = 2.0f;
}
else
{
f_left *= vel_right == 0 ? 2.0f : (1.0f + vel_diff/fabsf(vel_right));
if(f_left > 2.0f)
f_left = 2.0f;
f_right *= vel_right == 0 ? 2.0f : (1.0f + vel_diff/fabsf(vel_right));
if(f_right > 2.0f)
f_right = 2.0f;
}
// Increase the effect somewhat by squaring the factors
@@ -311,7 +313,7 @@ void Physics::KartKartCollision(Kart *kart_a, const Vec3 &contact_point_a,
if(right_kart->getVehicle()->getCentralImpulseTime()<=0)
{
const KartProperties *kp = left_kart->getKartProperties();
Vec3 impulse(-kp->getCollisionImpulse()*f_left, 0, 0);
Vec3 impulse(kp->getCollisionImpulse()*f_right, 0, 0);
impulse = right_kart->getTrans().getBasis() * impulse;
right_kart->getVehicle()
->setTimedCentralImpulse(kp->getCollisionImpulseTime(),
@@ -324,7 +326,7 @@ void Physics::KartKartCollision(Kart *kart_a, const Vec3 &contact_point_a,
if(left_kart->getVehicle()->getCentralImpulseTime()<=0)
{
const KartProperties *kp = right_kart->getKartProperties();
Vec3 impulse = Vec3(kp->getCollisionImpulse()*f_right, 0, 0);
Vec3 impulse = Vec3(-kp->getCollisionImpulse()*f_left, 0, 0);
impulse = left_kart->getTrans().getBasis() * impulse;
left_kart->getVehicle()
->setTimedCentralImpulse(kp->getCollisionImpulseTime(),