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

GGHawk - Hook up Highlight Active Display Region option, make this and Show Clipped Regions take effect on Core load

This commit is contained in:
adelikat 2012-10-06 12:37:38 +00:00
parent b88d5ffd5e
commit 6aa9608a77
4 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.MultiClient/Config.cs
View File

@ -601,6 +601,7 @@ namespace BizHawk.MultiClient
public bool SmsForceStereoSeparation = false; public bool SmsForceStereoSeparation = false;
public bool SmsSpriteLimit = false; public bool SmsSpriteLimit = false;
public bool GGShowClippedRegions = false; public bool GGShowClippedRegions = false;
public bool GGHighlightActiveDisplayRegion = false;
public string SmsReset = "C"; public string SmsReset = "C";
public string SmsPause = "V, X1 Start"; public string SmsPause = "V, X1 Start";

44
BizHawk.MultiClient/MainForm.Designer.cs generated
View File

@ -219,6 +219,8 @@
this.smsOverclockWhenKnownSafeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.smsOverclockWhenKnownSafeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.smsForceStereoSeparationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.smsForceStereoSeparationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.smsSpriteLimitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.smsSpriteLimitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.showClippedRegionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator24 = new System.Windows.Forms.ToolStripSeparator();
this.smsGraphicsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.smsGraphicsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tI83ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tI83ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.keypadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.keypadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -291,8 +293,7 @@
this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem(); this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem();
this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem(); this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem();
this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem(); this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem();
this.showClippedRegionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.highlightActiveDisplayRegionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator24 = new System.Windows.Forms.ToolStripSeparator();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.StatusSlot0.SuspendLayout(); this.StatusSlot0.SuspendLayout();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
@ -1882,6 +1883,7 @@
this.smsForceStereoSeparationToolStripMenuItem, this.smsForceStereoSeparationToolStripMenuItem,
this.smsSpriteLimitToolStripMenuItem, this.smsSpriteLimitToolStripMenuItem,
this.showClippedRegionsToolStripMenuItem, this.showClippedRegionsToolStripMenuItem,
this.highlightActiveDisplayRegionToolStripMenuItem,
this.toolStripSeparator24, this.toolStripSeparator24,
this.smsGraphicsSettingsToolStripMenuItem}); this.smsGraphicsSettingsToolStripMenuItem});
this.sMSToolStripMenuItem.Name = "sMSToolStripMenuItem"; this.sMSToolStripMenuItem.Name = "sMSToolStripMenuItem";
@ -1892,35 +1894,47 @@
// smsEnableFMChipToolStripMenuItem // smsEnableFMChipToolStripMenuItem
// //
this.smsEnableFMChipToolStripMenuItem.Name = "smsEnableFMChipToolStripMenuItem"; this.smsEnableFMChipToolStripMenuItem.Name = "smsEnableFMChipToolStripMenuItem";
this.smsEnableFMChipToolStripMenuItem.Size = new System.Drawing.Size(224, 22); this.smsEnableFMChipToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
this.smsEnableFMChipToolStripMenuItem.Text = "&Enable FM Chip"; this.smsEnableFMChipToolStripMenuItem.Text = "&Enable FM Chip";
this.smsEnableFMChipToolStripMenuItem.Click += new System.EventHandler(this.smsEnableFMChipToolStripMenuItem_Click); this.smsEnableFMChipToolStripMenuItem.Click += new System.EventHandler(this.smsEnableFMChipToolStripMenuItem_Click);
// //
// smsOverclockWhenKnownSafeToolStripMenuItem // smsOverclockWhenKnownSafeToolStripMenuItem
// //
this.smsOverclockWhenKnownSafeToolStripMenuItem.Name = "smsOverclockWhenKnownSafeToolStripMenuItem"; this.smsOverclockWhenKnownSafeToolStripMenuItem.Name = "smsOverclockWhenKnownSafeToolStripMenuItem";
this.smsOverclockWhenKnownSafeToolStripMenuItem.Size = new System.Drawing.Size(224, 22); this.smsOverclockWhenKnownSafeToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
this.smsOverclockWhenKnownSafeToolStripMenuItem.Text = "&Overclock when Known Safe"; this.smsOverclockWhenKnownSafeToolStripMenuItem.Text = "&Overclock when Known Safe";
this.smsOverclockWhenKnownSafeToolStripMenuItem.Click += new System.EventHandler(this.smsOverclockWhenKnownSafeToolStripMenuItem_Click); this.smsOverclockWhenKnownSafeToolStripMenuItem.Click += new System.EventHandler(this.smsOverclockWhenKnownSafeToolStripMenuItem_Click);
// //
// smsForceStereoSeparationToolStripMenuItem // smsForceStereoSeparationToolStripMenuItem
// //
this.smsForceStereoSeparationToolStripMenuItem.Name = "smsForceStereoSeparationToolStripMenuItem"; this.smsForceStereoSeparationToolStripMenuItem.Name = "smsForceStereoSeparationToolStripMenuItem";
this.smsForceStereoSeparationToolStripMenuItem.Size = new System.Drawing.Size(224, 22); this.smsForceStereoSeparationToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
this.smsForceStereoSeparationToolStripMenuItem.Text = "&Force Stereo Separation"; this.smsForceStereoSeparationToolStripMenuItem.Text = "&Force Stereo Separation";
this.smsForceStereoSeparationToolStripMenuItem.Click += new System.EventHandler(this.smsForceStereoSeparationToolStripMenuItem_Click); this.smsForceStereoSeparationToolStripMenuItem.Click += new System.EventHandler(this.smsForceStereoSeparationToolStripMenuItem_Click);
// //
// smsSpriteLimitToolStripMenuItem // smsSpriteLimitToolStripMenuItem
// //
this.smsSpriteLimitToolStripMenuItem.Name = "smsSpriteLimitToolStripMenuItem"; this.smsSpriteLimitToolStripMenuItem.Name = "smsSpriteLimitToolStripMenuItem";
this.smsSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(224, 22); this.smsSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
this.smsSpriteLimitToolStripMenuItem.Text = "Sprite &Limit"; this.smsSpriteLimitToolStripMenuItem.Text = "Sprite &Limit";
this.smsSpriteLimitToolStripMenuItem.Click += new System.EventHandler(this.smsSpriteLimitToolStripMenuItem_Click); this.smsSpriteLimitToolStripMenuItem.Click += new System.EventHandler(this.smsSpriteLimitToolStripMenuItem_Click);
// //
// showClippedRegionsToolStripMenuItem
//
this.showClippedRegionsToolStripMenuItem.Name = "showClippedRegionsToolStripMenuItem";
this.showClippedRegionsToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
this.showClippedRegionsToolStripMenuItem.Text = "&Show Clipped Regions";
this.showClippedRegionsToolStripMenuItem.Click += new System.EventHandler(this.showClippedRegionsToolStripMenuItem_Click);
//
// toolStripSeparator24
//
this.toolStripSeparator24.Name = "toolStripSeparator24";
this.toolStripSeparator24.Size = new System.Drawing.Size(238, 6);
//
// smsGraphicsSettingsToolStripMenuItem // smsGraphicsSettingsToolStripMenuItem
// //
this.smsGraphicsSettingsToolStripMenuItem.Name = "smsGraphicsSettingsToolStripMenuItem"; this.smsGraphicsSettingsToolStripMenuItem.Name = "smsGraphicsSettingsToolStripMenuItem";
this.smsGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(224, 22); this.smsGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
this.smsGraphicsSettingsToolStripMenuItem.Text = "&Graphics Settings..."; this.smsGraphicsSettingsToolStripMenuItem.Text = "&Graphics Settings...";
this.smsGraphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.smsGraphicsSettingsToolStripMenuItem_Click); this.smsGraphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.smsGraphicsSettingsToolStripMenuItem_Click);
// //
@ -2515,17 +2529,12 @@
this.cmiShowMenu.Text = "Show Menu"; this.cmiShowMenu.Text = "Show Menu";
this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click); this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click);
// //
// showClippedRegionsToolStripMenuItem // highlightActiveDisplayRegionToolStripMenuItem
// //
this.showClippedRegionsToolStripMenuItem.Name = "showClippedRegionsToolStripMenuItem"; this.highlightActiveDisplayRegionToolStripMenuItem.Name = "highlightActiveDisplayRegionToolStripMenuItem";
this.showClippedRegionsToolStripMenuItem.Size = new System.Drawing.Size(224, 22); this.highlightActiveDisplayRegionToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
this.showClippedRegionsToolStripMenuItem.Text = "&Show Clipped Regions"; this.highlightActiveDisplayRegionToolStripMenuItem.Text = "&Highlight Active Display Region";
this.showClippedRegionsToolStripMenuItem.Click += new System.EventHandler(this.showClippedRegionsToolStripMenuItem_Click); this.highlightActiveDisplayRegionToolStripMenuItem.Click += new System.EventHandler(this.highlightActiveDisplayRegionToolStripMenuItem_Click);
//
// toolStripSeparator24
//
this.toolStripSeparator24.Name = "toolStripSeparator24";
this.toolStripSeparator24.Size = new System.Drawing.Size(221, 6);
// //
// MainForm // MainForm
// //
@ -2831,6 +2840,7 @@
private System.Windows.Forms.ToolStripMenuItem blurryToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem blurryToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem showClippedRegionsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem showClippedRegionsToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator24; private System.Windows.Forms.ToolStripSeparator toolStripSeparator24;
private System.Windows.Forms.ToolStripMenuItem highlightActiveDisplayRegionToolStripMenuItem;
} }
} }

3
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

@ -1563,6 +1563,7 @@ namespace BizHawk.MultiClient
smsForceStereoSeparationToolStripMenuItem.Checked = Global.Config.SmsForceStereoSeparation; smsForceStereoSeparationToolStripMenuItem.Checked = Global.Config.SmsForceStereoSeparation;
smsSpriteLimitToolStripMenuItem.Checked = Global.Config.SmsSpriteLimit; smsSpriteLimitToolStripMenuItem.Checked = Global.Config.SmsSpriteLimit;
showClippedRegionsToolStripMenuItem.Checked = Global.Config.GGShowClippedRegions; showClippedRegionsToolStripMenuItem.Checked = Global.Config.GGShowClippedRegions;
highlightActiveDisplayRegionToolStripMenuItem.Checked = Global.Config.GGHighlightActiveDisplayRegion;
if (Global.Game.System == "GG") if (Global.Game.System == "GG")
{ {
@ -1571,6 +1572,7 @@ namespace BizHawk.MultiClient
smsForceStereoSeparationToolStripMenuItem.Visible = false; smsForceStereoSeparationToolStripMenuItem.Visible = false;
showClippedRegionsToolStripMenuItem.Visible = true; showClippedRegionsToolStripMenuItem.Visible = true;
highlightActiveDisplayRegionToolStripMenuItem.Visible = true;
} }
else else
{ {
@ -1579,6 +1581,7 @@ namespace BizHawk.MultiClient
smsForceStereoSeparationToolStripMenuItem.Visible = true; smsForceStereoSeparationToolStripMenuItem.Visible = true;
showClippedRegionsToolStripMenuItem.Visible = false; showClippedRegionsToolStripMenuItem.Visible = false;
highlightActiveDisplayRegionToolStripMenuItem.Visible = false;
} }
} }

9
BizHawk.MultiClient/MainForm.cs
View File

@ -360,6 +360,9 @@ namespace BizHawk.MultiClient
Global.CoreInputComm.SNES_ShowOBJ_1 = Global.Config.SNES_ShowOBJ2; Global.CoreInputComm.SNES_ShowOBJ_1 = Global.Config.SNES_ShowOBJ2;
Global.CoreInputComm.SNES_ShowOBJ_2 = Global.Config.SNES_ShowOBJ3; Global.CoreInputComm.SNES_ShowOBJ_2 = Global.Config.SNES_ShowOBJ3;
Global.CoreInputComm.SNES_ShowOBJ_3 = Global.Config.SNES_ShowOBJ4; Global.CoreInputComm.SNES_ShowOBJ_3 = Global.Config.SNES_ShowOBJ4;
Global.CoreInputComm.GG_HighlightActiveDisplayRegion = Global.Config.GGHighlightActiveDisplayRegion;
Global.CoreInputComm.GG_ShowClippedRegions = Global.Config.GGShowClippedRegions;
} }
void SyncPresentationMode() void SyncPresentationMode()
@ -3838,5 +3841,11 @@ namespace BizHawk.MultiClient
Global.Config.GGShowClippedRegions ^= true; Global.Config.GGShowClippedRegions ^= true;
Global.CoreInputComm.GG_ShowClippedRegions = Global.Config.GGShowClippedRegions; Global.CoreInputComm.GG_ShowClippedRegions = Global.Config.GGShowClippedRegions;
} }
private void highlightActiveDisplayRegionToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.GGHighlightActiveDisplayRegion ^= true;
Global.CoreInputComm.GG_HighlightActiveDisplayRegion = Global.Config.GGHighlightActiveDisplayRegion;
}
} }
} }