added tank model

This commit is contained in:
zzzzrrr
2009-08-11 14:11:30 -04:00
parent 0e71a0a3fd
commit 8ce22caf63
3 changed files with 67 additions and 4 deletions

View File

@@ -85,8 +85,9 @@ class Poly2TriDemo extends BasicGame("Poly2Tri") {
val star = "data/star.dat"
val strange = "data/strange.dat"
val i18 = "data/i.18"
val tank = "data/tank.dat"
var currentModel = i18
var currentModel = tank
var doCDT = true
var mouseButton = 0
@@ -273,6 +274,7 @@ class Poly2TriDemo extends BasicGame("Poly2Tri") {
if(c == '5') selectModel(star)
if(c == '6') selectModel(i18)
if(c == '7') selectModel(nazcaHeron)
if(c == '8') selectModel(tank)
if(c == 's') drawSegs = !drawSegs
if(c == 'c') drawcdtMesh = !drawcdtMesh
if(c == 'e') {drawEarClip = !drawEarClip; drawCDT = false; selectModel(currentModel)}
@@ -308,6 +310,11 @@ class Poly2TriDemo extends BasicGame("Poly2Tri") {
doCDT = false; drawCDT = false; drawcdtMesh = false
//CDT.clearPoint = 7
loadModel(nazcaHeron, 4.5f, Point(400f, 300f), 1500)
case "data/tank.dat" =>
//doCDT = false; drawCDT = false; drawcdtMesh = false
doCDT = true; drawCDT = true
CDT.clearPoint = 50
loadModel(tank, -1f, Point(0f, 0f), 10)
case _ =>
assert(false)
}

View File

@@ -44,7 +44,7 @@ object CDT {
// Inital triangle factor
val ALPHA = 0.3f
val SHEER = 0.00001f
val SHEER = 0.001f
var clearPoint = 0
@@ -439,6 +439,7 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
val t2 = node.triangle
val point = t1.points(0)
/*
val oPoint = t2 oppositePoint t1
// Try to avoid creating degenerate triangles
@@ -467,13 +468,13 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
aFront.insertLegalized(t1.points(1), t1, node)
} else {
*/
// Update neighbor
t2.markNeighbor(t1)
// Update advancing front
aFront.insert(point, t1, node)
}
//}
}