Merge branch 'master' of https://github.com/supertuxkart/stk-code into lensflare

Keep lens flare updated with trunk
This commit is contained in:
samuncle
2014-11-08 01:51:40 +01:00
6 changed files with 76 additions and 17 deletions

View File

@@ -49,10 +49,10 @@ void main(void)
vec3 sampleDirection = reflect(-eyedir, normal);
sampleDirection = (InverseViewMatrix * vec4(sampleDirection, 0.)).xyz;
float specval = texture(ntex, uv).z;
float specval = pow(texture(ntex, uv).z, 2.);
// From http://graphics.cs.williams.edu/papers/EnvMipReport2013/
int texSize = textureSize(tex, 0).x;
float lodval = clamp(log2(texSize * sqrt(3)) - .5 * log2(specval + 1), 0., 10.);
float lodval = clamp(log2(texSize * sqrt(3.)) - .5 * log2(specval + 1.), 0., 10.);
vec4 specular = textureLod(tex, sampleDirection, lodval);
Spec = max(specular, vec4(0.));
}