From bc6ba931a671562f6b44fb87e59f29403acaed4a Mon Sep 17 00:00:00 2001 From: havoc Date: Sun, 26 Sep 2004 13:11:04 +0000 Subject: [PATCH] r_fullbright 1 now works properly with r_shadow_realtime_world 1 (why anyone would want to do this? no idea) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4541 d7cf8633-e32d-0410-b094-e92efae38249 --- cl_main.c | 3 +++ gl_rsurf.c | 5 ++++- r_shadow.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cl_main.c b/cl_main.c index 88151231..307851ca 100644 --- a/cl_main.c +++ b/cl_main.c @@ -889,6 +889,9 @@ void CL_RelinkWorld(void) Matrix4x4_CreateIdentity(&ent->render.matrix); Matrix4x4_CreateIdentity(&ent->render.inversematrix); CL_BoundingBoxForEntity(&ent->render); + ent->render.flags = RENDER_SHADOW; + if (!r_fullbright.integer) + ent->render.flags |= RENDER_LIGHT; } static void CL_RelinkStaticEntities(void) diff --git a/gl_rsurf.c b/gl_rsurf.c index 06dd1dfb..9abcc652 100644 --- a/gl_rsurf.c +++ b/gl_rsurf.c @@ -1039,7 +1039,10 @@ static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent, GL_DepthTest(true); GL_BlendFunc(GL_ONE, GL_ZERO); m.tex[0] = R_GetTexture(texture->skin.base); - GL_Color(r_lightmapintensity, r_lightmapintensity, r_lightmapintensity, 1); + if (ent->flags & RENDER_LIGHT) + GL_Color(r_lightmapintensity, r_lightmapintensity, r_lightmapintensity, 1); + else + GL_Color(1, 1, 1, 1); while((surf = *surfchain++) != NULL) { if (surf->visframe == r_framecount) diff --git a/r_shadow.c b/r_shadow.c index 9ed419d5..22156eea 100644 --- a/r_shadow.c +++ b/r_shadow.c @@ -2171,7 +2171,7 @@ void R_DrawRTLight(rtlight_t *rtlight, int visiblevolumes) R_Shadow_Stage_Light(shadow && gl_stencil); ent = &cl_entities[0].render; - if (ent->model && ent->model->DrawLight) + if (ent->model && ent->model->DrawLight && (ent->flags & RENDER_LIGHT)) { Matrix4x4_Transform(&ent->inversematrix, rtlight->shadoworigin, relativelightorigin); Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, relativeeyeorigin); -- 2.39.2