From e779ed3e51e7171d93367661bffd70953d0127cd Mon Sep 17 00:00:00 2001 From: havoc Date: Sat, 11 Aug 2007 10:07:25 +0000 Subject: [PATCH] fix brightness of fullbright entities in r_glsl 1 mode by using a 128 grey texture instead of white as the fake lightmap for the batch git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7517 d7cf8633-e32d-0410-b094-e92efae38249 --- gl_rmain.c | 9 ++++++++- render.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gl_rmain.c b/gl_rmain.c index 48ded80f..a2b836fa 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -143,6 +143,7 @@ svbsp_t r_svbsp; rtexture_t *r_texture_blanknormalmap; rtexture_t *r_texture_white; +rtexture_t *r_texture_grey128; rtexture_t *r_texture_black; rtexture_t *r_texture_notexture; rtexture_t *r_texture_whitecube; @@ -235,6 +236,11 @@ static void R_BuildBlankTextures(void) data[2] = 255; data[3] = 255; r_texture_white = R_LoadTexture2D(r_main_texturepool, "blankwhite", 1, 1, data, TEXTYPE_RGBA, TEXF_PRECACHE, NULL); + data[0] = 128; + data[1] = 128; + data[2] = 128; + data[3] = 255; + r_texture_grey128 = R_LoadTexture2D(r_main_texturepool, "blankgrey128", 1, 1, data, TEXTYPE_RGBA, TEXF_PRECACHE, NULL); data[0] = 0; data[1] = 0; data[2] = 0; @@ -1479,6 +1485,7 @@ void gl_main_shutdown(void) R_FreeTexturePool(&r_main_texturepool); r_texture_blanknormalmap = NULL; r_texture_white = NULL; + r_texture_grey128 = NULL; r_texture_black = NULL; r_texture_whitecube = NULL; r_texture_normalizationcube = NULL; @@ -4676,7 +4683,7 @@ static void R_DrawTextureSurfaceList_GL20(int texturenumsurfaces, msurface_t **t GL_Color(rsurface.texture->currentlayers[0].color[0], rsurface.texture->currentlayers[0].color[1], rsurface.texture->currentlayers[0].color[2], rsurface.texture->currentlayers[0].color[3]); if (rsurface.texture->currentmaterialflags & MATERIALFLAG_FULLBRIGHT) { - R_Mesh_TexBind(7, R_GetTexture(r_texture_white)); + R_Mesh_TexBind(7, R_GetTexture(r_texture_grey128)); if (r_glsl_permutation->loc_Texture_Deluxemap >= 0) R_Mesh_TexBind(8, R_GetTexture(r_texture_blanknormalmap)); R_Mesh_ColorPointer(NULL, 0, 0); diff --git a/render.h b/render.h index b933881d..889ed640 100644 --- a/render.h +++ b/render.h @@ -175,6 +175,7 @@ extern cvar_t r_test; extern rtexture_t *r_texture_blanknormalmap; extern rtexture_t *r_texture_white; +extern rtexture_t *r_texture_grey128; extern rtexture_t *r_texture_black; extern rtexture_t *r_texture_notexture; extern rtexture_t *r_texture_whitecube; -- 2.39.2