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;
}\
}
-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)
int *surfacelist;
unsigned char *surfacepvs;
int numleafs;
+ unsigned char *visitingleafpvs; // used to prevent infinite loops
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;
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);
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)
- {
- 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) && 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;
- }
- }
- }
- else
+ 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))
{
- 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;
+ }
}
}
}
}
}
}
+
+ 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)
+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, 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;
info.numfrustumplanes = numfrustumplanes;
info.updateleafsmins = updateleafsmins;
info.updateleafsmaxs = updateleafsmaxs;
+ info.shadowtrispvs = shadowtrispvs;
+ info.lighttrispvs = lighttrispvs;
Portal_RecursiveFindLeafForFlow(&info, model->brush.data_nodes);