From df5def2182cf68c75221f7fca57d14283467be87 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 24 Feb 2016 00:43:57 +0100 Subject: [PATCH] Add a "load texture as a buffer view" button. Refs #141 * This isn't a complete fix as the buffer gridview doesn't support 100s or 1000s of columns, but it's a start and could be useful in some cases. --- renderdocui/Properties/Resources.Designer.cs | 12 +++++++++++- renderdocui/Properties/Resources.resx | 3 +++ renderdocui/Resources/page_white_code.png | Bin 0 -> 603 bytes renderdocui/Windows/TextureViewer.Designer.cs | 15 ++++++++++++++- renderdocui/Windows/TextureViewer.cs | 7 +++++++ renderdocui/renderdocui.csproj | 1 + 6 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 renderdocui/Resources/page_white_code.png diff --git a/renderdocui/Properties/Resources.Designer.cs b/renderdocui/Properties/Resources.Designer.cs index c244eac1f..3321aeb07 100644 --- a/renderdocui/Properties/Resources.Designer.cs +++ b/renderdocui/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -320,6 +320,16 @@ namespace renderdocui.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap page_white_code { + get { + object obj = ResourceManager.GetObject("page_white_code", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/renderdocui/Properties/Resources.resx b/renderdocui/Properties/Resources.resx index 1a0a9e501..ebf9081f0 100644 --- a/renderdocui/Properties/Resources.resx +++ b/renderdocui/Properties/Resources.resx @@ -283,4 +283,7 @@ ..\Resources\folder_page.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\page_white_code.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/renderdocui/Resources/page_white_code.png b/renderdocui/Resources/page_white_code.png new file mode 100644 index 0000000000000000000000000000000000000000..0c76bd1297751b66230f74719504b2adb02b1615 GIT binary patch literal 603 zcmV-h0;K(kP)^~*-1fljz_B$LUvK}k?BNXe#Y!m=zM!!V#}8bncK5m;8VP zw86G*RI63?Cd%b9bX|ueNlZ|wR6rj|r_)VIP@r2imh3?SN+^{|kY%~8B{maJ@F*OK z&VH9LwOeGt#DRjj0~v~8`>iO7!Ybi;zE$va`A^T#yW`y44;k^#O~K5*jD=qcUhPSc zvyy~q;5H_1WT1l~cqje9yfa+l!hu6xjdOJ8s;8E^+=QQ$tw p?%p!Hy#YapB=@+^9(46X{{RQg%9y;OKjr`c002ovPDHLkV1g7l326WT literal 0 HcmV?d00001 diff --git a/renderdocui/Windows/TextureViewer.Designer.cs b/renderdocui/Windows/TextureViewer.Designer.cs index 46a06abe3..f555a8eda 100644 --- a/renderdocui/Windows/TextureViewer.Designer.cs +++ b/renderdocui/Windows/TextureViewer.Designer.cs @@ -147,6 +147,7 @@ this.pixelContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.highlightedPixelHistoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.highlightedPixelDebugToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.viewTexBuffer = new System.Windows.Forms.ToolStripButton(); subSep = new System.Windows.Forms.ToolStripSeparator(); toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); @@ -976,7 +977,8 @@ this.actionsStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { toolStripLabel1, this.saveTex, - this.texListShow}); + this.texListShow, + this.viewTexBuffer}); this.actionsStrip.Location = new System.Drawing.Point(0, 25); this.actionsStrip.Margin = new System.Windows.Forms.Padding(0, 0, 12, 0); this.actionsStrip.Name = "actionsStrip"; @@ -1304,6 +1306,16 @@ this.highlightedPixelDebugToolStripMenuItem.Text = "Highlighted Pixel &Debug"; this.highlightedPixelDebugToolStripMenuItem.Click += new System.EventHandler(this.debugPixel_Click); // + // viewTexBuffer + // + this.viewTexBuffer.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.viewTexBuffer.Image = global::renderdocui.Properties.Resources.page_white_code; + this.viewTexBuffer.ImageTransparentColor = System.Drawing.Color.Magenta; + this.viewTexBuffer.Name = "viewTexBuffer"; + this.viewTexBuffer.Size = new System.Drawing.Size(23, 22); + this.viewTexBuffer.Text = "Open Texture as Buffer"; + this.viewTexBuffer.Click += new System.EventHandler(this.viewTexBuffer_Click); + // // TextureViewer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1464,6 +1476,7 @@ private System.Windows.Forms.ContextMenuStrip pixelContextMenu; private System.Windows.Forms.ToolStripMenuItem highlightedPixelHistoryToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem highlightedPixelDebugToolStripMenuItem; + private System.Windows.Forms.ToolStripButton viewTexBuffer; } } \ No newline at end of file diff --git a/renderdocui/Windows/TextureViewer.cs b/renderdocui/Windows/TextureViewer.cs index ce2725087..4cca0dbe8 100644 --- a/renderdocui/Windows/TextureViewer.cs +++ b/renderdocui/Windows/TextureViewer.cs @@ -3382,6 +3382,13 @@ namespace renderdocui.Windows })); } + private void viewTexBuffer_Click(object sender, EventArgs e) + { + var viewer = new BufferViewer(m_Core, false); + viewer.ViewRawBuffer(false, CurrentTexture.ID); + viewer.Show(this.DockPanel); + } + private TextureSaveDialog m_SaveDialog = null; private void saveTex_Click(object sender, EventArgs e) diff --git a/renderdocui/renderdocui.csproj b/renderdocui/renderdocui.csproj index b64af4df5..f3c822ae7 100644 --- a/renderdocui/renderdocui.csproj +++ b/renderdocui/renderdocui.csproj @@ -529,6 +529,7 @@ +