lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle arrays of uniform buffers in descriptor slots

Browse Source
This commit is contained in:
baldurk
2015-11-21 21:41:43 +01:00
parent be289dbec2
commit 8a6d2ebf30
10 changed files with 581 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdocui/Controls/TreeListView/TreeListNode.cs
+6
View File
@@ -19,6 +19,7 @@ namespace TreelistView
bool m_expanded = false;
Image m_image = null;
Image m_hoverImage = null;
int m_treeColumn = -1;
int m_id = -1;
object m_tag = null;
bool m_bold = false;
@@ -70,6 +71,11 @@ namespace TreelistView
get { return m_hoverImage != null ? m_hoverImage : m_image; }
set { m_hoverImage = value; }
}
public int TreeColumn
{
get { return m_treeColumn; }
set { m_treeColumn = value; }
}
public virtual NodeCollection Owner
{
get { return m_owner; }
renderdocui/Controls/TreeListView/TreeListOptions.cs
+13
View File
@@ -98,6 +98,7 @@ namespace TreelistView.TreeList
int m_indent = 16;
bool m_showLine = true;
bool m_showPlusMinus = true;
bool m_padForPlusMinus = true;
bool m_showGridLines = true;
bool m_rearrangeableColumns = false;
bool m_hoverHand = true;
@@ -137,6 +138,18 @@ namespace TreelistView.TreeList
m_owner.Invalidate();
}
}
[Category("Behavior")]
[DefaultValue(typeof(bool), "True")]
public bool PadForPlusMinus
{
get { return m_padForPlusMinus; }
set
{
m_padForPlusMinus = value;
m_owner.Invalidate();
}
}
[Category("Behavior")]
[DefaultValue(typeof(bool), "True")]
renderdocui/Controls/TreeListView/TreeListView.cs
+22 -9
View File
@@ -137,6 +137,14 @@ namespace TreelistView
}
}
private int GetTreeColumn(Node n)
{
if (n != null && n.TreeColumn >= 0)
return n.TreeColumn;
return m_treeColumn;
}
[Category("Behavior")]
[DefaultValue(typeof(bool), "False")]
public bool AlwaysDisplayVScroll
@@ -560,15 +568,18 @@ namespace TreelistView
{
int clickedRow = CalcHitRow(mousePoint);
Rectangle glyphRect = Rectangle.Empty;
if (m_treeColumn >= 0)
glyphRect = GetPlusMinusRectangle(clickedNode, Columns[m_treeColumn], clickedRow);
int treeColumn = GetTreeColumn(clickedNode);
if (treeColumn >= 0)
glyphRect = GetPlusMinusRectangle(clickedNode, Columns[treeColumn], clickedRow);
if (clickedNode.HasChildren && glyphRect != Rectangle.Empty && glyphRect.Contains(mousePoint))
clickedNode.Expanded = !clickedNode.Expanded;
var columnHit = CalcColumnHit(mousePoint);
if (glyphRect == Rectangle.Empty && columnHit.Column != null &&
columnHit.Column.Index == m_treeColumn && GetNodeBitmap(clickedNode) != null)
columnHit.Column.Index == treeColumn && GetNodeBitmap(clickedNode) != null)
{
OnNodeClicked(clickedNode);
}
@@ -685,7 +696,10 @@ namespace TreelistView
if ((int)(info.HitType & HitInfo.eHitType.kColumnHeaderResize) > 0)
Cursor = Cursors.VSplit;
else if (info.Column != null && info.Column.Index == m_treeColumn && GetNodeBitmap(clickedNode) != null && m_viewSetting.HoverHandTreeColumn)
else if (info.Column != null &&
info.Column.Index == GetTreeColumn(clickedNode) &&
GetNodeBitmap(clickedNode) != null &&
m_viewSetting.HoverHandTreeColumn)
Cursor = Cursors.Hand;
else
Cursor = Cursors.Arrow;
@@ -971,7 +985,7 @@ namespace TreelistView
dc.SetClip(cellRect);
if (col.Index == m_treeColumn)
if (col.Index == GetTreeColumn(node))
{
int lineindet = 10;
// add left margin
@@ -987,9 +1001,10 @@ namespace TreelistView
cellRect.X += lineindet;
cellRect.Width -= lineindet;
Rectangle glyphRect = GetPlusMinusRectangle(node, col, visibleRowIndex);
Rectangle glyphRect = GetPlusMinusRectangle(node, col, visibleRowIndex);
Rectangle plusminusRect = glyphRect;
if (!ViewOptions.ShowLine && !ViewOptions.ShowPlusMinus)
if (!ViewOptions.ShowLine && (!ViewOptions.ShowPlusMinus || (!ViewOptions.PadForPlusMinus && plusminusRect == Rectangle.Empty)))
{
cellRect.X -= (lineindet + 5);
cellRect.Width += (lineindet + 5);
@@ -1000,8 +1015,6 @@ namespace TreelistView
Image icon = hoverNode != null && hoverNode == node ? GetHoverNodeBitmap(node) : GetNodeBitmap(node);
Rectangle plusminusRect = glyphRect;
PaintCellBackground(dc, cellRect, node, col);
if (SelectedImage != null && (NodesSelection.Contains(node) || FocusedNode == node))