X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_rmain.c;h=0ce87d35782dbee5e89cbaeb9b2b8ed590f4df0c;hb=4b08159c59c67950fccf0fc9a1d038d53ecb0203;hp=7ab983c1839144d6f1464d232419a1bf43b5134f;hpb=64a368a5aabc3826fa374e35cd5e55909c8fa344;p=xonotic%2Fdarkplaces.git diff --git a/gl_rmain.c b/gl_rmain.c index 7ab983c1..0ce87d35 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -51,12 +51,14 @@ unsigned short d_lightstylevalue[256]; cvar_t r_drawentities = {0, "r_drawentities","1"}; cvar_t r_drawviewmodel = {0, "r_drawviewmodel","1"}; -cvar_t r_shadows = {CVAR_SAVE, "r_shadows", "1"}; +cvar_t r_shadows = {CVAR_SAVE, "r_shadows", "0"}; +cvar_t r_shadow_staticworldlights = {0, "r_shadow_staticworldlights", "1"}; cvar_t r_speeds = {0, "r_speeds","0"}; cvar_t r_fullbright = {0, "r_fullbright","0"}; cvar_t r_wateralpha = {CVAR_SAVE, "r_wateralpha","1"}; cvar_t r_dynamic = {CVAR_SAVE, "r_dynamic","1"}; cvar_t r_fullbrights = {CVAR_SAVE, "r_fullbrights", "1"}; +cvar_t r_shadow_cull = {0, "r_shadow_cull", "1"}; cvar_t gl_fogenable = {0, "gl_fogenable", "0"}; cvar_t gl_fogdensity = {0, "gl_fogdensity", "0.25"}; @@ -220,13 +222,15 @@ void GL_Main_Init(void) Cvar_RegisterVariable (&r_drawentities); Cvar_RegisterVariable (&r_drawviewmodel); Cvar_RegisterVariable (&r_shadows); + Cvar_RegisterVariable (&r_shadow_staticworldlights); Cvar_RegisterVariable (&r_speeds); Cvar_RegisterVariable (&r_fullbrights); Cvar_RegisterVariable (&r_wateralpha); Cvar_RegisterVariable (&r_dynamic); Cvar_RegisterVariable (&r_fullbright); Cvar_RegisterVariable (&r_textureunits); - if (gamemode == GAME_NEHAHRA) + Cvar_RegisterVariable (&r_shadow_cull); + if (gamemode == GAME_NEHAHRA || gamemode == GAME_NEXUIZ) Cvar_SetValue("r_fullbrights", 0); R_RegisterModule("GL_Main", gl_main_start, gl_main_shutdown, gl_main_newmap); } @@ -268,16 +272,6 @@ float R_FarClip_Finish(void) return r_farclip_meshfarclip - r_farclip_directiondist; } -/* -=============== -R_NewMap -=============== -*/ -void R_NewMap (void) -{ - R_Modules_NewMap(); -} - extern void R_Textures_Init(void); extern void Mod_RenderInit(void); extern void GL_Draw_Init(void); @@ -328,7 +322,7 @@ void GL_Init (void) Con_Printf ("\nengine extensions: %s\n", ENGINE_EXTENSIONS); } -int R_CullBox(const vec3_t emins, const vec3_t emaxs) +int R_CullBox(const vec3_t mins, const vec3_t maxs) { int i; mplane_t *p; @@ -339,35 +333,35 @@ int R_CullBox(const vec3_t emins, const vec3_t emaxs) { default: case 0: - if (p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2] < p->dist) + if (p->normal[0]*maxs[0] + p->normal[1]*maxs[1] + p->normal[2]*maxs[2] < p->dist) return true; break; case 1: - if (p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2] < p->dist) + if (p->normal[0]*mins[0] + p->normal[1]*maxs[1] + p->normal[2]*maxs[2] < p->dist) return true; break; case 2: - if (p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2] < p->dist) + if (p->normal[0]*maxs[0] + p->normal[1]*mins[1] + p->normal[2]*maxs[2] < p->dist) return true; break; case 3: - if (p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2] < p->dist) + if (p->normal[0]*mins[0] + p->normal[1]*mins[1] + p->normal[2]*maxs[2] < p->dist) return true; break; case 4: - if (p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2] < p->dist) + if (p->normal[0]*maxs[0] + p->normal[1]*maxs[1] + p->normal[2]*mins[2] < p->dist) return true; break; case 5: - if (p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2] < p->dist) + if (p->normal[0]*mins[0] + p->normal[1]*maxs[1] + p->normal[2]*mins[2] < p->dist) return true; break; case 6: - if (p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2] < p->dist) + if (p->normal[0]*maxs[0] + p->normal[1]*mins[1] + p->normal[2]*mins[2] < p->dist) return true; break; case 7: - if (p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2] < p->dist) + if (p->normal[0]*mins[0] + p->normal[1]*mins[1] + p->normal[2]*mins[2] < p->dist) return true; break; } @@ -375,48 +369,127 @@ int R_CullBox(const vec3_t emins, const vec3_t emaxs) return false; } -int R_NotCulledBox(const vec3_t emins, const vec3_t emaxs) +int PVS_CullBox(const vec3_t mins, const vec3_t maxs) { - int i; - mplane_t *p; - for (i = 0;i < 4;i++) + int stackpos, sides; + mnode_t *node, *stack[4096]; + if (cl.worldmodel == NULL) + return false; + stackpos = 0; + stack[stackpos++] = cl.worldmodel->nodes; + while (stackpos) { - p = frustum + i; - switch(p->signbits) + node = stack[--stackpos]; + if (node->contents < 0) { - default: - case 0: - if (p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2] < p->dist) - return false; - break; - case 1: - if (p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2] < p->dist) + if (((mleaf_t *)node)->pvsframe == cl.worldmodel->pvsframecount) return false; - break; - case 2: - if (p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2] < p->dist) - return false; - break; - case 3: - if (p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2] < p->dist) - return false; - break; - case 4: - if (p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2] < p->dist) - return false; - break; - case 5: - if (p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2] < p->dist) + } + else + { + sides = BoxOnPlaneSide(mins, maxs, node->plane); + if (sides & 2 && stackpos < 4096) + stack[stackpos++] = node->children[1]; + if (sides & 1 && stackpos < 4096) + stack[stackpos++] = node->children[0]; + } + } + return true; +} + +int VIS_CullBox(const vec3_t mins, const vec3_t maxs) +{ + int stackpos, sides; + mnode_t *node, *stack[4096]; + if (R_CullBox(mins, maxs)) + return true; + if (cl.worldmodel == NULL) + return false; + stackpos = 0; + stack[stackpos++] = cl.worldmodel->nodes; + while (stackpos) + { + node = stack[--stackpos]; + if (node->contents < 0) + { + if (((mleaf_t *)node)->visframe == r_framecount) return false; - break; - case 6: - if (p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2] < p->dist) + } + else + { + sides = BoxOnPlaneSide(mins, maxs, node->plane); + if (sides & 2 && stackpos < 4096) + stack[stackpos++] = node->children[1]; + if (sides & 1 && stackpos < 4096) + stack[stackpos++] = node->children[0]; + } + } + return true; +} + +int R_CullSphere(const vec3_t origin, vec_t radius) +{ + return (DotProduct(frustum[0].normal, origin) + radius < frustum[0].dist + || DotProduct(frustum[1].normal, origin) + radius < frustum[1].dist + || DotProduct(frustum[2].normal, origin) + radius < frustum[2].dist + || DotProduct(frustum[3].normal, origin) + radius < frustum[3].dist); +} + +int PVS_CullSphere(const vec3_t origin, vec_t radius) +{ + int stackpos; + mnode_t *node, *stack[4096]; + float dist; + if (cl.worldmodel == NULL) + return false; + stackpos = 0; + stack[stackpos++] = cl.worldmodel->nodes; + while (stackpos) + { + node = stack[--stackpos]; + if (node->contents < 0) + { + if (((mleaf_t *)node)->pvsframe == cl.worldmodel->pvsframecount) return false; - break; - case 7: - if (p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2] < p->dist) + } + else + { + dist = PlaneDiff(origin, node->plane); + if (dist <= radius) + stack[stackpos++] = node->children[1]; + if (dist >= -radius) + stack[stackpos++] = node->children[0]; + } + } + return true; +} + +int VIS_CullSphere(const vec3_t origin, vec_t radius) +{ + int stackpos; + mnode_t *node, *stack[4096]; + float dist; + if (R_CullSphere(origin, radius)) + return true; + if (cl.worldmodel == NULL) + return false; + stackpos = 0; + stack[stackpos++] = cl.worldmodel->nodes; + while (stackpos) + { + node = stack[--stackpos]; + if (node->contents < 0) + { + if (((mleaf_t *)node)->visframe == r_framecount) return false; - break; + } + else + { + dist = PlaneDiff(origin, node->plane); + if (dist <= radius) + stack[stackpos++] = node->children[1]; + if (dist >= -radius) + stack[stackpos++] = node->children[0]; } } return true; @@ -428,7 +501,6 @@ int R_NotCulledBox(const vec3_t emins, const vec3_t emaxs) static void R_MarkEntities (void) { int i; - vec3_t v; entity_render_t *ent; ent = &cl_entities[0].render; @@ -445,29 +517,15 @@ static void R_MarkEntities (void) { ent = r_refdef.entities[i]; Mod_CheckLoaded(ent->model); - - // move view-relative models to where they should be - if (ent->flags & RENDER_VIEWMODEL) - { - // remove flag so it will not be repeated incase RelinkEntities is not called again for a while - ent->flags -= RENDER_VIEWMODEL; - // transform origin - VectorCopy(ent->origin, v); - ent->origin[0] = v[0] * vpn[0] + v[1] * vright[0] + v[2] * vup[0] + r_origin[0]; - ent->origin[1] = v[0] * vpn[1] + v[1] * vright[1] + v[2] * vup[1] + r_origin[1]; - ent->origin[2] = v[0] * vpn[2] + v[1] * vright[2] + v[2] * vup[2] + r_origin[2]; - // adjust angles - VectorAdd(ent->angles, r_refdef.viewangles, ent->angles); - } - - VectorCopy(ent->angles, v); - if (!ent->model || ent->model->type != mod_brush) - v[0] = -v[0]; - Matrix4x4_CreateFromQuakeEntity(&ent->matrix, ent->origin[0], ent->origin[1], ent->origin[2], v[0], v[1], v[2], ent->scale); - Matrix4x4_Invert_Simple(&ent->inversematrix, &ent->matrix); + // some of the renderer still relies on origin... + Matrix4x4_OriginFromMatrix(&ent->matrix, ent->origin); + // some of the renderer still relies on scale... + ent->scale = Matrix4x4_ScaleFromMatrix(&ent->matrix); R_LerpAnimation(ent); R_UpdateEntLights(ent); - if (R_NotCulledBox(ent->mins, ent->maxs)) + if ((chase_active.integer || !(ent->flags & RENDER_EXTERIORMODEL)) + && !VIS_CullSphere(ent->origin, (ent->model != NULL ? ent->model->radius : 16) * ent->scale) + && !VIS_CullBox(ent->mins, ent->maxs)) { ent->visframe = r_framecount; R_FarClip_Box(ent->mins, ent->maxs); @@ -502,6 +560,7 @@ int R_DrawBrushModelsSky (void) R_DrawViewModel ============= */ +/* void R_DrawViewModel (void) { entity_render_t *ent; @@ -518,9 +577,10 @@ void R_DrawViewModel (void) R_UpdateEntLights(ent); ent->model->Draw(ent); } +*/ void R_DrawNoModel(entity_render_t *ent); -void R_DrawModels (void) +void R_DrawModels () { int i; entity_render_t *ent; @@ -528,17 +588,13 @@ void R_DrawModels (void) if (!r_drawentities.integer) return; - R_DrawViewModel(); for (i = 0;i < r_refdef.numentities;i++) { ent = r_refdef.entities[i]; if (ent->visframe == r_framecount) { - if (ent->model) - { - if (ent->model->Draw) - ent->model->Draw(ent); - } + if (ent->model && ent->model->Draw != NULL) + ent->model->Draw(ent); else R_DrawNoModel(ent); } @@ -559,231 +615,485 @@ void R_DrawFakeShadows (void) for (i = 0;i < r_refdef.numentities;i++) { ent = r_refdef.entities[i]; - if (ent->model && ent->model->DrawFakeShadow) + if ((ent->flags & RENDER_SHADOW) && ent->model && ent->model->DrawFakeShadow) ent->model->DrawFakeShadow(ent); } } -void R_TestAndDrawShadowVolume(entity_render_t *ent, vec3_t lightorigin, float lightradius, int visiblevolume) +#include "r_shadow.h" + +int shadowframecount = 0; + +int Light_CullBox(const vec3_t mins, const vec3_t maxs) +{ + int stackpos, sides; + mnode_t *node, *stack[4096]; + if (cl.worldmodel == NULL) + return false; + stackpos = 0; + stack[stackpos++] = cl.worldmodel->nodes; + while (stackpos) + { + node = stack[--stackpos]; + if (node->contents < 0) + { + if (((mleaf_t *)node)->worldnodeframe == shadowframecount) + return false; + } + else + { + sides = BoxOnPlaneSide(mins, maxs, node->plane); + if (sides & 2 && stackpos < 4096) + stack[stackpos++] = node->children[1]; + if (sides & 1 && stackpos < 4096) + stack[stackpos++] = node->children[0]; + } + } + return true; +} + +int LightAndVis_CullBox(const vec3_t mins, const vec3_t maxs) +{ + int stackpos, sides; + mnode_t *node, *stack[4096]; + if (R_CullBox(mins, maxs)) + return true; + if (cl.worldmodel == NULL) + return false; + stackpos = 0; + stack[stackpos++] = cl.worldmodel->nodes; + while (stackpos) + { + node = stack[--stackpos]; + if (node->contents < 0) + { + if (((mleaf_t *)node)->visframe == r_framecount && ((mleaf_t *)node)->worldnodeframe == shadowframecount) + return false; + } + else + { + sides = BoxOnPlaneSide(mins, maxs, node->plane); + if (sides & 2 && stackpos < 4096) + stack[stackpos++] = node->children[1]; + if (sides & 1 && stackpos < 4096) + stack[stackpos++] = node->children[0]; + } + } + return true; +} + +int LightAndVis_CullPointCloud(int numpoints, const float *points) { int i; - vec3_t p, p2, temp, relativelightorigin; - float dist, projectdistance; - // rough checks - if (ent->model && ent->model->DrawShadowVolume) + const float *p; + int stackpos, sides; + mnode_t *node, *stack[4096]; + //if (R_CullBox(mins, maxs)) + // return true; + if (cl.worldmodel == NULL) + return false; + stackpos = 0; + stack[stackpos++] = cl.worldmodel->nodes; + while (stackpos) { - temp[0] = bound(ent->mins[0], lightorigin[0], ent->maxs[0]) - lightorigin[0]; - temp[1] = bound(ent->mins[1], lightorigin[1], ent->maxs[1]) - lightorigin[1]; - temp[2] = bound(ent->mins[2], lightorigin[2], ent->maxs[2]) - lightorigin[2]; - dist = DotProduct(temp, temp); - if (dist < lightradius * lightradius) + node = stack[--stackpos]; + if (node->contents < 0) { - projectdistance = lightradius - sqrt(dist); - { -#if 0 - int d0, d1, d2, d3; - // calculate projected bounding box and decide if it is on-screen - d0 = false; - d1 = false; - d2 = false; - d3 = false; - for (i = 0;i < 8;i++) - { - p[0] = i & 1 ? ent->maxs[0] : ent->mins[0]; - p[1] = i & 2 ? ent->maxs[1] : ent->mins[1]; - p[2] = i & 4 ? ent->maxs[2] : ent->mins[2]; - VectorSubtract(p, lightorigin, temp); - dist = projectdistance / sqrt(DotProduct(temp, temp)); - VectorMA(p, dist, temp, p2); - if (!d0 && (DotProduct(p , frustum[0].normal) < frustum[0].dist || DotProduct(p2, frustum[0].normal) < frustum[0].dist)) - d0 = true; - if (!d1 && (DotProduct(p , frustum[1].normal) < frustum[1].dist || DotProduct(p2, frustum[1].normal) < frustum[1].dist)) - d1 = true; - if (!d2 && (DotProduct(p , frustum[2].normal) < frustum[2].dist || DotProduct(p2, frustum[2].normal) < frustum[2].dist)) - d2 = true; - if (!d3 && (DotProduct(p , frustum[3].normal) < frustum[3].dist || DotProduct(p2, frustum[3].normal) < frustum[3].dist)) - d3 = true; - } - if (d0 && d1 && d2 && d3) -#else - vec3_t mins, maxs; - // calculate projected bounding box and decide if it is on-screen - VectorCopy(ent->mins, mins); - VectorCopy(ent->maxs, maxs); - for (i = 0;i < 8;i++) - { - p[0] = i & 1 ? ent->maxs[0] : ent->mins[0]; - p[1] = i & 2 ? ent->maxs[1] : ent->mins[1]; - p[2] = i & 4 ? ent->maxs[2] : ent->mins[2]; - VectorSubtract(p, lightorigin, temp); - dist = projectdistance / sqrt(DotProduct(temp, temp)); - VectorMA(p, dist, temp, p2); - if (mins[0] > p2[0]) mins[0] = p2[0];if (maxs[0] < p2[0]) maxs[0] = p2[0]; - if (mins[1] > p2[1]) mins[1] = p2[1];if (maxs[1] < p2[1]) maxs[1] = p2[1]; - if (mins[2] > p2[2]) mins[2] = p2[2];if (maxs[2] < p2[2]) maxs[2] = p2[2]; - } - if (R_NotCulledBox(mins, maxs)) -#endif + if (((mleaf_t *)node)->visframe == r_framecount && ((mleaf_t *)node)->worldnodeframe == shadowframecount) + return false; + } + else + { + sides = 0; + for (i = 0, p = points;i < numpoints && sides != 3;i++, p += 3) { - Matrix4x4_Transform(&ent->inversematrix, lightorigin, relativelightorigin); - R_Mesh_Matrix(&ent->matrix); - ent->model->DrawShadowVolume (ent, relativelightorigin, lightradius, visiblevolume); - } + if (DotProduct(p, node->plane->normal) < node->plane->dist) + sides |= 1; + else + sides |= 2; } + if (sides & 2 && stackpos < 4096) + stack[stackpos++] = node->children[1]; + if (sides & 1 && stackpos < 4096) + stack[stackpos++] = node->children[0]; } } + return true; } -void R_DrawWorldLightShadowVolume(mlight_t *sl) + +void R_TestAndDrawShadowVolume(entity_render_t *ent, vec3_t lightorigin, float cullradius, float lightradius, vec3_t lightmins, vec3_t lightmaxs, vec3_t clipmins, vec3_t clipmaxs, int lightmarked) { - shadowmesh_t *mesh; - R_Mesh_Matrix(&cl_entities[0].render.matrix); - for (mesh = sl->shadowvolume;mesh;mesh = mesh->next) + vec3_t relativelightorigin; + #if 0 + int i; + vec3_t temp; + float dist, projectdistance; + float points[16][3]; + #endif + // rough checks + if (!(ent->flags & RENDER_SHADOW) || ent->model == NULL || ent->model->DrawShadowVolume == NULL) + return; + if (r_shadow_cull.integer) { - memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->elements); + if (ent->maxs[0] < lightmins[0] || ent->mins[0] > lightmaxs[0] + || ent->maxs[1] < lightmins[1] || ent->mins[1] > lightmaxs[1] + || ent->maxs[2] < lightmins[2] || ent->mins[2] > lightmaxs[2] + || (lightmarked && Light_CullBox(ent->mins, ent->maxs))) + return; } + #if 0 + if (r_shadow_cull.integer) + { + projectdistance = cullradius; + // calculate projected bounding box and decide if it is on-screen + for (i = 0;i < 8;i++) + { + temp[0] = i & 1 ? ent->model->normalmaxs[0] : ent->model->normalmins[0]; + temp[1] = i & 2 ? ent->model->normalmaxs[1] : ent->model->normalmins[1]; + temp[2] = i & 4 ? ent->model->normalmaxs[2] : ent->model->normalmins[2]; + Matrix4x4_Transform(&ent->matrix, temp, points[i]); + VectorSubtract(points[i], lightorigin, temp); + dist = projectdistance / sqrt(DotProduct(temp, temp)); + VectorMA(lightorigin, dist, temp, points[i+8]); + } + if (LightAndVis_CullPointCloud(16, points[0])) + return; + /* + for (i = 0;i < 8;i++) + { + p2[0] = i & 1 ? ent->model->normalmaxs[0] : ent->model->normalmins[0]; + p2[1] = i & 2 ? ent->model->normalmaxs[1] : ent->model->normalmins[1]; + p2[2] = i & 4 ? ent->model->normalmaxs[2] : ent->model->normalmins[2]; + Matrix4x4_Transform(&ent->matrix, p2, p); + VectorSubtract(p, lightorigin, temp); + dist = projectdistance / sqrt(DotProduct(temp, temp)); + VectorMA(p, dist, temp, p2); + if (i) + { + if (mins[0] > p[0]) mins[0] = p[0];if (maxs[0] < p[0]) maxs[0] = p[0]; + if (mins[1] > p[1]) mins[1] = p[1];if (maxs[1] < p[1]) maxs[1] = p[1]; + if (mins[2] > p[2]) mins[2] = p[2];if (maxs[2] < p[2]) maxs[2] = p[2]; + } + else + { + VectorCopy(p, mins); + VectorCopy(p, maxs); + } + if (mins[0] > p2[0]) mins[0] = p2[0];if (maxs[0] < p2[0]) maxs[0] = p2[0]; + if (mins[1] > p2[1]) mins[1] = p2[1];if (maxs[1] < p2[1]) maxs[1] = p2[1]; + if (mins[2] > p2[2]) mins[2] = p2[2];if (maxs[2] < p2[2]) maxs[2] = p2[2]; + } + if (mins[0] >= clipmaxs[0] || maxs[0] <= clipmins[0] + || mins[1] >= clipmaxs[1] || maxs[1] <= clipmins[1] + || mins[2] >= clipmaxs[2] || maxs[2] <= clipmins[2] + || LightAndVis_CullBox(mins, maxs)) + return; + */ + } + #endif + Matrix4x4_Transform(&ent->inversematrix, lightorigin, relativelightorigin); + ent->model->DrawShadowVolume (ent, relativelightorigin, lightradius); } -void R_DrawShadowVolumes (void) +void R_Shadow_DrawWorldLightShadowVolume(matrix4x4_t *matrix, worldlight_t *light); + +extern void R_Model_Brush_DrawLightForSurfaceList(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, msurface_t **surflist, int numsurfaces, const matrix4x4_t *matrix_modeltofilter, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz); +void R_ShadowVolumeLighting (int visiblevolumes) { - int i, lnum; + int i; entity_render_t *ent; - vec3_t mins, maxs;//, relativelightorigin; - mlight_t *sl; + int lnum; + float f, lightradius, cullradius; + vec3_t relativelightorigin, relativeeyeorigin, lightcolor, clipmins, clipmaxs; + worldlight_t *wl; rdlight_t *rd; rmeshstate_t m; + mleaf_t *leaf; + matrix4x4_t matrix; + matrix4x4_t matrix_worldtofilter, matrix_worldtoattenuationxyz, matrix_worldtoattenuationz; + matrix4x4_t matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz; - for (lnum = 0, sl = cl.worldmodel->lights;lnum < cl.worldmodel->numlights;lnum++, sl++) + if (visiblevolumes) { - if (d_lightstylevalue[sl->style] <= 0) - continue; - mins[0] = sl->origin[0] - sl->cullradius; - maxs[0] = sl->origin[0] + sl->cullradius; - mins[1] = sl->origin[1] - sl->cullradius; - maxs[1] = sl->origin[1] + sl->cullradius; - mins[2] = sl->origin[2] - sl->cullradius; - maxs[2] = sl->origin[2] + sl->cullradius; - if (R_CullBox(mins, maxs)) - continue; memset(&m, 0, sizeof(m)); m.blendfunc1 = GL_ONE; m.blendfunc2 = GL_ONE; + if (r_shadow_visiblevolumes.integer >= 2) + m.depthdisable = true; R_Mesh_State(&m); + qglDisable(GL_CULL_FACE); GL_Color(0.0 * r_colorscale, 0.0125 * r_colorscale, 0.1 * r_colorscale, 1); - if (sl->shadowvolume) - R_DrawWorldLightShadowVolume(sl); - else - { - ent = &cl_entities[0].render; - R_TestAndDrawShadowVolume(ent, sl->origin, sl->cullradius, true); - } - /* - ent = &cl_entities[0].render; - if (ent->model && ent->model->DrawShadowVolume && ent->maxs[0] >= mins[0] && ent->mins[0] <= maxs[0] && ent->maxs[1] >= mins[1] && ent->mins[1] <= maxs[1] && ent->maxs[2] >= mins[2] && ent->mins[2] <= maxs[2]) - { - Matrix4x4_Transform(&ent->inversematrix, sl->origin, relativelightorigin); - R_Mesh_Matrix(&ent->matrix); - ent->model->DrawShadowVolume (ent, relativelightorigin, sl->cullradius, true); - } - */ - if (r_drawentities.integer) + } + else + R_Shadow_Stage_Begin(); + shadowframecount++; + if (r_shadow_realtime_world.integer) + { + R_Shadow_LoadWorldLightsIfNeeded(); + for (lnum = 0, wl = r_shadow_worldlightchain;wl;wl = wl->next, lnum++) { - for (i = 0;i < r_refdef.numentities;i++) + if (d_lightstylevalue[wl->style] <= 0) + continue; + if (R_CullBox(wl->mins, wl->maxs)) + //if (R_CullSphere(wl->origin, cullradius)) + continue; + //if (R_CullBox(wl->mins, wl->maxs) || R_CullSphere(wl->origin, lightradius)) + // continue; + //if (VIS_CullBox(wl->mins, wl->maxs) || VIS_CullSphere(wl->origin, lightradius)) + // continue; + if (r_shadow_debuglight.integer >= 0 && lnum != r_shadow_debuglight.integer) + continue; + + cullradius = wl->cullradius; + lightradius = wl->lightradius; + + if (cl.worldmodel != NULL) { - ent = r_refdef.entities[i]; - /* - if (ent->mins[0] <= sl->maxs[0] - && ent->maxs[0] >= sl->mins[0] - && ent->mins[1] <= sl->maxs[1] - && ent->maxs[1] >= sl->mins[1] - && ent->mins[2] <= sl->maxs[2] - && ent->maxs[2] >= sl->mins[2]) - */ - R_TestAndDrawShadowVolume(ent, sl->origin, sl->cullradius, true); - /* - ent = r_refdef.entities[i]; - if (ent->model && ent->model->DrawShadowVolume && ent->maxs[0] >= mins[0] && ent->mins[0] <= maxs[0] && ent->maxs[1] >= mins[1] && ent->mins[1] <= maxs[1] && ent->maxs[2] >= mins[2] && ent->mins[2] <= maxs[2]) + for (i = 0;i < wl->numleafs;i++) + if (wl->leafs[i]->visframe == r_framecount) + break; + if (i == wl->numleafs) + continue; + leaf = wl->leafs[i++]; + VectorCopy(leaf->mins, clipmins); + VectorCopy(leaf->maxs, clipmaxs); + for (;i < wl->numleafs;i++) + { + leaf = wl->leafs[i]; + if (leaf->visframe == r_framecount) + { + if (clipmins[0] > leaf->mins[0]) clipmins[0] = leaf->mins[0]; + if (clipmaxs[0] < leaf->maxs[0]) clipmaxs[0] = leaf->maxs[0]; + if (clipmins[1] > leaf->mins[1]) clipmins[1] = leaf->mins[1]; + if (clipmaxs[1] < leaf->maxs[1]) clipmaxs[1] = leaf->maxs[1]; + if (clipmins[2] > leaf->mins[2]) clipmins[2] = leaf->mins[2]; + if (clipmaxs[2] < leaf->maxs[2]) clipmaxs[2] = leaf->maxs[2]; + } + } + if (clipmins[0] < wl->mins[0]) clipmins[0] = wl->mins[0]; + if (clipmaxs[0] > wl->maxs[0]) clipmaxs[0] = wl->maxs[0]; + if (clipmins[1] < wl->mins[1]) clipmins[1] = wl->mins[1]; + if (clipmaxs[1] > wl->maxs[1]) clipmaxs[1] = wl->maxs[1]; + if (clipmins[2] < wl->mins[2]) clipmins[2] = wl->mins[2]; + if (clipmaxs[2] > wl->maxs[2]) clipmaxs[2] = wl->maxs[2]; + } + else + { + VectorCopy(wl->mins, clipmins); + VectorCopy(wl->maxs, clipmaxs); + } + + //if (R_Shadow_ScissorForBBoxAndSphere(clipmins, clipmaxs, wl->origin, wl->cullradius)) + if (R_CullBox(clipmins, clipmaxs) || R_Shadow_ScissorForBBox(clipmins, clipmaxs)) + continue; + + // mark the leafs we care about so only things in those leafs will matter + if (cl.worldmodel != NULL) + for (i = 0;i < wl->numleafs;i++) + wl->leafs[i]->worldnodeframe = shadowframecount; + + f = d_lightstylevalue[wl->style] * (1.0f / 256.0f); + VectorScale(wl->light, f, lightcolor); + if (wl->selected) + { + f = 2 + sin(realtime * M_PI * 4.0); + VectorScale(lightcolor, f, lightcolor); + } + + if (wl->castshadows && (gl_stencil || visiblevolumes)) + { + if (!visiblevolumes) + R_Shadow_Stage_ShadowVolumes(); + ent = &cl_entities[0].render; + if (wl->shadowvolume && r_shadow_staticworldlights.integer) + R_Shadow_DrawWorldLightShadowVolume(&ent->matrix, wl); + else + R_TestAndDrawShadowVolume(ent, wl->origin, cullradius, lightradius, wl->mins, wl->maxs, clipmins, clipmaxs, true); + if (r_drawentities.integer) + for (i = 0;i < r_refdef.numentities;i++) + R_TestAndDrawShadowVolume(r_refdef.entities[i], wl->origin, cullradius, lightradius, wl->mins, wl->maxs, clipmins, clipmaxs, true); + } + + if (!visiblevolumes) + { + if (wl->castshadows && gl_stencil) + R_Shadow_Stage_LightWithShadows(); + else + R_Shadow_Stage_LightWithoutShadows(); + + // calculate world to filter matrix + Matrix4x4_CreateFromQuakeEntity(&matrix, wl->origin[0], wl->origin[1], wl->origin[2], wl->angles[0], wl->angles[1], wl->angles[2], lightradius); + Matrix4x4_Invert_Simple(&matrix_worldtofilter, &matrix); + // calculate world to attenuationxyz/xy matrix + Matrix4x4_CreateFromQuakeEntity(&matrix, 0.5, 0.5, 0.5, 0, 0, 0, 0.5); + Matrix4x4_Concat(&matrix_worldtoattenuationxyz, &matrix, &matrix_worldtofilter); + // calculate world to attenuationz matrix + matrix.m[0][0] = 0;matrix.m[0][1] = 0;matrix.m[0][2] = 0.5;matrix.m[0][3] = 0.5; + matrix.m[1][0] = 0;matrix.m[1][1] = 0;matrix.m[1][2] = 0 ;matrix.m[1][3] = 0.5; + matrix.m[2][0] = 0;matrix.m[2][1] = 0;matrix.m[2][2] = 0 ;matrix.m[2][3] = 0.5; + matrix.m[3][0] = 0;matrix.m[3][1] = 0;matrix.m[3][2] = 0 ;matrix.m[3][3] = 1; + Matrix4x4_Concat(&matrix_worldtoattenuationz, &matrix, &matrix_worldtofilter); + + ent = &cl_entities[0].render; + if (ent->model && ent->model->DrawLight) + { + Matrix4x4_Transform(&ent->inversematrix, wl->origin, relativelightorigin); + Matrix4x4_Transform(&ent->inversematrix, r_origin, relativeeyeorigin); + Matrix4x4_Concat(&matrix_modeltofilter, &matrix_worldtofilter, &ent->matrix); + Matrix4x4_Concat(&matrix_modeltoattenuationxyz, &matrix_worldtoattenuationxyz, &ent->matrix); + Matrix4x4_Concat(&matrix_modeltoattenuationz, &matrix_worldtoattenuationz, &ent->matrix); + if (wl->numsurfaces) + R_Model_Brush_DrawLightForSurfaceList(ent, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, wl->surfaces, wl->numsurfaces, &matrix_modeltofilter, &matrix_modeltoattenuationxyz, &matrix_modeltoattenuationz); + else + ent->model->DrawLight(ent, relativelightorigin, relativeeyeorigin, lightradius / ent->scale, lightcolor, &matrix_modeltofilter, &matrix_modeltoattenuationxyz, &matrix_modeltoattenuationz); + } + if (r_drawentities.integer) { - Matrix4x4_Transform(&ent->inversematrix, sl->origin, relativelightorigin); - R_Mesh_Matrix(&ent->matrix); - ent->model->DrawShadowVolume (ent, relativelightorigin, sl->cullradius, true); + for (i = 0;i < r_refdef.numentities;i++) + { + ent = r_refdef.entities[i]; + if (ent->visframe == r_framecount && ent->model && ent->model->DrawLight + && ent->maxs[0] >= clipmins[0] && ent->mins[0] <= clipmaxs[0] + && ent->maxs[1] >= clipmins[1] && ent->mins[1] <= clipmaxs[1] + && ent->maxs[2] >= clipmins[2] && ent->mins[2] <= clipmaxs[2] + && !(ent->effects & EF_ADDITIVE) && ent->alpha == 1) + { + Matrix4x4_Transform(&ent->inversematrix, wl->origin, relativelightorigin); + Matrix4x4_Transform(&ent->inversematrix, r_origin, relativeeyeorigin); + Matrix4x4_Concat(&matrix_modeltofilter, &matrix_worldtofilter, &ent->matrix); + Matrix4x4_Concat(&matrix_modeltoattenuationxyz, &matrix_worldtoattenuationxyz, &ent->matrix); + Matrix4x4_Concat(&matrix_modeltoattenuationz, &matrix_worldtoattenuationz, &ent->matrix); + ent->model->DrawLight(ent, relativelightorigin, relativeeyeorigin, lightradius / ent->scale, lightcolor, &matrix_modeltofilter, &matrix_modeltoattenuationxyz, &matrix_modeltoattenuationz); + } + } } - */ } } } - - for (lnum = 0, rd = r_dlight;lnum < r_numdlights;lnum++, rd++) + if (r_shadow_realtime_dlight.integer) { - mins[0] = rd->origin[0] - rd->cullradius; - maxs[0] = rd->origin[0] + rd->cullradius; - mins[1] = rd->origin[1] - rd->cullradius; - maxs[1] = rd->origin[1] + rd->cullradius; - mins[2] = rd->origin[2] - rd->cullradius; - maxs[2] = rd->origin[2] + rd->cullradius; - if (R_CullBox(mins, maxs)) - continue; - memset(&m, 0, sizeof(m)); - m.blendfunc1 = GL_ONE; - m.blendfunc2 = GL_ONE; - R_Mesh_State(&m); - GL_Color(0.1 * r_colorscale, 0.0125 * r_colorscale, 0.0 * r_colorscale, 1); - ent = &cl_entities[0].render; - if (ent != rd->ent) - R_TestAndDrawShadowVolume(ent, rd->origin, rd->cullradius, true); - /* - ent = &cl_entities[0].render; - if (ent != rd->ent && ent->model && ent->model->DrawShadowVolume && ent->maxs[0] >= mins[0] && ent->mins[0] <= maxs[0] && ent->maxs[1] >= mins[1] && ent->mins[1] <= maxs[1] && ent->maxs[2] >= mins[2] && ent->mins[2] <= maxs[2]) + for (lnum = 0, rd = r_dlight;lnum < r_numdlights;lnum++, rd++) { - Matrix4x4_Transform(&ent->inversematrix, rd->origin, relativelightorigin); - R_Mesh_Matrix(&ent->matrix); - ent->model->DrawShadowVolume (ent, relativelightorigin, rd->cullradius, true); - } - */ - if (r_drawentities.integer) - { - for (i = 0;i < r_refdef.numentities;i++) + lightradius = rd->cullradius; + clipmins[0] = rd->origin[0] - lightradius; + clipmins[1] = rd->origin[1] - lightradius; + clipmins[2] = rd->origin[2] - lightradius; + clipmaxs[0] = rd->origin[0] + lightradius; + clipmaxs[1] = rd->origin[1] + lightradius; + clipmaxs[2] = rd->origin[2] + lightradius; + if (VIS_CullBox(clipmins, clipmaxs)) + continue; + + //if (R_Shadow_ScissorForBBoxAndSphere(clipmins, clipmaxs, rd->origin, cullradius)) + if (R_Shadow_ScissorForBBox(clipmins, clipmaxs)) + continue; + + cullradius = RadiusFromBoundsAndOrigin(clipmins, clipmaxs, rd->origin); + VectorScale(rd->light, (1.0f / 4096.0f), lightcolor); + + if (gl_stencil || visiblevolumes) { - ent = r_refdef.entities[i]; - if (ent != rd->ent) - R_TestAndDrawShadowVolume(ent, rd->origin, rd->cullradius, true); - /* - ent = r_refdef.entities[i]; - if (ent != rd->ent && ent->model && ent->model->DrawShadowVolume && ent->maxs[0] >= mins[0] && ent->mins[0] <= maxs[0] && ent->maxs[1] >= mins[1] && ent->mins[1] <= maxs[1] && ent->maxs[2] >= mins[2] && ent->mins[2] <= maxs[2]) + if (!visiblevolumes) + R_Shadow_Stage_ShadowVolumes(); + ent = &cl_entities[0].render; + R_TestAndDrawShadowVolume(ent, rd->origin, cullradius, lightradius, clipmins, clipmaxs, clipmins, clipmaxs, false); + if (r_drawentities.integer) + { + for (i = 0;i < r_refdef.numentities;i++) + { + ent = r_refdef.entities[i]; + if (ent != rd->ent) + R_TestAndDrawShadowVolume(ent, rd->origin, cullradius, lightradius, clipmins, clipmaxs, clipmins, clipmaxs, false); + } + } + } + + if (!visiblevolumes) + { + if (gl_stencil) + R_Shadow_Stage_LightWithShadows(); + else + R_Shadow_Stage_LightWithoutShadows(); + + // calculate world to filter matrix + Matrix4x4_CreateFromQuakeEntity(&matrix, rd->origin[0], rd->origin[1], rd->origin[2], 0, 0, 0, lightradius); + Matrix4x4_Invert_Simple(&matrix_worldtofilter, &matrix); + // calculate world to attenuationxyz/xy matrix + Matrix4x4_CreateFromQuakeEntity(&matrix, 0.5, 0.5, 0.5, 0, 0, 0, 0.5); + Matrix4x4_Concat(&matrix_worldtoattenuationxyz, &matrix, &matrix_worldtofilter); + // calculate world to attenuationz matrix + matrix.m[0][0] = 0;matrix.m[0][1] = 0;matrix.m[0][2] = 0.5;matrix.m[0][3] = 0.5; + matrix.m[1][0] = 0;matrix.m[1][1] = 0;matrix.m[1][2] = 0 ;matrix.m[1][3] = 0.5; + matrix.m[2][0] = 0;matrix.m[2][1] = 0;matrix.m[2][2] = 0 ;matrix.m[2][3] = 0.5; + matrix.m[3][0] = 0;matrix.m[3][1] = 0;matrix.m[3][2] = 0 ;matrix.m[3][3] = 1; + Matrix4x4_Concat(&matrix_worldtoattenuationz, &matrix, &matrix_worldtofilter); + + ent = &cl_entities[0].render; + if (ent->model && ent->model->DrawLight) { Matrix4x4_Transform(&ent->inversematrix, rd->origin, relativelightorigin); - R_Mesh_Matrix(&ent->matrix); - ent->model->DrawShadowVolume (ent, relativelightorigin, rd->cullradius, true); + Matrix4x4_Transform(&ent->inversematrix, r_origin, relativeeyeorigin); + Matrix4x4_Concat(&matrix_modeltofilter, &matrix_worldtofilter, &ent->matrix); + Matrix4x4_Concat(&matrix_modeltoattenuationxyz, &matrix_worldtoattenuationxyz, &ent->matrix); + Matrix4x4_Concat(&matrix_modeltoattenuationz, &matrix_worldtoattenuationz, &ent->matrix); + ent->model->DrawLight(ent, relativelightorigin, relativeeyeorigin, lightradius / ent->scale, lightcolor, &matrix_modeltofilter, &matrix_modeltoattenuationxyz, &matrix_modeltoattenuationz); + } + if (r_drawentities.integer) + { + for (i = 0;i < r_refdef.numentities;i++) + { + ent = r_refdef.entities[i]; + if (ent->visframe == r_framecount && ent->model && ent->model->DrawLight + && ent->maxs[0] >= clipmins[0] && ent->mins[0] <= clipmaxs[0] + && ent->maxs[1] >= clipmins[1] && ent->mins[1] <= clipmaxs[1] + && ent->maxs[2] >= clipmins[2] && ent->mins[2] <= clipmaxs[2] + && !(ent->effects & EF_ADDITIVE) && ent->alpha == 1) + { + Matrix4x4_Transform(&ent->inversematrix, rd->origin, relativelightorigin); + Matrix4x4_Transform(&ent->inversematrix, r_origin, relativeeyeorigin); + Matrix4x4_Concat(&matrix_modeltofilter, &matrix_worldtofilter, &ent->matrix); + Matrix4x4_Concat(&matrix_modeltoattenuationxyz, &matrix_worldtoattenuationxyz, &ent->matrix); + Matrix4x4_Concat(&matrix_modeltoattenuationz, &matrix_worldtoattenuationz, &ent->matrix); + ent->model->DrawLight(ent, relativelightorigin, relativeeyeorigin, lightradius / ent->scale, lightcolor, &matrix_modeltofilter, &matrix_modeltoattenuationxyz, &matrix_modeltoattenuationz); + } + } } - */ } } } + + if (!visiblevolumes) + R_Shadow_Stage_End(); + qglEnable(GL_CULL_FACE); + qglDisable(GL_SCISSOR_TEST); } static void R_SetFrustum (void) { - int i; - // LordHavoc: note to all quake engine coders, the special case for 90 // degrees assumed a square view (wrong), so I removed it, Quake2 has it // disabled as well. + // rotate VPN right by FOV_X/2 degrees RotatePointAroundVector( frustum[0].normal, vup, vpn, -(90-r_refdef.fov_x / 2 ) ); + frustum[0].dist = DotProduct (r_origin, frustum[0].normal); + PlaneClassify(&frustum[0]); + // rotate VPN left by FOV_X/2 degrees RotatePointAroundVector( frustum[1].normal, vup, vpn, 90-r_refdef.fov_x / 2 ); + frustum[1].dist = DotProduct (r_origin, frustum[1].normal); + PlaneClassify(&frustum[1]); + // rotate VPN up by FOV_X/2 degrees RotatePointAroundVector( frustum[2].normal, vright, vpn, 90-r_refdef.fov_y / 2 ); + frustum[2].dist = DotProduct (r_origin, frustum[2].normal); + PlaneClassify(&frustum[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); - PlaneClassify(&frustum[i]); - } + frustum[3].dist = DotProduct (r_origin, frustum[3].normal); + PlaneClassify(&frustum[3]); } /* @@ -828,17 +1138,17 @@ static void R_BlendView(void) R_Mesh_Matrix(&r_identitymatrix); R_Mesh_State(&m); + R_Mesh_GetSpace(3); r = 64000; - varray_vertex[0] = r_origin[0] + vpn[0] * 1.5 - vright[0] * r - vup[0] * r; - varray_vertex[1] = r_origin[1] + vpn[1] * 1.5 - vright[1] * r - vup[1] * r; - varray_vertex[2] = r_origin[2] + vpn[2] * 1.5 - vright[2] * r - vup[2] * r; - r *= 3; - varray_vertex[4] = varray_vertex[0] + vup[0] * r; - varray_vertex[5] = varray_vertex[1] + vup[1] * r; - varray_vertex[6] = varray_vertex[2] + vup[2] * r; - varray_vertex[8] = varray_vertex[0] + vright[0] * r; - varray_vertex[9] = varray_vertex[1] + vright[1] * r; - varray_vertex[10] = varray_vertex[2] + vright[2] * r; + varray_vertex3f[0] = r_origin[0] + vpn[0] * 1.5 - vright[0] * r - vup[0] * r; + varray_vertex3f[1] = r_origin[1] + vpn[1] * 1.5 - vright[1] * r - vup[1] * r; + varray_vertex3f[2] = r_origin[2] + vpn[2] * 1.5 - vright[2] * r - vup[2] * r; + varray_vertex3f[3] = r_origin[0] + vpn[0] * 1.5 - vright[0] * r + vup[0] * r * 3; + varray_vertex3f[4] = r_origin[1] + vpn[1] * 1.5 - vright[1] * r + vup[1] * r * 3; + varray_vertex3f[5] = r_origin[2] + vpn[2] * 1.5 - vright[2] * r + vup[2] * r * 3; + varray_vertex3f[6] = r_origin[0] + vpn[0] * 1.5 + vright[0] * r * 3 - vup[0] * r; + varray_vertex3f[7] = r_origin[1] + vpn[1] * 1.5 + vright[1] * r * 3 - vup[1] * r; + varray_vertex3f[8] = r_origin[2] + vpn[2] * 1.5 + vright[2] * r * 3 - vup[2] * r; GL_Color(r_refdef.viewblend[0], r_refdef.viewblend[1], r_refdef.viewblend[2], r_refdef.viewblend[3]); R_Mesh_Draw(3, 1, polygonelements); } @@ -850,12 +1160,22 @@ R_RenderView r_refdef must be set before the first call ================ */ +extern void R_DrawLightningBeams (void); void R_RenderView (void) { entity_render_t *world; if (!r_refdef.entities/* || !cl.worldmodel*/) return; //Host_Error ("R_RenderView: NULL worldmodel"); + if (r_shadow_realtime_world.integer) + { + if (!gl_stencil) + { + Con_Printf("Stencil not enabled, turning off r_shadow_realtime_world, please type vid_stencil 1;vid_bitsperpixel 32;vid_restart and try again\n"); + Cvar_SetValueQuick(&r_shadow_realtime_world, 0); + } + } + world = &cl_entities[0].render; // FIXME: move to client @@ -870,19 +1190,27 @@ void R_RenderView (void) R_BuildLightList(); R_TimeReport("setup"); + R_WorldVisibility(world); + R_TimeReport("worldvis"); + R_FarClip_Start(r_origin, vpn, 768.0f); R_MarkEntities(); r_farclip = R_FarClip_Finish() + 256.0f; R_TimeReport("markentity"); GL_SetupView_ViewPort(r_refdef.x, r_refdef.y, r_refdef.width, r_refdef.height); - GL_SetupView_Mode_Perspective((double) r_refdef.height / r_refdef.width, r_refdef.fov_x, r_refdef.fov_y, 1.0f, r_farclip); + if (r_shadow_realtime_world.integer || gl_stencil) + 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.vieworg, r_refdef.viewangles); qglDepthFunc(GL_LEQUAL); - + R_Mesh_Start(); R_MeshQueue_BeginScene(); + R_Shadow_UpdateWorldLightSelection(); + if (R_DrawBrushModelsSky()) R_TimeReport("bmodelsky"); @@ -894,9 +1222,24 @@ void R_RenderView (void) if (!intimerefresh && !r_speeds.integer) S_ExtraUpdate (); - R_DrawModels(); + R_DrawModels(r_shadow_realtime_world.integer); R_TimeReport("models"); + if (r_shadows.integer == 1 && !r_shadow_realtime_world.integer) + { + R_DrawFakeShadows(); + R_TimeReport("fakeshadow"); + } + + if (r_shadow_realtime_world.integer || r_shadow_realtime_dlight.integer) + { + R_ShadowVolumeLighting(false); + R_TimeReport("dynlight"); + } + + R_DrawLightningBeams(); + R_TimeReport("lightning"); + R_DrawParticles(); R_TimeReport("particles"); @@ -917,16 +1260,13 @@ void R_RenderView (void) R_MeshQueue_Render(); R_MeshQueue_EndScene(); - if (r_shadows.integer == 1) - { - R_DrawFakeShadows(); - R_TimeReport("fakeshadows"); - } - if (r_shadows.integer == 2) + + if (r_shadow_visiblevolumes.integer) { - R_DrawShadowVolumes(); - R_TimeReport("shadowvolumes"); + R_ShadowVolumeLighting(true); + R_TimeReport("shadowvolume"); } + R_Mesh_Finish(); R_TimeReport("meshfinish"); } @@ -942,6 +1282,7 @@ void R_DrawBBoxMesh(vec3_t mins, vec3_t maxs, float cr, float cg, float cb, floa R_Mesh_Matrix(&r_identitymatrix); R_Mesh_State(&m); + R_Mesh_GetSpace(8); varray_vertex[ 0] = mins[0];varray_vertex[ 1] = mins[1];varray_vertex[ 2] = mins[2]; varray_vertex[ 4] = maxs[0];varray_vertex[ 5] = mins[1];varray_vertex[ 6] = mins[2]; varray_vertex[ 8] = mins[0];varray_vertex[ 9] = maxs[1];varray_vertex[10] = mins[2]; @@ -969,10 +1310,22 @@ void R_DrawBBoxMesh(vec3_t mins, vec3_t maxs, float cr, float cg, float cb, floa } */ +int nomodelelements[24] = +{ + 5, 2, 0, + 5, 1, 2, + 5, 0, 3, + 5, 3, 1, + 0, 2, 4, + 2, 1, 4, + 3, 0, 4, + 1, 3, 4 +}; + void R_DrawNoModelCallback(const void *calldata1, int calldata2) { const entity_render_t *ent = calldata1; - int i, element[24]; + int i; float f1, f2, *c, diff[3]; rmeshstate_t m; memset(&m, 0, sizeof(m)); @@ -994,32 +1347,26 @@ void R_DrawNoModelCallback(const void *calldata1, int calldata2) R_Mesh_Matrix(&ent->matrix); R_Mesh_State(&m); - element[ 0] = 5;element[ 1] = 2;element[ 2] = 0; - element[ 3] = 5;element[ 4] = 1;element[ 5] = 2; - element[ 6] = 5;element[ 7] = 0;element[ 8] = 3; - element[ 9] = 5;element[10] = 3;element[11] = 1; - element[12] = 0;element[13] = 2;element[14] = 4; - element[15] = 2;element[16] = 1;element[17] = 4; - element[18] = 3;element[19] = 0;element[20] = 4; - element[21] = 1;element[22] = 3;element[23] = 4; - varray_vertex[ 0] = -16;varray_vertex[ 1] = 0;varray_vertex[ 2] = 0; - varray_vertex[ 4] = 16;varray_vertex[ 5] = 0;varray_vertex[ 6] = 0; - varray_vertex[ 8] = 0;varray_vertex[ 9] = -16;varray_vertex[10] = 0; - varray_vertex[12] = 0;varray_vertex[13] = 16;varray_vertex[14] = 0; - varray_vertex[16] = 0;varray_vertex[17] = 0;varray_vertex[18] = -16; - varray_vertex[20] = 0;varray_vertex[21] = 0;varray_vertex[22] = 16; - varray_color[ 0] = 0.00f * r_colorscale;varray_color[ 1] = 0.00f * r_colorscale;varray_color[ 2] = 0.50f * r_colorscale;varray_color[ 3] = ent->alpha; - varray_color[ 4] = 0.00f * r_colorscale;varray_color[ 5] = 0.00f * r_colorscale;varray_color[ 6] = 0.50f * r_colorscale;varray_color[ 7] = ent->alpha; - varray_color[ 8] = 0.00f * r_colorscale;varray_color[ 9] = 0.50f * r_colorscale;varray_color[10] = 0.00f * r_colorscale;varray_color[11] = ent->alpha; - varray_color[12] = 0.00f * r_colorscale;varray_color[13] = 0.50f * r_colorscale;varray_color[14] = 0.00f * r_colorscale;varray_color[15] = ent->alpha; - varray_color[16] = 0.50f * r_colorscale;varray_color[17] = 0.00f * r_colorscale;varray_color[18] = 0.00f * r_colorscale;varray_color[19] = ent->alpha; - varray_color[20] = 0.50f * r_colorscale;varray_color[21] = 0.00f * r_colorscale;varray_color[22] = 0.00f * r_colorscale;varray_color[23] = ent->alpha; + GL_UseColorArray(); + R_Mesh_GetSpace(6); + varray_vertex3f[ 0] = -16;varray_vertex3f[ 1] = 0;varray_vertex3f[ 2] = 0; + varray_vertex3f[ 3] = 16;varray_vertex3f[ 4] = 0;varray_vertex3f[ 5] = 0; + varray_vertex3f[ 6] = 0;varray_vertex3f[ 7] = -16;varray_vertex3f[ 8] = 0; + varray_vertex3f[ 9] = 0;varray_vertex3f[10] = 16;varray_vertex3f[11] = 0; + varray_vertex3f[12] = 0;varray_vertex3f[13] = 0;varray_vertex3f[14] = -16; + varray_vertex3f[15] = 0;varray_vertex3f[16] = 0;varray_vertex3f[17] = 16; + varray_color4f[ 0] = 0.00f * r_colorscale;varray_color4f[ 1] = 0.00f * r_colorscale;varray_color4f[ 2] = 0.50f * r_colorscale;varray_color4f[ 3] = ent->alpha; + varray_color4f[ 4] = 0.00f * r_colorscale;varray_color4f[ 5] = 0.00f * r_colorscale;varray_color4f[ 6] = 0.50f * r_colorscale;varray_color4f[ 7] = ent->alpha; + varray_color4f[ 8] = 0.00f * r_colorscale;varray_color4f[ 9] = 0.50f * r_colorscale;varray_color4f[10] = 0.00f * r_colorscale;varray_color4f[11] = ent->alpha; + varray_color4f[12] = 0.00f * r_colorscale;varray_color4f[13] = 0.50f * r_colorscale;varray_color4f[14] = 0.00f * r_colorscale;varray_color4f[15] = ent->alpha; + varray_color4f[16] = 0.50f * r_colorscale;varray_color4f[17] = 0.00f * r_colorscale;varray_color4f[18] = 0.00f * r_colorscale;varray_color4f[19] = ent->alpha; + varray_color4f[20] = 0.50f * r_colorscale;varray_color4f[21] = 0.00f * r_colorscale;varray_color4f[22] = 0.00f * r_colorscale;varray_color4f[23] = ent->alpha; if (fogenabled) { VectorSubtract(ent->origin, r_origin, diff); f2 = exp(fogdensity/DotProduct(diff, diff)); f1 = 1 - f2; - for (i = 0, c = varray_color;i < 6;i++, c += 4) + for (i = 0, c = varray_color4f;i < 6;i++, c += 4) { c[0] = (c[0] * f1 + fogcolor[0] * f2) * r_colorscale; c[1] = (c[1] * f1 + fogcolor[1] * f2) * r_colorscale; @@ -1028,15 +1375,14 @@ void R_DrawNoModelCallback(const void *calldata1, int calldata2) } else { - for (i = 0, c = varray_color;i < 6;i++, c += 4) + for (i = 0, c = varray_color4f;i < 6;i++, c += 4) { c[0] *= r_colorscale; c[1] *= r_colorscale; c[2] *= r_colorscale; } } - GL_UseColorArray(); - R_Mesh_Draw(6, 8, element); + R_Mesh_Draw(6, 8, nomodelelements); } void R_DrawNoModel(entity_render_t *ent) @@ -1047,7 +1393,7 @@ void R_DrawNoModel(entity_render_t *ent) // R_DrawNoModelCallback(ent, 0); } -void R_CalcBeamVerts (float *vert, vec3_t org1, vec3_t org2, float width) +void R_CalcBeam_Vertex3f (float *vert, const vec3_t org1, const vec3_t org2, float width) { vec3_t right1, right2, diff, normal; @@ -1067,13 +1413,36 @@ void R_CalcBeamVerts (float *vert, vec3_t org1, vec3_t org2, float width) vert[ 0] = org1[0] + width * right1[0]; vert[ 1] = org1[1] + width * right1[1]; vert[ 2] = org1[2] + width * right1[2]; - vert[ 4] = org1[0] - width * right1[0]; - vert[ 5] = org1[1] - width * right1[1]; - vert[ 6] = org1[2] - width * right1[2]; - vert[ 8] = org2[0] - width * right2[0]; - vert[ 9] = org2[1] - width * right2[1]; - vert[10] = org2[2] - width * right2[2]; - vert[12] = org2[0] + width * right2[0]; - vert[13] = org2[1] + width * right2[1]; - vert[14] = org2[2] + width * right2[2]; + vert[ 3] = org1[0] - width * right1[0]; + vert[ 4] = org1[1] - width * right1[1]; + vert[ 5] = org1[2] - width * right1[2]; + vert[ 6] = org2[0] - width * right2[0]; + vert[ 7] = org2[1] - width * right2[1]; + vert[ 8] = org2[2] - width * right2[2]; + vert[ 9] = org2[0] + width * right2[0]; + vert[10] = org2[1] + width * right2[1]; + vert[11] = org2[2] + width * right2[2]; } + +void R_DrawSpriteMesh(const vec3_t origin, const vec3_t left, const vec3_t up, float scalex1, float scalex2, float scaley1, float scaley2) +{ + R_Mesh_GetSpace(4); + varray_texcoord2f[0][0] = 1;varray_texcoord2f[0][1] = 1; + varray_texcoord2f[0][2] = 1;varray_texcoord2f[0][3] = 0; + varray_texcoord2f[0][4] = 0;varray_texcoord2f[0][5] = 0; + varray_texcoord2f[0][6] = 0;varray_texcoord2f[0][7] = 1; + 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[ 3] = origin[0] + left[0] * scalex2 + up[0] * scaley2; + varray_vertex3f[ 4] = origin[1] + left[1] * scalex2 + up[1] * scaley2; + varray_vertex3f[ 5] = origin[2] + left[2] * scalex2 + up[2] * scaley2; + varray_vertex3f[ 6] = origin[0] + left[0] * scalex1 + up[0] * scaley2; + varray_vertex3f[ 7] = origin[1] + left[1] * scalex1 + up[1] * scaley2; + varray_vertex3f[ 8] = origin[2] + left[2] * scalex1 + up[2] * scaley2; + 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; + R_Mesh_Draw(4, 2, polygonelements); +} +