backup/anx.framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Improve the XInput system

Browse Source
This commit is contained in:
SND\rene87_cp 2011-11-04 23:51:05 +00:00
parent 2f3ab2541f
commit 07b520f17b
10 changed files with 258 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ANX.Framework/ANX.Framework.csproj
View File

@ -272,6 +272,7 @@
<Compile Include="Net\NetworkSessionState.cs" />
<Compile Include="Net\NetworkSessionType.cs" />
<Compile Include="Net\SendDataOptions.cs" />
<Compile Include="NonXNA\InputSystem\IMouse.cs" />
<Compile Include="NonXNA\RenderSystem\EffectProcessorOutputFormat.cs" />
<Compile Include="NonXNA\ICreator.cs" />
<Compile Include="NonXNA\InputSystem\IGamePad.cs" />

55
ANX.Framework/Input/Keyboard.cs
View File

@ -1,7 +1,54 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
#region Using Statements
using System;
#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.Framework.Input
{

73
ANX.Framework/Input/Mouse.cs
View File

@ -1,20 +1,79 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
#region Using Statements
using System;
using ANX.Framework.NonXNA;
#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.Framework.Input
{
public static class Mouse
{
public static IntPtr WindowHandle { get; set; }
private static IMouse mouse;
static Mouse()
{
mouse = AddInSystemFactory.Instance.GetCurrentCreator<IInputSystemCreator>().Mouse;
}
public static IntPtr WindowHandle
{
get { return mouse.WindowHandle; }
set { mouse.WindowHandle = value; }
}
public static MouseState GetState()
{
throw new NotImplementedException();
return mouse.GetState();
}
public static void SetPosition(int x, int y)
{
throw new NotImplementedException();
mouse.SetPosition(x, y);
}
}
}

30
ANX.Framework/Input/MouseState.cs
View File

@ -52,8 +52,38 @@ using System;
namespace ANX.Framework.Input
{
[SerializableAttribute]
public struct MouseState
{
private int x;
private int y;
private int scrollWheel;
private ButtonState leftButton;
private ButtonState middleButton;
private ButtonState rightButton;
private ButtonState xButton1;
private ButtonState xButton2;
public MouseState (int x, int y, int scrollWheel,ButtonState leftButton,ButtonState middleButton,ButtonState rightButton,ButtonState xButton1,ButtonState xButton2)
{
this.x = x;
this.y = y;
this.scrollWheel = scrollWheel;
this.leftButton = leftButton;
this.middleButton = middleButton;
this.rightButton = rightButton;
this.xButton1 = xButton1;
this.xButton2 = xButton2;
}
public ButtonState LeftButton { get { return this.leftButton; } }
public ButtonState MiddleButton { get { return this.middleButton; } }
public ButtonState RightButton { get { return this.rightButton; } }
public ButtonState XButton1 { get { return this.xButton1; } }
public ButtonState XButton2 { get { return this.xButton2; } }
public int ScrollWheelValue { get { return this.scrollWheel; } }
public int X { get { return this.x; } }
public int Y { get { return this.y; } }
}
}

1
ANX.Framework/NonXNA/InputSystem/IInputSystemCreator.cs
View File

@ -59,5 +59,6 @@ namespace ANX.Framework.NonXNA
public interface IInputSystemCreator : ICreator
{
IGamePad GamePad { get; }
IMouse Mouse { get; }
}
}

64
ANX.Framework/NonXNA/InputSystem/IMouse.cs Normal file
View File

@ -0,0 +1,64 @@
#region Using Statements
using System;
using System.IO;
using ANX.Framework.NonXNA;
using ANX.Framework.Input;
#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.Framework.NonXNA
{
public interface IMouse
{
IntPtr WindowHandle { get; set; }
MouseState GetState();
void SetPosition(int x, int y);
}
}

3
ANX.InputSystem.Windows.XInput/ANX.InputSystem.Windows.XInput.csproj
View File

@ -47,8 +47,9 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Creator.cs" />
<Compile Include="Mouse.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="XInput.cs" />
<Compile Include="GamePad.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ANX.Framework\ANX.Framework.csproj">

8
ANX.InputSystem.Windows.XInput/Creator.cs
View File

@ -67,12 +67,18 @@ namespace ANX.InputSystem.Windows.XInput
public IGamePad GamePad
{
get { return new XInput(); }
get { return new GamePad(); }
}
public void RegisterCreator(AddInSystemFactory factory)
{
factory.AddCreator(this);
}
public IMouse Mouse
{
get { return new Mouse(); }
}
}
}

4
ANX.InputSystem.Windows.XInput/XInput.cs → ANX.InputSystem.Windows.XInput/GamePad.cs
View File

@ -61,11 +61,11 @@ using SharpDX.XInput;
namespace ANX.InputSystem.Windows.XInput
{
public class XInput : IGamePad
public class GamePad : IGamePad
{
private Controller[] controller;
public XInput()
public GamePad()
{
controller = new Controller[4];
controller[0] = new Controller(UserIndex.One);

34
ANX.InputSystem.Windows.XInput/Mouse.cs Normal file
View File

@ -0,0 +1,34 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using ANX.Framework.NonXNA;
using ANX.Framework.Input;
namespace ANX.InputSystem.Windows.XInput
{
class Mouse:IMouse
{
public IntPtr WindowHandle
{
get
{
throw new NotImplementedException();
}
set
{
throw new NotImplementedException();
}
}
public MouseState GetState()
{
throw new NotImplementedException();
}
public void SetPosition(int x, int y)
{
throw new NotImplementedException();
}
}
}