livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-11330 

Put back atten for non-ALM lighting that accounts for inverted lin atten setup of yore.
meow-7.2.2
Graham Linden 2019-05-30 15:58:51 -07:00
parent 9118cafb22
commit f7bff299f1
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/app_settings/shaders/class1/lighting/lightFuncV.glsl
View File

@ -38,27 +38,20 @@ float calcPointLightOrSpotLight(vec3 v, vec3 n, vec4 lp, vec3 ln, float la, floa
vec3 lv = lp.xyz-v;
//get distance
float dist = length(lv);
if (dist > la)
{
return 0;
}
float d = length(lv);
//normalize light vector
lv = normalize(lv);
fa += 1.0;
float dist_atten = min(1.0 - (dist-1.0*(1.0 - fa))/fa, 1.0);
float da = max(dot(n, lv), 0.0);
lv *= 1.0/d;
//distance attenuation
float da = clamp(1.0/(la * d), 0.0, 1.0);
// spotlight coefficient.
float spot = max(dot(-ln, lv), is_pointlight);
da *= spot*spot; // GL_SPOT_EXPONENT=2
//angular attenuation
da *= dist_atten;
da *= calcDirectionalLight(n, lv);
return da;
}