Added in support for rotation.

Author: collielimabean

JoystickLibrary/JoystickLibrary.csproj

@@ -31,9 +31,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BadgerJaus">
-      <HintPath>..\..\BadgerJaus\BadgerJaus\bin\Debug\BadgerJaus.dll</HintPath>
-    </Reference>
     <Reference Include="SlimDX, Version=4.0.13.43, Culture=neutral, PublicKeyToken=b1b0c32fd1ffe4f9, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\SlimDX.dll</HintPath>

JoystickLibrary/JoystickQueryThread.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 using SlimDX;
 using SlimDX.DirectInput;
 
@@ -15,34 +13,28 @@ public class JoystickQueryThread : IDisposable
         private const int CENTER_VALUE = 32767;
         private const float ANGLE_RATIO = 0.0054933317056795f;
         private const float VELOCITY_RATIO = 0.0030518509475997f;
+        private const float ROTATION_RATIO = 0.0030518509475997f;
 
         private DirectInput directInputHandle;
         private Joystick joystick;
         private long angle;
         private long velocity;
-        private bool[] dPad;
+        private long rotation;
 
         public JoystickQueryThread()
         {
             angle = 0;
             velocity = 0;
-
-            
+            rotation = 0;
         }
 
-        /* REMOVE AFTER TESTING
-        public Joystick Joystick
-        {
-            get { return joystick; }
-        }
-        */
         public bool InitializeJoystick()
         {
             directInputHandle = new DirectInput();
             IList<DeviceInstance> devicelist = directInputHandle.GetDevices();
 
             DeviceInstance joystickinstance = null;
-            for (int i = 0; i < devicelist.Count; i++) //Traverse through all the lists and find the joystick to enumerate
+            for (int i = 0; i < devicelist.Count; i++) // Traverse through all the lists and find the joystick to enumerate
             {
                 DeviceInstance dinstance = devicelist.ElementAt(i);
                 if (dinstance.Type == DeviceType.Joystick || dinstance.Type == DeviceType.Gamepad)
@@ -57,8 +49,8 @@ public bool InitializeJoystick()
                 return false;
             }
 
-            joystick = new Joystick(directInputHandle, joystickinstance.ProductGuid); //Create a joystick object to interface with 
-            Result acquire = joystick.Acquire(); //Pull all data from it 
+            joystick = new Joystick(directInputHandle, joystickinstance.ProductGuid); // Create a joystick object to interface with 
+            Result acquire = joystick.Acquire(); // Pull all data from it 
 
             if (acquire.IsFailure)
             {
@@ -75,14 +67,16 @@ public void QueryJoystick()
             long yVelocity;
             long angleValue;
             long velocityValue;
+            long zRotation;
+            long rotationValue;
 
             while (true)
             {
                 if (joystick == null)
                 {
                     if (!InitializeJoystick())
                     {
-                        System.Threading.Thread.Sleep(1000);
+                        Thread.Sleep(1000);
                         continue;
                     }
                 }
@@ -97,8 +91,10 @@ public void QueryJoystick()
                 yVelocity = joystickstate.Y;
                 angleValue = xAngle - CENTER_VALUE;
                 velocityValue = CENTER_VALUE - yVelocity;
+                zRotation = joystickstate.RotationZ;
+                rotationValue = CENTER_VALUE - zRotation;
 
-
+                // account for dead zone: angle
                 if (Math.Abs(angleValue) < 4000)
                 {
                     Angle = 0;
@@ -108,6 +104,7 @@ public void QueryJoystick()
                     Angle = (long)(angleValue * ANGLE_RATIO);
                 }
 
+                // account for dead zone: velocity
                 if (Math.Abs(velocityValue) < 3000)
                 {
                     Velocity = 0;
@@ -116,6 +113,16 @@ public void QueryJoystick()
                 {
                     Velocity = (long)(velocityValue * VELOCITY_RATIO);
                 }
+
+                // account for dead zone: rotation
+                if (Math.Abs(rotationValue) < 3000)
+                {
+                    Rotation = 0;
+                }
+                else
+                {
+                    Rotation = (long)(rotationValue * ROTATION_RATIO);
+                }
             }
         }
 
@@ -125,7 +132,6 @@ public long Angle
             {
                 return Interlocked.Read(ref angle);
             }
-
             set
             {
                 Interlocked.Exchange(ref angle, value);
@@ -144,6 +150,18 @@ public long Velocity
             }
         }
 
+        public long Rotation
+        {
+            get
+            {
+                return Interlocked.Read(ref rotation);
+            }
+            set
+            {
+                Interlocked.Exchange(ref rotation, value);
+            }
+        }
+
         public void Dispose()
         {
             directInputHandle.Dispose();