lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-24 15:36:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Texture Viewer custom shaders directory setting

Browse Source
This commit is contained in:
alex
2020-06-16 11:47:52 +01:00
committed by Baldur Karlsson
parent 34b3484baa
commit c1612f5d46
6 changed files with 115 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/TextureViewer.cpp
+14 -7
View File
@@ -4020,8 +4020,7 @@ void TextureViewer::reloadCustomShaders(const QString &filter)
filters.push_back(lit("*.") + it.key());
}
QStringList files =
QDir(configFilePath(QString()))
QStringList files = getCustomShadersDir()
.entryList(filters, QDir::Files | QDir::NoDotAndDotDot, QDir::Name | QDir::IgnoreCase);
QStringList watchedFiles = m_Watcher->files();
@@ -4038,11 +4037,12 @@ void TextureViewer::reloadCustomShaders(const QString &filter)
if(!filter.isEmpty() && filter.toUpper() != key)
continue;
m_Watcher->addPath(configFilePath(f));
QString filePath = QDir::cleanPath(getCustomShadersDir().absoluteFilePath(f));
m_Watcher->addPath(filePath);
if(!m_CustomShaders.contains(key) && !m_CustomShadersBusy.contains(key))
{
QFile fileHandle(configFilePath(f));
QFile fileHandle(filePath);
if(fileHandle.open(QFile::ReadOnly | QFile::Text))
{
QTextStream stream(&fileHandle);
@@ -4134,6 +4134,13 @@ void TextureViewer::reloadCustomShaders(const QString &filter)
}
}
QDir TextureViewer::getCustomShadersDir() const
{
return m_Ctx.Config().TextureViewer_CustomShadersDirectory.empty()
? QDir(configFilePath(QString()))
: QDir(m_Ctx.Config().TextureViewer_CustomShadersDirectory);
}
void TextureViewer::on_customCreate_clicked()
{
QString filename = ui->customShader->currentText();
@@ -4177,7 +4184,7 @@ void TextureViewer::on_customCreate_clicked()
return;
}
QString path = configFilePath(filename);
QString path = QDir::cleanPath(getCustomShadersDir().absoluteFilePath(filename));
QString src;
@@ -4240,7 +4247,7 @@ void TextureViewer::on_customEdit_clicked()
return;
}
QString path = configFilePath(filename);
QString path = QDir::cleanPath(getCustomShadersDir().absoluteFilePath(filename));
QString src;
@@ -4332,7 +4339,7 @@ void TextureViewer::on_customDelete_clicked()
if(res == QMessageBox::Yes)
{
QString path = configFilePath(shaderName);
QString path = QDir::cleanPath(getCustomShadersDir().absoluteFilePath(shaderName));
if(!QFileInfo::exists(path))
{
RDDialog::critical(