diff --git a/src/drivers/human/human.cpp b/src/drivers/human/human.cpp index 401cee19d..608637b55 100644 --- a/src/drivers/human/human.cpp +++ b/src/drivers/human/human.cpp @@ -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_KEYBOARD && keyInfo[lookUpKeyMap(cmd[CMD_RIGHTGLANCE].val)].state) || (cmd[CMD_RIGHTGLANCE].type == GFCTRL_TYPE_JOY_ATOB && cmd[CMD_RIGHTGLANCE].deadZone != 0)) - { + { 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 { // return view to center if (newGlance > 0) { diff --git a/src/modules/userinterface/legacymenu/confscreens/controlconfig.cpp b/src/modules/userinterface/legacymenu/confscreens/controlconfig.cpp index 0d4d86602..febfda460 100644 --- a/src/modules/userinterface/legacymenu/confscreens/controlconfig.cpp +++ b/src/modules/userinterface/legacymenu/confscreens/controlconfig.cpp @@ -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_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_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_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_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_PREF_AXIS, 0} }; static const int MaxCmd = sizeof(Cmd) / sizeof(Cmd[0]);