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

USR_GP36 - a couple of tweaks

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

Former-commit-id: dc78b3eeed00cbfdf31dba13e6039ca10f774bde
Former-commit-id: 7a755edc753ad8b3d24b0e04d5774c4222d2be96
This commit is contained in:
andrewsumner 2008-12-08 00:02:07 +00:00
parent e226de9284
commit 27e908cf63
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/drivers/usr_GP3601/driver.cpp
View file

@ -32,9 +32,7 @@ const float Driver::G = 9.81f; // [m/(s*s)] Welcome on Earth.
const float Driver::FULL_ACCEL_MARGIN = 1.0f; // [m/s] Margin reduce oscillation of brake/acceleration.
const float Driver::SHIFT = 0.9f; // [-] (% of rpmredline) When do we like to shift gears.
const float Driver::SHIFT_MARGIN = 4.0f; // [m/s] Avoid oscillating gear changes.
const float Driver::ABS_RANGE = 5.0f; // [m/s] range [0..10]
const float Driver::ABS_MINSPEED = 3.0f; // [m/s] Below this speed the ABS is disabled (numeric, division by small numbers).
const float Driver::TCL_RANGE = 10.0f; // [m/s] range [0..10]
const float Driver::LOOKAHEAD_CONST = 18.0f; // [m]
const float Driver::LOOKAHEAD_FACTOR = 0.33f; // [-]
const float Driver::WIDTHDIV = 3.0f; // [-] Defines the percentage of the track to use (2/WIDTHDIV).
@ -70,7 +68,9 @@ Driver::Driver(int index) :
deltaTime(0.0f),
FuelSpeedUp(0.0f),
TclSlip(2.0f),
TclRange(10.0f),
AbsSlip(2.5f),
AbsRange(5.0f),
random_seed(0),
DebugMsg(0),
racetype(0),
@ -359,7 +359,9 @@ void Driver::newRace(tCarElt* car, tSituation *s)
if (brdebug) DebugMsg |= debug_brake;
FuelSpeedUp = GfParmGetNum(car->_carHandle, BT_SECT_PRIV, "FuelSpeedUp", NULL, 0.0f);
TclSlip = GfParmGetNum(car->_carHandle, BT_SECT_PRIV, "TclSlip", NULL, 2.0f);
TclRange = GfParmGetNum(car->_carHandle, BT_SECT_PRIV, "TclRange", NULL, 10.0f);
AbsSlip = GfParmGetNum(car->_carHandle, BT_SECT_PRIV, "AbsSlip", NULL, 2.5f);
AbsRange = GfParmGetNum(car->_carHandle, BT_SECT_PRIV, "AbsRange", NULL, 5.0f);
fuelperlap = GfParmGetNum(car->_carHandle, BT_SECT_PRIV, "FuelPerLap", NULL, 5.0f);
CARMASS = GfParmGetNum(car->_carHandle, SECT_CAR, PRM_MASS, NULL, 1000.0f);
maxfuel = GfParmGetNum(car->_carHandle, SECT_CAR, PRM_TANK, NULL, 100.0f);
@ -3104,7 +3106,7 @@ float Driver::filterABS(float brake)
float absslip = (car->_speed_x < 20.0f ? MIN(AbsSlip, 2.0f) : AbsSlip);
if (slip > absslip) {
brake = brake - MIN(brake, (slip - absslip)/ABS_RANGE);
brake = brake - MIN(brake, (slip - absslip)/AbsRange);
}
brake = MAX(brake, MIN(origbrake, 0.1f));

4
src/drivers/usr_GP3601/driver.h
View file

@ -148,7 +148,9 @@ class Driver {
float deltaTime;
float FuelSpeedUp;
float TclSlip;
float TclRange;
float AbsSlip;
float AbsRange;
unsigned int random_seed;
int DebugMsg;
int racetype;
@ -266,7 +268,6 @@ class Driver {
static const float FULL_ACCEL_MARGIN;
static const float SHIFT;
static const float SHIFT_MARGIN;
static const float ABS_RANGE ;
static const float ABS_MINSPEED;
static const float LOOKAHEAD_CONST;
static const float LOOKAHEAD_FACTOR;
@ -278,7 +279,6 @@ class Driver {
static const float PIT_BRAKE_AHEAD;
static const float PIT_MU;
static const float MAX_SPEED;
static const float TCL_RANGE;
static const float MAX_FUEL_PER_METER;
static const float CLUTCH_SPEED;
static const float CENTERDIV;