diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-06-13 18:13:30 -0500 | 
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-06-13 18:13:30 -0500 | 
| commit | 8d67ad3d86cbc57631c4b56926ff9a0ea5b82897 (patch) | |
| tree | fb237b131c6b33bc10f784ce3531088d6bb00314 /indra/newview/app_settings/shaders/class2/windlight | |
| parent | 7b28a9a541464ece86e6d09fe7a85f307a710ddb (diff) | |
NORSPEC-261 No more magic numbers, parity between forward and deferred rendering WRT to windlight and legacy shininess.
Reviewed by Graham (a little bit).
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/windlight')
| -rwxr-xr-x | indra/newview/app_settings/shaders/class2/windlight/atmosphericsV.glsl | 7 | 
1 files changed, 3 insertions, 4 deletions
| diff --git a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsV.glsl b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsV.glsl index 8fd06c7e2f..d174805cc0 100755 --- a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsV.glsl +++ b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsV.glsl @@ -54,7 +54,6 @@ uniform float density_multiplier;  uniform float distance_multiplier;  uniform float max_y;  uniform vec4 glow; -uniform float global_gamma;  void calcAtmospherics(vec3 inPositionEye) { @@ -132,9 +131,9 @@ void calcAtmospherics(vec3 inPositionEye) {  		  + tmpAmbient)));  	//brightness of surface both sunlight and ambient -	setSunlitColor(pow(vec3(sunlight * .5), vec3(global_gamma)) * global_gamma); -	setAmblitColor(pow(vec3(tmpAmbient * .25), vec3(global_gamma)) * global_gamma); -	setAdditiveColor(pow(getAdditiveColor() * vec3(1.0 - temp1), vec3(global_gamma)) * global_gamma); +	setSunlitColor(vec3(sunlight * .5)); +	setAmblitColor(vec3(tmpAmbient * .25)); +	setAdditiveColor(getAdditiveColor() * vec3(1.0 - temp1));  	// vary_SunlitColor = vec3(0);  	// vary_AmblitColor = vec3(0); | 
