diff --git a/src/main/java/cactusServer/models/CollisionManager.java b/src/main/java/cactusServer/models/CollisionManager.java index 8765087..ca3aedb 100644 --- a/src/main/java/cactusServer/models/CollisionManager.java +++ b/src/main/java/cactusServer/models/CollisionManager.java @@ -1,20 +1,51 @@ package cactusServer.models; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + import org.ntlab.radishforandroidstudio.framework.model3D.CollisionResult; +import org.ntlab.radishforandroidstudio.framework.physics.PhysicsUtility; + +import cactusServer.entities.Character; +import cactusServer.entities.Instance; public class CollisionManager { private static CollisionManager theInstance; - private CollisionResult result; + private List result; + private HashMap instances; + + private CollisionManager() { + result = new ArrayList(); + instances = Instances.getInstance().getInstances(); + } + public static CollisionManager getCollision() { if (theInstance == null) { theInstance = new CollisionManager(); } return theInstance; } - public CollisionResult getResult() { + + public List getResult() { return result; } - public void setResult(CollisionResult result) { - this.result = result; + + @SuppressWarnings("unlikely-arg-type") + public void collisionRun() { + result.clear(); + for (Map.Entry instance : instances.entrySet()) { + HashMap objects = instance.getValue().getObjects(); + HashMap characters = instance.getValue().getCharacters(); + for (Map.Entry object : objects.entrySet()) { + for (Map.Entry character : characters.entrySet()) { + result.add(PhysicsUtility.checkCollision(, "", + instances.get(i).getObjects().get(j).getObject(), "")); + } + } + } } + }