some added structures in in preparation for another protocol version bump (to add...

[xonotic/darkplaces.git] / gl_rmain.c

diff --git a/gl_rmain.c b/gl_rmain.c
index 8898c378b6f06bcea476eb47450ccd542c27a4d5..448d40542463a9b9bae689719ae477776e38aa5a 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -51,7 +51,7 @@ 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"};
@@ -551,7 +551,7 @@ static void R_MarkEntities (void)
                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;
@@ -642,7 +642,7 @@ 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);
        }
 }
@@ -709,14 +709,57 @@ int LightAndVis_CullBox(const vec3_t mins, const vec3_t maxs)
        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)
        {
@@ -726,11 +769,25 @@ void R_TestAndDrawShadowVolume(entity_render_t *ent, vec3_t lightorigin, float c
                 || 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];
@@ -759,7 +816,9 @@ void R_TestAndDrawShadowVolume(entity_render_t *ent, vec3_t lightorigin, float c
                 || 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);
 }
@@ -923,26 +982,26 @@ void R_ShadowVolumeLighting (int visiblevolumes)
                        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)
                        {
@@ -1070,7 +1129,7 @@ void R_ShadowVolumeLighting (int visiblevolumes)
 
                if (!visiblevolumes)
                {
-                       R_Shadow_Stage_Light();
+                       R_Shadow_Stage_LightWithShadows();
                        ent = &cl_entities[0].render;
                        if (ent->model && ent->model->DrawLight)
                        {
@@ -1192,6 +1251,7 @@ R_RenderView
 r_refdef must be set before the first call
 ================
 */
+extern void R_DrawLightningBeams (void);
 void R_RenderView (void)
 {
        entity_render_t *world;
@@ -1285,6 +1345,9 @@ void R_RenderView (void)
                R_TimeReport("dynlight");
        }
 
+       R_DrawLightningBeams();
+       R_TimeReport("lightning");
+
        R_DrawParticles();
        R_TimeReport("particles");