OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

remove special texture creation for fullscreen colormaps.

Browse source 
On GL 3.x+ this isn't needed at all and on older hardware it causes performance issues, in particular with hires textures due to impossibility of precaching.
In addition it forces some really awkward handling of lighting for things that have their own color, like stenciled sprites or particles.

With this special case gone it will be possible to handle this case in a saner manner than it is right now.

As compensation for older hardware a fullscreen blend will be drawn over the entire screen. This won't be 100% accurate but it's preferable to keeping the current method.
This commit is contained in:
Christoph Oelckers 2014-05-11 14:46:37 +02:00
commit f3a9cb0cfa
3 changed files with 153 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/gl/renderer/gl_lightdata.cpp
View file

@ -275,22 +275,27 @@ void gl_GetLightColor(int lightlevel, int rellight, const FColormap * cm, float
float & r=*pred,& g=*pgreen,& b=*pblue;
int torch=0;
if (gl_fixedcolormap)
if (gl_fixedcolormap)
{
if (gl_fixedcolormap==CM_LITE)
if (!gl_enhanced_nightvision || !gl.hasGLSL())
{
if (gl_enhanced_nightvision) r=0.375f, g=1.0f, b=0.375f;
else r=g=b=1.0f;
// we cannot multiply the light in here without causing major problems with the ThingColor so for older hardware
// these maps are done as a postprocessing overlay.
r = g = b = 1.0f;
}
else if (gl_fixedcolormap>=CM_TORCH)
else if (gl_fixedcolormap == CM_LITE)
{
int flicker=gl_fixedcolormap-CM_TORCH;
r=(0.8f+(7-flicker)/70.0f);
if (r>1.0f) r=1.0f;
b=g=r;
if (gl_enhanced_nightvision) b*=0.75f;
r = 0.375f, g = 1.0f, b = 0.375f;
}
else r=g=b=1.0f;
else if (gl_fixedcolormap >= CM_TORCH)
{
int flicker = gl_fixedcolormap - CM_TORCH;
r = (0.8f + (7 - flicker) / 70.0f);
if (r > 1.0f) r = 1.0f;
g = r;
b = g * 0.75f;
}
else r = g = b = 1.0f;
return;
}