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

add in missing platform framerates, add in Jaguar CD iding for movie file, fix aspect ratio for jaguar

This commit is contained in:
CasualPokePlayer 2022-09-28 17:25:34 -07:00
parent 79d43dab1d
commit f8a4524df7
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs
View File

@ -5,6 +5,7 @@ using System.Linq;
using BizHawk.Common;
using BizHawk.Common.PathExtensions;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Atari.Jaguar;
using BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy;
using BizHawk.Emulation.Cores.Consoles.Nintendo.NDS;
using BizHawk.Emulation.Cores.Consoles.Sega.gpgx;
@ -279,6 +280,11 @@ namespace BizHawk.Client.Common
movie.HeaderEntries.Add("Is32X", "1");
}
if (emulator is VirtualJaguar jag && jag.IsJaguarCD)
{
movie.HeaderEntries.Add("IsJaguarCD", "1");
}
if (emulator is ICycleTiming)
{
movie.HeaderEntries.Add(HeaderKeys.CycleCount, "0");

7
src/BizHawk.Client.Common/movie/PlatformFrameRates.cs
View File

@ -43,6 +43,9 @@ namespace BizHawk.Client.Common
["GEN"] = 53693175 / (3420.0 * 262),
["GEN_PAL"] = 53203424 / (3420.0 * 313),
["Jaguar"] = 60,
["Jaguar_PAL"] = 50,
// while the number of scanlines per frame is software controlled and variable, we
// enforce exactly 262 (NTSC) 312 (PAL) per reference time frame
["A26"] = 315000000.0 / 88.0 / 262.0 / 228.0, // 59.922751013550531429197560173856
@ -71,7 +74,9 @@ namespace BizHawk.Client.Common
["UZE"] = 60.016319939602,
["VEC"] = 50,
["O2"] = 60,
["O2_PAL"] = 50
["O2_PAL"] = 50,
["TIC80"] = 60,
};
public static double GetFrameRate(string systemId, bool pal)

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

@ -250,6 +250,8 @@ namespace BizHawk.Emulation.Cores.Atari.Jaguar
public DisplayType Region { get; }
public override int VirtualHeight => (int)Math.Ceiling(BufferHeight * (BufferWidth / 326.0));
public bool IsJaguarCD => _cd != null;
public bool DriveLightEnabled => IsJaguarCD;
public bool DriveLightOn { get; private set; }