From c66cadc05a7e92c78e0f454763fc9cda172a741e Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Sun, 22 Apr 2012 07:55:56 +0000 Subject: [PATCH] removed the envmap command which drew to front buffer. adjusted the timerefresh command not to draw to the front buffer. also made sure that there is an active connection when timerefresh is called. git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@660 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/gl_rmain.c | 5 +-- Quake/gl_rmisc.c | 91 +++++------------------------------------------- Quake/glquake.h | 2 -- 3 files changed, 10 insertions(+), 88 deletions(-) diff --git a/Quake/gl_rmain.c b/Quake/gl_rmain.c index 06d6e8b4..1168eb66 100644 --- a/Quake/gl_rmain.c +++ b/Quake/gl_rmain.c @@ -37,8 +37,6 @@ int rs_brushpolys, rs_aliaspolys, rs_skypolys, rs_particles, rs_fogpolys; int rs_dynamiclightmaps, rs_brushpasses, rs_aliaspasses, rs_skypasses; float rs_megatexels; -qboolean envmap; // true during envmap command capture - // // view origin // @@ -503,7 +501,7 @@ R_DrawViewModel -- johnfitz -- gutted */ void R_DrawViewModel (void) { - if (!r_drawviewmodel.value || !r_drawentities.value || chase_active.value || envmap) + if (!r_drawviewmodel.value || !r_drawentities.value || chase_active.value) return; if (cl.items & IT_INVISIBILITY || cl.stats[STAT_HEALTH] <= 0) @@ -677,7 +675,6 @@ void R_ShowTris (void) currententity = &cl.viewent; if (r_drawviewmodel.value && !chase_active.value - && !envmap && cl.stats[STAT_HEALTH] > 0 && !(cl.items & IT_INVISIBILITY) && currententity->model diff --git a/Quake/gl_rmisc.c b/Quake/gl_rmisc.c index dd56b3cd..84e8f491 100644 --- a/Quake/gl_rmisc.c +++ b/Quake/gl_rmisc.c @@ -108,80 +108,6 @@ static void R_NoLerpList_f (cvar_t *var) Mod_SetExtraFlags (cl.model_precache[i]); } -/* -=============== -R_Envmap_f - -Grab six views for environment mapping tests -=============== -*/ -void R_Envmap_f (void) -{ - byte buffer[256*256*4]; - refdef_t save_refdef; - - if (cls.state != ca_connected) - return; - - memcpy (&save_refdef, &r_refdef, sizeof(refdef_t)); - glDrawBuffer (GL_FRONT); - glReadBuffer (GL_FRONT); - envmap = true; - - r_refdef.vrect.x = 0; - r_refdef.vrect.y = 0; - r_refdef.vrect.width = 256; - r_refdef.vrect.height = 256; - - r_refdef.viewangles[0] = 0; - r_refdef.viewangles[1] = 0; - r_refdef.viewangles[2] = 0; - GL_BeginRendering (&glx, &gly, &glwidth, &glheight); - R_RenderView (); - glReadPixels (0, 0, 256, 256, GL_RGBA, GL_UNSIGNED_BYTE, buffer); - COM_WriteFile ("env0.rgb", buffer, sizeof(buffer)); - - r_refdef.viewangles[1] = 90; - GL_BeginRendering (&glx, &gly, &glwidth, &glheight); - R_RenderView (); - glReadPixels (0, 0, 256, 256, GL_RGBA, GL_UNSIGNED_BYTE, buffer); - COM_WriteFile ("env1.rgb", buffer, sizeof(buffer)); - - r_refdef.viewangles[1] = 180; - GL_BeginRendering (&glx, &gly, &glwidth, &glheight); - R_RenderView (); - glReadPixels (0, 0, 256, 256, GL_RGBA, GL_UNSIGNED_BYTE, buffer); - COM_WriteFile ("env2.rgb", buffer, sizeof(buffer)); - - r_refdef.viewangles[1] = 270; - GL_BeginRendering (&glx, &gly, &glwidth, &glheight); - R_RenderView (); - glReadPixels (0, 0, 256, 256, GL_RGBA, GL_UNSIGNED_BYTE, buffer); - COM_WriteFile ("env3.rgb", buffer, sizeof(buffer)); - - r_refdef.viewangles[0] = -90; - r_refdef.viewangles[1] = 0; - GL_BeginRendering (&glx, &gly, &glwidth, &glheight); - R_RenderView (); - glReadPixels (0, 0, 256, 256, GL_RGBA, GL_UNSIGNED_BYTE, buffer); - COM_WriteFile ("env4.rgb", buffer, sizeof(buffer)); - - r_refdef.viewangles[0] = 90; - r_refdef.viewangles[1] = 0; - GL_BeginRendering (&glx, &gly, &glwidth, &glheight); - R_RenderView (); - glReadPixels (0, 0, 256, 256, GL_RGBA, GL_UNSIGNED_BYTE, buffer); - COM_WriteFile ("env5.rgb", buffer, sizeof(buffer)); - - envmap = false; - glDrawBuffer (GL_BACK); - glReadBuffer (GL_BACK); - GL_EndRendering (); - - memcpy (&r_refdef, &save_refdef, sizeof(refdef_t)); - vid.recalc_refdef = 1; -} - /* =============== R_Init @@ -192,7 +118,6 @@ void R_Init (void) extern cvar_t gl_finish; Cmd_AddCommand ("timerefresh", R_TimeRefresh_f); - Cmd_AddCommand ("envmap", R_Envmap_f); Cmd_AddCommand ("pointfile", R_ReadPointFile_f); Cvar_RegisterVariable (&r_norefresh); @@ -367,26 +292,28 @@ For program optimization */ void R_TimeRefresh_f (void) { - int i; + int i; float start, stop, time; - glDrawBuffer (GL_FRONT); - glFinish (); + if (cls.state != ca_connected) + { + Con_Printf("Not connected to a server\n"); + return; + } start = Sys_DoubleTime (); - for (i=0 ; i<128 ; i++) + for (i = 0; i < 128; i++) { + GL_BeginRendering(&glx, &gly, &glwidth, &glheight); r_refdef.viewangles[1] = i/128.0*360.0; R_RenderView (); + GL_EndRendering (); } glFinish (); stop = Sys_DoubleTime (); time = stop-start; Con_Printf ("%f seconds (%f fps)\n", time, 128/time); - - glDrawBuffer (GL_BACK); - GL_EndRendering (); } void D_FlushCaches (void) diff --git a/Quake/glquake.h b/Quake/glquake.h index 6e542239..1dee3a89 100644 --- a/Quake/glquake.h +++ b/Quake/glquake.h @@ -121,8 +121,6 @@ extern refdef_t r_refdef; extern mleaf_t *r_viewleaf, *r_oldviewleaf; extern int d_lightstylevalue[256]; // 8.8 fraction of base light value -extern qboolean envmap; - extern cvar_t r_norefresh; extern cvar_t r_drawentities; extern cvar_t r_drawworld;