From bb55423d799b4149abaa4601bcd69c010c1a0474 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 28 Jun 2014 16:31:25 +0000 Subject: [PATCH] virtualpads - Saturn controls --- .../tools/VirtualPads/schema/SatSchema.cs | 92 ++++++++++++++----- 1 file changed, 68 insertions(+), 24 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SatSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SatSchema.cs index 2b8e235b56..c77097a95e 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SatSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SatSchema.cs @@ -13,13 +13,15 @@ namespace BizHawk.Client.EmuHawk { yield return StandardController(1); yield return StandardController(2); + yield return ConsoleButtons(); } + public static PadSchema StandardController(int controller) { return new PadSchema { IsConsole = false, - DefaultSize = new Size(174, 74), + DefaultSize = new Size(212, 90), Buttons = new[] { //TODO: C Button and Z Button, Need All Locations @@ -28,7 +30,7 @@ namespace BizHawk.Client.EmuHawk Name = "P" + controller + " Up", DisplayName = "", Icon = Properties.Resources.BlueUp, - Location = new Point(14, 2), + Location = new Point(34, 17), Type = PadSchema.PadInputType.Boolean }, new PadSchema.ButtonScema @@ -36,7 +38,7 @@ namespace BizHawk.Client.EmuHawk Name = "P" + controller + " Down", DisplayName = "", Icon = Properties.Resources.BlueDown, - Location = new Point(14, 46), + Location = new Point(34, 61), Type = PadSchema.PadInputType.Boolean }, new PadSchema.ButtonScema @@ -44,7 +46,7 @@ namespace BizHawk.Client.EmuHawk Name = "P" + controller + " Left", DisplayName = "", Icon = Properties.Resources.Back, - Location = new Point(2, 24), + Location = new Point(22, 39), Type = PadSchema.PadInputType.Boolean }, new PadSchema.ButtonScema @@ -52,56 +54,98 @@ namespace BizHawk.Client.EmuHawk Name = "P" + controller + " Right", DisplayName = "", Icon = Properties.Resources.Forward, - Location = new Point(24, 24), - Type = PadSchema.PadInputType.Boolean - }, - new PadSchema.ButtonScema - { - Name = "P" + controller + " B", - DisplayName = "B", - Location = new Point(134, 48), - Type = PadSchema.PadInputType.Boolean - }, - new PadSchema.ButtonScema - { - Name = "P" + controller + " A", - DisplayName = "A", - Location = new Point(146, 22), + Location = new Point(44, 39), Type = PadSchema.PadInputType.Boolean }, new PadSchema.ButtonScema { Name = "P" + controller + " Start", DisplayName = "S", - Location = new Point(78, 42), + Location = new Point(78, 52), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " A", + DisplayName = "A", + Location = new Point(110, 63), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " B", + DisplayName = "B", + Location = new Point(134, 53), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " C", + DisplayName = "C", + Location = new Point(158, 43), Type = PadSchema.PadInputType.Boolean }, new PadSchema.ButtonScema { Name = "P" + controller + " X", DisplayName = "X", - Location = new Point(122, 12), + Location = new Point(110, 40), Type = PadSchema.PadInputType.Boolean }, new PadSchema.ButtonScema { Name = "P" + controller + " Y", DisplayName = "Y", - Location = new Point(110, 34), + Location = new Point(134, 30), Type = PadSchema.PadInputType.Boolean }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " Z", + DisplayName = "Z", + Location = new Point(158, 20), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema { Name = "P" + controller + " L", DisplayName = "L", - Location = new Point(42, 0), + Location = new Point(2, 10), Type = PadSchema.PadInputType.Boolean }, new PadSchema.ButtonScema { Name = "P" + controller + " R", DisplayName = "R", - Location = new Point(94, 0), + Location = new Point(184, 10), + Type = PadSchema.PadInputType.Boolean + } + } + }; + } + + private static PadSchema ConsoleButtons() + { + return new PadSchema + { + DisplayName = "Console", + IsConsole = true, + DefaultSize = new Size(150, 50), + Buttons = new[] + { + new PadSchema.ButtonScema + { + Name = "Reset", + DisplayName = "Reset", + Location = new Point(10, 15), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "Power", + DisplayName = "Power", + Location = new Point(58, 15), Type = PadSchema.PadInputType.Boolean } }