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

pull in sameboy upstream and implement custom palettes for sameboy dmg (resolves #3239 for dmg, cgb should be fielded as an upstream request)

This commit is contained in:
CasualPokePlayer 2022-05-11 00:00:43 -07:00
parent 6beaa79b2c
commit 8ca1e4a080
11 changed files with 694 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/dll/libsameboy.dll
View File

Binary file not shown.

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

@ -240,6 +240,7 @@ namespace BizHawk.Client.EmuHawk
this.A7800FilterSettingsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.GBSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.GBcoreSettingsToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.SameBoyColorChooserMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.toolStripSeparator28 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
this.GBGPUViewerMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.GBPrinterViewerMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@ -1602,6 +1603,7 @@ namespace BizHawk.Client.EmuHawk
//
this.GBSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.GBcoreSettingsToolStripMenuItem,
this.SameBoyColorChooserMenuItem,
this.toolStripSeparator28,
this.GBGPUViewerMenuItem,
this.GBPrinterViewerMenuItem});
@ -1612,6 +1614,11 @@ namespace BizHawk.Client.EmuHawk
this.GBcoreSettingsToolStripMenuItem.Text = "Settings...";
this.GBcoreSettingsToolStripMenuItem.Click += new System.EventHandler(this.GbCoreSettingsMenuItem_Click);
//
// SameBoyColorChooserMenuItem
//
this.SameBoyColorChooserMenuItem.Text = "&Choose Custom Palette...";
this.SameBoyColorChooserMenuItem.Click += new System.EventHandler(this.SameboyColorChooserMenuItem_Click);
//
// GBGPUViewerMenuItem
//
this.GBGPUViewerMenuItem.Text = "GPU Viewer";
@ -2659,6 +2666,7 @@ namespace BizHawk.Client.EmuHawk
private BizHawk.WinForms.Controls.ToolStripMenuItemEx customizeToolStripMenuItem;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx N64ControllerSettingsMenuItem;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx GBcoreSettingsToolStripMenuItem;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx SameBoyColorChooserMenuItem;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx NesControllerSettingsMenuItem;
private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator22;
private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator23;

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

@ -26,6 +26,7 @@ using BizHawk.Emulation.Cores.Nintendo.BSNES;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
using BizHawk.Emulation.Cores.Nintendo.N64;
using BizHawk.Emulation.Cores.Nintendo.NES;
using BizHawk.Emulation.Cores.Nintendo.Sameboy;
using BizHawk.Emulation.Cores.Nintendo.SNES;
using BizHawk.Emulation.Cores.Nintendo.SubNESHawk;
using BizHawk.Emulation.Cores.Sony.PSX;
@ -1554,6 +1555,15 @@ namespace BizHawk.Client.EmuHawk
}
}
private void SameboyColorChooserMenuItem_Click(object sender, EventArgs e)
{
if (Emulator is Sameboy sameboy)
{
using var form = new SameBoyColorChooserForm(this, Game, Config, sameboy.GetSettings().Clone());
if (form.ShowDialog().IsOk()) AddOnScreenMessage("Palette settings saved");
}
}
private void GbGpuViewerMenuItem_Click(object sender, EventArgs e)
{
Tools.Load<GbGpuView>();

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

@ -33,6 +33,7 @@ using BizHawk.Emulation.Cores.Nintendo.Gameboy;
using BizHawk.Emulation.Cores.Nintendo.GBA;
using BizHawk.Emulation.Cores.Nintendo.N64;
using BizHawk.Emulation.Cores.Nintendo.NES;
using BizHawk.Emulation.Cores.Nintendo.Sameboy;
using BizHawk.Emulation.Cores.Nintendo.SNES;
using BizHawk.Emulation.Cores.Nintendo.SNES9X;
using BizHawk.Emulation.Cores.Sony.PSX;
@ -1991,6 +1992,7 @@ namespace BizHawk.Client.EmuHawk
case VSystemID.Raw.GBC:
case VSystemID.Raw.SGB when Emulator is Gameboy:
GBSubMenu.Visible = true;
SameBoyColorChooserMenuItem.Visible = Emulator is Sameboy sameboy && !sameboy.IsCGBMode(); // palette config only works in DMG mode
break;
case VSystemID.Raw.SNES when Emulator is LibsnesCore { IsSGB: true }: // doesn't use "SGB" sysID
SNESSubMenu.Text = "&SGB";

192
src/BizHawk.Client.EmuHawk/config/GB/SameBoyColorChooserForm.Designer.cs generated Normal file
View File

@ -0,0 +1,192 @@
namespace BizHawk.Client.EmuHawk
{
partial class SameBoyColorChooserForm
{
/// <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.panel1 = new System.Windows.Forms.Panel();
this.panel2 = new System.Windows.Forms.Panel();
this.panel3 = new System.Windows.Forms.Panel();
this.panel4 = new System.Windows.Forms.Panel();
this.panel5 = new System.Windows.Forms.Panel();
this.label1 = new BizHawk.WinForms.Controls.LocLabelEx();
this.OK = new System.Windows.Forms.Button();
this.Cancel = new System.Windows.Forms.Button();
this.buttonInterpolateBG = new System.Windows.Forms.Button();
this.buttonLoad = new System.Windows.Forms.Button();
this.buttonSave = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// panel1
//
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel1.Location = new System.Drawing.Point(56, 18);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(40, 32);
this.panel1.TabIndex = 0;
this.panel1.DoubleClick += new System.EventHandler(this.Panel12_DoubleClick);
//
// panel2
//
this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel2.Location = new System.Drawing.Point(103, 18);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(40, 32);
this.panel2.TabIndex = 1;
this.panel2.DoubleClick += new System.EventHandler(this.Panel12_DoubleClick);
//
// panel3
//
this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel3.Location = new System.Drawing.Point(149, 18);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(40, 32);
this.panel3.TabIndex = 2;
this.panel3.DoubleClick += new System.EventHandler(this.Panel12_DoubleClick);
//
// panel4
//
this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel4.Location = new System.Drawing.Point(195, 18);
this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(40, 32);
this.panel4.TabIndex = 3;
this.panel4.DoubleClick += new System.EventHandler(this.Panel12_DoubleClick);
//
// panel5
//
this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel5.Location = new System.Drawing.Point(241, 18);
this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(40, 32);
this.panel5.TabIndex = 4;
this.panel5.DoubleClick += new System.EventHandler(this.Panel12_DoubleClick);
//
// label1
//
this.label1.Location = new System.Drawing.Point(14, 27);
this.label1.Name = "label1";
this.label1.Text = "Colors";
//
// 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(206, 84);
this.OK.Name = "OK";
this.OK.Size = new System.Drawing.Size(75, 23);
this.OK.TabIndex = 22;
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(287, 84);
this.Cancel.Name = "Cancel";
this.Cancel.Size = new System.Drawing.Size(75, 23);
this.Cancel.TabIndex = 23;
this.Cancel.Text = "&Cancel";
this.Cancel.UseVisualStyleBackColor = true;
//
// buttonInterpolateBG
//
this.buttonInterpolateBG.Location = new System.Drawing.Point(287, 22);
this.buttonInterpolateBG.Name = "buttonInterpolateBG";
this.buttonInterpolateBG.Size = new System.Drawing.Size(75, 23);
this.buttonInterpolateBG.TabIndex = 25;
this.buttonInterpolateBG.Text = "Interpolate";
this.buttonInterpolateBG.UseVisualStyleBackColor = true;
this.buttonInterpolateBG.Click += new System.EventHandler(this.Button3_Click);
//
// buttonLoad
//
this.buttonLoad.Location = new System.Drawing.Point(17, 84);
this.buttonLoad.Name = "buttonLoad";
this.buttonLoad.Size = new System.Drawing.Size(60, 23);
this.buttonLoad.TabIndex = 28;
this.buttonLoad.Text = "&Load...";
this.buttonLoad.UseVisualStyleBackColor = true;
this.buttonLoad.Click += new System.EventHandler(this.Button6_Click);
//
// buttonSave
//
this.buttonSave.Location = new System.Drawing.Point(83, 84);
this.buttonSave.Name = "buttonSave";
this.buttonSave.Size = new System.Drawing.Size(60, 23);
this.buttonSave.TabIndex = 29;
this.buttonSave.Text = "&Save...";
this.buttonSave.UseVisualStyleBackColor = true;
this.buttonSave.Click += new System.EventHandler(this.Button7_Click);
//
// SameBoyColorChooserForm
//
this.AcceptButton = this.OK;
this.AllowDrop = true;
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, 119);
this.Controls.Add(this.buttonSave);
this.Controls.Add(this.buttonLoad);
this.Controls.Add(this.buttonInterpolateBG);
this.Controls.Add(this.Cancel);
this.Controls.Add(this.OK);
this.Controls.Add(this.label1);
this.Controls.Add(this.panel5);
this.Controls.Add(this.panel4);
this.Controls.Add(this.panel3);
this.Controls.Add(this.panel2);
this.Controls.Add(this.panel1);
this.MinimumSize = new System.Drawing.Size(310, 140);
this.Name = "SameBoyColorChooserForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "SameBoy Palette Config";
this.DragDrop += new System.Windows.Forms.DragEventHandler(this.ColorChooserForm_DragDrop);
this.DragEnter += new System.Windows.Forms.DragEventHandler(this.ColorChooserForm_DragEnter);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Panel panel3;
private System.Windows.Forms.Panel panel4;
private System.Windows.Forms.Panel panel5;
private BizHawk.WinForms.Controls.LocLabelEx label1;
private System.Windows.Forms.Button OK;
private System.Windows.Forms.Button Cancel;
private System.Windows.Forms.Button buttonInterpolateBG;
private System.Windows.Forms.Button buttonLoad;
private System.Windows.Forms.Button buttonSave;
}
}

325
src/BizHawk.Client.EmuHawk/config/GB/SameBoyColorChooserForm.cs Normal file
View File

@ -0,0 +1,325 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
using System.IO;
using BizHawk.Client.Common;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Nintendo.Sameboy;
namespace BizHawk.Client.EmuHawk
{
public partial class SameBoyColorChooserForm : Form
{
private readonly IMainFormForConfig _mainForm;
private readonly IGameInfo _game;
private readonly Config _config;
private readonly Sameboy.SameboySettings _settings;
public SameBoyColorChooserForm(IMainFormForConfig mainForm, IGameInfo game, Config config, Sameboy.SameboySettings settings)
{
_mainForm = mainForm;
_game = game;
_config = config;
_settings = settings;
InitializeComponent();
SetAllColors(_settings.GetCustomPalette());
}
private readonly Color[] _colors = new Color[5];
private void RefreshAllBackdrops()
{
panel1.BackColor = _colors[0];
panel2.BackColor = _colors[1];
panel3.BackColor = _colors[2];
panel4.BackColor = _colors[3];
panel5.BackColor = _colors[4];
}
private Color BetweenColor(Color left, Color right, double pos)
{
int r = (int)(right.R * pos + left.R * (1.0 - pos) + 0.5);
int g = (int)(right.G * pos + left.G * (1.0 - pos) + 0.5);
int b = (int)(right.B * pos + left.B * (1.0 - pos) + 0.5);
int a = (int)(right.A * pos + left.A * (1.0 - pos) + 0.5);
return Color.FromArgb(a, r, g, b);
}
private void InterpolateColors(int firstIndex, int lastIndex)
{
for (int i = firstIndex + 1; i < lastIndex; i++)
{
double pos = (i - firstIndex) / (double)(lastIndex - firstIndex);
_colors[i] = BetweenColor(_colors[firstIndex], _colors[lastIndex], pos);
}
RefreshAllBackdrops();
}
private void Button3_Click(object sender, EventArgs e)
{
InterpolateColors(0, 3); // todo: interpolate disabled color
}
private void Panel12_DoubleClick(object sender, EventArgs e)
{
Panel panel = (Panel)sender;
int i;
if (panel == panel1)
i = 0;
else if (panel == panel2)
i = 1;
else if (panel == panel3)
i = 2;
else if (panel == panel4)
i = 3;
else if (panel == panel5)
i = 4;
else
return; // i = -1;
using var dlg = new ColorDialog
{
AllowFullOpen = true,
AnyColor = true,
Color = _colors[i]
};
// custom colors are ints, not Color structs?
// and they don't work right unless the alpha bits are set to 0
// and the rgb order is switched
int[] customs = new int[5];
for (int j = 0; j < customs.Length; j++)
{
customs[j] = _colors[j].R | _colors[j].G << 8 | _colors[j].B << 16;
}
dlg.CustomColors = customs;
dlg.FullOpen = true;
var result = dlg.ShowDialog(this);
if (result == DialogResult.OK)
{
if (_colors[i] != dlg.Color)
{
_colors[i] = dlg.Color;
panel.BackColor = _colors[i];
}
}
}
// ini keys for gambatte palette file
// extra key for sameboy disabled screen color
private static readonly string[] PaletteIniKeys =
{
"Background0",
"Background1",
"Background2",
"Background3",
"Sprite%2010",
"Sprite%2011",
"Sprite%2012",
"Sprite%2013",
"Sprite%2020",
"Sprite%2021",
"Sprite%2022",
"Sprite%2023",
"Disabled",
};
/// <summary>
/// load gambatte-style .pal file
/// this code will not consider sprite colors
/// as sameboy only functions with 4 colors
/// (bg and sprites sharing all 4 colors)
/// if an extra disabled key is present, use it
/// otherwise fallback on background0
/// </summary>
/// <returns>null on failure</returns>
public static int[] LoadPalFile(TextReader f)
{
var lines = new Dictionary<string, int>();
string line;
while ((line = f.ReadLine()) != null)
{
int i = line.IndexOf('=');
if (i < 0)
{
continue;
}
try
{
lines.Add(line.Substring(0, i), int.Parse(line.Substring(i + 1)));
}
catch (FormatException)
{
}
}
int[] ret = new int[5];
try
{
for (int i = 0; i < 4; i++)
{
ret[i] = lines[PaletteIniKeys[i]];
}
}
catch (KeyNotFoundException)
{
return null;
}
if (lines.TryGetValue(PaletteIniKeys[12], out int key))
{
ret[4] = key;
}
else
{
ret[4] = ret[0];
}
return ret;
}
// save gambatte-style palette file
// this will duplicate the 4 bg colors across sprite colors
private static void SavePalFile(TextWriter f, int[] colors)
{
f.WriteLine("[General]");
for (int i = 0; i < 12; i++)
{
f.WriteLine($"{PaletteIniKeys[i]}={colors[i % 4]}");
}
f.WriteLine($"{PaletteIniKeys[12]}={colors[4]}");
}
private void SetAllColors(int[] colors)
{
// fix alpha to 255 in created color objects, else problems
for (int i = 0; i < _colors.Length; i++)
{
_colors[i] = Color.FromArgb(255, Color.FromArgb(colors[i]));
}
RefreshAllBackdrops();
}
private void LoadColorFile(string filename, bool alert)
{
try
{
using var f = new StreamReader(filename);
int[] newColors = LoadPalFile(f);
if (newColors == null)
{
throw new Exception();
}
SetAllColors(newColors);
}
catch
{
if (alert)
{
_mainForm.ModalMessageBox("Error loading .pal file!");
}
}
}
private void SaveColorFile(string filename)
{
try
{
using var f = new StreamWriter(filename);
int[] saveColors = new int[5];
for (int i = 0; i < 5; i++)
{
// clear alpha because gambatte color files don't usually contain it
saveColors[i] = _colors[i].ToArgb() & 0xffffff;
}
SavePalFile(f, saveColors);
}
catch
{
_mainForm.ModalMessageBox("Error saving .pal file!");
}
}
private void Button6_Click(object sender, EventArgs e)
{
using var ofd = new OpenFileDialog
{
InitialDirectory = _config.PathEntries.ScreenshotAbsolutePathFor(VSystemID.Raw.GB),
Filter = new FilesystemFilterSet(FilesystemFilter.Palettes).ToString(),
RestoreDirectory = true
};
var result = ofd.ShowDialog(this);
if (result.IsOk())
{
LoadColorFile(ofd.FileName, true);
}
}
private void ColorChooserForm_DragDrop(object sender, DragEventArgs e)
{
if (e.Data.GetDataPresent(DataFormats.FileDrop))
{
var files = (string[])e.Data.GetData(DataFormats.FileDrop);
if (files.Length > 1)
{
return;
}
LoadColorFile(files[0], true);
}
}
private void ColorChooserForm_DragEnter(object sender, DragEventArgs e)
{
e.Set(DragDropEffects.Move);
}
private void Button7_Click(object sender, EventArgs e)
{
using var sfd = new SaveFileDialog
{
InitialDirectory = _config.PathEntries.PalettesAbsolutePathFor(VSystemID.Raw.GB),
FileName = $"{_game.Name}.pal",
Filter = new FilesystemFilterSet(FilesystemFilter.Palettes).ToString(),
RestoreDirectory = true
};
var result = sfd.ShowDialog(this);
if (result.IsOk())
{
SaveColorFile(sfd.FileName);
}
}
private void OK_Click(object sender, EventArgs e)
{
int[] colors = new int[5];
for (int i = 0; i < 5; i++)
{
colors[i] = _colors[i].ToArgb();
}
_settings.SetCustomPalette(colors);
_mainForm.PutCoreSettings(_settings);
DialogResult = DialogResult.OK;
Close();
}
}
}

120
src/BizHawk.Client.EmuHawk/config/GB/SameBoyColorChooserForm.resx Normal file
View File

@ -0,0 +1,120 @@
<?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>

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/SameBoy/LibSameBoy.cs
View File

@ -120,7 +120,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Sameboy
public abstract void sameboy_setscanlinecallback(IntPtr core, ScanlineCallback callback, int sl);
[BizImport(cc)]
public abstract void sameboy_setpalette(IntPtr core, Sameboy.SameboySettings.GBPaletteType which);
public abstract void sameboy_setpalette(IntPtr core, Sameboy.SameboySettings.GBPaletteType which, int[] custompal);
[BizImport(cc)]
public abstract void sameboy_setcolorcorrection(IntPtr core, Sameboy.SameboySettings.ColorCorrectionMode which);

16
src/BizHawk.Emulation.Cores/Consoles/Nintendo/SameBoy/SameBoy.ISettable.cs
View File

@ -18,7 +18,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Sameboy
public PutSettingsDirtyBits PutSettings(SameboySettings o)
{
LibSameboy.sameboy_setpalette(SameboyState, o.GBPalette);
LibSameboy.sameboy_setpalette(SameboyState, o.GBPalette, o.GetCustomPalette());
LibSameboy.sameboy_setcolorcorrection(SameboyState, o.ColorCorrection);
LibSameboy.sameboy_setlighttemperature(SameboyState, o.LightTemperature);
LibSameboy.sameboy_sethighpassfilter(SameboyState, o.HighPassFilter);
@ -51,8 +51,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.Sameboy
MGB,
[Display(Name = "Teal (Game Boy Light)")]
GBL,
[Display(Name = "Custom")]
CUSTOM,
}
private int[] _customPal;
[DisplayName("GB Mono Palette")]
[Description("Selects which palette to use in GB mode. Does nothing in GBC mode.")]
[DefaultValue(GBPaletteType.GREY)]
@ -141,9 +145,17 @@ namespace BizHawk.Emulation.Cores.Nintendo.Sameboy
[DefaultValue(true)]
public bool UseRGBDSSyntax { get; set; }
public SameboySettings() => SettingsUtil.SetDefaultValues(this);
public SameboySettings()
{
SettingsUtil.SetDefaultValues(this);
_customPal = new[] { 0x00ffffff, 0x00aaaaaa, 0x00555555, 0x00000000, 0x00ffffff, };
}
public SameboySettings Clone() => MemberwiseClone() as SameboySettings;
public int[] GetCustomPalette() => _customPal.Clone() as int[];
public void SetCustomPalette(int[] pal) => _customPal = pal.Clone() as int[];
}
public class SameboySyncSettings

22
submodules/sameboy/BizInterface.c
View File

@ -35,6 +35,7 @@ typedef struct
u32 vbuf[256 * 224];
u32 bg_pal[0x20];
u32 obj_pal[0x20];
GB_palette_t custom_pal;
input_callback_t input_cb;
trace_callback_t trace_cb;
memory_callback_t read_cb;
@ -479,8 +480,24 @@ EXPORT void sameboy_setscanlinecallback(biz_t* biz, scanline_callback_t callback
GB_set_lcd_line_callback(&biz->gb, callback ? ScanlineCallbackRelay : NULL);
}
EXPORT void sameboy_setpalette(biz_t* biz, u32 which)
static struct GB_color_s argb_to_rgb(u32 argb)
{
struct GB_color_s ret;
ret.r = argb >> 16 & 0xFF;
ret.g = argb >> 8 & 0xFF;
ret.b = argb >> 0 & 0xFF;
return ret;
}
EXPORT void sameboy_setpalette(biz_t* biz, u32 which, u32* custom_pal)
{
for (u32 i = 0; i < 4; i++)
{
biz->custom_pal.colors[3 - i] = argb_to_rgb(custom_pal[i]);
}
biz->custom_pal.colors[4] = argb_to_rgb(custom_pal[4]);
switch (which)
{
case 0:
@ -495,6 +512,9 @@ EXPORT void sameboy_setpalette(biz_t* biz, u32 which)
case 3:
GB_set_palette(&biz->gb, &GB_PALETTE_GBL);
break;
case 4:
GB_set_palette(&biz->gb, &biz->custom_pal);
break;
}
}

2
submodules/sameboy/libsameboy

@ -1 +1 @@
Subproject commit b31bd586427d486d556a0977084c0d0ab4f64089
Subproject commit f866284b490cdb3fc45f6114cce3b1e620ae50ef