X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=tools%2Fquake3%2Fq3map2%2Fvis.c;h=e9d36c4748fdec1ddd01082b08bb8c309176566c;hb=e8fcd30f80784b8b87e3b6808447c9711be7e233;hp=566706a9e8c08585956e353478c3dfdfd3f9b7f6;hpb=3aca84b7e55ab6d79b30bb6b2ad5d97cfd8fde30;p=xonotic%2Fnetradiant.git

diff --git a/tools/quake3/q3map2/vis.c b/tools/quake3/q3map2/vis.c
index 566706a9..e9d36c47 100644
--- a/tools/quake3/q3map2/vis.c
+++ b/tools/quake3/q3map2/vis.c
@@ -167,6 +167,7 @@ ClusterMerge
 Merges the portal visibility for a leaf
 ===============
 */
+static int clustersizehistogram[MAX_MAP_LEAFS] = {0};
 void ClusterMerge (int leafnum)
 {
 	leaf_t		*leaf;
@@ -212,9 +213,8 @@ void ClusterMerge (int leafnum)
 
 	numvis++;		// count the leaf itself
 
-	totalvis += numvis;
-
-	Sys_FPrintf (SYS_VRB,"cluster %4i : %4i visible\n", leafnum, numvis);
+	//Sys_FPrintf (SYS_VRB,"cluster %4i : %4i visible\n", leafnum, numvis);
+	++clustersizehistogram[numvis];
 
 	memcpy (bspVisBytes + VIS_HEADER_SIZE + leafnum*leafbytes, uncompressed, leafbytes);
 }
@@ -310,8 +310,9 @@ CalcVis
 */
 void CalcVis (void)
 {
-	int			i;
+	int			i, minvis, maxvis;
 	const char	*value;
+	double mu, sigma, totalvis, totalvis2;
 	
 	
 	/* ydnar: rr2do2's farplane code */
@@ -357,9 +358,34 @@ void CalcVis (void)
 	Sys_Printf("creating leaf vis...\n");
 	for (i=0 ; i<portalclusters ; i++)
 		ClusterMerge (i);
-
-  Sys_Printf( "Total visible clusters: %i\n", totalvis );
-  Sys_Printf( "Average clusters visible: %i\n", totalvis / portalclusters );
+	
+	totalvis = 0;
+	totalvis2 = 0;
+	minvis = -1;
+	maxvis = -1;
+	for(i = 0; i < MAX_MAP_LEAFS; ++i)
+		if(clustersizehistogram[i])
+		{
+			if(debugCluster)
+				Sys_FPrintf(SYS_VRB, "%4i clusters have exactly %4i visible clusters\n", clustersizehistogram[i], i);
+			/* cast is to prevent integer overflow */
+			totalvis  += ((double) i)                * ((double) clustersizehistogram[i]);
+			totalvis2 += ((double) i) * ((double) i) * ((double) clustersizehistogram[i]);
+
+			if(minvis < 0)
+				minvis = i;
+			maxvis = i;
+		}
+	
+	mu = totalvis / portalclusters;
+	sigma = sqrt(totalvis2 / portalclusters - mu * mu);
+	
+  Sys_Printf( "Total clusters: %i\n", portalclusters );
+  Sys_Printf( "Total visible clusters: %.0f\n", totalvis );
+  Sys_Printf( "Average clusters visible: %.2f (%.3f %%/total)\n", mu, mu / portalclusters * 100.0);
+  Sys_Printf( "  Standard deviation: %.2f (%.3f %%/total, %.3f %%/avg)\n", sigma, sigma / portalclusters * 100.0, sigma / mu * 100.0);
+  Sys_Printf( "  Minimum: %i (%.3f %%/total, %.3f %%/avg)\n", minvis, minvis / (double) portalclusters * 100.0, minvis / mu * 100.0);
+  Sys_Printf( "  Maximum: %i (%.3f %%/total, %.3f %%/avg)\n", maxvis, maxvis / (double) portalclusters * 100.0, maxvis / mu * 100.0);
 }
 
 /*
@@ -1046,6 +1072,9 @@ int VisMain (int argc, char **argv)
 		} else if (!strcmp(argv[i], "-merge")) {
 			Sys_Printf ("merge = true\n");
 			mergevis = qtrue;
+		} else if (!strcmp(argv[i], "-mergeportals")) {
+			Sys_Printf ("mergeportals = true\n");
+			mergevisportals = qtrue;
 		} else if (!strcmp(argv[i], "-nopassage")) {
 			Sys_Printf ("nopassage = true\n");
 			noPassageVis = qtrue;
@@ -1058,6 +1087,9 @@ int VisMain (int argc, char **argv)
 		} else if (!strcmp (argv[i],"-saveprt")) {
 			Sys_Printf ("saveprt = true\n");
 			saveprt = qtrue;
+		} else if( !strcmp( argv[ i ], "-v" ) ) {
+			debugCluster = qtrue;
+			Sys_Printf( "Extra verbous mode enabled\n" );
 		} else if (!strcmp (argv[i],"-tmpin")) {
 			strcpy (inbase, "/tmp");
 		} else if (!strcmp (argv[i],"-tmpout")) {
@@ -1112,10 +1144,10 @@ int VisMain (int argc, char **argv)
 	UnparseEntities();
 	
 	if( mergevis )
-	{
 		MergeLeaves();
+
+	if( mergevis || mergevisportals )
 		MergeLeafPortals();
-	}
 	
 	CountActivePortals();
 	/* WritePortals( "maps/hints.prs" );*/