WebSVN – gelsvn – Diff – /trunk/src/HMesh/ConnectivityKernel.h

 #include <vector>
 #include <map>
 #include "ItemVector.h"
 #include "ItemID.h"
+#include "Iterators.h"
 namespace HMesh
+{
     struct Vertex;
     struct Face;
     struct HalfEdge;
     typedef ItemVector<Vertex>::IDType VertexID;
     typedef ItemVector<Face>::IDType FaceID;
     typedef ItemVector<HalfEdge>::IDType HalfEdgeID;
     /// The vertex struct. This contains just a single outgoing halfedge.
         HalfEdgeID opp;
         VertexID vert;
         FaceID face;
     };
+    typedef IDIterator<Vertex> VertexIDIterator;
+    typedef IDIterator<Face> FaceIDIterator;
+    typedef IDIterator<HalfEdge> HalfEdgeIDIterator;
     static const VertexID InvalidVertexID;
     static const FaceID InvalidFaceID;
     static const HalfEdgeID InvalidHalfEdgeID;
     typedef std::map<VertexID, VertexID> VertexIDRemap;
         HalfEdgeIDRemap hmap;
     };
     /** The connectivity kernel is basically an aggregate of ItemVectors for vertices, faces, and halfedges.
      This class contains no geometry information - only information about connectivitiy. Arguably it abstracts
-     away the implementation from the Manifold class making it possible, for instance, to use a different kernel. */
+     away the implementation from the ConnectivityKernel class making it possible, for instance, to use a different kernel. */
     class ConnectivityKernel
+    {
+        friend class Walker;
     public:
-        /// add vertex to kernel
+        /// number of active vertices in kernel
-        VertexID add_vertex();
+        size_t no_vertices() const;
-        /// add face to kernel
+        /// number of active faces in kernel
-        FaceID add_face();
+        size_t no_faces() const;
-        /// add halfedge to kernel
+        /// number of active halfedges in kernel
-        HalfEdgeID add_halfedge();
+        size_t no_halfedges() const;
-        /// remove vertex from kernel, given by ID
+        /// number of total vertices in kernel
-        void remove_vertex(VertexID id);
+        size_t allocated_vertices() const;
-        /// remove face from kernel, given by ID
+        /// number of total faces in kernel
-        void remove_face(FaceID id);
+        size_t allocated_faces() const;
-        /// remove halfedge from kernel, given by ID
+        /// number of total halfedges in kernel
-        void remove_halfedge(HalfEdgeID id);
+        size_t allocated_halfedges() const;
-        /// resize kernel vertices container to size
+        /// check if ID of vertex is in use
-        void resize_vertices(size_t size);
+        bool in_use(VertexID id) const;
-        /// resize kernel faces container to size
+        /// check if ID of face is in use
-        void resize_faces(size_t size);
+        bool in_use(FaceID id) const;
-        /// resize kernel halfedges container to size
+        /// check if ID of halfedge is in use
-        void resize_halfedges(size_t size);
+        bool in_use(HalfEdgeID id) const;
+        /// Iterator to first VertexID, optional argument defines if unused items should be skipped
+        VertexIDIterator vertices_begin(bool skip = true) const;
+        /// Iterator to first FaceID, optional argument defines if unused items should be skipped
+        FaceIDIterator faces_begin(bool skip = true) const;
+        /// Iterator to first HalfEdgeID, optional argument defines if unused items should be skipped
+        HalfEdgeIDIterator halfedges_begin(bool skip = true) const;
+        /// Iterator to past the end VertexID
+        VertexIDIterator vertices_end() const;
+        /// Iterator topast the end FaceID
+        FaceIDIterator faces_end() const;
+        /// Iterator to past the end HalfEdgeID
+        HalfEdgeIDIterator halfedges_end() const;
         /// get the ID of next halfedge, given by current halfedge ID
         HalfEdgeID next(HalfEdgeID current) const;
         /// get the ID of previous halfedge, given by current halfedge ID
         HalfEdgeID prev(HalfEdgeID current) const;
         /// get the ID of vertex pointed to by current halfedge ID
         VertexID vert(HalfEdgeID id) const;
         /// get the ID of face owning current halfedge ID
         FaceID face(HalfEdgeID id) const;
+    protected:
+        /// add vertex to kernel
+        VertexID add_vertex();
+        /// add face to kernel
+        FaceID add_face();
+        /// add halfedge to kernel
+        HalfEdgeID add_halfedge();
+        /// remove vertex from kernel, given by ID
+        void remove_vertex(VertexID id);
+        /// remove face from kernel, given by ID
+        void remove_face(FaceID id);
+        /// remove halfedge from kernel, given by ID
+        void remove_halfedge(HalfEdgeID id);
         /// set the ID of next halfedge of current halfedge to next
         void set_next(HalfEdgeID current, HalfEdgeID next);
         /// set the ID of previous halfedge of current halfedge to prev
         void set_prev(HalfEdgeID current, HalfEdgeID prev);
         /// set the ID of opposite halfedge of current halfedge to opp
         /// set the ID of vertex pointed to by current halfedge to vert
         void set_vert(HalfEdgeID current, VertexID vert);
         /// set the ID of face owning current halfedge to face
         void set_face(HalfEdgeID current, FaceID face);
-        /// number of active vertices in kernel
-        size_t no_vertices() const;
-        /// number of active faces in kernel
-        size_t no_faces() const;
-        /// number of active halfedges in kernel
-        size_t no_halfedges() const;
-        /// number of total vertices in kernel
-        size_t allocated_vertices() const;
-        /// number of total faces in kernel
-        size_t allocated_faces() const;
-        /// number of total halfedges in kernel
-        size_t allocated_halfedges() const;
-        /// check if ID of vertex is in use
-        bool in_use(VertexID id) const;
-        /// check if ID of face is in use
-        bool in_use(FaceID id) const;
-        /// check if ID of halfedge is in use
-        bool in_use(HalfEdgeID id) const;
-        /// get the ID of next vertex in container (default: skip unused IDs)
-        VertexID vertices_next(VertexID id, bool skip = true) const;
-        /// get the ID of next face in container (default: skip unused IDs)
-        HalfEdgeID halfedges_next(HalfEdgeID id, bool skip = true) const;
-        /// get the ID of next halfedge in container (default: skip unused IDs)
-        FaceID faces_next(FaceID id, bool skip = true) const;
-        /// get the ID of previous vertex in container (default: skip unused IDs)
-        VertexID vertices_prev(VertexID id, bool skip = true) const;
-        /// get the ID of previous face in container (default: skip unused IDs)
-        HalfEdgeID halfedges_prev(HalfEdgeID id, bool skip = true) const;
-        /// get the ID of previous halfedge in container (default: skip unused IDs)
-        FaceID faces_prev(FaceID id, bool skip = true) const;
-        /// get the ID of first vertex in container (default: skip unused IDs)
-        VertexID vertices_begin(bool skip = true) const;
-        /// get the ID of first vertex in container (default: skip unused IDs)
-        HalfEdgeID halfedges_begin(bool skip = true) const;
-        /// get the ID of first vertex in container (default: skip unused IDs)
-        FaceID faces_begin(bool skip = true) const;
-        /// get the ID of one past the end vertex in container
-        VertexID vertices_end() const;
-        /// get the ID of one past the end face in container
-        HalfEdgeID halfedges_end() const;
-        /// get the ID of one past the end halfedge in container
-        FaceID faces_end() const;
         /// Clean up unused space in vectors - WARNING! Invalidates existing handles!
         void cleanup(IDRemap& map);
         /// clear the kernel
         void clear();
-    private:
         ItemVector<Vertex> vertices;
         ItemVector<Face> faces;
         ItemVector<HalfEdge> halfedges;
     };
     { faces.remove(id); }
     inline void ConnectivityKernel::remove_halfedge(HalfEdgeID id)
     { halfedges.remove(id); }
-    inline void ConnectivityKernel::resize_vertices(size_t size)
-    {  vertices.resize(size); }
-    inline void ConnectivityKernel::resize_faces(size_t size)
-    {  faces.resize(size); }
-    inline void ConnectivityKernel::resize_halfedges(size_t size)
-    {  halfedges.resize(size); }
     inline HalfEdgeID ConnectivityKernel::next(HalfEdgeID id) const
     { return halfedges[id].next; }
     inline HalfEdgeID ConnectivityKernel::prev(HalfEdgeID id) const
     { return faces.in_use(id); }
     inline bool ConnectivityKernel::in_use(HalfEdgeID id) const
     { return halfedges.in_use(id); }
-    inline VertexID ConnectivityKernel::vertices_next(VertexID id, bool skip) const
+    inline VertexIDIterator ConnectivityKernel::vertices_begin(bool skip) const
-    { return vertices.index_next(id, skip); }
+    { return VertexIDIterator(vertices, vertices.index_begin(skip), skip); }
-    inline HalfEdgeID ConnectivityKernel::halfedges_next(HalfEdgeID id, bool skip) const
-    { return halfedges.index_next(id, skip); }
-    inline FaceID ConnectivityKernel::faces_next(FaceID id, bool skip) const
+    inline  FaceIDIterator ConnectivityKernel::faces_begin(bool skip) const
-    { return faces.index_next(id, skip); }
-    inline VertexID ConnectivityKernel::vertices_prev(VertexID id, bool skip) const
-    { return vertices.index_prev(id, skip); }
+    { return FaceIDIterator(faces, faces.index_begin(skip), skip); }
-    inline HalfEdgeID ConnectivityKernel::halfedges_prev(HalfEdgeID id, bool skip) const
+    inline HalfEdgeIDIterator ConnectivityKernel:: halfedges_begin(bool skip) const
-    { return halfedges.index_prev(id, skip); }
+    { return HalfEdgeIDIterator(halfedges, halfedges.index_begin(skip), skip); }
-    inline FaceID ConnectivityKernel::faces_prev(FaceID id, bool skip) const
-    { return faces.index_prev(id, skip); }
-    inline VertexID ConnectivityKernel::vertices_begin(bool skip) const
+    inline VertexIDIterator ConnectivityKernel::vertices_end() const
-    { return vertices.index_begin(skip); }
+    { return VertexIDIterator(vertices, vertices.index_end()); }
-    inline HalfEdgeID ConnectivityKernel::halfedges_begin(bool skip) const
-    { return halfedges.index_begin(skip); }
-    inline FaceID ConnectivityKernel::faces_begin(bool skip) const
-    { return faces.index_begin(skip); }
-    inline VertexID ConnectivityKernel::vertices_end() const
+    inline FaceIDIterator ConnectivityKernel::faces_end() const
-    { return vertices.index_end(); }
+    { return FaceIDIterator(faces, faces.index_end()); }
-    inline HalfEdgeID ConnectivityKernel::halfedges_end() const
+    inline HalfEdgeIDIterator ConnectivityKernel::halfedges_end() const
-    { return halfedges.index_end(); }
+    { return HalfEdgeIDIterator(halfedges, halfedges.index_end()); }
-    inline FaceID ConnectivityKernel::faces_end() const
-    { return faces.index_end(); }
     inline void ConnectivityKernel::clear()
+    {
         vertices.clear();
         faces.clear();
         halfedges.clear();

Subversion Repositories gelsvn

(root)/trunk/src/HMesh/ConnectivityKernel.h @ 595 – Rev 586 → 588