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

ButtonSchema - simplify UDLR helper methods more

This commit is contained in:
adelikat 2020-03-22 15:57:43 -05:00
parent ec353e163e
commit 1b7698aa71
26 changed files with 210 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs
View File

@ -51,10 +51,10 @@ namespace BizHawk.Client.EmuHawk
MaxSize = new Size(174, 74),
Buttons = new[]
{
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"),
ButtonSchema.Up(23, 15, controller),
ButtonSchema.Down(23, 36, controller),
ButtonSchema.Left(2, 24, controller),
ButtonSchema.Right(44, 24, controller),
new ButtonSchema(124, 24, controller, "Button") { DisplayName = "B" }
}
};
@ -102,22 +102,13 @@ namespace BizHawk.Client.EmuHawk
MaxSize = new Size(174, 74),
Buttons = new[]
{
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, controller, "Button")
{
DisplayName = "B"
},
new ButtonSchema(68, 36, "Button 1")
{
DisplayName = "B1"
},
new ButtonSchema(100, 36, "Button 2")
{
DisplayName = "B2"
}
ButtonSchema.Up(23, 15, controller),
ButtonSchema.Down(23, 36, controller),
ButtonSchema.Left(2, 24, controller),
ButtonSchema.Right(44, 24, controller),
new ButtonSchema(132, 24, controller, "Button") { DisplayName = "B" },
new ButtonSchema(68, 36, "Button 1") { DisplayName = "B1" },
new ButtonSchema(100, 36, "Button 2") { DisplayName = "B2" }
}
};
}

16
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs
View File

@ -60,10 +60,10 @@ namespace BizHawk.Client.EmuHawk
MaxSize = new Size(174, 74),
Buttons = new[]
{
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"),
ButtonSchema.Up(23, 15, controller),
ButtonSchema.Down(23, 36, controller),
ButtonSchema.Left(2, 24, controller),
ButtonSchema.Right(44, 24, controller),
new ButtonSchema(120, 24, controller, "Trigger")
{
DisplayName = "1"
@ -85,10 +85,10 @@ namespace BizHawk.Client.EmuHawk
MaxSize = new Size(174, 74),
Buttons = new[]
{
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"),
ButtonSchema.Up(23, 15, controller),
ButtonSchema.Down(23, 36, controller),
ButtonSchema.Left(2, 24, controller),
ButtonSchema.Right(54, 24, controller),
new ButtonSchema(120, 24, controller, "Button")
{
DisplayName = "1"

8
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs
View File

@ -94,10 +94,10 @@ namespace BizHawk.Client.EmuHawk
DisplayName = " Space "
},
new ButtonSchema(265, 114, "Black Apple") { DisplayName = ">" },
ButtonSchema.Left(289, 114, "Left"),
ButtonSchema.Right(311, 114, "Right"),
ButtonSchema.Down(333, 114, "Down"),
ButtonSchema.Up(355, 114, "Up")
ButtonSchema.Left(289, 114),
ButtonSchema.Right(311, 114),
ButtonSchema.Down(333, 114),
ButtonSchema.Up(355, 114)
}
};
}

37
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs
View File

@ -49,22 +49,51 @@ namespace BizHawk.Client.EmuHawk
public ControllerDefinition.AxisRange? AxisRange { get; set; }
public ControllerDefinition.AxisRange? SecondaryAxisRange { get; set; }
public static ButtonSchema Up(int x, int y, string name) => new ButtonSchema(x, y, name)
public static ButtonSchema Up(int x, int y, string name = null)
=> new ButtonSchema(x, y, name ?? "Up")
{
Icon = Properties.Resources.BlueUp
};
public static ButtonSchema Down(int x, int y, string name) => new ButtonSchema(x, y, name)
public static ButtonSchema Up(int x, int y, int controller)
=> new ButtonSchema(x, y, controller, "Up")
{
Icon = Properties.Resources.BlueUp
};
public static ButtonSchema Down(int x, int y, string name = null)
=> new ButtonSchema(x, y, name ?? "Down")
{
Icon = Properties.Resources.BlueDown
};
public static ButtonSchema Left(int x, int y, string name) => new ButtonSchema(x, y, name)
public static ButtonSchema Down(int x, int y, int controller)
=> new ButtonSchema(x, y, controller, "Down")
{
Icon = Properties.Resources.BlueDown
};
public static ButtonSchema Left(int x, int y, string name = null)
=> new ButtonSchema(x, y, name ?? "Left")
{
Icon = Properties.Resources.Back
};
public static ButtonSchema Right(int x, int y, string name) => new ButtonSchema(x, y, name)
public static ButtonSchema Left(int x, int y, int controller)
=> new ButtonSchema(x, y, controller, "Left")
{
Icon = Properties.Resources.Back
};
public static ButtonSchema Right(int x, int y, string name = null)
=> new ButtonSchema(x, y, name ?? "Right")
{
Icon = Properties.Resources.Forward
};
public static ButtonSchema Right(int x, int y, int controller)
=> new ButtonSchema(x, y, controller, "Right")
{
Icon = Properties.Resources.Forward
};

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

@ -25,14 +25,11 @@ namespace BizHawk.Client.EmuHawk
MaxSize = new Size(174, 74),
Buttons = new[]
{
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, controller, "Button")
{
DisplayName = "B"
}
ButtonSchema.Up(23, 15, controller),
ButtonSchema.Down(23, 36, controller),
ButtonSchema.Left(2, 24, controller),
ButtonSchema.Right(44, 24, controller),
new ButtonSchema(124, 24, controller, "Button") { DisplayName = "B" }
}
};
}

16
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs
View File

@ -44,10 +44,10 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(128, 200),
Buttons = new[]
{
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"),
ButtonSchema.Up(50, 11, controller),
ButtonSchema.Down(50, 32, controller),
ButtonSchema.Left(29, 22, controller),
ButtonSchema.Right(71, 22, controller),
new ButtonSchema(3, 42, controller, "L"),
new ButtonSchema(100, 42, controller, "R"),
new ButtonSchema(27, 85, controller, "1"),
@ -94,10 +94,10 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(195, 260),
Buttons = new[]
{
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"),
ButtonSchema.Up(50, 11, controller),
ButtonSchema.Down(50, 32, controller),
ButtonSchema.Left(29, 22, controller),
ButtonSchema.Right(71, 22, controller),
new ButtonSchema(27, 85, controller, "1"),
new ButtonSchema(50, 85, controller, "2"),
new ButtonSchema(73, 85, controller, "3"),

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

@ -22,20 +22,14 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(174, 79),
Buttons = new[]
{
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"),
ButtonSchema.Up(14, 12, controller),
ButtonSchema.Down(14, 56, controller),
ButtonSchema.Left(2, 34, controller),
ButtonSchema.Right(24, 34, controller),
new ButtonSchema(122, 34, controller, "B"),
new ButtonSchema(146, 34, controller, "A"),
new ButtonSchema(52, 34, controller, "Select")
{
DisplayName = "s"
},
new ButtonSchema(74, 34, controller, "Start")
{
DisplayName = "S"
}
new ButtonSchema(52, 34, controller, "Select") { DisplayName = "s" },
new ButtonSchema(74, 34, controller, "Start") { DisplayName = "S" }
}
};
}

8
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs
View File

@ -57,10 +57,10 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(194, 90),
Buttons = new[]
{
ButtonSchema.Up(29, 17, "Up"),
ButtonSchema.Down(29, 61, "Down"),
ButtonSchema.Left(17, 39, "Left"),
ButtonSchema.Right(39, 39, "Right"),
ButtonSchema.Up(29, 17),
ButtonSchema.Down(29, 61),
ButtonSchema.Left(17, 39),
ButtonSchema.Right(39, 39),
new ButtonSchema(130, 39, "B"),
new ButtonSchema(154, 39, "A"),
new ButtonSchema(64, 39, "Select") { DisplayName = "s" },

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

@ -37,10 +37,10 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(174, 79),
Buttons = new[]
{
ButtonSchema.Up(14, 12, "Up"),
ButtonSchema.Down(14, 56, "Down"),
ButtonSchema.Left(2, 34, "Left"),
ButtonSchema.Right(24, 34, "Right"),
ButtonSchema.Up(14, 12),
ButtonSchema.Down(14, 56),
ButtonSchema.Left(2, 34),
ButtonSchema.Right(24, 34),
new ButtonSchema(122, 34, "B"),
new ButtonSchema(146, 34, "A"),
new ButtonSchema(52, 34, "Select") { DisplayName = "s" },
@ -69,12 +69,12 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(174, 79),
Buttons = new[]
{
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, "P1 B") { DisplayName = "B" },
new ButtonSchema(146, 34, "P1 A") { DisplayName = "A" },
ButtonSchema.Up(14, 12, 1),
ButtonSchema.Down(14, 56, 1),
ButtonSchema.Left(2, 34, 1),
ButtonSchema.Right(24, 34, 1),
new ButtonSchema(122, 34, 1, "B"),
new ButtonSchema(146, 34, 1, "A"),
new ButtonSchema(52, 34, "P1 Select") { DisplayName = "s" },
new ButtonSchema(74, 34, "P1 Start") { DisplayName = "S" }
}

23
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GGLSchema.cs
View File

@ -22,22 +22,13 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(174, 90),
Buttons = new[]
{
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, controller, "Start")
{
DisplayName = "S"
},
new ButtonSchema(122, 34, controller, "B1")
{
DisplayName = "1"
},
new ButtonSchema(146, 34, controller, "B2")
{
DisplayName = "2"
}
ButtonSchema.Up(14, 12, controller),
ButtonSchema.Down(14, 56, controller),
ButtonSchema.Left(2, 34, controller),
ButtonSchema.Right(24, 34, controller),
new ButtonSchema(134, 12, controller, "Start") { DisplayName = "S" },
new ButtonSchema(122, 34, controller, "B1") { DisplayName = "1" },
new ButtonSchema(146, 34, controller, "B2") { DisplayName = "2" }
}
};
}

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

@ -73,10 +73,10 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(174, 90),
Buttons = new[]
{
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"),
ButtonSchema.Up(14, 12, controller),
ButtonSchema.Down(14, 56, controller),
ButtonSchema.Left(2, 34, controller),
ButtonSchema.Right(24, 34, controller),
new ButtonSchema(98, 40, controller, "A"),
new ButtonSchema(122, 40, controller, "B"),
new ButtonSchema(146, 40, controller, "C"),
@ -92,10 +92,10 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(174, 90),
Buttons = new[]
{
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"),
ButtonSchema.Up(14, 12, controller),
ButtonSchema.Down(14, 56, controller),
ButtonSchema.Left(2, 34, controller),
ButtonSchema.Right(24, 34, controller),
new ButtonSchema(98, 40, controller, "A"),
new ButtonSchema(122, 40, controller, "B"),
new ButtonSchema(146, 40, controller, "C"),
@ -185,10 +185,10 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(110, 110),
Buttons = new[]
{
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"),
ButtonSchema.Up(47, 10, controller),
ButtonSchema.Down(47, 73, controller),
ButtonSchema.Left(15, 43, controller),
ButtonSchema.Right(80, 43, controller),
new ButtonSchema(70, 65, controller, "A"),
new ButtonSchema(70, 20, controller, "B"),
new ButtonSchema(22, 20, controller, "C"),

8
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs
View File

@ -16,10 +16,10 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(194, 90),
Buttons = new[]
{
ButtonSchema.Up(14, 12, "Up"),
ButtonSchema.Down(14, 56, "Down"),
ButtonSchema.Left(2, 34, "Left"),
ButtonSchema.Right(24, 34, "Right"),
ButtonSchema.Up(14, 12),
ButtonSchema.Down(14, 56),
ButtonSchema.Left(2, 34),
ButtonSchema.Right(24, 34),
new ButtonSchema(130, 62, "B"),
new ButtonSchema(154, 62, "A"),
new ButtonSchema(100, 12, "Option 1") { DisplayName = "1" },

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

@ -34,30 +34,12 @@ namespace BizHawk.Client.EmuHawk
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, controller, "L")
{
DisplayName = "L"
},
new ButtonSchema(191, 185, controller, "R")
{
DisplayName = "R"
},
new ButtonSchema(81, 269, controller, "Z")
{
DisplayName = "Z"
},
new ButtonSchema(81, 246, controller, "Start")
{
DisplayName = "S"
},
new ButtonSchema(127, 246, controller, "B")
{
DisplayName = "B"
},
new ButtonSchema(138, 269, controller, "A")
{
DisplayName = "A"
},
new ButtonSchema(3, 185, controller, "L"),
new ButtonSchema(191, 185, controller, "R"),
new ButtonSchema(81, 269, controller, "Z"),
new ButtonSchema(81, 246, controller, "Start") { DisplayName = "S" },
new ButtonSchema(127, 246, controller, "B"),
new ButtonSchema(138, 269, controller, "A"),
new ButtonSchema(173, 210, controller, "C Up")
{
Icon = Properties.Resources.YellowUp

8
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NdsSchema.cs
View File

@ -33,10 +33,10 @@ namespace BizHawk.Client.EmuHawk.tools.VirtualPads.schema
DefaultSize = new Size(440, 260),
Buttons = new []
{
ButtonSchema.Up(14, 79, "Up"),
ButtonSchema.Down(14, 122, "Down"),
ButtonSchema.Left(2, 100, "Left"),
ButtonSchema.Right(24, 100, "Right"),
ButtonSchema.Up(14, 79),
ButtonSchema.Down(14, 122),
ButtonSchema.Left(2, 100),
ButtonSchema.Right(24, 100),
new ButtonSchema(2, 10, "L"),
new ButtonSchema(366, 10, "R"),
new ButtonSchema(341, 179, "Start"),

16
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs
View File

@ -215,10 +215,10 @@ namespace BizHawk.Client.EmuHawk
MaxSize = new Size(174, 74),
Buttons = new[]
{
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"),
ButtonSchema.Up(23, 15, controller),
ButtonSchema.Down(23, 36, controller),
ButtonSchema.Left(2, 24, controller),
ButtonSchema.Right(44, 24, controller),
new ButtonSchema(124, 24, controller, "B"),
new ButtonSchema(147, 24, controller, "A"),
new ButtonSchema(72, 24, controller, "Select")
@ -243,10 +243,10 @@ namespace BizHawk.Client.EmuHawk
MaxSize = new Size(174, 74),
Buttons = new[]
{
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"),
ButtonSchema.Up(23, 15, controller),
ButtonSchema.Down(23, 36, controller),
ButtonSchema.Left(2, 24, controller),
ButtonSchema.Right(44, 24, controller),
new ButtonSchema(124, 24, controller, "B"),
new ButtonSchema(147, 24, controller, "A"),
new ButtonSchema(72, 24, controller, "Microphone")

8
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs
View File

@ -22,10 +22,10 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(174, 79),
Buttons = new[]
{
ButtonSchema.Up(14, 12, "Up"),
ButtonSchema.Down(14, 56, "Down"),
ButtonSchema.Left(2, 34, "Left"),
ButtonSchema.Right(24, 34, "Right"),
ButtonSchema.Up(14, 12),
ButtonSchema.Down(14, 56),
ButtonSchema.Left(2, 34),
ButtonSchema.Right(24, 34),
new ButtonSchema(74, 34, "B"),
new ButtonSchema(98, 34, "A"),
new ButtonSchema(146, 12, "Option") { DisplayName = "O" }

8
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/O2Schema.cs
View File

@ -34,10 +34,10 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(100, 100),
Buttons = new[]
{
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"),
ButtonSchema.Up(14, 12, controller),
ButtonSchema.Down(14, 56, controller),
ButtonSchema.Left(2, 34, controller),
ButtonSchema.Right(24, 34, controller),
new ButtonSchema(74, 34, controller, "F")
}
};

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

@ -53,10 +53,10 @@ namespace BizHawk.Client.EmuHawk
DisplayName = $"DualShock Player{controller}",
Buttons = new[]
{
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"),
ButtonSchema.Up(32, 50, controller),
ButtonSchema.Down(32, 71, controller),
ButtonSchema.Left(11, 62, controller),
ButtonSchema.Right(53, 62, controller),
new ButtonSchema(3, 32, controller, "L1"),
new ButtonSchema(191, 32, controller, "R1"),
new ButtonSchema(3, 10, controller, "L2"),
@ -109,10 +109,10 @@ namespace BizHawk.Client.EmuHawk
DisplayName = $"Gamepad Player{controller}",
Buttons = new[]
{
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"),
ButtonSchema.Up(37, 55, controller),
ButtonSchema.Down(37, 76, controller),
ButtonSchema.Left(16, 67, controller),
ButtonSchema.Right(58, 67, controller),
new ButtonSchema(8, 37, controller, "L1"),
new ButtonSchema(196, 37, controller, "R1"),
new ButtonSchema(8, 15, controller, "L2"),
@ -153,14 +153,11 @@ namespace BizHawk.Client.EmuHawk
DisplayName = $"NeGcon Player{controller}",
Buttons = new[]
{
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, controller, "Start")
{
DisplayName = "S"
},
ButtonSchema.Up(36, 83, controller),
ButtonSchema.Down(36, 104, controller),
ButtonSchema.Left(15, 95, controller),
ButtonSchema.Right(57, 95, controller),
new ButtonSchema(78, 118, controller, "Start") { DisplayName = "S" },
new ButtonSchema(278, 38, controller, "B"),
new ButtonSchema(308, 55, controller, "A"),
new ButtonSchema(308, 15, controller, "R"),

8
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs
View File

@ -55,10 +55,10 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(174, 90),
Buttons = new[]
{
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"),
ButtonSchema.Up(14, 12, controller),
ButtonSchema.Down(14, 56, controller),
ButtonSchema.Left(2, 34, controller),
ButtonSchema.Right(24, 34, controller),
new ButtonSchema(122, 34, controller, "B2")
{
DisplayName = "II"

8
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs
View File

@ -48,10 +48,10 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(230, 100),
Buttons = new[]
{
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"),
ButtonSchema.Up(34, 17, controller),
ButtonSchema.Down(34, 61, controller),
ButtonSchema.Left(22, 39, controller),
ButtonSchema.Right(44, 39, controller),
new ButtonSchema(74, 17, controller, "Mode 1"),
new ButtonSchema(74, 40, controller, "Mode 2"),
new ButtonSchema(77, 63, controller, "Select")

8
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SGBSchema.cs
View File

@ -24,10 +24,10 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(174, 79),
Buttons = new[]
{
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"),
ButtonSchema.Up(14, 12, controller),
ButtonSchema.Down(14, 56, controller),
ButtonSchema.Left(2, 34, controller),
ButtonSchema.Right(24, 34, controller),
new ButtonSchema(122, 34, controller, "B"),
new ButtonSchema(146, 34, controller, "A"),
new ButtonSchema(52, 34, controller, "Select")

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

@ -73,10 +73,10 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(250, 100),
Buttons = new[]
{
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"),
ButtonSchema.Up(34, 17, controller),
ButtonSchema.Down(34, 61, controller),
ButtonSchema.Left(22, 39, controller),
ButtonSchema.Right(44, 39, controller),
new ButtonSchema(78, 52, controller, "Start") { DisplayName = "S" },
new ButtonSchema(110, 63, controller, "A"),
new ButtonSchema(134, 53, controller, "B"),
@ -98,10 +98,10 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(458, 285),
Buttons = new[]
{
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"),
ButtonSchema.Up(290, 77, controller),
ButtonSchema.Down(290, 121, controller),
ButtonSchema.Left(278, 99, controller),
ButtonSchema.Right(300, 99, controller),
new ButtonSchema(334, 112, controller, "Start") { DisplayName = "S" },
new ButtonSchema(366, 123, controller, "A"),
new ButtonSchema(390, 113, controller, "B"),
@ -176,8 +176,8 @@ namespace BizHawk.Client.EmuHawk
MinValue = 0,
MaxValue = 255
},
ButtonSchema.Up(150, 20, $"P{controller} Up"),
ButtonSchema.Down(150, 43, $"P{controller} Down"),
ButtonSchema.Up(150, 20, controller),
ButtonSchema.Down(150, 43, controller),
new ButtonSchema(180, 63, controller, "A"),
new ButtonSchema(204, 53, controller, "B"),
new ButtonSchema(228, 43, controller, "C"),

41
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs
View File

@ -32,18 +32,12 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(174, 90),
Buttons = new[]
{
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, controller, "B1")
{
DisplayName = "1"
},
new ButtonSchema(146, 34, controller, "B2")
{
DisplayName = "2"
}
ButtonSchema.Up(14, 12, controller),
ButtonSchema.Down(14, 56, controller),
ButtonSchema.Left(2, 34, controller),
ButtonSchema.Right(24, 34, controller),
new ButtonSchema(122, 34, controller, "B1") { DisplayName = "1" },
new ButtonSchema(146, 34, controller, "B2") { DisplayName = "2" }
}
};
}
@ -55,22 +49,13 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(174, 90),
Buttons = new[]
{
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, controller, "Start")
{
DisplayName = "S"
},
new ButtonSchema(122, 34, controller, "B1")
{
DisplayName = "1"
},
new ButtonSchema(146, 34, controller, "B2")
{
DisplayName = "2"
}
ButtonSchema.Up(14, 12, controller),
ButtonSchema.Down(14, 56, controller),
ButtonSchema.Left(2, 34, controller),
ButtonSchema.Right(24, 34, controller),
new ButtonSchema(134, 12, controller, "Start") { DisplayName = "S" },
new ButtonSchema(122, 34, controller, "B1") { DisplayName = "1" },
new ButtonSchema(146, 34, controller, "B2") { DisplayName = "2" }
}
};
}

8
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs
View File

@ -115,10 +115,10 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(200, 90),
Buttons = new[]
{
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"),
ButtonSchema.Up(34, 17, controller),
ButtonSchema.Down(34, 61, controller),
ButtonSchema.Left(22, 39, controller),
ButtonSchema.Right(44, 39, controller),
new ButtonSchema(2, 10, controller, "L"),
new ButtonSchema(174, 10, controller, "R"),
new ButtonSchema(70, 39, controller, "Select") { DisplayName = "s" },

8
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VECSchema.cs
View File

@ -44,10 +44,10 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(200, 100),
Buttons = new[]
{
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"),
ButtonSchema.Up(14, 12, controller),
ButtonSchema.Down(14, 56, controller),
ButtonSchema.Left(2, 34, controller),
ButtonSchema.Right(24, 34, controller),
new ButtonSchema(74, 34, controller, "Button 1")
{
DisplayName = "1"

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

@ -27,10 +27,10 @@ namespace BizHawk.Client.EmuHawk
MaxSize = new Size(174, 74),
Buttons = new[]
{
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"),
ButtonSchema.Up(23, 15, controller),
ButtonSchema.Down(23, 36, controller),
ButtonSchema.Left(2, 24, controller),
ButtonSchema.Right(44, 24, controller),
new ButtonSchema(124, 24, controller, "Button")
{
DisplayName = "B"