updated earClip init

This commit is contained in:
Mason 2009-08-16 17:08:08 -04:00
parent e6d11f8c81
commit bd128eb4e3
4 changed files with 13 additions and 9 deletions

View File

@ -396,11 +396,6 @@ class Poly2TriDemo extends BasicGame("Poly2Tri") {
var xVerts = polyX.toArray
var yVerts = polyY.toArray
if(currentModel != strange) {
xVerts = xVerts.reverse
yVerts = yVerts.reverse
}
val t1 = System.nanoTime
earClip.triangulatePolygon(xVerts, yVerts, xVerts.size, earClipResults)
val runTime = System.nanoTime - t1

View File

@ -117,9 +117,6 @@ class AFront(iTriangle: Triangle) {
node = node.next
}
T1.last.markNeighbor(T2.last)
}
def -=(tuple: Tuple3[Node, Node, Triangle]) {

View File

@ -229,6 +229,7 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
// Update neighbors
edgeNeighbors(nTriangles, T1)
edgeNeighbors(nTriangles, T2)
T1.last.markNeighbor(T2.last)
// Update advancing front

View File

@ -26,6 +26,7 @@
package org.poly2tri.earClip
import shapes.Point
import utils.Util
class EarClip {
@ -37,10 +38,20 @@ class EarClip {
var numTriangles = 0
def triangulatePolygon(xv: Array[Float], yv: Array[Float], vn: Int, results: Array[Triangle]): Int = {
def triangulatePolygon(x: Array[Float], y: Array[Float], vn: Int, results: Array[Triangle]): Int = {
val p1 = Point(x(0), y(0))
val p2 = Point(x(1), y(1))
val p3 = Point(x(2), y(2))
val ccw = Util.orient2d(p1, p2, p3) > 0
val xv = if(ccw) x else x.reverse.toArray
val yv = if(ccw) y else y.reverse.toArray
if (vn < 3) return 0
var vNum = vn
//Recurse and split on pinch points
val pA = new Poly
val pB = new Poly