X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=gl_rmain.c;h=f848defad3109e647fa9533251708d0c209c51ed;hb=45982a9894c5bff60ff494a0f82865ec267d52f7;hp=2303c5548d5f694c72daae7000305b2bfabb7744;hpb=e411cc7d14dad08cbbe27f5b3af86700f7eb5184;p=xonotic%2Fdarkplaces.git

diff --git a/gl_rmain.c b/gl_rmain.c
index 2303c554..f848defa 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -21,12 +21,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-entity_t	r_worldentity;
+//static qboolean	r_cache_thrash;		// compatability
 
-qboolean	r_cache_thrash;		// compatability
-
-vec3_t		modelorg, r_entorigin;
-entity_t	*currententity;
+vec3_t		modelorg;
+entity_render_t	*currentrenderentity;
 
 int			r_framecount;		// used for dlight push checking
 
@@ -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
@@ -48,8 +46,8 @@ vec3_t	vpn;
 vec3_t	vright;
 vec3_t	r_origin;
 
-float	r_world_matrix[16];
-float	r_base_world_matrix[16];
+//float	r_world_matrix[16];
+//float	r_base_world_matrix[16];
 
 //
 // screen size info
@@ -60,33 +58,33 @@ 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	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"};
+cvar_t	gl_viewmodeldepthhack = {0, "gl_viewmodeldepthhack", "1"};
 
 int R_VisibleCullBox (vec3_t mins, vec3_t maxs)
 {
@@ -108,9 +106,9 @@ loc0:
 		node = nodestack[--stack];
 		goto loc0;
 	}
-	
+
 	sides = BOX_ON_PLANE_SIDE(mins, maxs, node->plane);
-	
+
 // recurse down the contacted sides
 	if (sides & 1)
 	{
@@ -141,10 +139,8 @@ qboolean fogenabled;
 qboolean oldgl_fogenable;
 void FOG_framebegin(void)
 {
-	if (nehahra)
+	if (gamemode == GAME_NEHAHRA)
 	{
-//		if (!Nehahrademcompatibility)
-//			gl_fogenable.value = 0;
 		if (gl_fogenable.value)
 		{
 			oldgl_fogenable = true;
@@ -180,7 +176,7 @@ void FOG_framebegin(void)
 			return;
 		if(fog_density)
 		{
-			// LordHavoc: Borland C++ 5.0 was choking on this line, stupid compiler...
+			// LordHavoc: Borland C++ 5.0 was choking on this line...
 			//GLfloat colors[4] = {(GLfloat) gl_fogred.value, (GLfloat) gl_foggreen.value, (GLfloat) gl_fogblue.value, (GLfloat) 1};
 			GLfloat colors[4];
 			colors[0] = fog_red;
@@ -195,7 +191,7 @@ void FOG_framebegin(void)
 			}
 
 			glFogi (GL_FOG_MODE, GL_EXP2);
-			glFogf (GL_FOG_DENSITY, (GLfloat) fog_density / 100); 
+			glFogf (GL_FOG_DENSITY, (GLfloat) fog_density / 100);
 			glFogfv (GL_FOG_COLOR, colors);
 			glEnable (GL_FOG);
 		}
@@ -223,7 +219,7 @@ void FOG_frameend(void)
 
 void FOG_clear(void)
 {
-	if (nehahra)
+	if (gamemode == GAME_NEHAHRA)
 	{
 		Cvar_Set("gl_fogenable", "0");
 		Cvar_Set("gl_fogdensity", "0.2");
@@ -237,12 +233,12 @@ void FOG_clear(void)
 void FOG_registercvars(void)
 {
 	Cvar_RegisterVariable (&glfog);
-	if (nehahra)
+	if (gamemode == GAME_NEHAHRA)
 	{
 		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);
@@ -274,12 +270,13 @@ void GL_Main_Init(void)
 	Cvar_RegisterVariable (&r_fullbrights);
 	Cvar_RegisterVariable (&r_wateralpha);
 	Cvar_RegisterVariable (&r_dynamic);
-	Cvar_RegisterVariable (&r_waterripple); // LordHavoc: added waterripple
-	if (nehahra)
-		Cvar_SetValue("r_fullbrights", 0);
-//	if (gl_vendor && strstr(gl_vendor, "3Dfx"))
-//		gl_lightmode.value = 0;
+	Cvar_RegisterVariable (&r_waterripple);
+	Cvar_RegisterVariable (&r_farclip);
 	Cvar_RegisterVariable (&r_fullbright);
+	Cvar_RegisterVariable (&r_ser);
+	Cvar_RegisterVariable (&gl_viewmodeldepthhack);
+	if (gamemode == GAME_NEHAHRA)
+		Cvar_SetValue("r_fullbrights", 0);
 	R_RegisterModule("GL_Main", gl_main_start, gl_main_shutdown, gl_main_newmap);
 }
 
@@ -295,10 +292,13 @@ 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();
@@ -312,6 +312,7 @@ void Render_Init(void)
 	R_Explosion_Init();
 	CL_Effects_Init();
 	R_Decals_Init();
+	ui_init();
 	R_Modules_Start();
 }
 
@@ -335,8 +336,10 @@ void GL_Init (void)
 
 //	Con_Printf ("%s %s\n", gl_renderer, gl_version);
 
-	VID_CheckMultitexture();
-	VID_CheckCVA();
+//	VID_CheckMultitexture();
+//	VID_CheckCVA();
+//	VID_CheckCombine();
+	VID_CheckExtensions();
 
 	// LordHavoc: report supported extensions
 	Con_Printf ("\nengine extensions: %s\n", ENGINE_EXTENSIONS);
@@ -350,104 +353,66 @@ void GL_Init (void)
 }
 
 
-/*
-void R_RotateForEntity (entity_t *e)
-{
-	glTranslatef (e->origin[0],  e->origin[1],  e->origin[2]);
-
-	glRotatef (e->angles[1],  0, 0, 1);
-	glRotatef (-e->angles[0],  0, 1, 0);
-	glRotatef (e->angles[2],  1, 0, 0);
-
-	glScalef (e->scale, e->scale, e->scale); // LordHavoc: model scale
-}
-*/
-
-// LordHavoc: shading stuff
-vec3_t	shadevector;
-vec3_t	shadecolor;
-
-float	modelalpha;
-
 //==================================================================================
 
-void R_DrawBrushModel (entity_t *e);
-void R_DrawSpriteModel (entity_t *e, frameblend_t *blend);
-
-void R_LerpUpdate(entity_t *ent)
+void R_Entity_Callback(void *data, void *junk)
 {
-	int frame;
-	frame = ent->render.frame;
-	if (ent->render.model && ent->render.frame >= ent->render.model->numframes)
-	{
-		Con_Printf("R_LerpUpdate: no such frame%6i in \"%s\"\n", ent->render.frame, ent->render.model->name);
-		frame = 0;
-	}
-
-	if (ent->render.lerp_model != ent->render.model)
-	{
-		// reset all interpolation information
-		ent->render.lerp_model = ent->render.model;
-		ent->render.frame1 = ent->render.frame2 = frame;
-		ent->render.frame1start = ent->render.frame2start = cl.time;
-		ent->render.framelerp = 1;
-		ent->render.lerp_starttime = 0;
-	}
-	else if (ent->render.frame2 != frame)
-	{
-		// transition to new frame
-		ent->render.frame1 = ent->render.frame2;
-		ent->render.frame1start = ent->render.frame2start;
-		ent->render.frame2 = frame;
-		ent->render.frame2start = cl.time;
-		ent->render.framelerp = 0;
-		ent->render.lerp_starttime = cl.time;
-	}
-	else
-	{
-		// lerp_starttime < 0 is used to prevent changing of framelerp
-		if (ent->render.lerp_starttime >= 0)
-		{
-			// update transition
-			ent->render.framelerp = (cl.time - ent->render.lerp_starttime) * 10;
-			ent->render.framelerp = bound(0, ent->render.framelerp, 1);
-		}
-	}
+	((entity_render_t *)data)->visframe = r_framecount;
 }
 
-
-void R_PrepareEntities (void)
+static void R_AddModelEntities (void)
 {
-	int i;
-	entity_t *ent;
-	vec3_t v;
-	// this updates entities that are supposed to be view relative
+	int		i;
+	vec3_t	v;
+
+	if (!r_drawentities.value)
+		return;
+
 	for (i = 0;i < cl_numvisedicts;i++)
 	{
-		ent = cl_visedicts[i];
+		currentrenderentity = &cl_visedicts[i]->render;
 
-		if (ent->render.flags & RENDER_VIEWMODEL)
+		// move view-relative models to where they should be
+		if (currentrenderentity->flags & RENDER_VIEWMODEL)
 		{
 			// remove flag so it will not be repeated incase RelinkEntities is not called again for a while
-			ent->render.flags -= RENDER_VIEWMODEL;
+			currentrenderentity->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_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];
+			VectorCopy(currentrenderentity->origin, v);
+			currentrenderentity->origin[0] = v[0] * vpn[0] + v[1] * vright[0] + v[2] * vup[0] + r_origin[0];
+			currentrenderentity->origin[1] = v[0] * vpn[1] + v[1] * vright[1] + v[2] * vup[1] + r_origin[1];
+			currentrenderentity->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);
+			VectorAdd(currentrenderentity->angles, r_refdef.viewangles, currentrenderentity->angles);
+		}
+
+		if (currentrenderentity->angles[0] || currentrenderentity->angles[2])
+		{
+			VectorMA(currentrenderentity->origin, currentrenderentity->scale, currentrenderentity->model->rotatedmins, currentrenderentity->mins);
+			VectorMA(currentrenderentity->origin, currentrenderentity->scale, currentrenderentity->model->rotatedmaxs, currentrenderentity->maxs);
+		}
+		else if (currentrenderentity->angles[1])
+		{
+			VectorMA(currentrenderentity->origin, currentrenderentity->scale, currentrenderentity->model->yawmins, currentrenderentity->mins);
+			VectorMA(currentrenderentity->origin, currentrenderentity->scale, currentrenderentity->model->yawmaxs, currentrenderentity->maxs);
 		}
+		else
+		{
+			VectorMA(currentrenderentity->origin, currentrenderentity->scale, currentrenderentity->model->normalmins, currentrenderentity->mins);
+			VectorMA(currentrenderentity->origin, currentrenderentity->scale, currentrenderentity->model->normalmaxs, currentrenderentity->maxs);
+		}
+		if (R_VisibleCullBox(currentrenderentity->mins, currentrenderentity->maxs))
+			continue;
+
+		R_LerpAnimation(currentrenderentity);
+		if (r_ser.value)
+			currentrenderentity->model->SERAddEntity();
+		else
+			currentrenderentity->visframe = r_framecount;
 	}
 }
 
-/*
-=============
-R_DrawEntitiesOnList
-=============
-*/
-// LordHavoc: split so bmodels are rendered before any other objects
-void R_DrawEntitiesOnList1 (void)
+void R_DrawModels1 (void)
 {
 	int		i;
 
@@ -456,45 +421,24 @@ void R_DrawEntitiesOnList1 (void)
 
 	for (i = 0;i < cl_numvisedicts;i++)
 	{
-		if (cl_visedicts[i]->render.model->type != mod_brush)
-			continue;
-		currententity = cl_visedicts[i];
-		modelalpha = currententity->render.alpha;
-
-		R_DrawBrushModel (currententity);
+		currentrenderentity = &cl_visedicts[i]->render;
+		if (currentrenderentity->visframe == r_framecount && currentrenderentity->model->DrawEarly)
+			currentrenderentity->model->DrawEarly();
 	}
 }
 
-void R_DrawEntitiesOnList2 (void)
+void R_DrawModels2 (void)
 {
 	int		i;
-	frameblend_t blend[4];
 
 	if (!r_drawentities.value)
 		return;
 
 	for (i = 0;i < cl_numvisedicts;i++)
 	{
-		currententity = cl_visedicts[i];
-		modelalpha = currententity->render.alpha;
-
-		switch (currententity->render.model->type)
-		{
-		case mod_alias:
-			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);
-			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;
-
-		default:
-			break;
-		}
+		currentrenderentity = &cl_visedicts[i]->render;
+		if (currentrenderentity->visframe == r_framecount && currentrenderentity->model->DrawLate)
+			currentrenderentity->model->DrawLate();
 	}
 }
 
@@ -505,35 +449,30 @@ R_DrawViewModel
 */
 void R_DrawViewModel (void)
 {
-	frameblend_t blend[4];
-
 	if (!r_drawviewmodel.value || chase_active.value || envmap || !r_drawentities.value || cl.items & IT_INVISIBILITY || cl.stats[STAT_HEALTH] <= 0 || !cl.viewent.render.model)
 		return;
 
-	currententity = &cl.viewent;
-	currententity->render.alpha = modelalpha = cl_entities[cl.viewentity].render.alpha; // LordHavoc: if the player is transparent, so is the gun
-	currententity->render.effects = cl_entities[cl.viewentity].render.effects;
-	currententity->render.scale = 1;
-	VectorCopy(cl_entities[cl.viewentity].render.colormod, currententity->render.colormod);
+	currentrenderentity = &cl.viewent.render;
 
-	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_LerpAnimation(currentrenderentity);
 
 	// hack the depth range to prevent view model from poking into walls
-	glDepthRange (gldepthmin, gldepthmin + 0.3*(gldepthmax-gldepthmin));
-	R_DrawAliasModel (currententity, false, 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);
-	glDepthRange (gldepthmin, gldepthmax);
+	if (gl_viewmodeldepthhack.value)
+		glDepthRange (gldepthmin, gldepthmin + 0.3*(gldepthmax-gldepthmin));
+	currentrenderentity->model->DrawLate();
+	if (gl_viewmodeldepthhack.value)
+		glDepthRange (gldepthmin, gldepthmax);
 }
 
-void R_DrawBrushModel (entity_t *e);
-
-void RotatePointAroundVector( vec3_t dst, const vec3_t dir, const vec3_t point, float degrees );
-
-void R_SetFrustum (void)
+static 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
 
@@ -545,6 +484,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
@@ -553,32 +493,31 @@ 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]);
 	}
 }
 
-void R_AnimateLight (void);
-void V_CalcBlend (void);
-
 /*
 ===============
 R_SetupFrame
 ===============
 */
-void R_SetupFrame (void)
+static void R_SetupFrame (void)
 {
 // don't allow cheats in multiplayer
 	if (cl.maxclients > 1)
 	{
-		Cvar_Set ("r_fullbright", "0");
-		Cvar_Set ("r_ambient", "0");
+		if (r_fullbright.value != 0)
+			Cvar_Set ("r_fullbright", "0");
+		if (r_ambient.value != 0)
+			Cvar_Set ("r_ambient", "0");
 	}
 
 	r_framecount++;
@@ -595,7 +534,7 @@ void R_SetupFrame (void)
 	V_SetContentsColor (r_viewleaf->contents);
 	V_CalcBlend ();
 
-	r_cache_thrash = false;
+//	r_cache_thrash = false;
 
 	c_brush_polys = 0;
 	c_alias_polys = 0;
@@ -613,17 +552,20 @@ void R_SetupFrame (void)
 }
 
 
-void MYgluPerspective( GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar )
+static void MYgluPerspective(GLdouble fovx, GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar )
 {
-   GLdouble xmin, xmax, ymin, ymax;
+	GLdouble xmax, ymax;
 
-   ymax = zNear * tan( fovy * M_PI / 360.0 );
-   ymin = -ymax;
+	xmax = zNear * tan( fovx * M_PI / 360.0 ) * aspect;
+	ymax = zNear * tan( fovy * M_PI / 360.0 );
 
-   xmin = ymin * aspect;
-   xmax = ymax * aspect;
+	if (r_viewleaf->contents != CONTENTS_EMPTY && r_viewleaf->contents != CONTENTS_SOLID)
+	{
+		xmax *= (sin(cl.time * 4.7) * 0.03 + 0.97);
+		ymax *= (sin(cl.time * 3) * 0.03 + 0.97);
+	}
 
-   glFrustum( xmin, xmax, ymin, ymax, zNear, zFar );
+	glFrustum(-xmax, xmax, -ymax, ymax, zNear, zFar );
 }
 
 
@@ -632,60 +574,33 @@ void MYgluPerspective( GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble
 R_SetupGL
 =============
 */
-void R_SetupGL (void)
+static void R_SetupGL (void)
 {
-	float	screenaspect;
-	int		x, x2, y2, y, w, h;
-
 	if (!r_render.value)
 		return;
-	//
+
 	// set up viewpoint
-	//
 	glMatrixMode(GL_PROJECTION);
-    glLoadIdentity ();
-	x = r_refdef.vrect.x * glwidth/vid.width;
-	x2 = (r_refdef.vrect.x + r_refdef.vrect.width) * glwidth/vid.width;
-	y = (vid.height-r_refdef.vrect.y) * glheight/vid.height;
-	y2 = (vid.height - (r_refdef.vrect.y + r_refdef.vrect.height)) * glheight/vid.height;
-
-	// fudge around because of frac screen scale
-	if (x > 0)
-		x--;
-	if (x2 < glwidth)
-		x2++;
-	if (y2 < 0)
-		y2--;
-	if (y < glheight)
-		y++;
-
-	w = x2 - x;
-	h = y - y2;
-
-	if (envmap)
-	{
-		x = y2 = 0;
-		w = h = 256;
-	}
+	glLoadIdentity ();
 
-	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;
-	MYgluPerspective (r_refdef.fov_y,  screenaspect,  4,  r_farclip.value);
+	// y is weird beause OpenGL is bottom to top, we use top to bottom
+	glViewport(r_refdef.x, vid.realheight - (r_refdef.y + r_refdef.height), r_refdef.width, r_refdef.height);
+//	yfov = 2*atan((float)r_refdef.height/r_refdef.width)*180/M_PI;
+	MYgluPerspective (r_refdef.fov_x, r_refdef.fov_y, r_refdef.width/r_refdef.height, 4, r_farclip.value);
 
 	glCullFace(GL_FRONT);
 
 	glMatrixMode(GL_MODELVIEW);
-    glLoadIdentity ();
+	glLoadIdentity ();
 
-    glRotatef (-90,  1, 0, 0);	    // put Z going up
-    glRotatef (90,  0, 0, 1);	    // put Z going up
-    glRotatef (-r_refdef.viewangles[2],  1, 0, 0);
-    glRotatef (-r_refdef.viewangles[0],  0, 1, 0);
-    glRotatef (-r_refdef.viewangles[1],  0, 0, 1);
-    glTranslatef (-r_refdef.vieworg[0],  -r_refdef.vieworg[1],  -r_refdef.vieworg[2]);
+	glRotatef (-90,  1, 0, 0);	    // put Z going up
+	glRotatef (90,  0, 0, 1);	    // put Z going up
+	glRotatef (-r_refdef.viewangles[2],  1, 0, 0);
+	glRotatef (-r_refdef.viewangles[0],  0, 1, 0);
+	glRotatef (-r_refdef.viewangles[1],  0, 0, 1);
+	glTranslatef (-r_refdef.vieworg[0],  -r_refdef.vieworg[1],  -r_refdef.vieworg[2]);
 
-	glGetFloatv (GL_MODELVIEW_MATRIX, r_world_matrix);
+//	glGetFloatv (GL_MODELVIEW_MATRIX, r_world_matrix);
 
 	//
 	// set drawing parms
@@ -708,7 +623,7 @@ void R_SetupGL (void)
 R_Clear
 =============
 */
-void R_Clear (void)
+static void R_Clear (void)
 {
 	if (!r_render.value)
 		return;
@@ -720,35 +635,7 @@ void R_Clear (void)
 	glDepthRange (gldepthmin, gldepthmax);
 }
 
-// LordHavoc: my trick to *FIX* GLQuake lighting once and for all :)
-void GL_Brighten(void)
-{
-	if (!r_render.value)
-		return;
-	glMatrixMode(GL_PROJECTION);
-    glLoadIdentity ();
-	glOrtho  (0, vid.width, vid.height, 0, -99999, 99999);
-	glMatrixMode(GL_MODELVIEW);
-    glLoadIdentity ();
-	glDisable (GL_DEPTH_TEST);
-	glDisable (GL_CULL_FACE);
-	glDisable(GL_TEXTURE_2D);
-	glEnable(GL_BLEND);
-	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);
-	glDisable(GL_BLEND);
-	glEnable(GL_TEXTURE_2D);
-	glEnable (GL_DEPTH_TEST);
-	glEnable (GL_CULL_FACE);
-}
-
-void GL_BlendView(void)
+static void GL_BlendView(void)
 {
 	if (!r_render.value)
 		return;
@@ -758,7 +645,7 @@ void GL_BlendView(void)
 
 	glMatrixMode(GL_PROJECTION);
     glLoadIdentity ();
-	glOrtho  (0, vid.width, vid.height, 0, -99999, 99999);
+	glOrtho  (0, 256, 256, 0, -99999, 99999);
 	glMatrixMode(GL_MODELVIEW);
     glLoadIdentity ();
 	glDisable (GL_DEPTH_TEST);
@@ -782,16 +669,6 @@ void GL_BlendView(void)
 	glEnable(GL_TEXTURE_2D);
 }
 
-#define TIMEREPORT(VAR) \
-	if (r_speeds2.value)\
-	{\
-		temptime = currtime;\
-		currtime = Sys_DoubleTime();\
-		VAR = (int) ((currtime - temptime) * 1000000.0);\
-	}\
-	else\
-		VAR = 0;
-
 /*
 ================
 R_RenderView
@@ -799,96 +676,151 @@ R_RenderView
 r_refdef must be set before the first call
 ================
 */
-extern void R_Sky(void);
 extern void UploadLightmaps(void);
-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_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)
+	{
+		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);
+
 		starttime = currtime = Sys_DoubleTime();
+	}
 	else
 		starttime = currtime = 0;
+
+	R_MoveParticles ();
+	TIMEREPORT("mparticles")
+	R_MoveExplosions();
+	TIMEREPORT("mexplosion")
+
+	FOG_framebegin();
+
 	R_Clear();
-	TIMEREPORT(time_clear)
+	TIMEREPORT("clear     ")
 
 	// render normal view
 
 	R_SetupFrame ();
 	R_SetFrustum ();
 	R_SetupGL ();
-
-	R_PrepareEntities();
+	R_Clip_StartFrame();
 
 	skypolyclear();
 	wallpolyclear();
 	transpolyclear();
 
-	TIMEREPORT(time_setup)
+	TIMEREPORT("setup     ")
 
 	R_DrawWorld ();
-	TIMEREPORT(time_world)
-	R_DrawEntitiesOnList1 (); // BSP models
-	TIMEREPORT(time_bmodels)
+	TIMEREPORT("addworld  ")
 
-	UploadLightmaps();
-	TIMEREPORT(time_upload)
+	R_AddModelEntities();
+	TIMEREPORT("addmodels ")
+
+	R_Clip_EndFrame();
+	TIMEREPORT("scanedge  ")
 
-	skypolyrender(); // fogged sky polys, affects depth
+	// now mark the lit surfaces
+	R_PushDlights ();
+	TIMEREPORT("marklights")
+
+	R_DrawModels1 ();
+
+	// yes this does add the world after the brush models when using the SER
+	R_DrawSurfaces ();
+	R_DrawPortals ();
+	TIMEREPORT("surfaces  ");
+
+	UploadLightmaps();
+	TIMEREPORT("uploadlmap")
 
-	if (skyname[0] && currentskypoly && !fogenabled)
-		R_Sky(); // does not affect depth, draws over the sky polys
-	TIMEREPORT(time_sky)
+	skypolyrender();
+	TIMEREPORT("skypoly   ")
 
-	wallpolyrender();
-	TIMEREPORT(time_wall)
+	wallpolyrender1();
+	TIMEREPORT("wallpoly1 ")
 
 	GL_DrawDecals();
-	TIMEREPORT(time_drawdecals)
+	TIMEREPORT("ddecal    ")
 
+	wallpolyrender2();
+	TIMEREPORT("wallpoly2 ")
+
+	// 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_DrawModels2 ();
+	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_DoubleTime() - 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    ");
 }