zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-14 00:20:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

- vWorldNormal is not normalized but R_DoomColormap requires this

Browse source
This commit is contained in:
Magnus Norddahl 2018-12-19 11:07:39 +01:00
parent 1a3df8dfba
commit bc648015c7
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
wadsrc/static/shaders/glsl/main.fp
View file

@ -122,12 +122,12 @@ vec4 getTexel(vec2 st)
// Vanilla Doom wall colormap equation // Vanilla Doom wall colormap equation
// //
//=========================================================================== //===========================================================================
float R_WallColormap(float lightnum, float z) float R_WallColormap(float lightnum, float z, vec3 normal)
{ {
// R_ScaleFromGlobalAngle calculation // R_ScaleFromGlobalAngle calculation
float projection = 160.0; // projection depends on SCREENBLOCKS!! 160 is the fullscreen value float projection = 160.0; // projection depends on SCREENBLOCKS!! 160 is the fullscreen value
vec2 line_v1 = pixelpos.xz; // in vanilla this is the first curline vertex vec2 line_v1 = pixelpos.xz; // in vanilla this is the first curline vertex
vec2 line_normal = vWorldNormal.xz; vec2 line_normal = normal.xz;
float texscale = projection * clamp(dot(normalize(uCameraPos.xz - line_v1), line_normal), 0.0, 1.0) / z; float texscale = projection * clamp(dot(normalize(uCameraPos.xz - line_v1), line_normal), 0.0, 1.0) / z;
float lightz = clamp(16.0 * texscale, 0.0, 47.0); float lightz = clamp(16.0 * texscale, 0.0, 47.0);
@ -174,7 +174,8 @@ float R_DoomColormap(float light, float z)
if (dot(vWorldNormal.xyz, vWorldNormal.xyz) > 0.5) if (dot(vWorldNormal.xyz, vWorldNormal.xyz) > 0.5)
{ {
return mix(R_WallColormap(lightnum, z), R_PlaneColormap(lightnum, z), abs(vWorldNormal.y)); vec3 normal = normalize(vWorldNormal.xyz);
return mix(R_WallColormap(lightnum, z, normal), R_PlaneColormap(lightnum, z), abs(normal.y));
} }
else // vWorldNormal is not set on sprites else // vWorldNormal is not set on sprites
{ {