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

DS - refactoring

This commit is contained in:
adelikat 2020-03-28 15:05:13 -05:00
parent 0aaf2b4151
commit a541b45231
4 changed files with 42 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs
View File

@ -118,7 +118,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
}
}
public Point? TouchScreenStart => _settings.ScreenOptions.TouchScreenStart();
public Point? TouchScreenStart => _settings.TouchScreenStart();
/// <summary>
/// MelonDS expects bios and firmware files at a specific location.

39
BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_Settable.cs
View File

@ -1,4 +1,5 @@
using System;
using System.Drawing;
using System.Text;
using System.Runtime.InteropServices;
@ -75,9 +76,47 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
[DllImport(dllPath)]
private static extern uint GetTimeAtBoot();
public enum VideoScreenOptions
{
Default,
TopOnly,
SideBySideLR,
SideBySideRL
/* TODO Reverse */
}
public class MelonSettings
{
public VideoScreenOptions ScreenOptions { get; set; } = VideoScreenOptions.Default;
public Point? TouchScreenStart() =>
ScreenOptions switch
{
VideoScreenOptions.TopOnly => null,
VideoScreenOptions.SideBySideLR => new Point(NativeWidth, 0),
VideoScreenOptions.SideBySideRL => new Point(0, 0),
_ => new Point(0, NativeHeight)
};
public int Width() =>
ScreenOptions switch
{
VideoScreenOptions.SideBySideLR => NativeWidth * 2,
VideoScreenOptions.SideBySideRL => NativeWidth * 2,
_ => NativeWidth
};
// TODO: padding
public int Height() =>
ScreenOptions switch
{
VideoScreenOptions.TopOnly => NativeHeight,
VideoScreenOptions.SideBySideLR => NativeHeight,
VideoScreenOptions.SideBySideRL => NativeHeight,
_ => NativeHeight * 2
};
}
public class MelonSyncSettings

4
BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_VideoProvider.cs
View File

@ -16,8 +16,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
public int VirtualWidth => BufferWidth;
public int VirtualHeight => BufferHeight;
public int BufferWidth => _settings.ScreenOptions.Width();
public int BufferHeight => _settings.ScreenOptions.Height();
public int BufferWidth => _settings.Width();
public int BufferHeight => _settings.Height();
public int VsyncNumerator => 60;

53
BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/VIdeoScreenOptions.cs
View File

@ -1,53 +0,0 @@
using System.Drawing;
namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
{
public enum VideoScreenOptions
{
Default, TopOnly, SideBySideLR, SideBySideRL /*, Reverse */
}
public static class VideoScreenOptionExtensions
{
public static Point? TouchScreenStart(this VideoScreenOptions option)
{
switch (option)
{
default:
return new Point(0, MelonDS.NativeHeight);
case VideoScreenOptions.TopOnly:
return null;
case VideoScreenOptions.SideBySideLR:
return new Point(MelonDS.NativeWidth, 0);
case VideoScreenOptions.SideBySideRL:
return new Point(0, 0);
}
}
public static int Width(this VideoScreenOptions option)
{
switch (option)
{
default:
return MelonDS.NativeWidth;
case VideoScreenOptions.SideBySideLR:
case VideoScreenOptions.SideBySideRL:
return MelonDS.NativeWidth * 2;
}
}
// TODO: padding
public static int Height(this VideoScreenOptions option)
{
switch (option)
{
default:
return MelonDS.NativeHeight * 2;
case VideoScreenOptions.TopOnly:
case VideoScreenOptions.SideBySideLR:
case VideoScreenOptions.SideBySideRL:
return MelonDS.NativeHeight;
}
}
}
}