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

fixed legalization bug

This commit is contained in:
zzzzrrr 2009-08-07 11:19:58 -04:00
parent 60b4f68d89
commit ea65046b07
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,7 +126,7 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
// Implement sweep-line // Implement sweep-line
private def sweep { private def sweep {
//var cTri: Triangle = null //var cTri: Triangle = null
for(i <- 1 until 5 /*points.size*/ ) { for(i <- 1 until points.size) {
val point = points(i) val point = points(i)
// Process Point event // Process Point event
var triangle: Triangle = null var triangle: Triangle = null
@ -191,7 +191,7 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
mesh.map += triangle mesh.map += triangle
// Legalize // Legalize
val legal = true //legalization(triangle, nTri) val legal = legalization(triangle, nTri)
var newNode: Node = null var newNode: Node = null
// Update advancing front // Update advancing front
@ -424,21 +424,21 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
val ccwNeighbor = t2.neighborCCW(oPoint) val ccwNeighbor = t2.neighborCCW(oPoint)
if(ccwNeighbor != null) { if(ccwNeighbor != null) {
val point = if(t1.points(0).x > oPoint.x) t1.points(2) else t1.points(1) //val point = if(t1.points(0).x > oPoint.x) t1.points(1) else t1.points(2)
ccwNeighbor.updateNeighbors(oPoint, point, t1, mesh.debug) ccwNeighbor.updateNeighbors(oPoint, t1.points(2), t1, mesh.debug)
t1.neighbors(1) = ccwNeighbor t1.neighbors(1) = ccwNeighbor
} }
t2.rotateNeighborsCW(oPoint, t1) t2.rotateNeighborsCW(oPoint, t1)
t1.neighbors(0) = t2
t1.neighbors(2) = null
// Flip edges and rotate everything clockwise // Flip edges and rotate everything clockwise
val point = t1.points(0) val point = t1.points(0)
t1.legalize(oPoint) t1.legalize(oPoint)
t2.legalize(oPoint, point) t2.legalize(oPoint, point)
t1.neighbors(0) = t2
t1.neighbors(2) = null
false false
} else { } else {
true true

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

@ -139,21 +139,21 @@ class Triangle(val points: Array[Point], val neighbors: Array[Triangle]) {
// The neighbor clockwise to given point // The neighbor clockwise to given point
def neighborCW(point: Point): Triangle = { def neighborCW(point: Point): Triangle = {
if(point == points(0)) { if(point == points(0)) {
neighbors(2)
}else if(point == points(1)) {
neighbors(0)
} else
neighbors(1) neighbors(1)
}else if(point == points(1)) {
neighbors(2)
} else
neighbors(0)
} }
// The neighbor counter-clockwise to given point // The neighbor counter-clockwise to given point
def neighborCCW(point: Point): Triangle = { def neighborCCW(point: Point): Triangle = {
if(point == points(0)) { if(point == points(0)) {
neighbors(1)
}else if(point == points(1)) {
neighbors(2) neighbors(2)
} else }else if(point == points(1)) {
neighbors(0) neighbors(0)
} else
neighbors(1)
} }
// The neighbor clockwise to given point // The neighbor clockwise to given point