Changeset 5695 for code/trunk/src/ois/win32/Win32ForceFeedback.h

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/Win32ForceFeedback.h (modified) (4 diffs)

code/trunk/src/ois/win32/Win32ForceFeedback.h

@@ -34 +34 @@
                 Win32ForceFeedback() {}
         public:
-                Win32ForceFeedback(IDirectInputDevice8* joy);
+                Win32ForceFeedback(IDirectInputDevice8* pDIJoy, const DIDEVCAPS* pDIJoyCaps);
                 ~Win32ForceFeedback();
 
@@ -52 +52 @@
                 void setAutoCenterMode( bool auto_on );
 
-                /** @copydoc ForceFeedback::getFFAxesNumber 
-                        xxx todo - Actually return correct number
-                */
-                short getFFAxesNumber() {return 1;}
+                /** @copydoc ForceFeedback::getFFAxesNumber */
+                short getFFAxesNumber();
+
+                /** @copydoc ForceFeedback::getFFMemoryLoad */
+                unsigned short getFFMemoryLoad();
 
                 /**
@@ -64 +65 @@
                 void _addEffectSupport( LPCDIEFFECTINFO pdei );
 
+                /**
+                        @remarks
+                        Internal use.. Used during axis enumeration to get number of FF axes
+                        support effects.
+                */
+                void _addFFAxis();
+
         protected:
+
                 //Specific Effect Settings
                 void _updateConstantEffect( const Effect* effect );
@@ -71 +80 @@
                 void _updateConditionalEffect( const Effect* effect );
                 void _updateCustomEffect( const Effect* effect );
+
                 //Sets the common properties to all effects
                 void _setCommonProperties( DIEFFECT* diEffect, DWORD* rgdwAxes,
-                                                                        LONG* rglDirection, DWORD struct_size, 
-                                                                        LPVOID struct_type, const Effect* effect );
+                                                                        LONG* rglDirection, DIENVELOPE* diEnvelope, DWORD struct_size, 
+                                                                        LPVOID struct_type, const Effect* effect, const Envelope* envelope );
                 //Actually do the upload
                 void _upload( GUID, DIEFFECT*, const Effect* );
 
+                // Map of currently uploaded effects (handle => effect)
                 typedef std::map<int,LPDIRECTINPUTEFFECT> EffectList;
                 EffectList mEffectList;
-                //Simple unique handle creation - allows for upto 2+ million effects
+
+                //Simple unique handle creation - allows for upto 2+ billion effects
                 //during the lifetime of application. Hopefully, that is enough.
                 int mHandles;
 
+                // Joystick device descriptor.
                 IDirectInputDevice8* mJoyStick;
+                
+                // Joystick capabilities.
+                const DIDEVCAPS* mpDIJoyCaps;
+
+                // Number of axis supporting FF.
+                short mFFAxes;
         };
 }