Merge branch 'develop' into exceptions

CHANGELOG.md

@@ -8,6 +8,9 @@ This project aims to adhere to [Semantic Versioning](https://semver.org/spec/v2.
 
 ## Unreleased
 
+- Add post-increment iterators and make low level functions to add elements
+  public. This makes it possible to use CGAL algorithms on a PMP SurfaceMesh.
+  Thanks to @afabri for contributing the changes!
 - Add PMP_INSTALL option to CMake.
 
 ## [1.2.1] 2020-05-10

src/pmp/SurfaceMesh.h

@@ -261,6 +261,14 @@ class SurfaceMesh
             return *this;
         }
 
+        //! post-increment iterator
+        VertexIterator operator++(int)
+        {
+            VertexIterator tmp = *this;
+            ++(*this);
+            return tmp;
+        }
+
         //! pre-decrement iterator
         VertexIterator& operator--()
         {
@@ -319,6 +327,14 @@ class SurfaceMesh
             return *this;
         }
 
+        //! post-increment iterator
+        HalfedgeIterator operator++(int)
+        {
+            HalfedgeIterator tmp = *this;
+            ++(*this);
+            return tmp;
+        }
+
         //! pre-decrement iterator
         HalfedgeIterator& operator--()
         {
@@ -376,6 +392,14 @@ class SurfaceMesh
             return *this;
         }
 
+        //! post-increment iterator
+        EdgeIterator operator++(int)
+        {
+            EdgeIterator tmp = *this;
+            ++(*this);
+            return tmp;
+        }
+
         //! pre-decrement iterator
         EdgeIterator& operator--()
         {
@@ -433,6 +457,14 @@ class SurfaceMesh
             return *this;
         }
 
+        //! post-increment iterator
+        FaceIterator operator++(int)
+        {
+            FaceIterator tmp = *this;
+            ++(*this);
+            return tmp;
+        }
+
         //! pre-decrement iterator
         FaceIterator& operator--()
         {
@@ -1786,6 +1818,8 @@ class SurfaceMesh
     };
 
     //!@}
+
+public:
     //! \name Allocate new elements
     //!@{
 
@@ -1805,6 +1839,28 @@ class SurfaceMesh
 
     //! \brief Allocate a new edge, resize edge and halfedge properties accordingly.
     //! \throw AllocationException in case of failure to allocate a new edge.
+    Halfedge new_edge()
+    {
+        if (halfedges_size() == PMP_MAX_INDEX - 1)
+        {
+            auto what = "SurfaceMesh: cannot allocate edge, max. index reached";
+            throw AllocationException(what);
+        }
+
+        eprops_.push_back();
+        hprops_.push_back();
+        hprops_.push_back();
+
+        Halfedge h0(halfedges_size() - 2);
+        Halfedge h1(halfedges_size() - 1);
+
+        return h0;
+    }
+
+    //! \brief Allocate a new edge, resize edge and halfedge properties accordingly.
+    //! \throw AllocationException in case of failure to allocate a new edge.
+    //! \param start starting Vertex of the new edge
+    //! \param end end Vertex of the new edge
     Halfedge new_edge(Vertex start, Vertex end)
     {
         assert(start != end);
@@ -1843,6 +1899,8 @@ class SurfaceMesh
     }
 
     //!@}
+
+private:
     //! \name Helper functions
     //!@{