ryujinx-backup/Opentk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Input] Renamed GamePadMap to GamePadConfiguration

Browse source
This commit is contained in:
thefiddler 2014-01-02 01:38:12 +01:00
parent dc1ffab78d
commit fb57a9062d
4 changed files with 162 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

184
Source/OpenTK/Input/GamePadMap.cs → Source/OpenTK/Input/GamePadConfiguration.cs
View file

@ -34,138 +34,90 @@ using System.Text;
namespace OpenTK.Input namespace OpenTK.Input
{ {
enum MapType class GamePadConfiguration
{ {
Unmapped = 0, static readonly GamePadConfiguration default_map;
Axis,
Button
}
class MapItem
{
MapType map_type;
Nullable<JoystickButton> map_button;
Nullable<JoystickAxis> map_axis;
public MapItem()
{
}
public MapItem(JoystickAxis axis)
{
Type = MapType.Axis;
Axis = axis;
}
public MapItem(JoystickButton button)
{
Type = MapType.Button;
Button = button;
}
public MapType Type
{
get { return map_type; }
private set { map_type = value; }
}
public Nullable<JoystickAxis> Axis
{
get { return map_axis; }
private set { map_axis = value; }
}
public Nullable<JoystickButton> Button
{
get { return map_button; }
private set { map_button = value; }
}
}
class GamePadMap
{
static readonly GamePadMap default_map;
Guid guid; Guid guid;
string name; string name;
MapItem a, b, x, y; GamePadConfigurationItem a, b, x, y;
MapItem lshoulder, rshoulder; GamePadConfigurationItem lshoulder, rshoulder;
MapItem lstick, rstick; GamePadConfigurationItem lstick, rstick;
MapItem start, back; GamePadConfigurationItem start, back;
MapItem home; GamePadConfigurationItem home;
MapItem axis_lx, axis_ly; GamePadConfigurationItem axis_lx, axis_ly;
MapItem axis_rx, axis_ry; GamePadConfigurationItem axis_rx, axis_ry;
MapItem ltrigger, rtrigger; GamePadConfigurationItem ltrigger, rtrigger;
MapItem dpad_u, dpad_d; GamePadConfigurationItem dpad_u, dpad_d;
MapItem dpad_l, dpad_r; GamePadConfigurationItem dpad_l, dpad_r;
Guid Guid { get { return guid; } set { guid = value; } } Guid Guid { get { return guid; } set { guid = value; } }
public string Name { get { return name; } set { name = value; } } public string Name { get { return name; } set { name = value; } }
public MapItem A { get { return a; } set { a = value; } } public GamePadConfigurationItem A { get { return a; } set { a = value; } }
public MapItem B { get { return b; } set { b = value; } } public GamePadConfigurationItem B { get { return b; } set { b = value; } }
public MapItem X { get { return x; } set { x = value; } } public GamePadConfigurationItem X { get { return x; } set { x = value; } }
public MapItem Y { get { return y; } set { y = value; } } public GamePadConfigurationItem Y { get { return y; } set { y = value; } }
public MapItem LeftShoulder { get { return lshoulder; } set { lshoulder = value; } } public GamePadConfigurationItem LeftShoulder { get { return lshoulder; } set { lshoulder = value; } }
public MapItem RightShoulder { get { return rshoulder; } set { rshoulder = value; } } public GamePadConfigurationItem RightShoulder { get { return rshoulder; } set { rshoulder = value; } }
public MapItem LeftStick { get { return lstick; } set { lstick = value; } } public GamePadConfigurationItem LeftStick { get { return lstick; } set { lstick = value; } }
public MapItem RightStick { get { return rstick; } set { rstick = value; } } public GamePadConfigurationItem RightStick { get { return rstick; } set { rstick = value; } }
public MapItem Start { get { return start; } set { start = value; } } public GamePadConfigurationItem Start { get { return start; } set { start = value; } }
public MapItem Back { get { return back; } set { back = value; } } public GamePadConfigurationItem Back { get { return back; } set { back = value; } }
public MapItem BigButton { get { return home; } set { home = value; } } public GamePadConfigurationItem BigButton { get { return home; } set { home = value; } }
public MapItem LeftAxisX { get { return axis_lx; } set { axis_lx = value; } } public GamePadConfigurationItem LeftAxisX { get { return axis_lx; } set { axis_lx = value; } }
public MapItem LeftAxisY { get { return axis_ly; } set { axis_ly = value; } } public GamePadConfigurationItem LeftAxisY { get { return axis_ly; } set { axis_ly = value; } }
public MapItem RightAxisX { get { return axis_rx; } set { axis_rx = value; } } public GamePadConfigurationItem RightAxisX { get { return axis_rx; } set { axis_rx = value; } }
public MapItem RightAxisY { get { return axis_ry; } set { axis_ry = value; } } public GamePadConfigurationItem RightAxisY { get { return axis_ry; } set { axis_ry = value; } }
public MapItem LeftTrigger { get { return ltrigger; } set { ltrigger = value; } } public GamePadConfigurationItem LeftTrigger { get { return ltrigger; } set { ltrigger = value; } }
public MapItem RightTrigger { get { return rtrigger; } set { rtrigger = value; } } public GamePadConfigurationItem RightTrigger { get { return rtrigger; } set { rtrigger = value; } }
public MapItem DPadUp { get { return dpad_u; } set { dpad_u = value; } } public GamePadConfigurationItem DPadUp { get { return dpad_u; } set { dpad_u = value; } }
public MapItem DPadDown { get { return dpad_d; } set { dpad_d = value; } } public GamePadConfigurationItem DPadDown { get { return dpad_d; } set { dpad_d = value; } }
public MapItem DPadLeft { get { return dpad_l; } set { dpad_l = value; } } public GamePadConfigurationItem DPadLeft { get { return dpad_l; } set { dpad_l = value; } }
public MapItem DPadRight { get { return dpad_r; } set { dpad_r = value; } } public GamePadConfigurationItem DPadRight { get { return dpad_r; } set { dpad_r = value; } }
public GamePadMap() public GamePadConfiguration()
{ {
} }
public GamePadMap(string configuration) public GamePadConfiguration(string configuration)
{ {
} }
static GamePadMap() static GamePadConfiguration()
{ {
GamePadMap map = new GamePadMap(); GamePadConfiguration map = new GamePadConfiguration();
map.A = new MapItem(JoystickButton.Button0); map.A = new GamePadConfigurationItem(JoystickButton.Button0);
map.B = new MapItem(JoystickButton.Button1); map.B = new GamePadConfigurationItem(JoystickButton.Button1);
map.X = new MapItem(JoystickButton.Button2); map.X = new GamePadConfigurationItem(JoystickButton.Button2);
map.Y = new MapItem(JoystickButton.Button3); map.Y = new GamePadConfigurationItem(JoystickButton.Button3);
map.LeftShoulder = new MapItem(JoystickButton.Button4); map.LeftShoulder = new GamePadConfigurationItem(JoystickButton.Button4);
map.RightShoulder = new MapItem(JoystickButton.Button5); map.RightShoulder = new GamePadConfigurationItem(JoystickButton.Button5);
map.LeftStick = new MapItem(JoystickButton.Button6); map.LeftStick = new GamePadConfigurationItem(JoystickButton.Button6);
map.RightStick = new MapItem(JoystickButton.Button7); map.RightStick = new GamePadConfigurationItem(JoystickButton.Button7);
map.Start = new MapItem(JoystickButton.Button8); map.Start = new GamePadConfigurationItem(JoystickButton.Button8);
map.Back = new MapItem(JoystickButton.Button9); map.Back = new GamePadConfigurationItem(JoystickButton.Button9);
map.BigButton = new MapItem(JoystickButton.Button10); map.BigButton = new GamePadConfigurationItem(JoystickButton.Button10);
map.DPadUp = new MapItem(JoystickButton.Button11); map.DPadUp = new GamePadConfigurationItem(JoystickButton.Button11);
map.DPadDown = new MapItem(JoystickButton.Button12); map.DPadDown = new GamePadConfigurationItem(JoystickButton.Button12);
map.DPadLeft = new MapItem(JoystickButton.Button13); map.DPadLeft = new GamePadConfigurationItem(JoystickButton.Button13);
map.DPadRight = new MapItem(JoystickButton.Button14); map.DPadRight = new GamePadConfigurationItem(JoystickButton.Button14);
map.LeftAxisX = new MapItem(JoystickAxis.Axis0); map.LeftAxisX = new GamePadConfigurationItem(JoystickAxis.Axis0);
map.LeftAxisY = new MapItem(JoystickAxis.Axis1); map.LeftAxisY = new GamePadConfigurationItem(JoystickAxis.Axis1);
map.RightAxisX = new MapItem(JoystickAxis.Axis2); map.RightAxisX = new GamePadConfigurationItem(JoystickAxis.Axis2);
map.RightAxisY = new MapItem(JoystickAxis.Axis3); map.RightAxisY = new GamePadConfigurationItem(JoystickAxis.Axis3);
map.LeftTrigger = new MapItem(JoystickAxis.Axis4); map.LeftTrigger = new GamePadConfigurationItem(JoystickAxis.Axis4);
map.RightTrigger = new MapItem(JoystickAxis.Axis5); map.RightTrigger = new GamePadConfigurationItem(JoystickAxis.Axis5);
default_map = map; default_map = map;
} }
public static GamePadMap Default public static GamePadConfiguration Default
{ {
get { return default_map; } get { return default_map; }
} }
public static GamePadMap GetConfiguration(Guid guid) public static GamePadConfiguration GetConfiguration(Guid guid)
{ {
GamePadMap map = GamePadMap.Default; GamePadConfiguration map = GamePadConfiguration.Default;
if (GamePadConfigurationDatabase.Configurations.ContainsKey(guid)) if (GamePadConfigurationDatabase.Configurations.ContainsKey(guid))
{ {
map = ParseConfiguration(GamePadConfigurationDatabase.Configurations[guid]); map = ParseConfiguration(GamePadConfigurationDatabase.Configurations[guid]);
@ -176,7 +128,7 @@ namespace OpenTK.Input
// Parses a GamePad configuration string. The string // Parses a GamePad configuration string. The string
// follows the rules for SDL2 GameController, outlined here: // follows the rules for SDL2 GameController, outlined here:
// http://wiki.libsdl.org/SDL_GameControllerAddMapping // http://wiki.libsdl.org/SDL_GameControllerAddMapping
static GamePadMap ParseConfiguration(string configuration) static GamePadConfiguration ParseConfiguration(string configuration)
{ {
if (String.IsNullOrEmpty(configuration)) if (String.IsNullOrEmpty(configuration))
{ {
@ -194,13 +146,13 @@ namespace OpenTK.Input
throw new ArgumentException(); throw new ArgumentException();
} }
GamePadMap map = new GamePadMap(); GamePadConfiguration map = new GamePadConfiguration();
map.Guid = new Guid(items[0]); map.Guid = new Guid(items[0]);
map.Name = items[1]; map.Name = items[1];
for (int i = 2; i < items.Length; i++) for (int i = 2; i < items.Length; i++)
{ {
string[] config = items[i].Split(':'); string[] config = items[i].Split(':');
MapItem map_item = ParseItem(config[1]); GamePadConfigurationItem map_item = ParseItem(config[1]);
switch (config[0]) switch (config[0])
{ {
case "a": case "a":
@ -296,20 +248,20 @@ namespace OpenTK.Input
return map; return map;
} }
static MapItem ParseItem(string item) static GamePadConfigurationItem ParseItem(string item)
{ {
if (String.IsNullOrEmpty(item)) if (String.IsNullOrEmpty(item))
{ {
return new MapItem(); return new GamePadConfigurationItem();
} }
switch (item[0]) switch (item[0])
{ {
case 'a': case 'a':
return new MapItem(ParseAxis(item)); return new GamePadConfigurationItem(ParseAxis(item));
case 'b': case 'b':
return new MapItem(ParseButton(item)); return new GamePadConfigurationItem(ParseButton(item));
case 'h': case 'h':
throw new NotImplementedException(); throw new NotImplementedException();

81
Source/OpenTK/Input/GamePadConfigurationItem.cs Normal file
View file

@ -0,0 +1,81 @@
#region License
//
// GamePadConfigurationItem.cs
//
// Author:
// Stefanos A. <stapostol@gmail.com>
//
// Copyright (c) 2006-2014 Stefanos Apostolopoulos
//
// 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;
namespace OpenTK.Input
{
enum ConfigurationType
{
Unmapped = 0,
Axis,
Button
}
class GamePadConfigurationItem
{
ConfigurationType map_type;
Nullable<JoystickButton> map_button;
Nullable<JoystickAxis> map_axis;
public GamePadConfigurationItem()
{
}
public GamePadConfigurationItem(JoystickAxis axis)
{
Type = ConfigurationType.Axis;
Axis = axis;
}
public GamePadConfigurationItem(JoystickButton button)
{
Type = ConfigurationType.Button;
Button = button;
}
public ConfigurationType Type
{
get { return map_type; }
private set { map_type = value; }
}
public Nullable<JoystickAxis> Axis
{
get { return map_axis; }
private set { map_axis = value; }
}
public Nullable<JoystickButton> Button
{
get { return map_button; }
private set { map_button = value; }
}
}
}

3
Source/OpenTK/OpenTK.csproj
View file

@ -791,8 +791,9 @@
<Compile Include="Input\GamePadDPad.cs" /> <Compile Include="Input\GamePadDPad.cs" />
<Compile Include="Input\GamePadButtons.cs" /> <Compile Include="Input\GamePadButtons.cs" />
<Compile Include="Input\Buttons.cs" /> <Compile Include="Input\Buttons.cs" />
<Compile Include="Input\GamePadMap.cs" />
<Compile Include="Input\GamePadConfigurationDatabase.cs" /> <Compile Include="Input\GamePadConfigurationDatabase.cs" />
<Compile Include="Input\GamePadConfiguration.cs" />
<Compile Include="Input\GamePadConfigurationItem.cs" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>

22
Source/OpenTK/Platform/MappedGamePadDriver.cs
View file

@ -52,8 +52,8 @@ namespace OpenTK.Platform
/// </remarks> /// </remarks>
class MappedGamePadDriver : IGamePadDriver class MappedGamePadDriver : IGamePadDriver
{ {
readonly Dictionary<Guid, GamePadMap> configurations = readonly Dictionary<Guid, GamePadConfiguration> configurations =
new Dictionary<Guid, GamePadMap>(); new Dictionary<Guid, GamePadConfiguration>();
public GamePadState GetState(int index) public GamePadState GetState(int index)
{ {
@ -61,7 +61,7 @@ namespace OpenTK.Platform
GamePadState pad = new GamePadState(); GamePadState pad = new GamePadState();
if (joy.IsConnected) if (joy.IsConnected)
{ {
GamePadMap map = GetConfiguration(Joystick.GetGuid(index)); GamePadConfiguration map = GetConfiguration(Joystick.GetGuid(index));
// Todo: implement mapping // Todo: implement mapping
@ -75,7 +75,7 @@ namespace OpenTK.Platform
GamePadCapabilities pad; GamePadCapabilities pad;
if (joy.IsConnected) if (joy.IsConnected)
{ {
GamePadMap map = GetConfiguration(Joystick.GetGuid(index)); GamePadConfiguration map = GetConfiguration(Joystick.GetGuid(index));
pad = new GamePadCapabilities( pad = new GamePadCapabilities(
GamePadType.GamePad, // Todo: detect different types GamePadType.GamePad, // Todo: detect different types
TranslateAxes(map), TranslateAxes(map),
@ -95,7 +95,7 @@ namespace OpenTK.Platform
string name = String.Empty; string name = String.Empty;
if (joy.IsConnected) if (joy.IsConnected)
{ {
GamePadMap map = GetConfiguration(Joystick.GetGuid(index)); GamePadConfiguration map = GetConfiguration(Joystick.GetGuid(index));
name = map.Name; name = map.Name;
} }
return name; return name;
@ -103,22 +103,22 @@ namespace OpenTK.Platform
#region Private Members #region Private Members
GamePadMap GetConfiguration(Guid guid) GamePadConfiguration GetConfiguration(Guid guid)
{ {
if (!configurations.ContainsKey(guid)) if (!configurations.ContainsKey(guid))
{ {
GamePadMap map = GamePadMap.GetConfiguration(guid); GamePadConfiguration map = GamePadConfiguration.GetConfiguration(guid);
configurations.Add(guid, map); configurations.Add(guid, map);
} }
return configurations[guid]; return configurations[guid];
} }
bool IsMapped(MapItem item) bool IsMapped(GamePadConfigurationItem item)
{ {
return item.Type != MapType.Unmapped; return item.Type != ConfigurationType.Unmapped;
} }
GamePadAxes TranslateAxes(GamePadMap map) GamePadAxes TranslateAxes(GamePadConfiguration map)
{ {
GamePadAxes axes = 0; GamePadAxes axes = 0;
axes |= IsMapped(map.LeftAxisX) ? GamePadAxes.LeftX : 0; axes |= IsMapped(map.LeftAxisX) ? GamePadAxes.LeftX : 0;
@ -130,7 +130,7 @@ namespace OpenTK.Platform
return axes; return axes;
} }
Buttons TranslateButtons(GamePadMap map) Buttons TranslateButtons(GamePadConfiguration map)
{ {
Buttons buttons = 0; Buttons buttons = 0;
buttons |= IsMapped(map.A) ? Buttons.A : 0; buttons |= IsMapped(map.A) ? Buttons.A : 0;