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.

1 files changed, 10 insertions, 24 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