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"};
{
int stackpos, sides;
mnode_t *node, *stack[4096];
+ if (cl.worldmodel == NULL)
+ return false;
stackpos = 0;
stack[stackpos++] = cl.worldmodel->nodes;
while (stackpos)
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)
int stackpos;
mnode_t *node, *stack[4096];
float dist;
+ if (cl.worldmodel == NULL)
+ return false;
stackpos = 0;
stack[stackpos++] = cl.worldmodel->nodes;
while (stackpos)
float dist;
if (R_CullSphere(origin, radius))
return true;
+ if (cl.worldmodel == NULL)
+ return false;
stackpos = 0;
stack[stackpos++] = cl.worldmodel->nodes;
while (stackpos)
R_LerpAnimation(ent);
R_UpdateEntLights(ent);
if ((chase_active.integer || !(ent->flags & RENDER_EXTERIORMODEL))
- && !VIS_CullSphere(ent->origin, ent->model->radius * ent->scale)
+ && !VIS_CullSphere(ent->origin, (ent->model != NULL ? ent->model->radius : 16) * ent->scale)
&& !VIS_CullBox(ent->mins, ent->maxs))
{
ent->visframe = r_framecount;
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);
}
}
{
int stackpos, sides;
mnode_t *node, *stack[4096];
+ if (cl.worldmodel == NULL)
+ return false;
stackpos = 0;
stack[stackpos++] = cl.worldmodel->nodes;
while (stackpos)
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)
return true;
}
+int LightAndVis_CullPointCloud(int numpoints, const float *points)
+{
+ int i;
+ 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)
+ {
+ node = stack[--stackpos];
+ if (node->contents < 0)
+ {
+ 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)
+ {
+ 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_TestAndDrawShadowVolume(entity_render_t *ent, vec3_t lightorigin, float cullradius, float lightradius, vec3_t lightmins, vec3_t lightmaxs, vec3_t clipmins, vec3_t clipmaxs)
{
+ vec3_t relativelightorigin;
+ #if 0
int i;
- vec3_t p, p2, temp, relativelightorigin, mins, maxs;
+ vec3_t p, p2, temp, relativelightorigin/*, mins, maxs*/;
float dist, projectdistance;
+ float points[16][3];
+ #endif
// rough checks
- if (ent->model == NULL || ent->model->DrawShadowVolume == NULL || ent->alpha < 1 || (ent->effects & EF_ADDITIVE))
+ if (!(ent->flags & RENDER_SHADOW) || ent->model == NULL || ent->model->DrawShadowVolume == NULL)
return;
if (r_shadow_cull.integer)
{
|| 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(points[i], 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];
|| 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);
}
if (r_shadow_debuglight.integer >= 0 && lnum != r_shadow_debuglight.integer)
continue;
- 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++;i < wl->numleafs;i++)
+ if (cl.worldmodel != NULL)
{
- leaf = wl->leafs[i];
- if (leaf->visframe == r_framecount)
+ 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++;i < wl->numleafs;i++)
{
- 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];
+ 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 (clipmins[1] < wl->mins[1]) clipmins[1] = wl->mins[1];
+ if (clipmins[2] < wl->mins[2]) clipmins[2] = wl->mins[2];
+ if (clipmaxs[0] > wl->maxs[0]) clipmaxs[0] = wl->maxs[0];
+ if (clipmaxs[1] > wl->maxs[1]) clipmaxs[1] = wl->maxs[1];
+ if (clipmaxs[2] > wl->maxs[2]) clipmaxs[2] = wl->maxs[2];
+ }
+ else
+ {
+ VectorCopy(wl->mins, clipmins);
+ VectorCopy(wl->maxs, clipmaxs);
}
- if (clipmins[0] < wl->mins[0]) clipmins[0] = wl->mins[0];
- if (clipmins[1] < wl->mins[1]) clipmins[1] = wl->mins[1];
- if (clipmins[2] < wl->mins[2]) clipmins[2] = wl->mins[2];
- if (clipmaxs[0] > wl->maxs[0]) clipmaxs[0] = wl->maxs[0];
- if (clipmaxs[1] > wl->maxs[1]) clipmaxs[1] = wl->maxs[1];
- if (clipmaxs[2] > wl->maxs[2]) clipmaxs[2] = wl->maxs[2];
if (R_Shadow_ScissorForBBoxAndSphere(clipmins, clipmaxs, wl->origin, wl->cullradius))
continue;
// mark the leafs we care about so only things in those leafs will matter
- for (i = 0;i < wl->numleafs;i++)
- wl->leafs[i]->worldnodeframe = shadowframecount;
-
+ 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);
VectorScale(lightcolor, f, lightcolor);
}
- 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);
- if (r_drawentities.integer)
+ if (wl->castshadows)
{
- for (i = 0;i < r_refdef.numentities;i++)
- {
- ent = r_refdef.entities[i];
- if (ent->model)
- R_TestAndDrawShadowVolume(ent, wl->origin, cullradius, lightradius, wl->mins, wl->maxs, clipmins, clipmaxs);
- }
+ 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);
+ 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);
}
if (!visiblevolumes)
{
- R_Shadow_Stage_Light();
+ if (wl->castshadows)
+ R_Shadow_Stage_LightWithShadows();
+ else
+ R_Shadow_Stage_LightWithoutShadows();
ent = &cl_entities[0].render;
if (ent->model && ent->model->DrawLight)
{
if (!visiblevolumes)
{
- R_Shadow_Stage_Light();
+ R_Shadow_Stage_LightWithShadows();
ent = &cl_entities[0].render;
if (ent->model && ent->model->DrawLight)
{
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]);
}
/*
r_refdef must be set before the first call
================
*/
+extern void R_DrawLightningBeams (void);
void R_RenderView (void)
{
entity_render_t *world;
R_Mesh_Start();
R_MeshQueue_BeginScene();
- if (r_shadow_lightingmode)
- R_Shadow_UpdateWorldLightSelection();
+ R_Shadow_UpdateWorldLightSelection();
if (R_DrawBrushModelsSky())
R_TimeReport("bmodelsky");
R_TimeReport("dynlight");
}
+ R_DrawLightningBeams();
+ R_TimeReport("lightning");
+
R_DrawParticles();
R_TimeReport("particles");
projects / xonotic / darkplaces.git / blobdiff