WebSVN – gelsvn – Diff – /branches/cpp11-devel/src/HMesh/Manifold.h

 /**
  * @file Manifold.h
  * @brief The Manifold class is the main data structure of HMesh - the actual mesh.
  */
-#ifndef __HMESH_MANIFOLD_H__
-#define __HMESH_MANIFOLD_H__
+#pragma once
 #include <algorithm>
 #include "../CGLA/Vec3d.h"
 #include "ConnectivityKernel.h"
         /// check if ID of face is in use
         bool in_use(FaceID id) const { return kernel.in_use(id);}
         /// check if ID of halfedge is in use
         bool in_use(HalfEdgeID id) const { return kernel.in_use(id);}
+        IDIteratorPair<Vertex> vertices() const {return IDIteratorPair<Vertex>(kernel.vertices_begin(),
+                                                                         kernel.vertices_end());}
+        IDIteratorPair<Face> faces() const {return IDIteratorPair<Face>(kernel.faces_begin(),
+                                                                         kernel.faces_end());}
+        IDIteratorPair<HalfEdge> halfedges() const {return IDIteratorPair<HalfEdge>(kernel.halfedges_begin(),
+                                                                         kernel.halfedges_end());}
         /// Iterator to first VertexID, optional argument defines if unused items should be skipped
         VertexIDIterator vertices_begin(bool skip = true) const { return kernel.vertices_begin();}
         /// Iterator to first FaceID, optional argument defines if unused items should be skipped
         FaceIDIterator faces_begin(bool skip = true) const { return kernel.faces_begin();}
         /// Iterator to first HalfEdgeID, optional argument defines if unused items should be skipped
         /// Return reference to position given by VertexID
         Vec& pos(VertexID id);
         /// Return const reference to position given by VertexID
         const Vec& pos(VertexID id) const;
+        /// Return a reference to the entire positions attribute vector
+        VertexAttributeVector<Vec>& positions_attribute_vector();
+        /// Return a const reference to the entire positions attribute vector
+        const VertexAttributeVector<Vec>& positions_attribute_vector() const;
         /// Clear the mesh. Remove all faces, halfedges, and vertices.
         void clear();
         /// Remove unused items from Mesh, map argument is to be used for attribute vector cleanups in order to maintain sync.
         void cleanup(IDRemap& map);
     inline Manifold::Vec& Manifold::pos(VertexID id)
     { return positions[id]; }
     inline const Manifold::Vec& Manifold::pos(VertexID id) const
     { return positions[id]; }
+    inline VertexAttributeVector<Manifold::Vec>& Manifold::positions_attribute_vector()
+    {
+        return positions;
+    }
+    inline const VertexAttributeVector<Manifold::Vec>& Manifold::positions_attribute_vector() const
+    {
+        return positions;
+    }
     inline void Manifold::clear()
+    {
         kernel.clear();
         positions.clear();
     inline void Manifold::cleanup()
+    {
         IDRemap map;
         Manifold::cleanup(map);
+    }
+    inline void circulate_vertex_ccw(const Manifold& m, VertexID v, std::function<void(Walker&)> f)
+    {
+        for(Walker w = m.walker(v); !w.full_circle(); w = w.circulate_vertex_ccw())
+            f(w);
+    }
+    inline void circulate_vertex_ccw(const Manifold& m, VertexID v, std::function<void(VertexID)> f)
+    {
+        circulate_vertex_ccw(m, v, [&](Walker& w){f(w.vertex());});
+    }
+    inline void circulate_vertex_ccw(const Manifold& m, VertexID v, std::function<void(FaceID)> f)
+    {
+        circulate_vertex_ccw(m, v, [&](Walker& w){f(w.face());});
+    }
+    inline void circulate_vertex_ccw(const Manifold& m, VertexID v, std::function<void(HalfEdgeID)> f)
+    {
+        circulate_vertex_ccw(m, v, [&](Walker& w){f(w.halfedge());});
+    }
+    inline void circulate_vertex_cw(const Manifold& m, VertexID v, std::function<void(Walker&)> f)
+    {
+        for(Walker w = m.walker(v); !w.full_circle(); w = w.circulate_vertex_cw())
+            f(w);
+    }
+    inline void circulate_vertex_cw(const Manifold& m, VertexID v, std::function<void(VertexID)> f)
+    {
+        circulate_vertex_cw(m, v, [&](Walker& w){f(w.vertex());});
+    }
+    inline void circulate_vertex_cw(const Manifold& m, VertexID v, std::function<void(FaceID)> f)
+    {
+        circulate_vertex_cw(m, v, [&](Walker& w){f(w.face());});
+    }
+    inline void circulate_vertex_cw(const Manifold& m, VertexID v, std::function<void(HalfEdgeID)> f)
+    {
+        circulate_vertex_cw(m, v, [&](Walker& w){f(w.halfedge());});
+    }
+    inline void circulate_face_ccw(const Manifold& m, FaceID f, std::function<void(Walker&)> g)
+    {
+        for(Walker w = m.walker(f); !w.full_circle(); w = w.circulate_face_ccw())
+            g(w);
+    }
+    inline void circulate_face_ccw(const Manifold& m, FaceID f, std::function<void(VertexID)> g)
+    {
+        circulate_face_ccw(m, f, [&](Walker& w){g(w.vertex());});
+    }
+    inline void circulate_face_ccw(const Manifold& m, FaceID f, std::function<void(FaceID)> g)
+    {
+        circulate_face_ccw(m, f, [&](Walker& w){g(w.face());});
+    }
+    inline void circulate_face_ccw(const Manifold& m, FaceID f, std::function<void(HalfEdgeID)> g)
+    {
+        circulate_face_ccw(m, f, [&](Walker& w){g(w.halfedge());});
+    }
+    inline void circulate_face_cw(const Manifold& m, FaceID f, std::function<void(Walker&)> g)
+    {
+        for(Walker w = m.walker(f); !w.full_circle(); w = w.circulate_face_cw())
+            g(w);
+    }
+    inline void circulate_face_cw(const Manifold& m, FaceID f, std::function<void(VertexID)> g)
+    {
+        circulate_face_cw(m, f, [&](Walker& w){g(w.vertex());});
+    }
+    inline void circulate_face_cw(const Manifold& m, FaceID f, std::function<void(FaceID)> g)
+    {
+        circulate_face_cw(m, f, [&](Walker& w){g(w.face());});
+    }
+    inline void circulate_face_cw(const Manifold& m, FaceID f, std::function<void(HalfEdgeID)> g)
+    {
+        circulate_face_cw(m, f, [&](Walker& w){g(w.halfedge());});
-}
+    }
-#endif
+}

Subversion Repositories gelsvn

(root)/branches/cpp11-devel/src/HMesh/Manifold.h – Rev 630 → 631