kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

BGE patch approved: BGE Multiple Joysticks

Browse Source
This commit is contained in:
Benoit Bolsee 2008-08-31 18:42:58 +00:00
parent a4e74c92f7
commit 74339c639a
10 changed files with 93 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/makesdna/DNA_sensor_types.h
View File

@ -164,7 +164,7 @@ typedef struct bSensor {
typedef struct bJoystickSensor {
char name[32];
short type;
short pad;
short joyindex;
int axis;
int axisf;
int button;
@ -266,6 +266,7 @@ typedef struct bJoystickSensor {
#define SENS_JOY_HAT_DIR 0
#define SENS_DELAY_REPEAT 1
// should match JOYINDEX_MAX in SCA_JoystickDefines.h */
#define SENS_JOY_MAXINDEX 8
#endif

7
source/blender/src/buttons_logic.c
View File

@ -1444,10 +1444,13 @@ static short draw_sensorbuttons(bSensor *sens, uiBlock *block, short xco, short
draw_default_sensor_header(sens, block, xco, yco, width);
joy= sens->data;
uiDefButS(block, NUM, 1, "Index:", xco+10, yco-44, 0.6 * (width-120), 19,
&joy->joyindex, 0, SENS_JOY_MAXINDEX-1, 100, 0,
"Spesify which joystick to use");
str= "Type %t|Button %x0|Axis %x1|Hat%x2";
uiDefButS(block, MENU, B_REDR, str, xco+10, yco-44, 0.6 * (width-20), 19,
uiDefButS(block, MENU, B_REDR, str, xco+87, yco-44, 0.6 * (width-150), 19,
&joy->type, 0, 31, 0, 0,
"The type of event this joystick sensor is triggered on.");

1
source/gameengine/Converter/KX_ConvertSensors.cpp
View File

@ -713,6 +713,7 @@ void BL_ConvertSensors(struct Object* blenderobject,
gamesensor = new SCA_JoystickSensor(
eventmgr,
gameobj,
bjoy->joyindex,
joysticktype,
axis,axisf,
prec,

95
source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
View File

@ -29,9 +29,9 @@
#include "SCA_Joystick.h"
#include "SCA_JoystickPrivate.h"
SCA_Joystick::SCA_Joystick()
SCA_Joystick::SCA_Joystick(short int index)
:
m_joyindex(index),
m_axis10(0),
m_axis11(0),
m_axis20(0),
@ -52,50 +52,53 @@ SCA_Joystick::~SCA_Joystick()
delete m_private;
}
SCA_Joystick *SCA_Joystick::m_instance = NULL;
SCA_Joystick *SCA_Joystick::m_instance[JOYINDEX_MAX];
int SCA_Joystick::m_refCount = 0;
SCA_Joystick *SCA_Joystick::GetInstance()
SCA_Joystick *SCA_Joystick::GetInstance( short int joyindex )
{
if (m_instance == 0)
if (joyindex < 0 || joyindex >= JOYINDEX_MAX) {
echo("Error-invalid joystick index: " << joyindex);
return NULL;
}
if (m_refCount == 0)
{
m_instance = new SCA_Joystick();
m_instance->CreateJoystickDevice();
int i;
// do this once only
if(SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO ) == -1 ){
echo("Error-Initializing-SDL: " << SDL_GetError());
return NULL;
}
for (i=0; i<JOYINDEX_MAX; i++) {
m_instance[i] = new SCA_Joystick(i);
m_instance[i]->CreateJoystickDevice();
}
m_refCount = 1;
}
else
{
m_refCount++;
}
return m_instance;
return m_instance[joyindex];
}
void SCA_Joystick::ReleaseInstance()
{
if (--m_refCount == 0)
{
DestroyJoystickDevice();
delete m_instance;
m_instance = NULL;
int i;
for (i=0; i<JOYINDEX_MAX; i++) {
if (m_instance[i]) {
m_instance[i]->DestroyJoystickDevice();
delete m_instance[i];
}
m_instance[i]= NULL;
}
SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO );
}
}
bool SCA_Joystick::CreateJoystickDevice()
{
bool init = false;
init = pCreateJoystickDevice();
return init;
}
void SCA_Joystick::DestroyJoystickDevice()
{
if(m_isinit)
pDestroyJoystickDevice();
}
void SCA_Joystick::HandleEvents()
{
if(m_isinit)
@ -334,40 +337,34 @@ int SCA_Joystick::GetNumberOfHats()
return -1;
}
bool SCA_Joystick::pCreateJoystickDevice()
bool SCA_Joystick::CreateJoystickDevice(void)
{
if(m_isinit == false){
if(SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO ) == -1 ){
echo("Error-Initializing-SDL: " << SDL_GetError());
return false;
}
if(SDL_NumJoysticks() > 0){
for(int i=0; i<SDL_NumJoysticks();i++){
m_private->m_joystick = SDL_JoystickOpen(i);
SDL_JoystickEventState(SDL_ENABLE);
m_numjoys = i;
}
echo("Joystick-initialized");
m_isinit = true;
return true;
}else{
echo("Joystick-Error: " << SDL_NumJoysticks() << " avaiable joystick(s)");
if (m_joyindex>=SDL_NumJoysticks()) {
// don't print a message, because this is done anyway
//echo("Joystick-Error: " << SDL_NumJoysticks() << " avaiable joystick(s)");
return false;
}
m_private->m_joystick = SDL_JoystickOpen(m_joyindex);
SDL_JoystickEventState(SDL_ENABLE);
echo("Joystick " << m_joyindex << " initialized");
m_isinit = true;
}
return false;
return true;
}
void SCA_Joystick::pDestroyJoystickDevice()
void SCA_Joystick::DestroyJoystickDevice(void)
{
echo("Closing-");
for(int i=0; i<SDL_NumJoysticks(); i++){
if(SDL_JoystickOpened(i)){
if (m_isinit){
if(SDL_JoystickOpened(m_joyindex)){
echo("Closing-joystick " << m_joyindex);
SDL_JoystickClose(m_private->m_joystick);
}
m_isinit = false;
}
SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO );
}

23
source/gameengine/GameLogic/Joystick/SCA_Joystick.h
View File

@ -76,7 +76,7 @@
class SCA_Joystick
{
static SCA_Joystick *m_instance;
static SCA_Joystick *m_instance[JOYINDEX_MAX];
static int m_refCount;
class PrivateData;
@ -85,14 +85,6 @@ class SCA_Joystick
int m_joyindex;
/*!
* the number of avail joysticks
*/
int m_numjoys;
/*
*support for 2 axes
@ -185,7 +177,7 @@ class SCA_Joystick
*/
bool pCreateJoystickDevice(void);
bool CreateJoystickDevice(void);
/*
@ -193,7 +185,7 @@ class SCA_Joystick
*/
void pDestroyJoystickDevice(void);
void DestroyJoystickDevice(void);
@ -259,18 +251,13 @@ class SCA_Joystick
int pGetHat(int direction);
SCA_Joystick();
SCA_Joystick(short int index);
~SCA_Joystick();
bool CreateJoystickDevice(void);
void DestroyJoystickDevice(void);
public:
static SCA_Joystick *GetInstance();
static SCA_Joystick *GetInstance( short int joyindex );
void ReleaseInstance();

2
source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
View File

@ -38,6 +38,8 @@
#define echo(x) std::cout << x << std::endl;
#endif
#define JOYINDEX_MAX 8
/* function callbacks */
#define HANDLE_AXISMOTION(fn) ((fn)(), 0L)
#define HANDLE_HATMOTION(fn) ((fn)(), 0L)

17
source/gameengine/GameLogic/SCA_JoystickManager.cpp
View File

@ -40,13 +40,20 @@ SCA_JoystickManager::SCA_JoystickManager(class SCA_LogicManager* logicmgr)
: SCA_EventManager(JOY_EVENTMGR),
m_logicmgr(logicmgr)
{
m_joystick = SCA_Joystick::GetInstance();
int i;
for (i=0; i<JOYINDEX_MAX; i++) {
m_joystick[i] = SCA_Joystick::GetInstance( i );
}
//m_joystick = NULL;
}
SCA_JoystickManager::~SCA_JoystickManager()
{
m_joystick->ReleaseInstance();
int i;
for (i=0; i<JOYINDEX_MAX; i++) {
m_joystick[i]->ReleaseInstance();
}
}
@ -58,17 +65,17 @@ void SCA_JoystickManager::NextFrame(double curtime,double deltatime)
SCA_JoystickSensor* joysensor = (SCA_JoystickSensor*)(*it);
if(!joysensor->IsSuspended())
{
m_joystick->HandleEvents();
m_joystick[joysensor->GetJoyIndex()]->HandleEvents();
joysensor->Activate(m_logicmgr, NULL);
}
}
}
SCA_Joystick *SCA_JoystickManager::GetJoystickDevice()
SCA_Joystick *SCA_JoystickManager::GetJoystickDevice( short int joyindex)
{
/*
*Return the instance of SCA_Joystick for use
*/
return m_joystick;
return m_joystick[joyindex];
}

4
source/gameengine/GameLogic/SCA_JoystickManager.h
View File

@ -40,12 +40,12 @@ class SCA_JoystickManager : public SCA_EventManager
/**
* SDL Joystick Class Instance
*/
SCA_Joystick *m_joystick;
SCA_Joystick *m_joystick[JOYINDEX_MAX];
public:
SCA_JoystickManager(class SCA_LogicManager* logicmgr);
virtual ~SCA_JoystickManager();
virtual void NextFrame(double curtime,double deltatime);
SCA_Joystick* GetJoystickDevice(void);
SCA_Joystick* GetJoystickDevice(short int joyindex);
};

14
source/gameengine/GameLogic/SCA_JoystickSensor.cpp
View File

@ -39,6 +39,7 @@
SCA_JoystickSensor::SCA_JoystickSensor(class SCA_JoystickManager* eventmgr,
SCA_IObject* gameobj,
short int joyindex,
short int joymode,
int axis, int axisf,int prec,
int button, int buttonf,
@ -53,7 +54,8 @@ SCA_JoystickSensor::SCA_JoystickSensor(class SCA_JoystickManager* eventmgr,
m_hat(hat),
m_hatf(hatf),
m_precision(prec),
m_joymode(joymode)
m_joymode(joymode),
m_joyindex(joyindex)
{
/*
std::cout << " axis " << m_axis << std::endl;
@ -99,7 +101,7 @@ bool SCA_JoystickSensor::IsPositiveTrigger()
bool SCA_JoystickSensor::Evaluate(CValue* event)
{
SCA_Joystick *js = m_pJoystickMgr->GetJoystickDevice();
SCA_Joystick *js = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
bool result = false;
bool reset = m_reset && m_level;
@ -351,7 +353,7 @@ PyObject* SCA_JoystickSensor::PyGetRealAxis( PyObject* self,
PyObject* args,
PyObject* kwds) {
int a,b,c,d;
SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice();
SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
a = joy->GetAxis10();
b = joy->GetAxis11();
c = joy->GetAxis20();
@ -451,7 +453,7 @@ PyObject* SCA_JoystickSensor::PyNumberOfAxes( PyObject* self,
PyObject* args,
PyObject* kwds) {
int num;
SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice();
SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
num = joy->GetNumberOfAxes();
return Py_BuildValue("i",num);
}
@ -464,7 +466,7 @@ PyObject* SCA_JoystickSensor::PyNumberOfButtons( PyObject* self,
PyObject* args,
PyObject* kwds) {
int num;
SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice();
SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
num = joy->GetNumberOfButtons();
return Py_BuildValue("i",num);
}
@ -477,7 +479,7 @@ PyObject* SCA_JoystickSensor::PyNumberOfHats( PyObject* self,
PyObject* args,
PyObject* kwds) {
int num;
SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice();
SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
num = joy->GetNumberOfHats();
return Py_BuildValue("i",num);
}

9
source/gameengine/GameLogic/SCA_JoystickSensor.h
View File

@ -72,6 +72,10 @@ class SCA_JoystickSensor :public SCA_ISensor
* The mode to determine axis,button or hat
*/
short int m_joymode;
/**
* Select which joystick to use
*/
short int m_joyindex;
enum KX_JOYSENSORMODE {
KX_JOYSENSORMODE_NODEF = 0,
@ -85,6 +89,7 @@ class SCA_JoystickSensor :public SCA_ISensor
public:
SCA_JoystickSensor(class SCA_JoystickManager* eventmgr,
SCA_IObject* gameobj,
short int joyindex,
short int joymode,
int axis, int axisf,int prec,
int button, int buttonf,
@ -97,6 +102,10 @@ public:
virtual bool IsPositiveTrigger();
virtual void Init();
short int GetJoyIndex(void){
return m_joyindex;
}
/* --------------------------------------------------------------------- */
/* Python interface ---------------------------------------------------- */
/* --------------------------------------------------------------------- */