3rd-party/poly2tri
1
0
Fork 0
mirror of https://github.com/jhasse/poly2tri.git synced 2024-11-05 22:09:52 +01:00
Code Issues Projects Releases Wiki Activity

code cleanup

Browse Source
This commit is contained in:
zzzzrrr 2009-08-12 17:04:33 -04:00
parent 316ab15839
commit e827825e47
5 changed files with 33 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/poly2tri/Poly2Tri.scala
View File

@ -305,8 +305,8 @@ class Poly2TriDemo extends BasicGame("Poly2Tri") {
CDT.clearPoint = 7 CDT.clearPoint = 7
loadModel(i18, 20f, Point(600f, 500f), 20) loadModel(i18, 20f, Point(600f, 500f), 20)
case "data/nazca_heron.dat" => case "data/nazca_heron.dat" =>
doCDT = false; drawCDT = false; drawcdtMesh = false //doCDT = false; drawCDT = false; drawcdtMesh = false
CDT.clearPoint = 7 CDT.clearPoint = 100
loadModel(nazcaHeron, 4.2f, Point(400f, 300f), 1500) loadModel(nazcaHeron, 4.2f, Point(400f, 300f), 1500)
case "data/tank.dat" => case "data/tank.dat" =>
//doCDT = false; drawCDT = false; drawcdtMesh = false //doCDT = false; drawCDT = false; drawcdtMesh = false

67
src/org/poly2tri/cdt/AFront.scala
View File

@ -61,7 +61,7 @@ class AFront(iTriangle: Triangle) {
// Locate node containing given point // Locate node containing given point
def locatePoint(point: Point): Node = { def locatePoint(point: Point): Node = {
var node = head var node = head
while(node != tail) { while(node != null) {
if(point == node.point) if(point == node.point)
return node return node
node = node.next node = node.next
@ -90,72 +90,33 @@ class AFront(iTriangle: Triangle) {
} }
// Update advancing front with constrained edge triangles // Update advancing front with constrained edge triangles
def constrainedEdge(sNode: Node, eNode: Node, T1: ArrayBuffer[Triangle], def constrainedEdge(sNode: Node, eNode: Node, T2: ArrayBuffer[Triangle], edge: Segment): Triangle = {
T2: ArrayBuffer[Triangle], edge: Segment): Triangle = {
var node = sNode var node = sNode
var t1r, t2r = false
val point1 = edge.q
val point2 = edge.p
var edgeTri: Triangle = null
var marked = false
// Scan the advancing front and update Node triangle pointers // Scan the advancing front and update Node triangle pointers
// Either T1 OR T2
while(node != eNode) { while(node != eNode) {
T2.foreach(t => { T2.foreach(t => {
if(t.contains(node.point, node.next.point)) { if(t.contains(node.point, node.next.point))
node.triangle = t node.triangle = t
t2r = true if(!marked && t.contains(point1, point2)) {
} edgeTri = t
}) edgeTri markEdge(point1, point2)
marked = true
if(!t2r)
T1.foreach(t => {
if(t.contains(node.point, node.next.point)) {
node.triangle = t
t1r = true
} }
}) })
node = node.next node = node.next
} }
val point1 = edge.q edgeTri
val point2 = edge.p
// Select edge triangles
var edgeTri1: Triangle = null
var i = 0
while(edgeTri1 == null) {
if(T1(i).contains(point1, point2))
edgeTri1 = T1(i)
i += 1
}
// Mark constrained edge
edgeTri1 markEdge(point1, point2)
var edgeTri2: Triangle = null
i = 0
while(edgeTri2 == null) {
if(T2(i).contains(point1, point2))
edgeTri2 = T2(i)
i += 1
}
// Mark constrained edge
edgeTri2 markEdge(point1, point2)
// Update neighbor pointer
edgeTri1.markNeighbor(edgeTri2)
if(t1r && !t2r)
edgeTri1
else if(t2r && !t1r) {
edgeTri2
} else {
throw new Exception("edge insertion error")
}
} }
def -=(tuple: Tuple3[Node, Node, Triangle]) { def -=(tuple: Tuple3[Node, Node, Triangle]) {

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

@ -240,13 +240,11 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
val sNode = aFront.locate(point1) val sNode = aFront.locate(point1)
val eNode = aFront.locate(point2) val eNode = aFront.locate(point2)
val first = aFront.constrainedEdge(sNode, eNode, T1, T2, edge)
// Update neighbors // Update neighbors
edgeNeighbors(nTriangles, T1) edgeNeighbors(nTriangles, T1)
edgeNeighbors(nTriangles, T2) edgeNeighbors(nTriangles, T2)
first aFront.constrainedEdge(sNode, eNode, T2, edge)
} else if(firstTriangle == null) { } else if(firstTriangle == null) {
@ -257,7 +255,7 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
val point1 = if(ahead) edge.q else edge.p val point1 = if(ahead) edge.q else edge.p
val point2 = if(ahead) edge.p else edge.q val point2 = if(ahead) edge.p else edge.q
var node = aFront.locate(point1) var node = aFront.locatePoint(point1)
val first = node val first = node
val points = new ArrayBuffer[Point] val points = new ArrayBuffer[Point]
@ -277,8 +275,6 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
val T = new ArrayBuffer[Triangle] val T = new ArrayBuffer[Triangle]
triangulate(points.toArray, List(edge.q, edge.p), T) triangulate(points.toArray, List(edge.q, edge.p), T)
// Update advancing front
// Select edge triangle // Select edge triangle
var edgeTri: Triangle = null var edgeTri: Triangle = null
var i = 0 var i = 0
@ -288,6 +284,7 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
i += 1 i += 1
} }
// Update advancing front
aFront link (first, node, edgeTri) aFront link (first, node, edgeTri)
// Update neighbors // Update neighbors
@ -299,9 +296,9 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
// Return original triangle // Return original triangle
triangle triangle
} else if(firstTriangle.contains(edge.p, edge.q)) { } else if(firstTriangle.contains(edge.q, edge.p)) {
// Mark constrained edge // Mark constrained edge
firstTriangle markEdge(edge.p, edge.q) firstTriangle markEdge(edge.q, edge.p)
triangle triangle
} else { } else {
throw new Exception("Triangulation error") throw new Exception("Triangulation error")
@ -347,10 +344,10 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
} }
if(!P.isEmpty) { if(!P.isEmpty) {
val ccw = Util.orient2d(a, b, P(i)) > 0 //val ccw = Util.orient2d(a, b, P(i)) > 0
val pB = if(ccw) P(i) else b //val pB = if(ccw) P(i) else b
val pC = if(ccw) b else P(i) //val pC = if(ccw) b else P(i)
val points = Array(a, pB, pC) val points = Array(a, P(i), b)
T += new Triangle(points) T += new Triangle(points)
mesh.map += T.last mesh.map += T.last
} }
@ -447,8 +444,8 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
// Update new neighbors // Update new neighbors
for(n <- neighbors) { for(n <- neighbors) {
if(n != null) { if(n != null) {
t2.markNeighbor(n)
t1.markNeighbor(n) t1.markNeighbor(n)
t2.markNeighbor(n)
} }
} }
t2.markNeighbor(t1) t2.markNeighbor(t1)

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

@ -132,7 +132,7 @@ class Triangle(val points: Array[Point]) {
else if(edge.q == points(1)) else if(edge.q == points(1))
search(points(0), points(2), edge, neighbors(0)) search(points(0), points(2), edge, neighbors(0))
else if(edge.q == points(2)) else if(edge.q == points(2))
search(points(1), points(0), edge, neighbors(1)) search(points(0), points(1), edge, neighbors(1))
else else
throw new Exception("Point not found") throw new Exception("Point not found")

2
src/org/poly2tri/utils/Util.scala
View File

@ -125,7 +125,7 @@ object Util {
return det return det
} else { } else {
// Cheat a little bit.... we have a degenerate triangle // Cheat a little bit.... we have a degenerate triangle
val c = pc * 1.0001f val c = pc * 0.1e-5f
return orient2d(pa, pb, c) return orient2d(pa, pb, c)
} }