From 552cc3f5646f4b8ed6df57f900ca5c3ca9688320 Mon Sep 17 00:00:00 2001
From: Mason <Mason@mason-jwzy9dfja.hsd1.dc.comcast.net.>
Date: Fri, 7 Aug 2009 16:53:54 -0400
Subject: [PATCH] edge mark

---
 src/org/poly2tri/cdt/CDT.scala         | 32 +++++++++++++-------------
 src/org/poly2tri/cdt/Mesh.scala        |  6 ++---
 src/org/poly2tri/shapes/Triangle.scala | 11 +++++++--
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/org/poly2tri/cdt/CDT.scala b/src/org/poly2tri/cdt/CDT.scala
index da4888e..96998d9 100644
--- a/src/org/poly2tri/cdt/CDT.scala
+++ b/src/org/poly2tri/cdt/CDT.scala
@@ -136,20 +136,20 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
       } catch {
         case e: Exception => 
           println("Offending triangle = " + i)
-          //System exit 0
       }
       // Process edge events
       point.edges.foreach(e => edgeEvent(e, triangle))
-      //if(i == 5) {cTri = triangle; mesh.debug += cTri}
+      //if(i == 7) {cTri = triangle; mesh.debug += cTri}
     }
     //mesh clean cTri
+    //mesh.map.foreach(m => m.edges.foreach(e => if(e) mesh.debug += m))
   }  
   
   // Point event
   private def pointEvent(point: Point): Triangle = {
     
     val node = aFront.locate(point)
-
+    
     // Projected point coincides with existing point; create two triangles
     if(point.x == node.point.x && node.prev != null) {
         
@@ -165,7 +165,7 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
         mesh.map += lTriangle
         mesh.map += rTriangle
         
-        // Skip legalization
+        // TODO: check to see of legalization is necessary here
         
         // Update neighbors
         node.triangle.updateNeighbors(rTriangle.points(1), rTriangle.points(2), rTriangle, mesh.debug)
@@ -223,8 +223,10 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
     // STEP 1: Locate the first intersected triangle
     val firstTriangle = triangle.locateFirst(edge)
     
+    val contains = if(firstTriangle != null) firstTriangle.contains(edge) else false
+    
     // STEP 2: Remove intersected triangles
-    if(firstTriangle != null && !firstTriangle.contains(edge)) {
+    if(firstTriangle != null && !contains) {
       
        // Collect intersected triangles
        val tList = new ArrayBuffer[Triangle]
@@ -274,9 +276,9 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
       
        // Mark constrained edges
        val dEdge = new Segment(point1, point2)
-       T1.first markEdge dEdge
-       T2.first markEdge dEdge
-       println("cut")
+       T1.first mark dEdge
+       T2.first mark dEdge
+       
     } else if(firstTriangle == null) {
       
       // No triangles are intersected by the edge; edge must lie outside the mesh
@@ -306,13 +308,12 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
       
       // Mark constrained edge
       val dEdge = new Segment(point1, point2)
-      T.first markEdge dEdge
-      
-    } else {
-      // Triangle must contain the edge
-      // Mark constrained edge
-      firstTriangle markEdge edge
-    }
+      T.first mark dEdge
+    } 
+    
+    // Mark constrained edge
+    if(contains) 
+      firstTriangle mark edge
     
   }
   
@@ -433,7 +434,6 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
 	        val ccwNeighbor = t2.neighborCCW(oPoint)
 	       
 	        if(ccwNeighbor != null) {
-	          //val point = if(t1.points(0).x > oPoint.x) t1.points(1) else t1.points(2)
 	          ccwNeighbor.updateNeighbors(oPoint, t1.points(2), t1, mesh.debug)
 	          t1.neighbors(1) = ccwNeighbor
 	        }
diff --git a/src/org/poly2tri/cdt/Mesh.scala b/src/org/poly2tri/cdt/Mesh.scala
index 25d52c0..09f2410 100644
--- a/src/org/poly2tri/cdt/Mesh.scala
+++ b/src/org/poly2tri/cdt/Mesh.scala
@@ -47,11 +47,11 @@ class Mesh(initialTriangle: Triangle) {
     if(triangle != null && triangle.clean == false) {
       triangle.clean = true
       triangles += triangle
-      if(triangle.edges(0) == false) 
+      if(!triangle.edges(0)) 
         clean(triangle.neighbors(0))
-      if(triangle.edges(1) == false)
+      if(!triangle.edges(1))
         clean(triangle.neighbors(1))
-      if(triangle.edges(2) == false)
+      if(!triangle.edges(2))
         clean(triangle.neighbors(2))
     }
   }
diff --git a/src/org/poly2tri/shapes/Triangle.scala b/src/org/poly2tri/shapes/Triangle.scala
index ff982f0..64a51f4 100644
--- a/src/org/poly2tri/shapes/Triangle.scala
+++ b/src/org/poly2tri/shapes/Triangle.scala
@@ -56,7 +56,7 @@ class Triangle(val points: Array[Point], val neighbors: Array[Triangle]) {
       neighbors(2) = triangle
     else {
       debug += triangle
-      //throw new Exception("Neighbor pointer error, please report!")
+      throw new Exception("Neighbor pointer error, please report!")
     }
   }
   
@@ -267,8 +267,15 @@ class Triangle(val points: Array[Point], val neighbors: Array[Triangle]) {
     ki = points(0) - points(2)
   }
   
+  def mark(e: Segment) {
+    markEdge(e)
+    markNeighbors(e)
+  }
+  
+  private def markNeighbors(e: Segment) = neighbors.foreach(n => if(n != null) n.markEdge(e))
+  
   // Mark edge as constrained
-  def markEdge(e: Segment) {
+  private def markEdge(e: Segment) {
     if((e.q == points(0) && e.p == points(1)) || (e.q == points(1) && e.p == points(0))) {
       edges(2) = true
     } else if ((e.q == points(0) && e.p == points(2)) || (e.q == points(2) && e.p == points(0))) {