ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use enum to represent button images in Virtual Pads schemata

This commit is contained in:
YoshiRulz 2020-12-22 15:35:26 +10:00
parent 50b17096e1
commit 0ff60220f7
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
9 changed files with 122 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs
View File

@ -11,6 +11,38 @@ namespace BizHawk.Client.EmuHawk
{
public partial class VirtualPad : UserControl
{
private static readonly IReadOnlyDictionary<VGamepadButtonImage, Bitmap> _buttonImages = new Dictionary<VGamepadButtonImage, Bitmap>
{
[VGamepadButtonImage.BlueArrE] = Properties.Resources.Forward,
[VGamepadButtonImage.BlueArrENE] = Properties.Resources.ENE,
[VGamepadButtonImage.BlueArrESE] = Properties.Resources.ESE,
[VGamepadButtonImage.BlueArrN] = Properties.Resources.BlueUp,
[VGamepadButtonImage.BlueArrNE] = Properties.Resources.NE,
[VGamepadButtonImage.BlueArrNNE] = Properties.Resources.NNE,
[VGamepadButtonImage.BlueArrNNW] = Properties.Resources.NNW,
[VGamepadButtonImage.BlueArrNW] = Properties.Resources.NW,
[VGamepadButtonImage.BlueArrS] = Properties.Resources.BlueDown,
[VGamepadButtonImage.BlueArrSE] = Properties.Resources.SE,
[VGamepadButtonImage.BlueArrSSE] = Properties.Resources.SSE,
[VGamepadButtonImage.BlueArrSSW] = Properties.Resources.SSW,
[VGamepadButtonImage.BlueArrSW] = Properties.Resources.SW,
[VGamepadButtonImage.BlueArrW] = Properties.Resources.Back,
[VGamepadButtonImage.BlueArrWNW] = Properties.Resources.WNW,
[VGamepadButtonImage.BlueArrWSW] = Properties.Resources.WSW,
[VGamepadButtonImage.C64Symbol] = Properties.Resources.C64Symbol,
[VGamepadButtonImage.Circle] = Properties.Resources.Circle,
[VGamepadButtonImage.Cross] = Properties.Resources.Cross,
[VGamepadButtonImage.Play] = Properties.Resources.Play,
[VGamepadButtonImage.SkipBack] = Properties.Resources.BackMore,
[VGamepadButtonImage.Square] = Properties.Resources.Square,
[VGamepadButtonImage.Stop] = Properties.Resources.Stop,
[VGamepadButtonImage.Triangle] = Properties.Resources.Triangle,
[VGamepadButtonImage.YellowArrE] = Properties.Resources.YellowRight,
[VGamepadButtonImage.YellowArrN] = Properties.Resources.YellowUp,
[VGamepadButtonImage.YellowArrS] = Properties.Resources.YellowDown,
[VGamepadButtonImage.YellowArrW] = Properties.Resources.YellowLeft,
};
private readonly PadSchema _schema;
private readonly InputManager _inputManager;
private bool _readOnly;
@ -53,19 +85,20 @@ namespace BizHawk.Client.EmuHawk
{
static VirtualPadButton GenVirtualPadButton(InputManager inputManager, ButtonSchema button)
{
var icon = button.Icon == null ? null : _buttonImages[button.Icon.Value];
var buttonControl = new VirtualPadButton
{
InputManager = inputManager,
Name = button.Name,
Text = button.Icon != null ? null : button.DisplayName,
Text = icon != null ? null : button.DisplayName,
Location = UIHelper.Scale(button.Location),
Image = button.Icon
Image = icon
};
if (button.Icon != null && UIHelper.AutoScaleFactorX > 1F && UIHelper.AutoScaleFactorY > 1F)
if (icon != null && UIHelper.AutoScaleFactorX > 1F && UIHelper.AutoScaleFactorY > 1F)
{
// When scaling up, unfortunately the icon will look too small, but at least we can make the rest of the button bigger
buttonControl.AutoSize = false;
buttonControl.Size = UIHelper.Scale(button.Icon.Size) + new Size(6, 6);
buttonControl.Size = UIHelper.Scale(icon.Size) + new Size(6, 6);
}
return buttonControl;
}

2
src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs
View File

@ -91,7 +91,7 @@ namespace BizHawk.Client.EmuHawk
Key(326, 66, "Semicolon", ";"),
Key(346, 66, "Equal", "="),
Key(370, 66, "Return"),
new ButtonSchema(8, 90, "Key Commodore") { Icon = Properties.Resources.C64Symbol },
new ButtonSchema(8, 90, "Key Commodore") { Icon = VGamepadButtonImage.C64Symbol },
Key(44, 90, "Left Shift", "Shift"),
Key(82, 90, "Z"),
Key(106, 90, "X"),

18
src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs
View File

@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using BizHawk.Client.EmuHawk.Properties;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Consoles.Sega.gpgx;
@ -166,14 +166,14 @@ namespace BizHawk.Client.EmuHawk
Size = new Size(110, 110),
Buttons = new[]
{
new ButtonSchema(15, 43, controller, "1U") { Icon = Resources.Back },
new ButtonSchema(22, 20, controller, "2U") { Icon = Resources.NW },
new ButtonSchema(47, 10, controller, "3U") { Icon = Resources.BlueUp },
new ButtonSchema(70, 20, controller, "4U") { Icon = Resources.NE },
new ButtonSchema(80, 43, controller, "5U") { Icon = Resources.Forward },
new ButtonSchema(70, 65, controller, "6U") { Icon = Resources.SE },
new ButtonSchema(47, 73, controller, "7U") { Icon = Resources.BlueDown },
new ButtonSchema(22, 65, controller, "8U") { Icon = Resources.SW }
new ButtonSchema(15, 43, controller, "1U") { Icon = VGamepadButtonImage.BlueArrW },
new ButtonSchema(22, 20, controller, "2U") { Icon = VGamepadButtonImage.BlueArrNW },
new ButtonSchema(47, 10, controller, "3U") { Icon = VGamepadButtonImage.BlueArrN },
new ButtonSchema(70, 20, controller, "4U") { Icon = VGamepadButtonImage.BlueArrNE },
new ButtonSchema(80, 43, controller, "5U") { Icon = VGamepadButtonImage.BlueArrE },
new ButtonSchema(70, 65, controller, "6U") { Icon = VGamepadButtonImage.BlueArrSE },
new ButtonSchema(47, 73, controller, "7U") { Icon = VGamepadButtonImage.BlueArrS },
new ButtonSchema(22, 65, controller, "8U") { Icon = VGamepadButtonImage.BlueArrSW }
}
};
}

34
src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs
View File

@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using BizHawk.Client.EmuHawk.Properties;
using BizHawk.Common.ReflectionExtensions;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Intellivision;
@ -48,22 +48,22 @@ namespace BizHawk.Client.EmuHawk
Size = new Size(148, 332),
Buttons = StandardButtons(controller).Concat(new[]
{
new ButtonSchema(51, 124, controller, "N") { Icon = Resources.BlueUp },
new ButtonSchema(63, 145, controller, "NNE") { Icon = Resources.NNE },
new ButtonSchema(39, 145, controller, "NNW") { Icon = Resources.NNW },
new ButtonSchema(75, 166, controller, "NE") { Icon = Resources.NE },
new ButtonSchema(27, 166, controller, "NW") { Icon = Resources.NW },
new ButtonSchema(87, 187, controller, "ENE") { Icon = Resources.ENE },
new ButtonSchema(15, 187, controller, "WNW") { Icon = Resources.WNW },
new ButtonSchema(99, 208, controller, "E") { Icon = Resources.Forward },
new ButtonSchema(3, 208, controller, "W") { Icon = Resources.Back },
new ButtonSchema(87, 229, controller, "ESE") { Icon = Resources.ESE },
new ButtonSchema(15, 229, controller, "WSW") { Icon = Resources.WSW },
new ButtonSchema(75, 250, controller, "SE") { Icon = Resources.SE },
new ButtonSchema(27, 250, controller, "SW") { Icon = Resources.SW },
new ButtonSchema(63, 271, controller, "SSE") { Icon = Resources.SSE },
new ButtonSchema(39, 271, controller, "SSW") { Icon = Resources.SSW },
new ButtonSchema(51, 292, controller, "S") { Icon = Resources.BlueDown }
new ButtonSchema(51, 124, controller, "N") { Icon = VGamepadButtonImage.BlueArrN },
new ButtonSchema(63, 145, controller, "NNE") { Icon = VGamepadButtonImage.BlueArrNNE },
new ButtonSchema(39, 145, controller, "NNW") { Icon = VGamepadButtonImage.BlueArrNNW },
new ButtonSchema(75, 166, controller, "NE") { Icon = VGamepadButtonImage.BlueArrNE },
new ButtonSchema(27, 166, controller, "NW") { Icon = VGamepadButtonImage.BlueArrNW },
new ButtonSchema(87, 187, controller, "ENE") { Icon = VGamepadButtonImage.BlueArrENE },
new ButtonSchema(15, 187, controller, "WNW") { Icon = VGamepadButtonImage.BlueArrWNW },
new ButtonSchema(99, 208, controller, "E") { Icon = VGamepadButtonImage.BlueArrE },
new ButtonSchema(3, 208, controller, "W") { Icon = VGamepadButtonImage.BlueArrW },
new ButtonSchema(87, 229, controller, "ESE") { Icon = VGamepadButtonImage.BlueArrESE },
new ButtonSchema(15, 229, controller, "WSW") { Icon = VGamepadButtonImage.BlueArrWSW },
new ButtonSchema(75, 250, controller, "SE") { Icon = VGamepadButtonImage.BlueArrSE },
new ButtonSchema(27, 250, controller, "SW") { Icon = VGamepadButtonImage.BlueArrSW },
new ButtonSchema(63, 271, controller, "SSE") { Icon = VGamepadButtonImage.BlueArrSSE },
new ButtonSchema(39, 271, controller, "SSW") { Icon = VGamepadButtonImage.BlueArrSSW },
new ButtonSchema(51, 292, controller, "S") { Icon = VGamepadButtonImage.BlueArrS }
})
};
}

20
src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs
View File

@ -40,22 +40,10 @@ namespace BizHawk.Client.EmuHawk
new ButtonSchema(81, 246, controller, "Start", "S"),
new ButtonSchema(127, 246, controller, "B"),
new ButtonSchema(138, 269, controller, "A"),
new ButtonSchema(173, 210, controller, "C Up")
{
Icon = Properties.Resources.YellowUp
},
new ButtonSchema(173, 231, controller, "C Down")
{
Icon = Properties.Resources.YellowDown
},
new ButtonSchema(152, 221, controller, "C Left")
{
Icon = Properties.Resources.YellowLeft
},
new ButtonSchema(194, 221, controller, "C Right")
{
Icon = Properties.Resources.YellowRight
},
new ButtonSchema(173, 210, controller, "C Up") { Icon = VGamepadButtonImage.YellowArrN },
new ButtonSchema(173, 231, controller, "C Down") { Icon = VGamepadButtonImage.YellowArrS },
new ButtonSchema(152, 221, controller, "C Left") { Icon = VGamepadButtonImage.YellowArrW },
new ButtonSchema(194, 221, controller, "C Right") { Icon = VGamepadButtonImage.YellowArrE },
new AnalogSchema(6, 14, $"P{controller} X Axis")
{
Spec = new AxisSpec((-128).RangeTo(127), 0),

40
src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs
View File

@ -63,22 +63,10 @@ namespace BizHawk.Client.EmuHawk
new ButtonSchema(191, 10, controller, "R2"),
new ButtonSchema(72, 90, controller, "L3"),
new ButtonSchema(130, 90, controller, "R3"),
new ButtonSchema(148, 62, controller, "Square")
{
Icon = Properties.Resources.Square
},
new ButtonSchema(169, 50, controller, "Triangle")
{
Icon = Properties.Resources.Triangle
},
new ButtonSchema(190, 62, controller, "Circle")
{
Icon = Properties.Resources.Circle
},
new ButtonSchema(169, 71, controller, "Cross")
{
Icon = Properties.Resources.Cross
},
new ButtonSchema(148, 62, controller, "Square") { Icon = VGamepadButtonImage.Square },
new ButtonSchema(169, 50, controller, "Triangle") { Icon = VGamepadButtonImage.Triangle },
new ButtonSchema(190, 62, controller, "Circle") { Icon = VGamepadButtonImage.Circle },
new ButtonSchema(169, 71, controller, "Cross") { Icon = VGamepadButtonImage.Cross },
new ButtonSchema(112, 62, controller, "Start", "S"),
new ButtonSchema(90, 62, controller, "Select", "s"),
new AnalogSchema(3, 120, $"P{controller} LStick X")
@ -111,22 +99,10 @@ namespace BizHawk.Client.EmuHawk
new ButtonSchema(196, 37, controller, "R1"),
new ButtonSchema(8, 15, controller, "L2"),
new ButtonSchema(196, 15, controller, "R2"),
new ButtonSchema(153, 67, controller, "Square")
{
Icon = Properties.Resources.Square
},
new ButtonSchema(174, 55, controller, "Triangle")
{
Icon = Properties.Resources.Triangle
},
new ButtonSchema(195, 67, controller, "Circle")
{
Icon = Properties.Resources.Circle
},
new ButtonSchema(174, 76, controller, "Cross")
{
Icon = Properties.Resources.Cross
},
new ButtonSchema(153, 67, controller, "Square") { Icon = VGamepadButtonImage.Square },
new ButtonSchema(174, 55, controller, "Triangle") { Icon = VGamepadButtonImage.Triangle },
new ButtonSchema(195, 67, controller, "Circle") { Icon = VGamepadButtonImage.Circle },
new ButtonSchema(174, 76, controller, "Cross") { Icon = VGamepadButtonImage.Cross },
new ButtonSchema(112, 67, controller, "Start", "S"),
new ButtonSchema(90, 67, controller, "Select", "s")
}

19
src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchemaControl.cs
View File

@ -3,7 +3,6 @@
using System.Collections.Generic;
using System.Drawing;
using BizHawk.Client.EmuHawk.Properties;
using BizHawk.Emulation.Common;
namespace BizHawk.Client.EmuHawk
@ -25,7 +24,7 @@ namespace BizHawk.Client.EmuHawk
{
public string DisplayName { get; set; }
public Bitmap? Icon { get; set; }
public VGamepadButtonImage? Icon { get; set; }
public ButtonSchema(int x, int y, string name)
: base(new Point(x, y), name)
@ -40,28 +39,28 @@ namespace BizHawk.Client.EmuHawk
=> DisplayName = displayName;
public static ButtonSchema Up(int x, int y, string? name = null)
=> new ButtonSchema(x, y, name ?? "Up") { Icon = Resources.BlueUp };
=> new ButtonSchema(x, y, name ?? "Up") { Icon = VGamepadButtonImage.BlueArrN };
public static ButtonSchema Up(int x, int y, int controller)
=> new ButtonSchema(x, y, controller, "Up") { Icon = Resources.BlueUp };
=> new ButtonSchema(x, y, controller, "Up") { Icon = VGamepadButtonImage.BlueArrN };
public static ButtonSchema Down(int x, int y, string? name = null)
=> new ButtonSchema(x, y, name ?? "Down") { Icon = Resources.BlueDown };
=> new ButtonSchema(x, y, name ?? "Down") { Icon = VGamepadButtonImage.BlueArrS };
public static ButtonSchema Down(int x, int y, int controller)
=> new ButtonSchema(x, y, controller, "Down") { Icon = Resources.BlueDown };
=> new ButtonSchema(x, y, controller, "Down") { Icon = VGamepadButtonImage.BlueArrS };
public static ButtonSchema Left(int x, int y, string? name = null)
=> new ButtonSchema(x, y, name ?? "Left") { Icon = Resources.Back };
=> new ButtonSchema(x, y, name ?? "Left") { Icon = VGamepadButtonImage.BlueArrW };
public static ButtonSchema Left(int x, int y, int controller)
=> new ButtonSchema(x, y, controller, "Left") { Icon = Resources.Back };
=> new ButtonSchema(x, y, controller, "Left") { Icon = VGamepadButtonImage.BlueArrW };
public static ButtonSchema Right(int x, int y, string? name = null)
=> new ButtonSchema(x, y, name ?? "Right") { Icon = Resources.Forward };
=> new ButtonSchema(x, y, name ?? "Right") { Icon = VGamepadButtonImage.BlueArrE };
public static ButtonSchema Right(int x, int y, int controller)
=> new ButtonSchema(x, y, controller, "Right") { Icon = Resources.Forward };
=> new ButtonSchema(x, y, controller, "Right") { Icon = VGamepadButtonImage.BlueArrE };
}
/// <summary>A single analog control (e.g. pressure sensitive button)</summary>

15
src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ZXSpectrumSchema.cs
View File

@ -175,18 +175,9 @@ namespace BizHawk.Client.EmuHawk
Size = new Size(174, 74),
Buttons = new[]
{
new ButtonSchema(23, 22, "Play Tape")
{
Icon = Properties.Resources.Play
},
new ButtonSchema(53, 22, "Stop Tape")
{
Icon = Properties.Resources.Stop
},
new ButtonSchema(83, 22, "RTZ Tape")
{
Icon = Properties.Resources.BackMore
},
new ButtonSchema(23, 22, "Play Tape") { Icon = VGamepadButtonImage.Play },
new ButtonSchema(53, 22, "Stop Tape") { Icon = VGamepadButtonImage.Stop },
new ButtonSchema(83, 22, "RTZ Tape") { Icon = VGamepadButtonImage.SkipBack },
new ButtonSchema(23, 52, "Insert Next Tape")
{
DisplayName = "NEXT TAPE"

34
src/BizHawk.Emulation.Common/VGamepadButtonImage.cs Normal file
View File

@ -0,0 +1,34 @@
namespace BizHawk.Emulation.Common
{
public enum VGamepadButtonImage
{
BlueArrE,
BlueArrENE,
BlueArrESE,
BlueArrN,
BlueArrNE,
BlueArrNNE,
BlueArrNNW,
BlueArrNW,
BlueArrS,
BlueArrSE,
BlueArrSSE,
BlueArrSSW,
BlueArrSW,
BlueArrW,
BlueArrWNW,
BlueArrWSW,
C64Symbol,
Circle,
Cross,
Play,
SkipBack,
Square,
Stop,
Triangle,
YellowArrE,
YellowArrN,
YellowArrS,
YellowArrW,
}
}