X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=portals.c;h=e831466a6fc98a8e57754da2ba00e74afa0603e5;hp=8e2b579c64bed7c2b8eb0464cfe8d34b49ace6e2;hb=b99206803156d4bdfe4ce0c83a2db8f9486e09d4;hpb=7a96ec58916ceea50684acf4c00eaef551199fef

diff --git a/portals.c b/portals.c
index 8e2b579c..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
@@ -127,7 +128,7 @@ loc0:
 	goto loc0;
 }
 
-int Portal_CheckPolygon(dp_model_t *model, vec3_t eye, float *polypoints, int numpoints)
+int Portal_CheckPolygon(model_t *model, vec3_t eye, float *polypoints, int numpoints)
 {
 	int i, prev, returnvalue;
 	mleaf_t *eyeleaf;
@@ -204,7 +205,7 @@ int Portal_CheckPolygon(dp_model_t *model, vec3_t eye, float *polypoints, int nu
 	}\
 }
 
-int Portal_CheckBox(dp_model_t *model, vec3_t eye, vec3_t a, vec3_t b)
+int Portal_CheckBox(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)
@@ -273,11 +274,12 @@ 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;
-	dp_model_t *model;
+	model_t *model;
 	vec3_t eye;
 	float *updateleafsmins;
 	float *updateleafsmaxs;
@@ -291,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++)
 	{
@@ -301,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);
@@ -318,8 +325,8 @@ 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))
 			{
-				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;
@@ -332,7 +339,7 @@ static void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, in
 					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;
@@ -391,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)
@@ -411,7 +420,7 @@ static void Portal_RecursiveFindLeafForFlow(portalrecursioninfo_t *info, mnode_t
 	}
 }
 
-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)
+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;
@@ -446,6 +455,7 @@ void Portal_Visibility(dp_model_t *model, const vec3_t eye, int *leaflist, unsig
 	info.surfacelist = surfacelist;
 	info.surfacepvs = surfacepvs;
 	info.numleafs = 0;
+	info.visitingleafpvs = visitingleafpvs;
 	info.leaflist = leaflist;
 	info.leafpvs = leafpvs;
 	info.model = model;