#include "quakedef.h"
#include "polygon.h"
+#include "portals.h"
#define MAXRECURSIVEPORTALPLANES 1024
#define MAXRECURSIVEPORTALS 256
int *surfacelist;
unsigned char *surfacepvs;
int numleafs;
+ unsigned char *visitingleafpvs; // used to prevent infinite loops
int *leaflist;
unsigned char *leafpvs;
unsigned char *shadowtrispvs;
float dist;
vec3_t center;
tinyplane_t *newplanes;
+ int leafindex = leaf - info->model->brush.data_leafs;
+
+ if (CHECKPVSBIT(info->visitingleafpvs, leafindex))
+ return; // recursive loop of leafs (cmc.bsp for megatf coop)
+
+ SETPVSBIT(info->visitingleafpvs, leafindex);
for (i = 0;i < 3;i++)
{
if (info->leafpvs)
{
- int leafindex = leaf - info->model->brush.data_leafs;
if (!CHECKPVSBIT(info->leafpvs, leafindex))
{
SETPVSBIT(info->leafpvs, leafindex);
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;
+ qbool insidebox = BoxInsideBox(surface->mins, surface->maxs, info->boxmins, info->boxmaxs);
+ qbool addedtris = false;
int t, tend;
const int *elements;
const float *vertex3f;
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))
+ && (insidebox || TriangleBBoxOverlapsBox(v, v + 3, v + 6, info->boxmins, info->boxmaxs))
&& (!info->exact || Portal_PortalThroughPortalPlanes(&portalplanes[firstclipplane], numclipplanes, v, 3, &portaltemppoints2[0][0], 256) > 0))
{
addedtris = true;
}
}
}
+
+ CLEARPVSBIT(info->visitingleafpvs, leafindex);
}
static void Portal_RecursiveFindLeafForFlow(portalrecursioninfo_t *info, mnode_t *node)
}
}
-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)
+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, unsigned char *visitingleafpvs)
{
int i;
portalrecursioninfo_t info;
info.surfacelist = surfacelist;
info.surfacepvs = surfacepvs;
info.numleafs = 0;
+ info.visitingleafpvs = visitingleafpvs;
info.leaflist = leaflist;
info.leafpvs = leafpvs;
info.model = model;