diff --git a/renderdocui/Properties/Resources.Designer.cs b/renderdocui/Properties/Resources.Designer.cs index 43c1df138..d52db3ba4 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.17929 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -130,6 +130,16 @@ namespace renderdocui.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap asterisk_orange { + get { + object obj = ResourceManager.GetObject("asterisk_orange", 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 4143a3aee..4903122b5 100644 --- a/renderdocui/Properties/Resources.resx +++ b/renderdocui/Properties/Resources.resx @@ -130,15 +130,15 @@ ..\Resources\stepnext.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\accept.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\timeline_marker.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\runback.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\page_white_link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\page_white_database.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -163,12 +163,18 @@ ..\Resources\128.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\disconnect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\red_x_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\wrench.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\wand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -178,9 +184,6 @@ ..\Resources\stepprev.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\topologies\topo_linestrip_adj.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\tick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -199,6 +202,9 @@ ..\Resources\time.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\runcursor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -208,9 +214,15 @@ ..\Resources\hourglass.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\wireframe_mesh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\arrow_in.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\connect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\topologies\topo_pointlist.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -226,12 +238,15 @@ ..\Resources\topologies\topo_linelist_adj.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\runcursor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\accept.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\page_white_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\flip_y.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\topologies\topo_patch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -247,8 +262,8 @@ ..\resources\cog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\page_white_link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\topologies\topo_linestrip_adj.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\arrow_undo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -256,25 +271,13 @@ ..\resources\rightarrow_green_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\wrench.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\chart_curve.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\timeline_marker.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\connect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\disconnect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\wireframe_mesh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\flip_y.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\asterisk_orange.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/asterisk_orange.png b/renderdocui/Resources/asterisk_orange.png new file mode 100644 index 000000000..1ebebde54 Binary files /dev/null and b/renderdocui/Resources/asterisk_orange.png differ diff --git a/renderdocui/Windows/BufferViewer.Designer.cs b/renderdocui/Windows/BufferViewer.Designer.cs index 1ae7ecf36..1b8074800 100644 --- a/renderdocui/Windows/BufferViewer.Designer.cs +++ b/renderdocui/Windows/BufferViewer.Designer.cs @@ -35,21 +35,21 @@ System.Windows.Forms.Label label3; System.Windows.Forms.Label label5; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BufferViewer)); - WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin2 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); - WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin2 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient4 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient8 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient9 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient5 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient10 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient11 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient12 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient6 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient13 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient14 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin3 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); + WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin3 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient7 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient15 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin3 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient16 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient8 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient17 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient18 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient19 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient9 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient20 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient21 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); this.previewTable = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.render = new renderdocui.Controls.NoScrollPanel(); @@ -101,6 +101,7 @@ this.exportToCSVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportRawBytesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.syncViewsToolItem = new System.Windows.Forms.ToolStripButton(); + this.highlightVerts = new System.Windows.Forms.ToolStripButton(); this.debugSep = new System.Windows.Forms.ToolStripSeparator(); this.debugVertexToolItem = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); @@ -679,52 +680,52 @@ this.dockPanel.Location = new System.Drawing.Point(3, 34); this.dockPanel.Name = "dockPanel"; this.dockPanel.Size = new System.Drawing.Size(834, 462); - dockPanelGradient4.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient4.StartColor = System.Drawing.SystemColors.ControlLight; - autoHideStripSkin2.DockStripGradient = dockPanelGradient4; - tabGradient8.EndColor = System.Drawing.SystemColors.Control; - tabGradient8.StartColor = System.Drawing.SystemColors.Control; - tabGradient8.TextColor = System.Drawing.SystemColors.ControlDarkDark; - autoHideStripSkin2.TabGradient = tabGradient8; - autoHideStripSkin2.TextFont = new System.Drawing.Font("Tahoma", 8.25F); - dockPanelSkin2.AutoHideStripSkin = autoHideStripSkin2; - tabGradient9.EndColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient9.StartColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient9.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient2.ActiveTabGradient = tabGradient9; - dockPanelGradient5.EndColor = System.Drawing.SystemColors.Control; - dockPanelGradient5.StartColor = System.Drawing.SystemColors.Control; - dockPaneStripGradient2.DockStripGradient = dockPanelGradient5; - tabGradient10.EndColor = System.Drawing.SystemColors.ControlLight; - tabGradient10.StartColor = System.Drawing.SystemColors.ControlLight; - tabGradient10.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient2.InactiveTabGradient = tabGradient10; - dockPaneStripSkin2.DocumentGradient = dockPaneStripGradient2; - dockPaneStripSkin2.TextFont = new System.Drawing.Font("Tahoma", 8.25F); - tabGradient11.EndColor = System.Drawing.SystemColors.ActiveCaption; - tabGradient11.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient11.StartColor = System.Drawing.SystemColors.GradientActiveCaption; - tabGradient11.TextColor = System.Drawing.SystemColors.ActiveCaptionText; - dockPaneStripToolWindowGradient2.ActiveCaptionGradient = tabGradient11; - tabGradient12.EndColor = System.Drawing.SystemColors.Control; - tabGradient12.StartColor = System.Drawing.SystemColors.Control; - tabGradient12.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripToolWindowGradient2.ActiveTabGradient = tabGradient12; - dockPanelGradient6.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient6.StartColor = System.Drawing.SystemColors.ControlLight; - dockPaneStripToolWindowGradient2.DockStripGradient = dockPanelGradient6; - tabGradient13.EndColor = System.Drawing.SystemColors.InactiveCaption; - tabGradient13.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient13.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; - tabGradient13.TextColor = System.Drawing.SystemColors.InactiveCaptionText; - dockPaneStripToolWindowGradient2.InactiveCaptionGradient = tabGradient13; - tabGradient14.EndColor = System.Drawing.Color.Transparent; - tabGradient14.StartColor = System.Drawing.Color.Transparent; - tabGradient14.TextColor = System.Drawing.SystemColors.ControlDarkDark; - dockPaneStripToolWindowGradient2.InactiveTabGradient = tabGradient14; - dockPaneStripSkin2.ToolWindowGradient = dockPaneStripToolWindowGradient2; - dockPanelSkin2.DockPaneStripSkin = dockPaneStripSkin2; - this.dockPanel.Skin = dockPanelSkin2; + dockPanelGradient7.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient7.StartColor = System.Drawing.SystemColors.ControlLight; + autoHideStripSkin3.DockStripGradient = dockPanelGradient7; + tabGradient15.EndColor = System.Drawing.SystemColors.Control; + tabGradient15.StartColor = System.Drawing.SystemColors.Control; + tabGradient15.TextColor = System.Drawing.SystemColors.ControlDarkDark; + autoHideStripSkin3.TabGradient = tabGradient15; + autoHideStripSkin3.TextFont = new System.Drawing.Font("Tahoma", 8.25F); + dockPanelSkin3.AutoHideStripSkin = autoHideStripSkin3; + tabGradient16.EndColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient16.StartColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient16.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient3.ActiveTabGradient = tabGradient16; + dockPanelGradient8.EndColor = System.Drawing.SystemColors.Control; + dockPanelGradient8.StartColor = System.Drawing.SystemColors.Control; + dockPaneStripGradient3.DockStripGradient = dockPanelGradient8; + tabGradient17.EndColor = System.Drawing.SystemColors.ControlLight; + tabGradient17.StartColor = System.Drawing.SystemColors.ControlLight; + tabGradient17.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient3.InactiveTabGradient = tabGradient17; + dockPaneStripSkin3.DocumentGradient = dockPaneStripGradient3; + dockPaneStripSkin3.TextFont = new System.Drawing.Font("Tahoma", 8.25F); + tabGradient18.EndColor = System.Drawing.SystemColors.ActiveCaption; + tabGradient18.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient18.StartColor = System.Drawing.SystemColors.GradientActiveCaption; + tabGradient18.TextColor = System.Drawing.SystemColors.ActiveCaptionText; + dockPaneStripToolWindowGradient3.ActiveCaptionGradient = tabGradient18; + tabGradient19.EndColor = System.Drawing.SystemColors.Control; + tabGradient19.StartColor = System.Drawing.SystemColors.Control; + tabGradient19.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripToolWindowGradient3.ActiveTabGradient = tabGradient19; + dockPanelGradient9.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient9.StartColor = System.Drawing.SystemColors.ControlLight; + dockPaneStripToolWindowGradient3.DockStripGradient = dockPanelGradient9; + tabGradient20.EndColor = System.Drawing.SystemColors.InactiveCaption; + tabGradient20.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient20.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; + tabGradient20.TextColor = System.Drawing.SystemColors.InactiveCaptionText; + dockPaneStripToolWindowGradient3.InactiveCaptionGradient = tabGradient20; + tabGradient21.EndColor = System.Drawing.Color.Transparent; + tabGradient21.StartColor = System.Drawing.Color.Transparent; + tabGradient21.TextColor = System.Drawing.SystemColors.ControlDarkDark; + dockPaneStripToolWindowGradient3.InactiveTabGradient = tabGradient21; + dockPaneStripSkin3.ToolWindowGradient = dockPaneStripToolWindowGradient3; + dockPanelSkin3.DockPaneStripSkin = dockPaneStripSkin3; + this.dockPanel.Skin = dockPanelSkin3; this.dockPanel.TabIndex = 12; // // tableLayoutPanel1 @@ -748,7 +749,7 @@ this.flowLayoutPanel2.Controls.Add(this.toolStrip1); this.flowLayoutPanel2.Location = new System.Drawing.Point(3, 3); this.flowLayoutPanel2.Name = "flowLayoutPanel2"; - this.flowLayoutPanel2.Size = new System.Drawing.Size(619, 25); + this.flowLayoutPanel2.Size = new System.Drawing.Size(759, 25); this.flowLayoutPanel2.TabIndex = 0; // // toolStrip1 @@ -759,6 +760,7 @@ this.toolStripSeparator1, this.exportToolItem, this.syncViewsToolItem, + this.highlightVerts, this.debugSep, this.debugVertexToolItem, this.toolStripSeparator2, @@ -772,7 +774,7 @@ this.instanceIdxToolitem}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(619, 25); + this.toolStrip1.Size = new System.Drawing.Size(759, 25); this.toolStrip1.TabIndex = 0; this.toolStrip1.Text = "toolStrip1"; // @@ -823,6 +825,18 @@ this.syncViewsToolItem.Text = "Sync Views"; this.syncViewsToolItem.Click += new System.EventHandler(this.syncViewsToolItem_Click); // + // highlightVerts + // + this.highlightVerts.Checked = true; + this.highlightVerts.CheckOnClick = true; + this.highlightVerts.CheckState = System.Windows.Forms.CheckState.Checked; + this.highlightVerts.Image = global::renderdocui.Properties.Resources.asterisk_orange; + this.highlightVerts.ImageTransparentColor = System.Drawing.Color.Magenta; + this.highlightVerts.Name = "highlightVerts"; + this.highlightVerts.Size = new System.Drawing.Size(109, 22); + this.highlightVerts.Text = "Highlight Vertices"; + this.highlightVerts.CheckedChanged += new System.EventHandler(this.highlightVerts_CheckedChanged); + // // debugSep // this.debugSep.Name = "debugSep"; @@ -1028,6 +1042,7 @@ private System.Windows.Forms.TabPage tabPage3; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.DataGridView gsOutBufferView; + private System.Windows.Forms.ToolStripButton highlightVerts; } } \ No newline at end of file diff --git a/renderdocui/Windows/BufferViewer.cs b/renderdocui/Windows/BufferViewer.cs index 0e935e005..eac24556a 100644 --- a/renderdocui/Windows/BufferViewer.cs +++ b/renderdocui/Windows/BufferViewer.cs @@ -2367,74 +2367,9 @@ namespace renderdocui.Windows #region Vertex Highlighting - private FloatVector GetPosition(UIState ui, int rowidx) + private void highlightVerts_CheckedChanged(object sender, EventArgs e) { - if (rowidx >= 0 && rowidx < ui.m_Rows.Length) - { - uint offset = 0; - foreach (var el in ui.m_Input.BufferFormats) - { - if (el.name.ToUpper() == "POSITION" || el.name.ToUpper() == "SV_POSITION") - { - Stream stream = new MemoryStream(ui.m_RawData); - BinaryReader reader = new BinaryReader(stream); - - uint offs = (uint)(ui.m_RawStride * rowidx + offset); - - uint numComps = Math.Min(el.format.compCount, 4); - - if (offs > ui.m_RawData.Length || offs + sizeof(float) * numComps > ui.m_RawData.Length) - return new FloatVector(); - - stream.Seek(offs, SeekOrigin.Begin); - - var ret = new FloatVector(); - - if (el.format.compByteWidth == 4) - { - for (int i = 0; i < numComps; i++) - { - if (i == 0) ret.x = reader.ReadSingle(); - if (i == 1) ret.y = reader.ReadSingle(); - if (i == 2) ret.z = reader.ReadSingle(); - if (i == 3) ret.w = reader.ReadSingle(); - } - } - else if (el.format.compByteWidth == 2) - { - for (int i = 0; i < numComps; i++) - { - ushort data = reader.ReadUInt16(); - if (i == 0) ret.x = el.format.ConvertFromHalf(data); - if (i == 1) ret.y = el.format.ConvertFromHalf(data); - if (i == 2) ret.z = el.format.ConvertFromHalf(data); - if (i == 3) ret.w = el.format.ConvertFromHalf(data); - } - } - - return ret; - } - - offset += el.ByteSize; - } - } - - return new FloatVector(); - } - - private uint GetIndex(UIState ui, int rowidx) - { - if (rowidx >= 0 && ui.m_Data.Indices != null && rowidx < ui.m_Data.Indices.Length) - { - uint ret = ui.m_Data.Indices[rowidx]; - - if (ui.m_Input.IndexFormat.ByteSize == 2 && ret == ushort.MaxValue) - ret = uint.MaxValue; - - return ret; - } - - return uint.MaxValue; + UpdateHighlightVerts(GetUIState(m_MeshDisplay.type)); } private void ClearHighlightVerts() @@ -2449,7 +2384,10 @@ namespace renderdocui.Windows if (ui.m_GridView.SelectedRows.Count == 0) return; if (!MeshView) return; - m_MeshDisplay.highlightVert = (uint)ui.m_GridView.SelectedRows[0].Index; + if(highlightVerts.Checked) + m_MeshDisplay.highlightVert = (uint)ui.m_GridView.SelectedRows[0].Index; + else + m_MeshDisplay.highlightVert = ~0U; m_Core.Renderer.BeginInvoke((ReplayRenderer r) => { RT_UpdateRenderOutput(r); if (m_Output != null) m_Output.Display(); }); } diff --git a/renderdocui/Windows/BufferViewer.resx b/renderdocui/Windows/BufferViewer.resx index 898d382d3..c85a4c3b7 100644 --- a/renderdocui/Windows/BufferViewer.resx +++ b/renderdocui/Windows/BufferViewer.resx @@ -166,7 +166,4 @@ 387, 17 - - 387, 17 - \ No newline at end of file diff --git a/renderdocui/renderdocui.csproj b/renderdocui/renderdocui.csproj index f19359eb2..74768a886 100644 --- a/renderdocui/renderdocui.csproj +++ b/renderdocui/renderdocui.csproj @@ -462,6 +462,7 @@ +