fixed include; updated API; updated comments

poly2tri/common/utils.h

@@ -28,6 +28,9 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#ifndef UTILS_H
+#define UTILS_H
 
 #include <exception>
 #include <math.h>
@@ -95,3 +98,5 @@ bool InScanArea(Point& pa, Point& pb, Point& pc, Point& pd)
 
 }
 
+#endif
+

poly2tri/poly2tri.h

@@ -28,6 +28,12 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#ifndef POLY2TRI_H
+#define POLY2TRI_H
+
 #include "common/shapes.h"
 #include "sweep/cdt.h"
 
+#endif
+

poly2tri/sweep/advancing_front.h

@@ -28,6 +28,10 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#ifndef ADVANCED_FRONT_H
+#define ADVANCED_FRONT_H
+
 #include "../common/shapes.h"
 
 namespace p2t {
@@ -112,3 +116,4 @@ inline void AdvancingFront::set_search(Node* node)
 
 }
 
+#endif

poly2tri/sweep/cdt.cc

@@ -43,6 +43,10 @@ void CDT::AddHole(std::vector<Point*> polyline)
   sweep_context_->AddHole(polyline);
 }
 
+void CDT::AddPoint(Point* point) {
+  sweep_context_->AddPoint(point);
+}
+
 void CDT::Triangulate()
 {
   sweep_->Triangulate(*sweep_context_);

poly2tri/sweep/cdt.h

@@ -28,6 +28,10 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#ifndef CDT_H
+#define CDT_H
+
 #include "advancing_front.h"
 #include "sweep_context.h"
 #include "sweep.h"
@@ -42,9 +46,10 @@ class CDT
 CDT(std::vector<Point*> polyline);
 /// Destructor
 ~CDT();
-
 /// Add a hole
 void AddHole(std::vector<Point*> polyline);
+/// Add a single point
+void AddPoint(Point* point);
 /// Triangulate points
 void Triangulate();
 /// Get Delaunay triangles
@@ -60,3 +65,5 @@ Sweep* sweep_;
 };
 
 }
+
+#endif

poly2tri/sweep/sweep.h

@@ -35,6 +35,9 @@
  *
  * "FlipScan" Constrained Edge Algorithm invented by Thomas Åhlén, [email protected]
  */
+
+#ifndef SWEEP_H
+#define SWEEP_H
 
 namespace p2t {
 
@@ -113,3 +116,5 @@ void FinalizationPolygon(SweepContext& tcx);
 };
 
 }
+
+#endif

poly2tri/sweep/sweep_context.cc

@@ -28,19 +28,20 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "sweep_context.h"
 #include <algorithm>
-#include <GL/glfw.h>
+
+#include "sweep_context.h"
 #include "advancing_front.h"
-#include <iostream>
 
 namespace p2t {
 
 SweepContext::SweepContext(std::vector<Point*> polyline)
 {
   basin = Basin();
   edge_event = EdgeEvent();
+
   points_ = polyline;
+
   InitEdges(points_);
 }
 
@@ -52,6 +53,10 @@ void SweepContext::AddHole(std::vector<Point*> polyline)
   }
 }
 
+void SweepContext::AddPoint(Point* point) {
+  points_.push_back(point);
+}
+
 std::vector<Triangle*> SweepContext::GetTriangles()
 {
   return triangles_;

poly2tri/sweep/sweep_context.h

@@ -28,6 +28,10 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#ifndef SWEEP_CONTEXT_H
+#define SWEEP_CONTEXT_H
+
 #include <list>
 #include <vector>
 
@@ -46,43 +50,48 @@ class AdvancingFront;
 class SweepContext {
 public:
 
-// Constructor
+/// Constructor
 SweepContext(std::vector<Point*> polyline);
-// Destructor
+/// Destructor
 ~SweepContext();
 
 void set_head(Point* p1);
+
 Point* head();
 
 void set_tail(Point* p1);
+
 Point* tail();
 
 int point_count();
 
 Node& LocateNode(Point& point);
+
 void RemoveNode(Node* node);
 
 void CreateAdvancingFront();
 
-// Try to map a node to all sides of this triangle that don't have a neighbor
+/// Try to map a node to all sides of this triangle that don't have a neighbor
 void MapTriangleToNodes(Triangle& t);
 
 void AddToMap(Triangle* triangle);
 
 Point* GetPoint(const int& index);
+
 Point* GetPoints();
 
 void RemoveFromMap(Triangle* triangle);
 
 void AddHole(std::vector<Point*> polyline);
 
+void AddPoint(Point* point);
+
 AdvancingFront* front();
 
 void MeshClean(Triangle& triangle);
 
 std::vector<Triangle*> GetTriangles();
 std::list<Triangle*> GetMap();
-
 std::vector<Edge*> edge_list;
 
 struct Basin {
@@ -172,3 +181,5 @@ inline Point* SweepContext::tail()
 }
 
 }
+
+#endif

src/cdt.pxd

@@ -1,6 +1,7 @@
 cdef extern from "../poly2tri/sweep/cdt.h":
     ctypedef struct c_CDT "p2t::CDT":
         void AddHole(point_vec polyline)
+        void AddPoint(c_Point* point)
         void Triangulate()
         triangle_vec GetTriangles()
     c_CDT *new_CDT "new p2t::CDT" (point_vec polyline)

src/cdt.pxi

@@ -26,6 +26,10 @@ cdef class CDT:
         for point in polyline:
             hole.push_back(new_Point(point.x, point.y))
         self.me.AddHole(hole)
+
+    def add_point(self, point):
+        cdef c_Point* p = new_Point(point.x, point.y)
+        self.me.AddPoint(p)
 
     def __dealloc__(self):
         del_CDT(self.me)

test.py

@@ -33,6 +33,8 @@ def main(file_name, translate, zoom):
     screen = pygame.display.set_mode(SCREEN_SIZE,0,8)
     pygame.display.set_caption('poly2tri demo')
 
+    pygame.mouse.set_visible(True)
+
     black = Color(0,0,0)
     red = Color(255, 0, 0)
     green = Color(0, 255, 0)
@@ -52,25 +54,33 @@ def main(file_name, translate, zoom):
 
     ##
     ## Step 1: Initialize
+    ## NOTE: polyline must be a simple polygon. The polyline's points
+    ## constitute constrained edges. No repeat points!!!
     ##
     cdt = CDT(polyline)
 
     ##
-    ## Step 2: Add holes if necessary
+    ## Step 2: Add holes and interior Steiner points if necessary
     ##
     if file_name == "data/dude.dat":
         hole = []  
         for p in head_hole:
             p[0] = p[0]*zoom + translate[0]
             p[1] = p[1]*zoom + translate[1]
             hole.append(Point(p[0],p[1]))
+        # Add a hole
         cdt.add_hole(hole)
         hole = []  
         for p in chest_hole:
             p[0] = p[0]*zoom + translate[0]
             p[1] = p[1]*zoom + translate[1]
             hole.append(Point(p[0],p[1]))
+        # Add a hole
         cdt.add_hole(hole)
+        # Add an interior Steiner point
+        x = 361*zoom + translate[0]
+        y = 381*zoom + translate[1]
+        cdt.add_point(Point(x, y))
 
     ##
     ## Step 3: Triangulate
@@ -134,7 +144,7 @@ def main(file_name, translate, zoom):
                     break
                 if( e.key == K_f ):
                     pygame.display.toggle_fullscreen()
-
+        
     return
 
 if __name__=="__main__":