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

Preliminary support for converting buttons to HAT events for the GP2X 

gamepad, implementing 'case 2' configuration.  This hasn't been tested
yet, since I don't have the hardware.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@992 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2006-01-30 16:20:41 +00:00
parent 801f4a1bf9
commit 1c80f5b1c7
3 changed files with 108 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stella/src/emucore/EventHandler.hxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: EventHandler.hxx,v 1.76 2006-01-18 20:43:22 stephena Exp $
// $Id: EventHandler.hxx,v 1.77 2006-01-30 16:20:41 stephena Exp $
//============================================================================
#ifndef EVENTHANDLER_HXX
@ -133,7 +133,7 @@ struct JoyMouse {
mapping can take place.
@author Stephen Anthony
@version $Id: EventHandler.hxx,v 1.76 2006-01-18 20:43:22 stephena Exp $
@version $Id: EventHandler.hxx,v 1.77 2006-01-30 16:20:41 stephena Exp $
*/
class EventHandler
{
@ -480,6 +480,8 @@ class EventHandler
void takeSnapshot();
void setEventState(State state);
inline SDL_Joystick* getJoystick(int i) { return ourJoysticks[i].stick; }
private:
// Global OSystem object
OSystem* myOSystem;

93
stella/src/gp2x/OSystemGP2X.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: OSystemGP2X.cxx,v 1.2 2006-01-30 01:01:44 stephena Exp $
// $Id: OSystemGP2X.cxx,v 1.3 2006-01-30 16:20:41 stephena Exp $
// Modified on 2006/01/06 by Alex Zaballa for use on GP2X
//============================================================================
@ -76,6 +76,13 @@ OSystemGP2X::OSystemGP2X()
string cacheFile = basedir + "/stella.cache";
setCacheFile(cacheFile);
// Set hat event handler to a known state
for(int i = 0; i < 8; ++i)
{
myCurrentEvents[i] = myPreviousEvents[i] = 0;
myActiveEvents[i] = false;
}
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -183,6 +190,86 @@ void OSystemGP2X::setDefaultJoyAxisMap()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void OSystemGP2X::pollEvent()
{
// TODO - add code to translate joystick directions into proper SDL HAT
// events, so that the core code will 'just work'
// Translate joystick button events that act as directions into proper
// SDL HAT events. This method will use 'case 2', as discussed on the
// GP2X forums. Technically, this code should be integrated directly
// into the GP2X SDL port.
// Swap event buffers
uInt8* tmp = myCurrentEvents;
myCurrentEvents = myPreviousEvents;
myPreviousEvents = tmp;
// Scan all the buttons, and detect if an event has occurred
bool changeDetected = false;
SDL_Joystick* stick = myEventHandler->getJoystick(0);
for(int i = 0; i < 8; ++i)
{
myCurrentEvents[i] = SDL_JoystickGetButton(stick, i);
if(myCurrentEvents[i] != myPreviousEvents[i])
changeDetected = myActiveEvent[i] = true;
}
// Create an appropriate SDL HAT event for the new state
uInt8 value = SDL_HAT_CENTERED;
if(changeDetected)
{
// Merge 'in-between' values to the proper direction
// For example, if both 'up' and 'upright' are on, turn 'upright' off
if(myActiveEvent[kJDirUp] && myCurrentEvents[kJDirUp]) // up
{
myActiveEvent[kJDirUpLeft] = myActiveEvent[kJDirUpRight] = false;
myCurrentEvents[kJDirUpLeft] = myCurrentEvents[kJDirUpRight] = 0;
value |= SDL_HAT_UP;
}
else if(myActiveEvent[kJDirDown] && myCurrentEvents[kJDirDown]) // down
{
myActiveEvent[kJDirDownLeft] = myActiveEvent[kJDirDownRight] = false;
myCurrentEvents[kJDirDownLeft] = myCurrentEvents[kJDirDownRight] = 0;
value |= SDL_HAT_DOWN;
}
else if(myActiveEvent[kJDirLeft] && myCurrentEvents[kJDirLeft]) // left
{
myActiveEvent[kJDirUpLeft] = myActiveEvent[kJDirDownLeft] = false;
myCurrentEvents[kJDirUpLeft] = myCurrentEvents[kJDirDownLeft] = 0;
value |= SDL_HAT_LEFT;
}
else if(myActiveEvent[kJDirRight] && myCurrentEvents[kJDirRight]) // right
{
myActiveEvent[kJDirUpRight] = myActiveEvent[kJDirDownRight] = false;
myCurrentEvents[kJDirUpRight] = myCurrentEvents[kJDirDownRight] = 0;
value |= SDL_HAT_RIGHT;
}
// Now consider diagonal positions
if(myActiveEvent[kJDirUpLeft] && myCurrentEvents[kJDirUpLeft]) // up-left
{
value |= SDL_HAT_UP | SDL_HAT_LEFT;
}
else if(myActiveEvent[kJDirUpRight] && myCurrentEvents[kJDirUpRight]) // up-right
{
value |= SDL_HAT_UP | SDL_HAT_RIGHT;
}
else if(myActiveEvent[kJDirDownLeft] && myCurrentEvents[kJDirDownLeft]) // down-left
{
value |= SDL_HAT_DOWN | SDL_HAT_LEFT;
}
else if(myActiveEvent[kJDirDownRight] && myCurrentEvents[kJDirDownRight]) // down-right
{
value |= SDL_HAT_DOWN | SDL_HAT_RIGHT;
}
// Finally, create the HAT event and pass it to SDL
SDL_JoyHatEvent event;
event.type = SDL_JOYHATMOTION;
event.which = 0;
event.hat = 0;
event.value = value;
SDL_PushEvent((SDL_Event*)&event);
}
}

15
stella/src/gp2x/OSystemGP2X.hxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: OSystemGP2X.hxx,v 1.2 2006-01-30 01:01:44 stephena Exp $
// $Id: OSystemGP2X.hxx,v 1.3 2006-01-30 16:20:41 stephena Exp $
// Modified by Alex Zaballa on 2006/01/04 for use on GP2X
//============================================================================
@ -75,6 +75,19 @@ class OSystemGP2X : public OSystem
This method creates events from platform-specific hardware.
*/
void pollEvent();
private:
enum {
kJDirUp = 0, kJDirUpLeft = 1,
kJDirLeft = 2, kJDirDownLeft = 3,
kJDirDown = 4, kJDirDownRight = 5,
kJDirRight = 6, kJDirUpRight = 7
};
uInt8* myPreviousEvents[8];
uInt8* myCurrentEvents[8];
Int8* myActiveEvents[8];
};
#endif