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

2 files changed, 5 insertions, 5 deletions

diff --git a/src/tesseract/forces/Force.java b/src/tesseract/forces/Force.java
index 60498a1..23a1195 100644
--- a/src/tesseract/forces/Force.java
+++ b/src/tesseract/forces/Force.java
@@ -2,7 +2,7 @@ package tesseract.forces;
 
 import javax.vecmath.Vector3f;
 
-import tesseract.objects.Forceable;
+import tesseract.objects.PhysicalObject;
 
 /**
  * Abstract Force class.
@@ -16,14 +16,14 @@ public abstract class Force {
 	 * @param obj The given object.
 	 * @return A vector describing the force.
 	 */
-	protected abstract Vector3f calculateForce(final Forceable obj);
+	protected abstract Vector3f calculateForce(final PhysicalObject obj);
 	
 	/**
 	 * Apply this force to the given object.
 	 * 
 	 * @param obj The given object.
 	 */
-	public void applyForceTo(final Forceable obj) {
+	public void applyForceTo(final PhysicalObject obj) {
 		obj.addForce(calculateForce(obj));
 	}
 }
diff --git a/src/tesseract/forces/Gravity.java b/src/tesseract/forces/Gravity.java
index 79e7f6a..3cbf33e 100644
--- a/src/tesseract/forces/Gravity.java
+++ b/src/tesseract/forces/Gravity.java
@@ -2,7 +2,7 @@ package tesseract.forces;
 
 import javax.vecmath.Vector3f;
 
-import tesseract.objects.Forceable;
+import tesseract.objects.PhysicalObject;
 
 /**
  * Generic downward force class (aka Gravity).
@@ -42,7 +42,7 @@ public class Gravity extends Force {
 	 * @param obj The object the force is calculated for.
 	 * @return A vector describing the force
 	 */
-	protected Vector3f calculateForce(final Forceable obj) {
+	protected Vector3f calculateForce(final PhysicalObject obj) {
 		return new Vector3f(0, -myGravity, 0);
 	}