From b172409a18162e865f2bcc3267295f90d76adf6a Mon Sep 17 00:00:00 2001 From: Steve Date: Sun, 6 Mar 2011 09:51:07 +0000 Subject: Forgot to change a couple of Y's to Zs --- src/common/Peer.java | 9 +++++++++ src/tesseract/World.java | 16 ++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/common/Peer.java b/src/common/Peer.java index eb23a30..14ca0b8 100644 --- a/src/common/Peer.java +++ b/src/common/Peer.java @@ -344,6 +344,15 @@ public class Peer extends Observable { return minPeer; } + + /** + * Gets the size of peers in the list + * + * @param returns an int representing the number of peers + */ + public int getPeerSize() { + return peers.size(); + } /** * A method that sends a CollidableObject to all diff --git a/src/tesseract/World.java b/src/tesseract/World.java index 71dcdcd..0f01b3a 100644 --- a/src/tesseract/World.java +++ b/src/tesseract/World.java @@ -352,40 +352,40 @@ public class World implements Observer { (j_object.getVelocity().getX(), j_object.getVelocity().getZ()) != null) { System.out.println("Hit Side 1" + i_object.getPosition()); myPeer.sendPayloadToPeer(myPeer.getPeerInDirection - (j_object.getVelocity().getX(), j_object.getVelocity().getY()), j_object); + (j_object.getVelocity().getX(), j_object.getVelocity().getZ()), j_object); indexToRemove = j; j_object.detach(); - //i_object.resolveCollisions(j_object); + i_object.resolveCollisions(j_object); } if (myObjects.get(i).equals(my_side2) && myPeer.getPeerInDirection (j_object.getVelocity().getX(), j_object.getVelocity().getZ()) != null) { System.out.println("Hit Side 2" + i_object.getPosition()); myPeer.sendPayloadToPeer(myPeer.getPeerInDirection - (j_object.getVelocity().getX(), myObjects.get(j).getVelocity().getY()), myObjects.get(j)); + (j_object.getVelocity().getX(), j_object.getVelocity().getZ()), myObjects.get(j)); indexToRemove = j; j_object.detach(); - //i_object.resolveCollisions(j_object); + i_object.resolveCollisions(j_object); } if (i_object.equals(my_side3) && myPeer.getPeerInDirection (j_object.getVelocity().getX(), j_object.getVelocity().getZ()) != null) { System.out.println("Hit Side 3" + i_object.getPosition()); myPeer.sendPayloadToPeer(myPeer.getPeerInDirection - (j_object.getVelocity().getX(), myObjects.get(j).getVelocity().getY()), j_object); + (j_object.getVelocity().getX(), myObjects.get(j).getVelocity().getZ()), j_object); indexToRemove = j; j_object.detach(); - //i_object.resolveCollisions(j_object); + i_object.resolveCollisions(j_object); } if (myObjects.get(i).equals(my_side4) && myPeer.getPeerInDirection (j_object.getVelocity().getX(), j_object.getVelocity().getZ()) != null) { System.out.println("Hit Side 4" + i_object.getPosition()); myPeer.sendPayloadToPeer(myPeer.getPeerInDirection - (j_object.getVelocity().getX(), myObjects.get(j).getVelocity().getY()), myObjects.get(j)); + (j_object.getVelocity().getX(), j_object.getVelocity().getZ()), myObjects.get(j)); indexToRemove = j; myObjects.get(j).detach(); - //i_object.resolveCollisions(j_object); + i_object.resolveCollisions(j_object); } } } -- cgit v1.2.3