gb gpu view: use no alpha because of windows clipboard dumbassery
This commit is contained in:
goyuken
parent
afc97cda77
commit
607998ddd9
|
|
@ -13,13 +13,8 @@ namespace BizHawk.MultiClient.GBtools
|
|||
{
|
||||
[Browsable(false)]
|
||||
public Bitmap bmp { get; private set; }
|
||||
[Browsable(true)]
|
||||
bool scaled;
|
||||
|
||||
/// <summary>
|
||||
/// if true, the backcolor will be drawn. otherwise, nothing (so HOM with transparent images)
|
||||
/// </summary>
|
||||
public bool DrawBackdrop { get; set; }
|
||||
bool scaled;
|
||||
|
||||
public BmpView()
|
||||
{
|
||||
|
|
@ -50,10 +45,6 @@ namespace BizHawk.MultiClient.GBtools
|
|||
|
||||
void BmpView_Paint(object sender, PaintEventArgs e)
|
||||
{
|
||||
if (DrawBackdrop)
|
||||
{
|
||||
e.Graphics.Clear(BackColor);
|
||||
}
|
||||
if (scaled)
|
||||
{
|
||||
e.Graphics.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor;
|
||||
|
|
@ -87,16 +78,10 @@ namespace BizHawk.MultiClient.GBtools
|
|||
public void Clear()
|
||||
{
|
||||
var lockdata = bmp.LockBits(new Rectangle(0, 0, bmp.Width, bmp.Height), System.Drawing.Imaging.ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
|
||||
//Win32.ZeroMemory(lockdata.Scan0, (uint)(lockdata.Height * lockdata.Stride));
|
||||
Win32.MemSet(lockdata.Scan0, 0xff, (uint)(lockdata.Height * lockdata.Stride));
|
||||
bmp.UnlockBits(lockdata);
|
||||
Refresh();
|
||||
}
|
||||
|
||||
// kill unused props
|
||||
//[Browsable(false)]
|
||||
//public override Color BackColor { get { return base.BackColor; } set { base.BackColor = Color.Blue; } }
|
||||
//[Browsable(false)]
|
||||
//public override string Text { get { return base.Text; } set { base.Text = value; } }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,6 +55,10 @@
|
|||
this.groupBox7 = new System.Windows.Forms.GroupBox();
|
||||
this.checkBoxSavePos = new System.Windows.Forms.CheckBox();
|
||||
this.checkBoxAutoLoad = new System.Windows.Forms.CheckBox();
|
||||
this.groupBox8 = new System.Windows.Forms.GroupBox();
|
||||
this.panelSpriteBackColor = new System.Windows.Forms.Panel();
|
||||
this.buttonChangeColor = new System.Windows.Forms.Button();
|
||||
this.labelSpriteBackColor = new System.Windows.Forms.Label();
|
||||
this.bmpViewMemory = new BizHawk.MultiClient.GBtools.BmpView();
|
||||
this.bmpViewDetails = new BizHawk.MultiClient.GBtools.BmpView();
|
||||
this.bmpViewOAM = new BizHawk.MultiClient.GBtools.BmpView();
|
||||
|
|
@ -64,10 +68,6 @@
|
|||
this.bmpViewTiles2 = new BizHawk.MultiClient.GBtools.BmpView();
|
||||
this.bmpViewBG = new BizHawk.MultiClient.GBtools.BmpView();
|
||||
this.bmpViewWin = new BizHawk.MultiClient.GBtools.BmpView();
|
||||
this.groupBox8 = new System.Windows.Forms.GroupBox();
|
||||
this.panelSpriteBackColor = new System.Windows.Forms.Panel();
|
||||
this.buttonChangeColor = new System.Windows.Forms.Button();
|
||||
this.labelSpriteBackColor = new System.Windows.Forms.Label();
|
||||
this.groupBox1.SuspendLayout();
|
||||
this.groupBox2.SuspendLayout();
|
||||
this.groupBox3.SuspendLayout();
|
||||
|
|
@ -367,125 +367,6 @@
|
|||
this.checkBoxAutoLoad.UseVisualStyleBackColor = true;
|
||||
this.checkBoxAutoLoad.CheckedChanged += new System.EventHandler(this.checkBoxAutoLoad_CheckedChanged);
|
||||
//
|
||||
// bmpViewMemory
|
||||
//
|
||||
this.bmpViewMemory.BackColor = System.Drawing.Color.Black;
|
||||
this.bmpViewMemory.DrawBackdrop = true;
|
||||
this.bmpViewMemory.Location = new System.Drawing.Point(6, 19);
|
||||
this.bmpViewMemory.Name = "bmpViewMemory";
|
||||
this.bmpViewMemory.Size = new System.Drawing.Size(64, 128);
|
||||
this.bmpViewMemory.TabIndex = 1;
|
||||
this.bmpViewMemory.Text = "Details (memory)";
|
||||
//
|
||||
// bmpViewDetails
|
||||
//
|
||||
this.bmpViewDetails.BackColor = System.Drawing.Color.Black;
|
||||
this.bmpViewDetails.DrawBackdrop = true;
|
||||
this.bmpViewDetails.Location = new System.Drawing.Point(6, 19);
|
||||
this.bmpViewDetails.Name = "bmpViewDetails";
|
||||
this.bmpViewDetails.Size = new System.Drawing.Size(64, 128);
|
||||
this.bmpViewDetails.TabIndex = 0;
|
||||
this.bmpViewDetails.Text = "Details (mouseover)";
|
||||
this.bmpViewDetails.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bmpView_MouseClick);
|
||||
//
|
||||
// bmpViewOAM
|
||||
//
|
||||
this.bmpViewOAM.BackColor = System.Drawing.Color.Black;
|
||||
this.bmpViewOAM.DrawBackdrop = true;
|
||||
this.bmpViewOAM.Location = new System.Drawing.Point(6, 19);
|
||||
this.bmpViewOAM.Name = "bmpViewOAM";
|
||||
this.bmpViewOAM.Size = new System.Drawing.Size(320, 16);
|
||||
this.bmpViewOAM.TabIndex = 14;
|
||||
this.bmpViewOAM.Text = "Sprites";
|
||||
this.bmpViewOAM.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bmpView_MouseClick);
|
||||
this.bmpViewOAM.MouseEnter += new System.EventHandler(this.bmpViewOAM_MouseEnter);
|
||||
this.bmpViewOAM.MouseLeave += new System.EventHandler(this.bmpViewOAM_MouseLeave);
|
||||
this.bmpViewOAM.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bmpViewOAM_MouseMove);
|
||||
//
|
||||
// bmpViewBGPal
|
||||
//
|
||||
this.bmpViewBGPal.BackColor = System.Drawing.Color.Black;
|
||||
this.bmpViewBGPal.DrawBackdrop = true;
|
||||
this.bmpViewBGPal.Location = new System.Drawing.Point(6, 32);
|
||||
this.bmpViewBGPal.Name = "bmpViewBGPal";
|
||||
this.bmpViewBGPal.Size = new System.Drawing.Size(128, 64);
|
||||
this.bmpViewBGPal.TabIndex = 10;
|
||||
this.bmpViewBGPal.Text = "Background palettes";
|
||||
this.bmpViewBGPal.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bmpView_MouseClick);
|
||||
this.bmpViewBGPal.MouseEnter += new System.EventHandler(this.bmpViewBGPal_MouseEnter);
|
||||
this.bmpViewBGPal.MouseLeave += new System.EventHandler(this.bmpViewBGPal_MouseLeave);
|
||||
this.bmpViewBGPal.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bmpViewBGPal_MouseMove);
|
||||
//
|
||||
// bmpViewSPPal
|
||||
//
|
||||
this.bmpViewSPPal.BackColor = System.Drawing.Color.Black;
|
||||
this.bmpViewSPPal.DrawBackdrop = true;
|
||||
this.bmpViewSPPal.Location = new System.Drawing.Point(140, 32);
|
||||
this.bmpViewSPPal.Name = "bmpViewSPPal";
|
||||
this.bmpViewSPPal.Size = new System.Drawing.Size(128, 64);
|
||||
this.bmpViewSPPal.TabIndex = 11;
|
||||
this.bmpViewSPPal.Text = "Sprite palettes";
|
||||
this.bmpViewSPPal.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bmpView_MouseClick);
|
||||
this.bmpViewSPPal.MouseEnter += new System.EventHandler(this.bmpViewSPPal_MouseEnter);
|
||||
this.bmpViewSPPal.MouseLeave += new System.EventHandler(this.bmpViewSPPal_MouseLeave);
|
||||
this.bmpViewSPPal.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bmpViewSPPal_MouseMove);
|
||||
//
|
||||
// bmpViewTiles1
|
||||
//
|
||||
this.bmpViewTiles1.BackColor = System.Drawing.Color.Black;
|
||||
this.bmpViewTiles1.DrawBackdrop = false;
|
||||
this.bmpViewTiles1.Location = new System.Drawing.Point(6, 32);
|
||||
this.bmpViewTiles1.Name = "bmpViewTiles1";
|
||||
this.bmpViewTiles1.Size = new System.Drawing.Size(128, 192);
|
||||
this.bmpViewTiles1.TabIndex = 6;
|
||||
this.bmpViewTiles1.Text = "Tiles 1";
|
||||
this.bmpViewTiles1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bmpView_MouseClick);
|
||||
this.bmpViewTiles1.MouseEnter += new System.EventHandler(this.bmpViewTiles1_MouseEnter);
|
||||
this.bmpViewTiles1.MouseLeave += new System.EventHandler(this.bmpViewTiles1_MouseLeave);
|
||||
this.bmpViewTiles1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bmpViewTiles1_MouseMove);
|
||||
//
|
||||
// bmpViewTiles2
|
||||
//
|
||||
this.bmpViewTiles2.BackColor = System.Drawing.Color.Black;
|
||||
this.bmpViewTiles2.DrawBackdrop = false;
|
||||
this.bmpViewTiles2.Location = new System.Drawing.Point(140, 32);
|
||||
this.bmpViewTiles2.Name = "bmpViewTiles2";
|
||||
this.bmpViewTiles2.Size = new System.Drawing.Size(128, 192);
|
||||
this.bmpViewTiles2.TabIndex = 7;
|
||||
this.bmpViewTiles2.Text = "Tiles 2";
|
||||
this.bmpViewTiles2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bmpView_MouseClick);
|
||||
this.bmpViewTiles2.MouseEnter += new System.EventHandler(this.bmpViewTiles2_MouseEnter);
|
||||
this.bmpViewTiles2.MouseLeave += new System.EventHandler(this.bmpViewTiles2_MouseLeave);
|
||||
this.bmpViewTiles2.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bmpViewTiles2_MouseMove);
|
||||
//
|
||||
// bmpViewBG
|
||||
//
|
||||
this.bmpViewBG.BackColor = System.Drawing.Color.Black;
|
||||
this.bmpViewBG.DrawBackdrop = false;
|
||||
this.bmpViewBG.Location = new System.Drawing.Point(6, 32);
|
||||
this.bmpViewBG.Name = "bmpViewBG";
|
||||
this.bmpViewBG.Size = new System.Drawing.Size(256, 256);
|
||||
this.bmpViewBG.TabIndex = 4;
|
||||
this.bmpViewBG.Text = "Background";
|
||||
this.bmpViewBG.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bmpView_MouseClick);
|
||||
this.bmpViewBG.MouseEnter += new System.EventHandler(this.bmpViewBG_MouseEnter);
|
||||
this.bmpViewBG.MouseLeave += new System.EventHandler(this.bmpViewBG_MouseLeave);
|
||||
this.bmpViewBG.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bmpViewBG_MouseMove);
|
||||
//
|
||||
// bmpViewWin
|
||||
//
|
||||
this.bmpViewWin.BackColor = System.Drawing.Color.Black;
|
||||
this.bmpViewWin.DrawBackdrop = false;
|
||||
this.bmpViewWin.Location = new System.Drawing.Point(268, 32);
|
||||
this.bmpViewWin.Name = "bmpViewWin";
|
||||
this.bmpViewWin.Size = new System.Drawing.Size(256, 256);
|
||||
this.bmpViewWin.TabIndex = 5;
|
||||
this.bmpViewWin.Text = "Window";
|
||||
this.bmpViewWin.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bmpView_MouseClick);
|
||||
this.bmpViewWin.MouseEnter += new System.EventHandler(this.bmpViewWin_MouseEnter);
|
||||
this.bmpViewWin.MouseLeave += new System.EventHandler(this.bmpViewWin_MouseLeave);
|
||||
this.bmpViewWin.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bmpViewWin_MouseMove);
|
||||
//
|
||||
// groupBox8
|
||||
//
|
||||
this.groupBox8.Controls.Add(this.labelSpriteBackColor);
|
||||
|
|
@ -525,11 +406,121 @@
|
|||
this.labelSpriteBackColor.TabIndex = 2;
|
||||
this.labelSpriteBackColor.Text = "label8";
|
||||
//
|
||||
// bmpViewMemory
|
||||
//
|
||||
this.bmpViewMemory.BackColor = System.Drawing.Color.Black;
|
||||
this.bmpViewMemory.Location = new System.Drawing.Point(6, 19);
|
||||
this.bmpViewMemory.Name = "bmpViewMemory";
|
||||
this.bmpViewMemory.Size = new System.Drawing.Size(64, 128);
|
||||
this.bmpViewMemory.TabIndex = 1;
|
||||
this.bmpViewMemory.Text = "Details (memory)";
|
||||
//
|
||||
// bmpViewDetails
|
||||
//
|
||||
this.bmpViewDetails.BackColor = System.Drawing.Color.Black;
|
||||
this.bmpViewDetails.Location = new System.Drawing.Point(6, 19);
|
||||
this.bmpViewDetails.Name = "bmpViewDetails";
|
||||
this.bmpViewDetails.Size = new System.Drawing.Size(64, 128);
|
||||
this.bmpViewDetails.TabIndex = 0;
|
||||
this.bmpViewDetails.Text = "Details (mouseover)";
|
||||
this.bmpViewDetails.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bmpView_MouseClick);
|
||||
//
|
||||
// bmpViewOAM
|
||||
//
|
||||
this.bmpViewOAM.BackColor = System.Drawing.Color.Black;
|
||||
this.bmpViewOAM.Location = new System.Drawing.Point(6, 19);
|
||||
this.bmpViewOAM.Name = "bmpViewOAM";
|
||||
this.bmpViewOAM.Size = new System.Drawing.Size(320, 16);
|
||||
this.bmpViewOAM.TabIndex = 14;
|
||||
this.bmpViewOAM.Text = "Sprites";
|
||||
this.bmpViewOAM.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bmpView_MouseClick);
|
||||
this.bmpViewOAM.MouseEnter += new System.EventHandler(this.bmpViewOAM_MouseEnter);
|
||||
this.bmpViewOAM.MouseLeave += new System.EventHandler(this.bmpViewOAM_MouseLeave);
|
||||
this.bmpViewOAM.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bmpViewOAM_MouseMove);
|
||||
//
|
||||
// bmpViewBGPal
|
||||
//
|
||||
this.bmpViewBGPal.BackColor = System.Drawing.Color.Black;
|
||||
this.bmpViewBGPal.Location = new System.Drawing.Point(6, 32);
|
||||
this.bmpViewBGPal.Name = "bmpViewBGPal";
|
||||
this.bmpViewBGPal.Size = new System.Drawing.Size(128, 64);
|
||||
this.bmpViewBGPal.TabIndex = 10;
|
||||
this.bmpViewBGPal.Text = "Background palettes";
|
||||
this.bmpViewBGPal.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bmpView_MouseClick);
|
||||
this.bmpViewBGPal.MouseEnter += new System.EventHandler(this.bmpViewBGPal_MouseEnter);
|
||||
this.bmpViewBGPal.MouseLeave += new System.EventHandler(this.bmpViewBGPal_MouseLeave);
|
||||
this.bmpViewBGPal.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bmpViewBGPal_MouseMove);
|
||||
//
|
||||
// bmpViewSPPal
|
||||
//
|
||||
this.bmpViewSPPal.BackColor = System.Drawing.Color.Black;
|
||||
this.bmpViewSPPal.Location = new System.Drawing.Point(140, 32);
|
||||
this.bmpViewSPPal.Name = "bmpViewSPPal";
|
||||
this.bmpViewSPPal.Size = new System.Drawing.Size(128, 64);
|
||||
this.bmpViewSPPal.TabIndex = 11;
|
||||
this.bmpViewSPPal.Text = "Sprite palettes";
|
||||
this.bmpViewSPPal.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bmpView_MouseClick);
|
||||
this.bmpViewSPPal.MouseEnter += new System.EventHandler(this.bmpViewSPPal_MouseEnter);
|
||||
this.bmpViewSPPal.MouseLeave += new System.EventHandler(this.bmpViewSPPal_MouseLeave);
|
||||
this.bmpViewSPPal.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bmpViewSPPal_MouseMove);
|
||||
//
|
||||
// bmpViewTiles1
|
||||
//
|
||||
this.bmpViewTiles1.BackColor = System.Drawing.Color.Black;
|
||||
this.bmpViewTiles1.Location = new System.Drawing.Point(6, 32);
|
||||
this.bmpViewTiles1.Name = "bmpViewTiles1";
|
||||
this.bmpViewTiles1.Size = new System.Drawing.Size(128, 192);
|
||||
this.bmpViewTiles1.TabIndex = 6;
|
||||
this.bmpViewTiles1.Text = "Tiles 1";
|
||||
this.bmpViewTiles1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bmpView_MouseClick);
|
||||
this.bmpViewTiles1.MouseEnter += new System.EventHandler(this.bmpViewTiles1_MouseEnter);
|
||||
this.bmpViewTiles1.MouseLeave += new System.EventHandler(this.bmpViewTiles1_MouseLeave);
|
||||
this.bmpViewTiles1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bmpViewTiles1_MouseMove);
|
||||
//
|
||||
// bmpViewTiles2
|
||||
//
|
||||
this.bmpViewTiles2.BackColor = System.Drawing.Color.Black;
|
||||
this.bmpViewTiles2.Location = new System.Drawing.Point(140, 32);
|
||||
this.bmpViewTiles2.Name = "bmpViewTiles2";
|
||||
this.bmpViewTiles2.Size = new System.Drawing.Size(128, 192);
|
||||
this.bmpViewTiles2.TabIndex = 7;
|
||||
this.bmpViewTiles2.Text = "Tiles 2";
|
||||
this.bmpViewTiles2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bmpView_MouseClick);
|
||||
this.bmpViewTiles2.MouseEnter += new System.EventHandler(this.bmpViewTiles2_MouseEnter);
|
||||
this.bmpViewTiles2.MouseLeave += new System.EventHandler(this.bmpViewTiles2_MouseLeave);
|
||||
this.bmpViewTiles2.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bmpViewTiles2_MouseMove);
|
||||
//
|
||||
// bmpViewBG
|
||||
//
|
||||
this.bmpViewBG.BackColor = System.Drawing.Color.Black;
|
||||
this.bmpViewBG.Location = new System.Drawing.Point(6, 32);
|
||||
this.bmpViewBG.Name = "bmpViewBG";
|
||||
this.bmpViewBG.Size = new System.Drawing.Size(256, 256);
|
||||
this.bmpViewBG.TabIndex = 4;
|
||||
this.bmpViewBG.Text = "Background";
|
||||
this.bmpViewBG.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bmpView_MouseClick);
|
||||
this.bmpViewBG.MouseEnter += new System.EventHandler(this.bmpViewBG_MouseEnter);
|
||||
this.bmpViewBG.MouseLeave += new System.EventHandler(this.bmpViewBG_MouseLeave);
|
||||
this.bmpViewBG.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bmpViewBG_MouseMove);
|
||||
//
|
||||
// bmpViewWin
|
||||
//
|
||||
this.bmpViewWin.BackColor = System.Drawing.Color.Black;
|
||||
this.bmpViewWin.Location = new System.Drawing.Point(268, 32);
|
||||
this.bmpViewWin.Name = "bmpViewWin";
|
||||
this.bmpViewWin.Size = new System.Drawing.Size(256, 256);
|
||||
this.bmpViewWin.TabIndex = 5;
|
||||
this.bmpViewWin.Text = "Window";
|
||||
this.bmpViewWin.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bmpView_MouseClick);
|
||||
this.bmpViewWin.MouseEnter += new System.EventHandler(this.bmpViewWin_MouseEnter);
|
||||
this.bmpViewWin.MouseLeave += new System.EventHandler(this.bmpViewWin_MouseLeave);
|
||||
this.bmpViewWin.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bmpViewWin_MouseMove);
|
||||
//
|
||||
// GBGPUView
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(834, 590);
|
||||
this.ClientSize = new System.Drawing.Size(834, 580);
|
||||
this.Controls.Add(this.groupBox8);
|
||||
this.Controls.Add(this.groupBox7);
|
||||
this.Controls.Add(this.groupBox6);
|
||||
|
|
|
|||
|
|
@ -36,21 +36,10 @@ namespace BizHawk.MultiClient.GBtools
|
|||
set
|
||||
{
|
||||
_spriteback = value;
|
||||
SetSpriteBack(_spriteback, this);
|
||||
panelSpriteBackColor.BackColor = _spriteback;
|
||||
labelSpriteBackColor.Text = string.Format("({0},{1},{2})", _spriteback.R, _spriteback.G, _spriteback.B);
|
||||
}
|
||||
}
|
||||
static void SetSpriteBack(Color color, Control control)
|
||||
{
|
||||
foreach (Control c in control.Controls)
|
||||
{
|
||||
if (c is BmpView && (c as BmpView).DrawBackdrop)
|
||||
c.BackColor = color;
|
||||
if (c.Controls.Count > 0)
|
||||
SetSpriteBack(color, c);
|
||||
}
|
||||
}
|
||||
|
||||
public GBGPUView()
|
||||
{
|
||||
|
|
@ -376,8 +365,7 @@ namespace BizHawk.MultiClient.GBtools
|
|||
p = (int*)sppal;
|
||||
for (int i = 0; i < 32; i++)
|
||||
p[i] |= unchecked((int)0xff000000);
|
||||
// transparent all sprite color 0s
|
||||
int c = spriteback.B | spriteback.G << 8 | spriteback.R << 16;
|
||||
int c = spriteback.ToArgb();
|
||||
for (int i = 0; i < 32; i += 4)
|
||||
p[i] = c;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue