Changeset 7506 for code/branches/ois_update/src/external/ois/win32/Win32JoyStick.h

Timestamp:

Oct 7, 2010, 8:21:33 PM (14 years ago)

Author:

rgrieder

Message:

Updated OIS source files to its current SVN trunk (r26).

File:

• code/branches/ois_update/src/external/ois/win32/Win32JoyStick.h (modified) (4 diffs)

code/branches/ois_update/src/external/ois/win32/Win32JoyStick.h

@@ -25 +25 @@
 
 #include "OISJoyStick.h"
-#include "Win32/Win32Prereqs.h"
+#include "win32/Win32Prereqs.h"
 
 namespace OIS
@@ -41 +41 @@
                 virtual void capture();
 
+                //! hanlde xinput
+                void captureXInput();
+
                 /** @copydoc Object::queryInterface */
                 virtual Interface* queryInterface(Interface::IType type);
@@ -46 +49 @@
                 /** @copydoc Object::_initialize */
                 virtual void _initialize();
+
+                /**
+                @remarks
+                        Enum each PNP device using WMI and check each device ID to see if it contains 
+                        "IG_" (ex. "VID_045E&PID_028E&IG_00").  If it does, then it's an XInput device
+                        Unfortunately this information can not be found by just using DirectInput 
+                */
+                static void CheckXInputDevices(JoyStickInfoList &joys);
 
         protected:
@@ -61 +72 @@
                 IDirectInputDevice8* mJoyStick;
                 DIDEVCAPS mDIJoyCaps;
+                DWORD coopSetting;
 
-                DWORD coopSetting;
-                GUID deviceGuid;
+        JoyStickInfo mJoyInfo;
 
                 //! A force feedback device
-                Win32ForceFeedback* ff_device;
+                Win32ForceFeedback* mFfDevice;
 
                 //! Mapping