diff --git a/Quake/gl_rmain.c b/Quake/gl_rmain.c index e9cee614..87015240 100644 --- a/Quake/gl_rmain.c +++ b/Quake/gl_rmain.c @@ -34,9 +34,8 @@ int r_framecount; // used for dlight push checking mplane_t frustum[4]; //johnfitz -- rendering statistics -int rs_brushpolys, rs_aliaspolys, rs_skypolys, rs_particles, rs_fogpolys; +int rs_brushpolys, rs_aliaspolys, rs_skypolys; int rs_dynamiclightmaps, rs_brushpasses, rs_aliaspasses, rs_skypasses; -float rs_megatexels; // // view origin @@ -1043,7 +1042,7 @@ void R_RenderView (void) time1 = Sys_DoubleTime (); //johnfitz -- rendering statistics - rs_brushpolys = rs_aliaspolys = rs_skypolys = rs_particles = rs_fogpolys = rs_megatexels = + rs_brushpolys = rs_aliaspolys = rs_skypolys = rs_dynamiclightmaps = rs_aliaspasses = rs_skypasses = rs_brushpasses = 0; } else if (gl_finish.value) @@ -1093,12 +1092,12 @@ void R_RenderView (void) time2 = Sys_DoubleTime (); if (r_pos.value) Con_Printf ("x %i y %i z %i (pitch %i yaw %i roll %i)\n", - (int)cl_entities[cl.viewentity].origin[0], - (int)cl_entities[cl.viewentity].origin[1], - (int)cl_entities[cl.viewentity].origin[2], - (int)cl.viewangles[PITCH], - (int)cl.viewangles[YAW], - (int)cl.viewangles[ROLL]); + (int)cl_entities[cl.viewentity].origin[0], + (int)cl_entities[cl.viewentity].origin[1], + (int)cl_entities[cl.viewentity].origin[2], + (int)cl.viewangles[PITCH], + (int)cl.viewangles[YAW], + (int)cl.viewangles[ROLL]); else if (r_speeds.value == 2) Con_Printf ("%3i ms %4i/%4i wpoly %4i/%4i epoly %3i lmap %4i/%4i sky %1.1f mtex\n", (int)((time2-time1)*1000), diff --git a/Quake/glquake.h b/Quake/glquake.h index 495311c1..efe9e0e2 100644 --- a/Quake/glquake.h +++ b/Quake/glquake.h @@ -263,9 +263,8 @@ extern qboolean gl_texture_env_combine; extern qboolean gl_texture_env_add; // for GL_EXT_texture_env_add //johnfitz -- rendering statistics -extern int rs_brushpolys, rs_aliaspolys, rs_skypolys, rs_particles, rs_fogpolys; +extern int rs_brushpolys, rs_aliaspolys, rs_skypolys; extern int rs_dynamiclightmaps, rs_brushpasses, rs_aliaspasses, rs_skypasses; -extern float rs_megatexels; //johnfitz -- track developer statistics that vary every frame extern cvar_t devstats; diff --git a/Quake/r_part.c b/Quake/r_part.c index a72c4d5b..94204856 100644 --- a/Quake/r_part.c +++ b/Quake/r_part.c @@ -575,7 +575,9 @@ void R_TeleportSplash (vec3_t org) vec3_t dir; for (i=-16 ; i<16 ; i+=4) + { for (j=-16 ; j<16 ; j+=4) + { for (k=-24 ; k<32 ; k+=4) { if (!free_particles) @@ -601,6 +603,8 @@ void R_TeleportSplash (vec3_t org) vel = 50 + (rand()&63); VectorScale (dir, vel, p->vel); } + } + } } /* @@ -890,8 +894,6 @@ void R_DrawParticles (void) glTexCoord2f (0,0.5); VectorMA (p->org, scale, right, p_right); glVertex3fv (p_right); - - rs_particles++; //johnfitz //FIXME: just use r_numparticles } glEnd (); } @@ -931,8 +933,6 @@ void R_DrawParticles (void) glTexCoord2f (0,1); VectorMA (p->org, scale, right, p_right); glVertex3fv (p_right); - - rs_particles++; //johnfitz //FIXME: just use r_numparticles } glEnd (); }