Changeset 5695 for code/trunk/src/ois/win32/Win32JoyStick.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/Win32JoyStick.cpp (modified) (5 diffs)

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

@@ -82 +82 @@
         mState.mAxes.clear();
 
-        delete ff_device;
-        ff_device = 0;
-
+        if (ff_device)
+        {
+                delete ff_device;
+                ff_device = 0;
+        }
+
+        // Create direct input joystick device.
+        if(FAILED(mDirectInput->CreateDevice(deviceGuid, &mJoyStick, NULL)))
+                OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> Could not initialize joy device!");
+
+        // Set DIJoystick2 data format.
+        if(FAILED(mJoyStick->SetDataFormat(&c_dfDIJoystick2)))
+                OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> data format error!");
+
+        // Set cooperative level as specified when creating input manager.
+        HWND hwin = ((Win32InputManager*)mCreator)->getWindowHandle();
+        if(FAILED(mJoyStick->SetCooperativeLevel( hwin, coopSetting)))
+                OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> failed to set cooperation level!");
+
+        // Set buffer size.
         DIPROPDWORD dipdw;
-
         dipdw.diph.dwSize       = sizeof(DIPROPDWORD);
         dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER);
@@ -93 +109 @@
         dipdw.dwData            = JOYSTICK_DX_BUFFERSIZE;
 
-        if(FAILED(mDirectInput->CreateDevice(deviceGuid, &mJoyStick, NULL)))
-                OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> Could not initialize joy device!");
-
-        if(FAILED(mJoyStick->SetDataFormat(&c_dfDIJoystick2)))
-                OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> data format error!");
-
-        HWND hwin = ((Win32InputManager*)mCreator)->getWindowHandle();
-
-        if(FAILED(mJoyStick->SetCooperativeLevel( hwin, coopSetting)))
-                OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> failed to set cooperation level!");
-
         if( FAILED(mJoyStick->SetProperty(DIPROP_BUFFERSIZE, &dipdw.diph)) )
-                OIS_EXCEPT( E_General, "Win32Mouse::Win32Mouse >> Failed to set buffer size property" );
-
-        //Enumerate all axes/buttons/sliders/etc before aquiring
+                OIS_EXCEPT( E_General, "Win32JoyStick::_initialize >> Failed to set buffer size property" );
+
+        // Enumerate all axes/buttons/sliders/force feedback/etc before aquiring
         _enumerate();
 
@@ -118 +123 @@
 void Win32JoyStick::_enumerate()
 {
-        //We can check force feedback here too
-        DIDEVCAPS  DIJoyCaps;
-        DIJoyCaps.dwSize = sizeof(DIDEVCAPS);
-        mJoyStick->GetCapabilities(&DIJoyCaps);
-
-        mPOVs = (short)DIJoyCaps.dwPOVs;
-
-        mState.mButtons.resize(DIJoyCaps.dwButtons);
-        mState.mAxes.resize(DIJoyCaps.dwAxes);
+        // Get joystick capabilities.
+        mDIJoyCaps.dwSize = sizeof(DIDEVCAPS);
+        if( FAILED(mJoyStick->GetCapabilities(&mDIJoyCaps)) )
+                OIS_EXCEPT( E_General, "Win32JoyStick::_enumerate >> Failed to get capabilities" );
+
+        // => Number of POVs
+        mPOVs = (short)mDIJoyCaps.dwPOVs;
+
+        // => Number of buttons and axes.
+        mState.mButtons.resize(mDIJoyCaps.dwButtons);
+        mState.mAxes.resize(mDIJoyCaps.dwAxes);
+
+        // Enumerate all Force Feedback effects (if any)
+        mJoyStick->EnumEffects(DIEnumEffectsCallback, this, DIEFT_ALL);
 
         //Reset the axis mapping enumeration value
         _AxisNumber = 0;
 
-        //Enumerate Force Feedback (if any)
-        mJoyStick->EnumEffects(DIEnumEffectsCallback, this, DIEFT_ALL);
-
-        //Enumerate and set axis constraints (and check FF Axes)
+        // Enumerate and set axis constraints (and check FF Axes)
         mJoyStick->EnumObjects(DIEnumDeviceObjectsCallback, this, DIDFT_AXIS);
 }
@@ -181 +188 @@
                 OIS_EXCEPT( E_General, "Win32JoyStick::_DIEnumDeviceObjectsCallback >> Failed to set min/max range property" );
 
-        //Check if FF Axes
+        //Check if FF Axes, and if so, increment counter
         if((lpddoi->dwFlags & DIDOI_FFACTUATOR) != 0 )
         {
                 if( _this->ff_device )
                 {
-                        //todo - increment force feedback axis count
+                        _this->ff_device->_addFFAxis();
                 }
         }
 
+        //Force the flags for gain and auto-center support to true,
+        //as DInput has no API to query the device for these capabilities
+        //(the only way to know is to try them ...)
+        if( _this->ff_device )
+        {
+            _this->ff_device->_setGainSupport(true);
+            _this->ff_device->_setAutoCenterSupport(true);
+        }
+
         return DIENUM_CONTINUE;
 }
@@ -198 +214 @@
         Win32JoyStick* _this = (Win32JoyStick*)pvRef;
 
-        //Create the FF class after we know there is at least one effect type
+        //Create the FF instance only after we know there is at least one effect type
         if( _this->ff_device == 0 )
-                _this->ff_device = new Win32ForceFeedback(_this->mJoyStick);
+          _this->ff_device = new Win32ForceFeedback(_this->mJoyStick, &_this->mDIJoyCaps);
 
         _this->ff_device->_addEffectSupport( pdei );