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

Re-added gamma setting to color filter shader

Browse Source 
Fixed issue with setting default values of sliders for gauss shader
This commit is contained in:
Shyotl
2011-02-10 14:57:00 -06:00
parent a579663eb9
commit d0feea7ed7
6 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llrender/llpostprocess.cpp
View File

@@ -100,6 +100,7 @@ LLPostProcess::LLPostProcess(void) :
defaultEffect["bloom_strength"] = 1.5;
/// Color Filter Defaults
defaultEffect["gamma"] = 1.0;
defaultEffect["brightness"] = 1.0;
defaultEffect["contrast"] = 1.0;
defaultEffect["saturation"] = 1.0;
@@ -258,6 +259,7 @@ void LLPostProcess::applyColorFilterShader(void)
getShaderUniforms(colorFilterUniforms, gPostColorFilterProgram.mProgramObject);
glUniform1iARB(colorFilterUniforms["RenderTexture"], 0);
glUniform1fARB(colorFilterUniforms["gamma"], tweaks.getGamma());
glUniform1fARB(colorFilterUniforms["brightness"], tweaks.getBrightness());
glUniform1fARB(colorFilterUniforms["contrast"], tweaks.getContrast());
float baseI = (tweaks.getContrastBaseR() + tweaks.getContrastBaseG() + tweaks.getContrastBaseB()) / 3.0f;
@@ -283,6 +285,7 @@ void LLPostProcess::createColorFilterShader(void)
{
/// Define uniform names
colorFilterUniforms["RenderTexture"] = 0;
colorFilterUniforms["gamma"] = 0;
colorFilterUniforms["brightness"] = 0;
colorFilterUniforms["contrast"] = 0;
colorFilterUniforms["contrastBase"] = 0;