From 720db9ede3f19c2977d1967d858959f5a024b6d8 Mon Sep 17 00:00:00 2001 From: havoc Date: Tue, 4 Sep 2007 20:27:36 +0000 Subject: [PATCH] made r_view.showdebug affect more r_show* features git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7560 d7cf8633-e32d-0410-b094-e92efae38249 --- gl_rmain.c | 4 ++-- r_shadow.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gl_rmain.c b/gl_rmain.c index d1f96ffb..7e5c6eac 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -5450,10 +5450,10 @@ void R_DrawWorldSurfaces(qboolean skysurfaces, qboolean writedepth, qboolean dep r_refdef.stats.entities_triangles += counttriangles; RSurf_CleanUp(); - if (r_showcollisionbrushes.integer && !skysurfaces && !depthonly) + if (r_showcollisionbrushes.integer && r_view.showdebug && !skysurfaces && !depthonly) R_DrawCollisionBrushes(r_refdef.worldentity); - if ((r_showtris.integer || r_shownormals.integer) && !depthonly) + if ((r_showtris.integer || r_shownormals.integer) && r_view.showdebug && !depthonly) R_DrawTrianglesAndNormals(r_refdef.worldentity, r_showtris.integer, r_shownormals.integer, flagsmask); } diff --git a/r_shadow.c b/r_shadow.c index dad808ba..afdd9bbb 100644 --- a/r_shadow.c +++ b/r_shadow.c @@ -2936,7 +2936,7 @@ void R_DrawRTLight(rtlight_t *rtlight, qboolean visible) // count this light in the r_speeds r_refdef.stats.lights++; - if (r_showshadowvolumes.integer && numsurfaces + numshadowentities + numshadowentities_noselfshadow && rtlight->shadow && (rtlight->isstatic ? r_refdef.rtworldshadows : r_refdef.rtdlightshadows)) + if (r_showshadowvolumes.integer && r_view.showdebug && numsurfaces + numshadowentities + numshadowentities_noselfshadow && rtlight->shadow && (rtlight->isstatic ? r_refdef.rtworldshadows : r_refdef.rtdlightshadows)) { // optionally draw visible shape of the shadow volumes // for performance analysis by level designers @@ -2967,7 +2967,7 @@ void R_DrawRTLight(rtlight_t *rtlight, qboolean visible) // optionally draw the illuminated areas // for performance analysis by level designers - if (r_showlighting.integer) + if (r_showlighting.integer && r_view.showdebug) { R_Shadow_RenderMode_VisibleLighting(!r_showdisabledepthtest.integer, false); for (i = 0;i < numlightentities_noselfshadow;i++) @@ -2990,7 +2990,7 @@ void R_DrawRTLight(rtlight_t *rtlight, qboolean visible) // optionally draw the illuminated areas // for performance analysis by level designers - if (r_showlighting.integer) + if (r_showlighting.integer && r_view.showdebug) { R_Shadow_RenderMode_VisibleLighting(!r_showdisabledepthtest.integer, false); if (numsurfaces) @@ -3015,7 +3015,7 @@ void R_DrawRTLight(rtlight_t *rtlight, qboolean visible) // optionally draw the illuminated areas // for performance analysis by level designers - if (r_showlighting.integer) + if (r_showlighting.integer && r_view.showdebug) { R_Shadow_RenderMode_VisibleLighting(false, false); if (numsurfaces) -- 2.39.2