From 40a4e924073ffc1b0275bb5d39a3ed970ff1b8b4 Mon Sep 17 00:00:00 2001
From: Paolo Cignoni cignoni <paolo.cignoni@isti.cnr.it>
Date: Thu, 10 Jan 2008 11:59:33 +0000
Subject: [PATCH] added support of unused mesh

---
 .../editalign/align/OccupancyGrid.cpp         | 20 ++++++++++++-------
 .../editalign/align/OccupancyGrid.h           |  4 +++-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/meshlabplugins/editalign/align/OccupancyGrid.cpp b/src/meshlabplugins/editalign/align/OccupancyGrid.cpp
index 1f3ec22f7..ed56d6b05 100644
--- a/src/meshlabplugins/editalign/align/OccupancyGrid.cpp
+++ b/src/meshlabplugins/editalign/align/OccupancyGrid.cpp
@@ -42,7 +42,7 @@ using namespace vcg;
 // Nota che il bbox viene automaticamento inflatato dalla G.SetBBox();
 bool OccupancyGrid::Init(int _mn, Box3d bb, int size)
 {
-	mn=_mn;
+	mn=_mn; // the number of meshes (including all the unused ones; eg it is the range of the possible id)
 	if(mn>MeshCounter::MaxVal()) return false;
 	MeshCounter MC;
 	MC.Clear();
@@ -135,9 +135,10 @@ void OccupancyGrid::Compute()
 	// Find the best arcs
  SVA.clear();
 	for(i=0;i<mn-1;++i)
-		for(j=i+1;j<mn;++j)
-			if(VA[i+j*mn]>0)
-				SVA.push_back( OGArcInfo(i,j, VA[i+j*mn], VA[i+j*mn]/float( min(VM[i].area,VM[j].area)) )); 
+	 if(VM[i].used)
+			for(j=i+1;j<mn;++j)
+				if(VM[j].used && VA[i+j*mn]>0)
+					SVA.push_back( OGArcInfo(i,j, VA[i+j*mn], VA[i+j*mn]/float( min(VM[i].area,VM[j].area)) )); 
   
 	// Compute Mesh Coverage
 	for(i=0;i<SVA.size();++i)
@@ -183,7 +184,7 @@ void OccupancyGrid::ComputeUsefulMesh(FILE *elfp)
 	Use.clear();
 	int i,j,m,mcnt=0;
 	for(m=0;m<mn;++m) {
-			if(VM[m].area>0) {
+			if(VM[m].used && VM[m].area>0) {
 				mcnt++;
 				UpdCovg[m]=VM[m].coverage;
 				UpdArea[m]=VM[m].area;
@@ -237,7 +238,12 @@ void OccupancyGrid::Dump(FILE *fp)
 
 	fprintf(fp,"Computed %i arcs for %i meshes\n",SVA.size(),mn);
 	for(int i=0;i<VM.size();++i)
-		fprintf(fp,"mesh %3i area %6i covg %7i (%5.2f%%) uniq '%3i %3i %3i %3i %3i'\n",i,VM[i].area,VM[i].coverage,float(VM[i].coverage)/float(VM[i].area),VM[i].unique[1],VM[i].unique[2],VM[i].unique[3],VM[i].unique[4],VM[i].unique[5]);
+		{
+			if(VM[i].used) 
+					fprintf(fp,"mesh %3i area %6i covg %7i (%5.2f%%) uniq '%3i %3i %3i %3i %3i'\n",i,VM[i].area,VM[i].coverage,float(VM[i].coverage)/float(VM[i].area),VM[i].unique[1],VM[i].unique[2],VM[i].unique[3],VM[i].unique[4],VM[i].unique[5]);
+			else 
+					fprintf(fp,"mesh %3i ---- UNUSED\n",i);
+		}
 	fprintf(fp,"Computed %i Arcs :\n",SVA.size());
 	for(int i=0;i<SVA.size() && SVA[i].norm_area > .1; ++i)
 		fprintf(fp,"%4i -> %4i Area:%5i NormArea:%5.3f\n",SVA[i].s,SVA[i].t,SVA[i].area,SVA[i].norm_area);
@@ -279,7 +285,7 @@ void OccupancyGrid::ChooseArcs(vector<pair<int,int> > &AV, vector<int> &BNV, vec
 			++i;
 	}
 
-	for(i=0;i<mn;++i) if(adjcnt[i]==0) BNV.push_back(i);
+	for(i=0;i<mn;++i) if(VM[i].used && adjcnt[i]==0) BNV.push_back(i);
 }
 
 void OccupancyGrid::RemoveMesh(int id)
diff --git a/src/meshlabplugins/editalign/align/OccupancyGrid.h b/src/meshlabplugins/editalign/align/OccupancyGrid.h
index 61dd8d676..70d30204c 100644
--- a/src/meshlabplugins/editalign/align/OccupancyGrid.h
+++ b/src/meshlabplugins/editalign/align/OccupancyGrid.h
@@ -209,7 +209,7 @@ class OGMeshInfo
 {
 public:
 	enum {maxcnt =3};
-	OGMeshInfo() {Init();}
+	OGMeshInfo() {Init(); used=false;}
 	void Init() {
 		coverage=0;area=0;
 		memset(unique,0,32*4);
@@ -219,6 +219,7 @@ public:
 	int area;      // numero di voxel toccati da questa mesh
 	bool operator < (OGMeshInfo &o) const { return area<o.area;}	
 	static const int MaxStat() { return 64;}
+	bool used;
 };
 /* Classe con informazioni su un arco plausibile
 */
@@ -272,6 +273,7 @@ void AddMesh(MESH &M, const Matrix44d &Tr, int ind)
         G.Grid( Trf * Point3f::Construct((*vi).P()) ).Set(ind);
     }
 	VM[ind].Init();
+	VM[ind].used=true;
 }