X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_rmain.c;h=f11072eb68f8b08172ad354c7dd510e7c50c0c52;hp=9a4d9333b47289422e30e2d9bcca1562e1d4cd72;hb=be8d986d89e9ac7408134d9570ec398e535536e8;hpb=d7035ef4229a2462ad59a67160494593fbd8f2e0

diff --git a/gl_rmain.c b/gl_rmain.c
index 9a4d9333..f11072eb 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-entity_t	r_worldentity;
-
 qboolean	r_cache_thrash;		// compatability
 
 vec3_t		modelorg, r_entorigin;
@@ -34,7 +32,7 @@ mplane_t	frustum[4];
 
 int			c_brush_polys, c_alias_polys, c_light_polys, c_faces, c_nodes, c_leafs, c_models, c_bmodels, c_sprites, c_particles, c_dlights;
 
-qboolean	envmap;				// true during envmap command capture 
+qboolean	envmap;				// true during envmap command capture
 
 // LordHavoc: moved all code related to particles into r_part.c
 //int			particletexture;	// little dot for particles
@@ -60,59 +58,60 @@ mleaf_t		*r_viewleaf, *r_oldviewleaf;
 
 unsigned short	d_lightstylevalue[256];	// 8.8 fraction of base light value
 
-
 void R_MarkLeaves (void);
 
-//cvar_t	r_norefresh = {"r_norefresh","0"};
-cvar_t	r_drawentities = {"r_drawentities","1"};
-cvar_t	r_drawviewmodel = {"r_drawviewmodel","1"};
-cvar_t	r_speeds = {"r_speeds","0"};
-cvar_t	r_speeds2 = {"r_speeds2","0"};
-cvar_t	r_fullbright = {"r_fullbright","0"};
-//cvar_t	r_lightmap = {"r_lightmap","0"};
-cvar_t	r_wateralpha = {"r_wateralpha","1"};
-cvar_t	r_dynamic = {"r_dynamic","1"};
-cvar_t	r_waterripple = {"r_waterripple","0"};
-cvar_t	r_fullbrights = {"r_fullbrights", "1"};
-
-cvar_t	contrast = {"contrast", "1.0", true}; // LordHavoc: a method of operating system independent color correction
-cvar_t	brightness = {"brightness", "1.0", true}; // LordHavoc: a method of operating system independent color correction
-cvar_t	gl_lightmode = {"gl_lightmode", "1", true}; // LordHavoc: overbright lighting
-//cvar_t	r_dynamicbothsides = {"r_dynamicbothsides", "1"}; // LordHavoc: can disable dynamic lighting of backfaces, but quake maps are weird so it doesn't always work right...
-cvar_t	r_farclip = {"r_farclip", "6144"};
-
-cvar_t	gl_fogenable = {"gl_fogenable", "0"};
-cvar_t	gl_fogdensity = {"gl_fogdensity", "0.25"};
-cvar_t	gl_fogred = {"gl_fogred","0.3"};
-cvar_t	gl_foggreen = {"gl_foggreen","0.3"};
-cvar_t	gl_fogblue = {"gl_fogblue","0.3"};
-cvar_t	gl_fogstart = {"gl_fogstart", "0"};
-cvar_t	gl_fogend = {"gl_fogend","0"};
-cvar_t	glfog = {"glfog", "0"};
+//cvar_t	r_norefresh = {0, "r_norefresh","0"};
+cvar_t	r_drawentities = {0, "r_drawentities","1"};
+cvar_t	r_drawviewmodel = {0, "r_drawviewmodel","1"};
+cvar_t	r_speeds = {0, "r_speeds","0"};
+cvar_t	r_speeds2 = {0, "r_speeds2","0"};
+cvar_t	r_fullbright = {0, "r_fullbright","0"};
+//cvar_t	r_lightmap = {0, "r_lightmap","0"};
+cvar_t	r_wateralpha = {CVAR_SAVE, "r_wateralpha","1"};
+cvar_t	r_dynamic = {CVAR_SAVE, "r_dynamic","1"};
+cvar_t	r_waterripple = {CVAR_SAVE, "r_waterripple","0"};
+cvar_t	r_fullbrights = {CVAR_SAVE, "r_fullbrights", "1"};
+
+cvar_t	gl_lightmode = {CVAR_SAVE, "gl_lightmode", "1"}; // LordHavoc: overbright lighting
+//cvar_t	r_dynamicbothsides = {CVAR_SAVE, "r_dynamicbothsides", "1"}; // LordHavoc: can disable dynamic lighting of backfaces, but quake maps are weird so it doesn't always work right...
+cvar_t	r_farclip = {0, "r_farclip", "6144"}; // FIXME: make this go away (calculate based on farthest visible object/polygon)
+
+cvar_t	gl_fogenable = {0, "gl_fogenable", "0"};
+cvar_t	gl_fogdensity = {0, "gl_fogdensity", "0.25"};
+cvar_t	gl_fogred = {0, "gl_fogred","0.3"};
+cvar_t	gl_foggreen = {0, "gl_foggreen","0.3"};
+cvar_t	gl_fogblue = {0, "gl_fogblue","0.3"};
+cvar_t	gl_fogstart = {0, "gl_fogstart", "0"};
+cvar_t	gl_fogend = {0, "gl_fogend","0"};
+cvar_t	glfog = {0, "glfog", "0"};
+
+cvar_t	r_ser = {CVAR_SAVE, "r_ser", "1"};
 
+/*
 int R_VisibleCullBox (vec3_t mins, vec3_t maxs)
 {
 	int sides;
 	mnode_t *nodestack[8192], *node;
 	int stack = 0;
 
-	if (R_CullBox(mins, maxs))
-		return true;
-
 	node = cl.worldmodel->nodes;
 loc0:
 	if (node->contents < 0)
 	{
 		if (((mleaf_t *)node)->visframe == r_framecount)
+		{
+			if (R_CullBox(mins, maxs))
+				return true;
 			return false;
+		}
 		if (!stack)
 			return true;
 		node = nodestack[--stack];
 		goto loc0;
 	}
-	
+
 	sides = BOX_ON_PLANE_SIDE(mins, maxs, node->plane);
-	
+
 // recurse down the contacted sides
 	if (sides & 1)
 	{
@@ -133,6 +132,7 @@ loc0:
 	node = node->children[1];
 	goto loc0;
 }
+*/
 
 qboolean lighthalf;
 
@@ -141,7 +141,7 @@ vec_t fogdensity;
 float fog_density, fog_red, fog_green, fog_blue;
 qboolean fogenabled;
 qboolean oldgl_fogenable;
-void FOG_framebegin()
+void FOG_framebegin(void)
 {
 	if (nehahra)
 	{
@@ -217,13 +217,13 @@ void FOG_framebegin()
 	}
 }
 
-void FOG_frameend()
+void FOG_frameend(void)
 {
 	if (glfog.value)
 		glDisable(GL_FOG);
 }
 
-void FOG_clear()
+void FOG_clear(void)
 {
 	if (nehahra)
 	{
@@ -236,7 +236,7 @@ void FOG_clear()
 	fog_density = fog_red = fog_green = fog_blue = 0.0f;
 }
 
-void FOG_registercvars()
+void FOG_registercvars(void)
 {
 	Cvar_RegisterVariable (&glfog);
 	if (nehahra)
@@ -244,65 +244,68 @@ void FOG_registercvars()
 		Cvar_RegisterVariable (&gl_fogenable);
 		Cvar_RegisterVariable (&gl_fogdensity);
 		Cvar_RegisterVariable (&gl_fogred);
-		Cvar_RegisterVariable (&gl_foggreen); 
+		Cvar_RegisterVariable (&gl_foggreen);
 		Cvar_RegisterVariable (&gl_fogblue);
 		Cvar_RegisterVariable (&gl_fogstart);
 		Cvar_RegisterVariable (&gl_fogend);
 	}
 }
 
-void gl_main_start()
+void gl_main_start(void)
 {
 }
 
-void gl_main_shutdown()
+void gl_main_shutdown(void)
 {
 }
 
-void gl_main_newmap()
+void gl_main_newmap(void)
 {
 }
 
-void GL_Main_Init()
+void GL_Main_Init(void)
 {
 	FOG_registercvars();
 	Cvar_RegisterVariable (&r_drawentities);
 	Cvar_RegisterVariable (&r_drawviewmodel);
 	Cvar_RegisterVariable (&r_speeds);
 	Cvar_RegisterVariable (&r_speeds2);
-	Cvar_RegisterVariable (&contrast);
-	Cvar_RegisterVariable (&brightness);
 	Cvar_RegisterVariable (&gl_lightmode);
 //	Cvar_RegisterVariable (&r_dynamicwater);
 //	Cvar_RegisterVariable (&r_dynamicbothsides);
 	Cvar_RegisterVariable (&r_fullbrights);
 	Cvar_RegisterVariable (&r_wateralpha);
 	Cvar_RegisterVariable (&r_dynamic);
-	Cvar_RegisterVariable (&r_waterripple); // LordHavoc: added waterripple
+	Cvar_RegisterVariable (&r_waterripple);
+	Cvar_RegisterVariable (&r_farclip);
 	if (nehahra)
 		Cvar_SetValue("r_fullbrights", 0);
 //	if (gl_vendor && strstr(gl_vendor, "3Dfx"))
 //		gl_lightmode.value = 0;
 	Cvar_RegisterVariable (&r_fullbright);
+	Cvar_RegisterVariable (&r_ser);
 	R_RegisterModule("GL_Main", gl_main_start, gl_main_shutdown, gl_main_newmap);
 }
 
-extern void GL_Draw_Init();
-extern void GL_Main_Init();
-extern void GL_Models_Init();
-extern void GL_Poly_Init();
-extern void GL_Surf_Init();
-extern void GL_Screen_Init();
-extern void GL_Misc_Init();
-extern void R_Crosshairs_Init();
-extern void R_Light_Init();
-extern void R_Particles_Init();
-extern void R_Explosion_Init();
-extern void CL_Effects_Init();
-
-void Render_Init()
+extern void GL_Draw_Init(void);
+extern void GL_Main_Init(void);
+extern void GL_Models_Init(void);
+extern void GL_Poly_Init(void);
+extern void GL_Surf_Init(void);
+extern void GL_Screen_Init(void);
+extern void GL_Misc_Init(void);
+extern void R_Crosshairs_Init(void);
+extern void R_Light_Init(void);
+extern void R_Particles_Init(void);
+extern void R_Explosion_Init(void);
+extern void CL_Effects_Init(void);
+extern void R_Clip_Init(void);
+extern void ui_init(void);
+
+void Render_Init(void)
 {
 	R_Modules_Shutdown();
+	R_Clip_Init();
 	GL_Draw_Init();
 	GL_Main_Init();
 	GL_Models_Init();
@@ -316,6 +319,7 @@ void Render_Init()
 	R_Explosion_Init();
 	CL_Effects_Init();
 	R_Decals_Init();
+	ui_init();
 	R_Modules_Start();
 }
 
@@ -351,8 +355,6 @@ void GL_Init (void)
 	glAlphaFunc(GL_GREATER, 0.5);
 
 //	glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
-
-	Palette_Init();
 }
 
 
@@ -377,9 +379,6 @@ float	modelalpha;
 
 //==================================================================================
 
-void R_DrawBrushModel (entity_t *e);
-void R_DrawSpriteModel (entity_t *e, frameblend_t *blend);
-
 void R_LerpUpdate(entity_t *ent)
 {
 	int frame;
@@ -438,21 +437,71 @@ void R_PrepareEntities (void)
 			ent->render.flags -= RENDER_VIEWMODEL;
 			// transform origin
 			VectorCopy(ent->render.origin, v);
-			ent->render.origin[0] = v[0] * vpn[0] + v[1] * vright[0] + v[2] * vup[0] + r_refdef.vieworg[0];
-			ent->render.origin[1] = v[0] * vpn[1] + v[1] * vright[1] + v[2] * vup[1] + r_refdef.vieworg[1];
-			ent->render.origin[2] = v[0] * vpn[2] + v[1] * vright[2] + v[2] * vup[2] + r_refdef.vieworg[2];
+			ent->render.origin[0] = v[0] * vpn[0] + v[1] * vright[0] + v[2] * vup[0] + r_origin[0];
+			ent->render.origin[1] = v[0] * vpn[1] + v[1] * vright[1] + v[2] * vup[1] + r_origin[1];
+			ent->render.origin[2] = v[0] * vpn[2] + v[1] * vright[2] + v[2] * vup[2] + r_origin[2];
 			// adjust angles
 			VectorAdd(ent->render.angles, r_refdef.viewangles, ent->render.angles);
 		}
 	}
 }
 
+void R_Entity_Callback(void *data, void *junk)
+{
+	((entity_t *)data)->render.visframe = r_framecount;
+}
+
+void R_AddModelEntities (void)
+{
+	int		i;
+	vec3_t	mins, maxs;
+	frameblend_t blend[4];
+
+	if (!r_drawentities.value)
+		return;
+
+	for (i = 0;i < cl_numvisedicts;i++)
+	{
+		currententity = cl_visedicts[i];
+		if (currententity->render.model->type == mod_brush)
+		{
+			modelalpha = currententity->render.alpha;
+			R_DrawBrushModel (currententity);
+		}
+		else if (currententity->render.model->type == mod_alias)
+		{
+			VectorAdd(currententity->render.origin, currententity->render.model->mins, mins);
+			VectorAdd(currententity->render.origin, currententity->render.model->maxs, maxs);
+			if (r_ser.value)
+				R_Clip_AddBox(mins, maxs, R_Entity_Callback, currententity, NULL);
+			else if (R_NotCulledBox(mins, maxs))
+				currententity->render.visframe = r_framecount;
+		}
+		else if (currententity->render.model->type == mod_sprite)
+		{
+			R_LerpUpdate(currententity);
+			if (r_ser.value)
+			{
+				R_LerpAnimation(currententity->render.model, currententity->render.frame1, currententity->render.frame2, currententity->render.frame1start, currententity->render.frame2start, currententity->render.framelerp, blend);
+				R_ClipSprite(currententity, blend);
+			}
+			else
+			{
+				VectorAdd(currententity->render.origin, currententity->render.model->mins, mins);
+				VectorAdd(currententity->render.origin, currententity->render.model->maxs, maxs);
+				if (R_NotCulledBox(mins, maxs))
+					currententity->render.visframe = r_framecount;
+			}
+		}
+	}
+}
+
 /*
 =============
 R_DrawEntitiesOnList
 =============
 */
-// LordHavoc: split so bmodels are rendered before any other objects
+/*
 void R_DrawEntitiesOnList1 (void)
 {
 	int		i;
@@ -462,6 +511,8 @@ void R_DrawEntitiesOnList1 (void)
 
 	for (i = 0;i < cl_numvisedicts;i++)
 	{
+		if (cl_visedicts[i]->render.visframe != r_framecount)
+			continue;
 		if (cl_visedicts[i]->render.model->type != mod_brush)
 			continue;
 		currententity = cl_visedicts[i];
@@ -470,37 +521,55 @@ void R_DrawEntitiesOnList1 (void)
 		R_DrawBrushModel (currententity);
 	}
 }
+*/
 
-void R_DrawEntitiesOnList2 (void)
+void R_DrawModels (void)
 {
 	int		i;
 	frameblend_t blend[4];
+//	vec3_t	mins, maxs;
 
 	if (!r_drawentities.value)
 		return;
 
 	for (i = 0;i < cl_numvisedicts;i++)
 	{
+		if (cl_visedicts[i]->render.visframe != r_framecount)
+			continue;
 		currententity = cl_visedicts[i];
+		if (currententity->render.model->type != mod_alias && currententity->render.model->type != mod_sprite)
+			continue;
+
 		modelalpha = currententity->render.alpha;
 
-		switch (currententity->render.model->type)
+		if (currententity->render.model->type == mod_alias)
 		{
-		case mod_alias:
+			// only lerp models here because sprites were already lerped for their clip polygon
 			R_LerpUpdate(currententity);
 			R_LerpAnimation(currententity->render.model, currententity->render.frame1, currententity->render.frame2, currententity->render.frame1start, currententity->render.frame2start, currententity->render.framelerp, blend);
 			R_DrawAliasModel (currententity, true, modelalpha, currententity->render.model, blend, currententity->render.skinnum, currententity->render.origin, currententity->render.angles, currententity->render.scale, currententity->render.effects, currententity->render.model->flags, currententity->render.colormap);
-			break;
-
-		case mod_sprite:
-			R_LerpUpdate(currententity);
+		}
+		else //if (currententity->render.model->type == mod_sprite)
+		{
+			// build blend array
 			R_LerpAnimation(currententity->render.model, currententity->render.frame1, currententity->render.frame2, currententity->render.frame1start, currententity->render.frame2start, currententity->render.framelerp, blend);
 			R_DrawSpriteModel (currententity, blend);
-			break;
+		}
+
+		/*
+		VectorAdd(cl_visedicts[i]->render.origin, cl_visedicts[i]->render.model->mins, mins);
+		VectorAdd(cl_visedicts[i]->render.origin, cl_visedicts[i]->render.model->maxs, maxs);
 
-		default:
+		switch (cl_visedicts[i]->render.model->type)
+		{
+		case mod_alias:
+			R_Clip_AddBox(mins, maxs, R_DrawModelCallback, cl_visedicts[i], NULL);
+			break;
+		case mod_sprite:
+			R_Clip_AddBox(mins, maxs, R_DrawSpriteCallback, cl_visedicts[i], NULL);
 			break;
 		}
+		*/
 	}
 }
 
@@ -539,7 +608,11 @@ void R_SetFrustum (void)
 {
 	int		i;
 
-	if (r_refdef.fov_x == 90) 
+	// LordHavoc: note to all quake engine coders, this code was making the
+	// view frustum taller than it should have been (it assumed the view is
+	// square; it is not square), so I disabled it
+	/*
+	if (r_refdef.fov_x == 90)
 	{
 		// front side is visible
 
@@ -551,6 +624,7 @@ void R_SetFrustum (void)
 	}
 	else
 	{
+	*/
 		// rotate VPN right by FOV_X/2 degrees
 		RotatePointAroundVector( frustum[0].normal, vup, vpn, -(90-r_refdef.fov_x / 2 ) );
 		// rotate VPN left by FOV_X/2 degrees
@@ -559,14 +633,14 @@ void R_SetFrustum (void)
 		RotatePointAroundVector( frustum[2].normal, vright, vpn, 90-r_refdef.fov_y / 2 );
 		// rotate VPN down by FOV_X/2 degrees
 		RotatePointAroundVector( frustum[3].normal, vright, vpn, -( 90 - r_refdef.fov_y / 2 ) );
-	}
+	//}
 
 	for (i=0 ; i<4 ; i++)
 	{
 		frustum[i].type = PLANE_ANYZ;
 		frustum[i].dist = DotProduct (r_origin, frustum[i].normal);
 //		frustum[i].signbits = SignbitsForPlane (&frustum[i]);
-		BoxOnPlaneSideClassify(&frustum[i]);
+		PlaneClassify(&frustum[i]);
 	}
 }
 
@@ -587,8 +661,6 @@ void R_SetupFrame (void)
 		Cvar_Set ("r_ambient", "0");
 	}
 
-	R_AnimateLight ();
-
 	r_framecount++;
 
 // build the transformation matrix for the given view angles
@@ -616,6 +688,8 @@ void R_SetupFrame (void)
 	c_sprites = 0;
 	c_particles = 0;
 //	c_dlights = 0;
+
+	R_AnimateLight ();
 }
 
 
@@ -633,8 +707,6 @@ void MYgluPerspective( GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble
 }
 
 
-extern char skyname[];
-
 /*
 =============
 R_SetupGL
@@ -643,7 +715,6 @@ R_SetupGL
 void R_SetupGL (void)
 {
 	float	screenaspect;
-	extern	int glwidth, glheight;
 	int		x, x2, y2, y, w, h;
 
 	if (!r_render.value)
@@ -680,10 +751,7 @@ void R_SetupGL (void)
 	glViewport (glx + x, gly + y2, w, h);
     screenaspect = (float)r_refdef.vrect.width/r_refdef.vrect.height;
 //	yfov = 2*atan((float)r_refdef.vrect.height/r_refdef.vrect.width)*180/M_PI;
-//	if (skyname[0]) // skybox enabled?
-//		MYgluPerspective (r_refdef.fov_y,  screenaspect,  4,  r_skyboxsize.value*1.732050807569 + 256); // this is size*sqrt(3) + 256
-//	else
-		MYgluPerspective (r_refdef.fov_y,  screenaspect,  4,  r_farclip.value);
+	MYgluPerspective (r_refdef.fov_y,  screenaspect,  4,  r_farclip.value);
 
 	glCullFace(GL_FRONT);
 
@@ -733,7 +801,7 @@ void R_Clear (void)
 }
 
 // LordHavoc: my trick to *FIX* GLQuake lighting once and for all :)
-void GL_Brighten()
+void GL_Brighten(void)
 {
 	if (!r_render.value)
 		return;
@@ -760,14 +828,14 @@ void GL_Brighten()
 	glEnable (GL_CULL_FACE);
 }
 
-extern cvar_t contrast;
-extern cvar_t brightness;
-extern cvar_t gl_lightmode;
-
-void GL_BlendView()
+void GL_BlendView(void)
 {
 	if (!r_render.value)
 		return;
+
+	if (v_blend[3] < 0.01f)
+		return;
+
 	glMatrixMode(GL_PROJECTION);
     glLoadIdentity ();
 	glOrtho  (0, vid.width, vid.height, 0, -99999, 99999);
@@ -777,27 +845,16 @@ void GL_BlendView()
 	glDisable (GL_CULL_FACE);
 	glDisable(GL_TEXTURE_2D);
 	glEnable(GL_BLEND);
-	if (lighthalf)
-	{
-		glBlendFunc (GL_DST_COLOR, GL_ONE);
-		glBegin (GL_TRIANGLES);
-		glColor3f (1, 1, 1);
-		glVertex2f (-5000, -5000);
-		glVertex2f (10000, -5000);
-		glVertex2f (-5000, 10000);
-		glEnd ();
-	}
 	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	contrast.value = bound(0.2, contrast.value, 1.0);
-	if (/*gl_polyblend.value && */v_blend[3])
-	{
-		glBegin (GL_TRIANGLES);
+	glBegin (GL_TRIANGLES);
+	if (lighthalf)
+		glColor4f (v_blend[0] * 0.5f, v_blend[1] * 0.5f, v_blend[2] * 0.5f, v_blend[3]);
+	else
 		glColor4fv (v_blend);
-		glVertex2f (-5000, -5000);
-		glVertex2f (10000, -5000);
-		glVertex2f (-5000, 10000);
-		glEnd ();
-	}
+	glVertex2f (-5000, -5000);
+	glVertex2f (10000, -5000);
+	glVertex2f (-5000, 10000);
+	glEnd ();
 
 	glEnable (GL_CULL_FACE);
 	glEnable (GL_DEPTH_TEST);
@@ -805,16 +862,6 @@ void GL_BlendView()
 	glEnable(GL_TEXTURE_2D);
 }
 
-#define TIMEREPORT(VAR) \
-	if (r_speeds2.value)\
-	{\
-		temptime = currtime;\
-		currtime = Sys_FloatTime();\
-		VAR = (int) ((currtime - temptime) * 1000000.0);\
-	}\
-	else\
-		VAR = 0;
-
 /*
 ================
 R_RenderView
@@ -822,38 +869,90 @@ R_RenderView
 r_refdef must be set before the first call
 ================
 */
-extern qboolean intimerefresh;
-extern void R_Sky();
-extern void UploadLightmaps();
-char r_speeds2_string1[81], r_speeds2_string2[81], r_speeds2_string3[81], r_speeds2_string4[81], r_speeds2_string5[81], r_speeds2_string6[81], r_speeds2_string7[81];
+extern void R_Sky(void);
+extern void UploadLightmaps(void);
+extern void R_DrawSurfaces(void);
+extern void R_DrawPortals(void);
+char r_speeds2_string[1024];
+int speedstringcount;
+
+void timestring(int t, char *desc)
+{
+	char tempbuf[256];
+	int length;
+	if (t < 1000000)
+		sprintf(tempbuf, " %6ius %s", t, desc);
+	else
+		sprintf(tempbuf, " %6ims %s", t / 1000, desc);
+	length = strlen(tempbuf);
+//	while (length < 20)
+//		tempbuf[length++] = ' ';
+//	tempbuf[length] = 0;
+	if (speedstringcount + length > 80)
+	{
+		strcat(r_speeds2_string, "\n");
+		speedstringcount = 0;
+	}
+	// skip the space at the beginning if it's the first on the line
+	if (speedstringcount == 0)
+	{
+		strcat(r_speeds2_string, tempbuf + 1);
+		speedstringcount = length - 1;
+	}
+	else
+	{
+		strcat(r_speeds2_string, tempbuf);
+		speedstringcount += length;
+	}
+}
+
+#define TIMEREPORT(NAME) \
+	if (r_speeds2.value)\
+	{\
+		temptime = currtime;\
+		currtime = Sys_DoubleTime();\
+		timestring((int) ((currtime - temptime) * 1000000.0), NAME);\
+	}
+
 void R_RenderView (void)
 {
 	double starttime, currtime, temptime;
-	int time_clear, time_setup, time_world, time_bmodels, time_upload, time_sky, time_wall, time_models, time_moveparticles, time_drawparticles, time_moveexplosions, time_drawexplosions, time_drawdecals, time_transpoly, time_blend, time_total;
 //	if (r_norefresh.value)
 //		return;
 
-	if (!r_worldentity.render.model || !cl.worldmodel)
+	if (!cl.worldmodel)
 		Host_Error ("R_RenderView: NULL worldmodel");
 
-	lighthalf = gl_lightmode.value;
-
-	FOG_framebegin();
-
 	if (r_speeds2.value)
 	{
-		starttime = currtime = Sys_FloatTime();
+		starttime = currtime = Sys_DoubleTime();
+
+		speedstringcount = 0;
+		sprintf(r_speeds2_string, "org:'%c%6.2f %c%6.2f %c%6.2f' ang:'%c%3.0f %c%3.0f %c%3.0f' dir:'%c%2.3f %c%2.3f %c%2.3f'\n%6i walls %6i dlitwalls %7i modeltris %7i transpoly\nBSP: %6i faces %6i nodes %6i leafs\n%4i models %4i bmodels %4i sprites %5i particles %3i dlights\n",
+			r_origin[0] < 0 ? '-' : ' ', fabs(r_origin[0]), r_origin[1] < 0 ? '-' : ' ', fabs(r_origin[1]), r_origin[2] < 0 ? '-' : ' ', fabs(r_origin[2]), r_refdef.viewangles[0] < 0 ? '-' : ' ', fabs(r_refdef.viewangles[0]), r_refdef.viewangles[1] < 0 ? '-' : ' ', fabs(r_refdef.viewangles[1]), r_refdef.viewangles[2] < 0 ? '-' : ' ', fabs(r_refdef.viewangles[2]), vpn[0] < 0 ? '-' : ' ', fabs(vpn[0]), vpn[1] < 0 ? '-' : ' ', fabs(vpn[1]), vpn[2] < 0 ? '-' : ' ', fabs(vpn[2]),
+			c_brush_polys, c_light_polys, c_alias_polys, currenttranspoly,
+			c_faces, c_nodes, c_leafs,
+			c_models, c_bmodels, c_sprites, c_particles, c_dlights);
 	}
 	else
 		starttime = currtime = 0;
+
+	R_MoveParticles ();
+	R_MoveExplosions();
+
+	lighthalf = gl_lightmode.value;
+
+	FOG_framebegin();
+
 	R_Clear();
-	TIMEREPORT(time_clear)
+	TIMEREPORT("clear     ")
 
 	// render normal view
 
 	R_SetupFrame ();
 	R_SetFrustum ();
 	R_SetupGL ();
+	R_Clip_StartFrame();
 
 	R_PrepareEntities();
 
@@ -861,60 +960,62 @@ void R_RenderView (void)
 	wallpolyclear();
 	transpolyclear();
 
-	TIMEREPORT(time_setup)
+	TIMEREPORT("setup     ")
 
 	R_DrawWorld ();
-	TIMEREPORT(time_world)
-	R_DrawEntitiesOnList1 (); // BSP models
-	TIMEREPORT(time_bmodels)
+	TIMEREPORT("world     ")
+
+	R_AddModelEntities();
+	TIMEREPORT("addmodels")
+
+	R_Clip_EndFrame();
+	TIMEREPORT("scanedge  ")
+
+	// now mark the lit surfaces
+	R_PushDlights ();
+	// yes this does add the world surfaces after the brush models
+	R_DrawSurfaces ();
+	R_DrawPortals ();
+	TIMEREPORT("surfaces  ");
 
 	UploadLightmaps();
-	TIMEREPORT(time_upload)
+	TIMEREPORT("uploadlmap")
 
-	skypolyrender(); // fogged sky polys, affects depth
+	// fogged sky polys, affects depth
+	skypolyrender();
 
-	if (skyname[0] && currentskypoly && !fogenabled)
-		R_Sky(); // does not affect depth, draws over the sky polys
-	TIMEREPORT(time_sky)
+	// does not affect depth, draws over the sky polys
+	if (currentskypoly)
+		R_Sky();
+	TIMEREPORT("skypoly   ")
 
 	wallpolyrender();
-	TIMEREPORT(time_wall)
+	TIMEREPORT("wallpoly  ")
 
 	GL_DrawDecals();
-	TIMEREPORT(time_drawdecals)
+	TIMEREPORT("ddecal    ")
 
+	// don't let sound skip if going slow
 	if (!intimerefresh && !r_speeds2.value)
-		S_ExtraUpdate ();	// don't let sound get messed up if going slow
+		S_ExtraUpdate ();
 
-	R_DrawEntitiesOnList2 (); // other models
-//	R_RenderDlights ();
 	R_DrawViewModel ();
-	TIMEREPORT(time_models)
-	R_MoveParticles ();
-	TIMEREPORT(time_moveparticles)
+	R_DrawModels ();
+	TIMEREPORT("models    ")
+
 	R_DrawParticles ();
-	TIMEREPORT(time_drawparticles)
-	R_MoveExplosions();
-	TIMEREPORT(time_moveexplosions)
+	TIMEREPORT("dparticles")
 	R_DrawExplosions();
-	TIMEREPORT(time_drawexplosions)
+	TIMEREPORT("dexplosion")
 
 	transpolyrender();
-	TIMEREPORT(time_transpoly)
+	TIMEREPORT("transpoly ")
 
 	FOG_frameend();
 
 	GL_BlendView();
-	TIMEREPORT(time_blend)
+	TIMEREPORT("blend     ")
+
 	if (r_speeds2.value)
-	{
-		time_total = (int) ((Sys_FloatTime() - starttime) * 1000000.0);
-		sprintf(r_speeds2_string1, "%6i walls %6i dlitwalls %7i modeltris %7i transpoly\n", c_brush_polys, c_light_polys, c_alias_polys, currenttranspoly);
-		sprintf(r_speeds2_string2, "BSP: %6i faces %6i nodes %6i leafs\n", c_faces, c_nodes, c_leafs);
-		sprintf(r_speeds2_string3, "%4i models %4i bmodels %4i sprites %5i particles %3i dlights\n", c_models, c_bmodels, c_sprites, c_particles, c_dlights);
-		sprintf(r_speeds2_string4, "%6ius clear  %6ius setup  %6ius world  %6ius bmodel %6ius upload", time_clear, time_setup, time_world, time_bmodels, time_upload);
-		sprintf(r_speeds2_string5, "%6ius sky    %6ius wall   %6ius models %6ius mpart  %6ius dpart ", time_sky, time_wall, time_models, time_moveparticles, time_drawparticles);
-		sprintf(r_speeds2_string6, "%6ius mexplo %6ius dexplo %6ius decals %6ius trans  %6ius blend ", time_moveexplosions, time_drawexplosions, time_drawdecals, time_transpoly, time_blend);
-		sprintf(r_speeds2_string7, "%6ius permdl %6ius total ", time_models / max(c_models, 1), time_total);
-	}
+		timestring((int) ((Sys_DoubleTime() - starttime) * 1000000.0), "total    ");
 }