Changeset 5668 for code/branches/resource2/src/ois/OISForceFeedback.cpp

Timestamp:

Aug 22, 2009, 11:16:34 PM (15 years ago)

Author:

rgrieder

Message:

Updated OIS library (still 1.2, but CVS version).
There have been some little fixes and support for force feedback on Linux (but this doesn't concern us for now…)

File:

• code/branches/resource2/src/ois/OISForceFeedback.cpp (modified) (1 diff)

code/branches/resource2/src/ois/OISForceFeedback.cpp

@@ -27 +27 @@
 
 //-------------------------------------------------------------//
-void ForceFeedback::_addEffectTypes( Effect::EForce force, Effect::EType type )
+ForceFeedback::ForceFeedback() : mSetGainSupport(false), mSetAutoCenterSupport(false)
 {
-        if( force == Effect::UnknownForce || type == Effect::Unknown )
-                OIS_EXCEPT( E_General, "Unknown Force||Type was added too effect list..." );
-
-        mSupportedEffects[force] = type;
 }
 
 //-------------------------------------------------------------//
-const ForceFeedback::SupportedEffectList& 
-                                                ForceFeedback::getSupportedEffects() const
+void ForceFeedback::_addEffectTypes( Effect::EForce force, Effect::EType type )
+{
+        if( force <= Effect::UnknownForce || force >= Effect::_ForcesNumber
+                || type <= Effect::Unknown || type >= Effect::_TypesNumber )
+                OIS_EXCEPT( E_General, "Can't add unknown effect Force/Type to the supported list" );
+
+        mSupportedEffects.insert(std::pair<Effect::EForce, Effect::EType>(force, type));
+}
+
+//-------------------------------------------------------------//
+void ForceFeedback::_setGainSupport( bool on )
+{
+        mSetGainSupport = on;
+}
+
+//-------------------------------------------------------------//
+void ForceFeedback::_setAutoCenterSupport( bool on )
+{
+        mSetAutoCenterSupport = on;
+}
+
+//-------------------------------------------------------------//
+const ForceFeedback::SupportedEffectList& ForceFeedback::getSupportedEffects() const
 {
         return mSupportedEffects;
 }
+
+//-------------------------------------------------------------//
+bool ForceFeedback::supportsEffect(Effect::EForce force, Effect::EType type) const
+{
+    const std::pair<SupportedEffectList::const_iterator, SupportedEffectList::const_iterator> 
+            iterRange = mSupportedEffects.equal_range(force);
+        SupportedEffectList::const_iterator iter;
+        for (iter = iterRange.first; iter != iterRange.second; iter++)
+        {
+          if ((*iter).second == type)
+                return true;
+        }
+
+        return false;
+}