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 5

Fixed #194 (Human driver sets throttle to 0 at second 1.00)

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

Former-commit-id: b093821372656a57b8449467a7f4177ee9fd3c72
Former-commit-id: ff368290e03ca1f3be3e514718acb1606928adde
This commit is contained in:
pouillot 2011-02-07 18:03:05 +00:00
parent ac000cb136
commit d703a76fde
1 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -906,31 +906,37 @@ common_drive(const int index, tCarElt* car, tSituation *s)
break;
}
if (s->currentTime > 1.0) {
// thanks Christos for the following: gradual accel/brake changes for on/off controls.
const tdble inc_rate = 0.2f;
// thanks Christos for the following: gradual accel/brake changes for on/off controls.
if (cmd[CMD_BRAKE].type == GFCTRL_TYPE_JOY_BUT
|| cmd[CMD_BRAKE].type == GFCTRL_TYPE_MOUSE_BUT
|| cmd[CMD_BRAKE].type == GFCTRL_TYPE_KEYBOARD)
{
if (s->currentTime > 1.0)
{
static const tdble inc_rate = 0.2f;
if (cmd[CMD_BRAKE].type == GFCTRL_TYPE_JOY_BUT ||
cmd[CMD_BRAKE].type == GFCTRL_TYPE_MOUSE_BUT ||
cmd[CMD_BRAKE].type == GFCTRL_TYPE_KEYBOARD)
{
tdble d_brake = car->_brakeCmd - HCtx[idx]->pbrake;
if (fabs(d_brake) > inc_rate && car->_brakeCmd > HCtx[idx]->pbrake) {
car->_brakeCmd = MIN(car->_brakeCmd, HCtx[idx]->pbrake + inc_rate*d_brake/fabs(d_brake));
}
HCtx[idx]->pbrake = car->_brakeCmd;
if (fabs(d_brake) > inc_rate && car->_brakeCmd > HCtx[idx]->pbrake)
car->_brakeCmd =
MIN(car->_brakeCmd, HCtx[idx]->pbrake + inc_rate*d_brake/fabs(d_brake));
}
if (cmd[CMD_THROTTLE].type == GFCTRL_TYPE_JOY_BUT ||
cmd[CMD_THROTTLE].type == GFCTRL_TYPE_MOUSE_BUT ||
cmd[CMD_THROTTLE].type == GFCTRL_TYPE_KEYBOARD)
HCtx[idx]->pbrake = car->_brakeCmd;
}
if (cmd[CMD_THROTTLE].type == GFCTRL_TYPE_JOY_BUT
|| cmd[CMD_THROTTLE].type == GFCTRL_TYPE_MOUSE_BUT
|| cmd[CMD_THROTTLE].type == GFCTRL_TYPE_KEYBOARD)
{
if (s->currentTime > 1.0)
{
static const tdble inc_rate = 0.2f;
tdble d_accel = car->_accelCmd - HCtx[idx]->paccel;
if (fabs(d_accel) > inc_rate && car->_accelCmd > HCtx[idx]->paccel) {
car->_accelCmd = MIN(car->_accelCmd, HCtx[idx]->paccel + inc_rate*d_accel/fabs(d_accel));
}
HCtx[idx]->paccel = car->_accelCmd;
if (fabs(d_accel) > inc_rate && car->_accelCmd > HCtx[idx]->paccel)
car->_accelCmd =
MIN(car->_accelCmd, HCtx[idx]->paccel + inc_rate*d_accel/fabs(d_accel));
}
HCtx[idx]->paccel = car->_accelCmd;
}
if (HCtx[idx]->autoReverseEngaged) {