#include "quakedef.h"
-entity_t r_worldentity;
-
qboolean r_cache_thrash; // compatability
vec3_t modelorg, r_entorigin;
entity_t *currententity;
-int r_visframecount; // bumped when going to a new PVS
int r_framecount; // used for dlight push checking
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
mleaf_t *r_viewleaf, *r_oldviewleaf;
-texture_t *r_notexture_mip;
-
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_shadows = {"r_shadows","0"};
-cvar_t r_wateralpha = {"r_wateralpha","1"};
-cvar_t r_dynamic = {"r_dynamic","1"};
-cvar_t r_novis = {"r_novis","0"};
-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;
+
+ 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)
+ {
+ if (sides & 2) // 3
+ {
+ // put second child on the stack for later examination
+ nodestack[stack++] = node->children[1];
+ node = node->children[0];
+ goto loc0;
+ }
+ else // 1
+ {
+ node = node->children[0];
+ goto loc0;
+ }
+ }
+ // 2
+ node = node->children[1];
+ goto loc0;
+}
+*/
qboolean lighthalf;
float fog_density, fog_red, fog_green, fog_blue;
qboolean fogenabled;
qboolean oldgl_fogenable;
-void FOG_framebegin()
+void FOG_framebegin(void)
{
if (nehahra)
{
}
}
-void FOG_frameend()
+void FOG_frameend(void)
{
if (glfog.value)
glDisable(GL_FOG);
}
-void FOG_clear()
+void FOG_clear(void)
{
if (nehahra)
{
fog_density = fog_red = fog_green = fog_blue = 0.0f;
}
-void FOG_registercvars()
+void FOG_registercvars(void)
{
Cvar_RegisterVariable (&glfog);
if (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);
}
}
-void glmain_start()
+void gl_main_start(void)
{
}
-void glmain_shutdown()
+void gl_main_shutdown(void)
{
}
-void GL_Main_Init()
+void gl_main_newmap(void)
+{
+}
+
+void GL_Main_Init(void)
{
FOG_registercvars();
Cvar_RegisterVariable (&r_drawentities);
Cvar_RegisterVariable (&r_drawviewmodel);
- Cvar_RegisterVariable (&r_shadows);
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_novis);
- 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);
- R_RegisterModule("GL_Main", glmain_start, glmain_shutdown);
+ 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();
-
-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_ShutdownModules();
+ R_Modules_Shutdown();
+ R_Clip_Init();
GL_Draw_Init();
GL_Main_Init();
GL_Models_Init();
R_Light_Init();
R_Particles_Init();
R_Explosion_Init();
- R_StartModules();
+ CL_Effects_Init();
+ R_Decals_Init();
+ ui_init();
+ R_Modules_Start();
}
/*
GL_Init
===============
*/
-extern char *QSG_EXTENSIONS;
+extern char *ENGINE_EXTENSIONS;
void GL_Init (void)
{
gl_vendor = glGetString (GL_VENDOR);
// Con_Printf ("%s %s\n", gl_renderer, gl_version);
VID_CheckMultitexture();
- VID_CheckVertexArrays();
+ VID_CheckCVA();
// LordHavoc: report supported extensions
- Con_Printf ("\nQSG extensions: %s\n", QSG_EXTENSIONS);
+ Con_Printf ("\nengine extensions: %s\n", ENGINE_EXTENSIONS);
glCullFace(GL_FRONT);
glEnable(GL_TEXTURE_2D);
glAlphaFunc(GL_GREATER, 0.5);
// glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
-
- Palette_Init();
}
}
*/
-// LordHavoc: if not for the fact BRIGHTFIELD particles require this, it would be removed...
-#define NUMVERTEXNORMALS 162
-
-float r_avertexnormals[NUMVERTEXNORMALS][3] = {
-#include "anorms.h"
-};
-
// LordHavoc: shading stuff
vec3_t shadevector;
vec3_t shadecolor;
//==================================================================================
-void R_DrawBrushModel (entity_t *e);
-void R_DrawSpriteModel (entity_t *e);
+void R_LerpUpdate(entity_t *ent)
+{
+ 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);
+ }
+ }
+}
+
+
+void R_PrepareEntities (void)
+{
+ int i;
+ entity_t *ent;
+ vec3_t v;
+ // this updates entities that are supposed to be view relative
+ for (i = 0;i < cl_numvisedicts;i++)
+ {
+ ent = cl_visedicts[i];
+
+ if (ent->render.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;
+ // 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];
+ // 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;
if (!r_drawentities.value)
return;
- for (i=0 ; i<cl_numvisedicts ; i++)
+ for (i = 0;i < cl_numvisedicts;i++)
{
- if (cl_visedicts[i]->model->type != mod_brush)
+ if (cl_visedicts[i]->render.visframe != r_framecount)
+ continue;
+ if (cl_visedicts[i]->render.model->type != mod_brush)
continue;
currententity = cl_visedicts[i];
- modelalpha = currententity->alpha;
+ modelalpha = currententity->render.alpha;
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++)
+ for (i = 0;i < cl_numvisedicts;i++)
{
+ if (cl_visedicts[i]->render.visframe != r_framecount)
+ continue;
currententity = cl_visedicts[i];
- modelalpha = currententity->alpha;
+ if (currententity->render.model->type != mod_alias && currententity->render.model->type != mod_sprite)
+ continue;
+
+ modelalpha = currententity->render.alpha;
- switch (currententity->model->type)
+ if (currententity->render.model->type == 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);
+ }
+ 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);
+ }
+
+ /*
+ 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);
+
+ switch (cl_visedicts[i]->render.model->type)
{
case mod_alias:
- R_DrawAliasModel (currententity, true, modelalpha, currententity->model, currententity->frame, currententity->skinnum, currententity->origin, currententity->angles, currententity->effects, currententity->model->flags, currententity->colormap);
+ R_Clip_AddBox(mins, maxs, R_DrawModelCallback, cl_visedicts[i], NULL);
break;
-
case mod_sprite:
- R_DrawSpriteModel (currententity);
- break;
-
- default:
+ R_Clip_AddBox(mins, maxs, R_DrawSpriteCallback, cl_visedicts[i], NULL);
break;
}
+ */
}
}
*/
void R_DrawViewModel (void)
{
- if (!r_drawviewmodel.value || chase_active.value || envmap || !r_drawentities.value || cl.items & IT_INVISIBILITY || cl.stats[STAT_HEALTH] <= 0 || !cl.viewent.model)
+ 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->alpha = modelalpha = cl_entities[cl.viewentity].alpha; // LordHavoc: if the player is transparent, so is his gun
- currententity->effects = cl_entities[cl.viewentity].effects;
- currententity->scale = 1;
- VectorCopy(cl_entities[cl.viewentity].colormod, currententity->colormod);
+ 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);
+
+ R_LerpUpdate(currententity);
+ R_LerpAnimation(currententity->render.model, currententity->render.frame1, currententity->render.frame2, currententity->render.frame1start, currententity->render.frame2start, currententity->render.framelerp, blend);
// 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->model, currententity->frame, currententity->skinnum, currententity->origin, currententity->angles, currententity->effects, currententity->model->flags, currententity->colormap);
+ 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);
}
{
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
}
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
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]);
}
}
Cvar_Set ("r_ambient", "0");
}
- R_AnimateLight ();
-
r_framecount++;
// build the transformation matrix for the given view angles
c_sprites = 0;
c_particles = 0;
// c_dlights = 0;
+
+ R_AnimateLight ();
}
}
-extern char skyname[];
-
/*
=============
R_SetupGL
void R_SetupGL (void)
{
float screenaspect;
- extern int glwidth, glheight;
int x, x2, y2, y, w, h;
if (!r_render.value)
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);
}
// LordHavoc: my trick to *FIX* GLQuake lighting once and for all :)
-void GL_Brighten()
+void GL_Brighten(void)
{
if (!r_render.value)
return;
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);
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);
glEnable(GL_TEXTURE_2D);
}
-/*
-#define TIMEREPORT(DESC) \
- if (r_speeds2.value)\
- {\
- temptime = -currtime;\
- currtime = Sys_FloatTime();\
- temptime += currtime;\
- Con_Printf(DESC " %.4fms ", temptime * 1000.0);\
- }
-*/
-#define TIMEREPORT(VAR) \
- if (r_speeds2.value)\
- {\
- temptime = currtime;\
- currtime = Sys_FloatTime();\
- VAR = (int) ((currtime - temptime) * 1000000.0);\
- }\
- else\
- VAR = 0;
-
/*
================
R_RenderView
r_refdef must be set before the first call
================
*/
-extern qboolean intimerefresh;
-extern qboolean skyisvisible;
-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];
+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_transpoly, time_blend, time_total;
-// double currtime, temptime;
// if (r_norefresh.value)
// return;
- if (!r_worldentity.model || !cl.worldmodel)
- Sys_Error ("R_RenderView: NULL worldmodel");
-
- lighthalf = gl_lightmode.value;
-
- FOG_framebegin();
+ if (!cl.worldmodel)
+ Host_Error ("R_RenderView: NULL worldmodel");
if (r_speeds2.value)
{
- starttime = currtime = Sys_FloatTime();
-// Con_Printf("render time: ");
+ 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();
- skypolyclear();
- wallpolyclear();
- transpolyclear();
- skyisvisible = false;
- TIMEREPORT(time_clear)
+ TIMEREPORT("clear ")
// render normal view
R_SetupFrame ();
R_SetFrustum ();
R_SetupGL ();
- TIMEREPORT(time_setup)
+ R_Clip_StartFrame();
+
+ R_PrepareEntities();
+
+ skypolyclear();
+ wallpolyclear();
+ transpolyclear();
+
+ TIMEREPORT("setup ")
- R_MarkLeaves (); // done here so we know if we're in water
- R_DrawWorld (); // adds static entities to the list
- TIMEREPORT(time_world)
- R_DrawEntitiesOnList1 (); // BSP models
- TIMEREPORT(time_bmodels)
+ R_DrawWorld ();
+ 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] && skyisvisible && !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 ")
-// if (!intimerefresh)
-// S_ExtraUpdate (); // don't let sound get messed up if going slow
+ GL_DrawDecals();
+ TIMEREPORT("ddecal ")
+
+ // don't let sound skip if going slow
+ if (!intimerefresh && !r_speeds2.value)
+ 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);
-// Con_Printf("\n");
- 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 trans %6ius blend %6ius total %6ius permdl", time_transpoly, time_blend, time_total, time_models / max(c_models, 1));
- }
+ timestring((int) ((Sys_DoubleTime() - starttime) * 1000000.0), "total ");
}
projects / xonotic / darkplaces.git / blobdiff