Mercurial > sdl-ios-xcode

changeset 2525:1fb3fba13a2c gsoc2008_force_feedback

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added third axis to condition effects.
author Edgar Simo <bobbens@gmail.com>
date Thu, 17 Jul 2008 16:08:46 +0000
parents 1a55848ce198
children 2d88b82ce781
files include/SDL_haptic.h
diffstat 1 files changed, 12 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/include/SDL_haptic.h	Thu Jul 17 16:07:20 2008 +0000
+++ b/include/SDL_haptic.h	Thu Jul 17 16:08:46 2008 +0000
@@ -508,11 +508,12 @@
  *   - SDL_HAPTIC_FRICTION: Effect based on axes movement.
  *
  * Direction is handled by condition internals instead of a direction member.
- *  The condition effect specific members have two parameters.  The first
- *  refers to the X axis, the second refers to the Y axis.  The right terms
- *  refer to the positive side of the axis and the left terms refer to the
- *  negative side of the axis.  Please refer to the SDL_HapticDirection 
- *  diagram for which side is positive and which is negative.
+ *  The condition effect specific members have three parameters.  The first
+ *  refers to the X axis, the second refers to the Y axis and the third
+ *  refers to the Z axis.  The right terms refer to the positive side of the
+ *  axis and the left terms refer to the negative side of the axis.  Please 
+ *  refer to the SDL_HapticDirection  diagram for which side is positive and
+ *  which is negative.
  *
  * \sa SDL_HapticDirection
  * \sa SDL_HAPTIC_SPRING
@@ -536,12 +537,12 @@
    Uint16 interval; /**< How soon it can be triggered again after button. */
 
    /* Condition */
-   Uint16 right_sat[2]; /**< Level when joystick is to the positive side. */
-   Uint16 left_sat[2]; /**< Level when joystick is to the negative side. */
-   Sint16 right_coeff[2]; /**< How fast to increase the force towards the positive side. */
-   Sint16 left_coeff[2]; /**< How fast to increase the force towards the negative side. */
-   Uint16 deadband[2]; /**< Size of the dead zone. */
-   Sint16 center[2]; /**< Position of the dead zone. */
+   Uint16 right_sat[3]; /**< Level when joystick is to the positive side. */
+   Uint16 left_sat[3]; /**< Level when joystick is to the negative side. */
+   Sint16 right_coeff[3]; /**< How fast to increase the force towards the positive side. */
+   Sint16 left_coeff[3]; /**< How fast to increase the force towards the negative side. */
+   Uint16 deadband[3]; /**< Size of the dead zone. */
+   Sint16 center[3]; /**< Position of the dead zone. */
 } SDL_HapticCondition;
 /**
  * \struct SDL_HapticRamp