Commit 9ed1ded7 authored by Christopher Tenter's avatar Christopher Tenter

add option to set output dir for generated shaders in cache

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@19735 383ad7c9-94d9-4d36-a494-682f7c89f535
parent f693da07
......@@ -273,6 +273,7 @@ void OptionsWidget::showEvent ( QShowEvent * /*event*/ ) {
logFile->setText( OpenFlipperSettings().value("Core/Log/logFile").toString() );
maxRecentBox->setValue( OpenFlipperSettings().value("Core/File/MaxRecent",15).toInt() );
rbReloadShaders->setChecked(OpenFlipperSettings().value("Core/File/ReloadShaders",false).toBool()) ;
leShaderOutputDir->setText(OpenFlipperSettings().value("Core/File/ShaderOutputDir","").toString());
// UI settings
toolBoxOrientation->setCurrentIndex((OpenFlipperSettings().value("Core/Gui/ToolBoxes/ToolBoxOnTheRight",true).toBool() ? 0 : 1));
......@@ -581,6 +582,9 @@ void OptionsWidget::slotApply() {
OpenFlipperSettings().setValue("Core/File/MaxRecent",maxRecentBox->value() ) ;
OpenFlipperSettings().setValue("Core/File/ReloadShaders",rbReloadShaders->isChecked() ) ;
ACG::ShaderCache::getInstance()->setTimeCheck(rbReloadShaders->isChecked());
OpenFlipperSettings().setValue("Core/File/ShaderOutputDir",leShaderOutputDir->text() ) ;
ACG::ShaderCache::getInstance()->setDebugOutputDir(leShaderOutputDir->text().toUtf8());
// Toolbox orientation
OpenFlipperSettings().setValue("Core/Gui/ToolBoxes/ToolBoxOnTheRight", (toolBoxOrientation->currentIndex() == 0));
......
......@@ -37,7 +37,7 @@
<x>0</x>
<y>0</y>
<width>662</width>
<height>914</height>
<height>862</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
......@@ -392,7 +392,17 @@
</property>
</widget>
</item>
<item row="1" column="0">
<item row="4" column="1">
<widget class="QLineEdit" name="leShaderOutputDir"/>
</item>
<item row="3" column="1">
<widget class="QLabel" name="label_21">
<property name="text">
<string>OutputDir (Debug)</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QPushButton" name="pbReloadShaders">
<property name="text">
<string>Reload All Shaders</string>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment