From af73e1c67074f97ba3d3e82d2c75bfd97561259a Mon Sep 17 00:00:00 2001 From: havoc Date: Fri, 12 Dec 2003 00:28:56 +0000 Subject: [PATCH] made sure EF_FULLBRIGHT works on everything (bmodels were broken) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3723 d7cf8633-e32d-0410-b094-e92efae38249 --- gl_rsurf.c | 14 ++++++++++++-- todo | 6 +++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/gl_rsurf.c b/gl_rsurf.c index 94622dc0..1f68253d 100644 --- a/gl_rsurf.c +++ b/gl_rsurf.c @@ -249,7 +249,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf) // set to full bright if no light data bl = intblocklights; - if ((ent->effects & EF_FULLBRIGHT) || !ent->model->brushq1.lightdata) + if (!ent->model->brushq1.lightdata) { for (i = 0;i < size3;i++) bl[i] = 255*256; @@ -337,7 +337,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf) // set to full bright if no light data bl = floatblocklights; - if ((ent->effects & EF_FULLBRIGHT) || !ent->model->brushq1.lightdata) + if (!ent->model->brushq1.lightdata) j = 255*256; else j = r_ambient.value * 512.0f; // would be 128.0f logically, but using 512.0f to match winquake style @@ -1232,6 +1232,16 @@ static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const texture_ } } } + else if (ent->effects & EF_FULLBRIGHT) + { + RSurfShader_OpaqueWall_Pass_BaseTexture(ent, texture, surfchain); + if (r_detailtextures.integer) + RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture, surfchain); + if (texture->skin.glow) + RSurfShader_OpaqueWall_Pass_Glow(ent, texture, surfchain); + if (fogenabled) + RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain); + } else if (r_shadow_realtime_world.integer) { // opaque base lighting diff --git a/todo b/todo index 426a4f7a..2376e73c 100644 --- a/todo +++ b/todo @@ -101,9 +101,9 @@ d darkplaces: fix key based turning being affected by slowmo - it should not be 0 darkplaces: make memory pools have a flag to print them as temporary pools (I.E. consider them leaks if anything is in them) (Vicious) 0 darkplaces: make server able to work without models, just for sake of completeness 0 darkplaces: make server queries use a queue to avoid flooding out queries too fast (Willis) -0 darkplaces: make sure EF_FULLBRIGHT works on bmodels (FrikaC) -0 darkplaces: make sure EF_FULLBRIGHT works on models (FrikaC) -0 darkplaces: make sure EF_FULLBRIGHT works on sprites (FrikaC) +-n darkplaces: make sure EF_FULLBRIGHT works on bmodels (FrikaC) +-n darkplaces: make sure EF_FULLBRIGHT works on models (FrikaC) +-n darkplaces: make sure EF_FULLBRIGHT works on sprites (FrikaC) 0 darkplaces: make sure PR_SetString points NULL strings at pr_strings (which would be an offset of 0) (Fuh) 0 darkplaces: make sure QuakeDoneQuick works (Chris Kemp) 0 darkplaces: make sure r_fullbright works -- 2.39.2