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

Allow axis control of Left/Right Glance

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

Former-commit-id: 6c467165ccc6f8475a02b5a0e2c7762129295da5
Former-commit-id: e261010c37ea6f83afe2cf38a046b9db181975cb
This commit is contained in:
mungewell 2011-12-09 04:30:00 +00:00
parent 3998da16cf
commit b67e1da532
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -934,8 +934,14 @@ common_drive(const int index, tCarElt* car, tSituation *s)
|| (cmd[CMD_RIGHTGLANCE].type == GFCTRL_TYPE_MOUSE_BUT && mouseInfo->button[cmd[CMD_RIGHTGLANCE].val]) || (cmd[CMD_RIGHTGLANCE].type == GFCTRL_TYPE_MOUSE_BUT && mouseInfo->button[cmd[CMD_RIGHTGLANCE].val])
|| (cmd[CMD_RIGHTGLANCE].type == GFCTRL_TYPE_KEYBOARD && keyInfo[lookUpKeyMap(cmd[CMD_RIGHTGLANCE].val)].state) || (cmd[CMD_RIGHTGLANCE].type == GFCTRL_TYPE_KEYBOARD && keyInfo[lookUpKeyMap(cmd[CMD_RIGHTGLANCE].val)].state)
|| (cmd[CMD_RIGHTGLANCE].type == GFCTRL_TYPE_JOY_ATOB && cmd[CMD_RIGHTGLANCE].deadZone != 0)) || (cmd[CMD_RIGHTGLANCE].type == GFCTRL_TYPE_JOY_ATOB && cmd[CMD_RIGHTGLANCE].deadZone != 0))
{ {
newGlance = newGlance + GLANCERATE * s->deltaTime; newGlance = newGlance + GLANCERATE * s->deltaTime;
} else if (cmd[CMD_RIGHTGLANCE].type == GFCTRL_TYPE_JOY_AXIS && joyInfo->ax[cmd[CMD_RIGHTGLANCE].val] > 0)
{
newGlance = joyInfo->ax[cmd[CMD_RIGHTGLANCE].val] * 2*PI/3;
} else if (cmd[CMD_LEFTGLANCE].type == GFCTRL_TYPE_JOY_AXIS && joyInfo->ax[cmd[CMD_LEFTGLANCE].val] < 0)
{
newGlance = joyInfo->ax[cmd[CMD_LEFTGLANCE].val] * 2*PI/3;
} else { } else {
// return view to center // return view to center
if (newGlance > 0) { if (newGlance > 0) {

4
src/modules/userinterface/legacymenu/confscreens/controlconfig.cpp
View file

@ -71,8 +71,8 @@ static tCmdInfo Cmd[] = {
{HM_ATT_EBRAKE_CMD, {-1, GFCTRL_TYPE_NOT_AFFECTED}, 0, 0, HM_ATT_EBRAKE_MIN, 0, HM_ATT_EBRAKE_MAX, 0, 0, 0, 1, HM_ATT_JOY_REQ_BUT, 0}, {HM_ATT_EBRAKE_CMD, {-1, GFCTRL_TYPE_NOT_AFFECTED}, 0, 0, HM_ATT_EBRAKE_MIN, 0, HM_ATT_EBRAKE_MAX, 0, 0, 0, 1, HM_ATT_JOY_REQ_BUT, 0},
{HM_ATT_HBOX_X, {-1, GFCTRL_TYPE_NOT_AFFECTED}, 0, 0, HM_ATT_HBOX_X_MIN, -1, HM_ATT_HBOX_X_MAX, 1, 0, 0, 1, HM_ATT_JOY_REQ_AXIS, 0}, {HM_ATT_HBOX_X, {-1, GFCTRL_TYPE_NOT_AFFECTED}, 0, 0, HM_ATT_HBOX_X_MIN, -1, HM_ATT_HBOX_X_MAX, 1, 0, 0, 1, HM_ATT_JOY_REQ_AXIS, 0},
{HM_ATT_HBOX_Y, {-1, GFCTRL_TYPE_NOT_AFFECTED}, 0, 0, HM_ATT_HBOX_Y_MIN, -1, HM_ATT_HBOX_Y_MAX, 1, 0, 0, 1, HM_ATT_JOY_REQ_AXIS, 0}, {HM_ATT_HBOX_Y, {-1, GFCTRL_TYPE_NOT_AFFECTED}, 0, 0, HM_ATT_HBOX_Y_MIN, -1, HM_ATT_HBOX_Y_MAX, 1, 0, 0, 1, HM_ATT_JOY_REQ_AXIS, 0},
{HM_ATT_LEFTGLANCE, {-1, GFCTRL_TYPE_NOT_AFFECTED}, 0, 0, HM_ATT_L_GLANCE_MIN, 0, HM_ATT_L_GLANCE_MAX, 0, 0, 0, 1, HM_ATT_JOY_REQ_BUT, 0}, {HM_ATT_LEFTGLANCE, {-1, GFCTRL_TYPE_NOT_AFFECTED}, 0, 0, HM_ATT_L_GLANCE_MIN, 0, HM_ATT_L_GLANCE_MAX, 0, 0, 0, 1, HM_ATT_JOY_PREF_AXIS, 0},
{HM_ATT_RIGHTGLANCE,{-1, GFCTRL_TYPE_NOT_AFFECTED}, 0, 0, HM_ATT_R_GLANCE_MIN, 0, HM_ATT_R_GLANCE_MAX, 0, 0, 0, 1, HM_ATT_JOY_REQ_BUT, 0} {HM_ATT_RIGHTGLANCE,{-1, GFCTRL_TYPE_NOT_AFFECTED}, 0, 0, HM_ATT_R_GLANCE_MIN, 0, HM_ATT_R_GLANCE_MAX, 0, 0, 0, 1, HM_ATT_JOY_PREF_AXIS, 0}
}; };
static const int MaxCmd = sizeof(Cmd) / sizeof(Cmd[0]); static const int MaxCmd = sizeof(Cmd) / sizeof(Cmd[0]);