From 78f8100d745b22b1ed2363ae4384e2d315136986 Mon Sep 17 00:00:00 2001 From: SmileTheory Date: Fri, 14 Feb 2014 03:31:54 -0800 Subject: [PATCH] OpenGL2: Oops, set lightmap alpha to 1. --- code/renderergl2/tr_bsp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/renderergl2/tr_bsp.c b/code/renderergl2/tr_bsp.c index c335ea5a..a4f47cb8 100644 --- a/code/renderergl2/tr_bsp.c +++ b/code/renderergl2/tr_bsp.c @@ -386,7 +386,7 @@ static void R_LoadLightmaps( lump_t *l, lump_t *surfs ) { { if (hdrLightmap) { - float color[3]; + vec4_t color; #if 0 // HDRFILE_RGBE 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[2] = LittleFloat(color[2]); #endif + color[3] = 1.0f; + R_ColorShiftLightingFloats(color, color, 1.0f/255.0f); 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) { - float color[3]; + vec4_t color; //hack: convert LDR lightmap to HDR one 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[2] = avg; } + color[3] = 1.0f; R_ColorShiftLightingFloats(color, color, 1.0f/255.0f);