OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- route all glColor calls through render state.

Browse source 
- add sector links to dynamic lights.
This commit is contained in:
Christoph Oelckers 2014-05-11 22:57:42 +02:00
commit c47c7421a3
19 changed files with 160 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -72,22 +72,6 @@ CVAR(Bool, gl_brightfog, false, CVAR_ARCHIVE);
//==========================================================================
//
//
//
//==========================================================================
bool gl_BrightmapsActive()
{
return gl.hasGLSL();
}
bool gl_GlowActive()
{
return gl.hasGLSL();
}
//==========================================================================
//
// Sets up the fog tables
@ -337,7 +321,7 @@ void gl_SetColor(int light, int rellight, const FColormap * cm, float alpha, boo
gl_GetLightColor(light, rellight, cm, &r, &g, &b, weapon);
gl_RenderState.SetColor(r, g, b, alpha);
gl_RenderState.SetColor(r, g, b, alpha, cm->desaturation);
if (glset.lightmode == 8)
{
if (gl_fixedcolormap)
@ -518,15 +502,9 @@ bool gl_CheckFog(sector_t *frontsector, sector_t *backsector)
void gl_SetShaderLight(float level, float olight)
{
#if 1 //ndef _DEBUG
const float MAXDIST = 256.f;
const float THRESHOLD = 96.f;
const float FACTOR = 0.75f;
#else
const float MAXDIST = 256.f;
const float THRESHOLD = 96.f;
const float FACTOR = 2.75f;
#endif
if (level > 0)
{
@ -606,9 +584,6 @@ void gl_SetFog(int lightlevel, int rellight, const FColormap *cmap, bool isaddit
{
fogcolor=0;
}
// Handle desaturation
if (cmap->colormap != CM_DEFAULT)
gl_ModifyColor(fogcolor.r, fogcolor.g, fogcolor.b, cmap->colormap);
gl_RenderState.EnableFog(true);
gl_RenderState.SetFog(fogcolor, fogdensity);
@ -619,29 +594,6 @@ void gl_SetFog(int lightlevel, int rellight, const FColormap *cmap, bool isaddit
}
}
//==========================================================================
//
// Modifies a color according to a specified colormap
//
//==========================================================================
void gl_ModifyColor(BYTE & red, BYTE & green, BYTE & blue, int cm)
{
int gray = (red*77 + green*143 + blue*36)>>8;
if (cm >= CM_FIRSTSPECIALCOLORMAP && cm < CM_MAXCOLORMAP)
{
PalEntry pe = SpecialColormaps[cm - CM_FIRSTSPECIALCOLORMAP].GrayscaleToColor[gray];
red = pe.r;
green = pe.g;
blue = pe.b;
}
else if (cm >= CM_DESAT1 && cm <= CM_DESAT31)
{
gl_Desaturate(gray, red, green, blue, red, green, blue, cm - CM_DESAT0);
}
}
//==========================================================================
//