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

4
indra/llrender/llpostprocess.h
View File

@@ -117,9 +117,9 @@ public:
return (*this)["enable_night_vision"]; return (*this)["enable_night_vision"];
} }
inline LLSD & useBloomShader() { /*inline LLSD & useBloomShader() {
return (*this)["enable_bloom"]; return (*this)["enable_bloom"];
} }*/
inline LLSD & useColorFilter() { inline LLSD & useColorFilter() {
return (*this)["enable_color_filter"]; return (*this)["enable_color_filter"];

8
indra/newview/llfloaterpostprocess.cpp
View File

@@ -70,10 +70,10 @@ LLFloaterPostProcess::LLFloaterPostProcess() : LLFloater(std::string("Post-Proce
childSetCommitCallback("NightVisionNoiseStrength", &LLFloaterPostProcess::onFloatControlMoved, (char*)"noise_strength"); childSetCommitCallback("NightVisionNoiseStrength", &LLFloaterPostProcess::onFloatControlMoved, (char*)"noise_strength");
/// Bloom Callbacks /// Bloom Callbacks
childSetCommitCallback("BloomToggle", &LLFloaterPostProcess::onBoolToggle, (char*)"enable_bloom"); /*childSetCommitCallback("BloomToggle", &LLFloaterPostProcess::onBoolToggle, (char*)"enable_bloom");
childSetCommitCallback("BloomExtract", &LLFloaterPostProcess::onFloatControlMoved, (char*)"extract_low"); childSetCommitCallback("BloomExtract", &LLFloaterPostProcess::onFloatControlMoved, (char*)"extract_low");
childSetCommitCallback("BloomSize", &LLFloaterPostProcess::onFloatControlMoved, (char*)"bloom_width"); childSetCommitCallback("BloomSize", &LLFloaterPostProcess::onFloatControlMoved, (char*)"bloom_width");
childSetCommitCallback("BloomStrength", &LLFloaterPostProcess::onFloatControlMoved, (char*)"bloom_strength"); childSetCommitCallback("BloomStrength", &LLFloaterPostProcess::onFloatControlMoved, (char*)"bloom_strength");*/
// Gauss Blur Callbacks // Gauss Blur Callbacks
childSetCommitCallback("GaussBlurToggle", &LLFloaterPostProcess::onBoolToggle, (char*)"enable_gauss_blur"); childSetCommitCallback("GaussBlurToggle", &LLFloaterPostProcess::onBoolToggle, (char*)"enable_gauss_blur");
@@ -268,10 +268,10 @@ void LLFloaterPostProcess::syncMenu()
childSetValue("NightVisionNoiseStrength", gPostProcess->tweaks.noiseStrength()); childSetValue("NightVisionNoiseStrength", gPostProcess->tweaks.noiseStrength());
/// Sync Bloom Menu /// Sync Bloom Menu
childSetValue("BloomToggle", LLSD(gPostProcess->tweaks.useBloomShader())); /*childSetValue("BloomToggle", LLSD(gPostProcess->tweaks.useBloomShader()));
childSetValue("BloomExtract", gPostProcess->tweaks.extractLow()); childSetValue("BloomExtract", gPostProcess->tweaks.extractLow());
childSetValue("BloomSize", gPostProcess->tweaks.bloomWidth()); childSetValue("BloomSize", gPostProcess->tweaks.bloomWidth());
childSetValue("BloomStrength", gPostProcess->tweaks.bloomStrength()); childSetValue("BloomStrength", gPostProcess->tweaks.bloomStrength());*/
childSetValue("GaussBlurToggle", gPostProcess->tweaks.useGaussBlurFilter()); childSetValue("GaussBlurToggle", gPostProcess->tweaks.useGaussBlurFilter());
childSetValue("GaussBlurPasses", gPostProcess->tweaks.getGaussBlurPasses()); childSetValue("GaussBlurPasses", gPostProcess->tweaks.getGaussBlurPasses());

4
indra/newview/skins/default/xui/en-us/floater_post_process.xml
View File

@@ -150,7 +150,7 @@
left="14" max_val="1" min_val="0" mouse_opaque="true" left="14" max_val="1" min_val="0" mouse_opaque="true"
name="NightVisionNoiseStrength" show_text="true" value="1.0" width="200" /> name="NightVisionNoiseStrength" show_text="true" value="1.0" width="200" />
</panel> </panel>
<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400" <!--<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
label="Bloom" left="1" mouse_opaque="true" label="Bloom" left="1" mouse_opaque="true"
name="BloomPanel" width="398"> name="BloomPanel" width="398">
<check_box bottom="-20" control_name="BloomToggle" follows="left|top" <check_box bottom="-20" control_name="BloomToggle" follows="left|top"
@@ -191,7 +191,7 @@
initial_val="1.2" label="" left="14" max_val="10" min_val="0" initial_val="1.2" label="" left="14" max_val="10" min_val="0"
mouse_opaque="true" name="BloomStrength" show_text="true" value="1.0" mouse_opaque="true" name="BloomStrength" show_text="true" value="1.0"
width="200" /> width="200" />
</panel> </panel>-->
<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400" <panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
label="Extras" left="1" mouse_opaque="false" name="Extras" label="Extras" left="1" mouse_opaque="false" name="Extras"
width="398"> width="398">