mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 06:23:53 +00:00
Code Issues Releases Wiki Activity

Tidy up the mess I made of lighting.glsl a bit by removing two single-line functions that are only ever called in one location.

Browse source
This commit is contained in:
AnyOldName3 2017-09-21 02:03:53 +01:00
parent 26ecf2088b
commit e33bec97be
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
files/shaders/lighting.glsl
View file

@ -1,15 +1,5 @@
#define MAX_LIGHTS 8
vec3 lightAmbient(int lightIndex, vec3 ambient)
{
return ambient * gl_LightSource[lightIndex].ambient.xyz;
}
vec3 lightDiffuse(int lightIndex, vec4 diffuse, vec3 viewNormal, vec3 lightDir)
{
return diffuse.xyz * gl_LightSource[lightIndex].diffuse.xyz * max(dot(viewNormal.xyz, lightDir), 0.0);
}
void perLight(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec3 viewPos, vec3 viewNormal, vec4 diffuse, vec3 ambient)
{
vec3 lightDir;
@ -20,8 +10,8 @@ void perLight(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec3 vie
lightDir = normalize(lightDir);
float illumination = clamp(1.0 / (gl_LightSource[lightIndex].constantAttenuation + gl_LightSource[lightIndex].linearAttenuation * lightDistance + gl_LightSource[lightIndex].quadraticAttenuation * lightDistance * lightDistance), 0.0, 1.0);
ambientOut = lightAmbient(lightIndex, ambient) * illumination;
diffuseOut = lightDiffuse(lightIndex, diffuse, viewNormal, lightDir) * illumination;
ambientOut = ambient * gl_LightSource[lightIndex].ambient.xyz * illumination;
diffuseOut = diffuse.xyz * gl_LightSource[lightIndex].diffuse.xyz * max(dot(viewNormal.xyz, lightDir), 0.0) * illumination;
}
#ifdef FRAGMENT