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

PCE - remove menu items and config dialogs in favor of simply having a GenericCoreConfig dialog

This commit is contained in:
adelikat 2020-05-09 19:10:54 -05:00
parent e7f603c396
commit 35bed42042
14 changed files with 47 additions and 884 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
View File

@ -89,27 +89,15 @@
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
<Reference Include="GongShell"
HintPath="$(ProjectDir)../../References/GongShell.dll"
Private="true" />
<Reference Include="GongShell" HintPath="$(ProjectDir)../../References/GongShell.dll" Private="true" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" PrivateAssets="all" />
<Reference Include="NLua, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL"
HintPath="$(ProjectDir)../../output/dll/nlua/NLua.dll"
Private="true"
SpecificVersion="false" />
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL"
HintPath="$(ProjectDir)../../References/OpenTK.dll"
Private="true"
SpecificVersion="false" />
<Reference Include="NLua, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL" HintPath="$(ProjectDir)../../output/dll/nlua/NLua.dll" Private="true" SpecificVersion="false" />
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL" HintPath="$(ProjectDir)../../References/OpenTK.dll" Private="true" SpecificVersion="false" />
<PackageReference Include="OpenTK.GLControl" Version="3.0.1" PrivateAssets="all" />
<PackageReference Include="SharpCompress" Version="0.24.0" PrivateAssets="all" />
<PackageReference Include="SharpZipLib" Version="1.1.0" PrivateAssets="all" />
<Reference Include="SlimDX"
HintPath="$(ProjectDir)../../References/x64/SlimDX.dll"
Private="true" />
<Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
HintPath="$(ProjectDir)../../References/System.ComponentModel.Annotations.dll"
Private="true" />
<Reference Include="SlimDX" HintPath="$(ProjectDir)../../References/x64/SlimDX.dll" Private="true" />
<Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" HintPath="$(ProjectDir)../../References/System.ComponentModel.Annotations.dll" Private="true" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(ProjectDir)../BizHawk.Client.Common/BizHawk.Client.Common.csproj" />
@ -311,12 +299,6 @@
<Compile Update="config/PathInfo.cs" SubType="Form" />
<Compile Update="config/PathInfo.Designer.cs" DependentUpon="PathInfo.cs" />
<EmbeddedResource Update="config/PathInfo.resx" DependentUpon="PathInfo.cs" />
<Compile Update="config/PCE/PCEControllerConfig.cs" SubType="Form" />
<Compile Update="config/PCE/PCEControllerConfig.Designer.cs" DependentUpon="PCEControllerConfig.cs" />
<EmbeddedResource Update="config/PCE/PCEControllerConfig.resx" DependentUpon="PCEControllerConfig.cs" />
<Compile Update="config/PCE/PCEGraphicsConfig.cs" SubType="Form" />
<Compile Update="config/PCE/PCEGraphicsConfig.Designer.cs" DependentUpon="PCEGraphicsConfig.cs" />
<EmbeddedResource Update="config/PCE/PCEGraphicsConfig.resx" DependentUpon="PCEGraphicsConfig.cs" />
<Compile Update="config/ProfileConfig.cs" SubType="Form" />
<Compile Update="config/ProfileConfig.Designer.cs" DependentUpon="ProfileConfig.cs" />
<EmbeddedResource Update="config/ProfileConfig.resx" DependentUpon="ProfileConfig.cs" />

66
src/BizHawk.Client.EmuHawk/MainForm.Designer.cs generated
View File

@ -254,16 +254,11 @@
this.VSServiceSwitchMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.BarcodeReaderMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PCESubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.PceControllerSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PCEGraphicsSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PceSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator32 = new System.Windows.Forms.ToolStripSeparator();
this.PCEBGViewerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PCEtileViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PceSoundDebuggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator();
this.PCEAlwaysPerformSpriteLimitMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PCEAlwaysEqualizeVolumesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PCEArcadeCardRewindEnableMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SMSSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.SmsSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SmsMenuSeparator = new System.Windows.Forms.ToolStripSeparator();
@ -2349,34 +2344,22 @@
// PCESubMenu
//
this.PCESubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.PceControllerSettingsMenuItem,
this.PCEGraphicsSettingsMenuItem,
this.PceSettingsMenuItem,
this.toolStripSeparator32,
this.PCEBGViewerMenuItem,
this.PCEtileViewerToolStripMenuItem,
this.PceSoundDebuggerToolStripMenuItem,
this.toolStripSeparator25,
this.PCEAlwaysPerformSpriteLimitMenuItem,
this.PCEAlwaysEqualizeVolumesMenuItem,
this.PCEArcadeCardRewindEnableMenuItem});
this.PceSoundDebuggerToolStripMenuItem});
this.PCESubMenu.Name = "PCESubMenu";
this.PCESubMenu.Size = new System.Drawing.Size(38, 17);
this.PCESubMenu.Text = "&PCE";
this.PCESubMenu.DropDownOpened += new System.EventHandler(this.PceSubMenu_DropDownOpened);
//
// PceControllerSettingsMenuItem
// PceSettingsMenuItem
//
this.PceControllerSettingsMenuItem.Name = "PceControllerSettingsMenuItem";
this.PceControllerSettingsMenuItem.Size = new System.Drawing.Size(240, 22);
this.PceControllerSettingsMenuItem.Text = "Controller Settings";
this.PceControllerSettingsMenuItem.Click += new System.EventHandler(this.PceControllerSettingsMenuItem_Click);
//
// PCEGraphicsSettingsMenuItem
//
this.PCEGraphicsSettingsMenuItem.Name = "PCEGraphicsSettingsMenuItem";
this.PCEGraphicsSettingsMenuItem.Size = new System.Drawing.Size(240, 22);
this.PCEGraphicsSettingsMenuItem.Text = "Graphics Settings";
this.PCEGraphicsSettingsMenuItem.Click += new System.EventHandler(this.PceGraphicsSettingsMenuItem_Click);
this.PceSettingsMenuItem.Name = "PceSettingsMenuItem";
this.PceSettingsMenuItem.Size = new System.Drawing.Size(240, 22);
this.PceSettingsMenuItem.Text = "Settings...";
this.PceSettingsMenuItem.Click += new System.EventHandler(this.PceSettingsMenuItem_Click);
//
// toolStripSeparator32
//
@ -2404,32 +2387,6 @@
this.PceSoundDebuggerToolStripMenuItem.Text = "&Sound Debugger";
this.PceSoundDebuggerToolStripMenuItem.Click += new System.EventHandler(this.PceSoundDebuggerMenuItem_Click);
//
// toolStripSeparator25
//
this.toolStripSeparator25.Name = "toolStripSeparator25";
this.toolStripSeparator25.Size = new System.Drawing.Size(237, 6);
//
// PCEAlwaysPerformSpriteLimitMenuItem
//
this.PCEAlwaysPerformSpriteLimitMenuItem.Name = "PCEAlwaysPerformSpriteLimitMenuItem";
this.PCEAlwaysPerformSpriteLimitMenuItem.Size = new System.Drawing.Size(240, 22);
this.PCEAlwaysPerformSpriteLimitMenuItem.Text = "Always Perform Sprite Limit";
this.PCEAlwaysPerformSpriteLimitMenuItem.Click += new System.EventHandler(this.PceAlwaysPerformSpriteLimitMenuItem_Click);
//
// PCEAlwaysEqualizeVolumesMenuItem
//
this.PCEAlwaysEqualizeVolumesMenuItem.Name = "PCEAlwaysEqualizeVolumesMenuItem";
this.PCEAlwaysEqualizeVolumesMenuItem.Size = new System.Drawing.Size(240, 22);
this.PCEAlwaysEqualizeVolumesMenuItem.Text = "Always Equalize Volumes (PCE-CD)";
this.PCEAlwaysEqualizeVolumesMenuItem.Click += new System.EventHandler(this.PceAlwaysEqualizeVolumesMenuItem_Click);
//
// PCEArcadeCardRewindEnableMenuItem
//
this.PCEArcadeCardRewindEnableMenuItem.Name = "PCEArcadeCardRewindEnableMenuItem";
this.PCEArcadeCardRewindEnableMenuItem.Size = new System.Drawing.Size(240, 22);
this.PCEArcadeCardRewindEnableMenuItem.Text = "Arcade Card Rewind-Enable Hack";
this.PCEArcadeCardRewindEnableMenuItem.Click += new System.EventHandler(this.PceArcadeCardRewindEnableMenuItem_Click);
//
// SMSSubMenu
//
this.SMSSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -4141,11 +4098,6 @@
private System.Windows.Forms.ToolStripMenuItem ForumsMenuItem;
private System.Windows.Forms.ToolStripMenuItem ScreenshotClipboardMenuItem;
private System.Windows.Forms.ToolStripMenuItem PCESubMenu;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator25;
private System.Windows.Forms.ToolStripMenuItem PCEGraphicsSettingsMenuItem;
private System.Windows.Forms.ToolStripMenuItem PCEAlwaysPerformSpriteLimitMenuItem;
private System.Windows.Forms.ToolStripMenuItem PCEAlwaysEqualizeVolumesMenuItem;
private System.Windows.Forms.ToolStripMenuItem PCEArcadeCardRewindEnableMenuItem;
private System.Windows.Forms.ToolStripMenuItem SMSSubMenu;
private System.Windows.Forms.ToolStripMenuItem PCEBGViewerMenuItem;
private System.Windows.Forms.ToolStripMenuItem ScreenshotContextMenuItem;
@ -4266,7 +4218,7 @@
private System.Windows.Forms.ToolStripMenuItem ProfilesMenuItem;
private System.Windows.Forms.ToolStripMenuItem PceSoundDebuggerToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem SynclessRecordingMenuItem;
private System.Windows.Forms.ToolStripMenuItem PceControllerSettingsMenuItem;
private System.Windows.Forms.ToolStripMenuItem PceSettingsMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator32;
private System.Windows.Forms.ToolStripStatusLabel ProfileFirstBootLabel;
private System.Windows.Forms.ToolStripMenuItem MovieEndSubMenu;

53
src/BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1726,30 +1726,11 @@ namespace BizHawk.Client.EmuHawk
private void PceSubMenu_DropDownOpened(object sender, EventArgs e)
{
var s = ((PCEngine)Emulator).GetSettings();
PceControllerSettingsMenuItem.Enabled = MovieSession.Movie.NotActive();
PCEAlwaysPerformSpriteLimitMenuItem.Checked = s.SpriteLimit;
PCEAlwaysEqualizeVolumesMenuItem.Checked = s.EqualizeVolume;
PCEArcadeCardRewindEnableMenuItem.Checked = s.ArcadeCardRewindHack;
}
private void PceControllerSettingsMenuItem_Click(object sender, EventArgs e)
private void PceSettingsMenuItem_Click(object sender, EventArgs e)
{
if (Emulator is PCEngine pce)
{
using var dlg = new PCEControllerConfig(this, pce.GetSyncSettings().Clone());
dlg.ShowDialog();
}
}
private void PceGraphicsSettingsMenuItem_Click(object sender, EventArgs e)
{
if (Emulator is PCEngine pce)
{
using var form = new PCEGraphicsConfig(this, pce.GetSettings().Clone());
form.ShowDialog();
}
GenericCoreConfig.DoDialog(this, "PCE Settings");
}
private void PceBgViewerMenuItem_Click(object sender, EventArgs e)
@ -1767,36 +1748,6 @@ namespace BizHawk.Client.EmuHawk
Tools.Load<PCESoundDebugger>();
}
private void PceAlwaysPerformSpriteLimitMenuItem_Click(object sender, EventArgs e)
{
if (Emulator is PCEngine pce)
{
var s = pce.GetSettings();
s.SpriteLimit ^= true;
PutCoreSettings(s);
}
}
private void PceAlwaysEqualizeVolumesMenuItem_Click(object sender, EventArgs e)
{
if (Emulator is PCEngine pce)
{
var s = pce.GetSettings();
s.EqualizeVolume ^= true;
PutCoreSettings(s);
}
}
private void PceArcadeCardRewindEnableMenuItem_Click(object sender, EventArgs e)
{
if (Emulator is PCEngine pce)
{
var s = pce.GetSettings();
s.ArcadeCardRewindHack ^= true;
PutCoreSettings(s);
}
}
#endregion
#region SMS

2
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -152,8 +152,6 @@ namespace BizHawk.Client.EmuHawk
NesControllerSettingsMenuItem.Image = Properties.Resources.GameController;
NESGraphicSettingsMenuItem.Image = Properties.Resources.tvIcon;
NESSoundChannelsMenuItem.Image = Properties.Resources.AudioHS;
PceControllerSettingsMenuItem.Image = Properties.Resources.GameController;
PCEGraphicsSettingsMenuItem.Image = Properties.Resources.tvIcon;
KeypadMenuItem.Image = Properties.Resources.calculator;
PSXControllerSettingsMenuItem.Image = Properties.Resources.GameController;
SNESControllerConfigurationMenuItem.Image = Properties.Resources.GameController;

96
src/BizHawk.Client.EmuHawk/config/PCE/PCEControllerConfig.Designer.cs generated
View File

@ -1,96 +0,0 @@
namespace BizHawk.Client.EmuHawk
{
partial class PCEControllerConfig
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.CancelBtn = new System.Windows.Forms.Button();
this.OkBtn = new System.Windows.Forms.Button();
this.ControllerPropertyGrid = new System.Windows.Forms.PropertyGrid();
this.SuspendLayout();
//
// CancelBtn
//
this.CancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.CancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.CancelBtn.Location = new System.Drawing.Point(235, 203);
this.CancelBtn.Name = "CancelBtn";
this.CancelBtn.Size = new System.Drawing.Size(60, 23);
this.CancelBtn.TabIndex = 3;
this.CancelBtn.Text = "&Cancel";
this.CancelBtn.UseVisualStyleBackColor = true;
this.CancelBtn.Click += new System.EventHandler(this.CancelBtn_Click);
//
// OkBtn
//
this.OkBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.OkBtn.Location = new System.Drawing.Point(169, 203);
this.OkBtn.Name = "OkBtn";
this.OkBtn.Size = new System.Drawing.Size(60, 23);
this.OkBtn.TabIndex = 2;
this.OkBtn.Text = "&OK";
this.OkBtn.UseVisualStyleBackColor = true;
this.OkBtn.Click += new System.EventHandler(this.OkBtn_Click);
//
// ControllerPropertyGrid
//
this.ControllerPropertyGrid.Location = new System.Drawing.Point(12, 12);
this.ControllerPropertyGrid.Name = "ControllerPropertyGrid";
this.ControllerPropertyGrid.PropertySort = System.Windows.Forms.PropertySort.Alphabetical;
this.ControllerPropertyGrid.Size = new System.Drawing.Size(283, 181);
this.ControllerPropertyGrid.TabIndex = 4;
this.ControllerPropertyGrid.ToolbarVisible = false;
//
// PCEControllerConfig
//
this.AcceptButton = this.OkBtn;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.CancelBtn;
this.ClientSize = new System.Drawing.Size(307, 238);
this.Controls.Add(this.ControllerPropertyGrid);
this.Controls.Add(this.CancelBtn);
this.Controls.Add(this.OkBtn);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController_MultiSize;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "PCEControllerConfig";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Controller Settings";
this.Load += new System.EventHandler(this.PCEControllerConfig_Load);
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.Button CancelBtn;
private System.Windows.Forms.Button OkBtn;
private System.Windows.Forms.PropertyGrid ControllerPropertyGrid;
}
}

39
src/BizHawk.Client.EmuHawk/config/PCE/PCEControllerConfig.cs
View File

@ -1,39 +0,0 @@
using System;
using System.Windows.Forms;
using BizHawk.Emulation.Cores.PCEngine;
namespace BizHawk.Client.EmuHawk
{
public partial class PCEControllerConfig : Form
{
private readonly MainForm _mainForm;
private readonly PCEngine.PCESyncSettings _syncSettings;
public PCEControllerConfig(
MainForm mainForm,
PCEngine.PCESyncSettings syncSettings)
{
_mainForm = mainForm;
_syncSettings = syncSettings;
InitializeComponent();
}
private void PCEControllerConfig_Load(object sender, EventArgs e)
{
ControllerPropertyGrid.SelectedObject = _syncSettings;
}
private void OkBtn_Click(object sender, EventArgs e)
{
_mainForm.PutCoreSyncSettings(_syncSettings);
DialogResult = DialogResult.OK;
Close();
}
private void CancelBtn_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
}
}
}

120
src/BizHawk.Client.EmuHawk/config/PCE/PCEControllerConfig.resx
View File

@ -1,120 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

284
src/BizHawk.Client.EmuHawk/config/PCE/PCEGraphicsConfig.Designer.cs generated
View File

@ -1,284 +0,0 @@
namespace BizHawk.Client.EmuHawk
{
partial class PCEGraphicsConfig
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.OK = new System.Windows.Forms.Button();
this.Cancel = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.DispBG2 = new System.Windows.Forms.CheckBox();
this.DispOBJ2 = new System.Windows.Forms.CheckBox();
this.DispBG1 = new System.Windows.Forms.CheckBox();
this.DispOBJ1 = new System.Windows.Forms.CheckBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.label5 = new System.Windows.Forms.Label();
this.btnAreaFull = new System.Windows.Forms.Button();
this.btnAreaStandard = new System.Windows.Forms.Button();
this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.NTSC_LastLineNumeric = new System.Windows.Forms.NumericUpDown();
this.NTSC_FirstLineNumeric = new System.Windows.Forms.NumericUpDown();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.NTSC_LastLineNumeric)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.NTSC_FirstLineNumeric)).BeginInit();
this.SuspendLayout();
//
// OK
//
this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.OK.DialogResult = System.Windows.Forms.DialogResult.OK;
this.OK.Location = new System.Drawing.Point(205, 279);
this.OK.Name = "OK";
this.OK.Size = new System.Drawing.Size(75, 23);
this.OK.TabIndex = 4;
this.OK.Text = "&OK";
this.OK.UseVisualStyleBackColor = true;
this.OK.Click += new System.EventHandler(this.Ok_Click);
//
// Cancel
//
this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.Cancel.Location = new System.Drawing.Point(286, 279);
this.Cancel.Name = "Cancel";
this.Cancel.Size = new System.Drawing.Size(75, 23);
this.Cancel.TabIndex = 5;
this.Cancel.Text = "&Cancel";
this.Cancel.UseVisualStyleBackColor = true;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.DispBG2);
this.groupBox1.Controls.Add(this.DispOBJ2);
this.groupBox1.Controls.Add(this.DispBG1);
this.groupBox1.Controls.Add(this.DispOBJ1);
this.groupBox1.Location = new System.Drawing.Point(9, 12);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(352, 73);
this.groupBox1.TabIndex = 2;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Background and Sprites";
//
// DispBG2
//
this.DispBG2.AutoSize = true;
this.DispBG2.Checked = true;
this.DispBG2.CheckState = System.Windows.Forms.CheckState.Checked;
this.DispBG2.Location = new System.Drawing.Point(108, 43);
this.DispBG2.Name = "DispBG2";
this.DispBG2.Size = new System.Drawing.Size(84, 17);
this.DispBG2.TabIndex = 3;
this.DispBG2.Text = "Display BG2";
this.DispBG2.UseVisualStyleBackColor = true;
//
// DispOBJ2
//
this.DispOBJ2.AutoSize = true;
this.DispOBJ2.Checked = true;
this.DispOBJ2.CheckState = System.Windows.Forms.CheckState.Checked;
this.DispOBJ2.Location = new System.Drawing.Point(108, 21);
this.DispOBJ2.Name = "DispOBJ2";
this.DispOBJ2.Size = new System.Drawing.Size(89, 17);
this.DispOBJ2.TabIndex = 2;
this.DispOBJ2.Text = "Display OBJ2";
this.DispOBJ2.UseVisualStyleBackColor = true;
//
// DispBG1
//
this.DispBG1.AutoSize = true;
this.DispBG1.Checked = true;
this.DispBG1.CheckState = System.Windows.Forms.CheckState.Checked;
this.DispBG1.Location = new System.Drawing.Point(9, 43);
this.DispBG1.Name = "DispBG1";
this.DispBG1.Size = new System.Drawing.Size(84, 17);
this.DispBG1.TabIndex = 1;
this.DispBG1.Text = "Display BG1";
this.DispBG1.UseVisualStyleBackColor = true;
//
// DispOBJ1
//
this.DispOBJ1.AutoSize = true;
this.DispOBJ1.Checked = true;
this.DispOBJ1.CheckState = System.Windows.Forms.CheckState.Checked;
this.DispOBJ1.Location = new System.Drawing.Point(9, 21);
this.DispOBJ1.Name = "DispOBJ1";
this.DispOBJ1.Size = new System.Drawing.Size(89, 17);
this.DispOBJ1.TabIndex = 0;
this.DispOBJ1.Text = "Display OBJ1";
this.DispOBJ1.UseVisualStyleBackColor = true;
//
// groupBox2
//
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox2.Controls.Add(this.label5);
this.groupBox2.Controls.Add(this.btnAreaFull);
this.groupBox2.Controls.Add(this.btnAreaStandard);
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.label3);
this.groupBox2.Controls.Add(this.NTSC_LastLineNumeric);
this.groupBox2.Controls.Add(this.NTSC_FirstLineNumeric);
this.groupBox2.Location = new System.Drawing.Point(9, 100);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(352, 150);
this.groupBox2.TabIndex = 6;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Drawing Area";
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(62, 22);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(36, 13);
this.label5.TabIndex = 41;
this.label5.Text = "NTSC";
//
// btnAreaFull
//
this.btnAreaFull.Location = new System.Drawing.Point(6, 115);
this.btnAreaFull.Name = "btnAreaFull";
this.btnAreaFull.Size = new System.Drawing.Size(100, 23);
this.btnAreaFull.TabIndex = 40;
this.btnAreaFull.Text = "Full [0,262]";
this.btnAreaFull.UseVisualStyleBackColor = true;
this.btnAreaFull.Click += new System.EventHandler(this.BtnAreaFull_Click);
//
// btnAreaStandard
//
this.btnAreaStandard.Location = new System.Drawing.Point(6, 92);
this.btnAreaStandard.Name = "btnAreaStandard";
this.btnAreaStandard.Size = new System.Drawing.Size(100, 23);
this.btnAreaStandard.TabIndex = 35;
this.btnAreaStandard.Text = "Standard [18,252]";
this.btnAreaStandard.UseVisualStyleBackColor = true;
this.btnAreaStandard.Click += new System.EventHandler(this.BtnAreaStandard_Click);
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(4, 69);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(49, 13);
this.label4.TabIndex = 24;
this.label4.Text = "Last line:";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(5, 43);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(48, 13);
this.label3.TabIndex = 23;
this.label3.Text = "First line:";
//
// NTSC_LastLineNumeric
//
this.NTSC_LastLineNumeric.Location = new System.Drawing.Point(59, 67);
this.NTSC_LastLineNumeric.Maximum = new decimal(new int[] {
262,
0,
0,
0});
this.NTSC_LastLineNumeric.Minimum = new decimal(new int[] {
128,
0,
0,
0});
this.NTSC_LastLineNumeric.Name = "NTSC_LastLineNumeric";
this.NTSC_LastLineNumeric.Size = new System.Drawing.Size(47, 20);
this.NTSC_LastLineNumeric.TabIndex = 28;
this.NTSC_LastLineNumeric.Value = new decimal(new int[] {
128,
0,
0,
0});
//
// NTSC_FirstLineNumeric
//
this.NTSC_FirstLineNumeric.Location = new System.Drawing.Point(59, 41);
this.NTSC_FirstLineNumeric.Maximum = new decimal(new int[] {
127,
0,
0,
0});
this.NTSC_FirstLineNumeric.Name = "NTSC_FirstLineNumeric";
this.NTSC_FirstLineNumeric.Size = new System.Drawing.Size(47, 20);
this.NTSC_FirstLineNumeric.TabIndex = 21;
//
// PCEGraphicsConfig
//
this.AcceptButton = this.OK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.Cancel;
this.ClientSize = new System.Drawing.Size(373, 311);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.Cancel);
this.Controls.Add(this.OK);
this.MaximizeBox = false;
this.MaximumSize = new System.Drawing.Size(389, 433);
this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(389, 166);
this.Name = "PCEGraphicsConfig";
this.ShowIcon = false;
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "PC Engine Graphics Settings";
this.Load += new System.EventHandler(this.PCEGraphicsConfig_Load);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.NTSC_LastLineNumeric)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.NTSC_FirstLineNumeric)).EndInit();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.Button OK;
private System.Windows.Forms.Button Cancel;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.CheckBox DispBG2;
private System.Windows.Forms.CheckBox DispOBJ2;
private System.Windows.Forms.CheckBox DispBG1;
private System.Windows.Forms.CheckBox DispOBJ1;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Button btnAreaFull;
private System.Windows.Forms.Button btnAreaStandard;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.NumericUpDown NTSC_LastLineNumeric;
private System.Windows.Forms.NumericUpDown NTSC_FirstLineNumeric;
}
}

55
src/BizHawk.Client.EmuHawk/config/PCE/PCEGraphicsConfig.cs
View File

@ -1,55 +0,0 @@
using System;
using System.Windows.Forms;
using BizHawk.Emulation.Cores.PCEngine;
namespace BizHawk.Client.EmuHawk
{
public partial class PCEGraphicsConfig : Form
{
private readonly MainForm _mainForm;
private readonly PCEngine.PCESettings _settings;
public PCEGraphicsConfig(
MainForm mainForm,
PCEngine.PCESettings settings)
{
_mainForm = mainForm;
_settings = settings;
InitializeComponent();
}
private void PCEGraphicsConfig_Load(object sender, EventArgs e)
{
DispOBJ1.Checked = _settings.ShowOBJ1;
DispBG1.Checked = _settings.ShowBG1;
DispOBJ2.Checked = _settings.ShowOBJ2;
DispBG2.Checked = _settings.ShowBG2;
NTSC_FirstLineNumeric.Value = _settings.Top_Line;
NTSC_LastLineNumeric.Value = _settings.Bottom_Line;
}
private void Ok_Click(object sender, EventArgs e)
{
_settings.ShowOBJ1 = DispOBJ1.Checked;
_settings.ShowBG1 = DispBG1.Checked;
_settings.ShowOBJ2 = DispOBJ2.Checked;
_settings.ShowBG2 = DispBG2.Checked;
_settings.Top_Line = (int)NTSC_FirstLineNumeric.Value;
_settings.Bottom_Line = (int)NTSC_LastLineNumeric.Value;
_mainForm.PutCoreSettings(_settings);
Close();
}
private void BtnAreaStandard_Click(object sender, EventArgs e)
{
NTSC_FirstLineNumeric.Value = 18;
NTSC_LastLineNumeric.Value = 252;
}
private void BtnAreaFull_Click(object sender, EventArgs e)
{
NTSC_FirstLineNumeric.Value = 0;
NTSC_LastLineNumeric.Value = 262;
}
}
}

120
src/BizHawk.Client.EmuHawk/config/PCE/PCEGraphicsConfig.resx
View File

@ -1,120 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

28
src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.ISettable.cs
View File

@ -47,24 +47,21 @@ namespace BizHawk.Emulation.Cores.PCEngine
public class PCESettings
{
public bool ShowBG1 = true;
public bool ShowOBJ1 = true;
public bool ShowBG2 = true;
public bool ShowOBJ2 = true;
public bool ShowBG1 { get; set; } = true;
public bool ShowOBJ1 { get; set; } = true;
public bool ShowBG2 { get; set; } = true;
public bool ShowOBJ2 { get; set; } = true;
// cropping settings
public int Top_Line = 18;
public int Bottom_Line = 252;
public int TopLine { get; set; } = 18;
public int BottomLine { get; set; } = 252;
// these three require core reboot to use
public bool SpriteLimit = false;
public bool EqualizeVolume = false;
public bool ArcadeCardRewindHack = true;
public bool SpriteLimit { get; set; }
public bool EqualizeVolume { get; set; }
public bool ArcadeCardRewindHack{ get; set; }
public PCESettings Clone()
{
return (PCESettings)MemberwiseClone();
}
public PCESettings Clone() => (PCESettings)MemberwiseClone();
}
public class PCESyncSettings
@ -99,10 +96,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
[TypeConverter(typeof(DescribableEnumConverter))]
public PceControllerType Port5 { get; set; } = PceControllerType.Unplugged;
public PCESyncSettings Clone()
{
return (PCESyncSettings)MemberwiseClone();
}
public PCESyncSettings Clone() => (PCESyncSettings)MemberwiseClone();
public static bool NeedsReboot(PCESyncSettings x, PCESyncSettings y)
{

2
src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
View File

@ -49,7 +49,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
int IVideoLogicalOffsets.ScreenX => 0;
int IVideoLogicalOffsets.ScreenY => Settings.Top_Line;
int IVideoLogicalOffsets.ScreenY => Settings.TopLine;
public PCEngine(CoreComm comm, GameInfo game, Disc disc, object settings, object syncSettings)
{

24
src/BizHawk.Emulation.Cores/Consoles/PC Engine/VDC.Render.cs
View File

@ -107,8 +107,8 @@ namespace BizHawk.Emulation.Cores.PCEngine
public void RenderScanLine()
{
if (((ActiveLine + ViewStartLine) >= pce.Settings.Bottom_Line) ||
((ActiveLine + ViewStartLine) < pce.Settings.Top_Line))
if (((ActiveLine + ViewStartLine) >= pce.Settings.BottomLine) ||
((ActiveLine + ViewStartLine) < pce.Settings.TopLine))
return;
RenderBackgroundScanline(pce.Settings.ShowBG1);
@ -126,7 +126,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
int p = vce.Palette[256];
fixed (int* FBptr = FrameBuffer)
{
int* dst = FBptr + (ActiveLine + ViewStartLine - pce.Settings.Top_Line) * FramePitch;
int* dst = FBptr + (ActiveLine + ViewStartLine - pce.Settings.TopLine) * FramePitch;
for (int i = 0; i < FrameWidth; i++)
*dst++ = p;
}
@ -150,7 +150,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
{
// pointer to the BAT and the framebuffer for this line
ushort* BatRow = VRAMptr + yTile * BatWidth;
int* dst = FBptr + (ActiveLine + ViewStartLine - pce.Settings.Top_Line) * FramePitch;
int* dst = FBptr + (ActiveLine + ViewStartLine - pce.Settings.TopLine) * FramePitch;
// parameters that change per tile
ushort BatEnt;
@ -204,7 +204,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
if (BackgroundEnabled == false)
{
for (int i = 0; i < FrameWidth; i++)
FrameBuffer[((ActiveLine + ViewStartLine - pce.Settings.Top_Line) * FramePitch) + i] = vce.Palette[256];
FrameBuffer[((ActiveLine + ViewStartLine - pce.Settings.TopLine) * FramePitch) + i] = vce.Palette[256];
return;
}
@ -228,10 +228,10 @@ namespace BizHawk.Emulation.Cores.PCEngine
byte c = PatternBuffer[(tileNo * 64) + (yOfs * 8) + xOfs];
if (c == 0)
FrameBuffer[((ActiveLine + ViewStartLine - pce.Settings.Top_Line) * FramePitch) + x] = vce.Palette[0];
FrameBuffer[((ActiveLine + ViewStartLine - pce.Settings.TopLine) * FramePitch) + x] = vce.Palette[0];
else
{
FrameBuffer[((ActiveLine + ViewStartLine - pce.Settings.Top_Line) * FramePitch) + x] = show ? vce.Palette[paletteBase + c] : vce.Palette[0];
FrameBuffer[((ActiveLine + ViewStartLine - pce.Settings.TopLine) * FramePitch) + x] = show ? vce.Palette[paletteBase + c] : vce.Palette[0];
PriorityBuffer[x] = 1;
}
}
@ -363,7 +363,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
{
InterSpritePriorityBuffer[xs] = 1;
if ((priority || PriorityBuffer[xs] == 0) && show)
FrameBuffer[((ActiveLine + ViewStartLine - pce.Settings.Top_Line) * FramePitch) + xs] = vce.Palette[paletteBase + pixel];
FrameBuffer[((ActiveLine + ViewStartLine - pce.Settings.TopLine) * FramePitch) + xs] = vce.Palette[paletteBase + pixel];
}
}
}
@ -380,7 +380,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
{
InterSpritePriorityBuffer[xs] = 1;
if ((priority || PriorityBuffer[xs] == 0) && show)
FrameBuffer[((ActiveLine + ViewStartLine - pce.Settings.Top_Line) * FramePitch) + xs] = vce.Palette[paletteBase + pixel];
FrameBuffer[((ActiveLine + ViewStartLine - pce.Settings.TopLine) * FramePitch) + xs] = vce.Palette[paletteBase + pixel];
}
}
@ -401,7 +401,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
{
InterSpritePriorityBuffer[xs] = 1;
if ((priority || PriorityBuffer[xs] == 0) && show)
FrameBuffer[((ActiveLine + ViewStartLine - pce.Settings.Top_Line) * FramePitch) + xs] = vce.Palette[paletteBase + pixel];
FrameBuffer[((ActiveLine + ViewStartLine - pce.Settings.TopLine) * FramePitch) + xs] = vce.Palette[paletteBase + pixel];
}
}
if (width == 32)
@ -417,7 +417,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
{
InterSpritePriorityBuffer[xs] = 1;
if ((priority || PriorityBuffer[xs] == 0) && show)
FrameBuffer[((ActiveLine + ViewStartLine - pce.Settings.Top_Line) * FramePitch) + xs] = vce.Palette[paletteBase + pixel];
FrameBuffer[((ActiveLine + ViewStartLine - pce.Settings.TopLine) * FramePitch) + xs] = vce.Palette[paletteBase + pixel];
}
}
}
@ -436,7 +436,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
public int VirtualWidth => FramePitch;
public int VirtualHeight => BufferHeight;
public int BufferWidth => FramePitch;
public int BufferHeight => (pce.Settings.Bottom_Line - pce.Settings.Top_Line);
public int BufferHeight => (pce.Settings.BottomLine - pce.Settings.TopLine);
public int BackgroundColor => vce.Palette[256];
public int VsyncNumerator

14
src/BizHawk.Emulation.Cores/Consoles/PC Engine/VPC.cs
View File

@ -245,8 +245,8 @@ namespace BizHawk.Emulation.Cores.PCEngine
private void RenderScanLine()
{
if (((VDC1.ActiveLine + VDC1.ViewStartLine) >= PCE.Settings.Bottom_Line) ||
((VDC1.ActiveLine + VDC1.ViewStartLine) < PCE.Settings.Top_Line))
if (((VDC1.ActiveLine + VDC1.ViewStartLine) >= PCE.Settings.BottomLine) ||
((VDC1.ActiveLine + VDC1.ViewStartLine) < PCE.Settings.TopLine))
{
return;
}
@ -299,7 +299,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
{
// pointer to the BAT and the framebuffer for this line
ushort* BatRow = VRAMptr + yTile * vdc.BatWidth;
int* dst = FBptr + (vdc.ActiveLine + vdc.ViewStartLine - PCE.Settings.Top_Line) * FrameWidth;
int* dst = FBptr + (vdc.ActiveLine + vdc.ViewStartLine - PCE.Settings.TopLine) * FrameWidth;
// parameters that change per tile
ushort BatEnt;
@ -455,7 +455,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
byte myPriority = priority ? highPriority : lowPriority;
if (PriorityBuffer[xs] < myPriority)
{
if (show) FrameBuffer[((vdc.ActiveLine + vdc.ViewStartLine - PCE.Settings.Top_Line) * FrameWidth) + xs] = VCE.Palette[paletteBase + pixel];
if (show) FrameBuffer[((vdc.ActiveLine + vdc.ViewStartLine - PCE.Settings.TopLine) * FrameWidth) + xs] = VCE.Palette[paletteBase + pixel];
PriorityBuffer[xs] = myPriority;
}
}
@ -474,7 +474,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
byte myPriority = priority ? highPriority : lowPriority;
if (PriorityBuffer[xs] < myPriority)
{
if (show) FrameBuffer[((vdc.ActiveLine + vdc.ViewStartLine - PCE.Settings.Top_Line) * FrameWidth) + xs] = VCE.Palette[paletteBase + pixel];
if (show) FrameBuffer[((vdc.ActiveLine + vdc.ViewStartLine - PCE.Settings.TopLine) * FrameWidth) + xs] = VCE.Palette[paletteBase + pixel];
PriorityBuffer[xs] = myPriority;
}
}
@ -496,7 +496,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
byte myPriority = priority ? highPriority : lowPriority;
if (PriorityBuffer[xs] < myPriority)
{
if (show) FrameBuffer[((vdc.ActiveLine + vdc.ViewStartLine - PCE.Settings.Top_Line) * FrameWidth) + xs] = VCE.Palette[paletteBase + pixel];
if (show) FrameBuffer[((vdc.ActiveLine + vdc.ViewStartLine - PCE.Settings.TopLine) * FrameWidth) + xs] = VCE.Palette[paletteBase + pixel];
PriorityBuffer[xs] = myPriority;
}
}
@ -514,7 +514,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
byte myPriority = priority ? highPriority : lowPriority;
if (PriorityBuffer[xs] < myPriority)
{
if (show) FrameBuffer[((vdc.ActiveLine + vdc.ViewStartLine - PCE.Settings.Top_Line) * FrameWidth) + xs] = VCE.Palette[paletteBase + pixel];
if (show) FrameBuffer[((vdc.ActiveLine + vdc.ViewStartLine - PCE.Settings.TopLine) * FrameWidth) + xs] = VCE.Palette[paletteBase + pixel];
PriorityBuffer[xs] = myPriority;
}
}