empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debugger: Added tile/attribute grid options to nametable viewer

Browse source
This commit is contained in:
Souryo 2016-12-04 10:47:48 -05:00
parent 0df07aadc4
commit 7070a09ea8
3 changed files with 129 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GUI.NET/Config/DebugInfo.cs
View file

@ -78,6 +78,8 @@ namespace Mesen.GUI.Config
public bool PpuAutoRefresh = true;
public bool PpuPartialDraw = false;
public bool ShowPpuScrollOverlay = true;
public bool ShowTileGrid = false;
public bool ShowAttributeGrid = false;
public int PpuDisplayCycle = 0;
public int PpuDisplayScanline = 241;

68
GUI.NET/Debugger/Controls/ctrlNametableViewer.Designer.cs generated
View file

@ -28,7 +28,6 @@
private void InitializeComponent()
{
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.chkShowPpuScrollOverlay = new System.Windows.Forms.CheckBox();
this.picNametable = new System.Windows.Forms.PictureBox();
this.grpTileInfo = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
@ -44,11 +43,16 @@
this.lblTile = new System.Windows.Forms.Label();
this.txtTileIndex = new System.Windows.Forms.TextBox();
this.picTile = new System.Windows.Forms.PictureBox();
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.chkShowPpuScrollOverlay = new System.Windows.Forms.CheckBox();
this.chkShowTileGrid = new System.Windows.Forms.CheckBox();
this.chkShowAttributeGrid = new System.Windows.Forms.CheckBox();
this.tableLayoutPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picNametable)).BeginInit();
this.grpTileInfo.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picTile)).BeginInit();
this.flowLayoutPanel1.SuspendLayout();
this.SuspendLayout();
//
// tableLayoutPanel1
@ -58,7 +62,7 @@
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Controls.Add(this.picNametable, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.grpTileInfo, 1, 0);
this.tableLayoutPanel1.Controls.Add(this.chkShowPpuScrollOverlay, 1, 1);
this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 1, 1);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
@ -69,16 +73,6 @@
this.tableLayoutPanel1.Size = new System.Drawing.Size(697, 486);
this.tableLayoutPanel1.TabIndex = 2;
//
// chkShowPpuScrollOverlay
//
this.chkShowPpuScrollOverlay.AutoSize = true;
this.chkShowPpuScrollOverlay.Location = new System.Drawing.Point(519, 233);
this.chkShowPpuScrollOverlay.Name = "chkShowPpuScrollOverlay";
this.chkShowPpuScrollOverlay.Size = new System.Drawing.Size(146, 17);
this.chkShowPpuScrollOverlay.TabIndex = 0;
this.chkShowPpuScrollOverlay.Text = "Show PPU Scroll Overlay";
this.chkShowPpuScrollOverlay.UseVisualStyleBackColor = true;
//
// picNametable
//
this.picNametable.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@ -241,6 +235,50 @@
this.picTile.TabIndex = 12;
this.picTile.TabStop = false;
//
// flowLayoutPanel1
//
this.flowLayoutPanel1.Controls.Add(this.chkShowPpuScrollOverlay);
this.flowLayoutPanel1.Controls.Add(this.chkShowTileGrid);
this.flowLayoutPanel1.Controls.Add(this.chkShowAttributeGrid);
this.flowLayoutPanel1.Location = new System.Drawing.Point(516, 230);
this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0, 0, 0, 0);
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
this.flowLayoutPanel1.Size = new System.Drawing.Size(181, 100);
this.flowLayoutPanel1.TabIndex = 5;
//
// chkShowPpuScrollOverlay
//
this.chkShowPpuScrollOverlay.AutoSize = true;
this.chkShowPpuScrollOverlay.Location = new System.Drawing.Point(3, 3);
this.chkShowPpuScrollOverlay.Name = "chkShowPpuScrollOverlay";
this.chkShowPpuScrollOverlay.Size = new System.Drawing.Size(146, 17);
this.chkShowPpuScrollOverlay.TabIndex = 1;
this.chkShowPpuScrollOverlay.Text = "Show PPU Scroll Overlay";
this.chkShowPpuScrollOverlay.UseVisualStyleBackColor = true;
this.chkShowPpuScrollOverlay.Click += new System.EventHandler(this.chkShowScrollWindow_Click);
//
// chkShowTileGrid
//
this.chkShowTileGrid.AutoSize = true;
this.chkShowTileGrid.Location = new System.Drawing.Point(3, 26);
this.chkShowTileGrid.Name = "chkShowTileGrid";
this.chkShowTileGrid.Size = new System.Drawing.Size(95, 17);
this.chkShowTileGrid.TabIndex = 2;
this.chkShowTileGrid.Text = "Show Tile Grid";
this.chkShowTileGrid.UseVisualStyleBackColor = true;
this.chkShowTileGrid.Click += new System.EventHandler(this.chkShowTileGrid_Click);
//
// chkShowAttributeGrid
//
this.chkShowAttributeGrid.AutoSize = true;
this.chkShowAttributeGrid.Location = new System.Drawing.Point(3, 49);
this.chkShowAttributeGrid.Name = "chkShowAttributeGrid";
this.chkShowAttributeGrid.Size = new System.Drawing.Size(117, 17);
this.chkShowAttributeGrid.TabIndex = 3;
this.chkShowAttributeGrid.Text = "Show Attribute Grid";
this.chkShowAttributeGrid.UseVisualStyleBackColor = true;
this.chkShowAttributeGrid.Click += new System.EventHandler(this.chkShowAttributeGrid_Click);
//
// ctrlNametableViewer
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -249,12 +287,13 @@
this.Name = "ctrlNametableViewer";
this.Size = new System.Drawing.Size(697, 486);
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.picNametable)).EndInit();
this.grpTileInfo.ResumeLayout(false);
this.tableLayoutPanel2.ResumeLayout(false);
this.tableLayoutPanel2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.picTile)).EndInit();
this.flowLayoutPanel1.ResumeLayout(false);
this.flowLayoutPanel1.PerformLayout();
this.ResumeLayout(false);
}
@ -277,6 +316,9 @@
private System.Windows.Forms.Label lblTile;
private System.Windows.Forms.TextBox txtTileIndex;
private System.Windows.Forms.PictureBox picTile;
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
private System.Windows.Forms.CheckBox chkShowPpuScrollOverlay;
private System.Windows.Forms.CheckBox chkShowTileGrid;
private System.Windows.Forms.CheckBox chkShowAttributeGrid;
}
}

98
GUI.NET/Debugger/Controls/ctrlNametableViewer.cs
View file

@ -25,7 +25,8 @@ namespace Mesen.GUI.Debugger.Controls
bool designMode = (LicenseManager.UsageMode == LicenseUsageMode.Designtime);
if(!designMode) {
chkShowPpuScrollOverlay.Checked = ConfigManager.Config.DebugInfo.ShowPpuScrollOverlay;
chkShowPpuScrollOverlay.CheckedChanged += this.chkShowScrollWindow_CheckedChanged;
chkShowTileGrid.Checked = ConfigManager.Config.DebugInfo.ShowTileGrid;
chkShowAttributeGrid.Checked = ConfigManager.Config.DebugInfo.ShowAttributeGrid;
}
}
@ -53,36 +54,67 @@ namespace Mesen.GUI.Debugger.Controls
}
}
if(chkShowTileGrid.Checked) {
using(Pen pen = new Pen(Color.FromArgb(chkShowAttributeGrid.Checked ? 120 : 180, 240, 100, 120))) {
if(chkShowAttributeGrid.Checked) {
pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dot;
}
DrawGrid(g, pen, 1);
}
}
if(chkShowAttributeGrid.Checked) {
using(Pen pen = new Pen(Color.FromArgb(180, 80, 130, 250))) {
DrawGrid(g, pen, 2);
}
}
if(chkShowPpuScrollOverlay.Checked) {
using(Brush brush = new SolidBrush(Color.FromArgb(75, 100, 180, 215))) {
g.FillRectangle(brush, xScroll, yScroll, 256, 240);
if(xScroll + 256 >= 512) {
g.FillRectangle(brush, 0, yScroll, xScroll - 256, 240);
}
if(yScroll + 240 >= 480) {
g.FillRectangle(brush, xScroll, 0, 256, yScroll - 240);
}
if(xScroll + 256 >= 512 && yScroll + 240 >= 480) {
g.FillRectangle(brush, 0, 0, xScroll - 256, yScroll - 240);
}
}
using(Pen pen = new Pen(Color.FromArgb(230, 150, 150, 150), 2)) {
g.DrawRectangle(pen, xScroll, yScroll, 256, 240);
if(xScroll + 256 >= 512) {
g.DrawRectangle(pen, 0, yScroll, xScroll - 256, 240);
}
if(yScroll + 240 >= 480) {
g.DrawRectangle(pen, xScroll, 0, 256, yScroll - 240);
}
if(xScroll + 256 >= 512 && yScroll + 240 >= 480) {
g.DrawRectangle(pen, 0, 0, xScroll - 256, yScroll - 240);
}
}
DrawScrollOverlay(xScroll, yScroll, g);
}
}
this.picNametable.Image = target;
}
private static void DrawGrid(Graphics g, Pen pen, int factor)
{
for(int i = 0; i < 64 / factor; i++) {
g.DrawLine(pen, i * 8 * factor - 1, 0, i * 8 * factor - 1, 479);
}
for(int i = 0; i < 60 / factor; i++) {
g.DrawLine(pen, 0, i * 8 * factor - 1, 511, i * 8 * factor - 1);
}
}
private static void DrawScrollOverlay(int xScroll, int yScroll, Graphics g)
{
using(Brush brush = new SolidBrush(Color.FromArgb(75, 100, 180, 215))) {
g.FillRectangle(brush, xScroll, yScroll, 256, 240);
if(xScroll + 256 >= 512) {
g.FillRectangle(brush, 0, yScroll, xScroll - 256, 240);
}
if(yScroll + 240 >= 480) {
g.FillRectangle(brush, xScroll, 0, 256, yScroll - 240);
}
if(xScroll + 256 >= 512 && yScroll + 240 >= 480) {
g.FillRectangle(brush, 0, 0, xScroll - 256, yScroll - 240);
}
}
using(Pen pen = new Pen(Color.FromArgb(230, 150, 150, 150), 2)) {
g.DrawRectangle(pen, xScroll, yScroll, 256, 240);
if(xScroll + 256 >= 512) {
g.DrawRectangle(pen, 0, yScroll, xScroll - 256, 240);
}
if(yScroll + 240 >= 480) {
g.DrawRectangle(pen, xScroll, 0, 256, yScroll - 240);
}
if(xScroll + 256 >= 512 && yScroll + 240 >= 480) {
g.DrawRectangle(pen, 0, 0, xScroll - 256, yScroll - 240);
}
}
}
private void picNametable_MouseMove(object sender, MouseEventArgs e)
{
int nametableIndex = 0;
@ -124,11 +156,25 @@ namespace Mesen.GUI.Debugger.Controls
this.picTile.Image = tile;
}
private void chkShowScrollWindow_CheckedChanged(object sender, EventArgs e)
private void chkShowScrollWindow_Click(object sender, EventArgs e)
{
ConfigManager.Config.DebugInfo.ShowPpuScrollOverlay = chkShowPpuScrollOverlay.Checked;
ConfigManager.ApplyChanges();
this.RefreshViewer();
}
private void chkShowTileGrid_Click(object sender, EventArgs e)
{
ConfigManager.Config.DebugInfo.ShowTileGrid = chkShowTileGrid.Checked;
ConfigManager.ApplyChanges();
this.RefreshViewer();
}
private void chkShowAttributeGrid_Click(object sender, EventArgs e)
{
ConfigManager.Config.DebugInfo.ShowAttributeGrid = chkShowAttributeGrid.Checked;
ConfigManager.ApplyChanges();
this.RefreshViewer();
}
}
}