X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=portals.c;h=e831466a6fc98a8e57754da2ba00e74afa0603e5;hp=fccaae935d48eaa43cf324a66c8cc86bea43aee3;hb=e9206d59c8cde436ea29daa46a587db08f73a111;hpb=6a2c575936d3bc92becde71f6261a539038c52d5

diff --git a/portals.c b/portals.c
index fccaae93..e831466a 100644
--- a/portals.c
+++ b/portals.c
@@ -1,6 +1,7 @@
 
 #include "quakedef.h"
 #include "polygon.h"
+#include "portals.h"
 
 #define MAXRECURSIVEPORTALPLANES 1024
 #define MAXRECURSIVEPORTALS 256
@@ -273,8 +274,11 @@ typedef struct portalrecursioninfo_s
 	int *surfacelist;
 	unsigned char *surfacepvs;
 	int numleafs;
+	unsigned char *visitingleafpvs; // used to prevent infinite loops
 	int *leaflist;
 	unsigned char *leafpvs;
+	unsigned char *shadowtrispvs;
+	unsigned char *lighttrispvs;
 	model_t *model;
 	vec3_t eye;
 	float *updateleafsmins;
@@ -289,6 +293,12 @@ static void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, in
 	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++)
 	{
@@ -299,7 +309,6 @@ static void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, in
 
 	if (info->leafpvs)
 	{
-		int leafindex = leaf - info->model->brush.data_leafs;
 		if (!CHECKPVSBIT(info->leafpvs, leafindex))
 		{
 			SETPVSBIT(info->leafpvs, leafindex);
@@ -313,47 +322,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))
+				qbool insidebox = BoxInsideBox(surface->mins, surface->maxs, info->boxmins, info->boxmaxs);
+				qbool 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], 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]));
-								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
+					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 || TriangleBBoxOverlapsBox(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;
+				}
 			}
 		}
 	}
@@ -398,6 +398,8 @@ static void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, in
 			}
 		}
 	}
+
+	CLEARPVSBIT(info->visitingleafpvs, leafindex);
 }
 
 static void Portal_RecursiveFindLeafForFlow(portalrecursioninfo_t *info, mnode_t *node)
@@ -418,7 +420,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, unsigned char *visitingleafpvs)
 {
 	int i;
 	portalrecursioninfo_t info;
@@ -453,6 +455,7 @@ void Portal_Visibility(model_t *model, const vec3_t eye, int *leaflist, unsigned
 	info.surfacelist = surfacelist;
 	info.surfacepvs = surfacepvs;
 	info.numleafs = 0;
+	info.visitingleafpvs = visitingleafpvs;
 	info.leaflist = leaflist;
 	info.leafpvs = leafpvs;
 	info.model = model;
@@ -460,6 +463,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);