faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Changed when light contributions are not taken into account. Increased FPS.

Browse Source
This commit is contained in:
Faerbit 2015-03-21 20:55:21 +01:00
parent 78972a87bf
commit 2a2e89d445
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
data/shader/phong.fsh
View File

@ -209,7 +209,14 @@ void main()
float distance = length(lightDirection); float distance = length(lightDirection);
float pointVisibility = 1.0f; float pointVisibility = 1.0f;
// only take lights into account with meaningful contribution // only take lights into account with meaningful contribution
if (distance < farPlane) { float intensity = 0.0f;
if (isFlame[i] == true) {
intensity = clamp(exp(-(1/(lightIntensities[i] + flickerFunction(i)))*distance), 0.0, 1.0);
}
else {
intensity = clamp(exp(-(1/lightIntensities[i])*distance), 0.0, 1.0);
}
if (intensity > 0.005) {
if (i == 0 && i<maxShadowRenderCount) { if (i == 0 && i<maxShadowRenderCount) {
pointVisibility = samplePointShadow(shadowMap_cube0, lightDirection); pointVisibility = samplePointShadow(shadowMap_cube0, lightDirection);
} }
@ -241,13 +248,6 @@ void main()
pointVisibility = samplePointShadow(shadowMap_cube9, lightDirection); pointVisibility = samplePointShadow(shadowMap_cube9, lightDirection);
} }
vec3 lightVector = normalize(lightSources[i]-vec3(fragPosition)); vec3 lightVector = normalize(lightSources[i]-vec3(fragPosition));
float intensity = 0.0f;
if (isFlame[i] == true) {
intensity = clamp(exp(-(1/(lightIntensities[i] + flickerFunction(i)))*distance), 0.0, 1.0);
}
else {
intensity = clamp(exp(-(1/lightIntensities[i])*distance), 0.0, 1.0);
}
diffuseColor += clamp(dot(normalize(vNormal), lightVector) diffuseColor += clamp(dot(normalize(vNormal), lightVector)
*diffuseFactor*intensity*lightColors[i]*pointVisibility, 0.0, 1.0); *diffuseFactor*intensity*lightColors[i]*pointVisibility, 0.0, 1.0);
vec3 cameraVector = normalize(camera - vec3(fragPosition)); vec3 cameraVector = normalize(camera - vec3(fragPosition));