zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix depth calculations for R_DoomLightingEquation and make it an exact match of what zdoom does

This commit is contained in:
Magnus Norddahl 2016-07-23 16:30:28 +02:00 committed by Christoph Oelckers
parent 2cdc77de34
commit c08fc8f5a8
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
wadsrc/static/shaders/glsl/main.fp
View File

@ -117,34 +117,35 @@ vec4 getTexel(vec2 st)
//=========================================================================== //===========================================================================
// //
// Doom lighting equation ripped from EDGE. // Doom lighting equation exactly as calculated by zdoom.
// Big thanks to EDGE developers for making the only port
// that actually replicates software renderer's lighting in OpenGL.
// Float version.
// Basically replace int with float and divide all constants by 31.
// //
//=========================================================================== //===========================================================================
float R_DoomLightingEquation(float light)
float R_DoomLightingEquation(float light, float dist)
{ {
// Changing this constant gives results very similar to changing r_visibility. // Calculated from r_visibility. It differs between walls, floor and sprites.
// Default is 232, it seems to give exactly the same light bands as software renderer. //
#define DOOMLIGHTFACTOR 232.0 // Wall: globVis = r_WallVisibility
// Floor: r_FloorVisibility / abs(plane.Zat0 - ViewPos.Z)
// Sprite: same as wall
// All are calculated in R_SetVisibility and seem to be decided by the
// aspect ratio amongst other things.
//
// 1706 is the value for walls on 1080p 16:9 displays.
float globVis = 1706.0;
/* L in the range 0 to 63 */ /* L is the integer light level used in the game */
float L = light * 63.0/31.0; float L = light * 255.0;
float min_L = clamp(36.0/31.0 - L, 0.03, 1.0); /* z is the depth in view/eye space, positive going into the screen */
float z = pixelpos.w;
// Fix objects getting totally black when close. /* The zdoom light equation */
if (dist < 0.0001) float vis = globVis / z;
dist = 0.0001; float shade = 64.0 - (L + 12) * 32.0/128.0;
float lightscale = clamp((shade - min(24.0, vis)) / 32.0, 0.0, 31/32.0);
float scale = 1.0 / dist; // Result is the normalized colormap index (0 bright .. 1 dark)
float index = (59.0/31.0 - L) - (scale * DOOMLIGHTFACTOR/31.0 - DOOMLIGHTFACTOR/31.0); return lightscale;
/* result is colormap index (0 bright .. 31 dark) */
return clamp(index, min_L, 1.0);
} }
//=========================================================================== //===========================================================================
@ -167,7 +168,7 @@ vec4 getLightColor(float fogdist, float fogfactor)
if (uLightLevel >= 0.0) if (uLightLevel >= 0.0)
{ {
float newlightlevel = 1.0 - R_DoomLightingEquation(uLightLevel, gl_FragCoord.z); float newlightlevel = 1.0 - R_DoomLightingEquation(uLightLevel);
color.rgb *= newlightlevel; color.rgb *= newlightlevel;
} }
else if (uFogEnabled > 0) else if (uFogEnabled > 0)