float r_farclip;
+// forces all rendering to draw triangle outlines
+int r_showtrispass;
+
// view origin
vec3_t r_vieworigin;
vec3_t r_viewforward;
vec3_t r_viewleft;
vec3_t r_viewright;
vec3_t r_viewup;
+int r_view_x;
+int r_view_y;
+int r_view_z;
+int r_view_width;
+int r_view_height;
+int r_view_depth;
+float r_view_fov_x;
+float r_view_fov_y;
+matrix4x4_t r_view_matrix;
//
// screen size info
// 8.8 fraction of base light value
unsigned short d_lightstylevalue[256];
+cvar_t r_showtris = {0, "r_showtris", "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"};
VectorCopy(oldangles, cl.viewangles);
intimerefresh = 0;
- Con_Printf ("%f seconds (%f fps)\n", timedelta, 128/timedelta);
+ Con_Printf("%f seconds (%f fps)\n", timedelta, 128/timedelta);
}
vec3_t fogcolor;
if (l >= 0 && !strcmp(entname + l, ".bsp"))
{
strcpy(entname + l, ".ent");
- if ((entities = FS_LoadFile(entname, true)))
+ if ((entities = FS_LoadFile(entname, tempmempool, true)))
{
CL_ParseEntityLump(entities);
Mem_Free(entities);
// FIXME: move this to client?
FOG_registercvars();
Cmd_AddCommand("timerefresh", R_TimeRefresh_f);
+ Cvar_RegisterVariable(&r_showtris);
Cvar_RegisterVariable(&r_drawentities);
Cvar_RegisterVariable(&r_drawviewmodel);
Cvar_RegisterVariable(&r_speeds);
static void R_SetFrustum(void)
{
- // break apart the viewentity matrix into vectors for various purposes
- Matrix4x4_ToVectors(&r_refdef.viewentitymatrix, r_viewforward, r_viewleft, r_viewup, r_vieworigin);
+ // break apart the view matrix into vectors for various purposes
+ Matrix4x4_ToVectors(&r_view_matrix, r_viewforward, r_viewleft, r_viewup, r_vieworigin);
VectorNegate(r_viewleft, r_viewright);
// LordHavoc: note to all quake engine coders, the special case for 90
// disabled as well.
// rotate R_VIEWFORWARD right by FOV_X/2 degrees
- RotatePointAroundVector( frustum[0].normal, r_viewup, r_viewforward, -(90 - r_refdef.fov_x / 2));
+ RotatePointAroundVector( frustum[0].normal, r_viewup, r_viewforward, -(90 - r_view_fov_x / 2));
frustum[0].dist = DotProduct (r_vieworigin, frustum[0].normal);
PlaneClassify(&frustum[0]);
// rotate R_VIEWFORWARD left by FOV_X/2 degrees
- RotatePointAroundVector( frustum[1].normal, r_viewup, r_viewforward, (90 - r_refdef.fov_x / 2));
+ RotatePointAroundVector( frustum[1].normal, r_viewup, r_viewforward, (90 - r_view_fov_x / 2));
frustum[1].dist = DotProduct (r_vieworigin, frustum[1].normal);
PlaneClassify(&frustum[1]);
// rotate R_VIEWFORWARD up by FOV_X/2 degrees
- RotatePointAroundVector( frustum[2].normal, r_viewleft, r_viewforward, -(90 - r_refdef.fov_y / 2));
+ RotatePointAroundVector( frustum[2].normal, r_viewleft, r_viewforward, -(90 - r_view_fov_y / 2));
frustum[2].dist = DotProduct (r_vieworigin, frustum[2].normal);
PlaneClassify(&frustum[2]);
// rotate R_VIEWFORWARD down by FOV_X/2 degrees
- RotatePointAroundVector( frustum[3].normal, r_viewleft, r_viewforward, (90 - r_refdef.fov_y / 2));
+ RotatePointAroundVector( frustum[3].normal, r_viewleft, r_viewforward, (90 - r_view_fov_y / 2));
frustum[3].dist = DotProduct (r_vieworigin, frustum[3].normal);
PlaneClassify(&frustum[3]);
}
R_Mesh_Matrix(&r_identitymatrix);
memset(&m, 0, sizeof(m));
- R_Mesh_State_Texture(&m);
+ m.pointer_vertex = vertex3f;
+ R_Mesh_State(&m);
GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
GL_DepthMask(true);
GL_DepthTest(false); // magic
- GL_VertexPointer(vertex3f);
GL_Color(r_refdef.viewblend[0], r_refdef.viewblend[1], r_refdef.viewblend[2], r_refdef.viewblend[3]);
r = 64;
vertex3f[0] = r_vieworigin[0] + r_viewforward[0] * 1.5 + r_viewleft[0] * r - r_viewup[0] * r;
if (r_shadow_realtime_world.integer && !gl_stencil)
{
- Con_Printf("Realtime world lighting requires 32bit color; turning off r_shadow_realtime_world, please type vid_bitsperpixel 32;vid_restart and try again\n");
+ Con_Print("Realtime world lighting requires 32bit color; turning off r_shadow_realtime_world, please type vid_bitsperpixel 32;vid_restart and try again\n");
Cvar_SetValueQuick(&r_shadow_realtime_world, 0);
}
// don't allow cheats in multiplayer
- if (!cl.islocalgame)
+ if (!cl.islocalgame && cl.worldmodel)
{
if (r_fullbright.integer != 0)
Cvar_Set ("r_fullbright", "0");
if (!r_refdef.entities/* || !cl.worldmodel*/)
return; //Host_Error ("R_RenderView: NULL worldmodel");
- r_refdef.width = bound(0, r_refdef.width, vid.realwidth);
- r_refdef.height = bound(0, r_refdef.height, vid.realheight);
- r_refdef.x = bound(0, r_refdef.x, vid.realwidth - r_refdef.width);
- r_refdef.y = bound(0, r_refdef.y, vid.realheight - r_refdef.height);
- r_refdef.fov_x = bound(1, r_refdef.fov_x, 170);
- r_refdef.fov_y = bound(1, r_refdef.fov_y, 170);
-
- // GL is weird because it's bottom to top, r_refdef.y is top to bottom
- qglViewport(r_refdef.x, vid.realheight - (r_refdef.y + r_refdef.height), r_refdef.width, r_refdef.height);
- GL_Scissor(r_refdef.x, r_refdef.y, r_refdef.width, r_refdef.height);
+ r_view_width = bound(0, r_refdef.width, vid.realwidth);
+ r_view_height = bound(0, r_refdef.height, vid.realheight);
+ r_view_depth = 1;
+ r_view_x = bound(0, r_refdef.x, vid.realwidth - r_refdef.width);
+ r_view_y = bound(0, r_refdef.y, vid.realheight - r_refdef.height);
+ r_view_z = 0;
+ r_view_fov_x = bound(1, r_refdef.fov_x, 170);
+ r_view_fov_y = bound(1, r_refdef.fov_y, 170);
+ r_view_matrix = r_refdef.viewentitymatrix;
+ GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1);
+
+ // GL is weird because it's bottom to top, r_view_y is top to bottom
+ qglViewport(r_view_x, vid.realheight - (r_view_y + r_view_height), r_view_width, r_view_height);
+ GL_Scissor(r_view_x, r_view_y, r_view_width, r_view_height);
GL_ScissorTest(true);
+ GL_DepthMask(true);
R_ClearScreen();
-
- R_SetFrustum();
- r_farclip = R_FarClip(r_vieworigin, r_viewforward, 768.0f) + 256.0f;
-
- if (gl_stencil && ((r_shadow_realtime_world.integer && r_shadow_worldshadows.integer) || ((r_shadow_realtime_world.integer || r_shadow_realtime_dlight.integer) && r_shadow_dlightshadows.integer)))
- GL_SetupView_Mode_PerspectiveInfiniteFarClip(r_refdef.fov_x, r_refdef.fov_y, 1.0f);
- else
- GL_SetupView_Mode_Perspective(r_refdef.fov_x, r_refdef.fov_y, 1.0f, r_farclip);
-
- GL_SetupView_Orientation_FromEntity(&r_refdef.viewentitymatrix);
R_TimeReport("setup");
+ qglDepthFunc(GL_LEQUAL);
+ qglPolygonOffset(0, 0);
+ qglEnable(GL_POLYGON_OFFSET_FILL);
+
R_RenderScene();
+ qglPolygonOffset(0, 0);
+ qglDisable(GL_POLYGON_OFFSET_FILL);
+
R_BlendView();
R_TimeReport("blendview");
void R_RenderScene(void)
{
entity_render_t *world;
-
+
// don't let sound skip if going slow
if (!intimerefresh && !r_speeds.integer)
S_ExtraUpdate ();
r_framecount++;
+ GL_ShowTrisColor(0.05, 0.05, 0.05, 1);
+
+ R_SetFrustum();
+
+ r_farclip = R_FarClip(r_vieworigin, r_viewforward, 768.0f) + 256.0f;
+ if (gl_stencil && (r_shadow_realtime_world.integer || (r_shadow_realtime_dlight.integer && r_shadow_realtime_dlight_shadows.integer)))
+ GL_SetupView_Mode_PerspectiveInfiniteFarClip(r_view_fov_x, r_view_fov_y, 1.0f);
+ else
+ GL_SetupView_Mode_Perspective(r_view_fov_x, r_view_fov_y, 1.0f, r_farclip);
+
+ GL_SetupView_Orientation_FromEntity(&r_view_matrix);
+
R_SkyStartFrame();
if (cl.worldmodel && cl.worldmodel->brush.FatPVS)
R_MarkEntities();
R_TimeReport("markentity");
- qglDepthFunc(GL_LEQUAL);
- qglPolygonOffset(0, 0);
- qglEnable(GL_POLYGON_OFFSET_FILL);
-
- R_Mesh_Start();
R_MeshQueue_BeginScene();
R_Shadow_UpdateWorldLightSelection();
if (!intimerefresh && !r_speeds.integer)
S_ExtraUpdate ();
+ GL_ShowTrisColor(0.025, 0.025, 0, 1);
+ if (world->model && world->model->DrawSky)
+ {
+ world->model->DrawSky(world);
+ R_TimeReport("worldsky");
+ }
+
if (R_DrawBrushModelsSky())
R_TimeReport("bmodelsky");
- // must occur early because it can draw sky
- R_DrawWorld(world);
- R_TimeReport("world");
+ GL_ShowTrisColor(0.05, 0.05, 0.05, 1);
+ if (world->model && world->model->Draw)
+ {
+ world->model->Draw(world);
+ R_TimeReport("world");
+ }
// don't let sound skip if going slow
if (!intimerefresh && !r_speeds.integer)
S_ExtraUpdate ();
+ GL_ShowTrisColor(0, 0.015, 0, 1);
+
R_DrawModels();
R_TimeReport("models");
if (!intimerefresh && !r_speeds.integer)
S_ExtraUpdate ();
+ GL_ShowTrisColor(0, 0, 0.033, 1);
R_ShadowVolumeLighting(false);
R_TimeReport("rtlights");
if (!intimerefresh && !r_speeds.integer)
S_ExtraUpdate ();
+ GL_ShowTrisColor(0.1, 0, 0, 1);
+
R_DrawLightningBeams();
R_TimeReport("lightning");
R_MeshQueue_Render();
R_MeshQueue_EndScene();
- if (r_shadow_visiblevolumes.integer)
+ if (r_shadow_visiblevolumes.integer && !r_showtrispass)
{
R_ShadowVolumeLighting(true);
R_TimeReport("shadowvolume");
}
- R_Mesh_Finish();
- R_TimeReport("meshfinish");
-
- qglPolygonOffset(0, 0);
- qglDisable(GL_POLYGON_OFFSET_FILL);
+ GL_ShowTrisColor(0.05, 0.05, 0.05, 1);
// don't let sound skip if going slow
if (!intimerefresh && !r_speeds.integer)
GL_DepthTest(true);
R_Mesh_Matrix(&r_identitymatrix);
- memset(&m, 0, sizeof(m));
- R_Mesh_State_Texture(&m);
-
- R_Mesh_GetSpace(8);
vertex3f[ 0] = mins[0];vertex3f[ 1] = mins[1];vertex3f[ 2] = mins[2];
vertex3f[ 3] = maxs[0];vertex3f[ 4] = mins[1];vertex3f[ 5] = mins[2];
vertex3f[ 6] = mins[0];vertex3f[ 7] = maxs[1];vertex3f[ 8] = mins[2];
vertex3f[15] = maxs[0];vertex3f[16] = mins[1];vertex3f[17] = maxs[2];
vertex3f[18] = mins[0];vertex3f[19] = maxs[1];vertex3f[20] = maxs[2];
vertex3f[21] = maxs[0];vertex3f[22] = maxs[1];vertex3f[23] = maxs[2];
- GL_ColorPointer(color);
R_FillColors(color, 8, cr, cg, cb, ca);
if (fogenabled)
{
c[2] = c[2] * f1 + fogcolor[2] * f2;
}
}
+ memset(&m, 0, sizeof(m));
+ m.pointer_vertex = vertex3f;
+ m.pointer_color = color;
+ R_Mesh_State(&m);
R_Mesh_Draw(8, 12);
}
*/
R_Mesh_Matrix(&ent->matrix);
memset(&m, 0, sizeof(m));
- R_Mesh_State_Texture(&m);
+ m.pointer_vertex = nomodelvertex3f;
if (ent->flags & EF_ADDITIVE)
{
GL_DepthMask(true);
}
GL_DepthTest(true);
- GL_VertexPointer(nomodelvertex3f);
if (fogenabled)
{
memcpy(color4f, nomodelcolor4f, sizeof(float[6*4]));
- GL_ColorPointer(color4f);
+ m.pointer_color = color4f;
VectorSubtract(ent->origin, r_vieworigin, diff);
f2 = exp(fogdensity/DotProduct(diff, diff));
f1 = 1 - f2;
else if (ent->alpha != 1)
{
memcpy(color4f, nomodelcolor4f, sizeof(float[6*4]));
- GL_ColorPointer(color4f);
+ m.pointer_color = color4f;
for (i = 0, c = color4f;i < 6;i++, c += 4)
c[3] *= ent->alpha;
}
else
- GL_ColorPointer(nomodelcolor4f);
+ m.pointer_color = nomodelcolor4f;
+ R_Mesh_State(&m);
R_Mesh_Draw(6, 8, nomodelelements);
}
}
R_Mesh_Matrix(&r_identitymatrix);
- GL_Color(cr, cg, cb, ca);
- GL_VertexPointer(varray_vertex3f);
GL_BlendFunc(blendfunc1, blendfunc2);
GL_DepthMask(false);
GL_DepthTest(!depthdisable);
- memset(&m, 0, sizeof(m));
- m.tex[0] = R_GetTexture(texture);
- m.pointer_texcoord[0] = spritetexcoord2f;
- R_Mesh_State_Texture(&m);
-
varray_vertex3f[ 0] = origin[0] + left[0] * scalex2 + up[0] * scaley1;
varray_vertex3f[ 1] = origin[1] + left[1] * scalex2 + up[1] * scaley1;
varray_vertex3f[ 2] = origin[2] + left[2] * scalex2 + up[2] * scaley1;
varray_vertex3f[ 9] = origin[0] + left[0] * scalex1 + up[0] * scaley1;
varray_vertex3f[10] = origin[1] + left[1] * scalex1 + up[1] * scaley1;
varray_vertex3f[11] = origin[2] + left[2] * scalex1 + up[2] * scaley1;
+
+ memset(&m, 0, sizeof(m));
+ m.tex[0] = R_GetTexture(texture);
+ m.pointer_texcoord[0] = spritetexcoord2f;
+ m.pointer_vertex = varray_vertex3f;
+ R_Mesh_State(&m);
+ GL_Color(cr, cg, cb, ca);
R_Mesh_Draw(4, 2, polygonelements);
}
projects / xonotic / darkplaces.git / blobdiff