Initial implementation of IJoystickDriver API

Source/OpenTK/OpenTK.csproj

@@ -791,7 +791,6 @@
     <Compile Include="Platform\SDL2\Sdl2GraphicsContext.cs" />
     <Compile Include="Platform\SDL2\Sdl2GraphicsMode.cs" />
     <Compile Include="Platform\SDL2\Sdl2InputDriver.cs" />
-    <Compile Include="Platform\SDL2\Sdl2Joystick.cs" />
     <Compile Include="Platform\SDL2\Sdl2KeyMap.cs" />
     <Compile Include="Platform\SDL2\Sdl2Keyboard.cs" />
     <Compile Include="Platform\SDL2\Sdl2Mouse.cs" />
@@ -800,6 +799,7 @@
     <Compile Include="Platform\MacOS\Cgl.cs" />
     <Compile Include="Platform\SDL2\Sdl2.cs" />
     <Compile Include="Platform\Egl\EglSdl2PlatformFactory.cs" />
+    <Compile Include="Platform\SDL2\Sdl2JoystickDriver.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

Source/OpenTK/Platform/SDL2/Sdl2Joystick.cs

@@ -1,76 +0,0 @@
-#region License
-//
-// The Open Toolkit Library License
-//
-// Copyright (c) 2006 - 2013 Stefanos Apostolopoulos for the Open Toolkit library.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights to 
-// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-// the Software, and to permit persons to whom the Software is furnished to do
-// so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-//
-#endregion
-
-using System;
-using System.Collections.Generic;
-using OpenTK.Input;
-
-namespace OpenTK.Platform.SDL2
-{
-    class Sdl2Joystick : IJoystickDriver, IGamePadDriver
-    {
-        readonly List<JoystickDevice> joysticks = new List<JoystickDevice>();
-        IList<JoystickDevice> joysticks_readonly;
-
-        public Sdl2Joystick()
-        {
-            joysticks_readonly = joysticks.AsReadOnly();
-        }
-
-        #region IJoystickDriver Members
-
-        public IList<JoystickDevice> Joysticks
-        {
-            get
-            {
-                return joysticks_readonly;
-            }
-        }
-
-        #endregion
-
-        #region IGamePadDriver Members
-
-        public GamePadState GetState()
-        {
-            throw new NotImplementedException();
-        }
-
-        public GamePadState GetState(int index)
-        {
-            throw new NotImplementedException();
-        }
-
-        public string GetDeviceName(int index)
-        {
-            throw new NotImplementedException();
-        }
-
-        #endregion
-    }
-}
-

Source/OpenTK/Platform/SDL2/Sdl2JoystickDriver.cs

@@ -0,0 +1,137 @@
+#region License
+//
+// The Open Toolkit Library License
+//
+// Copyright (c) 2006 - 2013 Stefanos Apostolopoulos for the Open Toolkit library.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to 
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do
+// so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+//
+#endregion
+
+using System;
+using System.Collections.Generic;
+using OpenTK.Input;
+
+namespace OpenTK.Platform.SDL2
+{
+    using Sdl2Joystick = JoystickDevice<Sdl2JoystickDetails>;
+
+    class Sdl2JoystickDetails
+    {
+        public IntPtr Handle { get; set; }
+        public float RangeMultiplier { get { return 1.0f / 32768.0f; } }
+    }
+
+    class Sdl2JoystickDriver : IJoystickDriver, IGamePadDriver
+    {
+        readonly List<Sdl2Joystick> joysticks = new List<Sdl2Joystick>();
+        IList<JoystickDevice> joysticks_readonly;
+
+        public Sdl2JoystickDriver()
+        {
+            joysticks_readonly = (IList<JoystickDevice>)joysticks.AsReadOnly();
+
+        }
+
+        #region Private Members
+
+        void RefreshJoysticks()
+        {
+            joysticks.Clear();
+
+            int count = SDL.SDL_NumJoysticks();
+            for (int i = 0; i < count; i++)
+            {
+                JoystickDevice<Sdl2JoystickDetails> joystick = null;
+                int num_axes = 0;
+                int num_buttons = 0;
+                IntPtr handle = SDL.SDL_JoystickOpen(i);
+                if (handle != IntPtr.Zero)
+                {
+                    num_axes = SDL.SDL_JoystickNumAxes(handle);
+                    num_buttons = SDL.SDL_JoystickNumButtons(handle);
+                    joystick = new JoystickDevice<Sdl2JoystickDetails>(i, num_axes, num_buttons);
+                    joysticks.Add(joystick);
+                }
+            }
+
+        }
+
+        #endregion
+
+        #region IJoystickDriver Members
+
+        public IList<JoystickDevice> Joysticks
+        {
+            get
+            {
+                return joysticks_readonly;
+            }
+        }
+
+        public void Poll()
+        {
+            SDL.SDL_JoystickUpdate();
+            foreach (Sdl2Joystick joystick in joysticks)
+            {
+                IntPtr handle = joystick.Details.Handle;
+                
+                for (int i = 0; i < joystick.Axis.Count; i++)
+                {
+                    var axis = JoystickAxis.Axis0 + i;
+                    joystick.SetAxis(axis, SDL.SDL_JoystickGetAxis(handle, i) * joystick.Details.RangeMultiplier);
+                }
+
+                for (int i = 0; i < joystick.Button.Count; i++)
+                {
+                    var button = JoystickButton.Button0 + i;
+                    joystick.SetButton(button, SDL.SDL_JoystickGetButton(handle, i) != 0);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IGamePadDriver Members
+
+        public GamePadState GetState()
+        {
+            return new GamePadState();
+        }
+
+        public GamePadState GetState(int index)
+        {
+            if (joysticks.Count >= index)
+            {
+
+            }
+
+            return new GamePadState();
+        }
+
+        public string GetDeviceName(int index)
+        {
+            return String.Empty;
+        }
+
+        #endregion
+    }
+}
+