diff --git a/src/org/poly2tri/cdt/CDT.scala b/src/org/poly2tri/cdt/CDT.scala index cfa3f06..78232ca 100644 --- a/src/org/poly2tri/cdt/CDT.scala +++ b/src/org/poly2tri/cdt/CDT.scala @@ -209,7 +209,8 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian while(triangles.last != null && !triangles.last.contains(edge.p)) triangles += triangles.last.findNeighbor(edge.p - edge.q) - // TODO: triangles.last == null bug! + // TODO: fix triangles.last == null bug! + // This happens in the bird demo... if(triangles.last == null) triangles -= triangles.last @@ -228,10 +229,12 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian t.points.foreach(p => { if(p != edge.q && p != edge.p) { if(t.orient(point1, point2, p) >= 0 ) { + // Keep duplicate points out if(!lPoints.contains(p)) { lPoints += p } } else { + // Keep duplicate points out if(!rPoints.contains(p)) rPoints += p } @@ -267,6 +270,8 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian // STEP 3: Triangulate empty areas. triangulateEmpty(point1, point2, points) + // TODO: Update AFront before pushing changes!!!!! + // TODO: Update Delauney Edge Pointers } else if(firstTriangle.contains(edge)) { diff --git a/src/org/poly2tri/cdt/Mesh.scala b/src/org/poly2tri/cdt/Mesh.scala index c728850..d8ef5c7 100644 --- a/src/org/poly2tri/cdt/Mesh.scala +++ b/src/org/poly2tri/cdt/Mesh.scala @@ -38,14 +38,7 @@ class Mesh(initialTriangle: Triangle) { // Triangles that constitute the mesh val map = HashSet(initialTriangle) + // Debug triangles val debug = HashSet.empty[Triangle] - def addEdge(point:Point, triangle: Triangle) { - /* - val p = point.eEvent.p - if(!triangle.contains(p)) { - - } - */ - } }