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

Whoops. Reverting some stuff I was toying around with.

Browse Source
This commit is contained in:
Shyotl
2011-03-08 18:52:02 -06:00
parent 1b039a1be6
commit ef90cc74e4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
View File

@@ -151,7 +151,7 @@ void main()
// spec *= shadow; // spec *= shadow;
// color.rgb += spec * specular; // color.rgb += spec * specular;
color.rgb = atmosTransport(color.rgb); // color.rgb = atmosTransport(color.rgb);
// color.rgb = scaleSoftClip(color.rgb); // color.rgb = scaleSoftClip(color.rgb);
// color.a = spec * sunAngle2; // color.a = spec * sunAngle2;

4
indra/newview/lldrawpoolwater.cpp
View File

@@ -404,11 +404,11 @@ void LLDrawPoolWater::shade()
F32 eyedepth = LLViewerCamera::getInstance()->getOrigin().mV[2] - gAgent.getRegion()->getWaterHeight(); F32 eyedepth = LLViewerCamera::getInstance()->getOrigin().mV[2] - gAgent.getRegion()->getWaterHeight();
if (eyedepth > 0.f && deferred_render) if (deferred_render)
{ {
shader = &gDeferredWaterProgram; shader = &gDeferredWaterProgram;
} }
else if (eyedepth < 0.f /*&& LLPipeline::sWaterReflections*/) else if (eyedepth < 0.f && LLPipeline::sWaterReflections)
{ {
shader = &gUnderWaterProgram; shader = &gUnderWaterProgram;
} }