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

Better Jaguar Virtual Width/Height 

Jaguar VPad
Proper Jaguar default controls
Remove a lot of unneeded `ReSharper disable once UnusedMember.Global` in vpads (Global has been gone for a while now...)
Set VirtualJaguar to released
This commit is contained in:
CasualPokePlayer 2022-10-02 18:53:34 -07:00
parent 71f2676ad8
commit 8732e561a1
30 changed files with 91 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Assets/defctrl.json
View File

@ -1029,6 +1029,29 @@
"YES": "Y",
"NO": "N",
"ENT": "KeypadEnter"
},
"Jaguar Controller": {
"P1 Up": "Up",
"P1 Down": "Down",
"P1 Left": "Left",
"P1 Right": "Right",
"P1 A": "C",
"P1 B": "X",
"P1 C": "Z",
"P1 Option": "Space",
"P1 Pause": "Enter",
"P1 0": "Keypad0",
"P1 1": "Keypad1",
"P1 2": "Keypad2",
"P1 3": "Keypad3",
"P1 4": "Keypad4",
"P1 5": "Keypad5",
"P1 6": "Keypad6",
"P1 7": "Keypad7",
"P1 8": "Keypad8",
"P1 9": "Keypad9",
"P1 Asterisk": "KeypadMultiply",
"P1 Pound": "KeypadDivide",
}
},
"AllTrollersAutoFire": {

6
src/BizHawk.Emulation.Cores/Consoles/Atari/jaguar/VirtualJaguar.cs
View File

@ -12,7 +12,7 @@ using BizHawk.Emulation.DiscSystem;
namespace BizHawk.Emulation.Cores.Atari.Jaguar
{
[PortedCore(CoreNames.VirtualJaguar, "Niels Wagenaar, Carwin Jones, Adam Green, James L. Hammons", "2.1.3", "https://icculus.org/virtualjaguar/", isReleased: false)]
[PortedCore(CoreNames.VirtualJaguar, "Niels Wagenaar, Carwin Jones, Adam Green, James L. Hammons", "2.1.3", "https://icculus.org/virtualjaguar/")]
public partial class VirtualJaguar : WaterboxCore, IRegionable, IDriveLight
{
private readonly LibVirtualJaguar _core;
@ -250,8 +250,8 @@ namespace BizHawk.Emulation.Cores.Atari.Jaguar
public DisplayType Region { get; }
public override int VirtualWidth => 1304;
public override int VirtualHeight => Region is DisplayType.PAL ? 1024 : 960;
public override int VirtualWidth => 326;
public override int VirtualHeight => Region is DisplayType.PAL ? 256 : 240;
public bool IsJaguarCD => _cd != null;
public bool DriveLightEnabled => IsJaguarCD;

1
src/BizHawk.Emulation.Cores/vpads_schemata/A26Schema.cs
View File

@ -8,7 +8,6 @@ using BizHawk.Emulation.Cores.Atari.Atari2600;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.A26)]
// ReSharper disable once UnusedMember.Global
public class A26Schema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

1
src/BizHawk.Emulation.Cores/vpads_schemata/A78Schema.cs
View File

@ -9,7 +9,6 @@ using BizHawk.Emulation.Cores.Atari.A7800Hawk;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.A78)]
// ReSharper disable once UnusedMember.Global
public class A78Schema : IVirtualPadSchema
{
private static string StandardControllerName => typeof(StandardController).DisplayName();

1
src/BizHawk.Emulation.Cores/vpads_schemata/AppleIISchema.cs
View File

@ -7,7 +7,6 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.AppleII)]
// ReSharper disable once UnusedMember.Global
public class AppleIISchema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

1
src/BizHawk.Emulation.Cores/vpads_schemata/C64Schema.cs
View File

@ -7,7 +7,6 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.C64)]
// ReSharper disable once UnusedMember.Global
public class C64Schema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

1
src/BizHawk.Emulation.Cores/vpads_schemata/ColecoSchema.cs
View File

@ -8,7 +8,6 @@ using BizHawk.Emulation.Cores.ColecoVision;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.Coleco)]
// ReSharper disable once UnusedMember.Global
public class ColecoSchema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

1
src/BizHawk.Emulation.Cores/vpads_schemata/DualGBSchema.cs
View File

@ -7,7 +7,6 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.GBL)]
// ReSharper disable once UnusedMember.Global
public class DualGbSchema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

1
src/BizHawk.Emulation.Cores/vpads_schemata/GBASchema.cs
View File

@ -8,7 +8,6 @@ using BizHawk.Emulation.Cores.Nintendo.GBA;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.GBA)]
// ReSharper disable once UnusedMember.Global
public class GbaSchema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

1
src/BizHawk.Emulation.Cores/vpads_schemata/GBSchema.cs
View File

@ -7,7 +7,6 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.GB)]
// ReSharper disable once UnusedMember.Global
public class GbSchema : IVirtualPadSchema
{
public virtual IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

1
src/BizHawk.Emulation.Cores/vpads_schemata/GGLSchema.cs
View File

@ -7,7 +7,6 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.GGL)]
// ReSharper disable once UnusedMember.Global
public class GGLSchema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

1
src/BizHawk.Emulation.Cores/vpads_schemata/GenSchema.cs
View File

@ -10,7 +10,6 @@ using BizHawk.Emulation.Cores.Consoles.Sega.gpgx;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.GEN)]
// ReSharper disable once UnusedMember.Global
public class GenSchema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

1
src/BizHawk.Emulation.Cores/vpads_schemata/IntvSchema.cs
View File

@ -10,7 +10,6 @@ using BizHawk.Emulation.Cores.Intellivision;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.INTV)]
// ReSharper disable once UnusedMember.Global
public class IntvSchema : IVirtualPadSchema
{
private string StandardControllerName => typeof(StandardController).DisplayName();

65
src/BizHawk.Emulation.Cores/vpads_schemata/JaguarSchema.cs Normal file
View File

@ -0,0 +1,65 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Atari.Jaguar;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.Jaguar)]
public class JaguarSchema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)
{
var ss = ((VirtualJaguar)core).GetSyncSettings();
if (ss.P1Active) yield return StandardController(1);
if (ss.P2Active) yield return StandardController(2);
yield return ConsoleButtons();
}
private static PadSchema StandardController(int controller)
{
return new PadSchema
{
Size = new Size(184, 200),
Buttons = new[]
{
ButtonSchema.Up(14, 12, controller),
ButtonSchema.Down(14, 56, controller),
ButtonSchema.Left(2, 34, controller),
ButtonSchema.Right(24, 34, controller),
new ButtonSchema(106, 62, controller, "C"),
new ButtonSchema(130, 62, controller, "B"),
new ButtonSchema(154, 62, controller, "A"),
new ButtonSchema(130, 12, controller, "Option"),
new ButtonSchema(130, 37, controller, "Pause"),
new ButtonSchema(52, 96, controller, "1"),
new ButtonSchema(76, 96, controller, "2"),
new ButtonSchema(100, 96, controller, "3"),
new ButtonSchema(52, 120, controller, "4"),
new ButtonSchema(76, 120, controller, "5"),
new ButtonSchema(100, 120, controller, "6"),
new ButtonSchema(52, 144, controller, "7"),
new ButtonSchema(76, 144, controller, "8"),
new ButtonSchema(100, 144, controller, "9"),
new ButtonSchema(52, 168, controller, "Asterisk") { DisplayName = "*" },
new ButtonSchema(76, 168, controller, "0"),
new ButtonSchema(100, 168, controller, "Pound") { DisplayName = "#" },
}
};
}
private static PadSchema ConsoleButtons()
{
return new ConsoleSchema
{
Size = new Size(70, 50),
Buttons = new[]
{
new ButtonSchema(10, 15, "Power"),
}
};
}
}
}

1
src/BizHawk.Emulation.Cores/vpads_schemata/LynxSchema.cs
View File

@ -7,7 +7,6 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.Lynx)]
// ReSharper disable once UnusedMember.Global
public class LynxSchema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

1
src/BizHawk.Emulation.Cores/vpads_schemata/N64Schema.cs
View File

@ -10,7 +10,6 @@ using BizHawk.Emulation.Cores.Nintendo.N64;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.N64)]
// ReSharper disable once UnusedMember.Global
public class N64Schema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

1
src/BizHawk.Emulation.Cores/vpads_schemata/NdsSchema.cs
View File

@ -6,7 +6,6 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.NDS)]
// ReSharper disable once UnusedMember.Global
public class NdsSchema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

1
src/BizHawk.Emulation.Cores/vpads_schemata/NesSchema.cs
View File

@ -11,7 +11,6 @@ using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.NES)]
// ReSharper disable once UnusedMember.Global
public class NesSchema : IVirtualPadSchema
{
/// <exception cref="Exception">found <c>ControllerSNES</c></exception>

1
src/BizHawk.Emulation.Cores/vpads_schemata/NgpSchema.cs
View File

@ -7,7 +7,6 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.NGP)]
// ReSharper disable once UnusedMember.Global
public class NgpSchema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

1
src/BizHawk.Emulation.Cores/vpads_schemata/O2Schema.cs
View File

@ -6,7 +6,6 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.O2)]
// ReSharper disable once UnusedMember.Global
public class O2Schema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

1
src/BizHawk.Emulation.Cores/vpads_schemata/PSXSchema.cs
View File

@ -10,7 +10,6 @@ using BizHawk.Emulation.Cores.Sony.PSX;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.PSX)]
// ReSharper disable once UnusedMember.Global
public class PsxSchema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

3
src/BizHawk.Emulation.Cores/vpads_schemata/PceSchema.cs
View File

@ -11,15 +11,12 @@ using BizHawk.Emulation.Cores.Waterbox;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.SGXCD)]
// ReSharper disable once UnusedMember.Global
public class SgxCdSchema : PceSchema { }
[Schema(VSystemID.Raw.PCECD)]
// ReSharper disable once UnusedMember.Global
public class PceCdSchema : PceSchema { }
[Schema(VSystemID.Raw.SGX)]
// ReSharper disable once UnusedMember.Global
public class SgxSchema : PceSchema { }
[Schema(VSystemID.Raw.PCE)]

1
src/BizHawk.Emulation.Cores/vpads_schemata/PcfxSchema.cs
View File

@ -10,7 +10,6 @@ using BizHawk.Emulation.Cores.Waterbox;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.PCFX)]
// ReSharper disable once UnusedMember.Global
public class PcfxSchema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

1
src/BizHawk.Emulation.Cores/vpads_schemata/SGBSchema.cs
View File

@ -7,7 +7,6 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.SGB)]
// ReSharper disable once UnusedMember.Global
public class SgbSchema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

1
src/BizHawk.Emulation.Cores/vpads_schemata/SaturnSchema.cs
View File

@ -10,7 +10,6 @@ using BizHawk.Emulation.Cores.Waterbox;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.SAT)]
// ReSharper disable once UnusedMember.Global
public class SaturnSchema : IVirtualPadSchema
{
private static readonly AxisSpec AxisRange = new AxisSpec(0.RangeTo(0xffff), 0x8000);

1
src/BizHawk.Emulation.Cores/vpads_schemata/SnesSchema.cs
View File

@ -11,7 +11,6 @@ using BizHawk.Emulation.Cores.Waterbox;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.SNES)]
// ReSharper disable once UnusedMember.Global
public class SnesSchema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

1
src/BizHawk.Emulation.Cores/vpads_schemata/VECSchema.cs
View File

@ -8,7 +8,6 @@ using BizHawk.Emulation.Cores.Consoles.Vectrex;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.VEC)]
// ReSharper disable once UnusedMember.Global
public class VecSchema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

1
src/BizHawk.Emulation.Cores/vpads_schemata/VirtualBoySchema.cs
View File

@ -7,7 +7,6 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.VB)]
// ReSharper disable once UnusedMember.Global
public class VirtualBoySchema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

1
src/BizHawk.Emulation.Cores/vpads_schemata/WonderSwanSchema.cs
View File

@ -7,7 +7,6 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.WSWAN)]
// ReSharper disable once UnusedMember.Global
public class WonderSwanSchema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)

1
src/BizHawk.Emulation.Cores/vpads_schemata/ZXSpectrumSchema.cs
View File

@ -7,7 +7,6 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores
{
[Schema(VSystemID.Raw.ZXSpectrum)]
// ReSharper disable once UnusedMember.Global
internal class ZxSpectrumSchema : IVirtualPadSchema
{
public IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)