speed-dreams/speed-dreams-code
6
1
Fork 1
Code Issues 9 Pull requests Projects Releases Packages Wiki Activity Actions

Initialize oShiftcounter

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

Former-commit-id: 57506b2f96a3fb7682250248c28125ee766d1c2a
Former-commit-id: 66f88056c511d12eeb951e91fadf8a05bb038277
This commit is contained in:
wdbee 2009-08-08 12:53:14 +00:00
parent a09f7891c1
commit 5253229fab
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/drivers/simplix/src/unitdriver.cpp
View file

@ -245,6 +245,7 @@ TDriver::TDriver(int Index):
oDistFromStart(0.0), oDistFromStart(0.0),
// oShift // oShift
oShiftMargin(0), oShiftMargin(0),
oShiftCounter(0),
oSituation(NULL), oSituation(NULL),
oStartDistance(50.0), oStartDistance(50.0),
oStartRPM(100.0), oStartRPM(100.0),
@ -1164,7 +1165,7 @@ void TDriver::Drive()
// GfOut("t:%.2f s v:(%.1f)%.1f km/h A:%.3f C:%.3f G:%d R:%.1f H:%.3f\n",CurrSimTime,oTargetSpeed*3.6,oCurrSpeed*3.6,oAccel,oClutch,oGear,1/oLanePoint.Crv,CalcHairpin_simplix_36GP(fabs(oLanePoint.Crv))); // GfOut("t:%.2f s v:(%.1f)%.1f km/h A:%.3f C:%.3f G:%d R:%.1f H:%.3f\n",CurrSimTime,oTargetSpeed*3.6,oCurrSpeed*3.6,oAccel,oClutch,oGear,1/oLanePoint.Crv,CalcHairpin_simplix_36GP(fabs(oLanePoint.Crv)));
//else //else
// GfOut("t:%.2f s v:(%.1f)%.1f km/h A:%.3f C:%.3f G:%d R:%.1f F:%.3f\n",CurrSimTime,oTargetSpeed*3.6,oCurrSpeed*3.6,oAccel,oClutch,oGear,1/oLanePoint.Crv,CalcCrv_simplix_36GP(fabs(oLanePoint.Crv))); // GfOut("t:%.2f s v:(%.1f)%.1f km/h A:%.3f C:%.3f G:%d R:%.1f F:%.3f\n",CurrSimTime,oTargetSpeed*3.6,oCurrSpeed*3.6,oAccel,oClutch,oGear,1/oLanePoint.Crv,CalcCrv_simplix_36GP(fabs(oLanePoint.Crv)));
//GfOut("t:%.2f s v:(%.1f)%.1f km/h Z:%.3f RA:%.3f RAD:%.1f F:%.3f H:%.3f\n",CurrSimTime,oTargetSpeed*3.6,oCurrSpeed*3.6,oLanePoint.Crvz,TrackRollangle,1/oLanePoint.Crv,CalcCrv_simplix_36GP(fabs(oLanePoint.Crv)),CalcHairpin_simplix_36GP(fabs(oLanePoint.Crv))); GfOut("t:%.2f s v:(%.1f)%.1f km/h Z:%.3f RA:%.3f RAD:%.1f F:%.3f H:%.3f\n",CurrSimTime,oTargetSpeed*3.6,oCurrSpeed*3.6,oLanePoint.Crvz,TrackRollangle,1/oLanePoint.Crv,CalcCrv_simplix_SC(fabs(oLanePoint.Crv)),CalcHairpin_simplix_SC(fabs(oLanePoint.Crv)));
} }
//==========================================================================* //==========================================================================*
@ -3277,7 +3278,8 @@ double TDriver::CalcCrv_simplix(double Crv)
//--------------------------------------------------------------------------* //--------------------------------------------------------------------------*
double TDriver::CalcCrv_simplix_TRB1(double Crv) double TDriver::CalcCrv_simplix_TRB1(double Crv)
{ {
return MAX(0.75,MIN(3.0,600000.0 * Crv * Crv * Crv)); return MAX(0.75,MIN(3.0,350000.0 * Crv * Crv * Crv));
//return MAX(0.75,MIN(3.0,600000.0 * Crv * Crv * Crv));
} }
//==========================================================================* //==========================================================================*
@ -3286,7 +3288,8 @@ double TDriver::CalcCrv_simplix_TRB1(double Crv)
//--------------------------------------------------------------------------* //--------------------------------------------------------------------------*
double TDriver::CalcCrv_simplix_SC(double Crv) double TDriver::CalcCrv_simplix_SC(double Crv)
{ {
return MAX(0.75,MIN(3.0,600000.0 * Crv * Crv * Crv)); return MAX(0.75,MIN(3.0,75000.0 * Crv * Crv * Crv));
//return MAX(0.75,MIN(3.0,600000.0 * Crv * Crv * Crv));
} }
//==========================================================================* //==========================================================================*
@ -3316,7 +3319,8 @@ double TDriver::CalcHairpin_simplix(double Crv)
//--------------------------------------------------------------------------* //--------------------------------------------------------------------------*
double TDriver::CalcHairpin_simplix_TRB1(double Crv) double TDriver::CalcHairpin_simplix_TRB1(double Crv)
{ {
return MAX(0.75,MIN(5.0,600000.0 * Crv * Crv * Crv)); return MAX(0.75,MIN(5.0,300000.0 * Crv * Crv * Crv));
//return MAX(0.75,MIN(5.0,600000.0 * Crv * Crv * Crv));
} }
//==========================================================================* //==========================================================================*
@ -3325,7 +3329,8 @@ double TDriver::CalcHairpin_simplix_TRB1(double Crv)
//--------------------------------------------------------------------------* //--------------------------------------------------------------------------*
double TDriver::CalcHairpin_simplix_SC(double Crv) double TDriver::CalcHairpin_simplix_SC(double Crv)
{ {
return MAX(0.75,MIN(5.0,600000.0 * Crv * Crv * Crv)); return MAX(1.0,MIN(2.5,140000.0 * Crv * Crv * Crv));
//return MAX(0.75,MIN(5.0,600000.0 * Crv * Crv * Crv));
} }
//==========================================================================* //==========================================================================*

4
src/drivers/simplix/src/unitfixcarparam.cpp
View file

@ -406,8 +406,8 @@ double TFixCarParam::CalcMaxSpeed
else if (Speed > 112) // (111,11 m/s = 400 km/h) else if (Speed > 112) // (111,11 m/s = 400 km/h)
Speed = 112; Speed = 112;
if (Speed < 15) if (Speed < 13.0)
Speed = 15; Speed = 13.0;
return Speed; return Speed;
} }