Applied Tofu Linden's water atmospherics improvements.

59f73ee6a1 &
43fdcb8d84

indra/newview/app_settings/shaders/class1/deferred/waterF.glsl

@@ -162,8 +162,9 @@ void main()
 	//spec *= shadow;
 	//color.rgb += spec * specular;
 	
-	//color.rgb = atmosTransport(color.rgb);
-	//color.rgb = scaleSoftClip(color.rgb);
+	color.rgb = atmosTransport(color.rgb);
+	color.rgb = scaleSoftClip(color.rgb);
+
 	//color.a = spec * sunAngle2;
 
 	//wavef.z *= 0.1f;

indra/newview/app_settings/shaders/class1/deferred/waterV.glsl

@@ -85,7 +85,7 @@ void main()
 	pos.w = 1.0;
 	pos = modelview_matrix*pos;
 	
-	calcAtmospherics(pos.xyz);
+	calcAtmospherics(view.xyz);
 		
 	//pass wave parameters to pixel shader
 	vec2 bigWave =  (v.xy) * vec2(0.04,0.04)  + d1 * time * 0.055;

indra/newview/app_settings/shaders/class1/environment/waterV.glsl

@@ -81,7 +81,7 @@ void main()
 	pos.w = 1.0;
 	pos = modelview_matrix*pos;
 	
-	calcAtmospherics(pos.xyz);
+	calcAtmospherics(view.xyz);
 	
 	
 	//pass wave parameters to pixel shader

indra/newview/llviewershadermgr.cpp

@@ -1293,7 +1293,9 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
 	{
 		// load water shader
 		gDeferredWaterProgram.mName = "Deferred Water Shader";
+		gDeferredWaterProgram.mFeatures.atmosphericHelpers = true;
 		gDeferredWaterProgram.mFeatures.calculatesAtmospherics = true;
+		gDeferredWaterProgram.mFeatures.hasAtmospherics = true;
 		gDeferredWaterProgram.mFeatures.hasGamma = true;
 		gDeferredWaterProgram.mFeatures.hasTransport = true;
 		gDeferredWaterProgram.mShaderFiles.clear();