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

PCE - BG Viewer - Refresh Rate slider, UI cleanup

This commit is contained in:
andres.delikat 2012-07-13 00:38:04 +00:00
parent 0834c63a43
commit b84a601ef3
4 changed files with 105 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.MultiClient/Config.cs
View File

@ -342,6 +342,7 @@ namespace BizHawk.MultiClient
public bool PCEBGViewerAutoload = false;
public int PCEBGViewerWndx = -1;
public int PCEBGViewerWndy = -1;
public int PCEBGViewerRefreshRate = 16;
// SMS Graphics settings
public bool SMSDispBG = true;

1
BizHawk.MultiClient/MainForm.cs
View File

@ -2016,7 +2016,6 @@ namespace BizHawk.MultiClient
NESNameTableViewer1.UpdateValues();
NESPPU1.UpdateValues();
PCEBGViewer1.UpdateValues();
PCEBGViewer1.Generate(); // TODO: just a makeshift. PCE core should provide callbacks.
GBDebugger.UpdateValues();
}

115
BizHawk.MultiClient/PCEtools/PCEBGViewer.Designer.cs generated
View File

@ -30,15 +30,23 @@
{
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.vDC1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.vCD2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.autoloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.vDC1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.vCD2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.label7 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.RefreshRate = new System.Windows.Forms.TrackBar();
this.canvas = new BizHawk.MultiClient.PCEBGCanvas();
this.menuStrip1.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.RefreshRate)).BeginInit();
this.SuspendLayout();
//
// menuStrip1
@ -48,7 +56,7 @@
this.optionsToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(536, 24);
this.menuStrip1.Size = new System.Drawing.Size(676, 24);
this.menuStrip1.TabIndex = 2;
this.menuStrip1.Text = "menuStrip1";
//
@ -64,11 +72,30 @@
this.fileToolStripMenuItem.Text = "&Viewer";
this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened);
//
// vDC1ToolStripMenuItem
//
this.vDC1ToolStripMenuItem.Name = "vDC1ToolStripMenuItem";
this.vDC1ToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
this.vDC1ToolStripMenuItem.Text = "VDC&1";
this.vDC1ToolStripMenuItem.Click += new System.EventHandler(this.vDC1ToolStripMenuItem_Click);
//
// vCD2ToolStripMenuItem
//
this.vCD2ToolStripMenuItem.Name = "vCD2ToolStripMenuItem";
this.vCD2ToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
this.vCD2ToolStripMenuItem.Text = "VCD&2";
this.vCD2ToolStripMenuItem.Click += new System.EventHandler(this.vCD2ToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(131, 6);
//
// exitToolStripMenuItem
//
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
this.exitToolStripMenuItem.ShortcutKeyDisplayString = "Alt+F4";
this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.exitToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
this.exitToolStripMenuItem.Text = "E&xit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
//
@ -96,38 +123,73 @@
this.saveWindowPositionToolStripMenuItem.Text = "&Save Window position";
this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click);
//
// vDC1ToolStripMenuItem
// groupBox1
//
this.vDC1ToolStripMenuItem.Name = "vDC1ToolStripMenuItem";
this.vDC1ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.vDC1ToolStripMenuItem.Text = "VDC&1";
this.vDC1ToolStripMenuItem.Click += new System.EventHandler(this.vDC1ToolStripMenuItem_Click);
this.groupBox1.Controls.Add(this.canvas);
this.groupBox1.Location = new System.Drawing.Point(12, 27);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(529, 536);
this.groupBox1.TabIndex = 3;
this.groupBox1.TabStop = false;
//
// vCD2ToolStripMenuItem
// groupBox5
//
this.vCD2ToolStripMenuItem.Name = "vCD2ToolStripMenuItem";
this.vCD2ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.vCD2ToolStripMenuItem.Text = "VCD&2";
this.vCD2ToolStripMenuItem.Click += new System.EventHandler(this.vCD2ToolStripMenuItem_Click);
this.groupBox5.Controls.Add(this.label7);
this.groupBox5.Controls.Add(this.label6);
this.groupBox5.Controls.Add(this.RefreshRate);
this.groupBox5.Location = new System.Drawing.Point(554, 28);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(108, 236);
this.groupBox5.TabIndex = 15;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "Refresh";
//
// toolStripSeparator1
// label7
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6);
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(7, 186);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(31, 13);
this.label7.TabIndex = 2;
this.label7.Text = "More";
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(7, 32);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(29, 13);
this.label6.TabIndex = 1;
this.label6.Text = "Less";
//
// RefreshRate
//
this.RefreshRate.LargeChange = 2;
this.RefreshRate.Location = new System.Drawing.Point(9, 47);
this.RefreshRate.Maximum = 16;
this.RefreshRate.Minimum = 1;
this.RefreshRate.Name = "RefreshRate";
this.RefreshRate.Orientation = System.Windows.Forms.Orientation.Vertical;
this.RefreshRate.Size = new System.Drawing.Size(45, 136);
this.RefreshRate.TabIndex = 0;
this.RefreshRate.TickFrequency = 4;
this.RefreshRate.Value = 16;
//
// canvas
//
this.canvas.Location = new System.Drawing.Point(12, 27);
this.canvas.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.canvas.Location = new System.Drawing.Point(8, 15);
this.canvas.Name = "canvas";
this.canvas.Size = new System.Drawing.Size(512, 543);
this.canvas.Size = new System.Drawing.Size(512, 513);
this.canvas.TabIndex = 0;
//
// PCEBGViewer
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(536, 582);
this.Controls.Add(this.canvas);
this.ClientSize = new System.Drawing.Size(676, 575);
this.Controls.Add(this.groupBox5);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.menuStrip1);
this.MainMenuStrip = this.menuStrip1;
this.Name = "PCEBGViewer";
@ -137,6 +199,10 @@
this.Load += new System.EventHandler(this.PCEBGViewer_Load);
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.RefreshRate)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@ -154,5 +220,10 @@
private System.Windows.Forms.ToolStripMenuItem vDC1ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem vCD2ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.GroupBox groupBox5;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.TrackBar RefreshRate;
}
}

15
BizHawk.MultiClient/PCEtools/PCEBGViewer.cs
View File

@ -27,10 +27,7 @@ namespace BizHawk.MultiClient
public unsafe void Generate()
{
if (!this.IsHandleCreated || this.IsDisposed) return;
if (pce == null) return;
if (Global.Emulator.Frame % 20 != 0) return; // TODO: just a makeshift. hard-coded 3fps
if (Global.Emulator.Frame % RefreshRate.Value != 0) return;
VDC vdc = VDCtype == 0 ? pce.VDC1 : pce.VDC2;
@ -88,12 +85,14 @@ namespace BizHawk.MultiClient
{
if (!this.IsHandleCreated || this.IsDisposed) return;
if (!(Global.Emulator is PCEngine)) return;
Generate();
}
private void SaveConfigSettings()
{
Global.Config.PCEBGViewerWndx = this.Location.X;
Global.Config.PCEBGViewerWndy = this.Location.Y;
Global.Config.PCEBGViewerRefreshRate = RefreshRate.Value;
}
private void LoadConfigSettings()
@ -109,6 +108,14 @@ namespace BizHawk.MultiClient
{
pce = Global.Emulator as PCEngine;
LoadConfigSettings();
if (Global.Config.PCEBGViewerRefreshRate >= RefreshRate.Minimum && Global.Config.PCEBGViewerRefreshRate <= RefreshRate.Maximum)
{
RefreshRate.Value = Global.Config.PCEBGViewerRefreshRate;
}
else
{
RefreshRate.Value = RefreshRate.Maximum;
}
}
private void PCEBGViewer_FormClosed(object sender, FormClosedEventArgs e)