Broke the grabbing code but added Alden's collision code. Not sure if its working yet since my Mac doesn't like it.

1 files changed, 0 insertions, 26 deletions

diff --git a/src/tesseract/objects/CollidableObject.java b/src/tesseract/objects/CollidableObject.java
deleted file mode 100644
index 96248ac..0000000
--- a/src/tesseract/objects/CollidableObject.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package tesseract.objects;
-
-import javax.vecmath.Vector3f;
-
-public abstract class CollidableObject extends PhysicalObject implements Collidable {
-
-	public CollidableObject(Vector3f position) {
-		super(position);
-	}
-
-	public CollisionInfo calculateCollision(Physical obj) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public boolean hasCollision(Physical obj) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public void resolveCollision(Physical obj, CollisionInfo collision) {
-		// TODO Auto-generated method stub
-		
-	}
-
-}