Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed bloom tab from post-process menu.

Browse Source
This commit is contained in:
Shyotl
2011-02-15 17:19:23 -06:00
parent 000f102722
commit 257a971fcd
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llrender/llpostprocess.cpp
View File

@@ -81,9 +81,9 @@ LLPostProcess::LLPostProcess(void) :
{
LLSD & defaultEffect = (mAllEffects["default"] = LLSD::emptyMap());
defaultEffect["enable_night_vision"] = LLSD::Boolean(false);
/*defaultEffect["enable_night_vision"] = LLSD::Boolean(false);
defaultEffect["enable_bloom"] = LLSD::Boolean(false);
defaultEffect["enable_color_filter"] = LLSD::Boolean(false);
defaultEffect["enable_color_filter"] = LLSD::Boolean(false);*/
/// NVG Defaults
defaultEffect["brightness_multiplier"] = 3.0;
@@ -192,7 +192,7 @@ void LLPostProcess::initialize(unsigned int width, unsigned int height)
checkError();
createNightVisionShader();
createBloomShader();
//createBloomShader();
createColorFilterShader();
createGaussBlurShader();
checkError();
@@ -202,7 +202,7 @@ inline bool LLPostProcess::shadersEnabled(void)
{
return (tweaks.useColorFilter().asBoolean() ||
tweaks.useNightVisionShader().asBoolean() ||
tweaks.useBloomShader().asBoolean() ||
/*tweaks.useBloomShader().asBoolean() ||*/
tweaks.useGaussBlurFilter().asBoolean() );
}
@@ -234,7 +234,7 @@ void LLPostProcess::applyShaders(void)
checkError();
copy_buffer = true;
}
if (tweaks.useBloomShader())
/*if (tweaks.useBloomShader())
{
/// If any of the above shaders have been called update the frame buffer;
if (copy_buffer)
@@ -242,7 +242,7 @@ void LLPostProcess::applyShaders(void)
applyBloomShader();
checkError();
copy_buffer = true;
}
}*/
}
void LLPostProcess::applyColorFilterShader(void)