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

diff --git a/gl_rmain.c b/gl_rmain.c
index d82504eb829f9448095c48d79b22a9721c3189a3..f46df91638a6d3f15d0e8b6227ee548e2e7d6b1d 100644 (file)
--- 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 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;
 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(&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);
        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;
 
        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)
        {
        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 185c66d360732d772053180d35344fc60c8b50e4..745aac100106482b53c0742ab6e24a01f6c2058b 100644 (file)
--- 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();
        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++)
        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 48c0360fe31941e90c6d49e4fe8d3b92a37dda6e..92992f8538f1f1b0d4653ed9a6ae9c5992601519 100644 (file)
--- 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 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);
 // 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);