quick fix for code referencing undeclared variable & trimesh from tetra border

vcg/complex/algorithms/create/tetramesh_support.h

@@ -23,33 +23,67 @@
 #ifndef TETRAMESH_SUPPORT_H
 #define TETRAMESH_SUPPORT_H
 
+#include <vcg/simplex/tetrahedron/topology.h>
 namespace vcg {
 namespace tri {
 
 template <class TetraMesh, class TriMesh>
 inline void CreateTriMeshFromTTBorder(TetraMesh & tetramesh, TriMesh & trimesh)
 {
-    RequireTTAdjacency(tetramesh);
+        typedef typename TetraMesh::VertexPointer VertexPointer;
-    tri::UpdateTopology<TetraMesh>::TetraTetra(tetramesh);
+        typedef typename TriMesh::FacePointer     FacePointer;
-    trimesh.Clear();
 
-    typedef typename TetraMesh::TetraType TetraType;
+        RequireTTAdjacency(tetramesh);
-    ForEachTetra(tetramesh, [&] (TetraType & t) {
+        tri::UpdateTopology<TetraMesh>::TetraTetra(tetramesh);
-        for (int i = 0; i < 4; ++i)
-            if (IsTTBorder(t, i))
-            {
-                tri::Allocator<TriMesh>::AddFace(trimesh, 
-                                                 t.V(Tetra::VofF(i, 0)),
-                                                 t.V(Tetra::VofF(i, 1)),
-                                                 t.V(Tetra::VofF(i, 2)));
-            }
-    });
 
-	vcg::tri::Clean<TriMesh>::RemoveDuplicateVertex(trimesh);
+        trimesh.Clear();
-	vcg::tri::Allocator<TriMesh>::CompactEveryVector(trimesh);
+
+        std::vector<VertexPointer> verts;
+
+        typedef typename TetraMesh::TetraType TetraType;
+
+        ForEachTetra(tetramesh, [&] (TetraType & t) {
+                for (int i = 0; i < 4; ++i)
+                        if (vcg::tetrahedron::IsTTBorder(t, i))
+                        {
+                                verts.push_back(t.V(Tetra::VofF(i, 0)));
+                                verts.push_back(t.V(Tetra::VofF(i, 1)));
+                                verts.push_back(t.V(Tetra::VofF(i, 2)));
+                        }
+        });
+
+        typedef typename TriMesh::VertexIterator VertexIterator;
+        typedef typename TriMesh::FaceIterator     FaceIterator;
+
+        VertexIterator vi = tri::Allocator<TriMesh>::AddVertices(trimesh, verts.size());
+        FaceIterator   fi = tri::Allocator<TriMesh>::AddFaces(trimesh, verts.size() / 3);
+
+        for (int i = 0; i < verts.size(); i += 3)
+        {
+                fi->Alloc(3);
+
+                vi->P() = verts[i + 0]->P();
+                fi->V(0) = &*vi;
+                ++vi;
+
+                vi->P() = verts[i + 1]->P();
+                fi->V(1) = &*vi;
+                ++vi;
+
+                vi->P() = verts[i + 2]->P();
+                fi->V(2) = &*vi;
+                ++vi;
+
+                ++fi;
+        }
+
+        //do it while you build the mesh
+        vcg::tri::Clean<TriMesh>::RemoveDuplicateVertex(trimesh);
+        vcg::tri::Allocator<TriMesh>::CompactEveryVector(trimesh);
 }
 
 } // end namespace tri
 } // end namespace vcg
 
+
 #endif // EXTRUDE_H

wrap/io_tetramesh/import_ply.h

@@ -564,7 +564,13 @@ public:
 //    }
 
 
-    bool LoadMask(const char * filename, int &mask)
+    static bool LoadMask(const char * filename, int &mask)
+    {
+        PlyInfo pi;
+        return LoadMask(filename, mask, pi);
+    }
+
+    static bool LoadMask(const char * filename, int &mask, PlyInfo &pi)
     {
         mask=0;
         vcg::ply::PlyFile pf;
@@ -576,23 +582,35 @@ public:
 
         if( pf.AddToRead(VertDesc(0))!=-1 &&
             pf.AddToRead(VertDesc(1))!=-1 &&
-            pf.AddToRead(VertDesc(2))!=-1 )   mask |= vcg::tetra::io::Mask::IOM_VERTCOORD;
+            pf.AddToRead(VertDesc(2))!=-1 )
+            mask |= vcg::tetra::io::Mask::IOM_VERTCOORD;
+
+        if( pf.AddToRead(VertDesc(3))!=-1 )
+            mask |= vcg::tetra::io::Mask::IOM_VERTFLAGS;
+
+        if( pf.AddToRead(VertDesc(4))!=-1 )
+            mask |= vcg::tetra::io::Mask::IOM_VERTQUALITY;
 
-        if( pf.AddToRead(VertDesc(3))!=-1 )		mask |= vcg::tetra::io::Mask::IOM_VERTFLAGS;
-        if( pf.AddToRead(VertDesc(4))!=-1 )		mask |= vcg::tetra::io::Mask::IOM_VERTQUALITY;
         if( ( pf.AddToRead(VertDesc(5))!=-1 ) &&
             ( pf.AddToRead(VertDesc(6))!=-1 ) &&
             ( pf.AddToRead(VertDesc(7))!=-1 ) &&
-            ( pf.AddToRead(VertDesc(8))!=-1 )     )  mask |= vcg::tetra::io::Mask::IOM_VERTCOLOR;
+            ( pf.AddToRead(VertDesc(8))!=-1 ))
+            mask |= vcg::tetra::io::Mask::IOM_VERTCOLOR;
 
-        if( pf.AddToRead(TetraDesc(0))!=-1 ) mask |= vcg::tetra::io::Mask::IOM_TETRAINDEX;
+        if( pf.AddToRead(TetraDesc(0))!=-1 )
-        if( pf.AddToRead(TetraDesc(1))!=-1 ) mask |= vcg::tetra::io::Mask::IOM_TETRAFLAGS;
+            mask |= vcg::tetra::io::Mask::IOM_TETRAINDEX;
+
+        if( pf.AddToRead(TetraDesc(1))!=-1 )
+            mask |= vcg::tetra::io::Mask::IOM_TETRAFLAGS;
+
+        if( pf.AddToRead(TetraDesc(2))!=-1 )
+            mask |= vcg::tetra::io::Mask::IOM_TETRAQUALITY;
 
-        if( pf.AddToRead(TetraDesc(2))!=-1 ) mask |= vcg::tetra::io::Mask::IOM_TETRAQUALITY;
         if( ( pf.AddToRead(TetraDesc(6))!=-1 ) &&
             ( pf.AddToRead(TetraDesc(7))!=-1 ) &&
             ( pf.AddToRead(TetraDesc(8))!=-1 ) &&
-            ( pf.AddToRead(TetraDesc(9))!=-1 )    )  mask |= vcg::tetra::io::Mask::IOM_TETRACOLOR;
+            ( pf.AddToRead(TetraDesc(9))!=-1 ))
+            mask |= vcg::tetra::io::Mask::IOM_TETRACOLOR;
 
 
         return true;