implemented r_shadow_culltriangles cvar (on by default), this improves lighting perfo...

[xonotic/darkplaces.git] / portals.c

diff --git a/portals.c b/portals.c
index f4dafb6c5232c090579eb3f3a99fd31eb025a43a..4c0bb19a569e9dbbc8deed33b2abc32377d722f4 100644 (file)
--- a/portals.c
+++ b/portals.c
@@ -275,6 +275,8 @@ typedef struct portalrecursioninfo_s
        int numleafs;
        int *leaflist;
        unsigned char *leafpvs;
+       unsigned char *shadowtrispvs;
+       unsigned char *lighttrispvs;
        model_t *model;
        vec3_t eye;
        float *updateleafsmins;
@@ -318,28 +320,31 @@ static void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, in
                                msurface_t *surface = info->model->data_surfaces + surfaceindex;
                                if (BoxesOverlap(surface->mins, surface->maxs, info->boxmins, info->boxmaxs))
                                {
-                                       if (info->exact)
+                                       qboolean insidebox = BoxInsideBox(surface->mins, surface->maxs, info->boxmins, info->boxmaxs);
+                                       qboolean addedtris = false;
+                                       int t, tend;
+                                       const int *elements;
+                                       const float *vertex3f;
+                                       float v[9];
+                                       vertex3f = info->model->surfmesh.data_vertex3f;
+                                       elements = (info->model->surfmesh.data_element3i + 3 * surface->num_firsttriangle);
+                                       for (t = surface->num_firsttriangle, tend = t + surface->num_triangles;t < tend;t++, elements += 3)
                                        {
-                                               int j;
-                                               const int *elements;
-                                               const float *vertex3f;
-                                               float v[9];
-                                               vertex3f = info->model->surfmesh.data_vertex3f;
-                                               elements = (info->model->surfmesh.data_element3i + 3 * surface->num_firsttriangle);
-                                               for (j = 0;j < surface->num_triangles;j++, elements += 3)
+                                               VectorCopy(vertex3f + elements[0] * 3, v + 0);
+                                               VectorCopy(vertex3f + elements[1] * 3, v + 3);
+                                               VectorCopy(vertex3f + elements[2] * 3, v + 6);
+                                               if (PointInfrontOfTriangle(info->eye, v + 0, v + 3, v + 6)
+                                                && (insidebox || TriangleOverlapsBox(v, v + 3, v + 6, info->boxmins, info->boxmaxs))
+                                                && (!info->exact || Portal_PortalThroughPortalPlanes(&portalplanes[firstclipplane], numclipplanes, v, 3, &portaltemppoints2[0][0], 256) > 0))
                                                {
-                                                       VectorCopy(vertex3f + elements[0] * 3, v + 0);
-                                                       VectorCopy(vertex3f + elements[1] * 3, v + 3);
-                                                       VectorCopy(vertex3f + elements[2] * 3, v + 6);
-                                                       if (PointInfrontOfTriangle(info->eye, v + 0, v + 3, v + 6) && TriangleOverlapsBox(v, v + 3, v + 6, info->boxmins, info->boxmaxs) && Portal_PortalThroughPortalPlanes(&portalplanes[firstclipplane], numclipplanes, v, 3, &portaltemppoints2[0][0], 256) > 0)
-                                                       {
-                                                               SETPVSBIT(info->surfacepvs, surfaceindex);
-                                                               info->surfacelist[info->numsurfaces++] = surfaceindex;
-                                                               break;
-                                                       }
+                                                       addedtris = true;
+                                                       if (info->shadowtrispvs)
+                                                               SETPVSBIT(info->shadowtrispvs, t);
+                                                       if (info->lighttrispvs)
+                                                               SETPVSBIT(info->lighttrispvs, t);
                                                }
                                        }
-                                       else
+                                       if (addedtris)
                                        {
                                                SETPVSBIT(info->surfacepvs, surfaceindex);
                                                info->surfacelist[info->numsurfaces++] = surfaceindex;
@@ -409,7 +414,7 @@ static void Portal_RecursiveFindLeafForFlow(portalrecursioninfo_t *info, mnode_t
        }
 }
 
-void Portal_Visibility(model_t *model, const vec3_t eye, int *leaflist, unsigned char *leafpvs, int *numleafspointer, int *surfacelist, unsigned char *surfacepvs, int *numsurfacespointer, const mplane_t *frustumplanes, int numfrustumplanes, int exact, const float *boxmins, const float *boxmaxs, float *updateleafsmins, float *updateleafsmaxs)
+void Portal_Visibility(model_t *model, const vec3_t eye, int *leaflist, unsigned char *leafpvs, int *numleafspointer, int *surfacelist, unsigned char *surfacepvs, int *numsurfacespointer, const mplane_t *frustumplanes, int numfrustumplanes, int exact, const float *boxmins, const float *boxmaxs, float *updateleafsmins, float *updateleafsmaxs, unsigned char *shadowtrispvs, unsigned char *lighttrispvs)
 {
        int i;
        portalrecursioninfo_t info;
@@ -451,6 +456,8 @@ void Portal_Visibility(model_t *model, const vec3_t eye, int *leaflist, unsigned
        info.numfrustumplanes = numfrustumplanes;
        info.updateleafsmins = updateleafsmins;
        info.updateleafsmaxs = updateleafsmaxs;
+       info.shadowtrispvs = shadowtrispvs;
+       info.lighttrispvs = lighttrispvs;
 
        Portal_RecursiveFindLeafForFlow(&info, model->brush.data_nodes);