From 5f27758d3a3543253019f558d8f672c5e8b71c2b Mon Sep 17 00:00:00 2001 From: Jesse Morgan Date: Sat, 5 Mar 2011 00:33:40 +0000 Subject: Changed name of alden to common --- src/tesseract/TesseractServer.java | 3 ++- src/tesseract/TesseractUI.java | 2 +- src/tesseract/World.java | 5 +++-- src/tesseract/objects/PhysicalObject.java | 2 +- src/tesseract/objects/Polygon.java | 3 ++- src/tesseract/objects/Sphere.java | 3 ++- 6 files changed, 11 insertions(+), 7 deletions(-) (limited to 'src/tesseract') diff --git a/src/tesseract/TesseractServer.java b/src/tesseract/TesseractServer.java index 3518c38..6899d7f 100644 --- a/src/tesseract/TesseractServer.java +++ b/src/tesseract/TesseractServer.java @@ -4,7 +4,8 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import alden.Peer; +import common.Peer; + /** * This class is not part of the deliverable. This class is simply a server to diff --git a/src/tesseract/TesseractUI.java b/src/tesseract/TesseractUI.java index 85f46a1..705dec6 100644 --- a/src/tesseract/TesseractUI.java +++ b/src/tesseract/TesseractUI.java @@ -44,11 +44,11 @@ import tesseract.newmenu.NewSurfBoardMenuItem; import tesseract.newmenu.NewToroidMenuItem; import tesseract.objects.PhysicalObject; import tesseract.objects.Sphere; -import alden.Peer; import com.sun.j3d.utils.picking.PickCanvas; import com.sun.j3d.utils.picking.PickResult; import com.sun.j3d.utils.universe.SimpleUniverse; +import common.Peer; /** * This class is the main UI for the Tesseract Project. diff --git a/src/tesseract/World.java b/src/tesseract/World.java index eb9d26b..9dc5f19 100644 --- a/src/tesseract/World.java +++ b/src/tesseract/World.java @@ -19,11 +19,12 @@ import javax.vecmath.Color3f; import javax.vecmath.Point3d; import javax.vecmath.Vector3f; +import common.CollidableObject; +import common.Peer; + import tesseract.forces.Force; import tesseract.objects.HalfSpace; import tesseract.objects.PhysicalObject; -import alden.CollidableObject; -import alden.Peer; /** * Model of the 3D world. diff --git a/src/tesseract/objects/PhysicalObject.java b/src/tesseract/objects/PhysicalObject.java index d4e4e3b..7b699e3 100644 --- a/src/tesseract/objects/PhysicalObject.java +++ b/src/tesseract/objects/PhysicalObject.java @@ -8,9 +8,9 @@ import javax.media.j3d.TransformGroup; import javax.vecmath.Quat4f; import javax.vecmath.Vector3f; -import alden.CollidableObject; import com.sun.j3d.utils.geometry.Primitive; +import common.CollidableObject; /** * This class is the parent of all objects in the world. diff --git a/src/tesseract/objects/Polygon.java b/src/tesseract/objects/Polygon.java index c8fcf53..7290e04 100644 --- a/src/tesseract/objects/Polygon.java +++ b/src/tesseract/objects/Polygon.java @@ -2,7 +2,8 @@ package tesseract.objects; import javax.media.j3d.Transform3D; import javax.vecmath.*; -import alden.CollidableObject; +import common.CollidableObject; + public abstract class Polygon extends PhysicalObject { public Vector3f normal; diff --git a/src/tesseract/objects/Sphere.java b/src/tesseract/objects/Sphere.java index cb93041..719ecc0 100644 --- a/src/tesseract/objects/Sphere.java +++ b/src/tesseract/objects/Sphere.java @@ -4,7 +4,8 @@ import java.awt.Color; import javax.media.j3d.*; import javax.vecmath.*; -import alden.CollidableObject; +import common.CollidableObject; + /** * Sphere. -- cgit v1.2.3