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

[Gambatte] Slightly fix peeking & fix layer masking (#2712) 

* slightly fix gambatte peeking

* fix gambatte layer masking, move layer masking to sync settings (these settings affect sync, they shouldn't be normal settings)

* block toggle layer hotkeys when movie recording
This commit is contained in:
CasualPokePlayer 2021-04-18 08:03:44 -07:00 committed by GitHub
parent 82f26ee4ec
commit b9123453aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 50 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/dll/libgambatte.dll
View File

Binary file not shown.

BIN
Assets/dll/libgambatte.exp Normal file
View File

Binary file not shown.

BIN
Assets/dll/libgambatte.iobj Normal file
View File

Binary file not shown.

BIN
Assets/dll/libgambatte.ipdb Normal file
View File

Binary file not shown.

BIN
Assets/dll/libgambatte.lib Normal file
View File

Binary file not shown.

45
src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
View File

@ -697,30 +697,51 @@ namespace BizHawk.Client.EmuHawk
case "GB Toggle BG":
if (Emulator is Gameboy gb)
{
var s = gb.GetSettings();
s.DisplayBG ^= true;
gb.PutSettings(s);
AddOnScreenMessage($"BG toggled {(s.DisplayBG ? "on" : "off")}");
if (!gb.DeterministicEmulation)
{
var ss = gb.GetSyncSettings();
ss.DisplayBG ^= true;
gb.PutSyncSettings(ss);
AddOnScreenMessage($"BG toggled {(ss.DisplayBG ? "on" : "off")}");
}
else
{
AddOnScreenMessage($"BG cannot be toggled during movie recording.");
}
}
break;
case "GB Toggle Obj":
if (Emulator is Gameboy gb2)
{
var s = gb2.GetSettings();
s.DisplayOBJ ^= true;
gb2.PutSettings(s);
AddOnScreenMessage($"OBJ toggled {(s.DisplayOBJ ? "on" : "off")}");
if (!gb2.DeterministicEmulation)
{
var ss = gb2.GetSyncSettings();
ss.DisplayOBJ ^= true;
gb2.PutSyncSettings(ss);
AddOnScreenMessage($"OBJ toggled {(ss.DisplayOBJ ? "on" : "off")}");
}
else
{
AddOnScreenMessage($"OBJ cannot be toggled during movie recording.");
}
}
break;
case "GB Toggle Window":
if (Emulator is Gameboy gb3)
{
var s = gb3.GetSettings();
s.DisplayWindow ^= true;
gb3.PutSettings(s);
AddOnScreenMessage($"WIN toggled {(s.DisplayWindow ? "on" : "off")}");
if (!gb3.DeterministicEmulation)
{
var ss = gb3.GetSyncSettings();
ss.DisplayWindow ^= true;
gb3.PutSyncSettings(ss);
AddOnScreenMessage($"WIN toggled {(ss.DisplayWindow ? "on" : "off")}");
}
else
{
AddOnScreenMessage($"WIN cannot be toggled during movie recording.");
}
}
break;

45
src/BizHawk.Client.EmuHawk/config/GB/GBPrefControl.Designer.cs generated
View File

@ -32,9 +32,6 @@
this.buttonDefaults = new System.Windows.Forms.Button();
this.buttonPalette = new System.Windows.Forms.Button();
this.checkBoxMuted = new System.Windows.Forms.CheckBox();
this.cbDisplayBG = new System.Windows.Forms.CheckBox();
this.cbDisplayOBJ = new System.Windows.Forms.CheckBox();
this.cbDisplayWIN = new System.Windows.Forms.CheckBox();
this.SuspendLayout();
//
// propertyGrid1
@ -84,48 +81,9 @@
this.checkBoxMuted.UseVisualStyleBackColor = true;
this.checkBoxMuted.CheckedChanged += new System.EventHandler(this.CheckBoxMuted_CheckedChanged);
//
// cbDisplayBG
//
this.cbDisplayBG.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.cbDisplayBG.AutoSize = true;
this.cbDisplayBG.Location = new System.Drawing.Point(130, 292);
this.cbDisplayBG.Name = "cbDisplayBG";
this.cbDisplayBG.Size = new System.Drawing.Size(41, 17);
this.cbDisplayBG.TabIndex = 4;
this.cbDisplayBG.Text = "BG";
this.cbDisplayBG.UseVisualStyleBackColor = true;
this.cbDisplayBG.CheckedChanged += new System.EventHandler(this.CbDisplayBG_CheckedChanged);
//
// cbDisplayOBJ
//
this.cbDisplayOBJ.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.cbDisplayOBJ.AutoSize = true;
this.cbDisplayOBJ.Location = new System.Drawing.Point(171, 292);
this.cbDisplayOBJ.Name = "cbDisplayOBJ";
this.cbDisplayOBJ.Size = new System.Drawing.Size(46, 17);
this.cbDisplayOBJ.TabIndex = 5;
this.cbDisplayOBJ.Text = "OBJ";
this.cbDisplayOBJ.UseVisualStyleBackColor = true;
this.cbDisplayOBJ.CheckedChanged += new System.EventHandler(this.CbDisplayOBJ_CheckedChanged);
//
// cbDisplayWIN
//
this.cbDisplayWIN.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.cbDisplayWIN.AutoSize = true;
this.cbDisplayWIN.Location = new System.Drawing.Point(218, 292);
this.cbDisplayWIN.Name = "cbDisplayWIN";
this.cbDisplayWIN.Size = new System.Drawing.Size(48, 17);
this.cbDisplayWIN.TabIndex = 6;
this.cbDisplayWIN.Text = "WIN";
this.cbDisplayWIN.UseVisualStyleBackColor = true;
this.cbDisplayWIN.CheckedChanged += new System.EventHandler(this.CbDisplayWin_CheckedChanged);
//
// GBPrefControl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.cbDisplayWIN);
this.Controls.Add(this.cbDisplayOBJ);
this.Controls.Add(this.cbDisplayBG);
this.Controls.Add(this.checkBoxMuted);
this.Controls.Add(this.buttonPalette);
this.Controls.Add(this.buttonDefaults);
@ -143,8 +101,5 @@
private System.Windows.Forms.Button buttonDefaults;
private System.Windows.Forms.Button buttonPalette;
private System.Windows.Forms.CheckBox checkBoxMuted;
private System.Windows.Forms.CheckBox cbDisplayBG;
private System.Windows.Forms.CheckBox cbDisplayOBJ;
private System.Windows.Forms.CheckBox cbDisplayWIN;
}
}

18
src/BizHawk.Client.EmuHawk/config/GB/GBPrefControl.cs
View File

@ -42,9 +42,6 @@ namespace BizHawk.Client.EmuHawk
propertyGrid1.SelectedObject = _ss;
propertyGrid1.Enabled = movieSession.Movie.NotActive();
checkBoxMuted.Checked = _s.Muted;
cbDisplayBG.Checked = _s.DisplayBG;
cbDisplayOBJ.Checked = _s.DisplayOBJ;
cbDisplayWIN.Checked = _s.DisplayWindow;
}
public void GetSettings(out Gameboy.GambatteSettings s, out Gameboy.GambatteSyncSettings ss)
@ -83,20 +80,5 @@ namespace BizHawk.Client.EmuHawk
{
_s.Muted = ((CheckBox)sender).Checked;
}
private void CbDisplayBG_CheckedChanged(object sender, EventArgs e)
{
_s.DisplayBG = ((CheckBox)sender).Checked;
}
private void CbDisplayOBJ_CheckedChanged(object sender, EventArgs e)
{
_s.DisplayOBJ = ((CheckBox)sender).Checked;
}
private void CbDisplayWin_CheckedChanged(object sender, EventArgs e)
{
_s.DisplayWindow = ((CheckBox)sender).Checked;
}
}
}

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

@ -64,7 +64,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
public int[] GBPalette;
public GBColors.ColorType CGBColors;
public bool DisplayBG = true, DisplayOBJ = true, DisplayWindow = true;
/// <summary>
/// true to mute all audio
@ -130,6 +129,21 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
set => _equalLengthFrames = value;
}
[DisplayName("Display BG")]
[Description("Display background")]
[DefaultValue(true)]
public bool DisplayBG { get; set; }
[DisplayName("Display OBJ")]
[Description("Display objects")]
[DefaultValue(true)]
public bool DisplayOBJ { get; set; }
[DisplayName("Display Window")]
[Description("Display window")]
[DefaultValue(true)]
public bool DisplayWindow { get; set; }
[JsonIgnore]
[DeepEqualsIgnore]
private bool _equalLengthFrames;

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
View File

@ -286,7 +286,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
LibGambatte.gambatte_settracecallback(GambatteState, _tracecb);
LibGambatte.gambatte_setlayers(GambatteState, (_settings.DisplayBG ? 1 : 0) | (_settings.DisplayOBJ ? 2 : 0) | (_settings.DisplayWindow ? 4 : 0));
LibGambatte.gambatte_setlayers(GambatteState, (_syncSettings.DisplayBG ? 1 : 0) | (_syncSettings.DisplayOBJ ? 2 : 0) | (_syncSettings.DisplayWindow ? 4 : 0));
}
internal void FrameAdvancePost()

2
submodules/gambatte

@ -1 +1 @@
Subproject commit abe916f213eb2f6f07f34d6cdd7ac5426e10a590
Subproject commit 3ac46735febd8933f3be808db6b8759495932371