summaryrefslogtreecommitdiff
path: root/src/main/scala/sims/collision/PolyCircleCollision.scala
diff options
context:
space:
mode:
authorJakob Odersky <jodersky@gmail.com>2015-06-29 12:43:56 +0200
committerJakob Odersky <jodersky@gmail.com>2015-06-29 12:43:56 +0200
commit642f97a9378f71a279b22aa4af12f12e7f52c149 (patch)
tree6ac5fad49c62d835420f3865f966200a8b30b6a1 /src/main/scala/sims/collision/PolyCircleCollision.scala
parent3bc7d76b5da00781908da82cd0e989885323396f (diff)
downloadsims-642f97a9378f71a279b22aa4af12f12e7f52c149.tar.gz
sims-642f97a9378f71a279b22aa4af12f12e7f52c149.tar.bz2
sims-642f97a9378f71a279b22aa4af12f12e7f52c149.zip
fix warnings
Diffstat (limited to 'src/main/scala/sims/collision/PolyCircleCollision.scala')
-rw-r--r--src/main/scala/sims/collision/PolyCircleCollision.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/sims/collision/PolyCircleCollision.scala b/src/main/scala/sims/collision/PolyCircleCollision.scala
index 20f1d49..3048ef3 100644
--- a/src/main/scala/sims/collision/PolyCircleCollision.scala
+++ b/src/main/scala/sims/collision/PolyCircleCollision.scala
@@ -19,11 +19,11 @@ case class PolyCircleCollision(p: ConvexPolygon, c: Circle) extends Collision {
//minimum overlap
var min = (p.sides(0) distance c.pos) - c.radius
var axis = p.sides(0).n0
- for (s <- p.sides; val delta = (s distance c.pos) - c.radius) if (delta <= 0 && delta < min) {
+ for (s <- p.sides; delta = (s distance c.pos) - c.radius) if (delta <= 0 && delta < min) {
min = delta
axis = s.n0
}
- for (v <- p.vertices; val delta = (v - c.pos).length - c.radius) if (delta <= 0 && delta <= min){
+ for (v <- p.vertices; delta = (v - c.pos).length - c.radius) if (delta <= 0 && delta <= min){
min = delta
axis = (c.pos - v).unit
}