lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-28 08:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Normalise terminology in UI code - don't call captures 'logs'

Browse Source 
* Log is an overloaded term since it can also mean the debug log. We now
  consistently refer to capture files as capture files or just captures
  for short. The log is just for log messages and diagnostics.
* The user-facing UI was mostly already consistent, but many of the
  public interfaces exposed to python needed to be renamed, and it made
  more sense just to make everything consistent.
This commit is contained in:
baldurk
2017-11-17 16:30:57 +00:00
parent e399365ba2
commit 33ff48811b
52 changed files with 810 additions and 752 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/BufferViewer.cpp
+15 -15
View File
@@ -1121,7 +1121,7 @@ BufferViewer::BufferViewer(ICaptureContext &ctx, bool meshview, QWidget *parent)
Reset();
m_Ctx.AddLogViewer(this);
m_Ctx.AddCaptureViewer(this);
}
void BufferViewer::SetupRawView()
@@ -1303,7 +1303,7 @@ void BufferViewer::stageRowMenu(MeshDataStage stage, QMenu *menu, const QPoint &
menu->clear();
if(m_MeshView && stage != MeshDataStage::GSOut && m_Ctx.CurPipelineState().IsLogD3D11())
if(m_MeshView && stage != MeshDataStage::GSOut && m_Ctx.CurPipelineState().IsCaptureD3D11())
{
menu->addAction(m_DebugVert);
menu->addSeparator();
@@ -1345,11 +1345,11 @@ BufferViewer::~BufferViewer()
if(m_MeshView)
m_Ctx.BuiltinWindowClosed(this);
m_Ctx.RemoveLogViewer(this);
m_Ctx.RemoveCaptureViewer(this);
delete ui;
}
void BufferViewer::OnLogfileLoaded()
void BufferViewer::OnCaptureLoaded()
{
Reset();
@@ -1368,7 +1368,7 @@ void BufferViewer::OnLogfileLoaded()
});
}
void BufferViewer::OnLogfileClosed()
void BufferViewer::OnCaptureClosed()
{
Reset();
@@ -2421,7 +2421,7 @@ void BufferViewer::configureDrawRange()
bool instanced = true;
// don't check the flags, check if there are actually multiple instances
if(m_Ctx.LogLoaded())
if(m_Ctx.IsCaptureLoaded())
instanced = draw && draw->numInstances > 1;
ui->drawRange->blockSignals(true);
@@ -2525,7 +2525,7 @@ void BufferViewer::UpdateMeshConfig()
void BufferViewer::render_mouseMove(QMouseEvent *e)
{
if(!m_Ctx.LogLoaded())
if(!m_Ctx.IsCaptureLoaded())
return;
if(m_CurrentCamera)
@@ -2539,7 +2539,7 @@ void BufferViewer::render_mouseMove(QMouseEvent *e)
void BufferViewer::render_clicked(QMouseEvent *e)
{
if(!m_Ctx.LogLoaded())
if(!m_Ctx.IsCaptureLoaded())
return;
QPoint curpos = e->pos();
@@ -2592,7 +2592,7 @@ void BufferViewer::ScrollToRow(BufferItemModel *model, int row)
void BufferViewer::ViewBuffer(uint64_t byteOffset, uint64_t byteSize, ResourceId id,
const QString &format)
{
if(!m_Ctx.LogLoaded())
if(!m_Ctx.IsCaptureLoaded())
return;
m_IsBuffer = true;
@@ -2611,7 +2611,7 @@ void BufferViewer::ViewBuffer(uint64_t byteOffset, uint64_t byteSize, ResourceId
void BufferViewer::ViewTexture(uint32_t arrayIdx, uint32_t mip, ResourceId id, const QString &format)
{
if(!m_Ctx.LogLoaded())
if(!m_Ctx.IsCaptureLoaded())
return;
m_IsBuffer = false;
@@ -2710,7 +2710,7 @@ bool BufferViewer::isCurrentRasterOut()
}
else if(m_CurStage == MeshDataStage::VSOut)
{
if(m_Ctx.LogLoaded() && m_Ctx.CurPipelineState().IsTessellationEnabled())
if(m_Ctx.IsCaptureLoaded() && m_Ctx.CurPipelineState().IsTessellationEnabled())
return false;
return true;
@@ -2751,8 +2751,8 @@ void BufferViewer::Reset()
ICaptureContext *ctx = &m_Ctx;
// while a log is loaded, pass NULL into the widget
if(!m_Ctx.LogLoaded())
// while a capture is loaded, pass NULL into the widget
if(!m_Ctx.IsCaptureLoaded())
ctx = NULL;
{
@@ -3031,7 +3031,7 @@ void BufferViewer::on_byteRangeLength_valueChanged(int value)
void BufferViewer::exportData(const BufferExport &params)
{
if(!m_Ctx.LogLoaded())
if(!m_Ctx.IsCaptureLoaded())
return;
if(!m_Ctx.CurDrawcall())
@@ -3154,7 +3154,7 @@ void BufferViewer::exportData(const BufferExport &params)
void BufferViewer::debugVertex()
{
if(!m_Ctx.LogLoaded())
if(!m_Ctx.IsCaptureLoaded())
return;
if(!m_Ctx.CurDrawcall())