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

Improvements to auto-clutch to improve 'launch' at race start

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

Former-commit-id: 72e586f7c74b4cb38de5f21f467bd1cdeb6e947d
Former-commit-id: 263e14a1e12e6f2541a70c03414912d2bdef0706
This commit is contained in:
mungewell 2011-12-16 05:24:24 +00:00
parent 3028a236ee
commit 44568dcc48
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/drivers/human/human.cpp
View file

@ -1052,10 +1052,6 @@ common_drive(const int index, tCarElt* car, tSituation *s)
if (car->_clutchCmd != 0.0f)
HCtx[idx]->autoClutch = false;
// Linear delay of autoclutch
if (HCtx[idx]->clutchTime > 0.0f)
HCtx[idx]->clutchTime -= s->deltaTime;
// Ebrake here so that it can override the clutch control
if ((cmd[CMD_EBRAKE].type == GFCTRL_TYPE_JOY_BUT && joyInfo->levelup[cmd[CMD_EBRAKE].val])
|| (cmd[CMD_EBRAKE].type == GFCTRL_TYPE_MOUSE_BUT && mouseInfo->button[cmd[CMD_EBRAKE].val])
@ -1143,9 +1139,14 @@ common_drive(const int index, tCarElt* car, tSituation *s)
}
// Linear delay of autoclutch
if (HCtx[idx]->clutchTime > 0.0f)
HCtx[idx]->clutchTime -= s->deltaTime;
// automatically adjust throttle when auto-shifting
if (HCtx[idx]->clutchTime > 0.0f && HCtx[idx]->autoClutch) {
double rpm = car->_speed_xy * car->_gearRatio[car->_gear + car->_gearOffset] / car->_wheelRadius(2);
if (HCtx[idx]->clutchTime > 0.0f && HCtx[idx]->autoClutch && car->_gear > 1 && car->_speed_xy > 10) {
// Target RPMs slightly above ideal match
double rpm = 1.1 * car->_speed_xy * car->_gearRatio[car->_gear + car->_gearOffset] / car->_wheelRadius(2);
car->_accelCmd += (rpm - car->_enginerpm) * 4 / car->_enginerpmRedLine;
//GfOut("Desired rpms for gear %d = %f\n", car->_gear, rpm * 9.54);
@ -1304,6 +1305,10 @@ getAutoClutch(const int idx, int gear, int newGear, tCarElt *car)
if (newGear != gear)
HCtx[idx]->clutchTime = HCtx[idx]->maxClutchTime;
if (gear == 1 && car->_speed_xy < 10 && HCtx[idx]->clutchTime > 0)
// Hold clutch at 1/2 to allow a faster launch from stationary
HCtx[idx]->clutchTime = HCtx[idx]->maxClutchTime / 2;
ret = HCtx[idx]->clutchTime / HCtx[idx]->maxClutchTime;
}//if newGear