From a148474f42d83daba3d4a10538c6262de24ddaa9 Mon Sep 17 00:00:00 2001 From: havoc Date: Tue, 3 May 2005 05:06:41 +0000 Subject: [PATCH 1/1] added developer_texturelogging R_MarkEntities now updates r_refdef.worldentity visframe as well (for more internal consistency) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5214 d7cf8633-e32d-0410-b094-e92efae38249 --- gl_rmain.c | 5 +++++ image.c | 2 ++ render.h | 2 ++ 3 files changed, 9 insertions(+) diff --git a/gl_rmain.c b/gl_rmain.c index d82504eb..f46df916 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -103,6 +103,9 @@ cvar_t r_bloom_intensity = {CVAR_SAVE, "r_bloom_intensity", "2"}; cvar_t r_bloom_blur = {CVAR_SAVE, "r_bloom_blur", "8"}; cvar_t r_bloom_resolution = {CVAR_SAVE, "r_bloom_resolution", "320"}; cvar_t r_bloom_power = {CVAR_SAVE, "r_bloom_power", "4"}; + +cvar_t developer_texturelogging = {0, "developer_texturelogging", "1"}; + rtexturepool_t *r_main_texturepool; rtexture_t *r_bloom_texture_screen; rtexture_t *r_bloom_texture_bloom; @@ -383,6 +386,7 @@ void GL_Main_Init(void) Cvar_RegisterVariable(&r_bloom_blur); Cvar_RegisterVariable(&r_bloom_resolution); Cvar_RegisterVariable(&r_bloom_power); + Cvar_RegisterVariable(&developer_texturelogging); if (gamemode == GAME_NEHAHRA || gamemode == GAME_NEXUIZ || gamemode == GAME_TENEBRAE) Cvar_SetValue("r_fullbrights", 0); R_RegisterModule("GL_Main", gl_main_start, gl_main_shutdown, gl_main_newmap); @@ -542,6 +546,7 @@ static void R_MarkEntities (void) if (!r_drawentities.integer) return; + r_refdef.worldentity->visframe = r_framecount; renderimask = envmap ? (RENDER_EXTERIORMODEL | RENDER_VIEWMODEL) : (chase_active.integer ? 0 : RENDER_EXTERIORMODEL); if (r_refdef.worldmodel && r_refdef.worldmodel->brush.BoxTouchingVisibleLeafs) { diff --git a/image.c b/image.c index 185c66d3..745aac10 100644 --- a/image.c +++ b/image.c @@ -690,6 +690,8 @@ qbyte *loadimagepixels (const char *filename, qboolean complain, int matchwidth, char basename[MAX_QPATH], name[MAX_QPATH], *c; if (developer_memorydebug.integer) Mem_CheckSentinelsGlobal(); + if (developer_texturelogging.integer) + Log_Printf("textures.log", "%s\n", filename); Image_StripImageExtension(filename, basename); // strip filename extensions to allow replacement by other types // replace *'s with #, so commandline utils don't get confused when dealing with the external files for (c = basename;*c;c++) diff --git a/render.h b/render.h index 48c0360f..92992f85 100644 --- a/render.h +++ b/render.h @@ -76,6 +76,8 @@ extern cvar_t r_lerpmodels; extern cvar_t r_waterscroll; extern cvar_t r_watershader; +extern cvar_t developer_texturelogging; + // useful functions for rendering void R_ModulateColors(float *in, float *out, int verts, float r, float g, float b); void R_FillColors(float *out, int verts, float r, float g, float b, float a); -- 2.39.2