Commits

davep committed 315a622

SH-1912 Tweak based on QA/resident feedback

Comments (0)

Files changed (3)

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

 
 			//add environmentmap
 			vec3 env_vec = env_mat * refnormpersp;
-			col += textureCube(environmentMap, env_vec).rgb * max(spec.a-diffuse.a-0.2, 0.0); 
+			col = mix(col.rgb, textureCube(environmentMap, env_vec).rgb, 
+				max(spec.a-diffuse.a*2.0, 0.0)); 
 		}
 	
 		col = atmosLighting(col);

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

 	vec4 outColor = mix( mix(color3, color2, alpha2), mix(color1, color0, alpha1), alphaFinal );
 	
 	gl_FragData[0] = vec4(outColor.rgb, 0.0);
-	gl_FragData[1] = vec4(outColor.rgb*0.2, 0.2);
+	gl_FragData[1] = vec4(0,0,0,0);
 	vec3 nvn = normalize(vary_normal);
 	gl_FragData[2] = vec4(nvn.xy * 0.5 + 0.5, nvn.z, 0.0);
 }

indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl

 
 			//add environmentmap
 			vec3 env_vec = env_mat * refnormpersp;
-			col += textureCube(environmentMap, env_vec).rgb * max(spec.a-diffuse.a-0.2, 0.0); 
+			col = mix(col.rgb, textureCube(environmentMap, env_vec).rgb, 
+				max(spec.a-diffuse.a*2.0, 0.0)); 
 		}
 			
 		col = atmosLighting(col);