Get number of axes.

Should fix the autocenter issue.
libsdl-org · Aug 5, 2008 · 3501a8a · 3501a8a
1 parent 4e2d98a
commit 3501a8a
Showing 1 changed file with 33 additions and 0 deletions.
diff --git a/src/haptic/win32/SDL_syshaptic.c b/src/haptic/win32/SDL_syshaptic.c
@@ -223,6 +223,28 @@ DI_EffectCallback(LPCDIEFFECTINFO pei, LPVOID pv)
 }
 
 
+/*
+ * Callback to get supported axes.
+ */
+static BOOL CALLBACK
+DI_DeviceObjectCallback(LPCDIDEVICEOBJECTINSTANCE dev, LPVOID pvRef)
+{
+   SDL_Haptic *haptic = (SDL_Hapti *) pvRef;
+
+   if (dev->dwType & DIDFT_AXIS) {
+
+      haptic->naxes++;
+
+      /* Currently using the artificial limit of 3 axes. */
+      if (haptic->naxes >= 3) {
+         return DIENUM_STOP;
+      }
+   }
+
+   return DIENUM_CONTINUE;
+}
+
+
 /*
  * Opens the haptic device from the file descriptor.
  *
@@ -299,6 +321,15 @@ SDL_SYS_HapticOpenFromInstance(SDL_Haptic * haptic, DIDEVICEINSTANCE instance)
    }
 #endif
 
+   /* Get number of axes. */
+   ret = IDirectInputDevice2_EnumObjects( haptic->hwdata->device,
+                                          DI_DeviceObjectCallback,
+                                          haptic, DIDFT_AXIS );
+   if (FAILED(ret)) {
+      DI_SetError("Getting device axes",ret);
+      goto query_err;
+   }
+
    /* Acquire the device. */
    ret = IDirectInputDevice2_Acquire(haptic->hwdata->device);
    if (FAILED(ret)) {
@@ -352,6 +383,8 @@ SDL_SYS_HapticOpenFromInstance(SDL_Haptic * haptic, DIDEVICEINSTANCE instance)
    else { /* Gain is supported. */
       haptic->supported |= SDL_HAPTIC_GAIN;
    }
+   dipdw.diph.dwObj        = 0;
+   dipdw.diph.dwHow        = DIPH_DEVICE;
    dipdw.dwData            = DIPROPAUTOCENTER_OFF;
    ret = IDirectInputDevice2_SetProperty( haptic->hwdata->device,
                                           DIPROP_AUTOCENTER, &dipdw.diph );