rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-25 05:31:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

IOQ3 commit 2378

Browse source
This commit is contained in:
Richard Allen 2012-12-12 20:13:40 +00:00
parent a65193e64a
commit bfc5094b2e
2 changed files with 40 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
reaction/code/rend2/glsl/lightall_fp.glsl
View file

@ -300,28 +300,54 @@ void main()
#elif defined(USE_LIGHT) #elif defined(USE_LIGHT)
worldLight = normalize(worldLight); worldLight = normalize(worldLight);
#if defined(USE_LIGHTMAP) || defined(USE_LIGHT_VERTEX)
#if defined(r_normalAmbient)
vec3 ambientLight = directedLight * r_normalAmbient;
directedLight -= ambientLight;
#else
vec3 ambientLight = vec3(0.0);
#endif
directedLight /= max(dot(surfNormal, worldLight), 0.004);
#endif
float NL = clamp(dot(worldNormal, worldLight), 0.0, 1.0);
float surfNL = clamp(dot(surfNormal, worldLight), 0.0, 1.0); float surfNL = clamp(dot(surfNormal, worldLight), 0.0, 1.0);
NL = min(NL, surfNL * 2.0);
float NE = clamp(dot(worldNormal, SampleToView), 0.0, 1.0); #if defined(USE_LIGHTMAP) || defined(USE_LIGHT_VERTEX)
#if defined(USE_STANDARD_DELUXEMAP)
// Standard deluxe mapping treats the light sample as fully directed
// and doesn't compensate for light angle attenuation.
vec3 ambientLight = vec3(0.0);
#else
// Separate the light sample into directed and ambient parts.
//
// ambientMax - if the cosine of the angle between the surface
// normal and the light is below this value, the light
// is fully ambient.
// directedMax - if the cosine of the angle between the surface
// normal and the light is above this value, the light
// is fully directed.
const float ambientMax = 0.25;
const float directedMax = 0.5;
float directedScale = clamp((surfNL - ambientMax) / (directedMax - ambientMax), 0.0, 1.0);
// Scale the directed portion to compensate for the baked-in
// light angle attenuation.
directedScale /= max(surfNL, ambientMax);
#if defined(r_normalAmbient)
directedScale *= 1.0 - r_normalAmbient;
#endif
// Recover any unused light as ambient
vec3 ambientLight = directedLight;
directedLight *= directedScale;
ambientLight -= directedLight * surfNL;
#endif
#endif
float NL = clamp(dot(worldNormal, worldLight), 0.0, 1.0);
float NE = clamp(dot(worldNormal, SampleToView), 0.0, 1.0);
float fzero = u_MaterialInfo.x; float fzero = u_MaterialInfo.x;
float shininess = u_MaterialInfo.y; float shininess = u_MaterialInfo.y;
#if defined(USE_SPECULARMAP) #if defined(USE_SPECULARMAP)
vec4 specular = texture2D(u_SpecularMap, tex); vec4 specular = texture2D(u_SpecularMap, tex);
//specular.rgb = clamp(specular.rgb - diffuse.rgb, 0.0, 1.0); //specular.rgb = clamp(specular.rgb - diffuse.rgb, 0.0, 1.0);
shininess *= specular.a; shininess *= specular.a;
#endif #endif
float directedDiff = NL * CalcDiffuse(worldNormal, worldLight, SampleToView, NE, NL, fzero, shininess); float directedDiff = NL * CalcDiffuse(worldNormal, worldLight, SampleToView, NE, NL, fzero, shininess);
diffuse.rgb *= directedLight * directedDiff + ambientDiff * ambientLight; diffuse.rgb *= directedLight * directedDiff + ambientDiff * ambientLight;

10
reaction/code/rend2/tr_light.c
View file

@ -441,15 +441,7 @@ int R_LightDirForPoint( vec3_t point, vec3_t lightDir, vec3_t normal, world_t *w
Com_Memset(&ent, 0, sizeof(ent)); Com_Memset(&ent, 0, sizeof(ent));
VectorCopy( point, ent.e.origin ); VectorCopy( point, ent.e.origin );
R_SetupEntityLightingGrid( &ent, world ); R_SetupEntityLightingGrid( &ent, world );
VectorCopy(ent.lightDir, lightDir);
if ((DotProduct(ent.lightDir, ent.lightDir) < 0.9f) || (DotProduct(ent.lightDir, normal) < 0.1f))
{
VectorCopy(normal, lightDir);
}
else
{
VectorCopy(ent.lightDir, lightDir);
}
return qtrue; return qtrue;
} }