ButtonSchema - use more constructor overloads to simplify

This commit is contained in:
adelikat 2020-03-22 14:13:01 -05:00
parent 90a03f3f6a
commit 7b6ff18775
24 changed files with 337 additions and 648 deletions

View File

@ -55,11 +55,7 @@ namespace BizHawk.Client.EmuHawk
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"
}
new ButtonSchema(124, 24, controller, "Button") { DisplayName = "B" }
}
};
}
@ -73,14 +69,12 @@ namespace BizHawk.Client.EmuHawk
MaxSize = new Size(334, 94),
Buttons = new[]
{
new ButtonSchema(5, 24)
new ButtonSchema(5, 24, controller, "Button 1")
{
Name = $"P{controller} Button 1",
DisplayName = "B1"
},
new ButtonSchema(5, 48)
new ButtonSchema(5, 48, controller, "Button 2")
{
Name = $"P{controller} Button 2",
DisplayName = "B2"
},
new SingleFloatSchema(55, 17, $"P{controller} Paddle X 1")
@ -142,9 +136,8 @@ namespace BizHawk.Client.EmuHawk
MaxSize = new Size(334, 94),
Buttons = new[]
{
new ButtonSchema(5, 24)
new ButtonSchema(5, 24, controller, "Button")
{
Name = $"P{controller} Button",
DisplayName = "B1"
},
new SingleFloatSchema(55, 17, $"P{controller} Wheel X 1")

View File

@ -64,14 +64,12 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(120, 24, controller, "Trigger")
{
Name = $"P{controller} Trigger",
DisplayName = "1"
},
new ButtonSchema(145, 24)
new ButtonSchema(145, 24, controller, "Trigger 2")
{
Name = $"P{controller} Trigger 2",
DisplayName = "2"
}
}
@ -91,9 +89,8 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(120, 24, controller, "Button")
{
Name = $"P{controller} Button",
DisplayName = "1"
}
}
@ -138,9 +135,8 @@ namespace BizHawk.Client.EmuHawk
$"P{controller} HPos"
}
},
new ButtonSchema(284, 17)
new ButtonSchema(284, 17, controller, "Trigger")
{
Name = $"P{controller} Trigger",
DisplayName = "Trigger"
}
}

View File

@ -24,8 +24,7 @@ namespace BizHawk.Client.EmuHawk
Buttons = new[]
{
/************************** Row 1 **************************/
new ButtonSchema(10, 18) { Name = "Escape", DisplayName = "Esc"
},
new ButtonSchema(10, 18, "Escape") { DisplayName = "Esc" },
new ButtonSchema(46, 18, "1"),
new ButtonSchema(70, 18, "2"),
new ButtonSchema(94, 18, "3"),

View File

@ -24,6 +24,11 @@ namespace BizHawk.Client.EmuHawk
Name = name;
}
public ButtonSchema(int x, int y, int controller, string name)
: this(x, y, $"P{controller} {name}")
{
}
public string Name { get; set; }
public string DisplayName { get; set; }
public PadInputType Type { get; protected set; } = PadInputType.Boolean;

View File

@ -29,9 +29,8 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(124, 24, controller, "Button")
{
Name = $"P{controller} Button",
DisplayName = "B"
}
}

View File

@ -48,76 +48,60 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(3, 42, controller, "L")
{
Name = $"P{controller} L",
DisplayName = "L"
},
new ButtonSchema(100, 42)
new ButtonSchema(100, 42, controller, "R")
{
Name = $"P{controller} R",
DisplayName = "R"
},
new ButtonSchema(27, 85)
new ButtonSchema(27, 85, controller, "1")
{
Name = $"P{controller} Key 1",
DisplayName = "1"
},
new ButtonSchema(50, 85)
new ButtonSchema(50, 85, controller, "2")
{
Name = $"P{controller} Key 2",
DisplayName = "2"
},
new ButtonSchema(73, 85)
new ButtonSchema(73, 85, controller, "3")
{
Name = $"P{controller} Key 3",
DisplayName = "3"
},
new ButtonSchema(27, 108)
new ButtonSchema(27, 108, controller, "4")
{
Name = $"P{controller} Key 4",
DisplayName = "4"
},
new ButtonSchema(50, 108)
new ButtonSchema(50, 108, controller, "5")
{
Name = $"P{controller} Key 5",
DisplayName = "5"
},
new ButtonSchema(73, 108)
new ButtonSchema(73, 108, controller, "6")
{
Name = $"P{controller} Key 6",
DisplayName = "6"
},
new ButtonSchema(27, 131)
new ButtonSchema(27, 131, controller, "7")
{
Name = $"P{controller} Key 7",
DisplayName = "7"
},
new ButtonSchema(50, 131)
new ButtonSchema(50, 131, controller, "8")
{
Name = $"P{controller} Key 8",
DisplayName = "8"
},
new ButtonSchema(73, 131)
new ButtonSchema(73, 131, controller, "9")
{
Name = $"P{controller} Key 9",
DisplayName = "9"
},
new ButtonSchema(27, 154)
new ButtonSchema(27, 154, controller, "Star")
{
Name = $"P{controller} Star",
DisplayName = "*"
},
new ButtonSchema(50, 154)
new ButtonSchema(50, 154, controller, "0")
{
Name = $"P{controller} Key 0",
DisplayName = "0"
},
new ButtonSchema(73, 154)
new ButtonSchema(73, 154, controller, "Pound")
{
Name = $"P{controller} Pound",
DisplayName = "#"
}
}
@ -157,67 +141,52 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(27, 85, controller, "1")
{
Name = $"P{controller} Key 1",
DisplayName = "1"
},
new ButtonSchema(50, 85)
new ButtonSchema(50, 85, controller, "2")
{
Name = $"P{controller} Key 2",
DisplayName = "2"
},
new ButtonSchema(73, 85)
new ButtonSchema(73, 85, controller, "3")
{
Name = $"P{controller} Key 3",
DisplayName = "3"
},
new ButtonSchema(27, 108)
new ButtonSchema(27, 108, controller, "4")
{
Name = $"P{controller} Key 4",
DisplayName = "4"
},
new ButtonSchema(50, 108)
new ButtonSchema(50, 108, controller, "5")
{
Name = $"P{controller} Key 5",
DisplayName = "5"
},
new ButtonSchema(73, 108)
new ButtonSchema(73, 108, controller, "6")
{
Name = $"P{controller} Key 6",
DisplayName = "6"
},
new ButtonSchema(27, 131)
new ButtonSchema(27, 131, controller, "7")
{
Name = $"P{controller} Key 7",
DisplayName = "7"
},
new ButtonSchema(50, 131)
new ButtonSchema(50, 131, controller, "8")
{
Name = $"P{controller} Key 8",
DisplayName = "8"
},
new ButtonSchema(73, 131)
new ButtonSchema(73, 131, controller, "9")
{
Name = $"P{controller} Key 9",
DisplayName = "9"
},
new ButtonSchema(27, 154)
new ButtonSchema(27, 154, controller, "Star")
{
Name = $"P{controller} Star",
DisplayName = "*"
},
new ButtonSchema(50, 154)
new ButtonSchema(50, 154, controller, "0")
{
Name = $"P{controller} Key 0",
DisplayName = "0"
},
new ButtonSchema(73, 154)
new ButtonSchema(73, 154, controller, "Pound")
{
Name = $"P{controller} Pound",
DisplayName = "#"
},
@ -229,24 +198,20 @@ namespace BizHawk.Client.EmuHawk
MaxValue = 360
},
new ButtonSchema(126, 15)
new ButtonSchema(126, 15, controller, "Yellow")
{
Name = $"P{controller} Yellow",
DisplayName = "Yellow"
},
new ButtonSchema(126, 40)
new ButtonSchema(126, 40, controller, "Red")
{
Name = $"P{controller} Red",
DisplayName = "Red"
},
new ButtonSchema(126, 65)
new ButtonSchema(126, 65, controller, "Purple")
{
Name = $"P{controller} Purple",
DisplayName = "Purple"
},
new ButtonSchema(126, 90)
new ButtonSchema(126, 90, controller, "Blue")
{
Name = $"P{controller} Blue",
DisplayName = "Blue"
}
}

View File

@ -26,24 +26,20 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(122, 34, controller, "B")
{
Name = $"P{controller} B",
DisplayName = "B"
},
new ButtonSchema(146, 34)
new ButtonSchema(146, 34, controller, "A")
{
Name = $"P{controller} A",
DisplayName = "A"
},
new ButtonSchema(52, 34)
new ButtonSchema(52, 34, controller, "Select")
{
Name = $"P{controller} Select",
DisplayName = "s"
},
new ButtonSchema(74, 34)
new ButtonSchema(74, 34, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "S"
}
}

View File

@ -26,19 +26,16 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(134, 12, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "S"
},
new ButtonSchema(122, 34)
new ButtonSchema(122, 34, controller, "B1")
{
Name = $"P{controller} B1",
DisplayName = "1"
},
new ButtonSchema(146, 34)
new ButtonSchema(146, 34, controller, "B2")
{
Name = $"P{controller} B2",
DisplayName = "2"
}
}

View File

@ -191,24 +191,20 @@ namespace BizHawk.Client.EmuHawk
MaxValue = 255,
TargetSize = new Size(520, 570)
},
new ButtonSchema(365, 17)
new ButtonSchema(365, 17, controller, "Mouse Left")
{
Name = $"P{controller} Mouse Left",
DisplayName = "Left"
},
new ButtonSchema(365, 40)
new ButtonSchema(365, 40, controller, "Mouse Center")
{
Name = $"P{controller} Mouse Center",
DisplayName = "Center"
},
new ButtonSchema(365, 63)
new ButtonSchema(365, 63, "Mouse Right")
{
Name = $"P{controller} Mouse Right",
DisplayName = "Right"
},
new ButtonSchema(365, 86)
new ButtonSchema(365, 86, "Mouse Start")
{
Name = $"P{controller} Mouse Start",
DisplayName = "Start"
}
}
@ -239,29 +235,24 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(70, 65, controller, "A")
{
Name = $"P{controller} A",
DisplayName = "A"
},
new ButtonSchema(70, 20)
new ButtonSchema(70, 20, controller, "B")
{
Name = $"P{controller} B",
DisplayName = "B"
},
new ButtonSchema(22, 20)
new ButtonSchema(22, 20, controller, "C")
{
Name = $"P{controller} C",
DisplayName = "C"
},
new ButtonSchema(22, 65)
new ButtonSchema(22, 65, controller, "A")
{
Name = $"P{controller} A",
DisplayName = "A"
},
new ButtonSchema(47, 43)
new ButtonSchema(47, 43, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "S"
}
}
@ -275,44 +266,36 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(174, 90),
Buttons = new[]
{
new ButtonSchema(98, 40)
new ButtonSchema(98, 40, controller, "A")
{
Name = $"P{controller} A",
DisplayName = "A"
},
new ButtonSchema(122, 40)
new ButtonSchema(122, 40, controller, "B")
{
Name = $"P{controller} B",
DisplayName = "B"
},
new ButtonSchema(146, 40)
new ButtonSchema(146, 40, controller, "C")
{
Name = $"P{controller} C",
DisplayName = "C"
},
new ButtonSchema(98, 65)
new ButtonSchema(98, 65, controller, "D")
{
Name = $"P{controller} D",
DisplayName = "D"
},
new ButtonSchema(122, 65)
new ButtonSchema(122, 65, controller, "E1")
{
Name = $"P{controller} E1",
DisplayName = "E¹"
},
new ButtonSchema(152, 65)
new ButtonSchema(152, 65, controller, "E2")
{
Name = $"P{controller} E2",
DisplayName = "E²"
},
new ButtonSchema(122, 12)
new ButtonSchema(122, 12, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "Start"
},
new ButtonSchema(162, 12)
new ButtonSchema(162, 12, controller, "Select")
{
Name = $"P{controller} Select",
DisplayName = "Select"
}
}

View File

@ -11,12 +11,7 @@ namespace BizHawk.Client.EmuHawk
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core)
{
yield return StandardController();
}
private static PadSchema StandardController()
{
return new PadSchema
yield return new PadSchema
{
DefaultSize = new Size(194, 90),
Buttons = new[]
@ -25,11 +20,11 @@ namespace BizHawk.Client.EmuHawk
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" }
new ButtonSchema(130, 62, "B"),
new ButtonSchema(154, 62, "A"),
new ButtonSchema(100, 12, "Option 1") { DisplayName = "1" },
new ButtonSchema(100, 62, "Option 2") { DisplayName = "2" },
new ButtonSchema(100, 37, "Pause")
}
};
}

View File

@ -34,34 +34,28 @@ 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)
new ButtonSchema(3, 185, controller, "L")
{
Name = $"P{controller} L",
DisplayName = "L"
},
new ButtonSchema(191, 185)
new ButtonSchema(191, 185, controller, "R")
{
Name = $"P{controller} R",
DisplayName = "R"
},
new ButtonSchema(81, 269)
new ButtonSchema(81, 269, controller, "Z")
{
Name = $"P{controller} Z",
DisplayName = "Z"
},
new ButtonSchema(81, 246)
new ButtonSchema(81, 246, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "S"
},
new ButtonSchema(127, 246)
new ButtonSchema(127, 246, controller, "B")
{
Name = $"P{controller} B",
DisplayName = "B"
},
new ButtonSchema(138, 269)
new ButtonSchema(138, 269, controller, "A")
{
Name = $"P{controller} A",
DisplayName = "A"
},
new ButtonSchema(173, 210)

View File

@ -220,24 +220,20 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(124, 24, controller, "B")
{
Name = $"P{controller} B",
DisplayName = "B"
},
new ButtonSchema(147, 24)
new ButtonSchema(147, 24, controller, "A")
{
Name = $"P{controller} A",
DisplayName = "A"
},
new ButtonSchema(72, 24)
new ButtonSchema(72, 24, controller, "Select")
{
Name = $"P{controller} Select",
DisplayName = "s"
},
new ButtonSchema(93, 24)
new ButtonSchema(93, 24, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "S"
}
}
@ -258,19 +254,16 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(124, 24, controller, "B")
{
Name = $"P{controller} B",
DisplayName = "B"
},
new ButtonSchema(147, 24)
new ButtonSchema(147, 24, controller, "A")
{
Name = $"P{controller} A",
DisplayName = "A"
},
new ButtonSchema(72, 24)
new ButtonSchema(72, 24, controller, "Microphone")
{
Name = $"P{controller} Microphone",
DisplayName = "Mic"
}
}
@ -290,9 +283,8 @@ namespace BizHawk.Client.EmuHawk
{
TargetSize = new Size(256, 240)
},
new ButtonSchema(284, 17)
new ButtonSchema(284, 17, controller, "Fire")
{
Name = $"P{controller} Fire",
DisplayName = "Fire"
}
}
@ -314,9 +306,8 @@ namespace BizHawk.Client.EmuHawk
TargetSize = new Size(380, 69),
MaxValue = 160
},
new ButtonSchema(14, 85)
new ButtonSchema(14, 85, controller, "Fire")
{
Name = $"P{controller} Fire",
DisplayName = "Fire"
}
}
@ -331,65 +322,52 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(154, 114),
Buttons = new[]
{
new ButtonSchema(14, 17)
new ButtonSchema(14, 17, controller, "PP1")
{
Name = $"P{controller} PP1",
DisplayName = "1 "
},
new ButtonSchema(45, 17)
new ButtonSchema(45, 17, controller, "PP2")
{
Name = $"P{controller} PP2",
DisplayName = "2 "
},
new ButtonSchema(76, 17)
new ButtonSchema(76, 17, controller, "PP3")
{
Name = $"P{controller} PP3",
DisplayName = "3 "
},
new ButtonSchema(107, 17)
new ButtonSchema(107, 17, controller, "PP4")
{
Name = $"P{controller} PP4",
DisplayName = "4 "
},
new ButtonSchema(14, 48)
new ButtonSchema(14, 48, controller, "PP5")
{
Name = $"P{controller} PP5",
DisplayName = "5 "
},
new ButtonSchema(45, 48)
new ButtonSchema(45, 48, controller, "PP6")
{
Name = $"P{controller} PP6",
DisplayName = "6 "
},
new ButtonSchema(76, 48)
new ButtonSchema(76, 48, controller, "PP7")
{
Name = $"P{controller} PP7",
DisplayName = "7 "
},
new ButtonSchema(107, 48)
new ButtonSchema(107, 48, controller, "PP8")
{
Name = $"P{controller} PP8",
DisplayName = "8 "
},
new ButtonSchema(14, 79)
new ButtonSchema(14, 79, controller, "PP9")
{
Name = $"P{controller} PP9",
DisplayName = "9 "
},
new ButtonSchema(45, 79)
new ButtonSchema(45, 79, controller, "PP10")
{
Name = $"P{controller} PP10",
DisplayName = "10"
},
new ButtonSchema(76, 79)
new ButtonSchema(76, 79, controller, "PP11")
{
Name = $"P{controller} PP11",
DisplayName = "11"
},
new ButtonSchema(107, 79)
new ButtonSchema(107, 79, controller, "PP12")
{
Name = $"P{controller} PP12",
DisplayName = "12"
}
}
@ -409,14 +387,12 @@ namespace BizHawk.Client.EmuHawk
{
TargetSize = new Size(256, 240)
},
new ButtonSchema(284, 17)
new ButtonSchema(284, 17, controller, "Click")
{
Name = $"P{controller} Click",
DisplayName = "Click"
},
new ButtonSchema(284, 48)
new ButtonSchema(284, 48, controller, "Touch")
{
Name = $"P{controller} Touch",
DisplayName = "Touch"
}
}
@ -431,364 +407,292 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(560, 180),
Buttons = new[]
{
new ButtonSchema(23, 15)
new ButtonSchema(23, 15, controller, "F1")
{
Name = $"P{controller} F1",
DisplayName = " F1 "
},
new ButtonSchema(76, 15)
new ButtonSchema(76, 15, controller, "F2")
{
Name = $"P{controller} F2",
DisplayName = " F2 "
},
new ButtonSchema(129, 15)
new ButtonSchema(129, 15, controller, "F3")
{
Name = $"P{controller} F3",
DisplayName = " F3 "
},
new ButtonSchema(182, 15)
new ButtonSchema(182, 15, controller, "F4")
{
Name = $"P{controller} F4",
DisplayName = " F4 "
},
new ButtonSchema(235, 15)
new ButtonSchema(235, 15, controller, "F5")
{
Name = $"P{controller} F5",
DisplayName = " F5 "
},
new ButtonSchema(288, 15)
new ButtonSchema(288, 15, controller, "F6")
{
Name = $"P{controller} F6",
DisplayName = " F6 "
},
new ButtonSchema(341, 15)
new ButtonSchema(341, 15, controller, "F7")
{
Name = $"P{controller} F7",
DisplayName = " F7 "
},
new ButtonSchema(394, 15)
new ButtonSchema(394, 15, controller, "F8")
{
Name = $"P{controller} F8",
DisplayName = " F8 "
},
new ButtonSchema(36, 38)
new ButtonSchema(36, 38, controller, "1")
{
Name = $"P{controller} 1",
DisplayName = "1"
},
new ButtonSchema(60, 38)
new ButtonSchema(60, 38, controller, "2")
{
Name = $"P{controller} 2",
DisplayName = "2"
},
new ButtonSchema(84, 38)
new ButtonSchema(84, 38, controller, "3")
{
Name = $"P{controller} 3",
DisplayName = "3"
},
new ButtonSchema(108, 38)
new ButtonSchema(108, 38, controller, "4")
{
Name = $"P{controller} 4",
DisplayName = "4"
},
new ButtonSchema(132, 38)
new ButtonSchema(132, 38, controller, "5")
{
Name = $"P{controller} 5",
DisplayName = "5"
},
new ButtonSchema(156, 38)
new ButtonSchema(156, 38, controller, "6")
{
Name = $"P{controller} 6",
DisplayName = "6"
},
new ButtonSchema(180, 38)
new ButtonSchema(180, 38, controller, "7")
{
Name = $"P{controller} 7",
DisplayName = "7"
},
new ButtonSchema(204, 38)
new ButtonSchema(204, 38, controller, "8")
{
Name = $"P{controller} 8",
DisplayName = "8"
},
new ButtonSchema(228, 38)
new ButtonSchema(228, 38, controller, "9")
{
Name = $"P{controller} 9",
DisplayName = "9"
},
new ButtonSchema(252, 38)
new ButtonSchema(252, 38, controller, "0")
{
Name = $"P{controller} 0",
DisplayName = "0"
},
new ButtonSchema(276, 38)
new ButtonSchema(276, 38, controller, "Minus")
{
Name = $"P{controller} Minus",
DisplayName = "-"
},
new ButtonSchema(296, 38)
new ButtonSchema(296, 38, controller, "Caret")
{
Name = $"P{controller} Caret",
DisplayName = "^"
},
new ButtonSchema(320, 38)
new ButtonSchema(320, 38, controller, "Yen")
{
Name = $"P{controller} Yen",
DisplayName = "¥"
},
new ButtonSchema(344, 38)
new ButtonSchema(344, 38, controller, "Stop")
{
Name = $"P{controller} Stop",
DisplayName = "STOP"
},
new ButtonSchema(15, 61)
new ButtonSchema(15, 61, controller, "Escape")
{
Name = $"P{controller} Escape",
DisplayName = "ESC"
},
new ButtonSchema(54, 61)
new ButtonSchema(54, 61, controller, "Q")
{
Name = $"P{controller} Q",
DisplayName = "Q"
},
new ButtonSchema(80, 61)
new ButtonSchema(80, 61, controller, "W")
{
Name = $"P{controller} W",
DisplayName = "W"
},
new ButtonSchema(108, 61)
new ButtonSchema(108, 61, controller, "E")
{
Name = $"P{controller} E",
DisplayName = "E"
},
new ButtonSchema(132, 61)
new ButtonSchema(132, 61, controller, "R")
{
Name = $"P{controller} R",
DisplayName = "R"
},
new ButtonSchema(158, 61)
new ButtonSchema(158, 61, controller, "T")
{
Name = $"P{controller} T",
DisplayName = "T"
},
new ButtonSchema(182, 61)
new ButtonSchema(182, 61, controller, "Y")
{
Name = $"P{controller} Y",
DisplayName = "Y"
},
new ButtonSchema(206, 61)
new ButtonSchema(206, 61, controller, "U")
{
Name = $"P{controller} U",
DisplayName = "U"
},
new ButtonSchema(232, 61)
new ButtonSchema(232, 61, controller, "I")
{
Name = $"P{controller} I",
DisplayName = "I"
},
new ButtonSchema(252, 61)
new ButtonSchema(252, 61, controller, "O")
{
Name = $"P{controller} O",
DisplayName = "O"
},
new ButtonSchema(278, 61)
new ButtonSchema(278, 61, controller, "P")
{
Name = $"P{controller} P",
DisplayName = "P"
},
new ButtonSchema(302, 61)
new ButtonSchema(302, 61, controller, "At")
{
Name = $"P{controller} At",
DisplayName = "@"
},
new ButtonSchema(330, 61)
new ButtonSchema(330, 61, controller, "Left Bracket")
{
Name = $"P{controller} Left Bracket",
DisplayName = "["
},
new ButtonSchema(350, 61)
new ButtonSchema(350, 61, controller, "Return")
{
Name = $"P{controller} Return",
DisplayName = "RETURN"
},
new ButtonSchema(30, 84)
new ButtonSchema(30, 84, controller, "Contro")
{
Name = $"P{controller} Control",
DisplayName = "CTR"
},
new ButtonSchema(70, 84)
new ButtonSchema(70, 84, controller, "A")
{
Name = $"P{controller} A",
DisplayName = "A"
},
new ButtonSchema(94, 84)
new ButtonSchema(94, 84, controller, "S")
{
Name = $"P{controller} S",
DisplayName = "S"
},
new ButtonSchema(118, 84)
new ButtonSchema(118, 84, controller, "D")
{
Name = $"P{controller} D",
DisplayName = "D"
},
new ButtonSchema(144, 84)
new ButtonSchema(144, 84, controller, "F")
{
Name = $"P{controller} F",
DisplayName = "F"
},
new ButtonSchema(168, 84)
new ButtonSchema(168, 84, controller, "G")
{
Name = $"P{controller} G",
DisplayName = "G"
},
new ButtonSchema(194, 84)
new ButtonSchema(194, 84, controller, "H")
{
Name = $"P{controller} H",
DisplayName = "H"
},
new ButtonSchema(220, 84)
new ButtonSchema(220, 84, controller, "J")
{
Name = $"P{controller} J",
DisplayName = "J"
},
new ButtonSchema(242, 84)
new ButtonSchema(242, 84, controller, "K")
{
Name = $"P{controller} K",
DisplayName = "K"
},
new ButtonSchema(266, 84)
new ButtonSchema(266, 84, controller, "L")
{
Name = $"P{controller} L",
DisplayName = "L"
},
new ButtonSchema(290, 84)
new ButtonSchema(290, 84, controller, "Semicolon")
{
Name = $"P{controller} Semicolon",
DisplayName = ";"
},
new ButtonSchema(311, 84)
new ButtonSchema(311, 84, controller, "Colon")
{
Name = $"P{controller} Colon",
DisplayName = ":"
},
new ButtonSchema(332, 84)
new ButtonSchema(332, 84, controller, "Right Bracket")
{
Name = $"P{controller} Right Bracket",
DisplayName = "]"
},
new ButtonSchema(352, 84)
new ButtonSchema(352, 84, controller, "カナ")
{
Name = $"P{controller} カナ",
DisplayName = "カナ"
},
new ButtonSchema(10, 107)
new ButtonSchema(10, 107, controller, "Left Shift")
{
Name = $"P{controller} Left Shift",
DisplayName = "SHIFT"
},
new ButtonSchema(58, 107)
new ButtonSchema(58, 107, controller, "Z")
{
Name = $"P{controller} Z",
DisplayName = "Z"
},
new ButtonSchema(82, 107)
new ButtonSchema(82, 107, controller, "X")
{
Name = $"P{controller} X",
DisplayName = "X"
},
new ButtonSchema(106, 107)
new ButtonSchema(106, 107, controller, "C")
{
Name = $"P{controller} C",
DisplayName = "C"
},
new ButtonSchema(130, 107)
new ButtonSchema(130, 107, controller, "V")
{
Name = $"P{controller} V",
DisplayName = "V"
},
new ButtonSchema(154, 107)
new ButtonSchema(154, 107, controller, "B")
{
Name = $"P{controller} B",
DisplayName = "B"
},
new ButtonSchema(178, 107)
new ButtonSchema(178, 107, controller, "N")
{
Name = $"P{controller} N",
DisplayName = "N"
},
new ButtonSchema(203, 107)
new ButtonSchema(203, 107, controller, "M")
{
Name = $"P{controller} M",
DisplayName = "M"
},
new ButtonSchema(229, 107)
new ButtonSchema(229, 107, controller, "Comma")
{
Name = $"P{controller} Comma",
DisplayName = ","
},
new ButtonSchema(249, 107)
new ButtonSchema(249, 107, controller, "Period")
{
Name = $"P{controller} Period",
DisplayName = "."
},
new ButtonSchema(270, 107)
new ButtonSchema(270, 107, controller, "Slash")
{
Name = $"P{controller} Slash",
DisplayName = "/"
},
new ButtonSchema(292, 107)
new ButtonSchema(292, 107, controller, "Underscore")
{
Name = $"P{controller} Underscore",
DisplayName = "_"
},
new ButtonSchema(316, 107)
new ButtonSchema(316, 107, controller, "Right Shift")
{
Name = $"P{controller} Right Shift",
DisplayName = "SHIFT"
},
new ButtonSchema(82, 130)
new ButtonSchema(82, 130, controller, "Graph")
{
Name = $"P{controller} Graph",
DisplayName = "GRPH"
},
new ButtonSchema(130, 130)
new ButtonSchema(130, 130, controller, "Space")
{
Name = $"P{controller} Space",
DisplayName = " SPACE "
},
new ButtonSchema(420, 46)
new ButtonSchema(420, 46, controller, "Clear/Home")
{
Name = $"P{controller} Clear/Home",
DisplayName = " CLR\nHOME"
},
new ButtonSchema(470, 46)
new ButtonSchema(470, 46, controller, "Insert")
{
Name = $"P{controller} Insert",
DisplayName = "\nINS"
},
new ButtonSchema(506, 46)
new ButtonSchema(506, 46, controller, "Delete")
{
Name = $"P{controller} Delete",
DisplayName = "\nDEL"
},
new ButtonSchema(468, 86)
new ButtonSchema(468, 86, controller, "Up")
{
Name = $"P{controller} Up",
DisplayName = " ↑ "
},
new ButtonSchema(468, 134)
new ButtonSchema(468, 134, controller, "Down")
{
Name = $"P{controller} Down",
DisplayName = " ↓ "
},
new ButtonSchema(446, 110)
new ButtonSchema(446, 110, controller, "Left")
{
Name = $"P{controller} Left",
DisplayName = " ← "
},
new ButtonSchema(488, 110)
new ButtonSchema(488, 110, controller, "Right")
{
Name = $"P{controller} Right",
DisplayName = " ➝ "
}
}

View File

@ -38,9 +38,8 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(74, 34, controller, "F")
{
Name = $"P{controller} F",
DisplayName = "F"
}
}

View File

@ -57,75 +57,61 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(3, 32, controller, "L1")
{
Name = $"P{controller} L1",
DisplayName = "L1"
},
new ButtonSchema(191, 32)
new ButtonSchema(191, 32, controller, "R1")
{
Name = $"P{controller} R1",
DisplayName = "R1"
},
new ButtonSchema(3, 10)
new ButtonSchema(3, 10, controller, "L2")
{
Name = $"P{controller} L2",
DisplayName = "L2"
},
new ButtonSchema(191, 10)
new ButtonSchema(191, 10, controller, "R2")
{
Name = $"P{controller} R2",
DisplayName = "R2"
},
new ButtonSchema(72, 90)
new ButtonSchema(72, 90, controller, "L3")
{
Name = $"P{controller} L3",
DisplayName = "L3"
},
new ButtonSchema(130, 90)
new ButtonSchema(130, 90, controller, "R3")
{
Name = $"P{controller} R3",
DisplayName = "R3"
},
new ButtonSchema(148, 62)
new ButtonSchema(148, 62, controller, "Square")
{
Name = $"P{controller} Square",
Icon = Properties.Resources.Square
},
new ButtonSchema(169, 50)
new ButtonSchema(169, 50, controller, "Triangle")
{
Name = $"P{controller} Triangle",
Icon = Properties.Resources.Triangle
},
new ButtonSchema(190, 62)
new ButtonSchema(190, 62, controller, "Circle")
{
Name = $"P{controller} Circle",
Icon = Properties.Resources.Circle
},
new ButtonSchema(169, 71)
new ButtonSchema(169, 71, controller, "Cross")
{
Name = $"P{controller} Cross",
Icon = Properties.Resources.Cross
},
new ButtonSchema(112, 62)
new ButtonSchema(112, 62, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "S"
},
new ButtonSchema(90, 62)
new ButtonSchema(90, 62, controller, "Select")
{
Name = $"P{controller} Select",
DisplayName = "s"
},
new AnalogSchema(3, 120, $"P{controller} LStick X")
{
Name = $"P{controller} LStick X",
AxisRange = stickRanges[0],
SecondaryAxisRange = stickRanges[1]
},
new ButtonSchema(260, 120)
new AnalogSchema(260, 120, $"P{controller} RStick X")
{
Name = $"P{controller} RStick X",
AxisRange = stickRanges[0],
SecondaryAxisRange = stickRanges[1]
}
@ -145,54 +131,44 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(8, 37, controller, "L1")
{
Name = $"P{controller} L1",
DisplayName = "L1"
},
new ButtonSchema(196, 37)
new ButtonSchema(196, 37, controller, "R1")
{
Name = $"P{controller} R1",
DisplayName = "R1"
},
new ButtonSchema(8, 15)
new ButtonSchema(8, 15, controller, "L2")
{
Name = $"P{controller} L2",
DisplayName = "L2"
},
new ButtonSchema(196, 15)
new ButtonSchema(196, 15, controller, "R2")
{
Name = $"P{controller} R2",
DisplayName = "R2"
},
new ButtonSchema(153, 67)
new ButtonSchema(153, 67, controller, "Square")
{
Name = $"P{controller} Square",
Icon = Properties.Resources.Square
},
new ButtonSchema(174, 55)
new ButtonSchema(174, 55, controller, "Triangle")
{
Name = $"P{controller} Triangle",
Icon = Properties.Resources.Triangle
},
new ButtonSchema(195, 67)
new ButtonSchema(195, 67, controller, "Circle")
{
Name = $"P{controller} Circle",
Icon = Properties.Resources.Circle
},
new ButtonSchema(174, 76)
new ButtonSchema(174, 76, controller, "Cross")
{
Name = $"P{controller} Cross",
Icon = Properties.Resources.Cross
},
new ButtonSchema(112, 67)
new ButtonSchema(112, 67, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "S"
},
new ButtonSchema(90, 67)
new ButtonSchema(90, 67, controller, "Select")
{
Name = $"P{controller} Select",
DisplayName = "s"
}
}
@ -211,30 +187,24 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(78, 118, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "S"
},
new ButtonSchema(278, 38)
new ButtonSchema(278, 38, controller, "B")
{
Name = $"P{controller} B",
DisplayName = "B"
},
new ButtonSchema(308, 55)
new ButtonSchema(308, 55, controller, "A")
{
Name = $"P{controller} A",
DisplayName = "A"
},
new ButtonSchema(308, 15)
new ButtonSchema(308, 15, controller, "R")
{
Name = $"P{controller} R",
DisplayName = "R"
},
new SingleFloatSchema(5, 15, $"P{controller} L")
{
Name = $"P{controller} L",
DisplayName = "L",
TargetSize = new Size(128, 55),
MinValue = 0,

View File

@ -59,24 +59,20 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(122, 34, controller, "B2")
{
Name = $"P{controller} B2",
DisplayName = "II"
},
new ButtonSchema(146, 34)
new ButtonSchema(146, 34, controller, "B1")
{
Name = $"P{controller} B1",
DisplayName = "I"
},
new ButtonSchema(52, 34)
new ButtonSchema(52, 34, controller, "Select")
{
Name = $"P{controller} Select",
DisplayName = "s"
},
new ButtonSchema(74, 34)
new ButtonSchema(74, 34, controller, "Run")
{
Name = $"P{controller} Run",
DisplayName = "R"
}
}

View File

@ -52,54 +52,44 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(74, 17, controller, "Mode 1")
{
Name = $"P{controller} Mode 1",
DisplayName = "Mode 1"
},
new ButtonSchema(74, 40)
new ButtonSchema(74, 40, controller, "Mode 2")
{
Name = $"P{controller} Mode 2",
DisplayName = "Mode 2"
},
new ButtonSchema(77, 63)
new ButtonSchema(77, 63, controller, "Select")
{
Name = $"P{controller} Select",
DisplayName = "s"
},
new ButtonSchema(101, 63)
new ButtonSchema(101, 63, controller, "Run")
{
Name = $"P{controller} Run",
DisplayName = "R"
},
new ButtonSchema(140, 63)
new ButtonSchema(140, 63, controller, "IV")
{
Name = $"P{controller} IV",
DisplayName = "IV"
},
new ButtonSchema(166, 53)
new ButtonSchema(166, 53, controller, "V")
{
Name = $"P{controller} V",
DisplayName = "V"
},
new ButtonSchema(192, 43)
new ButtonSchema(192, 43, controller, "VI")
{
Name = $"P{controller} VI",
DisplayName = "VI"
},
new ButtonSchema(140, 40)
new ButtonSchema(140, 40, controller, "I")
{
Name = $"P{controller} I",
DisplayName = "I"
},
new ButtonSchema(166, 30)
new ButtonSchema(166, 30, controller, "II")
{
Name = $"P{controller} II",
DisplayName = "II"
},
new ButtonSchema(192, 20)
new ButtonSchema(192, 20, controller, "III")
{
Name = $"P{controller} III",
DisplayName = "III"
}
}
@ -118,14 +108,12 @@ namespace BizHawk.Client.EmuHawk
{
TargetSize = new Size(256, 256)
},
new ButtonSchema(300, 17)
new ButtonSchema(300, 17, controller, "Mouse Left")
{
Name = $"P{controller} Mouse Left",
DisplayName = "Left"
},
new ButtonSchema(300, 47)
new ButtonSchema(300, 47, "Mouse Right")
{
Name = $"P{controller} Mouse Right",
DisplayName = "Right"
}
}

View File

@ -17,35 +17,31 @@ namespace BizHawk.Client.EmuHawk
yield return StandardController(4);
}
private static PadSchema StandardController(int controllerNum)
private static PadSchema StandardController(int controller)
{
return new PadSchema
{
DefaultSize = new Size(174, 79),
Buttons = new[]
{
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)
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, "B")
{
Name = $"P{controllerNum} B",
DisplayName = "B"
},
new ButtonSchema(146, 34)
new ButtonSchema(146, 34, controller, "A")
{
Name = $"P{controllerNum} A",
DisplayName = "A"
},
new ButtonSchema(52, 34)
new ButtonSchema(52, 34, controller, "Select")
{
Name = $"P{controllerNum} Select",
DisplayName = "s"
},
new ButtonSchema(74, 34)
new ButtonSchema(74, 34, controller, "Start")
{
Name = $"P{controllerNum} Start",
DisplayName = "S"
}
}

View File

@ -77,49 +77,40 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(78, 52, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "S"
},
new ButtonSchema(110, 63)
new ButtonSchema(110, 63, controller, "A")
{
Name = $"P{controller} A",
DisplayName = "A"
},
new ButtonSchema(134, 53)
new ButtonSchema(134, 53, controller, "B")
{
Name = $"P{controller} B",
DisplayName = "B"
},
new ButtonSchema(158, 43)
new ButtonSchema(158, 43, controller, "C")
{
Name = $"P{controller} C",
DisplayName = "C"
},
new ButtonSchema(110, 40)
new ButtonSchema(110, 40, controller, "X")
{
Name = $"P{controller} X",
DisplayName = "X"
},
new ButtonSchema(134, 30)
new ButtonSchema(134, 30, controller, "Y")
{
Name = $"P{controller} Y",
DisplayName = "Y"
},
new ButtonSchema(158, 20)
new ButtonSchema(158, 20, controller, "Z")
{
Name = $"P{controller} Z",
DisplayName = "Z"
},
new ButtonSchema(2, 10)
new ButtonSchema(2, 10, controller, "L")
{
Name = $"P{controller} L",
DisplayName = "L"
},
new ButtonSchema(184, 10)
new ButtonSchema(184, 10, controller, "R")
{
Name = $"P{controller} R",
DisplayName = "R"
}
}
@ -138,39 +129,32 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(334, 112, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "S"
},
new ButtonSchema(366, 123)
new ButtonSchema(366, 123, controller, "A")
{
Name = $"P{controller} A",
DisplayName = "A"
},
new ButtonSchema(390, 113)
new ButtonSchema(390, 113, controller, "B")
{
Name = $"P{controller} B",
DisplayName = "B"
},
new ButtonSchema(414, 103)
new ButtonSchema(414, 103, controller, "C")
{
Name = $"P{controller} C",
DisplayName = "C"
},
new ButtonSchema(366, 100)
new ButtonSchema(366, 100, controller, "X")
{
Name = $"P{controller} X",
DisplayName = "X"
},
new ButtonSchema(390, 90)
new ButtonSchema(390, 90, controller, "Y")
{
Name = $"P{controller} Y",
DisplayName = "Y"
},
new ButtonSchema(414, 80)
new ButtonSchema(414, 80, controller, "Z")
{
Name = $"P{controller} Z",
DisplayName = "Z"
},
new AnalogSchema(6, 74)
@ -211,24 +195,20 @@ namespace BizHawk.Client.EmuHawk
{
TargetSize = new Size(256, 256)
},
new ButtonSchema(300, 17)
new ButtonSchema(300, 17, controller, "Mouse Left")
{
Name = $"P{controller} Mouse Left",
DisplayName = "Left"
},
new ButtonSchema(300, 47)
new ButtonSchema(300, 47, controller, "Mouse Center")
{
Name = $"P{controller} Mouse Center",
DisplayName = "Center"
},
new ButtonSchema(300, 77)
new ButtonSchema(300, 77, controller, "Mouse Right")
{
Name = $"P{controller} Mouse Right",
DisplayName = "Right"
},
new ButtonSchema(300, 107)
new ButtonSchema(300, 107, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "Start"
}
}
@ -252,39 +232,32 @@ namespace BizHawk.Client.EmuHawk
},
ButtonSchema.Up(150, 20, $"P{controller} Up"),
ButtonSchema.Down(150, 43, $"P{controller} Down"),
new ButtonSchema(180, 63)
new ButtonSchema(180, 63, controller, "A")
{
Name = $"P{controller} A",
DisplayName = "A"
},
new ButtonSchema(204, 53)
new ButtonSchema(204, 53, controller, "B")
{
Name = $"P{controller} B",
DisplayName = "B"
},
new ButtonSchema(228, 43)
new ButtonSchema(228, 43, controller, "C")
{
Name = $"P{controller} C",
DisplayName = "C"
},
new ButtonSchema(180, 40)
new ButtonSchema(180, 40, controller, "X")
{
Name = $"P{controller} X",
DisplayName = "X"
},
new ButtonSchema(204, 30)
new ButtonSchema(204, 30, controller, "Y")
{
Name = $"P{controller} Y",
DisplayName = "Y"
},
new ButtonSchema(228, 20)
new ButtonSchema(228, 20, controller, "Z")
{
Name = $"P{controller} Z",
DisplayName = "Z"
},
new ButtonSchema(268, 20)
new ButtonSchema(268, 20, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "Start"
}
}
@ -300,49 +273,40 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(445, 230),
Buttons = new[]
{
new ButtonSchema(45, 15)
new ButtonSchema(45, 15, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "Start"
},
new ButtonSchema(5, 58)
new ButtonSchema(5, 58, controller, "L")
{
Name = $"P{controller} L",
DisplayName = "L"
},
new ButtonSchema(105, 58)
new ButtonSchema(105, 58, controller, "R")
{
Name = $"P{controller} R",
DisplayName = "R"
},
new ButtonSchema(30, 43)
new ButtonSchema(30, 43, controller, "X")
{
Name = $"P{controller} X",
DisplayName = "X"
},
new ButtonSchema(55, 43)
new ButtonSchema(55, 43, controller, "Y")
{
Name = $"P{controller} Y",
DisplayName = "Y"
},
new ButtonSchema(80, 43)
new ButtonSchema(80, 43, controller, "Z")
{
Name = $"P{controller} Z",
DisplayName = "Z"
},
new ButtonSchema(30, 70)
new ButtonSchema(30, 70, controller, "A")
{
Name = $"P{controller} A",
DisplayName = "A"
},
new ButtonSchema(55, 70)
new ButtonSchema(55, 70, controller, "B")
{
Name = $"P{controller} B",
DisplayName = "B"
},
new ButtonSchema(80, 70)
new ButtonSchema(80, 70, controller, "C")
{
Name = $"P{controller} C",
DisplayName = "C"
},
new AnalogSchema(185, 13)
@ -416,14 +380,12 @@ namespace BizHawk.Client.EmuHawk
{
new ButtonSchema(10, 15, "Reset"),
new ButtonSchema(58, 15, "Power"),
new ButtonSchema(108, 15)
new ButtonSchema(108, 15, "Previous Disk")
{
Name = "Previous Disk",
DisplayName = "Prev Disc"
},
new ButtonSchema(175, 15)
new ButtonSchema(175, 15, "Next Disk")
{
Name = "Next Disk",
DisplayName = "Next Disc"
}
}

View File

@ -36,14 +36,12 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(122, 34, controller, "B1")
{
Name = $"P{controller} B1",
DisplayName = "1"
},
new ButtonSchema(146, 34)
new ButtonSchema(146, 34, controller, "B2")
{
Name = $"P{controller} B2",
DisplayName = "2"
}
}
@ -61,19 +59,16 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(134, 12, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "S"
},
new ButtonSchema(122, 34)
new ButtonSchema(122, 34, controller, "B1")
{
Name = $"P{controller} B1",
DisplayName = "1"
},
new ButtonSchema(146, 34)
new ButtonSchema(146, 34, controller, "B2")
{
Name = $"P{controller} B2",
DisplayName = "2"
}
}

View File

@ -119,44 +119,36 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(2, 10, controller, "L")
{
Name = $"P{controller} L",
DisplayName = "L"
},
new ButtonSchema(174, 10)
new ButtonSchema(174, 10, controller, "R")
{
Name = $"P{controller} R",
DisplayName = "R"
},
new ButtonSchema(70, 39)
new ButtonSchema(70, 39, controller, "Select")
{
Name = $"P{controller} Select",
DisplayName = "s"
},
new ButtonSchema(92, 39)
new ButtonSchema(92, 39, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "S"
},
new ButtonSchema(121, 39)
new ButtonSchema(121, 39, controller, "Y")
{
Name = $"P{controller} Y",
DisplayName = "Y"
},
new ButtonSchema(145, 52)
new ButtonSchema(145, 52, controller, "B")
{
Name = $"P{controller} B",
DisplayName = "B"
},
new ButtonSchema(122, 15)
new ButtonSchema(122, 15, controller, "X")
{
Name = $"P{controller} X",
DisplayName = "X"
},
new ButtonSchema(146, 25)
new ButtonSchema(146, 25, controller, "A")
{
Name = $"P{controller} A",
DisplayName = "A"
}
}
@ -176,14 +168,12 @@ namespace BizHawk.Client.EmuHawk
AxisRange = controllerDefRanges[0],
SecondaryAxisRange = controllerDefRanges[1]
},
new ButtonSchema(275, 15)
new ButtonSchema(275, 15, controller, "Mouse Left")
{
Name = $"P{controller} Mouse Left",
DisplayName = "Left"
},
new ButtonSchema(275, 45)
new ButtonSchema(275, 45, controller, "Mouse Right")
{
Name = $"P{controller} Mouse Right",
DisplayName = "Right"
}
}
@ -203,24 +193,20 @@ namespace BizHawk.Client.EmuHawk
{
TargetSize = new Size(256, 240)
},
new ButtonSchema(284, 17)
new ButtonSchema(284, 17, controller, "Trigger")
{
Name = $"P{controller} Trigger",
DisplayName = "Trigger"
},
new ButtonSchema(284, 47)
new ButtonSchema(284, 47, controller, "Cursor")
{
Name = $"P{controller} Cursor",
DisplayName = "Cursor"
},
new ButtonSchema(284, 77)
new ButtonSchema(284, 77, controller, "Turbo")
{
Name = $"P{controller} Turbo",
DisplayName = "Turbo"
},
new ButtonSchema(284, 107)
new ButtonSchema(284, 107, controller, "Pause")
{
Name = $"P{controller} Pause",
DisplayName = "Pause"
}
}
@ -240,14 +226,12 @@ namespace BizHawk.Client.EmuHawk
{
TargetSize = new Size(256, 240)
},
new ButtonSchema(284, 17)
new ButtonSchema(284, 17, controller, "Trigger")
{
Name = $"P{controller} Trigger",
DisplayName = "Trigger"
},
new ButtonSchema(284, 47)
new ButtonSchema(284, 47, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "Start"
}
}
@ -273,18 +257,24 @@ namespace BizHawk.Client.EmuHawk
for (int i = 0; i < 16; i++)
{
yield return new ButtonSchema(startX + (i * buttonSpacingX), startY)
yield return new ButtonSchema(
startX + (i * buttonSpacingX),
startY,
controller,
$"B{i}")
{
Name = $"P{controller} B{i}",
DisplayName = i.ToString()
};
}
for (int i = 0; i < 16; i++)
{
yield return new ButtonSchema(startX + (i * buttonSpacingX), startY + buttonSpacingY)
yield return new ButtonSchema(
startX + (i * buttonSpacingX),
startY + buttonSpacingY,
controller,
$"B{i + 16}")
{
Name = $"P{controller} B{i + 16}",
DisplayName = (i + 16).ToString()
};
}

View File

@ -48,24 +48,20 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(74, 34, controller, "Button 1")
{
Name = $"P{controller} Button 1",
DisplayName = "1"
},
new ButtonSchema(98, 34)
new ButtonSchema(98, 34, controller, "Button 2")
{
Name = $"P{controller} Button 2",
DisplayName = "2"
},
new ButtonSchema(122, 34)
new ButtonSchema(122, 34, controller, "Button 3")
{
Name = $"P{controller} Button 3",
DisplayName = "3"
},
new ButtonSchema(146, 34)
new ButtonSchema(146, 34, controller, "Button 4")
{
Name = $"P{controller} Button 4",
DisplayName = "4"
}
}
@ -80,24 +76,20 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(280, 380),
Buttons = new[]
{
new ButtonSchema(74, 34)
new ButtonSchema(74, 34, controller, "Button 1")
{
Name = $"P{controller} Button 1",
DisplayName = "1"
},
new ButtonSchema(98, 34)
new ButtonSchema(98, 34, controller, "Button 2")
{
Name = $"P{controller} Button 2",
DisplayName = "2"
},
new ButtonSchema(122, 34)
new ButtonSchema(122, 34, controller, "Button 3")
{
Name = $"P{controller} Button 3",
DisplayName = "3"
},
new ButtonSchema(146, 34)
new ButtonSchema(146, 34, controller, "Button 4")
{
Name = $"P{controller} Button 4",
DisplayName = "4"
},
new AnalogSchema(2, 80, $"P{controller} Stick X")

View File

@ -26,16 +26,16 @@ namespace BizHawk.Client.EmuHawk
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" },
new ButtonSchema(122, 58, "B"),
new ButtonSchema(146, 58, "A"),
new ButtonSchema(52, 58, "Select") { DisplayName = "s"},
new ButtonSchema(74, 58, "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" }
new ButtonSchema(24, 8, "L"),
new ButtonSchema(176, 8, "R")
}
};
}

View File

@ -24,59 +24,48 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(174, 210),
Buttons = new[]
{
new ButtonSchema(23, 12)
new ButtonSchema(23, 12, controller, "Y1")
{
Name = $"P{controller} Y1",
DisplayName = "Y1"
},
new ButtonSchema(9, 34)
new ButtonSchema(9, 34, controller, "Y4")
{
Name = $"P{controller} Y4",
DisplayName = "Y4"
},
new ButtonSchema(38, 34)
new ButtonSchema(38, 34, controller, "Y2")
{
Name = $"P{controller} Y2",
DisplayName = "Y2"
},
new ButtonSchema(23, 56)
new ButtonSchema(23, 56, controller, "Y3")
{
Name = $"P{controller} Y3",
DisplayName = "Y3"
},
new ButtonSchema(23, 92)
new ButtonSchema(23, 92, controller, "X1")
{
Name = $"P{controller} X1",
DisplayName = "X1"
},
new ButtonSchema(9, 114)
new ButtonSchema(9, 114, controller, "X4")
{
Name = $"P{controller} X4",
DisplayName = "X4"
},
new ButtonSchema(38, 114)
new ButtonSchema(38, 114, controller, "X2")
{
Name = $"P{controller} X2",
DisplayName = "X2"
},
new ButtonSchema(23, 136)
new ButtonSchema(23, 136, controller, "X3")
{
Name = $"P{controller} X3",
DisplayName = "X3"
},
new ButtonSchema(80, 114)
new ButtonSchema(80, 114, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "S"
},
new ButtonSchema(110, 114)
new ButtonSchema(110, 114, controller, "B")
{
Name = $"P{controller} B",
DisplayName = "B"
},
new ButtonSchema(133, 103)
new ButtonSchema(133, 103, controller, "A")
{
Name = $"P{controller} A",
DisplayName = "A"
}
}
@ -91,59 +80,48 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(174, 210),
Buttons = new[]
{
new ButtonSchema(23, 12)
new ButtonSchema(23, 12, controller, "A")
{
Name = $"P{controller} A",
DisplayName = "A"
},
new ButtonSchema(46, 22)
new ButtonSchema(46, 22, controller, "B")
{
Name = $"P{controller} B",
DisplayName = "B"
},
new ButtonSchema(32, 58)
new ButtonSchema(32, 58, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "S"
},
new ButtonSchema(23, 112)
new ButtonSchema(23, 112, controller, "Y2")
{
Name = $"P{controller} Y2",
DisplayName = "Y2"
},
new ButtonSchema(9, 134)
new ButtonSchema(9, 134, controller, "Y1")
{
Name = $"P{controller} Y1",
DisplayName = "Y1"
},
new ButtonSchema(38, 134)
new ButtonSchema(38, 134, controller, "Y3")
{
Name = $"P{controller} Y3",
DisplayName = "Y3"
},
new ButtonSchema(23, 156)
new ButtonSchema(23, 156, controller, "Y4")
{
Name = $"P{controller} Y4",
DisplayName = "Y4"
},
new ButtonSchema(103, 112)
new ButtonSchema(103, 112, controller, "X2")
{
Name = $"P{controller} X2",
DisplayName = "X2"
},
new ButtonSchema(89, 134)
new ButtonSchema(89, 134, controller, "X1")
{
Name = $"P{controller} X1",
DisplayName = "X1"
},
new ButtonSchema(118, 134)
new ButtonSchema(118, 134, controller, "X3")
{
Name = $"P{controller} X3",
DisplayName = "X3"
},
new ButtonSchema(103, 156)
new ButtonSchema(103, 156, controller, "X4")
{
Name = $"P{controller} X4",
DisplayName = "X4"
}
}

View File

@ -31,9 +31,8 @@ namespace BizHawk.Client.EmuHawk
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)
new ButtonSchema(124, 24, controller, "Button")
{
Name = $"P{controller} Button",
DisplayName = "B"
}
}
@ -197,14 +196,12 @@ namespace BizHawk.Client.EmuHawk
Name = "RTZ Tape",
Icon = Properties.Resources.BackMore
},
new ButtonSchema(23, 52)
new ButtonSchema(23, 52, "Insert Next Tape")
{
Name = "Insert Next Tape",
DisplayName = "NEXT TAPE"
},
new ButtonSchema(100, 52)
new ButtonSchema(100, 52, "Insert Previous Tape")
{
Name = "Insert Previous Tape",
DisplayName = "PREV TAPE"
}
}