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

BSNESv115: implement an extended gamepad controller with 4 extra buttons 

this is a breaking change for existing movies, but only when a non-gamepad controller was used, which is rare
This commit is contained in:
Morilli 2022-12-05 19:15:34 +01:00
parent 339994c5a7
commit 96cc3f8745
9 changed files with 92 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/dll/bsnes.wbx.zst
View File

Binary file not shown.

4
src/BizHawk.Client.Common/movie/import/LsmvImport.cs
View File

@ -54,7 +54,7 @@ namespace BizHawk.Client.Common.movie.import
ss.LeftPort = port1 switch
{
"none" => BsnesApi.BSNES_PORT1_INPUT_DEVICE.None,
// "gamepad16" => BsnesApi.BSNES_PORT1_INPUT_DEVICE.ExtendedGamepad, // coming soon (hopefully)
"gamepad16" => BsnesApi.BSNES_PORT1_INPUT_DEVICE.ExtendedGamepad,
"multitap" => BsnesApi.BSNES_PORT1_INPUT_DEVICE.SuperMultitap,
"multitap16" => BsnesApi.BSNES_PORT1_INPUT_DEVICE.Payload,
_ => BsnesApi.BSNES_PORT1_INPUT_DEVICE.Gamepad
@ -68,7 +68,7 @@ namespace BizHawk.Client.Common.movie.import
ss.RightPort = port2 switch
{
"none" => BsnesApi.BSNES_INPUT_DEVICE.None,
// "gamepad16" => BsnesApi.BSNES_INPUT_DEVICE.ExtendedGamepad, // coming soon (hopefully)
"gamepad16" => BsnesApi.BSNES_INPUT_DEVICE.ExtendedGamepad,
"multitap" => BsnesApi.BSNES_INPUT_DEVICE.SuperMultitap,
"multitap16" => BsnesApi.BSNES_INPUT_DEVICE.Payload,
// will these even work lol

20
src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesApi_Enums.cs
View File

@ -126,12 +126,13 @@
{
None = 0,
Gamepad = 1,
Mouse = 2,
SuperMultitap = 3,
Payload = 4,
SuperScope = 5,
Justifier = 6,
Justifiers = 7
ExtendedGamepad = 2,
Mouse = 3,
SuperMultitap = 4,
Payload = 5,
SuperScope = 6,
Justifier = 7,
Justifiers = 8
}
/// this a subset of the <see cref="BSNES_INPUT_DEVICE"/> enum with all lightgun controllers removed
@ -139,9 +140,10 @@
{
None = 0,
Gamepad = 1,
Mouse = 2,
SuperMultitap = 3,
Payload = 4
ExtendedGamepad = 2,
Mouse = 3,
SuperMultitap = 4,
Payload = 5
}
public enum ENTROPY

43
src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesControllers.cs
View File

@ -17,6 +17,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.BSNES
{
BSNES_INPUT_DEVICE.None => new BsnesUnpluggedController(),
BSNES_INPUT_DEVICE.Gamepad => new BsnesController(),
BSNES_INPUT_DEVICE.ExtendedGamepad => new BsnesExtendedController(),
BSNES_INPUT_DEVICE.Mouse => new BsnesMouseController
{
LimitAnalogChangeSensitivity = ss.LimitAnalogChangeSensitivity
@ -128,6 +129,48 @@ namespace BizHawk.Emulation.Cores.Nintendo.BSNES
return (short) (controller.IsPressed(Buttons[id]) ? 1 : 0);
}
}
internal class BsnesExtendedController : IBsnesController
{
private static readonly string[] Buttons =
{
"0Up", "0Down", "0Left", "0Right", "0B", "0A", "0Y", "0X", "0L", "0R", "0Select", "0Start", "0Extra1", "0Extra2", "0Extra3", "0Extra4"
};
private static readonly Dictionary<string, int> DisplayButtonOrder = new()
{
["0B"] = 0,
["0Y"] = 1,
["0Select"] = 2,
["0Start"] = 3,
["0Up"] = 4,
["0Down"] = 5,
["0Left"] = 6,
["0Right"] = 7,
["0A"] = 8,
["0X"] = 9,
["0L"] = 10,
["0R"] = 11,
["0Extra1"] = 12,
["0Extra2"] = 13,
["0Extra3"] = 14,
["0Extra4"] = 15
};
private static readonly ControllerDefinition _definition = new("(SNES Controller fragment)")
{
BoolButtons = Buttons.OrderBy(b => DisplayButtonOrder[b]).ToList()
};
public ControllerDefinition Definition => _definition;
public short GetState(IController controller, int index, int id)
{
if (id >= 16)
return 0;
return (short) (controller.IsPressed(Buttons[id]) ? 1 : 0);
}
}
internal class BsnesMouseController : IBsnesController
{

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

@ -134,6 +134,9 @@ namespace BizHawk.Emulation.Cores
case BsnesApi.BSNES_INPUT_DEVICE.Gamepad:
yield return StandardController(playerNum);
break;
case BsnesApi.BSNES_INPUT_DEVICE.ExtendedGamepad:
yield return ExtendedStandardController(playerNum);
break;
case BsnesApi.BSNES_INPUT_DEVICE.Mouse:
yield return Mouse(playerNum);
break;

1
waterbox/bsnescore/bsnes/sfc/controller/controller.cpp
View File

@ -47,6 +47,7 @@ auto ControllerPort::connect(uint deviceID) -> void {
switch(deviceID) { default:
case ID::Device::None: device = new Controller(port); break;
case ID::Device::Gamepad: device = new Gamepad(port); break;
case ID::Device::ExtendedGamepad: device = new Gamepad(port, true); break;
case ID::Device::Mouse: device = new Mouse(port); break;
case ID::Device::SuperMultitap: device = new SuperMultitap(port, false); break;
case ID::Device::Payload: device = new SuperMultitap(port, true); break;

42
waterbox/bsnescore/bsnes/sfc/controller/gamepad/gamepad.cpp
View File

@ -1,11 +1,13 @@
Gamepad::Gamepad(uint port) : Controller(port) {
Gamepad::Gamepad(uint port, bool isPayloadController) : Controller(port), isPayload(isPayloadController) {
device = isPayloadController ? ID::Device::ExtendedGamepad : ID::Device::Gamepad;
latched = 0;
counter = 0;
}
auto Gamepad::data() -> uint2 {
if(counter >= 16) return 1;
if(latched == 1) return platform->inputPoll(port, ID::Device::Gamepad, B);
if(latched == 1) return platform->inputPoll(port, device, B);
if (counter >= 12 && !isPayload) return 0; //12-15: signature
//note: D-pad physically prevents up+down and left+right from being pressed at the same time
// patched this "fix" out because it is handled in bizhawk frontend and fixing it here does not seem right anyway
@ -22,9 +24,12 @@ auto Gamepad::data() -> uint2 {
case 9: return x;
case 10: return l;
case 11: return r;
case 12: return extra1;
case 13: return extra2;
case 14: return extra3;
case 15: return extra4;
}
return 0; //12-15: signature
unreachable;
}
auto Gamepad::latch(bool data) -> void {
@ -34,17 +39,22 @@ auto Gamepad::latch(bool data) -> void {
if(latched == 0) {
if (port == ID::Port::Controller1) platform->notify("LATCH");
b = platform->inputPoll(port, ID::Device::Gamepad, B);
y = platform->inputPoll(port, ID::Device::Gamepad, Y);
select = platform->inputPoll(port, ID::Device::Gamepad, Select);
start = platform->inputPoll(port, ID::Device::Gamepad, Start);
up = platform->inputPoll(port, ID::Device::Gamepad, Up);
down = platform->inputPoll(port, ID::Device::Gamepad, Down);
left = platform->inputPoll(port, ID::Device::Gamepad, Left);
right = platform->inputPoll(port, ID::Device::Gamepad, Right);
a = platform->inputPoll(port, ID::Device::Gamepad, A);
x = platform->inputPoll(port, ID::Device::Gamepad, X);
l = platform->inputPoll(port, ID::Device::Gamepad, L);
r = platform->inputPoll(port, ID::Device::Gamepad, R);
b = platform->inputPoll(port, device, B);
y = platform->inputPoll(port, device, Y);
select = platform->inputPoll(port, device, Select);
start = platform->inputPoll(port, device, Start);
up = platform->inputPoll(port, device, Up);
down = platform->inputPoll(port, device, Down);
left = platform->inputPoll(port, device, Left);
right = platform->inputPoll(port, device, Right);
a = platform->inputPoll(port, device, A);
x = platform->inputPoll(port, device, X);
l = platform->inputPoll(port, device, L);
r = platform->inputPoll(port, device, R);
if (!isPayload) return;
extra1 = platform->inputPoll(port, device, Extra1);
extra2 = platform->inputPoll(port, device, Extra2);
extra3 = platform->inputPoll(port, device, Extra3);
extra4 = platform->inputPoll(port, device, Extra4);
}
}

7
waterbox/bsnescore/bsnes/sfc/controller/gamepad/gamepad.hpp
View File

@ -1,17 +1,20 @@
struct Gamepad : Controller {
enum : uint {
Up, Down, Left, Right, B, A, Y, X, L, R, Select, Start,
Up, Down, Left, Right, B, A, Y, X, L, R, Select, Start, Extra1, Extra2, Extra3, Extra4
};
Gamepad(uint port);
Gamepad(uint port, bool isPayloadController = false);
auto data() -> uint2;
auto latch(bool data) -> void;
private:
bool isPayload;
uint device;
uint counter;
boolean b, y, select, start;
boolean up, down, left, right;
boolean a, x, l, r;
boolean extra1, extra2, extra3, extra4;
};

1
waterbox/bsnescore/bsnes/sfc/interface/interface.hpp
View File

@ -19,6 +19,7 @@ struct ID {
struct Device { enum : uint {
None,
Gamepad,
ExtendedGamepad,
Mouse,
SuperMultitap,
Payload,