diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index f20237a7b4..7af4ea7354 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -265,6 +265,15 @@ Component + + Component + + + Form + + + PCEBGViewer.cs + Form @@ -294,6 +303,9 @@ NameStateForm.cs Designer + + PCEBGViewer.cs + PCEGraphicsConfig.cs diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index 759d5807a8..7b2d11962d 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -206,6 +206,7 @@ this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator(); this.graphicsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pCEToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pceBGViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator(); this.pceAlwaysPerformSpriteLimitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pceAlwaysEqualizeVolumesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -964,26 +965,26 @@ // this.pauseToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Pause; this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem"; - this.pauseToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.pauseToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.pauseToolStripMenuItem.Text = "&Pause"; this.pauseToolStripMenuItem.Click += new System.EventHandler(this.pauseToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(131, 6); // // powerToolStripMenuItem // this.powerToolStripMenuItem.Name = "powerToolStripMenuItem"; - this.powerToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.powerToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.powerToolStripMenuItem.Text = "Power Cycle"; this.powerToolStripMenuItem.Click += new System.EventHandler(this.powerToolStripMenuItem_Click); // // resetToolStripMenuItem // this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; - this.resetToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.resetToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.resetToolStripMenuItem.Text = "&Reset"; this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); // @@ -1561,20 +1562,20 @@ // this.toolBoxToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox; this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem"; - this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.toolBoxToolStripMenuItem.Text = "&Tool Box"; this.toolBoxToolStripMenuItem.Click += new System.EventHandler(this.toolBoxToolStripMenuItem_Click); // // toolStripSeparator12 // this.toolStripSeparator12.Name = "toolStripSeparator12"; - this.toolStripSeparator12.Size = new System.Drawing.Size(131, 6); + this.toolStripSeparator12.Size = new System.Drawing.Size(149, 6); // // rAMWatchToolStripMenuItem // this.rAMWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem"; - this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.rAMWatchToolStripMenuItem.Text = "RAM &Watch"; this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click); // @@ -1582,7 +1583,7 @@ // this.rAMSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search; this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem"; - this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.rAMSearchToolStripMenuItem.Text = "RAM &Search"; this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click); // @@ -1590,7 +1591,7 @@ // this.rAMPokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem"; - this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.rAMPokeToolStripMenuItem.Text = "RAM &Poke"; this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click); // @@ -1598,7 +1599,7 @@ // this.hexEditorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem"; - this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.hexEditorToolStripMenuItem.Text = "&Hex Editor"; this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click); // @@ -1606,20 +1607,20 @@ // this.tAStudioToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; this.tAStudioToolStripMenuItem.Name = "tAStudioToolStripMenuItem"; - this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.tAStudioToolStripMenuItem.Text = "&TAStudio"; this.tAStudioToolStripMenuItem.Click += new System.EventHandler(this.tAStudioToolStripMenuItem_Click); // // toolStripSeparator11 // this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(131, 6); + this.toolStripSeparator11.Size = new System.Drawing.Size(149, 6); // // luaConsoleToolStripMenuItem // this.luaConsoleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua; this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem"; - this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.luaConsoleToolStripMenuItem.Text = "Lua Console"; this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click); // @@ -1627,7 +1628,7 @@ // this.cheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; - this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.cheatsToolStripMenuItem.Text = "Cheats"; this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click); // @@ -1688,6 +1689,7 @@ // pCEToolStripMenuItem // this.pCEToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.pceBGViewerToolStripMenuItem, this.toolStripSeparator25, this.pceAlwaysPerformSpriteLimitToolStripMenuItem, this.pceAlwaysEqualizeVolumesToolStripMenuItem, @@ -1698,6 +1700,13 @@ this.pCEToolStripMenuItem.Text = "&PCE"; this.pCEToolStripMenuItem.DropDownOpened += new System.EventHandler(this.pCEToolStripMenuItem_DropDownOpened); // + // pceBGViewerToolStripMenuItem + // + this.pceBGViewerToolStripMenuItem.Name = "pceBGViewerToolStripMenuItem"; + this.pceBGViewerToolStripMenuItem.Size = new System.Drawing.Size(257, 22); + this.pceBGViewerToolStripMenuItem.Text = "&BG Viewer"; + this.pceBGViewerToolStripMenuItem.Click += new System.EventHandler(this.justatestToolStripMenuItem_Click); + // // toolStripSeparator25 // this.toolStripSeparator25.Name = "toolStripSeparator25"; @@ -2450,6 +2459,7 @@ private System.Windows.Forms.ToolStripMenuItem smsOverclockWhenKnownSafeToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem smsForceStereoSeparationToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem smsSpriteLimitToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem pceBGViewerToolStripMenuItem; } } diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs index 42d7f2e330..80155edbd0 100644 --- a/BizHawk.MultiClient/MainForm.MenuItems.cs +++ b/BizHawk.MultiClient/MainForm.MenuItems.cs @@ -4,6 +4,7 @@ using System.IO; using System.Windows.Forms; using BizHawk.Emulation.Consoles.Calculator; using BizHawk.Emulation.Consoles.Gameboy; +using System.Drawing.Imaging; namespace BizHawk.MultiClient { @@ -1447,5 +1448,10 @@ namespace BizHawk.MultiClient { ShowHideMenu(); } + + private void justatestToolStripMenuItem_Click(object sender, EventArgs e) + { + LoadPCEBGViewer(); + } } } diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 4369acd756..c75d2ac22f 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -59,6 +59,7 @@ namespace BizHawk.MultiClient public NESNameTableViewer NESNameTableViewer1 = new NESNameTableViewer(); public NESPPU NESPPU1 = new NESPPU(); public NESDebugger NESDebug1 = new NESDebugger(); + public PCEBGViewer PCEBGViewer1 = new PCEBGViewer(); public Cheats Cheats1 = new Cheats(); public ToolBox ToolBox1 = new ToolBox(); public TI83KeyPad TI83KeyPad1 = new TI83KeyPad(); @@ -1175,6 +1176,7 @@ namespace BizHawk.MultiClient NESPPU1.Restart(); NESNameTableViewer1.Restart(); NESDebug1.Restart(); + PCEBGViewer1.Restart(); TI83KeyPad1.Restart(); TAStudio1.Restart(); Cheats1.Restart(); @@ -1799,6 +1801,7 @@ namespace BizHawk.MultiClient HexEditor1.UpdateValues(); NESNameTableViewer1.UpdateValues(); NESPPU1.UpdateValues(); + PCEBGViewer1.UpdateValues(); TAStudio1.UpdateValues(); } @@ -2076,6 +2079,17 @@ namespace BizHawk.MultiClient NESDebug1.Focus(); } + public void LoadPCEBGViewer() + { + if (!PCEBGViewer1.IsHandleCreated || PCEBGViewer1.IsDisposed) + { + PCEBGViewer1 = new PCEBGViewer(); + PCEBGViewer1.Show(); + } + else + PCEBGViewer1.Focus(); + } + public void LoadTI83KeyPad() { if (!TI83KeyPad1.IsHandleCreated || TI83KeyPad1.IsDisposed) @@ -2272,6 +2286,7 @@ namespace BizHawk.MultiClient NESPPU1.Restart(); NESNameTableViewer1.Restart(); NESDebug1.Restart(); + PCEBGViewer1.Restart(); TI83KeyPad1.Restart(); Cheats1.Restart(); ToolBox1.Restart(); @@ -2302,6 +2317,7 @@ namespace BizHawk.MultiClient CloseForm(NESNameTableViewer1); CloseForm(NESPPU1); CloseForm(NESDebug1); + CloseForm(PCEBGViewer1); CloseForm(Cheats1); CloseForm(TI83KeyPad1); CloseForm(TAStudio1);