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

biz side nyma cd switching fix

This commit is contained in:
CasualPokePlayer 2022-05-29 22:23:55 -07:00
parent d201fdd62d
commit 58c28aefba
5 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/BizHawk.Emulation.Cores/Waterbox/LibNymaCore.cs
View File

@ -76,10 +76,10 @@ namespace BizHawk.Emulation.Cores.Waterbox
SkipSoundening = 2,
// render at LCM * LCM instead of raw
RenderConstantSize = 4,
// switch to the previous disk, if possible
PreviousDisk = 8,
// switch to the next disk, if possible
NextDisk = 16
// open disk tray, if possible
OpenTray = 8,
// close disk tray, if possible
CloseTray = 16
}
[StructLayout(LayoutKind.Sequential)]
@ -98,6 +98,10 @@ namespace BizHawk.Emulation.Cores.Waterbox
/// If the core calls time functions, this is the value that will be used
/// </summary>
public long FrontendTime;
/// <summary>
/// disk index to use if close tray is done
/// </summary>
public int DiskIndex;
}
/// <summary>

18
src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs
View File

@ -19,10 +19,10 @@ namespace BizHawk.Emulation.Cores.Waterbox
private readonly byte[] _inputPortData = new byte[MAX_INPUT_DATA];
private readonly string _controllerDeckName;
private void InitControls(List<NPortInfoT> allPorts, bool hasCds, ref SystemInfo si)
private void InitControls(List<NPortInfoT> allPorts, int numCds, ref SystemInfo si)
{
_controllerAdapter = new ControllerAdapter(
allPorts, _syncSettingsActual.PortDevices, OverrideButtonName, hasCds, ref si, ComputeHiddenPorts(),
allPorts, _syncSettingsActual.PortDevices, OverrideButtonName, numCds, ref si, ComputeHiddenPorts(),
_controllerDeckName);
_nyma.SetInputDevices(_controllerAdapter.Devices);
ControllerDefinition = _controllerAdapter.Definition;
@ -41,7 +41,7 @@ namespace BizHawk.Emulation.Cores.Waterbox
List<NPortInfoT> allPorts,
IDictionary<int, string> config,
Func<string, string> overrideName,
bool hasCds,
int numCds,
ref SystemInfo systemInfo,
HashSet<string> hiddenPorts,
string controllerDeckName)
@ -52,8 +52,9 @@ namespace BizHawk.Emulation.Cores.Waterbox
{
{ "Power", "System" },
{ "Reset", "System" },
{ "Previous Disk", "System" },
{ "Next Disk", "System" },
{ "Open Tray", "System" },
{ "Close Tray", "System" },
{ "Disk Index", "System" },
}
};
@ -261,10 +262,11 @@ namespace BizHawk.Emulation.Cores.Waterbox
}
ret.BoolButtons.Add("Power");
ret.BoolButtons.Add("Reset");
if (hasCds)
if (numCds > 0)
{
ret.BoolButtons.Add("Previous Disk");
ret.BoolButtons.Add("Next Disk");
ret.BoolButtons.Add("Open Tray");
ret.BoolButtons.Add("Close Tray");
ret.AddAxis("Disk Index", (-1).RangeTo(numCds - 1), 0);
}
Definition = ret.MakeImmutable();
finalDevices.Add(null);

11
src/BizHawk.Emulation.Cores/Waterbox/NymaCore.cs
View File

@ -150,7 +150,7 @@ namespace BizHawk.Emulation.Cores.Waterbox
ClockRate = info.MasterClock / (double)0x100000000;
_soundBuffer = new short[22050 * 2];
InitControls(portData, discs?.Length > 0, ref info);
InitControls(portData, discs?.Length ?? 0, ref info);
PostInit();
SettingsInfo.LayerNames = GetLayerData();
_settings.Normalize(SettingsInfo);
@ -217,10 +217,10 @@ namespace BizHawk.Emulation.Cores.Waterbox
flags |= LibNymaCore.BizhawkFlags.SkipSoundening;
if (SettingsQuery("nyma.constantfb") != "0")
flags |= LibNymaCore.BizhawkFlags.RenderConstantSize;
if (controller.IsPressed("Previous Disk"))
flags |= LibNymaCore.BizhawkFlags.PreviousDisk;
if (controller.IsPressed("Next Disk"))
flags |= LibNymaCore.BizhawkFlags.NextDisk;
if (controller.IsPressed("Open Tray"))
flags |= LibNymaCore.BizhawkFlags.OpenTray;
if (controller.IsPressed("Close Tray"))
flags |= LibNymaCore.BizhawkFlags.CloseTray;
var ret = new LibNymaCore.FrameInfo
{
@ -232,6 +232,7 @@ namespace BizHawk.Emulation.Cores.Waterbox
: LibNymaCore.CommandType.NONE,
InputPortData = (byte*)_frameAdvanceInputLock.AddrOfPinnedObject(),
FrontendTime = GetRtcTime(SettingsQuery("nyma.rtcrealtime") != "0"),
DiskIndex = (int)controller.AxisValue("Disk Index")
};
if (_frameThreadStart != null)
{

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

@ -67,7 +67,7 @@ namespace BizHawk.Emulation.Cores
};
}
yield return NymaConsoleButtons();
yield return NymaConsoleButtons(nyma.ControllerDefinition.Axes["Disk Index"]);
}
}
@ -429,23 +429,23 @@ namespace BizHawk.Emulation.Cores
};
}
private static PadSchema NymaConsoleButtons()
private static PadSchema NymaConsoleButtons(AxisSpec diskRange)
{
return new ConsoleSchema
{
Size = new Size(327, 50),
Buttons = new[]
Size = new Size(250, 100),
Buttons = new PadSchemaControl[]
{
new ButtonSchema(10, 15, "Reset"),
new ButtonSchema(58, 15, "Power"),
new ButtonSchema(108, 15, "Previous Disk")
new ButtonSchema(108, 15, "Open Tray"),
new ButtonSchema(175, 15, "Close Tray"),
new SingleAxisSchema(10, 35, "Disk Index")
{
DisplayName = "Prev Disc"
},
new ButtonSchema(175, 15, "Next Disk")
{
DisplayName = "Next Disc"
},
MinValue = diskRange.Min,
MaxValue = diskRange.Max,
TargetSize = new Size(235, 60)
}
}
};
}

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

@ -30,7 +30,7 @@ namespace BizHawk.Emulation.Cores
}
}
yield return ConsoleButtons();
yield return ConsoleButtons(nyma.ControllerDefinition.Axes["Disk Index"]);
}
private static PadSchema GenerateSchemaForPort(string device, int controllerNum, Action<string> showMessageBox)
@ -277,22 +277,22 @@ namespace BizHawk.Emulation.Cores
};
}
private static PadSchema ConsoleButtons()
private static PadSchema ConsoleButtons(AxisSpec diskRange)
{
return new ConsoleSchema
{
Size = new Size(327, 50),
Buttons = new[]
Size = new Size(327, 100),
Buttons = new PadSchemaControl[]
{
new ButtonSchema(10, 15, "Reset"),
new ButtonSchema(58, 15, "Power"),
new ButtonSchema(108, 15, "Previous Disk")
new ButtonSchema(108, 15, "Open Tray"),
new ButtonSchema(175, 15, "Close Tray"),
new SingleAxisSchema(10, 35, "Disk Index")
{
DisplayName = "Prev Disc"
},
new ButtonSchema(175, 15, "Next Disk")
{
DisplayName = "Next Disc"
MinValue = diskRange.Min,
MaxValue = diskRange.Max,
TargetSize = new Size(310, 60)
},
new ButtonSchema(242, 15, "P13 Smpc Reset")
{