From 2560def438bec0656166e11e5c883dc2f6877b21 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 21 Mar 2020 22:24:00 -0500 Subject: [PATCH] Virtual Pad - ButtonSchema - make location constructor the only option since location is always required, change param order on Directional helper methods for consistency --- .../tools/VirtualPads/schema/A26Schema.cs | 38 +- .../tools/VirtualPads/schema/A78Schema.cs | 16 +- .../tools/VirtualPads/schema/AppleIISchema.cs | 8 +- .../tools/VirtualPads/schema/ButtonSchema.cs | 24 +- .../tools/VirtualPads/schema/C64Schema.cs | 8 +- .../tools/VirtualPads/schema/ColecoSchema.cs | 16 +- .../tools/VirtualPads/schema/DualGBSchema.cs | 8 +- .../tools/VirtualPads/schema/GBASchema.cs | 8 +- .../tools/VirtualPads/schema/GBSchema.cs | 16 +- .../tools/VirtualPads/schema/GGLSchema.cs | 23 +- .../tools/VirtualPads/schema/GenSchema.cs | 192 +++---- .../tools/VirtualPads/schema/IntvSchema.cs | 244 ++++---- .../tools/VirtualPads/schema/LynxSchema.cs | 40 +- .../tools/VirtualPads/schema/N64Schema.cs | 61 +- .../tools/VirtualPads/schema/NdsSchema.cs | 76 +-- .../tools/VirtualPads/schema/NesSchema.cs | 531 +++++++----------- .../tools/VirtualPads/schema/NgpSchema.cs | 29 +- .../tools/VirtualPads/schema/O2Schema.cs | 13 +- .../tools/VirtualPads/schema/PSXSchema.cs | 183 +++--- .../tools/VirtualPads/schema/PceSchema.cs | 28 +- .../tools/VirtualPads/schema/PcfxSchema.cs | 72 +-- .../tools/VirtualPads/schema/SGBSchema.cs | 28 +- .../tools/VirtualPads/schema/SaturnSchema.cs | 256 ++++----- .../tools/VirtualPads/schema/SmsSchema.cs | 59 +- .../tools/VirtualPads/schema/SnesSchema.cs | 121 ++-- .../tools/VirtualPads/schema/VECSchema.cs | 51 +- .../VirtualPads/schema/VirtualBoySchema.cs | 60 +- .../VirtualPads/schema/WonderSwanSchema.cs | 123 ++-- .../VirtualPads/schema/ZXSpectrumSchema.cs | 43 +- 29 files changed, 913 insertions(+), 1462 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs index 9f58743dac..e4e33eea0b 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs @@ -52,10 +52,10 @@ namespace BizHawk.Client.EmuHawk MaxSize = new Size(174, 74), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 23, 15), - ButtonSchema.Down($"P{controller} Down", 23, 36), - ButtonSchema.Left($"P{controller} Left", 2, 24), - ButtonSchema.Right($"P{controller} Right", 44, 24), + ButtonSchema.Up(23, 15, $"P{controller} Up"), + ButtonSchema.Down(23, 36, $"P{controller} Down"), + ButtonSchema.Left(2, 24, $"P{controller} Left"), + ButtonSchema.Right(44, 24, $"P{controller} Right"), new ButtonSchema(124, 24) { Name = $"P{controller} Button", @@ -78,12 +78,12 @@ namespace BizHawk.Client.EmuHawk new ButtonSchema(5, 24) { Name = $"P{controller} Button 1", - DisplayName = "B1", + DisplayName = "B1" }, new ButtonSchema(5, 48) { Name = $"P{controller} Button 2", - DisplayName = "B2", + DisplayName = "B2" }, new ButtonSchema(55, 17) { @@ -117,24 +117,24 @@ namespace BizHawk.Client.EmuHawk MaxSize = new Size(174, 74), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 23, 15), - ButtonSchema.Down($"P{controller} Down", 23, 36), - ButtonSchema.Left($"P{controller} Left", 2, 24), - ButtonSchema.Right($"P{controller} Right", 44, 24), + ButtonSchema.Up(23, 15, $"P{controller} Up"), + ButtonSchema.Down(23, 36, $"P{controller} Down"), + ButtonSchema.Left(2, 24, $"P{controller} Left"), + ButtonSchema.Right(44, 24, $"P{controller} Right"), new ButtonSchema(132, 24) { Name = $"P{controller} Button", - DisplayName = "B", + DisplayName = "B" }, new ButtonSchema(68, 36) { Name = $"P{controller} Button 1", - DisplayName = "B1", + DisplayName = "B1" }, new ButtonSchema(100, 36) { Name = $"P{controller} Button 2", - DisplayName = "B2", + DisplayName = "B2" } } }; @@ -153,7 +153,7 @@ namespace BizHawk.Client.EmuHawk new ButtonSchema(5, 24) { Name = $"P{controller} Button", - DisplayName = "B1", + DisplayName = "B1" }, new ButtonSchema(55, 17) { @@ -189,17 +189,15 @@ namespace BizHawk.Client.EmuHawk new ButtonSchema(10, 15) { Name = "Select" }, new ButtonSchema(60, 15) { Name = "Reset" }, new ButtonSchema(108, 15) { Name = "Power" }, - new ButtonSchema + new ButtonSchema(10, 40) { Name = "Toggle Left Difficulty", - DisplayName = "Left Difficulty", - Location = new Point(10, 40) + DisplayName = "Left Difficulty" }, - new ButtonSchema + new ButtonSchema(92, 40) { Name = "Toggle Right Difficulty", - DisplayName = "Right Difficulty", - Location = new Point(92, 40) + DisplayName = "Right Difficulty" } } }; diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs index 85943da31f..3a2b72bebe 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs @@ -61,10 +61,10 @@ namespace BizHawk.Client.EmuHawk MaxSize = new Size(174, 74), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 23, 15), - ButtonSchema.Down($"P{controller} Down", 23, 36), - ButtonSchema.Left($"P{controller} Left", 2, 24), - ButtonSchema.Right($"P{controller} Right", 44, 24), + ButtonSchema.Up(23, 15, $"P{controller} Up"), + ButtonSchema.Down(23, 36, $"P{controller} Down"), + ButtonSchema.Left(2, 24, $"P{controller} Left"), + ButtonSchema.Right(44, 24, $"P{controller} Right"), new ButtonSchema(120, 24) { Name = $"P{controller} Trigger", @@ -89,10 +89,10 @@ namespace BizHawk.Client.EmuHawk MaxSize = new Size(174, 74), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 23, 15), - ButtonSchema.Down($"P{controller} Down", 23, 36), - ButtonSchema.Left($"P{controller} Left", 2, 24), - ButtonSchema.Right($"P{controller} Right", 54, 24), + ButtonSchema.Up(23, 15, $"P{controller} Up"), + ButtonSchema.Down(23, 36, $"P{controller} Down"), + ButtonSchema.Left(2, 24, $"P{controller} Left"), + ButtonSchema.Right(54, 24, $"P{controller} Right"), new ButtonSchema(120, 24) { Name = $"P{controller} Button", diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs index 15214b5cda..408f124073 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs @@ -113,10 +113,10 @@ namespace BizHawk.Client.EmuHawk Name = "Black Apple", DisplayName = ">" }, - ButtonSchema.Left("Left", 289, 114), - ButtonSchema.Right("Right", 311, 114), - ButtonSchema.Down("Down", 333, 114), - ButtonSchema.Up("Up", 355, 114), + ButtonSchema.Left(289, 114, "Left"), + ButtonSchema.Right(311, 114, "Right"), + ButtonSchema.Down(333, 114, "Down"), + ButtonSchema.Up(355, 114, "Up") } }; } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs index 63e5fa6288..30b63ab68d 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs @@ -16,10 +16,6 @@ namespace BizHawk.Client.EmuHawk public class ButtonSchema { - public ButtonSchema() - { - } - public ButtonSchema(int x, int y) => Location = new Point(x, y); public string Name { get; set; } @@ -43,32 +39,28 @@ namespace BizHawk.Client.EmuHawk public ControllerDefinition.AxisRange? AxisRange { get; set; } public ControllerDefinition.AxisRange? SecondaryAxisRange { get; set; } - public static ButtonSchema Up(string name, int x, int y) => new ButtonSchema + public static ButtonSchema Up(int x, int y, string name) => new ButtonSchema(x, y) { Name = name, - Icon = Properties.Resources.BlueUp, - Location = new Point(x, y) + Icon = Properties.Resources.BlueUp }; - public static ButtonSchema Down(string name, int x, int y) => new ButtonSchema + public static ButtonSchema Down(int x, int y, string name) => new ButtonSchema(x, y) { Name = name, - Icon = Properties.Resources.BlueDown, - Location = new Point(x, y) + Icon = Properties.Resources.BlueDown }; - public static ButtonSchema Left(string name, int x, int y) => new ButtonSchema + public static ButtonSchema Left(int x, int y, string name) => new ButtonSchema(x, y) { Name = name, - Icon = Properties.Resources.Back, - Location = new Point(x, y) + Icon = Properties.Resources.Back }; - public static ButtonSchema Right(string name, int x, int y) => new ButtonSchema + public static ButtonSchema Right(int x, int y, string name) => new ButtonSchema(x, y) { Name = name, - Icon = Properties.Resources.Forward, - Location = new Point(x, y) + Icon = Properties.Resources.Forward }; } } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs index 9eba6b8d2a..2d61f0f523 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs @@ -26,10 +26,10 @@ namespace BizHawk.Client.EmuHawk MaxSize = new Size(174, 74), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 23, 15), - ButtonSchema.Down($"P{controller} Down", 23, 36), - ButtonSchema.Left($"P{controller} Left", 2, 24), - ButtonSchema.Right($"P{controller} Right", 44, 24), + ButtonSchema.Up( 23, 15, $"P{controller} Up"), + ButtonSchema.Down(23, 36, $"P{controller} Down"), + ButtonSchema.Left(2, 24, $"P{controller} Left"), + ButtonSchema.Right(44, 24, $"P{controller} Right"), new ButtonSchema(124, 24) { Name = $"P{controller} Button", diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs index 411ee3b129..cff64aebc6 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs @@ -45,10 +45,10 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(128, 200), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 50, 11), - ButtonSchema.Down($"P{controller} Down", 50, 32), - ButtonSchema.Left($"P{controller} Left", 29, 22), - ButtonSchema.Right($"P{controller} Right", 71, 22), + ButtonSchema.Up(50, 11, $"P{controller} Up"), + ButtonSchema.Down(50, 32, $"P{controller} Down"), + ButtonSchema.Left(29, 22, $"P{controller} Left"), + ButtonSchema.Right(71, 22, $"P{controller} Right"), new ButtonSchema(3, 42) { Name = $"P{controller} L", @@ -158,10 +158,10 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(195, 260), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 50, 11), - ButtonSchema.Down($"P{controller} Down", 50, 32), - ButtonSchema.Left($"P{controller} Left", 29, 22), - ButtonSchema.Right($"P{controller} Right", 71, 22), + ButtonSchema.Up(50, 11, $"P{controller} Up"), + ButtonSchema.Down(50, 32, $"P{controller} Down"), + ButtonSchema.Left(29, 22, $"P{controller} Left"), + ButtonSchema.Right(71, 22, $"P{controller} Right"), new ButtonSchema(27, 85) { Name = $"P{controller} Key 1", diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs index 57d3725da0..381aaf1c1a 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs @@ -23,10 +23,10 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(174, 79), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 14, 12), - ButtonSchema.Down($"P{controller} Down", 14, 56), - ButtonSchema.Left($"P{controller} Left", 2, 34), - ButtonSchema.Right($"P{controller} Right", 24, 34), + ButtonSchema.Up(14, 12, $"P{controller} Up"), + ButtonSchema.Down(14, 56, $"P{controller} Down"), + ButtonSchema.Left(2, 34, $"P{controller} Left"), + ButtonSchema.Right(24, 34, $"P{controller} Right"), new ButtonSchema(122, 34) { Name = $"P{controller} B", diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs index 0a769754cb..2603eb9018 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs @@ -74,10 +74,10 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(194, 90), Buttons = new[] { - ButtonSchema.Up("Up", 29, 17), - ButtonSchema.Down("Down", 29, 61), - ButtonSchema.Left("Left", 17, 39), - ButtonSchema.Right("Right", 39, 39), + ButtonSchema.Up(29, 17, "Up"), + ButtonSchema.Down(29, 61, "Down"), + ButtonSchema.Left(17, 39, "Left"), + ButtonSchema.Right(39, 39, "Right"), new ButtonSchema(130, 39) { Name = "B" }, new ButtonSchema(154, 39) { Name = "A" }, new ButtonSchema(64, 39) { Name = "Select", DisplayName = "s" }, diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs index 1d4f90a2e7..a5d025c687 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs @@ -38,10 +38,10 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(174, 79), Buttons = new[] { - ButtonSchema.Up("Up", 14, 12), - ButtonSchema.Down("Down", 14, 56), - ButtonSchema.Left("Left", 2, 34), - ButtonSchema.Right("Right", 24, 34), + ButtonSchema.Up(14, 12, "Up"), + ButtonSchema.Down(14, 56, "Down"), + ButtonSchema.Left(2, 34, "Left"), + ButtonSchema.Right(24, 34, "Right"), new ButtonSchema(122, 34) { Name = "B" }, new ButtonSchema(146, 34) { Name = "A" }, new ButtonSchema(52, 34) { Name = "Select", DisplayName = "s" }, @@ -73,10 +73,10 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(174, 79), Buttons = new[] { - ButtonSchema.Up("P1 Up", 14, 12), - ButtonSchema.Down("P1 Down", 14, 56), - ButtonSchema.Left("P1 Left", 2, 34), - ButtonSchema.Right("P1 Right", 24, 34), + ButtonSchema.Up(14, 12, "P1 Up"), + ButtonSchema.Down(14, 56, "P1 Down"), + ButtonSchema.Left(2, 34, "P1 Left"), + ButtonSchema.Right(24, 34, "P1 Right"), new ButtonSchema(122, 34) { Name = "P1 B", diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GGLSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GGLSchema.cs index 7f9ebc6870..49bc203a76 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GGLSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GGLSchema.cs @@ -23,27 +23,24 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(174, 90), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 14, 12), - ButtonSchema.Down($"P{controller} Down", 14, 56), - ButtonSchema.Left($"P{controller} Left", 2, 34), - ButtonSchema.Right($"P{controller} Right", 24, 34), - new ButtonSchema + ButtonSchema.Up(14, 12, $"P{controller} Up"), + ButtonSchema.Down(14, 56, $"P{controller} Down"), + ButtonSchema.Left(2, 34, $"P{controller} Left"), + ButtonSchema.Right(24, 34, $"P{controller} Right"), + new ButtonSchema(134, 12) { Name = $"P{controller} Start", - DisplayName = "S", - Location = new Point(134, 12) + DisplayName = "S" }, - new ButtonSchema + new ButtonSchema(122, 34) { Name = $"P{controller} B1", - DisplayName = "1", - Location = new Point(122, 34) + DisplayName = "1" }, - new ButtonSchema + new ButtonSchema(146, 34) { Name = $"P{controller} B2", - DisplayName = "2", - Location = new Point(146, 34) + DisplayName = "2" } } }; diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs index d379e3446f..40c5a0b59e 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs @@ -74,33 +74,29 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(174, 90), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 14, 12), - ButtonSchema.Down($"P{controller} Down", 14, 56), - ButtonSchema.Left($"P{controller} Left", 2, 34), - ButtonSchema.Right($"P{controller} Right", 24, 34), - new ButtonSchema + ButtonSchema.Up(14, 12, $"P{controller} Up"), + ButtonSchema.Down(14, 56, $"P{controller} Down"), + ButtonSchema.Left(2, 34, $"P{controller} Left"), + ButtonSchema.Right(24, 34, $"P{controller} Right"), + new ButtonSchema(98, 40) { Name = $"P{controller} A", - DisplayName = "A", - Location = new Point(98, 40) + DisplayName = "A" }, - new ButtonSchema + new ButtonSchema(122, 40) { Name = $"P{controller} B", - DisplayName = "B", - Location = new Point(122, 40) + DisplayName = "B" }, - new ButtonSchema + new ButtonSchema(146, 40) { Name = $"P{controller} C", - DisplayName = "C", - Location = new Point(146, 40) + DisplayName = "C" }, - new ButtonSchema + new ButtonSchema(122, 12) { Name = $"P{controller} Start", - DisplayName = "S", - Location = new Point(122, 12) + DisplayName = "S" } } }; @@ -114,51 +110,44 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(174, 90), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 14, 12), - ButtonSchema.Down($"P{controller} Down", 14, 56), - ButtonSchema.Left($"P{controller} Left", 2, 34), - ButtonSchema.Right($"P{controller} Right", 24, 34), - new ButtonSchema + ButtonSchema.Up(14, 12, $"P{controller} Up"), + ButtonSchema.Down(14, 56, $"P{controller} Down"), + ButtonSchema.Left(2, 34, $"P{controller} Left"), + ButtonSchema.Right(24, 34, $"P{controller} Right"), + new ButtonSchema(98, 40) { Name = $"P{controller} A", - DisplayName = "A", - Location = new Point(98, 40) + DisplayName = "A" }, - new ButtonSchema + new ButtonSchema(122, 40) { Name = $"P{controller} B", - DisplayName = "B", - Location = new Point(122, 40) + DisplayName = "B" }, - new ButtonSchema + new ButtonSchema(146, 40) { Name = $"P{controller} C", - DisplayName = "C", - Location = new Point(146, 40) + DisplayName = "C" }, - new ButtonSchema + new ButtonSchema(98, 65) { Name = $"P{controller} X", - DisplayName = "X", - Location = new Point(98, 65) + DisplayName = "X" }, - new ButtonSchema + new ButtonSchema(122, 65) { Name = $"P{controller} Y", - DisplayName = "Y", - Location = new Point(122, 65) + DisplayName = "Y" }, - new ButtonSchema + new ButtonSchema(146, 65) { Name = $"P{controller} Z", - DisplayName = "Z", - Location = new Point(146, 65) + DisplayName = "Z" }, - new ButtonSchema + new ButtonSchema(122, 12) { Name = $"P{controller} Start", - DisplayName = "S", - Location = new Point(122, 12) + DisplayName = "S" } } }; @@ -173,10 +162,9 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(356, 300), Buttons = new[] { - new ButtonSchema + new ButtonSchema(14, 17) { Name = $"P{controller} Lightgun X", - Location = new Point(14, 17), Type = PadInputType.TargetedPair, MaxValue = 10000, TargetSize = new Size(320, 240), @@ -185,17 +173,15 @@ namespace BizHawk.Client.EmuHawk $"P{controller} Lightgun Y" } }, - new ButtonSchema + new ButtonSchema(284, 17) { Name = $"P{controller} Lightgun Trigger", - DisplayName = "Trigger", - Location = new Point(284, 17) + DisplayName = "Trigger" }, - new ButtonSchema + new ButtonSchema(284, 40) { Name = $"P{controller} Lightgun Start", - DisplayName = "Start", - Location = new Point(284, 40) + DisplayName = "Start" } } }; @@ -210,10 +196,9 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(418, 290), Buttons = new[] { - new ButtonSchema + new ButtonSchema(14, 17) { Name = $"P{controller} Mouse X", - Location = new Point(14, 17), Type = PadInputType.AnalogStick, MaxValue = 255, TargetSize = new Size(520, 570), @@ -222,29 +207,25 @@ namespace BizHawk.Client.EmuHawk $"P{controller} Mouse Y" } }, - new ButtonSchema + new ButtonSchema(365, 17) { Name = $"P{controller} Mouse Left", - DisplayName = "Left", - Location = new Point(365, 17) + DisplayName = "Left" }, - new ButtonSchema + new ButtonSchema(365, 40) { Name = $"P{controller} Mouse Center", - DisplayName = "Center", - Location = new Point(365, 40) + DisplayName = "Center" }, - new ButtonSchema + new ButtonSchema(365, 63) { Name = $"P{controller} Mouse Right", - DisplayName = "Right", - Location = new Point(365, 63) + DisplayName = "Right" }, - new ButtonSchema + new ButtonSchema(365, 86) { Name = $"P{controller} Mouse Start", - DisplayName = "Start", - Location = new Point(365, 86) + DisplayName = "Start" } } }; @@ -259,16 +240,8 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(150, 50), Buttons = new[] { - new ButtonSchema - { - Name = "Reset", - Location = new Point(10, 15) - }, - new ButtonSchema - { - Name = "Power", - Location = new Point(58, 15) - } + new ButtonSchema(10, 15) { Name = "Reset" }, + new ButtonSchema(58, 15) { Name = "Power" } } }; } @@ -281,39 +254,34 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(110, 110), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 47, 10), - ButtonSchema.Down($"P{controller} Down", 47, 73), - ButtonSchema.Left($"P{controller} Left", 15, 43), - ButtonSchema.Right($"P{controller} Right", 80, 43), - new ButtonSchema + ButtonSchema.Up(47, 10, $"P{controller} Up"), + ButtonSchema.Down(47, 73, $"P{controller} Down"), + ButtonSchema.Left(15, 43, $"P{controller} Left"), + ButtonSchema.Right(80, 43, $"P{controller} Right"), + new ButtonSchema(70, 65) { Name = $"P{controller} A", - DisplayName = "A", - Location = new Point(70, 65) + DisplayName = "A" }, - new ButtonSchema + new ButtonSchema(70, 20) { Name = $"P{controller} B", - DisplayName = "B", - Location = new Point(70, 20) + DisplayName = "B" }, - new ButtonSchema + new ButtonSchema(22, 20) { Name = $"P{controller} C", - DisplayName = "C", - Location = new Point(22, 20) + DisplayName = "C" }, - new ButtonSchema + new ButtonSchema(22, 65) { Name = $"P{controller} A", - DisplayName = "A", - Location = new Point(22, 65) + DisplayName = "A" }, - new ButtonSchema + new ButtonSchema(47, 43) { Name = $"P{controller} Start", - DisplayName = "S", - Location = new Point(47, 43) + DisplayName = "S" } } }; @@ -327,53 +295,45 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(174, 90), Buttons = new[] { - new ButtonSchema + new ButtonSchema(98, 40) { Name = $"P{controller} A", - DisplayName = "A", - Location = new Point(98, 40) + DisplayName = "A" }, - new ButtonSchema + new ButtonSchema(122, 40) { Name = $"P{controller} B", - DisplayName = "B", - Location = new Point(122, 40) + DisplayName = "B" }, - new ButtonSchema + new ButtonSchema(146, 40) { Name = $"P{controller} C", - DisplayName = "C", - Location = new Point(146, 40) + DisplayName = "C" }, - new ButtonSchema + new ButtonSchema(98, 65) { Name = $"P{controller} D", - DisplayName = "D", - Location = new Point(98, 65) + DisplayName = "D" }, - new ButtonSchema + new ButtonSchema(122, 65) { Name = $"P{controller} E1", - DisplayName = "E¹", - Location = new Point(122, 65) + DisplayName = "E¹" }, - new ButtonSchema + new ButtonSchema(152, 65) { Name = $"P{controller} E2", - DisplayName = "E²", - Location = new Point(152, 65) + DisplayName = "E²" }, - new ButtonSchema + new ButtonSchema(122, 12) { Name = $"P{controller} Start", - DisplayName = "Start", - Location = new Point(122, 12) + DisplayName = "Start" }, - new ButtonSchema + new ButtonSchema(162, 12) { Name = $"P{controller} Select", - DisplayName = "Select", - Location = new Point(162, 12) + DisplayName = "Select" } } }; diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs index 778df7be4d..8487760e59 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs @@ -48,203 +48,171 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(148, 332), Buttons = new[] { - new ButtonSchema + new ButtonSchema(25, 15) { Name = $"P{controller} Key 1", - DisplayName = "1", - Location = new Point(25, 15) + DisplayName = "1" }, - new ButtonSchema + new ButtonSchema(51, 15) { Name = $"P{controller} Key 2", - DisplayName = "2", - Location = new Point(51, 15) + DisplayName = "2" }, - new ButtonSchema + new ButtonSchema(77, 15) { Name = $"P{controller} Key 3", - DisplayName = "3", - Location = new Point(77, 15) + DisplayName = "3" }, - new ButtonSchema + new ButtonSchema(25, 41) { Name = $"P{controller} Key 4", - DisplayName = "4", - Location = new Point(25, 41) + DisplayName = "4" }, - new ButtonSchema + new ButtonSchema(51, 41) { Name = $"P{controller} Key 5", - DisplayName = "5", - Location = new Point(51, 41) + DisplayName = "5" }, - new ButtonSchema + new ButtonSchema(77, 41) { Name = $"P{controller} Key 6", - DisplayName = "6", - Location = new Point(77, 41) + DisplayName = "6" }, - new ButtonSchema + new ButtonSchema(25, 67) { Name = $"P{controller} Key 7", - DisplayName = "7", - Location = new Point(25, 67) + DisplayName = "7" }, - new ButtonSchema + new ButtonSchema(51, 67) { Name = $"P{controller} Key 8", - DisplayName = "8", - Location = new Point(51, 67) + DisplayName = "8" }, - new ButtonSchema + new ButtonSchema(77, 67) { Name = $"P{controller} Key 9", - DisplayName = "9", - Location = new Point(77, 67) + DisplayName = "9" }, - new ButtonSchema + new ButtonSchema(25, 93) { Name = $"P{controller} Clear", - DisplayName = "C", - Location = new Point(25, 93) + DisplayName = "C" }, - new ButtonSchema + new ButtonSchema(51, 93) { Name = $"P{controller} Key 0", - DisplayName = "0", - Location = new Point(51, 93) + DisplayName = "0" }, - new ButtonSchema + new ButtonSchema(77, 93) { Name = $"P{controller} Enter", - DisplayName = "E", - Location = new Point(77, 93) + DisplayName = "E" }, - new ButtonSchema + new ButtonSchema(2, 41) { Name = $"P{controller} Top", - DisplayName = "T", - Location = new Point(2, 41) + DisplayName = "T" }, - new ButtonSchema + new ButtonSchema(100, 41) { Name = $"P{controller} Top", - DisplayName = "T", - Location = new Point(100, 41) + DisplayName = "T" }, - new ButtonSchema + new ButtonSchema(2, 67) { Name = $"P{controller} L", - DisplayName = "L", - Location = new Point(2, 67) + DisplayName = "L" }, - new ButtonSchema + new ButtonSchema(100, 67) { Name = $"P{controller} R", - DisplayName = "R", - Location = new Point(100, 67) + DisplayName = "R" }, /************** Directional Pad *******************/ - new ButtonSchema + new ButtonSchema(51, 124) { Name = $"P{controller} N", - Icon = Properties.Resources.BlueUp, - Location = new Point(51, 124) + Icon = Properties.Resources.BlueUp }, - new ButtonSchema + new ButtonSchema(63, 145) { Name = $"P{controller} NNE", - Icon = Properties.Resources.NNE, - Location = new Point(63, 145) + Icon = Properties.Resources.NNE }, - new ButtonSchema + new ButtonSchema(39, 145) { Name = $"P{controller} NNW", - Icon = Properties.Resources.NNW, - Location = new Point(39, 145) + Icon = Properties.Resources.NNW }, - new ButtonSchema + new ButtonSchema(75, 166) { Name = $"P{controller} NE", - Icon = Properties.Resources.NE, - Location = new Point(75, 166) + Icon = Properties.Resources.NE }, - new ButtonSchema + new ButtonSchema(27, 166) { Name = $"P{controller} NW", - Icon = Properties.Resources.NW, - Location = new Point(27, 166) + Icon = Properties.Resources.NW }, - new ButtonSchema + new ButtonSchema(87, 187) { Name = $"P{controller} ENE", - Icon = Properties.Resources.ENE, - Location = new Point(87, 187) + Icon = Properties.Resources.ENE }, - new ButtonSchema + new ButtonSchema(15, 187) { Name = $"P{controller} WNW", - Icon = Properties.Resources.WNW, - Location = new Point(15, 187) + Icon = Properties.Resources.WNW }, - new ButtonSchema + new ButtonSchema(99, 208) { Name = $"P{controller} E", - Icon = Properties.Resources.Forward, - Location = new Point(99, 208) + Icon = Properties.Resources.Forward }, - new ButtonSchema + new ButtonSchema(3, 208) { Name = $"P{controller} W", - Icon = Properties.Resources.Back, - Location = new Point(3, 208) + Icon = Properties.Resources.Back }, - new ButtonSchema + new ButtonSchema(87, 229) { Name = $"P{controller} ESE", - Icon = Properties.Resources.ESE, - Location = new Point(87, 229) + Icon = Properties.Resources.ESE }, - new ButtonSchema + new ButtonSchema(15, 229) { Name = $"P{controller} WSW", - Icon = Properties.Resources.WSW, - Location = new Point(15, 229) + Icon = Properties.Resources.WSW }, - new ButtonSchema + new ButtonSchema(75, 250) { Name = $"P{controller} SE", - Icon = Properties.Resources.SE, - Location = new Point(75, 250) + Icon = Properties.Resources.SE }, - new ButtonSchema + new ButtonSchema(27, 250) { Name = $"P{controller} SW", - Icon = Properties.Resources.SW, - Location = new Point(27, 250) + Icon = Properties.Resources.SW }, - new ButtonSchema + new ButtonSchema(63, 271) { Name = $"P{controller} SSE", - Icon = Properties.Resources.SSE, - Location = new Point(63, 271) + Icon = Properties.Resources.SSE }, - new ButtonSchema + new ButtonSchema(39, 271) { Name = $"P{controller} SSW", - Icon = Properties.Resources.SSW, - Location = new Point(39, 271) + Icon = Properties.Resources.SSW }, - new ButtonSchema + new ButtonSchema(51, 292) { Name = $"P{controller} S", - Icon = Properties.Resources.BlueDown, - Location = new Point(51, 292) + Icon = Properties.Resources.BlueDown } } }; @@ -260,110 +228,92 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(280, 332), Buttons = new[] { - new ButtonSchema + new ButtonSchema(91, 15) { Name = $"P{controller} Key 1", - DisplayName = "1", - Location = new Point(91, 15) + DisplayName = "1" }, - new ButtonSchema + new ButtonSchema(117, 15) { Name = $"P{controller} Key 2", - DisplayName = "2", - Location = new Point(117, 15) + DisplayName = "2" }, - new ButtonSchema + new ButtonSchema(143, 15) { Name = $"P{controller} Key 3", - DisplayName = "3", - Location = new Point(143, 15) + DisplayName = "3" }, - new ButtonSchema + new ButtonSchema(91, 41) { Name = $"P{controller} Key 4", - DisplayName = "4", - Location = new Point(91, 41) + DisplayName = "4" }, - new ButtonSchema + new ButtonSchema(117, 41) { Name = $"P{controller} Key 5", - DisplayName = "5", - Location = new Point(117, 41) + DisplayName = "5" }, - new ButtonSchema + new ButtonSchema(143, 41) { Name = $"P{controller} Key 6", - DisplayName = "6", - Location = new Point(143, 41) + DisplayName = "6" }, - new ButtonSchema + new ButtonSchema(91, 67) { Name = $"P{controller} Key 7", - DisplayName = "7", - Location = new Point(91, 67) + DisplayName = "7" }, - new ButtonSchema + new ButtonSchema(117, 67) { Name = $"P{controller} Key 8", - DisplayName = "8", - Location = new Point(117, 67) + DisplayName = "8" }, - new ButtonSchema + new ButtonSchema(143, 67) { Name = $"P{controller} Key 9", - DisplayName = "9", - Location = new Point(143, 67) + DisplayName = "9" }, - new ButtonSchema + new ButtonSchema(91, 93) { Name = $"P{controller} Clear", - DisplayName = "C", - Location = new Point(91, 93) + DisplayName = "C" }, - new ButtonSchema + new ButtonSchema(117, 93) { Name = $"P{controller} Key 0", - DisplayName = "0", - Location = new Point(117, 93) + DisplayName = "0" }, - new ButtonSchema + new ButtonSchema(143, 93) { Name = $"P{controller} Enter", - DisplayName = "E", - Location = new Point(143, 93) + DisplayName = "E" }, - new ButtonSchema + new ButtonSchema(68, 41) { Name = $"P{controller} Top", - DisplayName = "T", - Location = new Point(68, 41) + DisplayName = "T" }, - new ButtonSchema + new ButtonSchema(166, 41) { Name = $"P{controller} Top", - DisplayName = "T", - Location = new Point(166, 41) + DisplayName = "T" }, - - new ButtonSchema + new ButtonSchema(68, 67) { Name = $"P{controller} L", - DisplayName = "L", - Location = new Point(68, 67) + DisplayName = "L" }, - new ButtonSchema + new ButtonSchema(166, 67) { Name = $"P{controller} R", - DisplayName = "R", - Location = new Point(166, 67) + DisplayName = "R" }, - new ButtonSchema + new ButtonSchema(1, 121) { Name = $"P{controller} Disc X", AxisRange = controllerDefRanges[0], SecondaryAxisRange = controllerDefRanges[1], - Location = new Point(1, 121), Type = PadInputType.AnalogStick } } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs index 8a0dc955f2..bb88e18536 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs @@ -22,37 +22,15 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(194, 90), Buttons = new[] { - ButtonSchema.Up("Up", 14, 12), - ButtonSchema.Down("Down", 14, 56), - ButtonSchema.Left("Left", 2, 34), - ButtonSchema.Right($"Right", 24, 34), - new ButtonSchema - { - Name = "B", - Location = new Point(130, 62) - }, - new ButtonSchema - { - Name = "A", - Location = new Point(154, 62) - }, - new ButtonSchema - { - Name = "Option 1", - DisplayName = "1", - Location = new Point(100, 12) - }, - new ButtonSchema - { - Name = "Option 2", - DisplayName = "2", - Location = new Point(100, 62) - }, - new ButtonSchema - { - Name = "Pause", - Location = new Point(100, 37) - } + ButtonSchema.Up(14, 12, "Up"), + ButtonSchema.Down(14, 56, "Down"), + ButtonSchema.Left(2, 34, "Left"), + ButtonSchema.Right(24, 34, "Right"), + new ButtonSchema(130, 62) { Name = "B" }, + new ButtonSchema(154, 62) { Name = "A" }, + new ButtonSchema(100, 12) { Name = "Option 1", DisplayName = "1" }, + new ButtonSchema(100, 62) { Name = "Option 2", DisplayName = "2" }, + new ButtonSchema(100, 37) { Name = "Pause" } } }; } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs index f89548b508..321d8399cb 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs @@ -31,76 +31,65 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(275, 316), Buttons = new[] { - ButtonSchema.Up($"P{controller} DPad U", 24, 230), - ButtonSchema.Down($"P{controller} DPad D", 24, 251), - ButtonSchema.Left($"P{controller} DPad L", 3, 242), - ButtonSchema.Right($"P{controller} DPad R", 45, 242), - new ButtonSchema + ButtonSchema.Up(24, 230, $"P{controller} DPad U"), + ButtonSchema.Down(24, 251, $"P{controller} DPad D"), + ButtonSchema.Left(3, 242, $"P{controller} DPad L"), + ButtonSchema.Right(45, 242, $"P{controller} DPad R"), + new ButtonSchema(3, 185) { Name = $"P{controller} L", - DisplayName = "L", - Location = new Point(3, 185) + DisplayName = "L" }, - new ButtonSchema + new ButtonSchema(191, 185) { Name = $"P{controller} R", - DisplayName = "R", - Location = new Point(191, 185) + DisplayName = "R" }, - new ButtonSchema + new ButtonSchema(81, 269) { Name = $"P{controller} Z", - DisplayName = "Z", - Location = new Point(81, 269) + DisplayName = "Z" }, - new ButtonSchema + new ButtonSchema(81, 246) { Name = $"P{controller} Start", - DisplayName = "S", - Location = new Point(81, 246) + DisplayName = "S" }, - new ButtonSchema + new ButtonSchema(127, 246) { Name = $"P{controller} B", - DisplayName = "B", - Location = new Point(127, 246) + DisplayName = "B" }, - new ButtonSchema + new ButtonSchema(138, 269) { Name = $"P{controller} A", - DisplayName = "A", - Location = new Point(138, 269) + DisplayName = "A" }, - new ButtonSchema + new ButtonSchema(173, 210) { Name = $"P{controller} C Up", - Icon = Properties.Resources.YellowUp, - Location = new Point(173, 210) + Icon = Properties.Resources.YellowUp }, - new ButtonSchema + new ButtonSchema(173, 231) { Name = $"P{controller} C Down", - Icon = Properties.Resources.YellowDown, - Location = new Point(173, 231) + Icon = Properties.Resources.YellowDown }, - new ButtonSchema + new ButtonSchema(152, 221) { Name = $"P{controller} C Left", - Icon = Properties.Resources.YellowLeft, - Location = new Point(152, 221) + Icon = Properties.Resources.YellowLeft }, - new ButtonSchema + new ButtonSchema(194, 221) { Name = $"P{controller} C Right", - Icon = Properties.Resources.YellowRight, - Location = new Point(194, 221) + Icon = Properties.Resources.YellowRight }, - new ButtonSchema + new ButtonSchema(6, 14) { Name = $"P{controller} X Axis", AxisRange = controllerDefRanges[0], SecondaryAxisRange = controllerDefRanges[1], - Location = new Point(6, 14), Type = PadInputType.AnalogStick } } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NdsSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NdsSchema.cs index 0ffd29ce5c..b0bbbfb860 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NdsSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NdsSchema.cs @@ -22,11 +22,7 @@ namespace BizHawk.Client.EmuHawk.tools.VirtualPads.schema DefaultSize = new Size(50, 35), Buttons = new [] { - new ButtonSchema - { - Name = "Lid", - Location = new Point(8, 8) - } + new ButtonSchema(8, 8) { Name = "Lid" } } }; } @@ -39,68 +35,28 @@ namespace BizHawk.Client.EmuHawk.tools.VirtualPads.schema DefaultSize = new Size(440, 260), Buttons = new [] { - ButtonSchema.Up("Up", 14, 79), - ButtonSchema.Down("Down", 14, 122), - ButtonSchema.Left("Left", 2, 100), - ButtonSchema.Right("Right", 24, 100), - new ButtonSchema - { - Name = "L", - Location = new Point(2, 10) - }, - new ButtonSchema - { - Name = "R", - Location = new Point(366, 10) - }, - new ButtonSchema - { - Name = "Start", - Location = new Point(341, 179) - }, - new ButtonSchema - { - Name = "Select", - Location = new Point(341, 201) - }, - new ButtonSchema - { - Name = "Y", - Location = new Point(341, 100) - }, - new ButtonSchema - { - Name = "B", - Location = new Point(365, 113) - }, - new ButtonSchema - { - Name = "X", - Location = new Point(341, 76) - }, - new ButtonSchema - { - Name = "A", - Location = new Point(366, 86) - }, + ButtonSchema.Up(14, 79, "Up"), + ButtonSchema.Down(14, 122, "Down"), + ButtonSchema.Left(2, 100, "Left"), + ButtonSchema.Right(24, 100, "Right"), + new ButtonSchema(2, 10) { Name = "L" }, + new ButtonSchema(366, 10) { Name = "R" }, + new ButtonSchema(341, 179) { Name = "Start" }, + new ButtonSchema(341, 201) { Name = "Select" }, + new ButtonSchema(341, 100) { Name = "Y" }, + new ButtonSchema(365, 113) { Name = "B" }, + new ButtonSchema(341, 76) { Name = "X" }, + new ButtonSchema(366, 86) { Name = "A" }, // Screen - new ButtonSchema + new ButtonSchema(72, 35) { Name = "TouchX", - Location = new Point(72, 35), Type = PadInputType.TargetedPair, TargetSize = new Size(256, 192), - SecondaryNames = new[] - { - "TouchY" - } + SecondaryNames = new[] { "TouchY" } }, - new ButtonSchema - { - Name = "Touch", - Location = new Point(72, 10) - } + new ButtonSchema(72, 10) { Name = "Touch" } } }; } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs index 88813de721..79e8332a06 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs @@ -169,16 +169,8 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(150, 50), Buttons = new[] { - new ButtonSchema - { - Name = "Reset", - Location = new Point(10, 15) - }, - new ButtonSchema - { - Name = "Power", - Location = new Point(58, 15) - } + new ButtonSchema(10, 15) { Name = "Reset" }, + new ButtonSchema(58, 15) { Name = "Power" } } }; } @@ -187,31 +179,21 @@ namespace BizHawk.Client.EmuHawk { var buttons = new List { - new ButtonSchema - { - Name = "Reset", - Location = new Point(10, 15) - }, - new ButtonSchema - { - Name = "Power", - Location = new Point(58, 15) - }, - new ButtonSchema + new ButtonSchema(10, 15) { Name = "Reset" }, + new ButtonSchema(58, 15) { Name = "Power" }, + new ButtonSchema(108, 15) { Name = "FDS Eject", - DisplayName = "Eject", - Location = new Point(108, 15) + DisplayName = "Eject" } }; for (var i = 0; i < diskSize; i++) { - buttons.Add(new ButtonSchema + buttons.Add(new ButtonSchema(10 + (i * 58), 50) { Name = $"FDS Insert {i}", - DisplayName = $"Insert {i}", - Location = new Point(10 + (i * 58), 50) + DisplayName = $"Insert {i}" }); } @@ -240,33 +222,29 @@ namespace BizHawk.Client.EmuHawk MaxSize = new Size(174, 74), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 23, 15), - ButtonSchema.Down($"P{controller} Down", 23, 36), - ButtonSchema.Left($"P{controller} Left", 2, 24), - ButtonSchema.Right($"P{controller} Right", 44, 24), - new ButtonSchema + ButtonSchema.Up(23, 15, $"P{controller} Up"), + ButtonSchema.Down(23, 36, $"P{controller} Down"), + ButtonSchema.Left(2, 24, $"P{controller} Left"), + ButtonSchema.Right(44, 24, $"P{controller} Right"), + new ButtonSchema(124, 24) { Name = $"P{controller} B", - DisplayName = "B", - Location = new Point(124, 24) + DisplayName = "B" }, - new ButtonSchema + new ButtonSchema(147, 24) { Name = $"P{controller} A", - DisplayName = "A", - Location = new Point(147, 24) + DisplayName = "A" }, - new ButtonSchema + new ButtonSchema(72, 24) { Name = $"P{controller} Select", - DisplayName = "s", - Location = new Point(72, 24) + DisplayName = "s" }, - new ButtonSchema + new ButtonSchema(93, 24) { Name = $"P{controller} Start", - DisplayName = "S", - Location = new Point(93, 24) + DisplayName = "S" } } }; @@ -283,27 +261,24 @@ namespace BizHawk.Client.EmuHawk MaxSize = new Size(174, 74), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 23, 15), - ButtonSchema.Down($"P{controller} Down", 23, 36), - ButtonSchema.Left($"P{controller} Left", 2, 24), - ButtonSchema.Right($"P{controller} Right", 44, 24), - new ButtonSchema + ButtonSchema.Up(23, 15, $"P{controller} Up"), + ButtonSchema.Down(23, 36, $"P{controller} Down"), + ButtonSchema.Left(2, 24, $"P{controller} Left"), + ButtonSchema.Right(44, 24, $"P{controller} Right"), + new ButtonSchema(124, 24) { Name = $"P{controller} B", - DisplayName = "B", - Location = new Point(124, 24) + DisplayName = "B" }, - new ButtonSchema + new ButtonSchema(147, 24) { Name = $"P{controller} A", - DisplayName = "A", - Location = new Point(147, 24) + DisplayName = "A" }, - new ButtonSchema + new ButtonSchema(72, 24) { Name = $"P{controller} Microphone", - DisplayName = "Mic", - Location = new Point(72, 24) + DisplayName = "Mic" } } }; @@ -319,10 +294,9 @@ namespace BizHawk.Client.EmuHawk MaxSize = new Size(356, 290), Buttons = new[] { - new ButtonSchema + new ButtonSchema(14, 17) { Name = $"P{controller} Zapper X", - Location = new Point(14, 17), Type = PadInputType.TargetedPair, TargetSize = new Size(256, 240), SecondaryNames = new[] @@ -330,11 +304,10 @@ namespace BizHawk.Client.EmuHawk $"P{controller} Zapper Y" } }, - new ButtonSchema + new ButtonSchema(284, 17) { Name = $"P{controller} Fire", - DisplayName = "Fire", - Location = new Point(284, 17) + DisplayName = "Fire" } } }; @@ -350,20 +323,18 @@ namespace BizHawk.Client.EmuHawk MaxSize = new Size(380, 110), Buttons = new[] { - new ButtonSchema + new ButtonSchema(14, 17) { Name = $"P{controller} Paddle", DisplayName = "Arkanoid Paddle", - Location = new Point(14, 17), Type = PadInputType.FloatSingle, TargetSize = new Size(380, 69), MaxValue = 160 }, - new ButtonSchema + new ButtonSchema(14, 85) { Name = $"P{controller} Fire", - DisplayName = "Fire", - Location = new Point(14, 85) + DisplayName = "Fire" } } }; @@ -378,78 +349,66 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(154, 114), Buttons = new[] { - new ButtonSchema + new ButtonSchema(14, 17) { Name = $"P{controller} PP1", - DisplayName = "1 ", - Location = new Point(14, 17) + DisplayName = "1 " }, - new ButtonSchema + new ButtonSchema(45, 17) { Name = $"P{controller} PP2", - DisplayName = "2 ", - Location = new Point(45, 17) + DisplayName = "2 " }, - new ButtonSchema + new ButtonSchema(76, 17) { Name = $"P{controller} PP3", - DisplayName = "3 ", - Location = new Point(76, 17) + DisplayName = "3 " }, - new ButtonSchema + new ButtonSchema(107, 17) { Name = $"P{controller} PP4", - DisplayName = "4 ", - Location = new Point(107, 17) + DisplayName = "4 " }, - new ButtonSchema + new ButtonSchema(14, 48) { Name = $"P{controller} PP5", - DisplayName = "5 ", - Location = new Point(14, 48) + DisplayName = "5 " }, - new ButtonSchema + new ButtonSchema(45, 48) { Name = $"P{controller} PP6", - DisplayName = "6 ", - Location = new Point(45, 48) + DisplayName = "6 " }, - new ButtonSchema + new ButtonSchema(76, 48) { Name = $"P{controller} PP7", - DisplayName = "7 ", - Location = new Point(76, 48) + DisplayName = "7 " }, - new ButtonSchema + new ButtonSchema(107, 48) { Name = $"P{controller} PP8", - DisplayName = "8 ", - Location = new Point(107, 48) + DisplayName = "8 " }, - new ButtonSchema + new ButtonSchema(14, 79) { Name = $"P{controller} PP9", - DisplayName = "9 ", - Location = new Point(14, 79) + DisplayName = "9 " }, - new ButtonSchema + new ButtonSchema(45, 79) { Name = $"P{controller} PP10", - DisplayName = "10", - Location = new Point(45, 79) + DisplayName = "10" }, - new ButtonSchema + new ButtonSchema(76, 79) { Name = $"P{controller} PP11", - DisplayName = "11", - Location = new Point(76, 79) + DisplayName = "11" }, - new ButtonSchema + new ButtonSchema(107, 79) { Name = $"P{controller} PP12", - DisplayName = "12", - Location = new Point(107, 79) + DisplayName = "12" } } }; @@ -465,10 +424,9 @@ namespace BizHawk.Client.EmuHawk MaxSize = new Size(356, 290), Buttons = new[] { - new ButtonSchema + new ButtonSchema(14, 17) { Name = $"P{controller} Pen X", - Location = new Point(14, 17), Type = PadInputType.TargetedPair, TargetSize = new Size(256, 240), SecondaryNames = new[] @@ -476,17 +434,15 @@ namespace BizHawk.Client.EmuHawk $"P{controller} Pen Y" } }, - new ButtonSchema + new ButtonSchema(284, 17) { Name = $"P{controller} Click", - DisplayName = "Click", - Location = new Point(284, 17) + DisplayName = "Click" }, - new ButtonSchema + new ButtonSchema(284, 48) { Name = $"P{controller} Touch", - DisplayName = "Touch", - Location = new Point(284, 48) + DisplayName = "Touch" } } }; @@ -501,437 +457,366 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(560, 180), Buttons = new[] { - new ButtonSchema + new ButtonSchema(23, 15) { Name = $"P{controller} F1", - DisplayName = " F1 ", - Location = new Point(23, 15) + DisplayName = " F1 " }, - new ButtonSchema + new ButtonSchema(76, 15) { Name = $"P{controller} F2", - DisplayName = " F2 ", - Location = new Point(76, 15) + DisplayName = " F2 " }, - new ButtonSchema + new ButtonSchema(129, 15) { Name = $"P{controller} F3", - DisplayName = " F3 ", - Location = new Point(129, 15) + DisplayName = " F3 " }, - new ButtonSchema + new ButtonSchema(182, 15) { Name = $"P{controller} F4", - DisplayName = " F4 ", - Location = new Point(182, 15) + DisplayName = " F4 " }, - new ButtonSchema + new ButtonSchema(235, 15) { Name = $"P{controller} F5", - DisplayName = " F5 ", - Location = new Point(235, 15) + DisplayName = " F5 " }, - new ButtonSchema + new ButtonSchema(288, 15) { Name = $"P{controller} F6", - DisplayName = " F6 ", - Location = new Point(288, 15) + DisplayName = " F6 " }, - new ButtonSchema + new ButtonSchema(341, 15) { Name = $"P{controller} F7", - DisplayName = " F7 ", - Location = new Point(341, 15) + DisplayName = " F7 " }, - new ButtonSchema + new ButtonSchema(394, 15) { Name = $"P{controller} F8", - DisplayName = " F8 ", - Location = new Point(394, 15) + DisplayName = " F8 " }, - new ButtonSchema + new ButtonSchema(36, 38) { Name = $"P{controller} 1", - DisplayName = "1", - Location = new Point(36, 38) + DisplayName = "1" }, - new ButtonSchema + new ButtonSchema(60, 38) { Name = $"P{controller} 2", - DisplayName = "2", - Location = new Point(60, 38) + DisplayName = "2" }, - new ButtonSchema + new ButtonSchema(84, 38) { Name = $"P{controller} 3", - DisplayName = "3", - Location = new Point(84, 38) + DisplayName = "3" }, - new ButtonSchema + new ButtonSchema(108, 38) { Name = $"P{controller} 4", - DisplayName = "4", - Location = new Point(108, 38) + DisplayName = "4" }, - new ButtonSchema + new ButtonSchema(132, 38) { Name = $"P{controller} 5", - DisplayName = "5", - Location = new Point(132, 38) + DisplayName = "5" }, - new ButtonSchema + new ButtonSchema(156, 38) { Name = $"P{controller} 6", - DisplayName = "6", - Location = new Point(156, 38) + DisplayName = "6" }, - new ButtonSchema + new ButtonSchema(180, 38) { Name = $"P{controller} 7", - DisplayName = "7", - Location = new Point(180, 38) + DisplayName = "7" }, - new ButtonSchema + new ButtonSchema(204, 38) { Name = $"P{controller} 8", - DisplayName = "8", - Location = new Point(204, 38) + DisplayName = "8" }, - new ButtonSchema + new ButtonSchema(228, 38) { Name = $"P{controller} 9", - DisplayName = "9", - Location = new Point(228, 38) + DisplayName = "9" }, - new ButtonSchema + new ButtonSchema(252, 38) { Name = $"P{controller} 0", - DisplayName = "0", - Location = new Point(252, 38) + DisplayName = "0" }, - new ButtonSchema + new ButtonSchema(276, 38) { Name = $"P{controller} Minus", - DisplayName = "-", - Location = new Point(276, 38) + DisplayName = "-" }, - new ButtonSchema + new ButtonSchema(296, 38) { Name = $"P{controller} Caret", - DisplayName = "^", - Location = new Point(296, 38) + DisplayName = "^" }, - new ButtonSchema + new ButtonSchema(320, 38) { Name = $"P{controller} Yen", - DisplayName = "¥", - Location = new Point(320, 38) + DisplayName = "¥" }, - new ButtonSchema + new ButtonSchema(344, 38) { Name = $"P{controller} Stop", - DisplayName = "STOP", - Location = new Point(344, 38) + DisplayName = "STOP" }, - new ButtonSchema + new ButtonSchema(15, 61) { Name = $"P{controller} Escape", - DisplayName = "ESC", - Location = new Point(15, 61) + DisplayName = "ESC" }, - new ButtonSchema + new ButtonSchema(54, 61) { Name = $"P{controller} Q", - DisplayName = "Q", - Location = new Point(54, 61) + DisplayName = "Q" }, - new ButtonSchema + new ButtonSchema(80, 61) { Name = $"P{controller} W", - DisplayName = "W", - Location = new Point(80, 61) + DisplayName = "W" }, - new ButtonSchema + new ButtonSchema(108, 61) { Name = $"P{controller} E", - DisplayName = "E", - Location = new Point(108, 61) + DisplayName = "E" }, - new ButtonSchema + new ButtonSchema(132, 61) { Name = $"P{controller} R", - DisplayName = "R", - Location = new Point(132, 61) + DisplayName = "R" }, - new ButtonSchema + new ButtonSchema(158, 61) { Name = $"P{controller} T", - DisplayName = "T", - Location = new Point(158, 61) + DisplayName = "T" }, - new ButtonSchema + new ButtonSchema(182, 61) { Name = $"P{controller} Y", - DisplayName = "Y", - Location = new Point(182, 61) + DisplayName = "Y" }, - new ButtonSchema + new ButtonSchema(206, 61) { Name = $"P{controller} U", - DisplayName = "U", - Location = new Point(206, 61) + DisplayName = "U" }, - new ButtonSchema + new ButtonSchema(232, 61) { Name = $"P{controller} I", - DisplayName = "I", - Location = new Point(232, 61) + DisplayName = "I" }, - new ButtonSchema + new ButtonSchema(252, 61) { Name = $"P{controller} O", - DisplayName = "O", - Location = new Point(252, 61) + DisplayName = "O" }, - new ButtonSchema + new ButtonSchema(278, 61) { Name = $"P{controller} P", - DisplayName = "P", - Location = new Point(278, 61) + DisplayName = "P" }, - new ButtonSchema + new ButtonSchema(302, 61) { Name = $"P{controller} At", - DisplayName = "@", - Location = new Point(302, 61) + DisplayName = "@" }, - new ButtonSchema + new ButtonSchema(330, 61) { Name = $"P{controller} Left Bracket", - DisplayName = "[", - Location = new Point(330, 61) + DisplayName = "[" }, - new ButtonSchema + new ButtonSchema(350, 61) { Name = $"P{controller} Return", - DisplayName = "RETURN", - Location = new Point(350, 61) + DisplayName = "RETURN" }, - new ButtonSchema + new ButtonSchema(30, 84) { Name = $"P{controller} Control", - DisplayName = "CTR", - Location = new Point(30, 84) + DisplayName = "CTR" }, - new ButtonSchema + new ButtonSchema(70, 84) { Name = $"P{controller} A", - DisplayName = "A", - Location = new Point(70, 84) + DisplayName = "A" }, - new ButtonSchema + new ButtonSchema(94, 84) { Name = $"P{controller} S", - DisplayName = "S", - Location = new Point(94, 84) + DisplayName = "S" }, - new ButtonSchema + new ButtonSchema(118, 84) { Name = $"P{controller} D", - DisplayName = "D", - Location = new Point(118, 84) + DisplayName = "D" }, - new ButtonSchema + new ButtonSchema(144, 84) { Name = $"P{controller} F", - DisplayName = "F", - Location = new Point(144, 84) + DisplayName = "F" }, - new ButtonSchema + new ButtonSchema(168, 84) { Name = $"P{controller} G", - DisplayName = "G", - Location = new Point(168, 84) + DisplayName = "G" }, - new ButtonSchema + new ButtonSchema(194, 84) { Name = $"P{controller} H", - DisplayName = "H", - Location = new Point(194, 84) + DisplayName = "H" }, - new ButtonSchema + new ButtonSchema(220, 84) { Name = $"P{controller} J", - DisplayName = "J", - Location = new Point(220, 84) + DisplayName = "J" }, - new ButtonSchema + new ButtonSchema(242, 84) { Name = $"P{controller} K", - DisplayName = "K", - Location = new Point(242, 84) + DisplayName = "K" }, - new ButtonSchema + new ButtonSchema(266, 84) { Name = $"P{controller} L", - DisplayName = "L", - Location = new Point(266, 84) + DisplayName = "L" }, - new ButtonSchema + new ButtonSchema(290, 84) { Name = $"P{controller} Semicolon", - DisplayName = ";", - Location = new Point(290, 84) + DisplayName = ";" }, - new ButtonSchema + new ButtonSchema(311, 84) { Name = $"P{controller} Colon", DisplayName = ":", Location = new Point(311, 84) }, - new ButtonSchema + new ButtonSchema(332, 84) { Name = $"P{controller} Right Bracket", - DisplayName = "]", - Location = new Point(332, 84) + DisplayName = "]" }, - new ButtonSchema + new ButtonSchema(352, 84) { Name = $"P{controller} カナ", - DisplayName = "カナ", - Location = new Point(352, 84) + DisplayName = "カナ" }, - new ButtonSchema + new ButtonSchema(10, 107) { Name = $"P{controller} Left Shift", - DisplayName = "SHIFT", - Location = new Point(10, 107) + DisplayName = "SHIFT" }, - new ButtonSchema + new ButtonSchema(58, 107) { Name = $"P{controller} Z", - DisplayName = "Z", - Location = new Point(58, 107) + DisplayName = "Z" }, - new ButtonSchema + new ButtonSchema(82, 107) { Name = $"P{controller} X", - DisplayName = "X", - Location = new Point(82, 107) + DisplayName = "X" }, - new ButtonSchema + new ButtonSchema(106, 107) { Name = $"P{controller} C", - DisplayName = "C", - Location = new Point(106, 107) + DisplayName = "C" }, - new ButtonSchema + new ButtonSchema(130, 107) { Name = $"P{controller} V", - DisplayName = "V", - Location = new Point(130, 107) + DisplayName = "V" }, - new ButtonSchema + new ButtonSchema(154, 107) { Name = $"P{controller} B", - DisplayName = "B", - Location = new Point(154, 107) + DisplayName = "B" }, - new ButtonSchema + new ButtonSchema(178, 107) { Name = $"P{controller} N", - DisplayName = "N", - Location = new Point(178, 107) + DisplayName = "N" }, - new ButtonSchema + new ButtonSchema(203, 107) { Name = $"P{controller} M", - DisplayName = "M", - Location = new Point(203, 107) + DisplayName = "M" }, - new ButtonSchema + new ButtonSchema(229, 107) { Name = $"P{controller} Comma", - DisplayName = ",", - Location = new Point(229, 107) + DisplayName = "," }, - new ButtonSchema + new ButtonSchema(249, 107) { Name = $"P{controller} Period", - DisplayName = ".", - Location = new Point(249, 107) + DisplayName = "." }, - new ButtonSchema + new ButtonSchema(270, 107) { Name = $"P{controller} Slash", - DisplayName = "/", - Location = new Point(270, 107) + DisplayName = "/" }, - new ButtonSchema + new ButtonSchema(292, 107) { Name = $"P{controller} Underscore", - DisplayName = "_", - Location = new Point(292, 107) + DisplayName = "_" }, - new ButtonSchema + new ButtonSchema(316, 107) { Name = $"P{controller} Right Shift", - DisplayName = "SHIFT", - Location = new Point(316, 107) + DisplayName = "SHIFT" }, - new ButtonSchema + new ButtonSchema(82, 130) { Name = $"P{controller} Graph", - DisplayName = "GRPH", - Location = new Point(82, 130) + DisplayName = "GRPH" }, - new ButtonSchema + new ButtonSchema(130, 130) { Name = $"P{controller} Space", - DisplayName = " SPACE ", - Location = new Point(130, 130) + DisplayName = " SPACE " }, - new ButtonSchema + new ButtonSchema(420, 46) { Name = $"P{controller} Clear/Home", - DisplayName = " CLR\nHOME", - Location = new Point(420, 46) + DisplayName = " CLR\nHOME" }, - new ButtonSchema + new ButtonSchema(470, 46) { Name = $"P{controller} Insert", - DisplayName = "\nINS", - Location = new Point(470, 46) + DisplayName = "\nINS" }, - new ButtonSchema + new ButtonSchema(506, 46) { Name = $"P{controller} Delete", - DisplayName = "\nDEL", - Location = new Point(506, 46) + DisplayName = "\nDEL" }, - new ButtonSchema + new ButtonSchema(468, 86) { Name = $"P{controller} Up", - DisplayName = " ↑ ", - Location = new Point(468, 86) + DisplayName = " ↑ " }, - new ButtonSchema + new ButtonSchema(468, 134) { Name = $"P{controller} Down", - DisplayName = " ↓ ", - Location = new Point(468, 134) + DisplayName = " ↓ " }, - new ButtonSchema + new ButtonSchema(446, 110) { Name = $"P{controller} Left", - DisplayName = " ← ", - Location = new Point(446, 110) + DisplayName = " ← " }, - new ButtonSchema + new ButtonSchema(488, 110) { Name = $"P{controller} Right", - DisplayName = " ➝ ", - Location = new Point(488, 110) + DisplayName = " ➝ " } } }; diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs index 11337063e6..64377eeb2c 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs @@ -23,27 +23,24 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(174, 79), Buttons = new[] { - ButtonSchema.Up("Up", 14, 12), - ButtonSchema.Down("Down", 14, 56), - ButtonSchema.Left("Left", 2, 34), - ButtonSchema.Right("Right", 24, 34), - new ButtonSchema + ButtonSchema.Up(14, 12, "Up"), + ButtonSchema.Down(14, 56, "Down"), + ButtonSchema.Left(2, 34, "Left"), + ButtonSchema.Right(24, 34, "Right"), + new ButtonSchema(74, 34) { Name = "B", - DisplayName = "B", - Location = new Point(74, 34) + DisplayName = "B" }, - new ButtonSchema + new ButtonSchema(98, 34) { Name = "A", - DisplayName = "A", - Location = new Point(98, 34) + DisplayName = "A" }, - new ButtonSchema + new ButtonSchema(146, 12) { Name = "Option", - DisplayName = "O", - Location = new Point(146, 12) + DisplayName = "O" } } }; @@ -58,11 +55,7 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(75, 50), Buttons = new[] { - new ButtonSchema - { - Name = "Power", - Location = new Point(10, 15) - } + new ButtonSchema(10, 15) { Name = "Power" } } }; } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/O2Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/O2Schema.cs index 81019a116b..ed87e853af 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/O2Schema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/O2Schema.cs @@ -35,15 +35,14 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(100, 100), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 14, 12), - ButtonSchema.Down($"P{controller} Down", 14, 56), - ButtonSchema.Left($"P{controller} Left", 2, 34), - ButtonSchema.Right($"P{controller} Right", 24, 34), - new ButtonSchema + ButtonSchema.Up(14, 12, $"P{controller} Up"), + ButtonSchema.Down(14, 56, $"P{controller} Down"), + ButtonSchema.Left(2, 34, $"P{controller} Left"), + ButtonSchema.Right(24, 34, $"P{controller} Right"), + new ButtonSchema(74, 34) { Name = $"P{controller} F", - DisplayName = "F", - Location = new Point(74, 34) + DisplayName = "F" } } }; diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs index 4d005550f7..a6820eedf3 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs @@ -54,96 +54,82 @@ namespace BizHawk.Client.EmuHawk DisplayName = $"DualShock Player{controller}", Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 32, 50), - ButtonSchema.Down($"P{controller} Down", 32, 71), - ButtonSchema.Left($"P{controller} Left", 11, 62), - ButtonSchema.Right($"P{controller} Right", 53, 62), - new ButtonSchema + ButtonSchema.Up(32, 50, $"P{controller} Up"), + ButtonSchema.Down(32, 71, $"P{controller} Down"), + ButtonSchema.Left(11, 62, $"P{controller} Left"), + ButtonSchema.Right(53, 62, $"P{controller} Right"), + new ButtonSchema(3, 32) { Name = $"P{controller} L1", - DisplayName = "L1", - Location = new Point(3, 32) + DisplayName = "L1" }, - new ButtonSchema + new ButtonSchema(191, 32) { Name = $"P{controller} R1", - DisplayName = "R1", - Location = new Point(191, 32) + DisplayName = "R1" }, - new ButtonSchema + new ButtonSchema(3, 10) { Name = $"P{controller} L2", - DisplayName = "L2", - Location = new Point(3, 10) + DisplayName = "L2" }, - new ButtonSchema + new ButtonSchema(191, 10) { Name = $"P{controller} R2", - DisplayName = "R2", - Location = new Point(191, 10) + DisplayName = "R2" }, - new ButtonSchema + new ButtonSchema(72, 90) { Name = $"P{controller} L3", - DisplayName = "L3", - Location = new Point(72, 90) + DisplayName = "L3" }, - new ButtonSchema + new ButtonSchema(130, 90) { Name = $"P{controller} R3", - DisplayName = "R3", - Location = new Point(130, 90) + DisplayName = "R3" }, - new ButtonSchema + new ButtonSchema(148, 62) { Name = $"P{controller} Square", - Icon = Properties.Resources.Square, - Location = new Point(148, 62) + Icon = Properties.Resources.Square }, - new ButtonSchema + new ButtonSchema(169, 50) { Name = $"P{controller} Triangle", - Icon = Properties.Resources.Triangle, - Location = new Point(169, 50) + Icon = Properties.Resources.Triangle }, - new ButtonSchema + new ButtonSchema(190, 62) { Name = $"P{controller} Circle", - Icon = Properties.Resources.Circle, - Location = new Point(190, 62) + Icon = Properties.Resources.Circle }, - new ButtonSchema + new ButtonSchema(169, 71) { Name = $"P{controller} Cross", - Icon = Properties.Resources.Cross, - Location = new Point(169, 71) + Icon = Properties.Resources.Cross }, - new ButtonSchema + new ButtonSchema(112, 62) { Name = $"P{controller} Start", - DisplayName = "S", - Location = new Point(112, 62) + DisplayName = "S" }, - new ButtonSchema + new ButtonSchema(90, 62) { Name = $"P{controller} Select", - DisplayName = "s", - Location = new Point(90, 62) + DisplayName = "s" }, - new ButtonSchema + new ButtonSchema(3, 120) { Name = $"P{controller} LStick X", AxisRange = stickRanges[0], SecondaryAxisRange = stickRanges[1], - Location = new Point(3, 120), Type = PadInputType.AnalogStick }, - new ButtonSchema + new ButtonSchema(260, 120) { Name = $"P{controller} RStick X", AxisRange = stickRanges[0], SecondaryAxisRange = stickRanges[1], - Location = new Point(260, 120), Type = PadInputType.AnalogStick } } @@ -159,69 +145,59 @@ namespace BizHawk.Client.EmuHawk DisplayName = $"Gamepad Player{controller}", Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 37, 55), - ButtonSchema.Down($"P{controller} Down", 37, 76), - ButtonSchema.Left($"P{controller} Left", 16, 67), - ButtonSchema.Right($"P{controller} Right", 58, 67), - new ButtonSchema + ButtonSchema.Up(37, 55, $"P{controller} Up"), + ButtonSchema.Down(37, 76, $"P{controller} Down"), + ButtonSchema.Left(16, 67, $"P{controller} Left"), + ButtonSchema.Right(58, 67, $"P{controller} Right"), + new ButtonSchema(8, 37) { Name = $"P{controller} L1", - DisplayName = "L1", - Location = new Point(8, 37) + DisplayName = "L1" }, - new ButtonSchema + new ButtonSchema(196, 37) { Name = $"P{controller} R1", - DisplayName = "R1", - Location = new Point(196, 37) + DisplayName = "R1" }, - new ButtonSchema + new ButtonSchema(8, 15) { Name = $"P{controller} L2", - DisplayName = "L2", - Location = new Point(8, 15) + DisplayName = "L2" }, - new ButtonSchema + new ButtonSchema(196, 15) { Name = $"P{controller} R2", - DisplayName = "R2", - Location = new Point(196, 15) + DisplayName = "R2" }, - new ButtonSchema + new ButtonSchema(153, 67) { Name = $"P{controller} Square", - Icon = Properties.Resources.Square, - Location = new Point(153, 67) + Icon = Properties.Resources.Square }, - new ButtonSchema + new ButtonSchema(174, 55) { Name = $"P{controller} Triangle", - Icon = Properties.Resources.Triangle, - Location = new Point(174, 55) + Icon = Properties.Resources.Triangle }, - new ButtonSchema + new ButtonSchema(195, 67) { Name = $"P{controller} Circle", - Icon = Properties.Resources.Circle, - Location = new Point(195, 67) + Icon = Properties.Resources.Circle }, - new ButtonSchema + new ButtonSchema(174, 76) { Name = $"P{controller} Cross", - Icon = Properties.Resources.Cross, - Location = new Point(174, 76) + Icon = Properties.Resources.Cross }, - new ButtonSchema + new ButtonSchema(112, 67) { Name = $"P{controller} Start", - DisplayName = "S", - Location = new Point(112, 67) + DisplayName = "S" }, - new ButtonSchema + new ButtonSchema(90, 67) { Name = $"P{controller} Select", - DisplayName = "s", - Location = new Point(90, 67) + DisplayName = "s" } } }; @@ -236,73 +212,63 @@ namespace BizHawk.Client.EmuHawk DisplayName = $"NeGcon Player{controller}", Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 36, 83), - ButtonSchema.Down($"P{controller} Down", 36, 104), - ButtonSchema.Left($"P{controller} Left", 15, 95), - ButtonSchema.Right($"P{controller} Right", 57, 95), - new ButtonSchema + ButtonSchema.Up(36, 83, $"P{controller} Up"), + ButtonSchema.Down(36, 104, $"P{controller} Down"), + ButtonSchema.Left(15, 95, $"P{controller} Left"), + ButtonSchema.Right(57, 95, $"P{controller} Right"), + new ButtonSchema(78, 118) { Name = $"P{controller} Start", - DisplayName = "S", - Location = new Point(78, 118) + DisplayName = "S" }, - - new ButtonSchema + new ButtonSchema(278, 38) { Name = $"P{controller} B", - DisplayName = "B", - Location = new Point(278, 38) + DisplayName = "B" }, - new ButtonSchema + new ButtonSchema(308, 55) { Name = $"P{controller} A", - DisplayName = "A", - Location = new Point(308, 55) + DisplayName = "A" }, - new ButtonSchema + new ButtonSchema(308, 15) { Name = $"P{controller} R", - DisplayName = "R", - Location = new Point(308, 15) + DisplayName = "R" }, - - new ButtonSchema + new ButtonSchema(5, 15) { Name = $"P{controller} L", DisplayName = "L", - Location = new Point(5, 15), Type = PadInputType.FloatSingle, TargetSize = new Size(128, 55), MinValue = 0, MaxValue = 255 }, - new ButtonSchema + new ButtonSchema(125, 15) { Name = $"P{controller} Twist", DisplayName = "Twist", - Location = new Point(125, 15), Type = PadInputType.FloatSingle, TargetSize = new Size(64, 178), MinValue = 0, MaxValue = 255, Orientation = Orientation.Vertical }, - new ButtonSchema + new ButtonSchema(180, 60) { Name = $"P{controller} 2", DisplayName = "II", - Location = new Point(180, 60), Type = PadInputType.FloatSingle, TargetSize = new Size(128, 55), MinValue = 0, MaxValue = 255 }, - new ButtonSchema + new ButtonSchema(220, 120) { Name = $"P{controller} 1", DisplayName = "I", - Location = new Point(220, 120), Type = PadInputType.FloatSingle, TargetSize = new Size(128, 55), MinValue = 0, @@ -321,16 +287,11 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(310, 400), Buttons = new[] { - new ButtonSchema - { - Name = "Reset", - Location = new Point(10, 15) - }, - new ButtonSchema + new ButtonSchema(10, 15) { Name = "Reset" }, + new ButtonSchema(10, 54) { Name = "Disc Select", // not really, but shuts up a warning Type = PadInputType.DiscManager, - Location = new Point(10, 54), TargetSize = new Size(300, 300), OwnerEmulator = psx, SecondaryNames = new[] { "Open", "Close", "Disc Select" } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs index 0a70564f1c..5b0ee805a8 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs @@ -56,33 +56,29 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(174, 90), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 14, 12), - ButtonSchema.Down($"P{controller} Down", 14, 56), - ButtonSchema.Left($"P{controller} Left", 2, 34), - ButtonSchema.Right($"P{controller} Right", 24, 34), - new ButtonSchema + ButtonSchema.Up(14, 12, $"P{controller} Up"), + ButtonSchema.Down(14, 56, $"P{controller} Down"), + ButtonSchema.Left(2, 34, $"P{controller} Left"), + ButtonSchema.Right(24, 34, $"P{controller} Right"), + new ButtonSchema(122, 34) { Name = $"P{controller} B2", - DisplayName = "II", - Location = new Point(122, 34) + DisplayName = "II" }, - new ButtonSchema + new ButtonSchema(146, 34) { Name = $"P{controller} B1", - DisplayName = "I", - Location = new Point(146, 34) + DisplayName = "I" }, - new ButtonSchema + new ButtonSchema(52, 34) { Name = $"P{controller} Select", - DisplayName = "s", - Location = new Point(52, 34) + DisplayName = "s" }, - new ButtonSchema + new ButtonSchema(74, 34) { Name = $"P{controller} Run", - DisplayName = "R", - Location = new Point(74, 34) + DisplayName = "R" } } }; diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs index 284dc614da..7f09c67668 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs @@ -49,70 +49,59 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(230, 100), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 34, 17), - ButtonSchema.Down($"P{controller} Down", 34, 61), - ButtonSchema.Left($"P{controller} Left", 22, 39), - ButtonSchema.Right($"P{controller} Right", 44, 39), - new ButtonSchema + ButtonSchema.Up(34, 17, $"P{controller} Up"), + ButtonSchema.Down(34, 61, $"P{controller} Down"), + ButtonSchema.Left(22, 39, $"P{controller} Left"), + ButtonSchema.Right(44, 39, $"P{controller} Right"), + new ButtonSchema(74, 17) { Name = $"P{controller} Mode 1", - DisplayName = "Mode 1", - Location = new Point(74, 17) + DisplayName = "Mode 1" }, - new ButtonSchema + new ButtonSchema(74, 40) { Name = $"P{controller} Mode 2", - DisplayName = "Mode 2", - Location = new Point(74, 40) + DisplayName = "Mode 2" }, - new ButtonSchema + new ButtonSchema(77, 63) { Name = $"P{controller} Select", - DisplayName = "s", - Location = new Point(77, 63) + DisplayName = "s" }, - new ButtonSchema + new ButtonSchema(101, 63) { Name = $"P{controller} Run", - DisplayName = "R", - Location = new Point(101, 63) + DisplayName = "R" }, - - new ButtonSchema + new ButtonSchema(140, 63) { Name = $"P{controller} IV", - DisplayName = "IV", - Location = new Point(140, 63) + DisplayName = "IV" }, - new ButtonSchema + new ButtonSchema(166, 53) { Name = $"P{controller} V", - DisplayName = "V", - Location = new Point(166, 53) + DisplayName = "V" }, - new ButtonSchema + new ButtonSchema(192, 43) { Name = $"P{controller} VI", - DisplayName = "VI", - Location = new Point(192, 43) + DisplayName = "VI" }, - new ButtonSchema + new ButtonSchema(140, 40) { Name = $"P{controller} I", - DisplayName = "I", - Location = new Point(140, 40) + DisplayName = "I" }, - new ButtonSchema + new ButtonSchema(166, 30) { Name = $"P{controller} II", - DisplayName = "II", - Location = new Point(166, 30) + DisplayName = "II" }, - new ButtonSchema + new ButtonSchema(192, 20) { Name = $"P{controller} III", - DisplayName = "III", - Location = new Point(192, 20) + DisplayName = "III" } } }; @@ -127,25 +116,22 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(375, 320), Buttons = new[] { - new ButtonSchema + new ButtonSchema(14, 17) { Name = $"P{controller} X", SecondaryNames = new[] { $"P{controller} Y" }, - Location = new Point(14, 17), Type = PadInputType.TargetedPair, TargetSize = new Size(256, 256) }, - new ButtonSchema + new ButtonSchema(300, 17) { Name = $"P{controller} Mouse Left", - DisplayName = "Left", - Location = new Point(300, 17) + DisplayName = "Left" }, - new ButtonSchema + new ButtonSchema(300, 47) { Name = $"P{controller} Mouse Right", - DisplayName = "Right", - Location = new Point(300, 47) + DisplayName = "Right" } } }; diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SGBSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SGBSchema.cs index e9fed61935..89cec0ad2d 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SGBSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SGBSchema.cs @@ -25,33 +25,29 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(174, 79), Buttons = new[] { - ButtonSchema.Up($"P{controllerNum} Up", 14, 12), - ButtonSchema.Down($"P{controllerNum} Down", 14, 56), - ButtonSchema.Left($"P{controllerNum} Left", 2, 34), - ButtonSchema.Right($"P{controllerNum} Right", 24, 34), - new ButtonSchema + ButtonSchema.Up(14, 12, $"P{controllerNum} Up"), + ButtonSchema.Down(14, 56, $"P{controllerNum} Down"), + ButtonSchema.Left(2, 34, $"P{controllerNum} Left"), + ButtonSchema.Right(24, 34, $"P{controllerNum} Right"), + new ButtonSchema(122, 34) { Name = $"P{controllerNum} B", - DisplayName = "B", - Location = new Point(122, 34) + DisplayName = "B" }, - new ButtonSchema + new ButtonSchema(146, 34) { Name = $"P{controllerNum} A", - DisplayName = "A", - Location = new Point(146, 34) + DisplayName = "A" }, - new ButtonSchema + new ButtonSchema(52, 34) { Name = $"P{controllerNum} Select", - DisplayName = "s", - Location = new Point(52, 34) + DisplayName = "s" }, - new ButtonSchema + new ButtonSchema(74, 34) { Name = $"P{controllerNum} Start", - DisplayName = "S", - Location = new Point(74, 34) + DisplayName = "S" } } }; diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs index b80912e71c..2306a9f4cf 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs @@ -74,63 +74,54 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(250, 100), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 34, 17), - ButtonSchema.Down($"P{controller} Down", 34, 61), - ButtonSchema.Left($"P{controller} Left", 22, 39), - ButtonSchema.Right($"P{controller} Right", 44, 39), - new ButtonSchema + ButtonSchema.Up(34, 17, $"P{controller} Up"), + ButtonSchema.Down(34, 61, $"P{controller} Down"), + ButtonSchema.Left(22, 39, $"P{controller} Left"), + ButtonSchema.Right(44, 39, $"P{controller} Right"), + new ButtonSchema(78, 52) { Name = $"P{controller} Start", - DisplayName = "S", - Location = new Point(78, 52) + DisplayName = "S" }, - new ButtonSchema + new ButtonSchema(110, 63) { Name = $"P{controller} A", - DisplayName = "A", - Location = new Point(110, 63) + DisplayName = "A" }, - new ButtonSchema + new ButtonSchema(134, 53) { Name = $"P{controller} B", - DisplayName = "B", - Location = new Point(134, 53) + DisplayName = "B" }, - new ButtonSchema + new ButtonSchema(158, 43) { Name = $"P{controller} C", - DisplayName = "C", - Location = new Point(158, 43) + DisplayName = "C" }, - new ButtonSchema + new ButtonSchema(110, 40) { Name = $"P{controller} X", - DisplayName = "X", - Location = new Point(110, 40) + DisplayName = "X" }, - new ButtonSchema + new ButtonSchema(134, 30) { Name = $"P{controller} Y", - DisplayName = "Y", - Location = new Point(134, 30) + DisplayName = "Y" }, - new ButtonSchema + new ButtonSchema(158, 20) { Name = $"P{controller} Z", - DisplayName = "Z", - Location = new Point(158, 20) + DisplayName = "Z" }, - new ButtonSchema + new ButtonSchema(2, 10) { Name = $"P{controller} L", - DisplayName = "L", - Location = new Point(2, 10) + DisplayName = "L" }, - new ButtonSchema + new ButtonSchema(184, 10) { Name = $"P{controller} R", - DisplayName = "R", - Location = new Point(184, 10) + DisplayName = "R" } } }; @@ -145,76 +136,66 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(458, 285), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 290, 77), - ButtonSchema.Down($"P{controller} Down", 290, 121), - ButtonSchema.Left($"P{controller} Left", 278, 99), - ButtonSchema.Right($"P{controller} Right", 300, 99), - new ButtonSchema + ButtonSchema.Up(290, 77, $"P{controller} Up"), + ButtonSchema.Down(290, 121, $"P{controller} Down"), + ButtonSchema.Left(278, 99, $"P{controller} Left"), + ButtonSchema.Right(300, 99, $"P{controller} Right"), + new ButtonSchema(334, 112) { Name = $"P{controller} Start", - DisplayName = "S", - Location = new Point(334, 112) + DisplayName = "S" }, - new ButtonSchema + new ButtonSchema(366, 123) { Name = $"P{controller} A", - DisplayName = "A", - Location = new Point(366, 123) + DisplayName = "A" }, - new ButtonSchema + new ButtonSchema(390, 113) { Name = $"P{controller} B", - DisplayName = "B", - Location = new Point(390, 113) + DisplayName = "B" }, - new ButtonSchema + new ButtonSchema(414, 103) { Name = $"P{controller} C", - DisplayName = "C", - Location = new Point(414, 103) + DisplayName = "C" }, - new ButtonSchema + new ButtonSchema(366, 100) { Name = $"P{controller} X", - DisplayName = "X", - Location = new Point(366, 100) + DisplayName = "X" }, - new ButtonSchema + new ButtonSchema(390, 90) { Name = $"P{controller} Y", - DisplayName = "Y", - Location = new Point(390, 90) + DisplayName = "Y" }, - new ButtonSchema + new ButtonSchema(414, 80) { Name = $"P{controller} Z", - DisplayName = "Z", - Location = new Point(414, 80) + DisplayName = "Z" }, - new ButtonSchema + new ButtonSchema(6, 74) { Name = $"P{controller} Stick Horizontal", SecondaryNames = new[] { $"P{controller} Stick Vertical" }, AxisRange = axisRanges[0], SecondaryAxisRange = axisRanges[1], - Location = new Point(6, 74), Type = PadInputType.AnalogStick }, - new ButtonSchema + new ButtonSchema(8, 12) { Name = $"P{controller} Left Shoulder", DisplayName = "L", - Location = new Point(8, 12), Type = PadInputType.FloatSingle, TargetSize = new Size(128, 55), MinValue = 0, MaxValue = 255 }, - new ButtonSchema + new ButtonSchema(328, 12) { Name = $"P{controller} Right Shoulder", DisplayName = "L", - Location = new Point(328, 12), Type = PadInputType.FloatSingle, TargetSize = new Size(128, 55), MinValue = 0, @@ -233,37 +214,32 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(375, 320), Buttons = new[] { - new ButtonSchema + new ButtonSchema(14, 17) { Name = $"P{controller} X", SecondaryNames = new[] { $"P{controller} Y" }, - Location = new Point(14, 17), Type = PadInputType.TargetedPair, TargetSize = new Size(256, 256) }, - new ButtonSchema + new ButtonSchema(300, 17) { Name = $"P{controller} Mouse Left", - DisplayName = "Left", - Location = new Point(300, 17) + DisplayName = "Left" }, - new ButtonSchema + new ButtonSchema(300, 47) { Name = $"P{controller} Mouse Center", - DisplayName = "Center", - Location = new Point(300, 47) + DisplayName = "Center" }, - new ButtonSchema + new ButtonSchema(300, 77) { Name = $"P{controller} Mouse Right", - DisplayName = "Right", - Location = new Point(300, 77) + DisplayName = "Right" }, - new ButtonSchema + new ButtonSchema(300, 107) { Name = $"P{controller} Start", - DisplayName = "Start", - Location = new Point(300, 107) + DisplayName = "Start" } } }; @@ -278,62 +254,53 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(325, 100), Buttons = new[] { - new ButtonSchema + new ButtonSchema(8, 12) { Name = $"P{controller} Wheel", DisplayName = "Wheel", - Location = new Point(8, 12), Type = PadInputType.FloatSingle, TargetSize = new Size(128, 55), MinValue = 0, MaxValue = 255 }, - ButtonSchema.Up($"P{controller} Up", 150, 20), - ButtonSchema.Down($"P{controller} Down", 150, 43), - new ButtonSchema + ButtonSchema.Up(150, 20, $"P{controller} Up"), + ButtonSchema.Down(150, 43, $"P{controller} Down"), + new ButtonSchema(180, 63) { Name = $"P{controller} A", - DisplayName = "A", - Location = new Point(180, 63) + DisplayName = "A" }, - new ButtonSchema + new ButtonSchema(204, 53) { Name = $"P{controller} B", - DisplayName = "B", - Location = new Point(204, 53) + DisplayName = "B" }, - new ButtonSchema + new ButtonSchema(228, 43) { Name = $"P{controller} C", - DisplayName = "C", - Location = new Point(228, 43) + DisplayName = "C" }, - new ButtonSchema + new ButtonSchema(180, 40) { Name = $"P{controller} X", - DisplayName = "X", - Location = new Point(180, 40) + DisplayName = "X" }, - new ButtonSchema + new ButtonSchema(204, 30) { Name = $"P{controller} Y", - DisplayName = "Y", - Location = new Point(204, 30) + DisplayName = "Y" }, - new ButtonSchema + new ButtonSchema(228, 20) { Name = $"P{controller} Z", - DisplayName = "Z", - Location = new Point(228, 20) + DisplayName = "Z" }, - new ButtonSchema + new ButtonSchema(268, 20) { Name = $"P{controller} Start", - DisplayName = "Start", - Location = new Point(268, 20) + DisplayName = "Start" } } - }; } @@ -347,74 +314,63 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(445, 230), Buttons = new[] { - new ButtonSchema + new ButtonSchema(45, 15) { Name = $"P{controller} Start", - DisplayName = "Start", - Location = new Point(45, 15) + DisplayName = "Start" }, - new ButtonSchema + new ButtonSchema(5, 58) { Name = $"P{controller} L", - DisplayName = "L", - Location = new Point(5, 58) + DisplayName = "L" }, - new ButtonSchema + new ButtonSchema(105, 58) { Name = $"P{controller} R", - DisplayName = "R", - Location = new Point(105, 58) + DisplayName = "R" }, - new ButtonSchema + new ButtonSchema(30, 43) { Name = $"P{controller} X", - DisplayName = "X", - Location = new Point(30, 43) + DisplayName = "X" }, - new ButtonSchema + new ButtonSchema(55, 43) { Name = $"P{controller} Y", - DisplayName = "Y", - Location = new Point(55, 43) + DisplayName = "Y" }, - new ButtonSchema + new ButtonSchema(80, 43) { Name = $"P{controller} Z", - DisplayName = "Z", - Location = new Point(80, 43) + DisplayName = "Z" }, - new ButtonSchema + new ButtonSchema(30, 70) { Name = $"P{controller} A", - DisplayName = "A", - Location = new Point(30, 70) + DisplayName = "A" }, - new ButtonSchema + new ButtonSchema(55, 70) { Name = $"P{controller} B", - DisplayName = "B", - Location = new Point(55, 70) + DisplayName = "B" }, - new ButtonSchema + new ButtonSchema(80, 70) { Name = $"P{controller} C", - DisplayName = "C", - Location = new Point(80, 70) + DisplayName = "C" }, - new ButtonSchema + new ButtonSchema(185, 13) { Name = $"P{controller} Stick Horizontal", SecondaryNames = new[] { $"P{controller} Stick Vertical" }, AxisRange = axisRanges[0], SecondaryAxisRange = axisRanges[1], - Location = new Point(185, 13), Type = PadInputType.AnalogStick }, - new ButtonSchema + new ButtonSchema(135, 13) { Name = $"P{controller} Throttle", DisplayName = "Throttle", - Location = new Point(135, 13), Type = PadInputType.FloatSingle, TargetSize = new Size(64, 178), MinValue = 0, @@ -435,40 +391,36 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(680, 230), Buttons = new[] { - new ButtonSchema + new ButtonSchema(58, 13) { Name = $"P{controller} Left Stick Horizontal", SecondaryNames = new[] { $"P{controller} Left Stick Vertical" }, AxisRange = axisRanges[3], SecondaryAxisRange = axisRanges[4], - Location = new Point(58, 13), Type = PadInputType.AnalogStick }, - new ButtonSchema + new ButtonSchema(8, 13) { Name = $"P{controller} Left Throttle", DisplayName = "Throttle", - Location = new Point(8, 13), Type = PadInputType.FloatSingle, TargetSize = new Size(64, 178), MinValue = 0, MaxValue = 255, Orientation = Orientation.Vertical }, - new ButtonSchema + new ButtonSchema(400, 13) { Name = $"P{controller} Right Stick Horizontal", SecondaryNames = new[] { $"P{controller} Right Stick Vertical" }, AxisRange = axisRanges[0], SecondaryAxisRange = axisRanges[1], - Location = new Point(400, 13), Type = PadInputType.AnalogStick }, - new ButtonSchema + new ButtonSchema(350, 13) { Name = $"P{controller} Right Throttle", DisplayName = "Throttle", - Location = new Point(350, 13), Type = PadInputType.FloatSingle, TargetSize = new Size(64, 178), MinValue = 0, @@ -488,27 +440,17 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(250, 50), Buttons = new[] { - new ButtonSchema - { - Name = "Reset", - Location = new Point(10, 15) - }, - new ButtonSchema - { - Name = "Power", - Location = new Point(58, 15) - }, - new ButtonSchema + new ButtonSchema(10, 15) { Name = "Reset" }, + new ButtonSchema(58, 15) { Name = "Power" }, + new ButtonSchema(108, 15) { Name = "Previous Disk", - DisplayName = "Prev Disc", - Location = new Point(108, 15) + DisplayName = "Prev Disc" }, - new ButtonSchema + new ButtonSchema(175, 15) { Name = "Next Disk", - DisplayName = "Next Disc", - Location = new Point(175, 15) + DisplayName = "Next Disc" } } }; diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs index dde3c7611b..deac023ea0 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs @@ -33,21 +33,19 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(174, 90), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 14, 12), - ButtonSchema.Down($"P{controller} Down", 14, 56), - ButtonSchema.Left($"P{controller} Left", 2, 34), - ButtonSchema.Right($"P{controller} Right", 24, 34), - new ButtonSchema + ButtonSchema.Up(14, 12, $"P{controller} Up"), + ButtonSchema.Down(14, 56, $"P{controller} Down"), + ButtonSchema.Left(2, 34, $"P{controller} Left"), + ButtonSchema.Right(24, 34, $"P{controller} Right"), + new ButtonSchema(122, 34) { Name = $"P{controller} B1", - DisplayName = "1", - Location = new Point(122, 34) + DisplayName = "1" }, - new ButtonSchema + new ButtonSchema(146, 34) { Name = $"P{controller} B2", - DisplayName = "2", - Location = new Point(146, 34) + DisplayName = "2" } } }; @@ -61,27 +59,24 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(174, 90), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 14, 12), - ButtonSchema.Down($"P{controller} Down", 14, 56), - ButtonSchema.Left($"P{controller} Left", 2, 34), - ButtonSchema.Right($"P{controller} Right", 24, 34), - new ButtonSchema + ButtonSchema.Up(14, 12, $"P{controller} Up"), + ButtonSchema.Down(14, 56, $"P{controller} Down"), + ButtonSchema.Left(2, 34, $"P{controller} Left"), + ButtonSchema.Right(24, 34, $"P{controller} Right"), + new ButtonSchema(134, 12) { Name = $"P{controller} Start", - DisplayName = "S", - Location = new Point(134, 12) + DisplayName = "S" }, - new ButtonSchema + new ButtonSchema(122, 34) { Name = $"P{controller} B1", - DisplayName = "1", - Location = new Point(122, 34) + DisplayName = "1" }, - new ButtonSchema + new ButtonSchema(146, 34) { Name = $"P{controller} B2", - DisplayName = "2", - Location = new Point(146, 34) + DisplayName = "2" } } }; @@ -96,16 +91,8 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(150, 50), Buttons = new[] { - new ButtonSchema - { - Name = "Reset", - Location = new Point(10, 15) - }, - new ButtonSchema - { - Name = "Pause", - Location = new Point(58, 15) - } + new ButtonSchema(10, 15) { Name = "Reset" }, + new ButtonSchema(58, 15) { Name = "Pause" } } }; } @@ -119,11 +106,7 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(150, 50), Buttons = new[] { - new ButtonSchema - { - Name = "Reset", - Location = new Point(10, 15) - } + new ButtonSchema(10, 15) { Name = "Reset" } } }; } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs index bfd810f365..0820a2eef0 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs @@ -116,59 +116,49 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(200, 90), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 34, 17), - ButtonSchema.Down($"P{controller} Down", 34, 61), - ButtonSchema.Left($"P{controller} Left", 22, 39), - ButtonSchema.Right($"P{controller} Right", 44, 39), - new ButtonSchema + ButtonSchema.Up(34, 17, $"P{controller} Up"), + ButtonSchema.Down(34, 61, $"P{controller} Down"), + ButtonSchema.Left(22, 39, $"P{controller} Left"), + ButtonSchema.Right(44, 39, $"P{controller} Right"), + new ButtonSchema(2, 10) { Name = $"P{controller} L", - DisplayName = "L", - Location = new Point(2, 10) + DisplayName = "L" }, - new ButtonSchema + new ButtonSchema(174, 10) { Name = $"P{controller} R", - DisplayName = "R", - Location = new Point(174, 10) + DisplayName = "R" }, - - new ButtonSchema + new ButtonSchema(70, 39) { Name = $"P{controller} Select", - DisplayName = "s", - Location = new Point(70, 39) + DisplayName = "s" }, - new ButtonSchema + new ButtonSchema(92, 39) { Name = $"P{controller} Start", - DisplayName = "S", - Location = new Point(92, 39) + DisplayName = "S" }, - - new ButtonSchema + new ButtonSchema(121, 39) { Name = $"P{controller} Y", - DisplayName = "Y", - Location = new Point(121, 39) + DisplayName = "Y" }, - new ButtonSchema + new ButtonSchema(145, 52) { Name = $"P{controller} B", - DisplayName = "B", - Location = new Point(145, 52) + DisplayName = "B" }, - new ButtonSchema + new ButtonSchema(122, 15) { Name = $"P{controller} X", - DisplayName = "X", - Location = new Point(122, 15) + DisplayName = "X" }, - new ButtonSchema + new ButtonSchema(146, 25) { Name = $"P{controller} A", - DisplayName = "A", - Location = new Point(146, 25) + DisplayName = "A" } } }; @@ -183,25 +173,22 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(345, 225), Buttons = new[] { - new ButtonSchema + new ButtonSchema(6, 14) { Name = $"P{controller} Mouse X", AxisRange = controllerDefRanges[0], SecondaryAxisRange = controllerDefRanges[1], - Location = new Point(6, 14), Type = PadInputType.AnalogStick }, - new ButtonSchema + new ButtonSchema(275, 15) { Name = $"P{controller} Mouse Left", - DisplayName = "Left", - Location = new Point(275, 15) + DisplayName = "Left" }, - new ButtonSchema + new ButtonSchema(275, 45) { Name = $"P{controller} Mouse Right", - DisplayName = "Right", - Location = new Point(275, 45) + DisplayName = "Right" } } }; @@ -217,10 +204,9 @@ namespace BizHawk.Client.EmuHawk MaxSize = new Size(356, 290), Buttons = new[] { - new ButtonSchema + new ButtonSchema(14, 17) { Name = $"P{controller} Scope X", - Location = new Point(14, 17), Type = PadInputType.TargetedPair, TargetSize = new Size(256, 240), SecondaryNames = new[] @@ -228,29 +214,25 @@ namespace BizHawk.Client.EmuHawk $"P{controller} Scope Y" } }, - new ButtonSchema + new ButtonSchema(284, 17) { Name = $"P{controller} Trigger", - DisplayName = "Trigger", - Location = new Point(284, 17) + DisplayName = "Trigger" }, - new ButtonSchema + new ButtonSchema(284, 47) { Name = $"P{controller} Cursor", - DisplayName = "Cursor", - Location = new Point(284, 47) + DisplayName = "Cursor" }, - new ButtonSchema + new ButtonSchema(284, 77) { Name = $"P{controller} Turbo", - DisplayName = "Turbo", - Location = new Point(284, 77) + DisplayName = "Turbo" }, - new ButtonSchema + new ButtonSchema(284, 107) { Name = $"P{controller} Pause", - DisplayName = "Pause", - Location = new Point(284, 107) + DisplayName = "Pause" } } }; @@ -266,10 +248,9 @@ namespace BizHawk.Client.EmuHawk MaxSize = new Size(356, 290), Buttons = new[] { - new ButtonSchema + new ButtonSchema(14, 17) { Name = $"P{controller} Justifier X", - Location = new Point(14, 17), Type = PadInputType.TargetedPair, TargetSize = new Size(256, 240), SecondaryNames = new[] @@ -277,17 +258,15 @@ namespace BizHawk.Client.EmuHawk $"P{controller} Justifier Y" } }, - new ButtonSchema + new ButtonSchema(284, 17) { Name = $"P{controller} Trigger", - DisplayName = "Trigger", - Location = new Point(284, 17) + DisplayName = "Trigger" }, - new ButtonSchema + new ButtonSchema(284, 47) { Name = $"P{controller} Start", - DisplayName = "Start", - Location = new Point(284, 47) + DisplayName = "Start" } } }; @@ -313,21 +292,19 @@ namespace BizHawk.Client.EmuHawk for (int i = 0; i < 16; i++) { - yield return new ButtonSchema + yield return new ButtonSchema(startX + (i * buttonSpacingX), startY) { Name = $"P{controller} B{i}", - DisplayName = i.ToString(), - Location = new Point(startX + (i * buttonSpacingX), startY) + DisplayName = i.ToString() }; } for (int i = 0; i < 16; i++) { - yield return new ButtonSchema + yield return new ButtonSchema(startX + (i * buttonSpacingX), startY + buttonSpacingY) { Name = $"P{controller} B{i + 16}", - DisplayName = (i + 16).ToString(), - Location = new Point(startX + (i * buttonSpacingX), startY + buttonSpacingY) + DisplayName = (i + 16).ToString() }; } } @@ -341,16 +318,8 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(150, 50), Buttons = new[] { - new ButtonSchema - { - Name = "Reset", - Location = new Point(10, 15) - }, - new ButtonSchema - { - Name = "Power", - Location = new Point(58, 15) - } + new ButtonSchema(10, 15) { Name = "Reset" }, + new ButtonSchema(58, 15) { Name = "Power" } } }; } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VECSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VECSchema.cs index 4d69581609..d8cf2ceee4 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VECSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VECSchema.cs @@ -45,33 +45,29 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(200, 100), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 14, 12), - ButtonSchema.Down($"P{controller} Down", 14, 56), - ButtonSchema.Left($"P{controller} Left", 2, 34), - ButtonSchema.Right($"P{controller} Right", 24, 34), - new ButtonSchema + ButtonSchema.Up(14, 12, $"P{controller} Up"), + ButtonSchema.Down(14, 56, $"P{controller} Down"), + ButtonSchema.Left(2, 34, $"P{controller} Left"), + ButtonSchema.Right(24, 34, $"P{controller} Right"), + new ButtonSchema(74, 34) { Name = $"P{controller} Button 1", - DisplayName = "1", - Location = new Point(74, 34) + DisplayName = "1" }, - new ButtonSchema + new ButtonSchema(98, 34) { Name = $"P{controller} Button 2", - DisplayName = "2", - Location = new Point(98, 34) + DisplayName = "2" }, - new ButtonSchema + new ButtonSchema(122, 34) { Name = $"P{controller} Button 3", - DisplayName = "3", - Location = new Point(122, 34) + DisplayName = "3" }, - new ButtonSchema + new ButtonSchema(146, 34) { Name = $"P{controller} Button 4", - DisplayName = "4", - Location = new Point(146, 34) + DisplayName = "4" } } }; @@ -86,34 +82,29 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(280, 380), Buttons = new[] { - new ButtonSchema + new ButtonSchema(74, 34) { Name = $"P{controller} Button 1", - DisplayName = "1", - Location = new Point(74, 34) + DisplayName = "1" }, - new ButtonSchema + new ButtonSchema(98, 34) { Name = $"P{controller} Button 2", - DisplayName = "2", - Location = new Point(98, 34) + DisplayName = "2" }, - new ButtonSchema + new ButtonSchema(122, 34) { Name = $"P{controller} Button 3", - DisplayName = "3", - Location = new Point(122, 34) + DisplayName = "3" }, - new ButtonSchema + new ButtonSchema(146, 34) { Name = $"P{controller} Button 4", - DisplayName = "4", - Location = new Point(146, 34) + DisplayName = "4" }, - new ButtonSchema + new ButtonSchema(2, 80) { Name = $"P{controller} Stick X", - Location = new Point(2, 80), AxisRange = controllerDefRanges[0], SecondaryAxisRange = controllerDefRanges[1], Type = PadInputType.AnalogStick, diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs index d6c5d9594d..ce7eb46298 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs @@ -23,46 +23,20 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(222, 103), Buttons = new[] { - ButtonSchema.Up("L_Up", 14, 36), - ButtonSchema.Down("L_Down", 14, 80), - ButtonSchema.Left("L_Left", 2, 58), - ButtonSchema.Right("L_Right", 24, 58), - new ButtonSchema - { - Name = "B", - Location = new Point(122, 58) - }, - new ButtonSchema - { - Name = "A", - Location = new Point(146, 58) - }, - new ButtonSchema - { - Name = "Select", - DisplayName = "s", - Location = new Point(52, 58) - }, - new ButtonSchema - { - Name = "Start", - DisplayName = "S", - Location = new Point(74, 58) - }, - ButtonSchema.Up("R_Up", 188, 36), - ButtonSchema.Down("R_Down", 188, 80), - ButtonSchema.Left("R_Left", 176, 58), - ButtonSchema.Right("R_Right", 198, 58), - new ButtonSchema - { - Name = "L", - Location = new Point(24, 8) - }, - new ButtonSchema - { - Name = "R", - Location = new Point(176, 8) - } + ButtonSchema.Up(14, 36, "L_Up"), + ButtonSchema.Down(14, 80, "L_Down"), + ButtonSchema.Left(2, 58, "L_Left"), + ButtonSchema.Right(24, 58, "L_Right"), + new ButtonSchema(122, 58) { Name = "B" }, + new ButtonSchema(146, 58) { Name = "A" }, + new ButtonSchema(52, 58) { Name = "Select", DisplayName = "s"}, + new ButtonSchema(74, 58) { Name = "Start", DisplayName = "S" }, + ButtonSchema.Up(188, 36, "R_Up"), + ButtonSchema.Down(188, 80, "R_Down"), + ButtonSchema.Left(176, 58, "R_Left"), + ButtonSchema.Right(198, 58, "R_Right"), + new ButtonSchema(24, 8) { Name = "L" }, + new ButtonSchema(176, 8) { Name = "R" } } }; } @@ -76,11 +50,7 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(75, 50), Buttons = new[] { - new ButtonSchema - { - Name = "Power", - Location = new Point(10, 15) - } + new ButtonSchema(10, 15) { Name = "Power" } } }; } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs index 1c1dde31c6..a5395bca12 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs @@ -25,75 +25,60 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(174, 210), Buttons = new[] { - new ButtonSchema + new ButtonSchema(23, 12) { Name = $"P{controller} Y1", - DisplayName = "Y1", - Location = new Point(23, 12) + DisplayName = "Y1" }, - new ButtonSchema + new ButtonSchema(9, 34) { Name = $"P{controller} Y4", - DisplayName = "Y4", - Location = new Point(9, 34) + DisplayName = "Y4" }, - new ButtonSchema + new ButtonSchema(38, 34) { Name = $"P{controller} Y2", - DisplayName = "Y2", - Location = new Point(38, 34) + DisplayName = "Y2" }, - new ButtonSchema + new ButtonSchema(23, 56) { Name = $"P{controller} Y3", - DisplayName = "Y3", - Location = new Point(23, 56) + DisplayName = "Y3" }, - - new ButtonSchema + new ButtonSchema(23, 92) { Name = $"P{controller} X1", - DisplayName = "X1", - Location = new Point(23, 92) + DisplayName = "X1" }, - new ButtonSchema + new ButtonSchema(9, 114) { Name = $"P{controller} X4", - DisplayName = "X4", - Location = new Point(9, 114) + DisplayName = "X4" }, - new ButtonSchema + new ButtonSchema(38, 114) { Name = $"P{controller} X2", - DisplayName = "X2", - Location = new Point(38, 114) + DisplayName = "X2" }, - new ButtonSchema + new ButtonSchema(23, 136) { Name = $"P{controller} X3", - DisplayName = "X3", - Location = new Point(23, 136) + DisplayName = "X3" }, - - new ButtonSchema + new ButtonSchema(80, 114) { Name = $"P{controller} Start", - DisplayName = "S", - Location = new Point(80, 114) + DisplayName = "S" }, - - new ButtonSchema + new ButtonSchema(110, 114) { Name = $"P{controller} B", - DisplayName = "B", - Location = new Point(110, 114) + DisplayName = "B" }, - - new ButtonSchema + new ButtonSchema(133, 103) { Name = $"P{controller} A", - DisplayName = "A", - Location = new Point(133, 103) + DisplayName = "A" } } }; @@ -108,74 +93,60 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(174, 210), Buttons = new[] { - new ButtonSchema + new ButtonSchema(23, 12) { Name = $"P{controller} A", - DisplayName = "A", - Location = new Point(23, 12) + DisplayName = "A" }, - new ButtonSchema + new ButtonSchema(46, 22) { Name = $"P{controller} B", - DisplayName = "B", - Location = new Point(46, 22) + DisplayName = "B" }, - - new ButtonSchema + new ButtonSchema(32, 58) { Name = $"P{controller} Start", - DisplayName = "S", - Location = new Point(32, 58) + DisplayName = "S" }, - - new ButtonSchema + new ButtonSchema(23, 112) { Name = $"P{controller} Y2", - DisplayName = "Y2", - Location = new Point(23, 112) + DisplayName = "Y2" }, - new ButtonSchema + new ButtonSchema(9, 134) { Name = $"P{controller} Y1", - DisplayName = "Y1", - Location = new Point(9, 134) + DisplayName = "Y1" }, - new ButtonSchema + new ButtonSchema(38, 134) { Name = $"P{controller} Y3", - DisplayName = "Y3", - Location = new Point(38, 134) + DisplayName = "Y3" }, - new ButtonSchema + new ButtonSchema(23, 156) { Name = $"P{controller} Y4", - DisplayName = "Y4", - Location = new Point(23, 156) + DisplayName = "Y4" }, - - new ButtonSchema + new ButtonSchema(103, 112) { Name = $"P{controller} X2", - DisplayName = "X2", - Location = new Point(103, 112) + DisplayName = "X2" }, - new ButtonSchema + new ButtonSchema(89, 134) { Name = $"P{controller} X1", - DisplayName = "X1", - Location = new Point(89, 134) + DisplayName = "X1" }, - new ButtonSchema + new ButtonSchema(118, 134) { Name = $"P{controller} X3", - DisplayName = "X3", - Location = new Point(118, 134) + DisplayName = "X3" }, - new ButtonSchema + new ButtonSchema(103, 156) { Name = $"P{controller} X4", - DisplayName = "X4", - Location = new Point(103, 156) + DisplayName = "X4" } } }; @@ -190,11 +161,7 @@ namespace BizHawk.Client.EmuHawk DefaultSize = new Size(75, 50), Buttons = new[] { - new ButtonSchema - { - Name = "Power", - Location = new Point(7, 15) - } + new ButtonSchema(7, 15) { Name = "Power" } } }; } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ZXSpectrumSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ZXSpectrumSchema.cs index 66f6b983f6..1e839926d2 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ZXSpectrumSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ZXSpectrumSchema.cs @@ -28,15 +28,14 @@ namespace BizHawk.Client.EmuHawk MaxSize = new Size(174, 74), Buttons = new[] { - ButtonSchema.Up($"P{controller} Up", 23, 15), - ButtonSchema.Down($"P{controller} Down", 23, 36), - ButtonSchema.Left($"P{controller} Left", 2, 24), - ButtonSchema.Right($"P{controller} Right", 44, 24), - new ButtonSchema + ButtonSchema.Up(23, 15, $"P{controller} Up"), + ButtonSchema.Down(23, 36, $"P{controller} Down"), + ButtonSchema.Left(2, 24, $"P{controller} Left"), + ButtonSchema.Right(44, 24, $"P{controller} Right"), + new ButtonSchema(124, 24) { Name = $"P{controller} Button", - DisplayName = "B", - Location = new Point(124, 24) + DisplayName = "B" } } }; @@ -161,11 +160,10 @@ namespace BizHawk.Client.EmuHawk if (b.IsActive) { - var btn = new ButtonSchema + var btn = new ButtonSchema(xPos, yPos) { Name = b.Name, - DisplayName = disp, - Location = new Point(xPos, yPos) + DisplayName = disp }; btns.Add(btn); } @@ -187,35 +185,30 @@ namespace BizHawk.Client.EmuHawk MaxSize = new Size(174, 74), Buttons = new[] { - new ButtonSchema + new ButtonSchema(23, 22) { Name = "Play Tape", - Icon = Properties.Resources.Play, - Location = new Point(23, 22) + Icon = Properties.Resources.Play }, - new ButtonSchema + new ButtonSchema(53, 22) { Name = "Stop Tape", - Icon = Properties.Resources.Stop, - Location = new Point(53, 22) + Icon = Properties.Resources.Stop }, - new ButtonSchema + new ButtonSchema(83, 22) { Name = "RTZ Tape", - Icon = Properties.Resources.BackMore, - Location = new Point(83, 22) + Icon = Properties.Resources.BackMore }, - new ButtonSchema + new ButtonSchema(23, 52) { Name = "Insert Next Tape", - DisplayName = "NEXT TAPE", - Location = new Point(23, 52) + DisplayName = "NEXT TAPE" }, - new ButtonSchema + new ButtonSchema(100, 52) { Name = "Insert Previous Tape", - DisplayName = "PREV TAPE", - Location = new Point(100, 52) + DisplayName = "PREV TAPE" } } };