globally rename model_t to dp_model_t for OpenSolaris. Sorry, guys who now have svn...

[xonotic/darkplaces.git] / portals.c

diff --git a/portals.c b/portals.c
index b53e14e9f87cae5ebf3e07b478afcf040773d9d4..8e2b579c64bed7c2b8eb0464cfe8d34b49ace6e2 100644 (file)
--- a/portals.c
+++ b/portals.c
@@ -127,7 +127,7 @@ loc0:
        goto loc0;
 }
 
-int Portal_CheckPolygon(model_t *model, vec3_t eye, float *polypoints, int numpoints)
+int Portal_CheckPolygon(dp_model_t *model, vec3_t eye, float *polypoints, int numpoints)
 {
        int i, prev, returnvalue;
        mleaf_t *eyeleaf;
@@ -204,7 +204,7 @@ int Portal_CheckPolygon(model_t *model, vec3_t eye, float *polypoints, int numpo
        }\
 }
 
-int Portal_CheckBox(model_t *model, vec3_t eye, vec3_t a, vec3_t b)
+int Portal_CheckBox(dp_model_t *model, vec3_t eye, vec3_t a, vec3_t b)
 {
        if (eye[0] >= (a[0] - 1.0f) && eye[0] < (b[0] + 1.0f)
         && eye[1] >= (a[1] - 1.0f) && eye[1] < (b[1] + 1.0f)
@@ -275,7 +275,9 @@ typedef struct portalrecursioninfo_s
        int numleafs;
        int *leaflist;
        unsigned char *leafpvs;
-       model_t *model;
+       unsigned char *shadowtrispvs;
+       unsigned char *lighttrispvs;
+       dp_model_t *model;
        vec3_t eye;
        float *updateleafsmins;
        float *updateleafsmaxs;
@@ -313,49 +315,38 @@ static void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, in
                for (i = 0;i < leaf->numleafsurfaces;i++)
                {
                        int surfaceindex = leaf->firstleafsurface[i];
-                       if (!CHECKPVSBIT(info->surfacepvs, surfaceindex))
+                       msurface_t *surface = info->model->data_surfaces + surfaceindex;
+                       if (BoxesOverlap(surface->mins, surface->maxs, info->boxmins, info->boxmaxs))
                        {
-                               msurface_t *surface = info->model->data_surfaces + surfaceindex;
-                               if (BoxesOverlap(surface->mins, surface->maxs, info->boxmins, info->boxmaxs))
+                               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)
                                {
-                                       if (info->exact)
+                                       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))
                                        {
-                                               int j;
-                                               const int *elements;
-                                               const float *vertex3f;
-                                               float v[9], trimins[3], trimaxs[3];
-                                               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))
-                                                       {
-                                                               trimins[0] = min(v[0], min(v[3], v[6]));
-                                                               trimaxs[0] = max(v[0], max(v[3], v[6]));
-                                                               trimins[1] = min(v[1], min(v[4], v[7]));
-                                                               trimaxs[1] = max(v[1], max(v[4], v[7]));
-                                                               trimins[2] = min(v[2], min(v[5], v[8]));
-                                                               trimaxs[2] = max(v[2], max(v[5], v[8]));
-                                                               // FIXME: Portal_PortalThroughPortalPlanes is
-                                                               // nice, but it seems to fail on some polygons
-                                                               if (BoxesOverlap(trimins, trimaxs, 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;
-                                                               }
-                                                       }
-                                               }
-                                       }
-                                       else
-                                       {
-                                               SETPVSBIT(info->surfacepvs, surfaceindex);
-                                               info->surfacelist[info->numsurfaces++] = surfaceindex;
+                                               addedtris = true;
+                                               if (info->shadowtrispvs)
+                                                       SETPVSBIT(info->shadowtrispvs, t);
+                                               if (info->lighttrispvs)
+                                                       SETPVSBIT(info->lighttrispvs, t);
                                        }
                                }
+                               if (addedtris && !CHECKPVSBIT(info->surfacepvs, surfaceindex))
+                               {
+                                       SETPVSBIT(info->surfacepvs, surfaceindex);
+                                       info->surfacelist[info->numsurfaces++] = surfaceindex;
+                               }
                        }
                }
        }
@@ -420,7 +411,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(dp_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;
@@ -462,6 +453,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);