Changeset 5695 for code/trunk/src/ois/win32/Win32InputManager.cpp

Timestamp:

Aug 30, 2009, 2:22:00 AM (15 years ago)

Author:

rgrieder

Message:

Merged resource2 branch back to trunk.

IMPORTANT NOTE:
Upon this merge you need to specifically call your data directory "data_extern" when checking it out (when you don't provide a name, it will be just called 'trunk').
The new CMake variable is EXTERNAL_DATA_DIRECTORY. DATA_DIRECTORY now points to the one the source part of the repository.
UPDATE YOUR DATA DIRECTORY AS WELL!!!

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/ois/win32/Win32InputManager.cpp (modified) (3 diffs)

code/trunk/src/ois/win32/Win32InputManager.cpp

@@ -75 +75 @@
         hInst = GetModuleHandle(0);
 
-        //Create the device
+        //Create the input system
         hr = DirectInput8Create( hInst, DIRECTINPUT_VERSION, IID_IDirectInput8, (VOID**)&mDirectInput, NULL );
     if (FAILED(hr))     
@@ -82 +82 @@
         //Ok, now we have DirectInput, parse whatever extra settings were sent to us
         _parseConfigSettings( paramList );
+
+        // Enumerate devices ...
         _enumerateDevices();
 }
@@ -116 +118 @@
 {
         //Enumerate all attached devices
-        mDirectInput->EnumDevices(NULL, _DIEnumKbdCallback, this, DIEDFL_ATTACHEDONLY); 
-}
-
-//--------------------------------------------------------------------------------//
-BOOL CALLBACK Win32InputManager::_DIEnumKbdCallback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef)
+        mDirectInput->EnumDevices(NULL , _DIEnumDevCallback, this, DIEDFL_ATTACHEDONLY); 
+}
+
+//--------------------------------------------------------------------------------//
+BOOL CALLBACK Win32InputManager::_DIEnumDevCallback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef)
 {
         Win32InputManager *_this_ = static_cast<Win32InputManager*>(pvRef);
+
+        // Register only game devices (keyboard and mouse are managed differently).
         if( GET_DIDEVICE_TYPE(lpddi->dwDevType) == DI8DEVTYPE_JOYSTICK ||
                 GET_DIDEVICE_TYPE(lpddi->dwDevType) == DI8DEVTYPE_GAMEPAD ||