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

Fixed #127 Bad key index return when unassigned to driving command key pressed

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

Former-commit-id: 3a3f5ddce27892ff6e6ca04eeb9ea4c505a7ed8f
Former-commit-id: 4d4e5ead92ef631bb7545470ab3e8049ebf84529
This commit is contained in:
pouillot 2010-05-05 22:11:48 +00:00
parent 09df650585
commit c296b78c9a
2 changed files with 36 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,6 @@
@version $Id$ @version $Id$
*/ */
#include <map> #include <map>
#include <string> #include <string>
@ -74,13 +73,17 @@ typedef struct
int edgeUp; int edgeUp;
} tKeyInfo; } tKeyInfo;
// Keyboard map for all players
// (key code => index of the associated command in keyInfo / lastReadKeyState).
typedef std::map<int,int> tKeyMap; typedef std::map<int,int> tKeyMap;
static tKeyMap mapKeys; static tKeyMap mapKeys;
static int keyindex = 0; static int keyIndex = 0;
static tKeyInfo keyInfo[0x1000]; // Last read state for each possible player command key.
static int lastReadKeyState[GFUIK_MAX+1];
static int currentKey[0x1000]; // Up-to-date info for each possible player command key (state, edge up, edge down)
static tKeyInfo keyInfo[GFUIK_MAX+1];
static bool firstTime = false; static bool firstTime = false;
static tdble lastKeyUpdate = -10.0; static tdble lastKeyUpdate = -10.0;
@ -94,7 +97,7 @@ static std::vector<std::string> VecNames;
static int NbDrivers = -1; static int NbDrivers = -1;
#ifdef _WIN32 #ifdef _WIN32
/* should be present in mswindows */ /* Must be present under MS Windows */
BOOL WINAPI DllEntryPoint (HINSTANCE hDLL, DWORD dwReason, LPVOID Reserved) BOOL WINAPI DllEntryPoint (HINSTANCE hDLL, DWORD dwReason, LPVOID Reserved)
{ {
return TRUE; return TRUE;
@ -417,7 +420,7 @@ newrace(int index, tCarElt* car, tSituation *s)
// Initialize key state table // Initialize key state table
memset(keyInfo, 0, sizeof(keyInfo)); memset(keyInfo, 0, sizeof(keyInfo));
memset(currentKey, 0, sizeof(currentKey)); memset(lastReadKeyState, 0, sizeof(lastReadKeyState));
#ifndef WIN32 #ifndef WIN32
#ifdef TELEMETRY #ifdef TELEMETRY
@ -452,15 +455,15 @@ newrace(int index, tCarElt* car, tSituation *s)
else else
HCtx[idx]->autoClutch = false; HCtx[idx]->autoClutch = false;
// Setup Keyboard map // Setup Keyboard map (key code => index of the associated command in keyInfo / lastReadKeyState).
for (int i = 0; i < NbCmdControl; i++) for (int i = 0; i < NbCmdControl; i++)
{ {
if (cmd[i].type == GFCTRL_TYPE_KEYBOARD) if (cmd[i].type == GFCTRL_TYPE_KEYBOARD)
{ {
if (mapKeys.find(cmd[i].val) == mapKeys.end()) if (mapKeys.find(cmd[i].val) == mapKeys.end())
{ {
mapKeys[cmd[i].val] = keyindex; mapKeys[cmd[i].val] = keyIndex;
keyindex++; keyIndex++;
} }
}//KEYBOARD }//KEYBOARD
@ -477,14 +480,14 @@ lookUpKeyMap(int key)
if (p != mapKeys.end()) if (p != mapKeys.end())
return p->second; return p->second;
return 0; return -1;
} }
static void static void
updateKeys(void) updateKeys(void)
{ {
int i; int i;
int key; int nKeyInd;
int idx; int idx;
tControlCmd *cmd; tControlCmd *cmd;
@ -493,21 +496,21 @@ updateKeys(void)
cmd = HCtx[idx]->cmdControl; cmd = HCtx[idx]->cmdControl;
for (i = 0; i < NbCmdControl; i++) { for (i = 0; i < NbCmdControl; i++) {
if (cmd[i].type == GFCTRL_TYPE_KEYBOARD) { if (cmd[i].type == GFCTRL_TYPE_KEYBOARD) {
key = lookUpKeyMap(cmd[i].val); nKeyInd = lookUpKeyMap(cmd[i].val);
if (currentKey[key] == GFUI_KEY_DOWN) { if (lastReadKeyState[nKeyInd] == GFUI_KEY_DOWN) {
if (keyInfo[key].state == GFUI_KEY_UP) { if (keyInfo[nKeyInd].state == GFUI_KEY_UP) {
keyInfo[key].edgeDn = 1; keyInfo[nKeyInd].edgeDn = 1;
} else { } else {
keyInfo[key].edgeDn = 0; keyInfo[nKeyInd].edgeDn = 0;
} }
} else { } else {
if (keyInfo[key].state == GFUI_KEY_DOWN) { if (keyInfo[nKeyInd].state == GFUI_KEY_DOWN) {
keyInfo[key].edgeUp = 1; keyInfo[nKeyInd].edgeUp = 1;
} else { } else {
keyInfo[key].edgeUp = 0; keyInfo[nKeyInd].edgeUp = 0;
} }
} }
keyInfo[key].state = currentKey[key]; keyInfo[nKeyInd].state = lastReadKeyState[nKeyInd];
} }
} }
} }
@ -518,7 +521,10 @@ updateKeys(void)
static int static int
onKeyAction(int key, int modifier, int state) onKeyAction(int key, int modifier, int state)
{ {
currentKey[lookUpKeyMap(key)] = state; // Update key state only if the key is assigned to a player command.
const int nKeyInd = lookUpKeyMap(key);
if (nKeyInd >= 0)
lastReadKeyState[lookUpKeyMap(key)] = state;
return 0; return 0;
}//onKeyAction }//onKeyAction
@ -534,6 +540,7 @@ common_drive(const int index, tCarElt* car, tSituation *s)
tdble throttle; tdble throttle;
tdble leftSteer; tdble leftSteer;
tdble rightSteer; tdble rightSteer;
tdble sensFrac, speedFrac;
int scrw, scrh, dummy; int scrw, scrh, dummy;
const int idx = index - 1; const int idx = index - 1;
@ -652,14 +659,14 @@ common_drive(const int index, tCarElt* car, tSituation *s)
ax0 = joyInfo->levelup[cmd[CMD_LEFTSTEER].val]; ax0 = joyInfo->levelup[cmd[CMD_LEFTSTEER].val];
} }
if (ax0 == 0) { if (ax0 == 0) {
HCtx[idx]->prevLeftSteer = leftSteer = 0; leftSteer = 0;
} else { } else {
ax0 = 2 * ax0 - 1; ax0 = 2 * ax0 - 1;
leftSteer = HCtx[idx]->prevLeftSteer + ax0 * cmd[CMD_LEFTSTEER].sens * s->deltaTime / (1.0 + cmd[CMD_LEFTSTEER].spdSens * car->_speed_x / 10.0); leftSteer = HCtx[idx]->prevLeftSteer + ax0 * cmd[CMD_LEFTSTEER].sens * s->deltaTime / (1.0 + cmd[CMD_LEFTSTEER].spdSens * car->_speed_x / 10.0);
if (leftSteer > 1.0) leftSteer = 1.0; if (leftSteer > 1.0) leftSteer = 1.0;
if (leftSteer < 0.0) leftSteer = 0.0; if (leftSteer < 0.0) leftSteer = 0.0;
HCtx[idx]->prevLeftSteer = leftSteer;
} }
HCtx[idx]->prevLeftSteer = leftSteer;
break; break;
default: default:
leftSteer = 0; leftSteer = 0;
@ -697,14 +704,14 @@ common_drive(const int index, tCarElt* car, tSituation *s)
ax0 = joyInfo->levelup[cmd[CMD_RIGHTSTEER].val]; ax0 = joyInfo->levelup[cmd[CMD_RIGHTSTEER].val];
} }
if (ax0 == 0) { if (ax0 == 0) {
HCtx[idx]->prevRightSteer = rightSteer = 0; rightSteer = 0;
} else { } else {
ax0 = 2 * ax0 - 1; ax0 = 2 * ax0 - 1;
rightSteer = HCtx[idx]->prevRightSteer - ax0 * cmd[CMD_RIGHTSTEER].sens * s->deltaTime/ (1.0 + cmd[CMD_RIGHTSTEER].spdSens * car->_speed_x / 10.0); rightSteer = HCtx[idx]->prevRightSteer - ax0 * cmd[CMD_RIGHTSTEER].sens * s->deltaTime/ (1.0 + cmd[CMD_RIGHTSTEER].spdSens * car->_speed_x / 10.0);
if (rightSteer > 0.0) rightSteer = 0.0; if (rightSteer > 0.0) rightSteer = 0.0;
if (rightSteer < -1.0) rightSteer = -1.0; if (rightSteer < -1.0) rightSteer = -1.0;
HCtx[idx]->prevRightSteer = rightSteer;
} }
HCtx[idx]->prevRightSteer = rightSteer;
break; break;
default: default:
rightSteer = 0; rightSteer = 0;
@ -1247,7 +1254,7 @@ pitcmd(int index, tCarElt* car, tSituation *s)
keyInfo[key].state = GFUI_KEY_UP; keyInfo[key].state = GFUI_KEY_UP;
keyInfo[key].edgeDn = 0; keyInfo[key].edgeDn = 0;
keyInfo[key].edgeUp = 0; keyInfo[key].edgeUp = 0;
currentKey[key] = GFUI_KEY_UP; lastReadKeyState[key] = GFUI_KEY_UP;
} }
}//for i }//for i
}//if HCtx }//if HCtx

4
src/drivers/human/pref.cpp
View file

@ -133,8 +133,8 @@ HmReadPrefs(const int index)
} }
ref = GfctrlGetRefByName(prm); ref = GfctrlGetRefByName(prm);
cmdCtrl[cmd].type = ref->type; cmdCtrl[cmd].type = ref->type; // GFCTRL_TYPE_XX
cmdCtrl[cmd].val = ref->index; cmdCtrl[cmd].val = ref->index; // Index for joy. axis, buttons ; 1-bytes ASCII code for keys.
GfOut(" %s\t: %s\n", cmdCtrl[cmd].name, prm); GfOut(" %s\t: %s\n", cmdCtrl[cmd].name, prm);
/* min value < max value */ /* min value < max value */