BGE Joystick Hat Bugfix

bug reported by blenderage on blenderartist (found other bugs too).

- "All Hat Events" didnt work.
- Multiple hats didnt work
- use a menu with direction names rather then have the user guess. disallow zero as a direction.
- Allow up to 4 hats (was 2).
- Python api was clamping the axis to 2, maximum is currently JOYAXIS_MAX - 16
- New python attributes hatValues and hatSingle, match axis functions.
- Use SDL Axis events to fill in the axis and hat array rather then filling in every axis with SDL_JoystickGetAxis for each axis event.

4 files changed, 28 insertions, 64 deletions

diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
index b19424f20e9..7c4ebb4c330 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
+++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
@@ -42,7 +42,6 @@ SCA_Joystick::SCA_Joystick(short int index)
 	m_axismax(-1),
 	m_buttonmax(-1),
 	m_hatmax(-1),
-	m_hatdir(-2),
 	m_isinit(0),
 	m_istrig_axis(0),
 	m_istrig_button(0),
@@ -50,6 +49,10 @@ SCA_Joystick::SCA_Joystick(short int index)
 {
 	for(int i=0; i<JOYAXIS_MAX; i++)
 		m_axis_array[i]= 0;
+	
+	for(int i=0; i<JOYHAT_MAX; i++)
+		m_hat_array[i]= 0;
+	
 #ifndef DISABLE_SDL
 	m_private = new PrivateData();
 #endif
@@ -184,20 +187,9 @@ bool SCA_Joystick::aButtonReleaseIsPositive(int button)
 }
 
 
-bool SCA_Joystick::aHatIsPositive(int dir)
+bool SCA_Joystick::aHatIsPositive(int hatnum, int dir)
 {
-	bool result;
-	int res = pGetHat(dir);
-	res == dir? result = true : result = false;
-	return result;
-}
-
-int SCA_Joystick::pGetHat(int direction)
-{
-	if(direction == m_hatdir){
-		return m_hatdir;
-	}
-	return 0;
+	return (GetHat(hatnum)==dir) ? true : false;
 }
 
 int SCA_Joystick::GetNumberOfAxes()
@@ -248,8 +240,11 @@ bool SCA_Joystick::CreateJoystickDevice(void)
 		if (m_axismax > JOYAXIS_MAX) m_axismax= JOYAXIS_MAX;		/* very unlikely */
 		else if (m_axismax < 0) m_axismax = 0;
 		
+		if (m_hatmax > JOYHAT_MAX) m_hatmax= JOYHAT_MAX;			/* very unlikely */
+		else if(m_hatmax<0) m_hatmax= 0;
+		
 		if(m_buttonmax<0) m_buttonmax= 0;
-		if(m_hatmax<0) m_hatmax= 0;
+		
 	}
 	return true;
 #endif
@@ -278,15 +273,6 @@ int SCA_Joystick::Connected(void)
 	return 0;
 }
 
-void SCA_Joystick::pFillAxes()
-{
-#ifndef DISABLE_SDL
-	for(int i=0; i<m_axismax; i++)
-		m_axis_array[i]= SDL_JoystickGetAxis(m_private->m_joystick, i);
-#endif
-}
-
-
 int SCA_Joystick::pGetAxis(int axisnum, int udlr)
 {
 #ifndef DISABLE_SDL
diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.h b/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
index 53cd65cd495..5822f8e8ff8 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
+++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
@@ -53,28 +53,20 @@ class SCA_Joystick
 	int				m_joyindex;
 
 	/* 
-	 *support for 2 axes 
+	 *support for JOYAXIS_MAX axes (in pairs)
 	 */
 	int m_axis_array[JOYAXIS_MAX];
+
+	/* 
+	 *support for JOYHAT_MAX hats (each is a direction)
+	 */
+	int m_hat_array[JOYHAT_MAX];	
 	
 	/*
 	 * Precision or range of the axes
 	 */
 	int 			m_prec;
 
-	/*
-	 * multiple axis values stored here
-	 */
-	int 			m_axisnum;
-	int 			m_axisvalue;
-
-	/*
-	 * max # of axes avail
-	 */
-	/*disabled
-	int 			m_axismax;
-	*/
-
 	/* 
 	 *	button values stored here 
 	 */
@@ -88,18 +80,6 @@ class SCA_Joystick
 	int 			m_buttonmax;
 	int 			m_hatmax;
 	
-	/*
-	 * hat values stored here 
-	 */
-	int 			m_hatnum;
-	int 			m_hatdir;
-
-	/*
-
-	 * max # of hats avail
-		disabled
-	int 			m_hatmax;
-	 */
 	/* is the joystick initialized ?*/
 	bool			m_isinit;
 
@@ -136,7 +116,6 @@ class SCA_Joystick
 	/*
 	 * fills the axis mnember values 
 	 */
-	void pFillAxes(void);
 	void pFillButtons(void);
 
 	/*
@@ -149,11 +128,6 @@ class SCA_Joystick
 	 */
 	int pGetAxis(int axisnum, int udlr);
 
-	/*
-	 * gets the current hat direction
-	 */
-	int pGetHat(int direction);
-
 	SCA_Joystick(short int index);
 
 	~SCA_Joystick();
@@ -175,7 +149,7 @@ public:
 	bool aAnyButtonReleaseIsPositive(void);
 	bool aButtonPressIsPositive(int button);
 	bool aButtonReleaseIsPositive(int button);
-	bool aHatIsPositive(int dir);
+	bool aHatIsPositive(int hatnum, int dir);
 
 	/*
 	 * precision is default '3200' which is overridden by input
@@ -191,8 +165,8 @@ public:
 		return m_buttonnum;
 	}
 
-	int GetHat(void){
-		return m_hatdir;
+	int GetHat(int index){
+		return m_hat_array[index];
 	}
 
 	int GetThreshold(void){
diff --git a/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h b/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
index 636c4dd5a42..c7a9a5114df 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
+++ b/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
@@ -40,6 +40,7 @@
 
 #define JOYINDEX_MAX			8
 #define JOYAXIS_MAX				16
+#define JOYHAT_MAX				4
 
 #define JOYAXIS_RIGHT		0
 #define JOYAXIS_UP			1
diff --git a/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp b/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
index 8e190060e95..3ca8d7d2329 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
+++ b/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
@@ -35,17 +35,20 @@
 #ifndef DISABLE_SDL
 void SCA_Joystick::OnAxisMotion(SDL_Event* sdl_event)
 {
-	pFillAxes();
-	m_axisnum	= sdl_event->jaxis.axis;
-	m_axisvalue = sdl_event->jaxis.value;
+	if(sdl_event->jaxis.axis >= JOYAXIS_MAX)
+		return;
+	
+	m_axis_array[sdl_event->jaxis.axis]= sdl_event->jaxis.value;
 	m_istrig_axis = 1;
 }
 
 
 void SCA_Joystick::OnHatMotion(SDL_Event* sdl_event)
 {
-	m_hatdir = sdl_event->jhat.value;
-	m_hatnum = sdl_event->jhat.hat;
+	if(sdl_event->jhat.hat >= JOYAXIS_MAX)
+		return;
+
+	m_hat_array[sdl_event->jhat.hat]= sdl_event->jhat.value;
 	m_istrig_hat = 1;
 }