From 2c30d8ff7e99ccd60b592f2a8029910921531f5c Mon Sep 17 00:00:00 2001 From: "SND\\rene87_cp" Date: Mon, 14 Nov 2011 16:19:58 +0000 Subject: [PATCH] add XInput Keyboard --- ANX.Framework/Input/Keyboard.cs | 14 +++- ANX.Framework/NonXNA/InputSystem/IKeyboard.cs | 3 + .../ANX.InputSystem.Windows.XInput.csproj | 1 + ANX.InputSystem.Windows.XInput/Creator.cs | 2 +- ANX.InputSystem.Windows.XInput/Keyboard.cs | 73 +++++++++++++++++++ 5 files changed, 89 insertions(+), 4 deletions(-) create mode 100644 ANX.InputSystem.Windows.XInput/Keyboard.cs diff --git a/ANX.Framework/Input/Keyboard.cs b/ANX.Framework/Input/Keyboard.cs index cf73700f..3d96f331 100644 --- a/ANX.Framework/Input/Keyboard.cs +++ b/ANX.Framework/Input/Keyboard.cs @@ -1,5 +1,6 @@ #region Using Statements using System; +using ANX.Framework.NonXNA; #endregion // Using Statements @@ -54,13 +55,20 @@ namespace ANX.Framework.Input { public static class Keyboard { + private static IKeyboard keyboard; + + static Keyboard() + { + keyboard = AddInSystemFactory.Instance.GetDefaultCreator().Keyboard; + } + public static KeyboardState GetState() - { - throw new NotImplementedException(); + { + return keyboard.GetState(); } public static KeyboardState GetState (PlayerIndex playerIndex) { - throw new NotImplementedException(); + return keyboard.GetState(playerIndex); } } diff --git a/ANX.Framework/NonXNA/InputSystem/IKeyboard.cs b/ANX.Framework/NonXNA/InputSystem/IKeyboard.cs index 4f446ecf..50225e96 100644 --- a/ANX.Framework/NonXNA/InputSystem/IKeyboard.cs +++ b/ANX.Framework/NonXNA/InputSystem/IKeyboard.cs @@ -2,10 +2,13 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using ANX.Framework.Input; namespace ANX.Framework.NonXNA { public interface IKeyboard { + KeyboardState GetState(); + KeyboardState GetState(PlayerIndex playerIndex); } } diff --git a/ANX.InputSystem.Windows.XInput/ANX.InputSystem.Windows.XInput.csproj b/ANX.InputSystem.Windows.XInput/ANX.InputSystem.Windows.XInput.csproj index a996d95d..d1300ae5 100644 --- a/ANX.InputSystem.Windows.XInput/ANX.InputSystem.Windows.XInput.csproj +++ b/ANX.InputSystem.Windows.XInput/ANX.InputSystem.Windows.XInput.csproj @@ -51,6 +51,7 @@ + diff --git a/ANX.InputSystem.Windows.XInput/Creator.cs b/ANX.InputSystem.Windows.XInput/Creator.cs index bd495050..a7b6db3d 100644 --- a/ANX.InputSystem.Windows.XInput/Creator.cs +++ b/ANX.InputSystem.Windows.XInput/Creator.cs @@ -92,7 +92,7 @@ namespace ANX.InputSystem.Windows.XInput public IKeyboard Keyboard { - get { throw new NotImplementedException(); } + get { return new Keyboard(); } } #endregion diff --git a/ANX.InputSystem.Windows.XInput/Keyboard.cs b/ANX.InputSystem.Windows.XInput/Keyboard.cs new file mode 100644 index 00000000..954173be --- /dev/null +++ b/ANX.InputSystem.Windows.XInput/Keyboard.cs @@ -0,0 +1,73 @@ +#region Using Statements +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using ANX.InputSystem; +using ANX.Framework.NonXNA; +using SharpDX.DirectInput; +using DXKeyboard=SharpDX.DirectInput.Keyboard; +#endregion // Using Statements + +#region License + +// +// This file is part of the ANX.Framework created by the "ANX.Framework developer group". +// +// This file is released under the Ms-PL license. +// +// +// +// Microsoft Public License (Ms-PL) +// +// This license governs use of the accompanying software. If you use the software, you accept this license. +// If you do not accept the license, do not use the software. +// +// 1.Definitions +// The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning +// here as under U.S. copyright law. +// A "contribution" is the original software, or any additions or changes to the software. +// A "contributor" is any person that distributes its contribution under this license. +// "Licensed patents" are a contributor's patent claims that read directly on its contribution. +// +// 2.Grant of Rights +// (A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations +// in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to +// reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution +// or any derivative works that you create. +// (B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in +// section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed +// patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution +// in the software or derivative works of the contribution in the software. +// +// 3.Conditions and Limitations +// (A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks. +// (B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your +// patent license from such contributor to the software ends automatically. +// (C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution +// notices that are present in the software. +// (D) If you distribute any portion of the software in source code form, you may do so only under this license by including +// a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or +// object code form, you may only do so under a license that complies with this license. +// (E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees, +// or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the +// extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a +// particular purpose and non-infringement. + +#endregion // License +namespace ANX.InputSystem.Windows.XInput +{ + public class Keyboard:IKeyboard + { + private DXKeyboard keyboroard; + public Framework.Input.KeyboardState GetState() + { + throw new NotImplementedException(); + } + + public Framework.Input.KeyboardState GetState(Framework.PlayerIndex playerIndex) + { + throw new NotImplementedException(); + } + } +}