ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some slight performance modifications to CompuMate handling; we don't 

need to get the keyboard pointer 60 times per second.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2012-04-19 15:25:09 +00:00
parent a64626ba25
commit e1d31ada6e
3 changed files with 61 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/StellaKeys.hxx
View File

@ -317,11 +317,11 @@ typedef int StellaMod;
class StellaKeys class StellaKeys
{ {
public: public:
static uInt8* GetKeyState() // According to the SDL source code, this only needs to be called
{ // once, since it points to an internal static variable in SDL
SDL_PumpEvents(); // As such, it's not really a (current) state table, since that
return SDL_GetKeyState(NULL); // implies it needs to be called each time you want the state updated
} static inline uInt8* GetKeyTable() { return SDL_GetKeyState(NULL); }
}; };
#endif /* StellaKeys */ #endif /* StellaKeys */

105
src/emucore/CompuMate.cxx
View File

@ -39,6 +39,8 @@ CompuMate::CompuMate(CartridgeCM& cart, const Event& event,
myLeftController->myAnalogPinValue[Controller::Five] = Controller::minimumResistance; myLeftController->myAnalogPinValue[Controller::Five] = Controller::minimumResistance;
myRightController->myAnalogPinValue[Controller::Nine] = Controller::minimumResistance; myRightController->myAnalogPinValue[Controller::Nine] = Controller::minimumResistance;
myRightController->myAnalogPinValue[Controller::Five] = Controller::maximumResistance; myRightController->myAnalogPinValue[Controller::Five] = Controller::maximumResistance;
myKeyTable = StellaKeys::GetKeyTable();
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -57,7 +59,6 @@ void CompuMate::update()
// Handle SWCHA changes - the following comes almost directly from z26 // Handle SWCHA changes - the following comes almost directly from z26
Controller& lp = *myLeftController; Controller& lp = *myLeftController;
Controller& rp = *myRightController; Controller& rp = *myRightController;
uInt8* KeyTable = StellaKeys::GetKeyState();
lp.myAnalogPinValue[Controller::Nine] = Controller::maximumResistance; lp.myAnalogPinValue[Controller::Nine] = Controller::maximumResistance;
lp.myAnalogPinValue[Controller::Five] = Controller::minimumResistance; lp.myAnalogPinValue[Controller::Five] = Controller::minimumResistance;
@ -66,9 +67,9 @@ void CompuMate::update()
rp.myAnalogPinValue[Controller::Five] = Controller::maximumResistance; rp.myAnalogPinValue[Controller::Five] = Controller::maximumResistance;
rp.myDigitalPinState[Controller::Six] = true; rp.myDigitalPinState[Controller::Six] = true;
if (KeyTable[KBDK_LSHIFT] || KeyTable[KBDK_RSHIFT]) if (myKeyTable[KBDK_LSHIFT] || myKeyTable[KBDK_RSHIFT])
rp.myAnalogPinValue[Controller::Five] = Controller::minimumResistance; rp.myAnalogPinValue[Controller::Five] = Controller::minimumResistance;
if (KeyTable[KBDK_LCTRL] || KeyTable[KBDK_RCTRL]) if (myKeyTable[KBDK_LCTRL] || myKeyTable[KBDK_RCTRL])
lp.myAnalogPinValue[Controller::Nine] = Controller::minimumResistance; lp.myAnalogPinValue[Controller::Nine] = Controller::minimumResistance;
rp.myDigitalPinState[Controller::Three] = true; rp.myDigitalPinState[Controller::Three] = true;
@ -76,118 +77,118 @@ void CompuMate::update()
switch(myCart.column()) switch(myCart.column())
{ {
case 0: case 0:
if (KeyTable[KBDK_7]) lp.myDigitalPinState[Controller::Six] = false; if (myKeyTable[KBDK_7]) lp.myDigitalPinState[Controller::Six] = false;
if (KeyTable[KBDK_u]) rp.myDigitalPinState[Controller::Three] = false; if (myKeyTable[KBDK_u]) rp.myDigitalPinState[Controller::Three] = false;
if (KeyTable[KBDK_j]) rp.myDigitalPinState[Controller::Six] = false; if (myKeyTable[KBDK_j]) rp.myDigitalPinState[Controller::Six] = false;
if (KeyTable[KBDK_m]) rp.myDigitalPinState[Controller::Four] = false; if (myKeyTable[KBDK_m]) rp.myDigitalPinState[Controller::Four] = false;
break; break;
case 1: case 1:
if (KeyTable[KBDK_6]) lp.myDigitalPinState[Controller::Six] = false; if (myKeyTable[KBDK_6]) lp.myDigitalPinState[Controller::Six] = false;
// Emulate the '?' character (Shift-6) with the actual question key // Emulate the '?' character (Shift-6) with the actual question key
if (KeyTable[KBDK_SLASH] && (KeyTable[KBDK_LSHIFT] || KeyTable[KBDK_RSHIFT])) if (myKeyTable[KBDK_SLASH] && (myKeyTable[KBDK_LSHIFT] || myKeyTable[KBDK_RSHIFT]))
{ {
rp.myAnalogPinValue[Controller::Five] = Controller::minimumResistance; rp.myAnalogPinValue[Controller::Five] = Controller::minimumResistance;
lp.myDigitalPinState[Controller::Six] = false; lp.myDigitalPinState[Controller::Six] = false;
} }
if (KeyTable[KBDK_y]) rp.myDigitalPinState[Controller::Three] = false; if (myKeyTable[KBDK_y]) rp.myDigitalPinState[Controller::Three] = false;
if (KeyTable[KBDK_h]) rp.myDigitalPinState[Controller::Six] = false; if (myKeyTable[KBDK_h]) rp.myDigitalPinState[Controller::Six] = false;
if (KeyTable[KBDK_n]) rp.myDigitalPinState[Controller::Four] = false; if (myKeyTable[KBDK_n]) rp.myDigitalPinState[Controller::Four] = false;
break; break;
case 2: case 2:
if (KeyTable[KBDK_8]) lp.myDigitalPinState[Controller::Six] = false; if (myKeyTable[KBDK_8]) lp.myDigitalPinState[Controller::Six] = false;
// Emulate the '[' character (Shift-8) with the actual key // Emulate the '[' character (Shift-8) with the actual key
if (KeyTable[KBDK_LEFTBRACKET] && !(KeyTable[KBDK_LSHIFT] || KeyTable[KBDK_RSHIFT])) if (myKeyTable[KBDK_LEFTBRACKET] && !(myKeyTable[KBDK_LSHIFT] || myKeyTable[KBDK_RSHIFT]))
{ {
rp.myAnalogPinValue[Controller::Five] = Controller::minimumResistance; rp.myAnalogPinValue[Controller::Five] = Controller::minimumResistance;
lp.myDigitalPinState[Controller::Six] = false; lp.myDigitalPinState[Controller::Six] = false;
} }
if (KeyTable[KBDK_i]) rp.myDigitalPinState[Controller::Three] = false; if (myKeyTable[KBDK_i]) rp.myDigitalPinState[Controller::Three] = false;
if (KeyTable[KBDK_k]) rp.myDigitalPinState[Controller::Six] = false; if (myKeyTable[KBDK_k]) rp.myDigitalPinState[Controller::Six] = false;
if (KeyTable[KBDK_COMMA]) rp.myDigitalPinState[Controller::Four] = false; if (myKeyTable[KBDK_COMMA]) rp.myDigitalPinState[Controller::Four] = false;
break; break;
case 3: case 3:
if (KeyTable[KBDK_2]) lp.myDigitalPinState[Controller::Six] = false; if (myKeyTable[KBDK_2]) lp.myDigitalPinState[Controller::Six] = false;
// Emulate the '-' character (Shift-2) with the actual minus key // Emulate the '-' character (Shift-2) with the actual minus key
if (KeyTable[KBDK_MINUS] && !(KeyTable[KBDK_LSHIFT] || KeyTable[KBDK_RSHIFT])) if (myKeyTable[KBDK_MINUS] && !(myKeyTable[KBDK_LSHIFT] || myKeyTable[KBDK_RSHIFT]))
{ {
rp.myAnalogPinValue[Controller::Five] = Controller::minimumResistance; rp.myAnalogPinValue[Controller::Five] = Controller::minimumResistance;
lp.myDigitalPinState[Controller::Six] = false; lp.myDigitalPinState[Controller::Six] = false;
} }
if (KeyTable[KBDK_w]) rp.myDigitalPinState[Controller::Three] = false; if (myKeyTable[KBDK_w]) rp.myDigitalPinState[Controller::Three] = false;
if (KeyTable[KBDK_s]) rp.myDigitalPinState[Controller::Six] = false; if (myKeyTable[KBDK_s]) rp.myDigitalPinState[Controller::Six] = false;
if (KeyTable[KBDK_x]) rp.myDigitalPinState[Controller::Four] = false; if (myKeyTable[KBDK_x]) rp.myDigitalPinState[Controller::Four] = false;
break; break;
case 4: case 4:
if (KeyTable[KBDK_3]) lp.myDigitalPinState[Controller::Six] = false; if (myKeyTable[KBDK_3]) lp.myDigitalPinState[Controller::Six] = false;
if (KeyTable[KBDK_e]) rp.myDigitalPinState[Controller::Three] = false; if (myKeyTable[KBDK_e]) rp.myDigitalPinState[Controller::Three] = false;
if (KeyTable[KBDK_d]) rp.myDigitalPinState[Controller::Six] = false; if (myKeyTable[KBDK_d]) rp.myDigitalPinState[Controller::Six] = false;
if (KeyTable[KBDK_c]) rp.myDigitalPinState[Controller::Four] = false; if (myKeyTable[KBDK_c]) rp.myDigitalPinState[Controller::Four] = false;
break; break;
case 5: case 5:
if (KeyTable[KBDK_0]) lp.myDigitalPinState[Controller::Six] = false; if (myKeyTable[KBDK_0]) lp.myDigitalPinState[Controller::Six] = false;
// Emulate the quote character (Shift-0) with the actual quote key // Emulate the quote character (Shift-0) with the actual quote key
if (KeyTable[KBDK_QUOTE] && (KeyTable[KBDK_LSHIFT] || KeyTable[KBDK_RSHIFT])) if (myKeyTable[KBDK_QUOTE] && (myKeyTable[KBDK_LSHIFT] || myKeyTable[KBDK_RSHIFT]))
{ {
rp.myAnalogPinValue[Controller::Five] = Controller::minimumResistance; rp.myAnalogPinValue[Controller::Five] = Controller::minimumResistance;
lp.myDigitalPinState[Controller::Six] = false; lp.myDigitalPinState[Controller::Six] = false;
} }
if (KeyTable[KBDK_p]) rp.myDigitalPinState[Controller::Three] = false; if (myKeyTable[KBDK_p]) rp.myDigitalPinState[Controller::Three] = false;
if (KeyTable[KBDK_RETURN]) rp.myDigitalPinState[Controller::Six] = false; if (myKeyTable[KBDK_RETURN]) rp.myDigitalPinState[Controller::Six] = false;
if (KeyTable[KBDK_SPACE]) rp.myDigitalPinState[Controller::Four] = false; if (myKeyTable[KBDK_SPACE]) rp.myDigitalPinState[Controller::Four] = false;
// Emulate Ctrl-space (aka backspace) with the actual Backspace key // Emulate Ctrl-space (aka backspace) with the actual Backspace key
if (KeyTable[KBDK_BACKSPACE]) if (myKeyTable[KBDK_BACKSPACE])
{ {
lp.myAnalogPinValue[Controller::Nine] = Controller::minimumResistance; lp.myAnalogPinValue[Controller::Nine] = Controller::minimumResistance;
rp.myDigitalPinState[Controller::Four] = false; rp.myDigitalPinState[Controller::Four] = false;
} }
break; break;
case 6: case 6:
if (KeyTable[KBDK_9]) lp.myDigitalPinState[Controller::Six] = false; if (myKeyTable[KBDK_9]) lp.myDigitalPinState[Controller::Six] = false;
// Emulate the ']' character (Shift-9) with the actual key // Emulate the ']' character (Shift-9) with the actual key
if (KeyTable[KBDK_RIGHTBRACKET] && !(KeyTable[KBDK_LSHIFT] || KeyTable[KBDK_RSHIFT])) if (myKeyTable[KBDK_RIGHTBRACKET] && !(myKeyTable[KBDK_LSHIFT] || myKeyTable[KBDK_RSHIFT]))
{ {
rp.myAnalogPinValue[Controller::Five] = Controller::minimumResistance; rp.myAnalogPinValue[Controller::Five] = Controller::minimumResistance;
lp.myDigitalPinState[Controller::Six] = false; lp.myDigitalPinState[Controller::Six] = false;
} }
if (KeyTable[KBDK_o]) rp.myDigitalPinState[Controller::Three] = false; if (myKeyTable[KBDK_o]) rp.myDigitalPinState[Controller::Three] = false;
if (KeyTable[KBDK_l]) rp.myDigitalPinState[Controller::Six] = false; if (myKeyTable[KBDK_l]) rp.myDigitalPinState[Controller::Six] = false;
if (KeyTable[KBDK_PERIOD]) rp.myDigitalPinState[Controller::Four] = false; if (myKeyTable[KBDK_PERIOD]) rp.myDigitalPinState[Controller::Four] = false;
break; break;
case 7: case 7:
if (KeyTable[KBDK_5]) lp.myDigitalPinState[Controller::Six] = false; if (myKeyTable[KBDK_5]) lp.myDigitalPinState[Controller::Six] = false;
// Emulate the '=' character (Shift-5) with the actual equals key // Emulate the '=' character (Shift-5) with the actual equals key
if (KeyTable[KBDK_EQUALS] && !(KeyTable[KBDK_LSHIFT] || KeyTable[KBDK_RSHIFT])) if (myKeyTable[KBDK_EQUALS] && !(myKeyTable[KBDK_LSHIFT] || myKeyTable[KBDK_RSHIFT]))
{ {
rp.myAnalogPinValue[Controller::Five] = Controller::minimumResistance; rp.myAnalogPinValue[Controller::Five] = Controller::minimumResistance;
lp.myDigitalPinState[Controller::Six] = false; lp.myDigitalPinState[Controller::Six] = false;
} }
if (KeyTable[KBDK_t]) rp.myDigitalPinState[Controller::Three] = false; if (myKeyTable[KBDK_t]) rp.myDigitalPinState[Controller::Three] = false;
if (KeyTable[KBDK_g]) rp.myDigitalPinState[Controller::Six] = false; if (myKeyTable[KBDK_g]) rp.myDigitalPinState[Controller::Six] = false;
if (KeyTable[KBDK_b]) rp.myDigitalPinState[Controller::Four] = false; if (myKeyTable[KBDK_b]) rp.myDigitalPinState[Controller::Four] = false;
break; break;
case 8: case 8:
if (KeyTable[KBDK_1]) lp.myDigitalPinState[Controller::Six] = false; if (myKeyTable[KBDK_1]) lp.myDigitalPinState[Controller::Six] = false;
// Emulate the '+' character (Shift-1) with the actual plus key (Shift-=) // Emulate the '+' character (Shift-1) with the actual plus key (Shift-=)
if (KeyTable[KBDK_EQUALS] && (KeyTable[KBDK_LSHIFT] || KeyTable[KBDK_RSHIFT])) if (myKeyTable[KBDK_EQUALS] && (myKeyTable[KBDK_LSHIFT] || myKeyTable[KBDK_RSHIFT]))
{ {
rp.myAnalogPinValue[Controller::Five] = Controller::minimumResistance; rp.myAnalogPinValue[Controller::Five] = Controller::minimumResistance;
lp.myDigitalPinState[Controller::Six] = false; lp.myDigitalPinState[Controller::Six] = false;
} }
if (KeyTable[KBDK_q]) rp.myDigitalPinState[Controller::Three] = false; if (myKeyTable[KBDK_q]) rp.myDigitalPinState[Controller::Three] = false;
if (KeyTable[KBDK_a]) rp.myDigitalPinState[Controller::Six] = false; if (myKeyTable[KBDK_a]) rp.myDigitalPinState[Controller::Six] = false;
if (KeyTable[KBDK_z]) rp.myDigitalPinState[Controller::Four] = false; if (myKeyTable[KBDK_z]) rp.myDigitalPinState[Controller::Four] = false;
break; break;
case 9: case 9:
if (KeyTable[KBDK_4]) lp.myDigitalPinState[Controller::Six] = false; if (myKeyTable[KBDK_4]) lp.myDigitalPinState[Controller::Six] = false;
// Emulate the '/' character (Shift-4) with the actual slash key // Emulate the '/' character (Shift-4) with the actual slash key
if (KeyTable[KBDK_SLASH] && !(KeyTable[KBDK_LSHIFT] || KeyTable[KBDK_RSHIFT])) if (myKeyTable[KBDK_SLASH] && !(myKeyTable[KBDK_LSHIFT] || myKeyTable[KBDK_RSHIFT]))
{ {
rp.myAnalogPinValue[Controller::Five] = Controller::minimumResistance; rp.myAnalogPinValue[Controller::Five] = Controller::minimumResistance;
lp.myDigitalPinState[Controller::Six] = false; lp.myDigitalPinState[Controller::Six] = false;
} }
if (KeyTable[KBDK_r]) rp.myDigitalPinState[Controller::Three] = false; if (myKeyTable[KBDK_r]) rp.myDigitalPinState[Controller::Three] = false;
if (KeyTable[KBDK_f]) rp.myDigitalPinState[Controller::Six] = false; if (myKeyTable[KBDK_f]) rp.myDigitalPinState[Controller::Six] = false;
if (KeyTable[KBDK_v]) rp.myDigitalPinState[Controller::Four] = false; if (myKeyTable[KBDK_v]) rp.myDigitalPinState[Controller::Four] = false;
break; break;
default: default:
break; break;

3
src/emucore/CompuMate.hxx
View File

@ -123,6 +123,9 @@ class CompuMate
// Left and right controllers // Left and right controllers
CMControl *myLeftController, *myRightController; CMControl *myLeftController, *myRightController;
// The keyboard state array (tells us the current state of the keyboard)
uInt8* myKeyTable;
// System cycle at which the update() method is called // System cycle at which the update() method is called
// Multiple calls at the same cycle should be ignored // Multiple calls at the same cycle should be ignored
uInt32 myCycleAtLastUpdate; uInt32 myCycleAtLastUpdate;