From 370e648ae1409cb6fd5102dda29f122fdd9789aa Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 4 Feb 2005 10:30:36 +0000
Subject: [PATCH] realtime dlights are now overridden by gl_flashblend (as was
intended)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4999 d7cf8633-e32d-0410-b094-e92efae38249
---
gl_rmain.c | 6 +++---
r_light.c | 2 +-
render.h | 1 +
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/gl_rmain.c b/gl_rmain.c
index b127b381..ccf6be3f 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -313,7 +313,7 @@ static float R_FarClip(vec3_t origin, vec3_t direction, vec_t startfarclip)
R_FarClip_Box(r_refdef.worldmodel->normalmins, r_refdef.worldmodel->normalmaxs);
for (i = 0;i < r_refdef.numentities;i++)
R_FarClip_Box(r_refdef.entities[i]->mins, r_refdef.entities[i]->maxs);
-
+
return r_farclip_meshfarclip - r_farclip_directiondist;
}
@@ -739,7 +739,7 @@ void R_RenderView(void)
GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1);
r_rtworld = r_shadow_realtime_world.integer;
r_rtworldshadows = r_shadow_realtime_world_shadows.integer && gl_stencil;
- r_rtdlight = r_shadow_realtime_world.integer || r_shadow_realtime_dlight.integer;
+ r_rtdlight = (r_shadow_realtime_world.integer || r_shadow_realtime_dlight.integer) && !gl_flashblend.integer;
r_rtdlightshadows = r_rtdlight && (r_rtworld ? r_shadow_realtime_world_dlightshadows.integer : r_shadow_realtime_dlight_shadows.integer) && gl_stencil;
r_lightmapintensity = r_rtworld ? r_shadow_realtime_world_lightmaps.value : 1;
@@ -765,7 +765,7 @@ void R_RenderView(void)
R_BlendView();
R_TimeReport("blendview");
-
+
GL_Scissor(0, 0, vid.realwidth, vid.realheight);
GL_ScissorTest(false);
}
diff --git a/r_light.c b/r_light.c
index 0dc8bee0..c431a86b 100644
--- a/r_light.c
+++ b/r_light.c
@@ -29,7 +29,7 @@ int r_numdlights = 0;
cvar_t r_modellights = {CVAR_SAVE, "r_modellights", "4"};
cvar_t r_vismarklights = {0, "r_vismarklights", "1"};
cvar_t r_coronas = {CVAR_SAVE, "r_coronas", "1"};
-cvar_t gl_flashblend = {CVAR_SAVE, "gl_flashblend", "1"};
+cvar_t gl_flashblend = {CVAR_SAVE, "gl_flashblend", "0"};
static rtexture_t *lightcorona;
static rtexturepool_t *lighttexturepool;
diff --git a/render.h b/render.h
index e9cd43bb..46cc4e69 100644
--- a/render.h
+++ b/render.h
@@ -56,6 +56,7 @@ extern char r_speeds_string[1024];
// lighting stuff
extern cvar_t r_ambient;
+extern cvar_t gl_flashblend;
// vis stuff
extern cvar_t r_novis;
--
2.39.5