From b390c2829c688cfcd694d3d8ff0b452fb0778337 Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 31 Dec 2019 11:36:22 -0600 Subject: [PATCH] cleanup virtualpad code --- .../tools/VirtualPads/schema/A26Schema.cs | 1 + .../tools/VirtualPads/schema/A78Schema.cs | 8 +- .../tools/VirtualPads/schema/AppleIISchema.cs | 1 + .../tools/VirtualPads/schema/C64Schema.cs | 1 + .../tools/VirtualPads/schema/ColecoSchema.cs | 1 + .../tools/VirtualPads/schema/DualGBSchema.cs | 1 + .../tools/VirtualPads/schema/GBASchema.cs | 1 + .../tools/VirtualPads/schema/GBSchema.cs | 1 + .../tools/VirtualPads/schema/GGLSchema.cs | 1 + .../tools/VirtualPads/schema/GenSchema.cs | 18 +- .../tools/VirtualPads/schema/IntvSchema.cs | 1 + .../tools/VirtualPads/schema/LynxSchema.cs | 2 +- .../tools/VirtualPads/schema/N64Schema.cs | 1 + .../tools/VirtualPads/schema/NesSchema.cs | 169 ++++-------------- .../tools/VirtualPads/schema/NgpSchema.cs | 1 + .../tools/VirtualPads/schema/O2Schema.cs | 1 + .../tools/VirtualPads/schema/PSXSchema.cs | 9 +- .../tools/VirtualPads/schema/PadSchema.cs | 4 +- .../tools/VirtualPads/schema/PceSchema.cs | 1 + .../tools/VirtualPads/schema/PcfxSchema.cs | 15 +- .../tools/VirtualPads/schema/SGBSchema.cs | 1 + .../tools/VirtualPads/schema/SatSchema.cs | 3 +- .../VirtualPads/schema/SchemaAttribute.cs | 2 +- .../tools/VirtualPads/schema/SmsSchema.cs | 1 + .../tools/VirtualPads/schema/SnesSchema.cs | 21 +-- .../tools/VirtualPads/schema/VECSchema.cs | 9 +- .../VirtualPads/schema/VirtualBoySchema.cs | 1 + .../VirtualPads/schema/WonderSwanSchema.cs | 1 + .../VirtualPads/schema/ZXSpectrumSchema.cs | 31 ++-- BizHawk.sln.DotSettings | 5 + 30 files changed, 120 insertions(+), 193 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs index c15d0f3095..44c0ee1d60 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs @@ -7,6 +7,7 @@ using BizHawk.Emulation.Cores.Atari.Atari2600; namespace BizHawk.Client.EmuHawk { [Schema("A26")] + // ReSharper disable once UnusedMember.Global public class A26Schema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs index 2491618d8e..863fec15c6 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs @@ -9,6 +9,7 @@ using BizHawk.Emulation.Cores.Atari.A7800Hawk; namespace BizHawk.Client.EmuHawk { [Schema("A78")] + // ReSharper disable once UnusedMember.Global public class A78Schema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) @@ -19,15 +20,14 @@ namespace BizHawk.Client.EmuHawk internal static class Atari7800HawkSchema { - private static string UnpluggedControllerName => typeof(UnpluggedController).DisplayName(); private static string StandardControllerName => typeof(StandardController).DisplayName(); private static string ProLineControllerName => typeof(ProLineController).DisplayName(); public static IEnumerable GetPadSchemas(A7800Hawk core) { - var A78SyncSettings = core.GetSyncSettings().Clone(); - var port1 = A78SyncSettings.Port1; - var port2 = A78SyncSettings.Port2; + var a78SyncSettings = core.GetSyncSettings().Clone(); + var port1 = a78SyncSettings.Port1; + var port2 = a78SyncSettings.Port2; if (port1 == StandardControllerName) { diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs index b723d0d589..258eba113a 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs @@ -6,6 +6,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { [Schema("AppleII")] + // ReSharper disable once UnusedMember.Global public class AppleIISchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs index 087a49e215..30e78eb6e5 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs @@ -6,6 +6,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { [Schema("C64")] + // ReSharper disable once UnusedMember.Global public class C64Schema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs index facebe0bbc..d1f07fcbe0 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs @@ -7,6 +7,7 @@ using BizHawk.Emulation.Cores.ColecoVision; namespace BizHawk.Client.EmuHawk { [Schema("Coleco")] + // ReSharper disable once UnusedMember.Global public class ColecoSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs index fa2994abd2..60324cbaf4 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs @@ -6,6 +6,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { [Schema("DGB")] + // ReSharper disable once UnusedMember.Global public class DualGBSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs index 493f1b649e..803e8f4c50 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs @@ -7,6 +7,7 @@ using BizHawk.Emulation.Cores.Nintendo.GBA; namespace BizHawk.Client.EmuHawk { [Schema("GBA")] + // ReSharper disable once UnusedMember.Global public class GBASchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs index 19cd26ffb1..9b8c9d4da7 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs @@ -6,6 +6,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { [Schema("GB")] + // ReSharper disable once UnusedMember.Global public class GBSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GGLSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GGLSchema.cs index ef7a52875f..f926a98cbe 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GGLSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GGLSchema.cs @@ -6,6 +6,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { [Schema("GGL")] + // ReSharper disable once UnusedMember.Global public class GGLSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs index b5a35b32c4..c9aa1b0c2c 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs @@ -3,24 +3,24 @@ using System.Drawing; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Consoles.Sega.gpgx; -using BizHawk.Emulation.Cores.Consoles.Sega.PicoDrive; namespace BizHawk.Client.EmuHawk { [Schema("GEN")] + // ReSharper disable once UnusedMember.Global public class GenSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) { - if (core is GPGX) + if (core is GPGX gpgx) { - return GpgxPadSchemas((GPGX)core); + return GpgxPadSchemas(gpgx); } - return PicoPadSchemas((PicoDrive)core); + return PicoPadSchemas(); } - private IEnumerable PicoPadSchemas(PicoDrive core) + private IEnumerable PicoPadSchemas() { yield return SixButtonController(1); yield return SixButtonController(2); @@ -29,9 +29,9 @@ namespace BizHawk.Client.EmuHawk private IEnumerable GpgxPadSchemas(GPGX core) { - var devs = (core).GetDevices(); + var devices = core.GetDevices(); int player = 1; - foreach (var dev in devs) + foreach (var dev in devices) { switch (dev) { @@ -53,7 +53,7 @@ namespace BizHawk.Client.EmuHawk yield return Activator(player); break; case LibGPGX.INPUT_DEVICE.DEVICE_XE_A1P: - yield return XE1AP(player); + yield return Xe1AP(player); break; default: // TO DO @@ -429,7 +429,7 @@ namespace BizHawk.Client.EmuHawk }; } - private static PadSchema XE1AP(int controller) + private static PadSchema Xe1AP(int controller) { return new PadSchema { diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs index 178f9bdd75..03ae9682ef 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs @@ -8,6 +8,7 @@ using BizHawk.Emulation.Cores.Intellivision; namespace BizHawk.Client.EmuHawk { [Schema("INTV")] + // ReSharper disable once UnusedMember.Global public class IntvSchema : IVirtualPadSchema { private string StandardControllerName => typeof(StandardController).DisplayName(); diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs index 6137fac22c..b012bacc4f 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs @@ -6,12 +6,12 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { [Schema("Lynx")] + // ReSharper disable once UnusedMember.Global public class LynxSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) { yield return StandardController(); - //yield return ConsoleButtons(); } private static PadSchema StandardController() diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs index e8b1c0e9be..02e23df50d 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs @@ -7,6 +7,7 @@ using BizHawk.Emulation.Cores.Nintendo.N64; namespace BizHawk.Client.EmuHawk { [Schema("N64")] + // ReSharper disable once UnusedMember.Global public class N64Schema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs index 2a8ff69673..a8ab4d3031 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs @@ -11,17 +11,29 @@ using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES; namespace BizHawk.Client.EmuHawk { [Schema("NES")] + // ReSharper disable once UnusedMember.Global public class NesSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) { - if (core is NES) + if (core is NES || core is SubNESHawk) { - var nes = (NES)core; + NES.NESSyncSettings ss = null; + bool isFds = false; + int fdsButtonCount = 0; + if (core is NES nesHawk) + { + ss = nesHawk.GetSyncSettings(); + isFds = nesHawk.IsFDS; + fdsButtonCount = nesHawk.ControllerDefinition.BoolButtons.Count(b => b.StartsWith("FDS Insert ")); + } + else if (core is SubNESHawk subNesHawk) + { + ss = subNesHawk.GetSyncSettings(); + isFds = subNesHawk.IsFDS; + fdsButtonCount = subNesHawk.ControllerDefinition.BoolButtons.Count(b => b.StartsWith("FDS Insert ")); + } - var ss = nes.GetSyncSettings(); - - var isFds = nes.IsFDS; if (ss.Controls.Famicom) { yield return StandardController(1); @@ -52,7 +64,7 @@ namespace BizHawk.Client.EmuHawk } else { - var currentControlerNo = 1; + var currentControllerNo = 1; switch (ss.Controls.NesLeftPort) { default: @@ -60,24 +72,24 @@ namespace BizHawk.Client.EmuHawk break; case "ControllerNES": yield return StandardController(1); - currentControlerNo++; + currentControllerNo++; break; case "Zapper": yield return Zapper(1); - currentControlerNo++; + currentControllerNo++; break; case "ArkanoidNES": yield return ArkanoidPaddle(1); - currentControlerNo++; + currentControllerNo++; break; case "FourScore": yield return StandardController(1); yield return StandardController(2); - currentControlerNo += 2; + currentControllerNo += 2; break; case "PowerPad": yield return PowerPad(1); - currentControlerNo++; + currentControllerNo++; break; case "ControllerSNES": throw new Exception("TODO"); @@ -89,27 +101,27 @@ namespace BizHawk.Client.EmuHawk case "UnpluggedNES": break; case "ControllerNES": - yield return StandardController(currentControlerNo); + yield return StandardController(currentControllerNo); break; case "Zapper": - yield return Zapper(currentControlerNo); + yield return Zapper(currentControllerNo); break; case "ArkanoidNES": - yield return ArkanoidPaddle(currentControlerNo); + yield return ArkanoidPaddle(currentControllerNo); break; case "FourScore": - yield return StandardController(currentControlerNo); - yield return StandardController(currentControlerNo + 1); - currentControlerNo += 2; + yield return StandardController(currentControllerNo); + yield return StandardController(currentControllerNo + 1); + currentControllerNo += 2; break; case "PowerPad": - yield return PowerPad(currentControlerNo); + yield return PowerPad(currentControllerNo); break; case "ControllerSNES": throw new Exception("TODO"); } - if (currentControlerNo == 0) + if (currentControllerNo == 0) { yield return null; } @@ -117,139 +129,28 @@ namespace BizHawk.Client.EmuHawk if (isFds) { - yield return FdsConsoleButtons(core.ControllerDefinition.BoolButtons.Count(b => b.StartsWith("FDS Insert "))); + yield return FdsConsoleButtons(fdsButtonCount); } else { yield return NesConsoleButtons(); } } - else if (core is SubNESHawk) - { - { - var nes = (SubNESHawk)core; - - var ss = nes.GetSyncSettings(); - - var isFds = nes.IsFDS; - if (ss.Controls.Famicom) - { - yield return StandardController(1); - yield return Famicom2ndController(); - - switch (ss.Controls.FamicomExpPort) - { - default: - case "UnpluggedFam": - break; - case "Zapper": - yield return Zapper(3); - break; - case "ArkanoidFam": - yield return ArkanoidPaddle(3); - break; - case "Famicom4P": - yield return StandardController(3); - yield return StandardController(4); - break; - case "FamilyBasicKeyboard": - yield return FamicomFamilyKeyboard(3); - break; - case "OekaKids": - yield return OekaKidsTablet(3); - break; - } - } - else - { - var currentControlerNo = 1; - switch (ss.Controls.NesLeftPort) - { - default: - case "UnpluggedNES": - break; - case "ControllerNES": - yield return StandardController(1); - currentControlerNo++; - break; - case "Zapper": - yield return Zapper(1); - currentControlerNo++; - break; - case "ArkanoidNES": - yield return ArkanoidPaddle(1); - currentControlerNo++; - break; - case "FourScore": - yield return StandardController(1); - yield return StandardController(2); - currentControlerNo += 2; - break; - case "PowerPad": - yield return PowerPad(1); - currentControlerNo++; - break; - case "ControllerSNES": - throw new Exception("TODO"); - } - - switch (ss.Controls.NesRightPort) - { - default: - case "UnpluggedNES": - break; - case "ControllerNES": - yield return StandardController(currentControlerNo); - break; - case "Zapper": - yield return Zapper(currentControlerNo); - break; - case "ArkanoidNES": - yield return ArkanoidPaddle(currentControlerNo); - break; - case "FourScore": - yield return StandardController(currentControlerNo); - yield return StandardController(currentControlerNo + 1); - currentControlerNo += 2; - break; - case "PowerPad": - yield return PowerPad(currentControlerNo); - break; - case "ControllerSNES": - throw new Exception("TODO"); - } - - if (currentControlerNo == 0) - { - yield return null; - } - } - - if (isFds) - { - yield return FdsConsoleButtons(core.ControllerDefinition.BoolButtons.Count(b => b.StartsWith("FDS Insert "))); - } - else - { - yield return NesConsoleButtons(); - } - } - } else // Quicknes Can support none, one or two controllers. { var ss = ((QuickNES)core).GetSyncSettings(); - if (ss.LeftPortConnected == true && ss.RightPortConnected == true) + if (ss.LeftPortConnected && ss.RightPortConnected) { // Set both controllers yield return StandardController(1); yield return StandardController(2); } - else if (ss.LeftPortConnected == true && ss.RightPortConnected == false) + else if (ss.LeftPortConnected && !ss.RightPortConnected) { yield return StandardController(1); } - else if (ss.LeftPortConnected == false && ss.RightPortConnected == true) + else if (!ss.LeftPortConnected && ss.RightPortConnected) { yield return StandardController(1); } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs index 046f400ed2..9fcdeb19d1 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs @@ -6,6 +6,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { [Schema("NGP")] + // ReSharper disable once UnusedMember.Global public class NgpSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/O2Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/O2Schema.cs index f85546104e..ce63566dbf 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/O2Schema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/O2Schema.cs @@ -7,6 +7,7 @@ using BizHawk.Emulation.Cores.Consoles.O2Hawk; namespace BizHawk.Client.EmuHawk { [Schema("O2")] + // ReSharper disable once UnusedMember.Global public class O2Schema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs index 0da6825d37..8f0f1c42ae 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs @@ -8,6 +8,7 @@ using BizHawk.Emulation.Cores.Sony.PSX; namespace BizHawk.Client.EmuHawk { [Schema("PSX")] + // ReSharper disable once UnusedMember.Global public class PSXSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) @@ -23,20 +24,20 @@ namespace BizHawk.Client.EmuHawk continue; } - int pnum = i + 1; + int pNum = i + 1; if (fioConfig.DevicesPlayer[i] == OctoshockDll.ePeripheralType.DualAnalog || fioConfig.DevicesPlayer[i] == OctoshockDll.ePeripheralType.DualShock) { - yield return DualShockController(pnum); + yield return DualShockController(pNum); } if (fioConfig.DevicesPlayer[i] == OctoshockDll.ePeripheralType.Pad) { - yield return GamePadController(pnum); + yield return GamePadController(pNum); } if (fioConfig.DevicesPlayer[i] == OctoshockDll.ePeripheralType.NegCon) { - yield return NeGcon(pnum); + yield return NeGcon(pNum); } } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchema.cs index f32285cd62..c67fcfa1f8 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchema.cs @@ -11,7 +11,7 @@ namespace BizHawk.Client.EmuHawk Boolean, // A single on/off button AnalogStick, // An analog stick X,Y Pair FloatSingle, // A single analog button (pressure sensitive button for instance) - TargetedPair, // A X,Y pair intended to be a screen cooridnate (for zappers, mouse, stylus, etc) + TargetedPair, // A X,Y pair intended to be a screen coordinate (for zappers, mouse, stylus, etc) DiscManager } @@ -39,7 +39,7 @@ namespace BizHawk.Client.EmuHawk public int MinValueSec { get; set; } public object OwnerEmulator { get; set; } - public Orientation Orientation { get; set; } // For Single Flaot controls + public Orientation Orientation { get; set; } // For Single Float controls } } } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs index 1b6545b7b2..f2de9d0e72 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs @@ -9,6 +9,7 @@ using BizHawk.Emulation.Cores.PCEngine; namespace BizHawk.Client.EmuHawk { [Schema("PCECD")] + // ReSharper disable once UnusedMember.Global public class PceCdSchema : PceSchema { } [Schema("PCE")] diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs index c461599051..613344a774 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs @@ -1,29 +1,28 @@ using System.Collections.Generic; using System.Drawing; -using System.Linq; - using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Consoles.NEC.PCFX; namespace BizHawk.Client.EmuHawk { [Schema("PCFX")] + // ReSharper disable once UnusedMember.Global public class PcfxSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) { var ss = ((Tst)core).GetSyncSettings(); - List _schemas = new List(); + var schemas = new List(); if (ss.Port1 != ControllerType.None || ss.Port2 != ControllerType.None) { switch (ss.Port1) { case ControllerType.Gamepad: - _schemas.Add(StandardController(1)); + schemas.Add(StandardController(1)); break; case ControllerType.Mouse: - _schemas.Add(Mouse(1)); + schemas.Add(Mouse(1)); break; } @@ -31,15 +30,15 @@ namespace BizHawk.Client.EmuHawk switch (ss.Port2) { case ControllerType.Gamepad: - _schemas.Add(StandardController(controllerNum)); + schemas.Add(StandardController(controllerNum)); break; case ControllerType.Mouse: - _schemas.Add(Mouse(controllerNum)); + schemas.Add(Mouse(controllerNum)); break; } } - return _schemas; + return schemas; } private static PadSchema StandardController(int controller) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SGBSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SGBSchema.cs index 59826408b2..ddd1a15ed9 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SGBSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SGBSchema.cs @@ -6,6 +6,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { [Schema("SGB")] + // ReSharper disable once UnusedMember.Global public class SGBSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SatSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SatSchema.cs index 063410e332..85fda8c8c4 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SatSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SatSchema.cs @@ -9,6 +9,7 @@ using BizHawk.Emulation.Cores.Consoles.Sega.Saturn; namespace BizHawk.Client.EmuHawk { [Schema("SAT")] + // ReSharper disable once UnusedMember.Global public class SaturnSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) @@ -17,7 +18,7 @@ namespace BizHawk.Client.EmuHawk int totalPorts = (ss.Port1Multitap ? 6 : 1) + (ss.Port2Multitap ? 6 : 1); - var padSchemas = new SaturnusControllerDeck.Device[] + var padSchemas = new[] { ss.Port1, ss.Port2, diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SchemaAttribute.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SchemaAttribute.cs index 5cba133178..779f4d03b6 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SchemaAttribute.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SchemaAttribute.cs @@ -8,7 +8,7 @@ namespace BizHawk.Client.EmuHawk /// /// Gets the system id associated with this schema /// - public string SystemId { get; private set; } + public string SystemId { get; } public SchemaAttribute(string systemId) { diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs index 9f641beefe..395a0577e4 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs @@ -7,6 +7,7 @@ using BizHawk.Emulation.Cores.Sega.MasterSystem; namespace BizHawk.Client.EmuHawk { [Schema("SMS")] + // ReSharper disable once UnusedMember.Global public class SmsSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs index 3be18684f2..74808314bc 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs @@ -8,23 +8,24 @@ using BizHawk.Emulation.Cores.Nintendo.SNES9X; namespace BizHawk.Client.EmuHawk { [Schema("SNES")] + // ReSharper disable once UnusedMember.Global public class SnesSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) { - if (core is LibsnesCore) + if (core is LibsnesCore bsnes) { - return GetBsnesPadSchemas(core); + return GetBsnesPadSchemas(bsnes); } - return GetSnes9xPadSchemas(core); + return GetSnes9xPadSchemas((Snes9x)core); } - private IEnumerable GetSnes9xPadSchemas(IEmulator core) + private IEnumerable GetSnes9xPadSchemas(Snes9x core) { // Only standard controller is supported on the left port yield return StandardController(1); - Snes9x.SyncSettings syncSettings = ((Snes9x)core).GetSyncSettings(); + Snes9x.SyncSettings syncSettings = core.GetSyncSettings(); LibSnes9x.RightPortDevice rightPort = syncSettings.RightPort; switch (rightPort) @@ -53,14 +54,14 @@ namespace BizHawk.Client.EmuHawk yield return ConsoleButtons(); } - private IEnumerable GetBsnesPadSchemas(IEmulator core) + private IEnumerable GetBsnesPadSchemas(LibsnesCore core) { - var syncsettings = ((LibsnesCore)core).GetSyncSettings(); + var syncSettings = core.GetSyncSettings(); var ports = new[] { - syncsettings.LeftPort, - syncsettings.RightPort + syncSettings.LeftPort, + syncSettings.RightPort }; int offset = 0; @@ -252,7 +253,7 @@ namespace BizHawk.Client.EmuHawk { return new PadSchema { - DisplayName = "Superscope", + DisplayName = "Super Scope", IsConsole = false, DefaultSize = new Size(356, 290), MaxSize = new Size(356, 290), diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VECSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VECSchema.cs index 987e9f5d5d..85cc5c8b4d 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VECSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VECSchema.cs @@ -7,13 +7,14 @@ using BizHawk.Emulation.Cores.Consoles.Vectrex; namespace BizHawk.Client.EmuHawk { [Schema("VEC")] - public class VECSchema : IVirtualPadSchema + // ReSharper disable once UnusedMember.Global + public class VecSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) { - var VECSyncSettings = ((VectrexHawk)core).GetSyncSettings().Clone(); - var port1 = VECSyncSettings.Port1; - var port2 = VECSyncSettings.Port2; + var vecSyncSettings = ((VectrexHawk)core).GetSyncSettings().Clone(); + var port1 = vecSyncSettings.Port1; + var port2 = vecSyncSettings.Port2; if (port1 == "Vectrex Digital Controller") { diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs index b56819b21a..05dc919cf1 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs @@ -6,6 +6,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { [Schema("VB")] + // ReSharper disable once UnusedMember.Global public class VirtualBoySchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs index 132dcca53b..d834b0272a 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs @@ -6,6 +6,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { [Schema("WSWAN")] + // ReSharper disable once UnusedMember.Global public class WonderSwanSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ZXSpectrumSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ZXSpectrumSchema.cs index 66ea6715e2..873b798ad6 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ZXSpectrumSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ZXSpectrumSchema.cs @@ -2,12 +2,12 @@ using System.Drawing; using BizHawk.Emulation.Common; -using System.Linq; namespace BizHawk.Client.EmuHawk { [Schema("ZXSpectrum")] - class ZXSpectrumSchema : IVirtualPadSchema + // ReSharper disable once UnusedMember.Global + class ZxSpectrumSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) { @@ -25,7 +25,7 @@ namespace BizHawk.Client.EmuHawk DisplayName = $"Joystick {controller}", IsConsole = false, DefaultSize = new Size(174, 74), - MaxSize = new Size(174, 74), + MaxSize = new Size(174, 74), Buttons = new[] { new PadSchema.ButtonSchema @@ -77,12 +77,12 @@ namespace BizHawk.Client.EmuHawk public string DisName { get; set; } public double WidthFactor { get; set; } public int Row { get; set; } - public bool IsActive = true; + public bool IsActive { get; } = true; } private static PadSchema Keyboard() { - List bls = new List + var bls = new List { new ButtonLayout { Name = "Key True Video", DisName = "TV", Row = 0, WidthFactor = 1 }, new ButtonLayout { Name = "Key Inv Video", DisName = "IV", Row = 0, WidthFactor = 1 }, @@ -148,14 +148,14 @@ namespace BizHawk.Client.EmuHawk new ButtonLayout { Name = "Key Symbol Shift", DisName = "SS", Row = 4, WidthFactor = 1 }, }; - PadSchema ps = new PadSchema + var ps = new PadSchema { DisplayName = "Keyboard", IsConsole = false, DefaultSize = new Size(500, 170) }; - List btns = new List(); + var btns = new List(); int rowHeight = 29; //24 int stdButtonWidth = 29; //24 @@ -186,18 +186,19 @@ namespace BizHawk.Client.EmuHawk case "I": disp = $" {disp} "; break; case "W": disp = b.DisName; break; } - - + if (b.IsActive) { - PadSchema.ButtonSchema btn = new PadSchema.ButtonSchema(); - btn.Name = b.Name; - btn.DisplayName = disp; - btn.Location = new Point(xPos, yPos); - btn.Type = PadSchema.PadInputType.Boolean; + var btn = new PadSchema.ButtonSchema + { + Name = b.Name, + DisplayName = disp, + Location = new Point(xPos, yPos), + Type = PadSchema.PadInputType.Boolean + }; btns.Add(btn); } - + xPos += btnSize; } diff --git a/BizHawk.sln.DotSettings b/BizHawk.sln.DotSettings index c4706ab8ef..b7b41569d7 100644 --- a/BizHawk.sln.DotSettings +++ b/BizHawk.sln.DotSettings @@ -182,6 +182,7 @@ True True True + True True True True @@ -201,6 +202,7 @@ True True True + True True True True @@ -252,6 +254,7 @@ True True True + True True True True @@ -306,6 +309,7 @@ True True True + True True True True @@ -314,6 +318,7 @@ True True True + True True True True