ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2025-03-04 15:21:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

OpenGL2: Oops, set lightmap alpha to 1.

Browse source
This commit is contained in:
SmileTheory 2014-02-14 03:31:54 -08:00
parent 7a23bb1c59
commit 78f8100d74
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/renderergl2/tr_bsp.c
View file

@ -386,7 +386,7 @@ static void R_LoadLightmaps( lump_t *l, lump_t *surfs ) {
{ {
if (hdrLightmap) if (hdrLightmap)
{ {
float color[3]; vec4_t color;
#if 0 // HDRFILE_RGBE #if 0 // HDRFILE_RGBE
float exponent = exp2(buf_p[j*4+3] - 128); float exponent = exp2(buf_p[j*4+3] - 128);
@ -401,6 +401,8 @@ static void R_LoadLightmaps( lump_t *l, lump_t *surfs ) {
color[1] = LittleFloat(color[1]); color[1] = LittleFloat(color[1]);
color[2] = LittleFloat(color[2]); color[2] = LittleFloat(color[2]);
#endif #endif
color[3] = 1.0f;
R_ColorShiftLightingFloats(color, color, 1.0f/255.0f); R_ColorShiftLightingFloats(color, color, 1.0f/255.0f);
if (glRefConfig.textureFloat && glRefConfig.halfFloatPixel && r_floatLightmap->integer) if (glRefConfig.textureFloat && glRefConfig.halfFloatPixel && r_floatLightmap->integer)
@ -410,7 +412,7 @@ static void R_LoadLightmaps( lump_t *l, lump_t *surfs ) {
} }
else if (glRefConfig.textureFloat && glRefConfig.halfFloatPixel && r_floatLightmap->integer) else if (glRefConfig.textureFloat && glRefConfig.halfFloatPixel && r_floatLightmap->integer)
{ {
float color[3]; vec4_t color;
//hack: convert LDR lightmap to HDR one //hack: convert LDR lightmap to HDR one
color[0] = MAX(buf_p[j*3+0], 0.499f); color[0] = MAX(buf_p[j*3+0], 0.499f);
@ -426,6 +428,7 @@ static void R_LoadLightmaps( lump_t *l, lump_t *surfs ) {
color[1] = avg; color[1] = avg;
color[2] = avg; color[2] = avg;
} }
color[3] = 1.0f;
R_ColorShiftLightingFloats(color, color, 1.0f/255.0f); R_ColorShiftLightingFloats(color, color, 1.0f/255.0f);