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

more bug fixes

Browse Source
This commit is contained in:
masongreen 2009-07-19 10:05:05 -04:00
parent 3fcf75c49a
commit 4bb28f9e0c
5 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,11 +111,11 @@ class MonotoneMountain {
if(valid(a)) convexPoints.enqueue(a) if(valid(a)) convexPoints.enqueue(a)
if(valid(c)) convexPoints.enqueue(c) if(valid(c)) convexPoints.enqueue(c)
} }
assert(size <= 3, "Triangulation bug") assert(size <= 3, "Triangulation bug, please report")
} }
def valid(p: Point) = (p.prev != null && p.next != null && convex(p)) def valid(p: Point) = (p != head && p != tail && convex(p))
// Create the monotone polygon // Create the monotone polygon
private def genMonoPoly { private def genMonoPoly {

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

@ -65,8 +65,6 @@ class Poly2TriDemo extends BasicGame("Poly2Tri") {
def init(container: GameContainer) { def init(container: GameContainer) {
poly poly
val foo = 1.4
println(Math.round(foo.toDouble))
} }
def update(gc: GameContainer, delta: Int) { def update(gc: GameContainer, delta: Int) {

8
src/org/poly2tri/Segment.scala
View File

@ -44,13 +44,13 @@ class Segment(var p: Point, var q: Point) {
// Equation of a line: y = m*x + b // Equation of a line: y = m*x + b
// Slope of the line (m) // Slope of the line (m)
val slope = ((q.y - p.y)/(q.x - p.x)).toDouble val slope = (q.y - p.y)/(q.x - p.x)
// Y intercept // Y intercept
val b = (p.y - (p.x * slope)).toDouble val b = p.y - (p.x * slope)
// Determines if this segment lies above the given point // Determines if this segment lies above the given point
def > (point: Point) = (point.y.toFloat < Math.round(slope * point.x.toDouble + b)) def > (point: Point) = (point.y < Math.round(slope * point.x + b))
// Determines if this segment lies below the given point // Determines if this segment lies below the given point
def < (point: Point) = (point.y.toFloat > Math.round(slope * point.x.toDouble + b)) def < (point: Point) = (point.y > Math.round(slope * point.x + b))
} }

2
src/org/poly2tri/Trapezoid.scala
View File

@ -74,7 +74,7 @@ class Trapezoid(val leftPoint: Point, var rightPoint: Point, val top: Segment, v
} }
def lineIntersect(s: Segment, x: Float) = { def lineIntersect(s: Segment, x: Float) = {
val y = (s.slope * x + s.b).toFloat val y = s.slope * x + s.b
Point(x, y) Point(x, y)
} }

64
src/org/poly2tri/TrapezoidalMap.scala
View File

@ -68,10 +68,10 @@ class TrapezoidalMap {
def case1(t: Trapezoid, s: Segment) = { def case1(t: Trapezoid, s: Segment) = {
val trapezoids = new Array[Trapezoid](4) val trapezoids = new Array[Trapezoid](4)
trapezoids(0) = new Trapezoid(t.leftPoint.clone, s.p.clone, t.top, t.bottom) trapezoids(0) = new Trapezoid(t.leftPoint, s.p, t.top, t.bottom)
trapezoids(1) = new Trapezoid(s.p.clone, s.q.clone, t.top, s) trapezoids(1) = new Trapezoid(s.p, s.q, t.top, s)
trapezoids(2) = new Trapezoid(s.p.clone, s.q.clone, s, t.bottom) trapezoids(2) = new Trapezoid(s.p, s.q, s, t.bottom)
trapezoids(3) = new Trapezoid(s.q.clone, t.rightPoint.clone, t.top, t.bottom) trapezoids(3) = new Trapezoid(s.q, t.rightPoint, t.top, t.bottom)
trapezoids(0).update(t.upperLeft, t.lowerLeft, trapezoids(1), trapezoids(2)) trapezoids(0).update(t.upperLeft, t.lowerLeft, trapezoids(1), trapezoids(2))
trapezoids(1).update(trapezoids(0), null, trapezoids(3), null) trapezoids(1).update(trapezoids(0), null, trapezoids(3), null)
@ -88,12 +88,12 @@ class TrapezoidalMap {
// break trapezoid into 3 smaller trapezoids // break trapezoid into 3 smaller trapezoids
def case2(t: Trapezoid, s: Segment) = { def case2(t: Trapezoid, s: Segment) = {
assert(s.p.x < s.q.x) val rp = if(s.q.x == t.rightPoint.x) s.q else t.rightPoint
val trapezoids = new Array[Trapezoid](3) val trapezoids = new Array[Trapezoid](3)
trapezoids(0) = new Trapezoid(t.leftPoint.clone, s.p.clone, t.top, t.bottom) trapezoids(0) = new Trapezoid(t.leftPoint, s.p, t.top, t.bottom)
trapezoids(1) = new Trapezoid(s.p.clone, t.rightPoint.clone, t.top, s) trapezoids(1) = new Trapezoid(s.p, rp, t.top, s)
trapezoids(2) = new Trapezoid(s.p.clone, t.rightPoint.clone, s, t.bottom) trapezoids(2) = new Trapezoid(s.p, rp, s, t.bottom)
trapezoids(0).update(t.upperLeft, t.lowerLeft, trapezoids(1), trapezoids(2)) trapezoids(0).update(t.upperLeft, t.lowerLeft, trapezoids(1), trapezoids(2))
trapezoids(1).update(trapezoids(0), null, t.upperRight, null) trapezoids(1).update(trapezoids(0), null, t.upperRight, null)
@ -110,17 +110,20 @@ class TrapezoidalMap {
// Case 3: Trapezoid is bisected // Case 3: Trapezoid is bisected
def case3(t: Trapezoid, s: Segment) = { def case3(t: Trapezoid, s: Segment) = {
val lp = if(s.p.x == t.leftPoint.x) s.p else t.leftPoint
val rp = if(s.q.x == t.rightPoint.x) s.q else t.rightPoint
val topCross = (tCross == t.top) val topCross = (tCross == t.top)
val bottomCross = (bCross == t.bottom) val bottomCross = (bCross == t.bottom)
val trapezoids = new Array[Trapezoid](2) val trapezoids = new Array[Trapezoid](2)
trapezoids(0) = if(topCross) t.upperLeft else new Trapezoid(t.leftPoint.clone, t.rightPoint.clone, t.top, s) trapezoids(0) = if(topCross) t.upperLeft else new Trapezoid(lp, rp, t.top, s)
trapezoids(1) = if(bottomCross) t.lowerLeft else new Trapezoid(t.leftPoint.clone, t.rightPoint.clone, s, t.bottom) trapezoids(1) = if(bottomCross) t.lowerLeft else new Trapezoid(lp, rp, s, t.bottom)
if(topCross) { if(topCross) {
trapezoids(0).upperRight = t.upperRight trapezoids(0).upperRight = t.upperRight
if(t.upperRight != null) t.upperRight.upperLeft = trapezoids(0) if(t.upperRight != null) t.upperRight.upperLeft = trapezoids(0)
trapezoids(0).rightPoint = t.rightPoint.clone trapezoids(0).rightPoint = rp
} else { } else {
trapezoids(0).update(t.upperLeft, s.above, t.upperRight, null) trapezoids(0).update(t.upperLeft, s.above, t.upperRight, null)
} }
@ -128,7 +131,7 @@ class TrapezoidalMap {
if(bottomCross) { if(bottomCross) {
trapezoids(1).lowerRight = t.lowerRight trapezoids(1).lowerRight = t.lowerRight
if(t.lowerRight != null) t.lowerRight.lowerLeft = trapezoids(1) if(t.lowerRight != null) t.lowerRight.lowerLeft = trapezoids(1)
trapezoids(1).rightPoint = t.rightPoint.clone trapezoids(1).rightPoint = rp
} else { } else {
trapezoids(1).update(s.below, t.lowerLeft, null, t.lowerRight) trapezoids(1).update(s.below, t.lowerLeft, null, t.lowerRight)
} }
@ -145,24 +148,27 @@ class TrapezoidalMap {
// break trapezoid into 3 smaller trapezoids // break trapezoid into 3 smaller trapezoids
def case4(t: Trapezoid, s: Segment) = { def case4(t: Trapezoid, s: Segment) = {
val lp = if(s.p.x == t.leftPoint.x) s.p else t.leftPoint
val rp = if(s.q.x == t.rightPoint.x) s.q else t.rightPoint
val topCross = (tCross == t.top) val topCross = (tCross == t.top)
val bottomCross = (bCross == t.bottom) val bottomCross = (bCross == t.bottom)
val trapezoids = new Array[Trapezoid](3) val trapezoids = new Array[Trapezoid](3)
trapezoids(0) = if(topCross) t.upperLeft else new Trapezoid(t.leftPoint.clone, s.q.clone, t.top, s) trapezoids(0) = if(topCross) t.upperLeft else new Trapezoid(lp, s.q, t.top, s)
trapezoids(1) = if(bottomCross) t.lowerLeft else new Trapezoid(t.leftPoint.clone, s.q.clone, s, t.bottom) trapezoids(1) = if(bottomCross) t.lowerLeft else new Trapezoid(lp, s.q, s, t.bottom)
trapezoids(2) = new Trapezoid(s.q.clone, t.rightPoint.clone, t.top, t.bottom) trapezoids(2) = new Trapezoid(s.q, t.rightPoint, t.top, t.bottom)
if(topCross) { if(topCross) {
trapezoids(0).upperRight = trapezoids(2) trapezoids(0).upperRight = trapezoids(2)
trapezoids(0).rightPoint = s.q.clone trapezoids(0).rightPoint = s.q
} else { } else {
trapezoids(0).update(t.upperLeft, s.above, trapezoids(2), null) trapezoids(0).update(t.upperLeft, s.above, trapezoids(2), null)
} }
if(bottomCross) { if(bottomCross) {
trapezoids(1).lowerRight = trapezoids(2) trapezoids(1).lowerRight = trapezoids(2)
trapezoids(1).rightPoint = s.q.clone trapezoids(1).rightPoint = s.q
} else { } else {
trapezoids(1).update(s.below, t.lowerLeft, null, trapezoids(2)) trapezoids(1).update(s.below, t.lowerLeft, null, trapezoids(2))
} }
@ -178,24 +184,24 @@ class TrapezoidalMap {
// Create an AABB around segments // Create an AABB around segments
def boundingBox(segments: ArrayBuffer[Segment]): Trapezoid = { def boundingBox(segments: ArrayBuffer[Segment]): Trapezoid = {
var max = segments(0).p.clone + margin var max = segments(0).p + margin
var min = segments(0).q.clone - margin var min = segments(0).q - margin
for(s <- segments) { for(s <- segments) {
if(s.p.clone.x > max.x) max = Point(s.p.x + margin, max.y) if(s.p.x > max.x) max = Point(s.p.x + margin, max.y)
if(s.p.clone.y > max.y) max = Point(max.x, s.p.y + margin) if(s.p.y > max.y) max = Point(max.x, s.p.y + margin)
if(s.q.clone.x > max.x) max = Point(s.q.x+margin, max.y) if(s.q.x > max.x) max = Point(s.q.x+margin, max.y)
if(s.q.clone.y > max.y) max = Point(max.x, s.q.y+margin) if(s.q.y > max.y) max = Point(max.x, s.q.y+margin)
if(s.p.clone.x < min.x) min = Point(s.p.x-margin, min.y) if(s.p.x < min.x) min = Point(s.p.x-margin, min.y)
if(s.p.clone.y < min.y) min = Point(min.x, s.p.y-margin) if(s.p.y < min.y) min = Point(min.x, s.p.y-margin)
if(s.q.clone.x < min.x) min = Point(s.q.x-margin, min.y) if(s.q.x < min.x) min = Point(s.q.x-margin, min.y)
if(s.q.clone.y < min.y) min = Point(min.x, s.q.y-margin) if(s.q.y < min.y) min = Point(min.x, s.q.y-margin)
} }
val top = new Segment(Point(min.x, max.y), Point(max.x, max.y)) val top = new Segment(Point(min.x, max.y), Point(max.x, max.y))
val bottom = new Segment(Point(min.x, min.y), Point(max.x, min.y)) val bottom = new Segment(Point(min.x, min.y), Point(max.x, min.y))
val left = bottom.p.clone val left = bottom.p
val right = bottom.q.clone val right = bottom.q
return new Trapezoid(left, right, top, bottom) return new Trapezoid(left, right, top, bottom)
} }