iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

Re #720 Fixed wrong initializations (old typos) + another set-but-not-used warning

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5008 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 018ffe955c68f492a28447cab2695fcbb4b2f4db
Former-commit-id: 0f8e7363c9b9c30f942970ccb70e3722298a0cbe
This commit is contained in:
pouillot 2012-10-20 14:06:39 +00:00
parent 50397aa5bb
commit c37659ccfb
2 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/modules/simu/simuv3/car.cpp
View file

@ -521,20 +521,16 @@ SimCarUpdatePos(tCar *car)
if (gc_height_difference < 0) {
car->DynGCg.pos.z = RtTrackHeightL(&(car->trkPos)) + 1;
// FIXME: Wasn't car->DynGCg.vel.z intended the 2nd time ?
car->DynGCg.vel.x = car->DynGCg.vel.y = car->DynGCg.vel.y =
// FIXME: Wasn't car->DynGC.vel.z intended the 2nd time ?
car->DynGC.vel.x = car->DynGC.vel.y = car->DynGC.vel.y = 0.0;
car->DynGCg.vel.x = car->DynGCg.vel.y = car->DynGCg.vel.z =
car->DynGC.vel.x = car->DynGC.vel.y = car->DynGC.vel.z = 0.0;
car->DynGCg.vel.ax = car->DynGC.vel.ax =
car->DynGCg.vel.ay = car->DynGC.vel.ay =
car->DynGCg.vel.az = car->DynGC.vel.az = 0.0;
car->rot_mom[0] = car->rot_mom[1] = car->rot_mom[2] = 0.0;
} else if (gc_height_difference > 100) {
car->DynGCg.pos.z = RtTrackHeightL(&(car->trkPos)) + 50;
// FIXME: Wasn't car->DynGCg.vel.z intended the 2nd time ?
car->DynGCg.vel.x = car->DynGCg.vel.y = car->DynGCg.vel.y =
// FIXME: Wasn't car->DynGC.vel.z intended the 2nd time ?
car->DynGC.vel.x = car->DynGC.vel.y = car->DynGC.vel.y = 0.0;
car->DynGCg.vel.x = car->DynGCg.vel.y = car->DynGCg.vel.z =
car->DynGC.vel.x = car->DynGC.vel.y = car->DynGC.vel.z = 0.0;
car->DynGCg.vel.ax = car->DynGC.vel.ax =
car->DynGCg.vel.ay = car->DynGC.vel.ay =
car->DynGCg.vel.az = car->DynGC.vel.az = 0.0;

9
src/modules/simu/simuv3/collide.cpp
View file

@ -86,7 +86,6 @@ SimCarCollideZ(tCar *car)
t3Dd rel_car_normal;
tdble dotProd;
tWheel *wheel;
bool upside_down = false;
tdble corner_factor = 0.9f; // how much to shrink the bounding box
if (car->collide_timer < 10.0) {
@ -110,10 +109,8 @@ SimCarCollideZ(tCar *car)
// Increment the upside down timer. This can be used later to
// remove cars that have been upside down for too long.
if (rel_car_normal.z > 0) {
upside_down = false;
car->upside_down_timer = 0.0f;
} else {
upside_down = true;
car->upside_down_timer += (float)(0.01*SimDeltaTime);
}
@ -405,10 +402,8 @@ SimCarCollideZ(tCar *car)
car->DynGCg.pos.z -= gc_height_difference;
} else if (gc_height_difference > 100) {
car->DynGCg.pos.z = RtTrackHeightL(&(car->trkPos)) + 100;
// FIXME: Wasn't car->DynGCg.vel.z intended the 2nd time ?
car->DynGCg.vel.x = car->DynGCg.vel.y = car->DynGCg.vel.y =
// FIXME: Wasn't car->DynGC.vel.z intended the 2nd time ?
car->DynGC.vel.x = car->DynGC.vel.y = car->DynGC.vel.y = 0.0;
car->DynGCg.vel.x = car->DynGCg.vel.y = car->DynGCg.vel.z =
car->DynGC.vel.x = car->DynGC.vel.y = car->DynGC.vel.z = 0.0;
// Translate angular momentum to angular velocity
// NOTE: This translation is done again in SimCarAddAngularVelocity()
car->DynGCg.vel.ax = car->DynGC.vel.ax =