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

ButtonSchema - use name overload more

This commit is contained in:
adelikat 2020-03-22 13:16:30 -05:00
parent 5f24a07fc9
commit 1c9260f7cf
13 changed files with 110 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,9 +172,9 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(185, 75),
Buttons = new[]
{
new ButtonSchema(10, 15) { Name = "Select" },
new ButtonSchema(60, 15) { Name = "Reset" },
new ButtonSchema(108, 15) { Name = "Power" },
new ButtonSchema(10, 15, "Select"),
new ButtonSchema(60, 15, "Reset"),
new ButtonSchema(108, 15, "Power"),
new ButtonSchema(10, 40)
{
Name = "Toggle Left Difficulty",

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

@ -26,92 +26,75 @@ namespace BizHawk.Client.EmuHawk
/************************** Row 1 **************************/
new ButtonSchema(10, 18) { Name = "Escape", DisplayName = "Esc"
},
new ButtonSchema(46, 18) { Name = "1" },
new ButtonSchema(70, 18) { Name = "2" },
new ButtonSchema(94, 18) { Name = "3" },
new ButtonSchema(118, 18) { Name = "4" },
new ButtonSchema(142, 18) { Name = "5" },
new ButtonSchema(166, 18) { Name = "6" },
new ButtonSchema(190, 18) { Name = "7" },
new ButtonSchema(214, 18) { Name = "8" },
new ButtonSchema(238, 18) { Name = "9" },
new ButtonSchema(262, 18) { Name = "0" },
new ButtonSchema(286, 18) { Name = "-" },
new ButtonSchema(307, 18) { Name = "=" },
new ButtonSchema(331, 18) { Name = "Delete" },
new ButtonSchema(46, 18, "1"),
new ButtonSchema(70, 18, "2"),
new ButtonSchema(94, 18, "3"),
new ButtonSchema(118, 18, "4"),
new ButtonSchema(142, 18, "5"),
new ButtonSchema(166, 18, "6"),
new ButtonSchema(190, 18, "7"),
new ButtonSchema(214, 18, "8"),
new ButtonSchema(238, 18, "9"),
new ButtonSchema(262, 18, "0"),
new ButtonSchema(286, 18, "-"),
new ButtonSchema(307, 18, "="),
new ButtonSchema(331, 18, "Delete"),
/************************** Row 2 **************************/
new ButtonSchema(10, 42) { Name = "Tab", DisplayName = " Tab " },
new ButtonSchema(52, 42) { Name = "Q" },
new ButtonSchema(78, 42) { Name = "W" },
new ButtonSchema(106, 42) { Name = "E" },
new ButtonSchema(130, 42) { Name = "R" },
new ButtonSchema(156, 42) { Name = "T" },
new ButtonSchema(180, 42) { Name = "Y" },
new ButtonSchema(204, 42) { Name = "U" },
new ButtonSchema(230, 42) { Name = "I" },
new ButtonSchema(250, 42) { Name = "O" },
new ButtonSchema(276, 42) { Name = "P" },
new ButtonSchema(302, 42) { Name = "[" },
new ButtonSchema(325, 42) { Name = "]" },
new ButtonSchema(349, 42) { Name = "\\", DisplayName = " \\ " },
new ButtonSchema(10, 42, "Tab") { DisplayName = " Tab " },
new ButtonSchema(52, 42, "Q"),
new ButtonSchema(78, 42, "W"),
new ButtonSchema(106, 42, "E"),
new ButtonSchema(130, 42, "R"),
new ButtonSchema(156, 42, "T"),
new ButtonSchema(180, 42, "Y"),
new ButtonSchema(204, 42, "U"),
new ButtonSchema(230, 42, "I"),
new ButtonSchema(250, 42, "O"),
new ButtonSchema(276, 42, "P"),
new ButtonSchema(302, 42, "["),
new ButtonSchema(325, 42, "]"),
new ButtonSchema(349, 42, "\\") { DisplayName = " \\ " },
/************************** Row 3 **************************/
new ButtonSchema(10, 66) { Name = "Control", DisplayName = " Control " },
new ButtonSchema(66, 66) { Name = "A" },
new ButtonSchema(90, 66) { Name = "S" },
new ButtonSchema(114, 66) { Name = "D" },
new ButtonSchema(140, 66) { Name = "F" },
new ButtonSchema(164, 66) { Name = "G" },
new ButtonSchema(190, 66) { Name = "H" },
new ButtonSchema(216, 66) { Name = "J" },
new ButtonSchema(238, 66) { Name = "K" },
new ButtonSchema(262, 66) { Name = "L" },
new ButtonSchema(286, 66) { Name = ";" },
new ButtonSchema(307, 66) { Name = "'" },
new ButtonSchema(328, 66) { Name = "Return" },
new ButtonSchema(10, 66, "Control") { DisplayName = " Control " },
new ButtonSchema(66, 66, "A"),
new ButtonSchema(90, 66, "S"),
new ButtonSchema(114, 66, "D"),
new ButtonSchema(140, 66, "F"),
new ButtonSchema(164, 66, "G"),
new ButtonSchema(190, 66, "H"),
new ButtonSchema(216, 66, "J"),
new ButtonSchema(238, 66, "K"),
new ButtonSchema(262, 66, "L"),
new ButtonSchema(286, 66, ";"),
new ButtonSchema(307, 66, "'"),
new ButtonSchema(328, 66, "Return"),
/************************** Row 4 **************************/
new ButtonSchema(10, 90) { Name = "Shift", DisplayName = " Shift " },
new ButtonSchema(80, 90) { Name = "Z" },
new ButtonSchema(106, 90) { Name = "X" },
new ButtonSchema(130, 90) { Name = "C" },
new ButtonSchema(154, 90) { Name = "V" },
new ButtonSchema(178, 90) { Name = "B" },
new ButtonSchema(202, 90) { Name = "N" },
new ButtonSchema(226, 90) { Name = "M" },
new ButtonSchema(252, 90) { Name = "," },
new ButtonSchema(272, 90) { Name = "." },
new ButtonSchema(292, 90) { Name = "/" },
new ButtonSchema(315, 90) { Name = "Shift", DisplayName = " Shift " },
new ButtonSchema(10, 90, "Shift") { DisplayName = " Shift " },
new ButtonSchema(80, 90, "Z"),
new ButtonSchema(106, 90, "X"),
new ButtonSchema(130, 90, "C"),
new ButtonSchema(154, 90, "V"),
new ButtonSchema(178, 90, "B"),
new ButtonSchema(202, 90, "N"),
new ButtonSchema(226, 90, "M"),
new ButtonSchema(252, 90, ","),
new ButtonSchema(272, 90, "."),
new ButtonSchema(292, 90, "/"),
new ButtonSchema(315, 90, "Shift") { DisplayName = " Shift " },
/************************** Row 5 **************************/
new ButtonSchema(10, 114)
new ButtonSchema(10, 114, "Caps Lock") { DisplayName = "Caps" },
new ButtonSchema(52, 114, "`") { DisplayName = "~" },
new ButtonSchema(96, 114, "White Apple") { DisplayName = "<" },
new ButtonSchema(120, 114, "Space")
{
Name = "Caps Lock",
DisplayName = "Caps"
},
new ButtonSchema(52, 114)
{
Name = "`",
DisplayName = "~"
},
new ButtonSchema(96, 114)
{
Name = "White Apple",
DisplayName = "<"
},
new ButtonSchema(120, 114)
{
Name = "Space",
DisplayName = " Space "
},
new ButtonSchema(265, 114)
{
Name = "Black Apple",
DisplayName = ">"
},
new ButtonSchema(265, 114, "Black Apple") { DisplayName = ">" },
ButtonSchema.Left(289, 114, "Left"),
ButtonSchema.Right(311, 114, "Right"),
ButtonSchema.Down(333, 114, "Down"),
@ -128,14 +111,12 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(120, 50),
Buttons = new[]
{
new ButtonSchema(10, 18)
new ButtonSchema(10, 18, "Next Disk")
{
Name = "Next Disk",
DisplayName = "Next"
},
new ButtonSchema(50, 18)
new ButtonSchema(50, 18, "Previous Disk")
{
Name = "Previous Disk",
DisplayName = "Previous"
}
}

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

@ -117,9 +117,8 @@ namespace BizHawk.Client.EmuHawk
}
private static ButtonSchema Key(int x, int y, string name, string displayName = null)
=> new ButtonSchema(x, y)
=> new ButtonSchema(x, y, "Key " + name)
{
Name = "Key " + name,
DisplayName = displayName ?? name
};
}

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

@ -30,24 +30,9 @@ namespace BizHawk.Client.EmuHawk
MaxSize = new Size(256, 326),
Buttons = new[]
{
new SingleFloatSchema(10, 15, "Tilt X")
{
TargetSize = new Size(226, 69),
MinValue = short.MinValue,
MaxValue = short.MaxValue
},
new SingleFloatSchema(10, 94, "Tilt Y")
{
TargetSize = new Size(226, 69),
MinValue = short.MinValue,
MaxValue = short.MaxValue
},
new SingleFloatSchema(10, 173, "Tilt Z")
{
TargetSize = new Size(226, 69),
MinValue = short.MinValue,
MaxValue = short.MaxValue
},
Tilt(10, 15, "X"),
Tilt(10, 94, "Y"),
Tilt(10, 173, "Z"),
new SingleFloatSchema(10, 252, "Light Sensor")
{
TargetSize = new Size(226, 69),
@ -57,6 +42,14 @@ namespace BizHawk.Client.EmuHawk
};
}
private static ButtonSchema Tilt(int x, int y, string direction)
=> new SingleFloatSchema(x, y, "Tilt " + direction)
{
TargetSize = new Size(226, 69),
MinValue = short.MinValue,
MaxValue = short.MaxValue
};
private static PadSchema StandardController()
{
return new PadSchema

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

@ -41,10 +41,10 @@ namespace BizHawk.Client.EmuHawk
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" },
new ButtonSchema(74, 34) { Name = "Start", DisplayName = "S" }
new ButtonSchema(122, 34, "B"),
new ButtonSchema(146, 34, "A"),
new ButtonSchema(52, 34, "Select") { DisplayName = "s" },
new ButtonSchema(74, 34, "Start") { DisplayName = "S" }
}
};
}
@ -56,7 +56,7 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(75, 50),
Buttons = new[]
{
new ButtonSchema(10, 15) { Name = "Power" }
new ButtonSchema(10, 15, "Power")
}
};
}
@ -73,26 +73,10 @@ namespace BizHawk.Client.EmuHawk
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",
DisplayName = "B"
},
new ButtonSchema(146, 34)
{
Name = "P1 A",
DisplayName = "A"
},
new ButtonSchema(52, 34)
{
Name = "P1 Select",
DisplayName = "s"
},
new ButtonSchema(74, 34)
{
Name = "P1 Start",
DisplayName = "S"
}
new ButtonSchema(122, 34, "P1 B") { DisplayName = "B" },
new ButtonSchema(146, 34, "P1 A") { DisplayName = "A" },
new ButtonSchema(52, 34, "P1 Select") { DisplayName = "s" },
new ButtonSchema(74, 34, "P1 Start") { DisplayName = "S" }
}
};
}
@ -104,7 +88,7 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(75, 50),
Buttons = new[]
{
new ButtonSchema(10, 15) { Name = "P1 Power" }
new ButtonSchema(10, 15, "P1 Power") { DisplayName = "Power" }
}
};
}

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

@ -222,8 +222,8 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(150, 50),
Buttons = new[]
{
new ButtonSchema(10, 15) { Name = "Reset" },
new ButtonSchema(58, 15) { Name = "Power" }
new ButtonSchema(10, 15, "Reset"),
new ButtonSchema(58, 15, "Power")
}
};
}

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

@ -37,14 +37,14 @@ namespace BizHawk.Client.EmuHawk.tools.VirtualPads.schema
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" },
new ButtonSchema(2, 10, "L"),
new ButtonSchema(366, 10, "R"),
new ButtonSchema(341, 179, "Start"),
new ButtonSchema(341, 201, "Select"),
new ButtonSchema(341, 100, "Y"),
new ButtonSchema(365, 113, "B"),
new ButtonSchema(341, 76, "X"),
new ButtonSchema(366, 86, "A"),
// Screen
new TargetedPairSchema(72, 35, "TouchX")

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

@ -167,8 +167,8 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(150, 50),
Buttons = new[]
{
new ButtonSchema(10, 15) { Name = "Reset" },
new ButtonSchema(58, 15) { Name = "Power" }
new ButtonSchema(10, 15, "Reset"),
new ButtonSchema(58, 15, "Power")
}
};
}
@ -177,11 +177,10 @@ namespace BizHawk.Client.EmuHawk
{
var buttons = new List<ButtonSchema>
{
new ButtonSchema(10, 15) { Name = "Reset" },
new ButtonSchema(58, 15) { Name = "Power" },
new ButtonSchema(108, 15)
new ButtonSchema(10, 15, "Reset"),
new ButtonSchema(58, 15, "Power"),
new ButtonSchema(108, 15, "FDS Eject")
{
Name = "FDS Eject",
DisplayName = "Eject"
}
};

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

@ -26,21 +26,9 @@ namespace BizHawk.Client.EmuHawk
ButtonSchema.Down(14, 56, "Down"),
ButtonSchema.Left(2, 34, "Left"),
ButtonSchema.Right(24, 34, "Right"),
new ButtonSchema(74, 34)
{
Name = "B",
DisplayName = "B"
},
new ButtonSchema(98, 34)
{
Name = "A",
DisplayName = "A"
},
new ButtonSchema(146, 12)
{
Name = "Option",
DisplayName = "O"
}
new ButtonSchema(74, 34, "B"),
new ButtonSchema(98, 34, "A"),
new ButtonSchema(146, 12, "Option") { DisplayName = "O" }
}
};
}
@ -52,7 +40,7 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(75, 50),
Buttons = new[]
{
new ButtonSchema(10, 15) { Name = "Power" }
new ButtonSchema(10, 15, "Power")
}
};
}

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

@ -87,8 +87,8 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(150, 50),
Buttons = new[]
{
new ButtonSchema(10, 15) { Name = "Reset" },
new ButtonSchema(58, 15) { Name = "Pause" }
new ButtonSchema(10, 15, "Reset"),
new ButtonSchema(58, 15, "Pause")
}
};
}
@ -100,7 +100,7 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(150, 50),
Buttons = new[]
{
new ButtonSchema(10, 15) { Name = "Reset" }
new ButtonSchema(10, 15, "Reset")
}
};
}

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

@ -297,8 +297,8 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(150, 50),
Buttons = new[]
{
new ButtonSchema(10, 15) { Name = "Reset" },
new ButtonSchema(58, 15) { Name = "Power" }
new ButtonSchema(10, 15, "Reset"),
new ButtonSchema(58, 15, "Power")
}
};
}

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

@ -47,7 +47,7 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(75, 50),
Buttons = new[]
{
new ButtonSchema(10, 15) { Name = "Power" }
new ButtonSchema(10, 15, "Power")
}
};
}

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

@ -157,7 +157,7 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(75, 50),
Buttons = new[]
{
new ButtonSchema(7, 15) { Name = "Power" }
new ButtonSchema(7, 15, "Power")
}
};
}