diff --git a/src/main/java/cactusServer/models/CollisionManager.java b/src/main/java/cactusServer/models/CollisionManager.java index 16034c9..2bad65d 100644 --- a/src/main/java/cactusServer/models/CollisionManager.java +++ b/src/main/java/cactusServer/models/CollisionManager.java @@ -2,15 +2,11 @@ import java.util.ArrayList; import java.util.HashMap; -import java.util.List; -import java.util.Map; import org.ntlab.radishforandroidstudio.framework.model3D.CollisionResult; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; import org.ntlab.radishforandroidstudio.framework.physics.PhysicsUtility; -import org.ntlab.radishforandroidstudio.java3d.Vector2f; import org.ntlab.radishforandroidstudio.java3d.Vector3d; -import cactusServer.entities.Character; import cactusServer.entities.Instance; import cactusServer.entities.Object; import cactusServer.entities.Player; @@ -18,6 +14,7 @@ public class CollisionManager { private static CollisionManager theInstance; private HashMap instances; + private ArrayList resultList; private CollisionManager() { instances = Instances.getInstance().getInstances(); @@ -30,7 +27,12 @@ return theInstance; } + public ArrayList getResultList() { + return resultList; + } + public void collisionRun(long interval) { + resultList.clear(); for (String instanceId : instances.keySet()) { Instance instance = Instances.getInstance().getInstance(instanceId); instance.getUniverse().update(interval); @@ -64,8 +66,8 @@ if (result != null) { Vector3d vec1 = object1.getVelocity().getVector3d(); Vector3d vec2 = object2.getVelocity().getVector3d(); - if(vec1.length() > vec2.length()) { - + if (vec1.length() > vec2.length()) { + } } }