diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2009-12-13 16:06:50 +0000 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2009-12-13 16:06:50 +0000 |
| commit | 66d338aec5d632927fa561a68310c8931938e9e0 (patch) | |
| tree | 1e200fd94bb903772b007690da4e5d13fc46fb5b /src/sims/collision | |
| parent | be2ee4dea92c5a4fc2329959d6e7272c50b221a6 (diff) | |
| download | sims-66d338aec5d632927fa561a68310c8931938e9e0.tar.gz sims-66d338aec5d632927fa561a68310c8931938e9e0.tar.bz2 sims-66d338aec5d632927fa561a68310c8931938e9e0.zip | |
Ported to scala 2.8.
Diffstat (limited to 'src/sims/collision')
| -rw-r--r-- | src/sims/collision/AABB.scala | 2 | ||||
| -rw-r--r-- | src/sims/collision/CircleCollision.scala | 4 | ||||
| -rw-r--r-- | src/sims/collision/Collision.scala | 4 | ||||
| -rw-r--r-- | src/sims/collision/Detector.scala | 2 | ||||
| -rw-r--r-- | src/sims/collision/GridDetector.scala | 3 | ||||
| -rw-r--r-- | src/sims/collision/PolyCollision.scala | 1 |
6 files changed, 7 insertions, 9 deletions
diff --git a/src/sims/collision/AABB.scala b/src/sims/collision/AABB.scala index ea696f2..f3a0b71 100644 --- a/src/sims/collision/AABB.scala +++ b/src/sims/collision/AABB.scala @@ -6,7 +6,7 @@ package sims.collision -import geometry._ +import sims.geometry._ /** * Axis Aligned Bounding Boxes (AABBs) are rectangles that frame a shape. diff --git a/src/sims/collision/CircleCollision.scala b/src/sims/collision/CircleCollision.scala index e77c8e2..04cf2d7 100644 --- a/src/sims/collision/CircleCollision.scala +++ b/src/sims/collision/CircleCollision.scala @@ -6,8 +6,8 @@ package sims.collision -import geometry._ -import dynamics._ +import sims.geometry._ +import sims.dynamics._ /**Collision between two circles.*/ case class CircleCollision(c1: Circle, c2: Circle) extends Collision { diff --git a/src/sims/collision/Collision.scala b/src/sims/collision/Collision.scala index ce09ac2..540081a 100644 --- a/src/sims/collision/Collision.scala +++ b/src/sims/collision/Collision.scala @@ -6,8 +6,8 @@ package sims.collision -import dynamics._ -import geometry._ +import sims.dynamics._ +import sims.geometry._ /**Collision between two shapes. Contains methods to compute the collision response.*/ abstract class Collision extends Constraint { diff --git a/src/sims/collision/Detector.scala b/src/sims/collision/Detector.scala index 0a3ad5b..96af5dc 100644 --- a/src/sims/collision/Detector.scala +++ b/src/sims/collision/Detector.scala @@ -9,8 +9,6 @@ package sims.collision import sims.geometry._ import sims.dynamics._ -import scala.collection._ -import scala.collection.mutable._ /**A world detects its collisions through concrete implementations of this class.*/ abstract class Detector { diff --git a/src/sims/collision/GridDetector.scala b/src/sims/collision/GridDetector.scala index f5ed99a..abc40f2 100644 --- a/src/sims/collision/GridDetector.scala +++ b/src/sims/collision/GridDetector.scala @@ -9,7 +9,8 @@ package sims.collision import sims.dynamics._ import sims.geometry._ import scala.collection._ -import scala.collection.mutable._ +import scala.collection.mutable.ArrayBuffer +import scala.collection.mutable.HashMap /**A conrete implementation of <code>Detector</code>. <code>GridDetector</code> divides the world into a grid * for faster collision detection.*/ diff --git a/src/sims/collision/PolyCollision.scala b/src/sims/collision/PolyCollision.scala index b4fa917..5296f41 100644 --- a/src/sims/collision/PolyCollision.scala +++ b/src/sims/collision/PolyCollision.scala @@ -9,7 +9,6 @@ package sims.collision import sims.geometry._ import sims.dynamics._ import scala.collection.mutable.Map -import scala.collection.mutable._ /**Collision between two convex polygons.*/ case class PolyCollision(p1: ConvexPolygon, p2: ConvexPolygon) extends Collision { |