Adds empty implementations to the supported platforms for the newly added Platform gamepad APIs

Fixes build error when USE_XINPUT is not defined.

gameplay/src/PlatformAndroid.cpp

@@ -1000,6 +1000,66 @@ void Platform::sleep(long ms)
     usleep(ms * 1000);
 }
 
+unsigned int Platform::getGamepadCount()
+{
+    return 0;
+}
+
+bool Platform::isGamepadAttached(unsigned int gamepadHandle)
+{
+    return false;
+}
+
+const char* Platform::getGamepadId(unsigned int gamepadHandle)
+{
+    return NULL;
+}
+
+unsigned int Platform::getGamepadButtonCount(unsigned int gamepadHandle)
+{
+    return 0;
+}
+
+bool Platform::getGamepadButtonState(unsigned int gamepadHandle, unsigned int buttonIndex)
+{
+    return false;
+}
+
+unsigned int Platform::getGamepadJoystickCount(unsigned int gamepadHandle)
+{
+    return 0;
+}
+
+bool Platform::isGamepadJoystickActive(unsigned int gamepadHandle, unsigned int joystickIndex)
+{
+    return false;
+}
+
+float Platform::getGamepadJoystickXAxis(unsigned int gamepadHandle, unsigned int joystickIndex)
+{
+    return 0.0f;
+}
+
+float Platform::getGamepadJoystickYAxis(unsigned int gamepadHandle, unsigned int joystickIndex)
+{
+    return 0.0f;
+}
+
+void Platform::getGamepadJoystickValue(unsigned int gamepadHandle, unsigned int joystickIndex, Vector2* value)
+{
+
+}
+
+unsigned int Platform::getGamepadTriggerCount(unsigned int gamepadHandle)
+{
+    return 0;
+}
+
+float Platform::getGamepadTriggerValue(unsigned int gamepadHandle, unsigned int triggerIndex)
+{
+    return 0.0f;
+}
+
 }
 
 #endif

gameplay/src/PlatformLinux.cpp

@@ -804,6 +804,66 @@ void Platform::sleep(long ms)
     usleep(ms * 1000);
 }
 
+unsigned int Platform::getGamepadCount()
+{
+    return 0;
+}
+
+bool Platform::isGamepadAttached(unsigned int gamepadHandle)
+{
+    return false;
+}
+
+const char* Platform::getGamepadId(unsigned int gamepadHandle)
+{
+    return NULL;
+}
+
+unsigned int Platform::getGamepadButtonCount(unsigned int gamepadHandle)
+{
+    return 0;
+}
+
+bool Platform::getGamepadButtonState(unsigned int gamepadHandle, unsigned int buttonIndex)
+{
+    return false;
+}
+
+unsigned int Platform::getGamepadJoystickCount(unsigned int gamepadHandle)
+{
+    return 0;
+}
+
+bool Platform::isGamepadJoystickActive(unsigned int gamepadHandle, unsigned int joystickIndex)
+{
+    return false;
+}
+
+float Platform::getGamepadJoystickXAxis(unsigned int gamepadHandle, unsigned int joystickIndex)
+{
+    return 0.0f;
+}
+
+float Platform::getGamepadJoystickYAxis(unsigned int gamepadHandle, unsigned int joystickIndex)
+{
+    return 0.0f;
+}
+
+void Platform::getGamepadJoystickValue(unsigned int gamepadHandle, unsigned int joystickIndex, Vector2* value)
+{
+
+}
+
+unsigned int Platform::getGamepadTriggerCount(unsigned int gamepadHandle)
+{
+    return 0;
+}
+
+float Platform::getGamepadTriggerValue(unsigned int gamepadHandle, unsigned int triggerIndex)
+{
+    return 0.0f;
+}
+
 }
 
 #endif

gameplay/src/PlatformMacOSX.mm

@@ -879,6 +879,66 @@ void Platform::sleep(long ms)
     usleep(ms * 1000);
 }
 
+unsigned int Platform::getGamepadCount()
+{
+    return 0;
+}
+
+bool Platform::isGamepadAttached(unsigned int gamepadHandle)
+{
+    return false;
+}
+
+const char* Platform::getGamepadId(unsigned int gamepadHandle)
+{
+    return NULL;
+}
+
+unsigned int Platform::getGamepadButtonCount(unsigned int gamepadHandle)
+{
+    return 0;
+}
+
+bool Platform::getGamepadButtonState(unsigned int gamepadHandle, unsigned int buttonIndex)
+{
+    return false;
+}
+
+unsigned int Platform::getGamepadJoystickCount(unsigned int gamepadHandle)
+{
+    return 0;
+}
+
+bool Platform::isGamepadJoystickActive(unsigned int gamepadHandle, unsigned int joystickIndex)
+{
+    return false;
+}
+
+float Platform::getGamepadJoystickXAxis(unsigned int gamepadHandle, unsigned int joystickIndex)
+{
+    return 0.0f;
+}
+
+float Platform::getGamepadJoystickYAxis(unsigned int gamepadHandle, unsigned int joystickIndex)
+{
+    return 0.0f;
+}
+
+void Platform::getGamepadJoystickValue(unsigned int gamepadHandle, unsigned int joystickIndex, Vector2* value)
+{
+
+}
+
+unsigned int Platform::getGamepadTriggerCount(unsigned int gamepadHandle)
+{
+    return 0;
+}
+
+float Platform::getGamepadTriggerValue(unsigned int gamepadHandle, unsigned int triggerIndex)
+{
+    return 0.0f;
+}
+
 }
 
 #endif

gameplay/src/PlatformQNX.cpp

@@ -1196,6 +1196,66 @@ void Platform::sleep(long ms)
     usleep(ms * 1000);
 }
 
+unsigned int Platform::getGamepadCount()
+{
+    return 0;
+}
+
+bool Platform::isGamepadAttached(unsigned int gamepadHandle)
+{
+    return false;
+}
+
+const char* Platform::getGamepadId(unsigned int gamepadHandle)
+{
+    return NULL;
+}
+
+unsigned int Platform::getGamepadButtonCount(unsigned int gamepadHandle)
+{
+    return 0;
+}
+
+bool Platform::getGamepadButtonState(unsigned int gamepadHandle, unsigned int buttonIndex)
+{
+    return false;
+}
+
+unsigned int Platform::getGamepadJoystickCount(unsigned int gamepadHandle)
+{
+    return 0;
+}
+
+bool Platform::isGamepadJoystickActive(unsigned int gamepadHandle, unsigned int joystickIndex)
+{
+    return false;
+}
+
+float Platform::getGamepadJoystickXAxis(unsigned int gamepadHandle, unsigned int joystickIndex)
+{
+    return 0.0f;
+}
+
+float Platform::getGamepadJoystickYAxis(unsigned int gamepadHandle, unsigned int joystickIndex)
+{
+    return 0.0f;
+}
+
+void Platform::getGamepadJoystickValue(unsigned int gamepadHandle, unsigned int joystickIndex, Vector2* value)
+{
+
+}
+
+unsigned int Platform::getGamepadTriggerCount(unsigned int gamepadHandle)
+{
+    return 0;
+}
+
+float Platform::getGamepadTriggerValue(unsigned int gamepadHandle, unsigned int triggerIndex)
+{
+    return 0.0f;
+}
+
 }
 
 #endif

gameplay/src/PlatformWin32.cpp

@@ -621,8 +621,9 @@ Platform::~Platform()
         DestroyWindow(__hwnd);
         __hwnd = 0;
     }
-
+#ifdef USE_XINPUT
     SAFE_DELETE_ARRAY(_xInputGamepads);
+#endif
 }
 
 bool initializeGL()
@@ -1036,10 +1037,10 @@ unsigned int Platform::getGamepadCount()
 
 bool Platform::isGamepadAttached(unsigned int gamepadHandle)
 {
-    GP_ASSERT(0 <= gamepadHandle);
-    GP_ASSERT(gamepadHandle < XUSER_MAX_COUNT);
 
 #ifdef USE_XINPUT
+    GP_ASSERT(0 <= gamepadHandle);
+    GP_ASSERT(gamepadHandle < XUSER_MAX_COUNT);
     Game* game = Game::getInstance();
     GP_ASSERT(game);
 
@@ -1082,10 +1083,11 @@ bool Platform::isGamepadAttached(unsigned int gamepadHandle)
 
 const char* Platform::getGamepadId(unsigned int gamepadHandle) 
 {
+
+#ifdef USE_XINPUT
     GP_ASSERT(0 <= gamepadHandle);
     GP_ASSERT(gamepadHandle < XUSER_MAX_COUNT);
 
-#ifdef USE_XINPUT
     return _xInputGamepads[gamepadHandle]._id.c_str();
 #endif
     return NULL;
@@ -1093,10 +1095,10 @@ const char* Platform::getGamepadId(unsigned int gamepadHandle)
 
 unsigned int Platform::getGamepadButtonCount(unsigned int gamepadHandle)
 {
-    GP_ASSERT(0 <= gamepadHandle);
-    GP_ASSERT(gamepadHandle < XUSER_MAX_COUNT);
 
 #ifdef USE_XINPUT
+    GP_ASSERT(0 <= gamepadHandle);
+    GP_ASSERT(gamepadHandle < XUSER_MAX_COUNT);
     if (!_xInputGamepads[gamepadHandle]._isConnected)
         return 0;
 
@@ -1108,10 +1110,10 @@ unsigned int Platform::getGamepadButtonCount(unsigned int gamepadHandle)
 
 bool Platform::getGamepadButtonState(unsigned int gamepadHandle, unsigned int buttonIndex)
 {
-    GP_ASSERT(0 <= gamepadHandle);
-    GP_ASSERT(gamepadHandle < XUSER_MAX_COUNT);
 
 #ifdef USE_XINPUT
+    GP_ASSERT(0 <= gamepadHandle);
+    GP_ASSERT(gamepadHandle < XUSER_MAX_COUNT);
     return getXInputButtonState(gamepadHandle, buttonIndex);
 #endif
 
@@ -1120,10 +1122,11 @@ bool Platform::getGamepadButtonState(unsigned int gamepadHandle, unsigned int bu
 
 unsigned int Platform::getGamepadJoystickCount(unsigned int gamepadHandle)
 {
+
+#ifdef USE_XINPUT
     GP_ASSERT(0 <= gamepadHandle);
     GP_ASSERT(gamepadHandle < XUSER_MAX_COUNT);
 
-#ifdef USE_XINPUT
     if (!_xInputGamepads[gamepadHandle]._isConnected)
         return 0;
 
@@ -1135,10 +1138,11 @@ unsigned int Platform::getGamepadJoystickCount(unsigned int gamepadHandle)
 
 float Platform::getGamepadJoystickXAxis(unsigned int gamepadHandle, unsigned int joystickIndex)
 {
+    
+#ifdef USE_XINPUT
     GP_ASSERT(0 <= gamepadHandle);
     GP_ASSERT(gamepadHandle < XUSER_MAX_COUNT);
 
-#ifdef USE_XINPUT
     return getXInputJoystickXAxis(gamepadHandle, joystickIndex);
 #endif 
 
@@ -1147,10 +1151,11 @@ float Platform::getGamepadJoystickXAxis(unsigned int gamepadHandle, unsigned int
 
 float Platform::getGamepadJoystickYAxis(unsigned int gamepadHandle, unsigned int joystickIndex)
 {
+
+#ifdef USE_XINPUT
     GP_ASSERT(0 <= gamepadHandle);
     GP_ASSERT(gamepadHandle < XUSER_MAX_COUNT);
 
-#ifdef USE_XINPUT
     return getXInputJoystickYAxis(gamepadHandle, joystickIndex);
 #endif
 
@@ -1159,10 +1164,11 @@ float Platform::getGamepadJoystickYAxis(unsigned int gamepadHandle, unsigned int
 
 void Platform::getGamepadJoystickValue(unsigned int gamepadHandle, unsigned int joystickIndex, Vector2* value)
 {
+    
+#ifdef USE_XINPUT
     GP_ASSERT(0 <= gamepadHandle);
     GP_ASSERT(gamepadHandle < XUSER_MAX_COUNT);
 
-#ifdef USE_XINPUT
     getXInputJoystickValue(gamepadHandle, joystickIndex, value);
 #endif
 
@@ -1170,10 +1176,11 @@ void Platform::getGamepadJoystickValue(unsigned int gamepadHandle, unsigned int
 
 bool Platform::isGamepadJoystickActive(unsigned int gamepadHandle, unsigned int joystickIndex)
 {
+    
+#ifdef USE_XINPUT
     GP_ASSERT(0 <= gamepadHandle);
     GP_ASSERT(gamepadHandle < XUSER_MAX_COUNT);
 
-#ifdef USE_XINPUT
     return (getXInputJoystickXAxis(gamepadHandle, joystickIndex) != 0.0f || getXInputJoystickYAxis(gamepadHandle, joystickIndex) != 0.0f);
 #endif 
 
@@ -1182,10 +1189,11 @@ bool Platform::isGamepadJoystickActive(unsigned int gamepadHandle, unsigned int
 
 unsigned int Platform::getGamepadTriggerCount(unsigned int gamepadHandle)
 {
+
+#ifdef USE_XINPUT
     GP_ASSERT(0 <= gamepadHandle);
     GP_ASSERT(gamepadHandle < XUSER_MAX_COUNT);
 
-#ifdef USE_XINPUT
     return XInputGamepad::TRIGGER_COUNT;
 #endif
 
@@ -1194,9 +1202,10 @@ unsigned int Platform::getGamepadTriggerCount(unsigned int gamepadHandle)
 
 float Platform::getGamepadTriggerValue(unsigned int gamepadHandle, unsigned int triggerIndex)
 {
+    
+#ifdef USE_XINPUT
     GP_ASSERT(0 <= gamepadHandle);
     GP_ASSERT(gamepadHandle < XUSER_MAX_COUNT);
-#ifdef USE_XINPUT
     //TODO:
 #endif
     return 0.0f;

gameplay/src/PlatformiOS.mm

@@ -988,6 +988,66 @@ void Platform::sleep(long ms)
 {
     usleep(ms * 1000);
 }
+
+unsigned int Platform::getGamepadCount()
+{
+    return 0;
+}
+
+bool Platform::isGamepadAttached(unsigned int gamepadHandle)
+{
+    return false;
+}
+
+const char* Platform::getGamepadId(unsigned int gamepadHandle)
+{
+    return NULL;
+}
+
+unsigned int Platform::getGamepadButtonCount(unsigned int gamepadHandle)
+{
+    return 0;
+}
+
+bool Platform::getGamepadButtonState(unsigned int gamepadHandle, unsigned int buttonIndex)
+{
+    return false;
+}
+
+unsigned int Platform::getGamepadJoystickCount(unsigned int gamepadHandle)
+{
+    return 0;
+}
+
+bool Platform::isGamepadJoystickActive(unsigned int gamepadHandle, unsigned int joystickIndex)
+{
+    return false;
+}
+
+float Platform::getGamepadJoystickXAxis(unsigned int gamepadHandle, unsigned int joystickIndex)
+{
+    return 0.0f;
+}
+
+float Platform::getGamepadJoystickYAxis(unsigned int gamepadHandle, unsigned int joystickIndex)
+{
+    return 0.0f;
+}
+
+void Platform::getGamepadJoystickValue(unsigned int gamepadHandle, unsigned int joystickIndex, Vector2* value)
+{
+
+}
+
+unsigned int Platform::getGamepadTriggerCount(unsigned int gamepadHandle)
+{
+    return 0;
+}
+
+float Platform::getGamepadTriggerValue(unsigned int gamepadHandle, unsigned int triggerIndex)
+{
+    return 0.0f;
+}
     
 }