From 2d96093072d69b5aa08e8e2e7e82d2d1aa33f498 Mon Sep 17 00:00:00 2001 From: wdbee Date: Fri, 7 Oct 2011 13:38:15 +0000 Subject: [PATCH] Reduce warnings git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@3945 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 3a8cbdd7649137cc62a213daf8586ff9adec369e Former-commit-id: bf738136b87163dc4e6f653b8805bb60f916e0dd --- src/modules/simu/simuv2.1/collide.cpp | 24 +++++++++---------- src/modules/simu/simuv2.1/differential.cpp | 16 ++++++------- src/modules/simu/simuv2.1/engine.cpp | 10 ++++---- src/modules/simu/simuv2.1/simu.cpp | 28 +++++++++++----------- 4 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/modules/simu/simuv2.1/collide.cpp b/src/modules/simu/simuv2.1/collide.cpp index e42d7d97..330cc8f5 100644 --- a/src/modules/simu/simuv2.1/collide.cpp +++ b/src/modules/simu/simuv2.1/collide.cpp @@ -113,7 +113,7 @@ void SimCarCollideXYScene(tCar *car) initDotProd = nx * corner->vel.x + ny * corner->vel.y; // Compute dmgDotProd (base value for later damage) with a heuristic. - tdble absvel = MAX(1.0, sqrt(car->DynGCg.vel.x*car->DynGCg.vel.x + car->DynGCg.vel.y*car->DynGCg.vel.y)); + tdble absvel = (tdble) (MAX(1.0, sqrt(car->DynGCg.vel.x*car->DynGCg.vel.x + car->DynGCg.vel.y*car->DynGCg.vel.y))); tdble GCgnormvel = car->DynGCg.vel.x*nx + car->DynGCg.vel.y*ny; tdble cosa = GCgnormvel/absvel; tdble dmgDotProd = GCgnormvel*cosa; @@ -128,13 +128,13 @@ void SimCarCollideXYScene(tCar *car) static tdble VELMAX = 6.0f; car->DynGCg.vel.az -= dotprod2 * dotProd / VELSCALE; if (fabs(car->DynGCg.vel.az) > VELMAX) { - car->DynGCg.vel.az = SIGN(car->DynGCg.vel.az) * VELMAX; + car->DynGCg.vel.az = (tdble) (SIGN(car->DynGCg.vel.az) * VELMAX); } // Dammage. dotProd = initDotProd; if (dotProd < 0.0f && (car->carElt->_state & RM_CAR_STATE_FINISH) == 0) { - dmg = curBarrier->surface->kDammage * fabs(0.5*dmgDotProd*dmgDotProd) * simDammageFactor[car->carElt->_skillLevel]; + dmg = (tdble) (curBarrier->surface->kDammage * fabs(0.5*dmgDotProd*dmgDotProd) * simDammageFactor[car->carElt->_skillLevel]); car->dammage += (int)dmg; } else { dmg = 0.0f; @@ -241,7 +241,7 @@ static void SimCarCollideResponse(void * /*dummy*/, DtObjectRef obj1, DtObjectRe sgVec2 tmpv; - sgScaleVec2(tmpv, n, MIN(distpab, 0.05)); + sgScaleVec2(tmpv, n, (float) MIN(distpab, 0.05)); // No "for" loop here because of subtle difference AddVec/SubVec. if (car[0]->blocked == 0 && !(car[0]->carElt->_state & RM_CAR_STATE_NO_SIMU)) { sgAddVec2((float*)&(car[0]->DynGCg.pos), tmpv); @@ -291,8 +291,8 @@ static void SimCarCollideResponse(void * /*dummy*/, DtObjectRef obj1, DtObjectRe } if ((car[i]->carElt->_state & RM_CAR_STATE_FINISH) == 0) { - float dammage = (CAR_DAMMAGE * fabs(j) * damFactor * simDammageFactor[car[i]->carElt->_skillLevel]); - dammage *= MIN(1.5, dammage / 500.0); + float dammage = (float)((CAR_DAMMAGE * fabs(j) * damFactor * simDammageFactor[car[i]->carElt->_skillLevel])); + dammage *= (float)(MIN(1.5, dammage / 500.0)); if (dammage < 10) dammage = 0; car[i]->dammage += (int)(dammage); @@ -315,7 +315,7 @@ static void SimCarCollideResponse(void * /*dummy*/, DtObjectRef obj1, DtObjectRe static float VELMAX = 3.0f; if (fabs(car[i]->VelColl.az) > VELMAX) { - car[i]->VelColl.az = SIGN(car[i]->VelColl.az) * VELMAX; + car[i]->VelColl.az = (tdble)(SIGN(car[i]->VelColl.az) * VELMAX); } sgCopyVec2((float*)&(car[i]->VelColl.x), v2a); @@ -323,8 +323,8 @@ static void SimCarCollideResponse(void * /*dummy*/, DtObjectRef obj1, DtObjectRe // Move the car for the collision lib. tCarElt *carElt = car[i]->carElt; sgMakeCoordMat4(carElt->pub.posMat, car[i]->DynGCg.pos.x, car[i]->DynGCg.pos.y, - car[i]->DynGCg.pos.z - carElt->_statGC_z, RAD2DEG(carElt->_yaw), - RAD2DEG(carElt->_roll), RAD2DEG(carElt->_pitch)); + car[i]->DynGCg.pos.z - carElt->_statGC_z, (float) RAD2DEG(carElt->_yaw), + (float) RAD2DEG(carElt->_roll), (float) RAD2DEG(carElt->_pitch)); dtSelectObject(car[i]); dtLoadIdentity(); dtTranslate(-carElt->_statGC_x, -carElt->_statGC_y, 0.0f); @@ -433,15 +433,15 @@ static void SimCarWallCollideResponse(void *clientdata, DtObjectRef obj1, DtObje static float VELMAX = 3.0f; if (fabs(car->VelColl.az) > VELMAX) { - car->VelColl.az = SIGN(car->VelColl.az) * VELMAX; + car->VelColl.az = (float) (SIGN(car->VelColl.az) * VELMAX); } sgCopyVec2((float*)&(car->VelColl.x), v2a); // Move the car for the collision lib. sgMakeCoordMat4(carElt->pub.posMat, car->DynGCg.pos.x, car->DynGCg.pos.y, - car->DynGCg.pos.z - carElt->_statGC_z, RAD2DEG(carElt->_yaw), - RAD2DEG(carElt->_roll), RAD2DEG(carElt->_pitch)); + car->DynGCg.pos.z - carElt->_statGC_z, (float) RAD2DEG(carElt->_yaw), + (float) RAD2DEG(carElt->_roll), (float) RAD2DEG(carElt->_pitch)); dtSelectObject(car); dtLoadIdentity(); dtTranslate(-carElt->_statGC_x, -carElt->_statGC_y, 0.0f); diff --git a/src/modules/simu/simuv2.1/differential.cpp b/src/modules/simu/simuv2.1/differential.cpp index 2720dcf2..6e0f14b9 100644 --- a/src/modules/simu/simuv2.1/differential.cpp +++ b/src/modules/simu/simuv2.1/differential.cpp @@ -79,7 +79,7 @@ updateSpool(tCar *car, tDifferential *differential, int first) ndot = SimDeltaTime * (DrTq - inTq) / I; spinVel = differential->inAxis[0]->spinVel + ndot; - BrTq = - SIGN(spinVel) * brkTq; + BrTq = (tdble) (- SIGN(spinVel) * brkTq); ndot = SimDeltaTime * BrTq / I; if (((ndot * spinVel) < 0.0) && (fabs(ndot) > fabs(spinVel))) { @@ -215,8 +215,8 @@ SimDifferentialUpdate(tCar *car, tDifferential *differential, int first) DrTq0 = DrTq * differential->dTqMin; DrTq1 = DrTq * (1 - differential->dTqMin); } else { - deltaTq = differential->dTqMin + (1.0 - exp(-fabs(differential->viscosity * spinVel0 - spinVel1))) / - differential->viscomax * differential->dTqMax; + deltaTq = (tdble) (differential->dTqMin + (1.0 - exp(-fabs(differential->viscosity * spinVel0 - spinVel1))) / + differential->viscomax * differential->dTqMax); DrTq0 = DrTq * deltaTq; DrTq1 = DrTq * (1 - deltaTq); } @@ -227,8 +227,8 @@ SimDifferentialUpdate(tCar *car, tDifferential *differential, int first) break; } } else { - DrTq0 = DrTq / 2.0; - DrTq1 = DrTq / 2.0; + DrTq0 = (tdble) (DrTq / 2.0); + DrTq1 = (tdble) (DrTq / 2.0); } @@ -237,7 +237,7 @@ SimDifferentialUpdate(tCar *car, tDifferential *differential, int first) ndot1 = SimDeltaTime * (DrTq1 - inTq1) / differential->outAxis[1]->I; spinVel1 += ndot1; - BrTq = - SIGN(spinVel0) * differential->inAxis[0]->brkTq; + BrTq = (tdble) (- SIGN(spinVel0) * differential->inAxis[0]->brkTq); ndot0 = SimDeltaTime * BrTq / differential->outAxis[0]->I; if (((ndot0 * spinVel0) < 0.0) && (fabs(ndot0) > fabs(spinVel0))) { ndot0 = -spinVel0; @@ -245,7 +245,7 @@ SimDifferentialUpdate(tCar *car, tDifferential *differential, int first) if ((spinVel0 == 0.0) && (ndot0 < 0.0)) ndot0 = 0; spinVel0 += ndot0; - BrTq = - SIGN(spinVel1) * differential->inAxis[1]->brkTq; + BrTq = (tdble) (- SIGN(spinVel1) * differential->inAxis[1]->brkTq); ndot1 = SimDeltaTime * BrTq / differential->outAxis[1]->I; if (((ndot1 * spinVel1) < 0.0) && (fabs(ndot1) > fabs(spinVel1))) { ndot1 = -spinVel1; @@ -254,7 +254,7 @@ SimDifferentialUpdate(tCar *car, tDifferential *differential, int first) spinVel1 += ndot1; if (first) { - meanv = (spinVel0 + spinVel1) / 2.0; + meanv = (tdble) ((spinVel0 + spinVel1) / 2.0); engineReaction = SimEngineUpdateRpm(car, meanv); if (meanv != 0.0) { engineReaction = engineReaction/meanv; diff --git a/src/modules/simu/simuv2.1/engine.cpp b/src/modules/simu/simuv2.1/engine.cpp index ee40c455..d7a82043 100644 --- a/src/modules/simu/simuv2.1/engine.cpp +++ b/src/modules/simu/simuv2.1/engine.cpp @@ -161,9 +161,9 @@ SimEngineUpdateTq(tCar *car) tdble cons = Tq_cur * 0.75f; if (cons > 0) { - car->fuel -= cons * engine->rads * engine->fuelcons * 0.0000001 * SimDeltaTime; + car->fuel -= (tdble) (cons * engine->rads * engine->fuelcons * 0.0000001 * SimDeltaTime); } - car->fuel = MAX(car->fuel, 0.0); + car->fuel = (tdble) MAX(car->fuel, 0.0); } } @@ -231,7 +231,7 @@ freerads += engine->Tq / engine->I * SimDeltaTime; } float alpha = 0.1f; // transition coefficient - engine->I_joint = engine->I_joint*(1.0-alpha) + alpha*trans->curI; + engine->I_joint = (tdble) (engine->I_joint*(1.0-alpha) + alpha*trans->curI); // only use these values when the clutch is engaged or the gear // has changed. @@ -239,8 +239,8 @@ freerads += engine->Tq / engine->I * SimDeltaTime; transfer = clutch->transferValue * clutch->transferValue * clutch->transferValue * clutch->transferValue; - ttq = dI* tanh(0.01*(axleRpm * trans->curOverallRatio * transfer + freerads * (1.0-transfer) -engine->rads))*100.0; - engine->rads = (1.0-sdI) * (axleRpm * trans->curOverallRatio * transfer + freerads * (1.0-transfer)) + sdI *(engine->rads + ((ttq)*SimDeltaTime)/(engine->I)); + ttq = (float) (dI* tanh(0.01*(axleRpm * trans->curOverallRatio * transfer + freerads * (1.0-transfer) -engine->rads))*100.0); + engine->rads = (tdble) ((1.0-sdI) * (axleRpm * trans->curOverallRatio * transfer + freerads * (1.0-transfer)) + sdI *(engine->rads + ((ttq)*SimDeltaTime)/(engine->I))); if (engine->rads < 0.0) { engine->rads = 0; engine->Tq = 0.0; diff --git a/src/modules/simu/simuv2.1/simu.cpp b/src/modules/simu/simuv2.1/simu.cpp index 9b5f2972..0dc807f2 100644 --- a/src/modules/simu/simuv2.1/simu.cpp +++ b/src/modules/simu/simuv2.1/simu.cpp @@ -91,9 +91,9 @@ ctrlCheck(tCar *car) } } else if (car->carElt->_state & RM_CAR_STATE_FINISH) { /* when the finish line is passed, continue at "slow" pace */ - car->ctrl->accelCmd = MIN(car->ctrl->accelCmd, 0.20); + car->ctrl->accelCmd = (tdble) MIN(car->ctrl->accelCmd, 0.20); if (car->DynGC.vel.x > 30.0) { - car->ctrl->brakeCmd = MAX(car->ctrl->brakeCmd, 0.05); + car->ctrl->brakeCmd = (tdble) MAX(car->ctrl->brakeCmd, 0.05); } } @@ -119,7 +119,7 @@ ctrlCheck(tCar *car) car->ctrl->steer = -1.0; } - clutch->transferValue = 1.0 - car->ctrl->clutchCmd; + clutch->transferValue = 1.0f - car->ctrl->clutchCmd; } /* Initial configuration */ @@ -140,7 +140,7 @@ SimConfig(tCarElt *carElt) SimCarCollideConfig(car, PTrack); sgMakeCoordMat4(carElt->pub.posMat, carElt->_pos_X, carElt->_pos_Y, carElt->_pos_Z - carElt->_statGC_z, - RAD2DEG(carElt->_yaw), RAD2DEG(carElt->_roll), RAD2DEG(carElt->_pitch)); + (float) RAD2DEG(carElt->_yaw), (float) RAD2DEG(carElt->_roll), (float) RAD2DEG(carElt->_pitch)); } /* After pit stop */ @@ -180,7 +180,7 @@ RemoveCar(tCar *car, tSituation *s) carElt->_roll += car->restPos.vel.ax * SimDeltaTime; carElt->_pitch += car->restPos.vel.ay * SimDeltaTime; sgMakeCoordMat4(carElt->pub.posMat, carElt->_pos_X, carElt->_pos_Y, carElt->_pos_Z - carElt->_statGC_z, - RAD2DEG(carElt->_yaw), RAD2DEG(carElt->_roll), RAD2DEG(carElt->_pitch)); + (float) RAD2DEG(carElt->_yaw), (float) RAD2DEG(carElt->_roll), (float) RAD2DEG(carElt->_pitch)); if (carElt->_pos_Z > (car->restPos.pos.z + PULL_Z_OFFSET)) { carElt->_state &= ~RM_CAR_STATE_PULLUP; @@ -205,7 +205,7 @@ RemoveCar(tCar *car, tSituation *s) carElt->_pos_X += car->restPos.vel.x * SimDeltaTime; carElt->_pos_Y += car->restPos.vel.y * SimDeltaTime; sgMakeCoordMat4(carElt->pub.posMat, carElt->_pos_X, carElt->_pos_Y, carElt->_pos_Z - carElt->_statGC_z, - RAD2DEG(carElt->_yaw), RAD2DEG(carElt->_roll), RAD2DEG(carElt->_pitch)); + (float) RAD2DEG(carElt->_yaw), (float) RAD2DEG(carElt->_roll), (float) RAD2DEG(carElt->_pitch)); if ((fabs(car->restPos.pos.x - carElt->_pos_X) < 0.5) && (fabs(car->restPos.pos.y - carElt->_pos_Y) < 0.5)) { carElt->_state &= ~RM_CAR_STATE_PULLSIDE; @@ -218,7 +218,7 @@ RemoveCar(tCar *car, tSituation *s) if (carElt->_state & RM_CAR_STATE_PULLDN) { carElt->_pos_Z -= car->restPos.vel.z * SimDeltaTime; sgMakeCoordMat4(carElt->pub.posMat, carElt->_pos_X, carElt->_pos_Y, carElt->_pos_Z - carElt->_statGC_z, - RAD2DEG(carElt->_yaw), RAD2DEG(carElt->_roll), RAD2DEG(carElt->_pitch)); + (float) RAD2DEG(carElt->_yaw), (float) RAD2DEG(carElt->_roll), (float) RAD2DEG(carElt->_pitch)); if (carElt->_pos_Z < car->restPos.pos.z) { carElt->_state &= ~RM_CAR_STATE_PULLDN; @@ -298,13 +298,13 @@ RemoveCar(tCar *car, tSituation *s) car->restPos.vel.z = PULL_SPD; travelTime = (car->restPos.pos.z + PULL_Z_OFFSET - carElt->_pos_Z) / car->restPos.vel.z; dang = car->restPos.pos.az - carElt->_yaw; - NORM_PI_PI(dang); + FLOAT_NORM_PI_PI(dang); car->restPos.vel.az = dang / travelTime; dang = car->restPos.pos.ax - carElt->_roll; - NORM_PI_PI(dang); + FLOAT_NORM_PI_PI(dang); car->restPos.vel.ax = dang / travelTime; dang = car->restPos.pos.ay - carElt->_pitch; - NORM_PI_PI(dang); + FLOAT_NORM_PI_PI(dang); car->restPos.vel.ay = dang / travelTime; } @@ -322,7 +322,7 @@ SimUpdate(tSituation *s, double deltaTime) tCarElt *carElt; tCar *car; - SimDeltaTime = deltaTime; + SimDeltaTime = (tdble) deltaTime; for (ncar = 0; ncar < s->_ncars; ncar++) { SimCarTable[ncar].collision = 0; SimCarTable[ncar].blocked = 0; @@ -414,7 +414,7 @@ SimUpdate(tSituation *s, double deltaTime) carElt->pub.DynGC = car->DynGC; carElt->pub.DynGCg = car->DynGCg; sgMakeCoordMat4(carElt->pub.posMat, carElt->_pos_X, carElt->_pos_Y, carElt->_pos_Z - carElt->_statGC_z, - RAD2DEG(carElt->_yaw), RAD2DEG(carElt->_roll), RAD2DEG(carElt->_pitch)); + (float) RAD2DEG(carElt->_yaw), (float) RAD2DEG(carElt->_roll), (float) RAD2DEG(carElt->_pitch)); carElt->_trkPos = car->trkPos; for (i = 0; i < 4; i++) { carElt->priv.wheel[i].relPos = car->wheel[i].relPos; @@ -484,7 +484,7 @@ SimUpdateSingleCar(int index, double deltaTime,tSituation *s) tCarElt *carElt; tCar *car; - SimDeltaTime = deltaTime; + SimDeltaTime = (tdble) deltaTime; SimCarTable[index].collision = 0; SimCarTable[index].blocked = 0; @@ -535,7 +535,7 @@ SimUpdateSingleCar(int index, double deltaTime,tSituation *s) carElt->pub.DynGC = car->DynGC; carElt->pub.DynGCg = car->DynGCg; sgMakeCoordMat4(carElt->pub.posMat, carElt->_pos_X, carElt->_pos_Y, carElt->_pos_Z - carElt->_statGC_z, - RAD2DEG(carElt->_yaw), RAD2DEG(carElt->_roll), RAD2DEG(carElt->_pitch)); + (float) RAD2DEG(carElt->_yaw), (float) RAD2DEG(carElt->_roll), (float) RAD2DEG(carElt->_pitch)); carElt->_trkPos = car->trkPos; for (i = 0; i < 4; i++) { carElt->priv.wheel[i].relPos = car->wheel[i].relPos;