3rd-party
/
poly2tri
mirror of https://github.com/jhasse/poly2tri.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

neighbor updates

This commit is contained in:
Mason 2009-08-08 13:37:12 -04:00
parent 7d87363ba7
commit 99f6af554c
2 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/org/poly2tri/cdt/CDT.scala
View File

@ -141,7 +141,7 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
}
// Process edge events
point.edges.foreach(e => edgeEvent(e, triangle))
//if(i == 7) {cleanTri = triangle; mesh.debug += cleanTri}
if(i == 7) {cleanTri = triangle; mesh.debug += cleanTri}
}
}
@ -176,8 +176,8 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
// TODO: check to see of legalization is necessary here
// Update neighbors
node.triangle.updateNeighbors(rTriangle.points(1), rTriangle.points(2), rTriangle, mesh.debug)
node.prev.triangle.updateNeighbors(lTriangle.points(1), lTriangle.points(2), lTriangle, mesh.debug)
node.triangle.markNeighbor(rTriangle.points(1), rTriangle.points(2), rTriangle, mesh.debug)
node.prev.triangle.markNeighbor(lTriangle.points(1), lTriangle.points(2), lTriangle, mesh.debug)
// Update advancing front
val newNode = aFront.insert(point, rTriangle, node)
@ -209,7 +209,7 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
if(legal) {
newNode = aFront.insert(point, triangle, node)
// Update neighbors
nTri.updateNeighbors(cwPoint, ccwPoint, triangle, mesh.debug)
nTri.markNeighbor(cwPoint, ccwPoint, triangle, mesh.debug)
} else {
newNode = new Node(triangle.points(1), triangle)
val rNode = node.next
@ -300,18 +300,20 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
val point2 = if(ahead) edge.p else edge.q
val points = new ArrayBuffer[Point]
val triangles = new ArrayBuffer[Triangle]
var node = aFront.locate(point1)
val first = node
triangles += first.triangle
node = node.next
while(node.point != point2) {
points += node.point
triangles += node.triangle
node = node.next
}
//assert(points.size == 1, "not implemented yet, points = " + points.size)
val endPoints = if(ahead) List(point2, point1) else List(point1, point2)
// STEP 3: Triangulate empty areas.
@ -322,21 +324,17 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
aFront -= (first, node.prev, T.first)
// Update neigbor pointers
if(ahead) {
T.first.neighbors(2) = node.prev.triangle;
T.first.neighbors(0) = first.triangle
node.prev.triangle.updateNeighbors(T.first.points(0), T.first.points(1), T.first, mesh.debug)
first.triangle.updateNeighbors(T.first.points(1), T.first.points(2), T.first, mesh.debug)
} else {
T.first.neighbors(2) = first.triangle;
T.first.neighbors(0) = node.prev.triangle
node.prev.triangle.updateNeighbors(T.first.points(1), T.first.points(2), T.first, mesh.debug)
first.triangle.updateNeighbors(T.first.points(0), T.first.points(1), T.first, mesh.debug)
}
// Inneficient, but it works well...
for(i <- triangles)
for(j <- T)
i.markNeighbor(j)
for(i <- 0 until T.size)
for(j <- i+1 until T.size)
T(i).markNeighbor(T(j))
// Mark constrained edge
T.first mark(edge.p, edge.q)
} else {
// Mark constrained edge
@ -407,8 +405,8 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
val neighbors = Array(node.triangle, null, node.prev.triangle)
val triangle = new Triangle(points, neighbors)
// Update neighbor pointers
node.prev.triangle.updateNeighbors(triangle.points(0), triangle.points(1), triangle, mesh.debug)
node.triangle.updateNeighbors(triangle.points(1), triangle.points(2), triangle, mesh.debug)
node.prev.triangle.markNeighbor(triangle.points(0), triangle.points(1), triangle, mesh.debug)
node.triangle.markNeighbor(triangle.points(1), triangle.points(2), triangle, mesh.debug)
mesh.map += triangle
aFront -= (node.prev, node, triangle)
}
@ -461,7 +459,7 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
val ccwNeighbor = t2.neighborCCW(oPoint)
if(ccwNeighbor != null) {
ccwNeighbor.updateNeighbors(oPoint, t1.points(2), t1, mesh.debug)
ccwNeighbor.markNeighbor(oPoint, t1.points(2), t1, mesh.debug)
t1.neighbors(1) = ccwNeighbor
}

32
src/org/poly2tri/shapes/Triangle.scala
View File

@ -47,7 +47,8 @@ class Triangle(val points: Array[Point], val neighbors: Array[Triangle]) {
var clean = false
// Update neighbor pointers
def updateNeighbors(ccwPoint: Point, cwPoint: Point, triangle: Triangle, debug: HashSet[Triangle]) {
// Debug version
def markNeighbor(ccwPoint: Point, cwPoint: Point, triangle: Triangle, debug: HashSet[Triangle]) {
if((ccwPoint == points(2) && cwPoint == points(1)) || (ccwPoint == points(1) && cwPoint == points(2)))
neighbors(0) = triangle
else if((ccwPoint == points(0) && cwPoint == points(2)) || (ccwPoint == points(2) && cwPoint == points(0)))
@ -56,7 +57,33 @@ class Triangle(val points: Array[Point], val neighbors: Array[Triangle]) {
neighbors(2) = triangle
else {
debug += triangle
//throw new Exception("Neighbor pointer error, please report!")
}
}
// Update neighbor pointers
def markNeighbor(ccwPoint: Point, cwPoint: Point, triangle: Triangle) {
if((ccwPoint == points(2) && cwPoint == points(1)) || (ccwPoint == points(1) && cwPoint == points(2)))
neighbors(0) = triangle
else if((ccwPoint == points(0) && cwPoint == points(2)) || (ccwPoint == points(2) && cwPoint == points(0)))
neighbors(1) = triangle
else if((ccwPoint == points(0) && cwPoint == points(1)) || (ccwPoint == points(1) && cwPoint == points(0)))
neighbors(2) = triangle
else {
throw new Exception("Neighbor pointer error, please report!")
}
}
/* Exhaustive search to update neighbor pointers */
def markNeighbor(t: Triangle) {
if (t.contains(points(1), points(2))) {
neighbors(0) = t
t.markNeighbor(points(1), points(2), this)
} else if(t.contains(points(0), points(2))) {
neighbors(1) = t
t.markNeighbor(points(0), points(2), this)
} else if (t.contains(points(0), points(1))) {
neighbors(2) = t
t.markNeighbor(points(0), points(1), this)
}
}
@ -71,6 +98,7 @@ class Triangle(val points: Array[Point], val neighbors: Array[Triangle]) {
def contains(p: Point): Boolean = (p == points(0) || p == points(1) || p == points(2))
def contains(e: Segment): Boolean = (contains(e.p) && contains(e.q))
def contains(p: Point, q: Point): Boolean = (contains(p) && contains(q))
// Fast point in triangle test
def pointIn(point: Point): Boolean = {