Changeset 2194 for GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/vmi/src/simplify.cpp

Timestamp:

03/06/07 14:26:14 (17 years ago)

Author:

gumbau

Message:

 

File:

• GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/vmi/src/simplify.cpp (modified) (15 diffs)

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/vmi/src/simplify.cpp

@@ -28 +28 @@
 vector<Geometry::Vector2>       VMI::vTexCoords;
 
-///////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
 
 void VMI::bh_mydump(Mesh *mesh, bheap_t *h) {
@@ -56 +56 @@
                         exit(1);
                 }
-        }    
+        }
 }
 
@@ -73 +73 @@
         for (i = 0; i <mesh->numEdges; i++) {
 
-                //      Update progress bar.
-                mUPB(percent);
+                if (mUPB)
+                {
+                        //      Update progress bar.
+                        mUPB(percent);
+                }
 
                 if (mesh->edges[i].enable == TRUE) {
@@ -226 +229 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-void saveProjectedAreas(int **histogram, int numCameras, Change *c, int *dest) {
-        int i, j, t, n = 0;
-
-        for (j=0; j<c->numDel; j++) {
-
-                t = c->deleted[j].id;
-
-                for (i=0; i<numCameras; i++) {
-
-                        dest[n] = histogram[i][t + 1];
-                        n++;
-                }
-        }
-
-        for (j=0; j<c->numMod; j++) { 
-
-                t = c->modified[j].id;
-
-                for (i=0; i<numCameras; i++) {
-
-                        dest[n] = histogram[i][t + 1];
-                        n++;
-                }   
-        }
-
-        // Save background area
-        for (i=0; i<numCameras; i++) {
-
-                dest[n] = histogram[i][0];
-                n++;
-        }
+int *saveProjectedAreas(int **histogram, int numCameras, Change *c) {
+    int i, j, t, n = 0;
+    int *dest;
+    
+    // Allocate memory
+    dest = (int *)malloc((c->numDel + c->numMod + 1) * numCameras * sizeof(int));
+        
+    for (j=0; j<c->numDel; j++) { 
+        
+        t = c->deleted[j].id;
+
+        for (i=0; i<numCameras; i++) {
+            
+            dest[n] = histogram[i][t + 1];
+            n++;
+        }
+    }
+    
+    for (j=0; j<c->numMod; j++) { 
+        
+        t = c->modified[j].id;
+        
+        for (i=0; i<numCameras; i++) {
+            
+            dest[n] = histogram[i][t + 1];
+            n++;
+        }   
+    }
+
+    // Save background area
+    for (i=0; i<numCameras; i++) {
+        
+        dest[n] = histogram[i][0];
+        n++;
+    }
+    
+    return dest;
 }
 
@@ -365 +374 @@
         penalized = check_local_inversion(mesh, c);
 #endif
-                // Allocate memory
-                histoAux = (int *)malloc((c->numDel + c->numMod + 1) * numCameras * sizeof(int));
-
-#if defined(VERTEX_BUFFER_OBJECTS) || defined(VERTEX_ARRAY)
-        vb = (VertexIL *)malloc((c->numDel + c->numMod + 1) * 3 * sizeof(VertexIL));
-
-        saveVertexBuffer(c, vb);
+#ifdef VERTEX_ARRAY
+        vb = saveVertexBuffer(c, buf_vertices, buf_colors);
+#endif
+#ifdef VERTEX_BUFFER_OBJECTS
+        vb = saveVertexBufferGPU(c);
 #endif
 
@@ -388 +395 @@
                 }
 
-                saveProjectedAreas(histogram, numCameras, c, histoAux);
+                histoAux = saveProjectedAreas(histogram, numCameras, c);
     // Apply the edge collapse
                 doChange(mesh, c);
@@ -424 +431 @@
                 ///////////////////////////////////////////////////////////////////////////////
 
-                saveProjectedAreas(histogram, numCameras, c, histoAux);
+                histoAux = saveProjectedAreas(histogram, numCameras, c);
 
                 doChange(mesh, c);
@@ -459 +466 @@
                 // Free memory
                 free(histoAux);
-#if defined(VERTEX_BUFFER_OBJECTS) || defined(VERTEX_ARRAY)
-        loadVertexBuffer(vb, c);
+#ifdef VERTEX_ARRAY
+                loadVertexBuffer(vb, c, buf_vertices, buf_colors);
+                free(vb);
+#endif
+#ifdef VERTEX_BUFFER_OBJECTS
+                loadVertexBufferGPU(vb, c);
         free(vb);
 #endif
@@ -499 +510 @@
         e = bh_min(h);
 
-        while (!isValidEdge_(mesh, e)) {
+        while (!isValidEdge_(mesh, e) && (h->n >0)) {
                 /* delete invalid edge */
                 bh_delete(h, e);
@@ -510 +521 @@
 
 /* Get the mininum edge cost from the heap using lazy evaluation */
-int getMinEdge(Mesh *mesh, bheap_t *h) {
+int getMinEdge(Mesh *mesh, bheap_t *h)
+{
         double cost;
         int e;
@@ -517 +529 @@
         e = getMinValidEdge(mesh, h);
 
-        while (bh_is_dirty(h, e)) {
+        while (bh_is_dirty(h, e) && (h->n >0)) {
                 /* delete edge from heap */
                 bh_delete(h, e);
@@ -560 +572 @@
         if (bSaveLog == TRUE)
         {
-#ifdef SALIENCY       
+#ifdef SALIENCY
                 sprintf(s,"%s_%s_S.log", filename, EXT);
 #else
@@ -573 +585 @@
                 if (!file)
                 {
-                        fprintf(stderr, "simplifyModel() failed: can't open file \"%s\" to write.\n", s);
+                        fprintf(stderr,
+                                                        "simplifyModel() failed: can't open file \"%s\" to write.\n",
+                                                        s);
+
                         exit(1);
                 }
@@ -592 +607 @@
         printf("Starting simplification...\n");
 
-        while (mesh->currentNumTriangles > numDemandedTri /*&& cost == 0.0*/)
+        while (mesh->currentNumTriangles > numDemandedTri && (h->n >0)/*&& cost == 0.0*/)
         {
                 // Get the edge that has the minimum cost
@@ -600 +615 @@
                 c = createChange(mesh, e);
 
-                // Apply the edge collapse
-                doChange(mesh, c);
-                //deleteVertexOfMap(mesh, c->u);
-
-                // Write Simplification sequence.
-                saveSimplificationSequence(c,0);
-
-                //contractTwinVertices(mesh, c->u, c->v); // vertex u is removed
-
-                if (bSaveLog == TRUE) writeChange(file, c);
-
-                cost = h->a[h->p[e]].key;
-
-                /*
-                printf( "Edge collapse e%d(%d,%d) %f MIN d %d m %d\n",
-                                c->e,
-                                c->u,
-                                c->v,
-                                cost,
-                                c->numDel,
-                                c->numMod);
-                */
-
-                mesh->edges[e].enable = FALSE;
-                bh_delete(h, e);
-
-                updateHWAcceleration(c);
-
-                // Get projected areas after the edge collapse
-                getProjectedAreas(histogram, numCameras);
-
-                computeCameraIs(histogram, numCameras, initialIs);
-
-                updateEdgeAdj(mesh, c);
-
-    modifyEdges(mesh, c);
-
-                // Update the heap according to the edge collapse
-                h = updateHeap(h, mesh, c);
-
-                mUPB((float)c->numDel * percent);
+                // Check whether edge collapse is a valid change
+                if (c->numDel > 0) {
+                        // Apply the edge collapse
+                        doChange(mesh, c);
+                        //deleteVertexOfMap(mesh, c->u);
+
+                        // Write Simplification sequence.
+                        saveSimplificationSequence(c,0);
+
+                        //contractTwinVertices(mesh, c->u, c->v); // vertex u is removed
+
+                        if (bSaveLog == TRUE) writeChange(file, c);
+
+                        cost = h->a[h->p[e]].key;
+
+                        /*
+                                 printf(        "Edge collapse e%d(%d,%d) %f MIN d %d m %d\n",
+                                 c->e,
+                                 c->u,
+                                 c->v,
+                                 cost,
+                                 c->numDel,
+                                 c->numMod);
+                                 */
+
+                        mesh->edges[e].enable = FALSE;
+                        bh_delete(h, e);
+
+                        updateHWAcceleration(c);
+
+                        // Get projected areas after the edge collapse
+                        getProjectedAreas(histogram, numCameras);
+
+                        computeCameraIs(histogram, numCameras, initialIs);
+
+                        updateEdgeAdj(mesh, c);
+                        modifyEdges(mesh, c);
+
+                        // Update the heap according to the edge collapse
+                        h = updateHeap(h, mesh, c);
+
+                        if (mUPB)
+                        {
+                                mUPB((float)c->numDel * percent);
+                        }
+                }
+                else
+                {
+                        mesh->edges[e].enable = FALSE;
+                        bh_delete(h, e);
+                }
 
                 deleteChange(c);