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

snes-support user override backdrop color

This commit is contained in:
zeromus 2012-10-17 18:39:44 +00:00
parent b2db264eed
commit 9e50d25c16
9 changed files with 141 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs
View File

@ -149,6 +149,9 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
bool enable
);
[DllImport("libsneshawk.dll", CallingConvention = CallingConvention.Cdecl)]
public static extern void snes_set_backdropColor(int backdropColor);
[DllImport("libsneshawk.dll", CallingConvention = CallingConvention.Cdecl)]
public static extern int snes_peek_logical_register(SNES_REG reg);

91
BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.Designer.cs generated
View File

@ -131,7 +131,6 @@
this.radioButton5 = new System.Windows.Forms.RadioButton();
this.radioButton10 = new System.Windows.Forms.RadioButton();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.paletteViewer = new BizHawk.MultiClient.SNESGraphicsViewer();
this.tabctrlDetails = new System.Windows.Forms.TabControl();
this.tpPalette = new System.Windows.Forms.TabPage();
this.txtPaletteDetailsIndexSpecific = new System.Windows.Forms.TextBox();
@ -147,9 +146,13 @@
this.lblDetailsPaletteAddress = new System.Windows.Forms.Label();
this.tpTile = new System.Windows.Forms.TabPage();
this.viewerPanel = new System.Windows.Forms.Panel();
this.viewer = new BizHawk.MultiClient.SNESGraphicsViewer();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.checkBackdropColor = new System.Windows.Forms.CheckBox();
this.pnBackdropColor = new System.Windows.Forms.Panel();
this.paletteViewer = new BizHawk.MultiClient.SNESGraphicsViewer();
this.viewerTile = new BizHawk.MultiClient.SNESGraphicsViewer();
this.viewer = new BizHawk.MultiClient.SNESGraphicsViewer();
this.label24 = new System.Windows.Forms.Label();
this.menuStrip1.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.panel1.SuspendLayout();
@ -261,6 +264,9 @@
//
this.panel1.AutoSize = true;
this.panel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.panel1.Controls.Add(this.label24);
this.panel1.Controls.Add(this.pnBackdropColor);
this.panel1.Controls.Add(this.checkBackdropColor);
this.panel1.Controls.Add(this.groupBox3);
this.panel1.Controls.Add(this.groupBox2);
this.panel1.Controls.Add(this.groupBox1);
@ -1294,17 +1300,6 @@
this.groupBox5.TabStop = false;
this.groupBox5.Text = "Palette";
//
// paletteViewer
//
this.paletteViewer.BackColor = System.Drawing.Color.Transparent;
this.paletteViewer.Location = new System.Drawing.Point(6, 14);
this.paletteViewer.Name = "paletteViewer";
this.paletteViewer.Size = new System.Drawing.Size(307, 307);
this.paletteViewer.TabIndex = 18;
this.paletteViewer.TabStop = false;
this.paletteViewer.MouseClick += new System.Windows.Forms.MouseEventHandler(this.paletteViewer_MouseClick);
this.paletteViewer.MouseMove += new System.Windows.Forms.MouseEventHandler(this.paletteViewer_MouseMove);
//
// tabctrlDetails
//
this.tabctrlDetails.Controls.Add(this.tpPalette);
@ -1467,6 +1462,52 @@
this.viewerPanel.Size = new System.Drawing.Size(516, 667);
this.viewerPanel.TabIndex = 1;
//
// toolTip1
//
this.toolTip1.AutoPopDelay = 5000;
this.toolTip1.InitialDelay = 250;
this.toolTip1.ReshowDelay = 100;
//
// checkBackdropColor
//
this.checkBackdropColor.AutoSize = true;
this.checkBackdropColor.Location = new System.Drawing.Point(278, 25);
this.checkBackdropColor.Name = "checkBackdropColor";
this.checkBackdropColor.Size = new System.Drawing.Size(15, 14);
this.checkBackdropColor.TabIndex = 47;
this.checkBackdropColor.UseVisualStyleBackColor = true;
this.checkBackdropColor.CheckedChanged += new System.EventHandler(this.checkBackdropColor_CheckedChanged);
//
// pnBackdropColor
//
this.pnBackdropColor.BackColor = System.Drawing.Color.Red;
this.pnBackdropColor.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.pnBackdropColor.Location = new System.Drawing.Point(240, 7);
this.pnBackdropColor.Name = "pnBackdropColor";
this.pnBackdropColor.Size = new System.Drawing.Size(32, 32);
this.pnBackdropColor.TabIndex = 48;
this.pnBackdropColor.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.pnBackdropColor_MouseDoubleClick);
//
// paletteViewer
//
this.paletteViewer.BackColor = System.Drawing.Color.Transparent;
this.paletteViewer.Location = new System.Drawing.Point(6, 14);
this.paletteViewer.Name = "paletteViewer";
this.paletteViewer.Size = new System.Drawing.Size(307, 307);
this.paletteViewer.TabIndex = 18;
this.paletteViewer.TabStop = false;
this.paletteViewer.MouseClick += new System.Windows.Forms.MouseEventHandler(this.paletteViewer_MouseClick);
this.paletteViewer.MouseMove += new System.Windows.Forms.MouseEventHandler(this.paletteViewer_MouseMove);
//
// viewerTile
//
this.viewerTile.BackColor = System.Drawing.Color.Transparent;
this.viewerTile.Location = new System.Drawing.Point(6, 6);
this.viewerTile.Name = "viewerTile";
this.viewerTile.Size = new System.Drawing.Size(64, 64);
this.viewerTile.TabIndex = 19;
this.viewerTile.TabStop = false;
//
// viewer
//
this.viewer.BackColor = System.Drawing.Color.Transparent;
@ -1479,20 +1520,14 @@
this.viewer.MouseMove += new System.Windows.Forms.MouseEventHandler(this.viewer_MouseMove);
this.viewer.MouseUp += new System.Windows.Forms.MouseEventHandler(this.viewer_MouseUp);
//
// toolTip1
// label24
//
this.toolTip1.AutoPopDelay = 5000;
this.toolTip1.InitialDelay = 250;
this.toolTip1.ReshowDelay = 100;
//
// viewerTile
//
this.viewerTile.BackColor = System.Drawing.Color.Transparent;
this.viewerTile.Location = new System.Drawing.Point(6, 6);
this.viewerTile.Name = "viewerTile";
this.viewerTile.Size = new System.Drawing.Size(64, 64);
this.viewerTile.TabIndex = 19;
this.viewerTile.TabStop = false;
this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(237, 42);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(78, 13);
this.label24.TabIndex = 49;
this.label24.Text = "User Backdrop";
//
// SNESGraphicsDebugger
//
@ -1510,6 +1545,7 @@
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.nudScanline)).EndInit();
@ -1655,5 +1691,8 @@
private System.Windows.Forms.Label label27;
private System.Windows.Forms.CheckBox checkScreenCGWSEL_DirectColor;
private SNESGraphicsViewer viewerTile;
private System.Windows.Forms.Panel pnBackdropColor;
private System.Windows.Forms.CheckBox checkBackdropColor;
private System.Windows.Forms.Label label24;
}
}

35
BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.cs
View File

@ -769,6 +769,41 @@ namespace BizHawk.MultiClient
UpdateColorDetails();
}
void SyncBackdropColor()
{
if (checkBackdropColor.Checked)
{
int r = pnBackdropColor.BackColor.R;
int g = pnBackdropColor.BackColor.G;
int b = pnBackdropColor.BackColor.B;
r >>= 3;
g >>= 3;
b >>= 3;
int col = r | (g << 5) | (b << 10);
LibsnesDll.snes_set_backdropColor(col);
}
else
{
LibsnesDll.snes_set_backdropColor(-1);
}
}
private void checkBackdropColor_CheckedChanged(object sender, EventArgs e)
{
SyncBackdropColor();
}
private void pnBackdropColor_MouseDoubleClick(object sender, MouseEventArgs e)
{
var cd = new ColorDialog();
cd.Color = pnBackdropColor.BackColor;
if (cd.ShowDialog(this) == System.Windows.Forms.DialogResult.OK)
{
pnBackdropColor.BackColor = cd.Color;
SyncBackdropColor();
}
}
}
}

BIN
BizHawk.MultiClient/output/dll/libsneshawk.dll
View File

Binary file not shown.

9
libsnes/bsnes/snes/alt/ppu-compatibility/render/cache.cpp
View File

@ -101,7 +101,14 @@ void PPU::render_bg_tile(uint16 tile_num) {
#undef render_bg_tile_line_8bpp
void PPU::flush_pixel_cache() {
uint16 main = get_palette(0);
uint16 main;
int backdropColor = interface->getBackdropColor();
if(backdropColor == -1)
main = get_palette(0);
else main = backdropColor;
uint16 sub = (regs.pseudo_hires || regs.bg_mode == 5 || regs.bg_mode == 6)
? main
: regs.color_rgb;

5
libsnes/bsnes/snes/interface/interface.cpp
View File

@ -31,4 +31,9 @@ time_t Interface::randomSeed()
return time(0);
}
int Interface::getBackdropColor()
{
return -1;
}
}

3
libsnes/bsnes/snes/interface/interface.hpp
View File

@ -12,6 +12,9 @@ struct Interface {
//zero 27-sep-2012
virtual void scanlineStart(int line) = 0;
//zero 17-oct-2012
virtual int getBackdropColor();
};
extern Interface *interface;

22
libsnes/bsnes/target-libsnes/libsnes.cpp
View File

@ -25,6 +25,13 @@ struct Interface : public SNES::Interface {
//zero 26-sep-2012
std::queue<nall::string> messages;
//zero 17-oct-2012
int backdropColor;
int getBackdropColor()
{
return backdropColor;
}
void videoRefresh(const uint32_t *data, bool hires, bool interlace, bool overscan) {
unsigned width = hires ? 512 : 256;
unsigned height = overscan ? 239 : 224;
@ -79,7 +86,15 @@ struct Interface : public SNES::Interface {
}
Interface() : pvideo_refresh(0), paudio_sample(0), pinput_poll(0), pinput_state(0), pinput_notify(0), ppath_request(0) {
Interface() :
pvideo_refresh(0),
paudio_sample(0),
pinput_poll(0),
pinput_state(0),
pinput_notify(0),
ppath_request(0),
backdropColor(-1)
{
buffer = new uint32_t[512 * 480];
palette = new uint32_t[16 * 32768];
@ -546,4 +561,9 @@ void snes_dequeue_message(char* buffer)
int len = interface.messages.front().length();
memcpy(buffer,(const char*)interface.messages.front(),len);
interface.messages.pop();
}
void snes_set_backdropColor(int color)
{
interface.backdropColor = color;
}

1
libsnes/bsnes/target-libsnes/libsnes.hpp
View File

@ -135,6 +135,7 @@ bool snes_check_cartridge(const uint8_t *rom_data, unsigned rom_size);
void snes_set_layer_enable(int layer, int priority, bool enable);
typedef void (*snes_scanlineStart_t)(int);
void snes_set_scanlineStart(snes_scanlineStart_t);
void snes_set_backdropColor(int color);
//returns -1 if no messages, messagelength if there is one
int snes_poll_message();
//give us a buffer of messagelength and we'll dequeue a message into it. you better take care of the null pointer