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

cleanup

This commit is contained in:
zzzzrrr 2009-08-11 13:08:42 -04:00
parent 2296bcc767
commit 0e71a0a3fd
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,13 +79,14 @@ class Poly2TriDemo extends BasicGame("Poly2Tri") {
var drawcdtMesh = false var drawcdtMesh = false
val nazcaMonkey = "data/nazca_monkey.dat" val nazcaMonkey = "data/nazca_monkey.dat"
val nazcaHeron = "data/nazca_heron.dat"
val bird = "data/bird.dat" val bird = "data/bird.dat"
val snake = "data/i.snake" val snake = "data/i.snake"
val star = "data/star.dat" val star = "data/star.dat"
val strange = "data/strange.dat" val strange = "data/strange.dat"
val i18 = "data/i.18" val i18 = "data/i.18"
var currentModel = strange var currentModel = i18
var doCDT = true var doCDT = true
var mouseButton = 0 var mouseButton = 0
@ -110,7 +111,7 @@ class Poly2TriDemo extends BasicGame("Poly2Tri") {
def render(container: GameContainer, g: Graphics) { def render(container: GameContainer, g: Graphics) {
g.drawString("'1-6' to cycle models", 10, 520) g.drawString("'1-7' to cycle models, mouse to pan & zoom", 10, 520)
g.drawString("'SPACE' to show Seidel debug info", 10, 532) g.drawString("'SPACE' to show Seidel debug info", 10, 532)
g.drawString("'m' to show trapezoidal map (Seidel debug mode)", 10, 544) g.drawString("'m' to show trapezoidal map (Seidel debug mode)", 10, 544)
g.drawString("'e' to switch Seidel / EarClip", 10, 556) g.drawString("'e' to switch Seidel / EarClip", 10, 556)
@ -271,6 +272,7 @@ class Poly2TriDemo extends BasicGame("Poly2Tri") {
if(c == '4') selectModel(snake) if(c == '4') selectModel(snake)
if(c == '5') selectModel(star) if(c == '5') selectModel(star)
if(c == '6') selectModel(i18) if(c == '6') selectModel(i18)
if(c == '7') selectModel(nazcaHeron)
if(c == 's') drawSegs = !drawSegs if(c == 's') drawSegs = !drawSegs
if(c == 'c') drawcdtMesh = !drawcdtMesh if(c == 'c') drawcdtMesh = !drawcdtMesh
if(c == 'e') {drawEarClip = !drawEarClip; drawCDT = false; selectModel(currentModel)} if(c == 'e') {drawEarClip = !drawEarClip; drawCDT = false; selectModel(currentModel)}
@ -279,11 +281,11 @@ class Poly2TriDemo extends BasicGame("Poly2Tri") {
def selectModel(model: String) { def selectModel(model: String) {
model match { model match {
case "data/nazca_monkey.dat" => case "data/nazca_monkey.dat" =>
CDT.clearPoint = 50 //CDT.clearPoint = 50
//doCDT = false; drawCDT = false; drawcdtMesh = false doCDT = false; drawCDT = false; drawcdtMesh = false
loadModel(nazcaMonkey, 4.5f, Point(400, 300), 1500) loadModel(nazcaMonkey, 4.5f, Point(400, 300), 1500)
case "data/bird.dat" => case "data/bird.dat" =>
//doCDT = false; drawCDT = false; drawcdtMesh = false doCDT = false; drawCDT = false; drawcdtMesh = false
CDT.clearPoint = 80 CDT.clearPoint = 80
loadModel(bird, 25f, Point(400, 300), 350) loadModel(bird, 25f, Point(400, 300), 350)
case "data/i.snake" => case "data/i.snake" =>
@ -302,6 +304,10 @@ class Poly2TriDemo extends BasicGame("Poly2Tri") {
doCDT = true; drawCDT = true doCDT = true; drawCDT = true
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" =>
doCDT = false; drawCDT = false; drawcdtMesh = false
//CDT.clearPoint = 7
loadModel(nazcaHeron, 4.5f, Point(400f, 300f), 1500)
case _ => case _ =>
assert(false) assert(false)
} }

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

@ -169,8 +169,6 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
val pts = Array(point, node.point, node.next.point) val pts = Array(point, node.point, node.next.point)
val triangle = new Triangle(pts) val triangle = new Triangle(pts)
println(Util.orient2d(point, node.point, node.next.point))
mesh.map += triangle mesh.map += triangle
// Legalize // Legalize