diff options
| author | Steve <steveb9@u.washington.edu> | 2011-03-05 13:59:52 +0000 |
|---|---|---|
| committer | Steve <steveb9@u.washington.edu> | 2011-03-05 13:59:52 +0000 |
| commit | 0a81b367574f1574b3fc3a92d97f967a24bc3f83 (patch) | |
| tree | f8478f6dfd0f5a884e8019eeb0106fda37852a62 /src | |
| parent | 87c4c6b5e7952468af71d4383b44c1b3ee12df7c (diff) | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/tesseract/World.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/tesseract/World.java b/src/tesseract/World.java index 11e2677..b129832 100644 --- a/src/tesseract/World.java +++ b/src/tesseract/World.java @@ -258,14 +258,6 @@ public class World implements Observer { */ // Collision Detection with Aldens mar4 suggestions - PeerInformation neighbor1 = myPeer.getPeerInDirection(my_side1.getPosition().getX(), - my_side1.getPosition().getY()); - PeerInformation neighbor2 = myPeer.getPeerInDirection(my_side2.getPosition().getX(), - my_side2.getPosition().getY()); - PeerInformation neighbor3 = myPeer.getPeerInDirection(my_side3.getPosition().getX(), - my_side3.getPosition().getY()); - PeerInformation neighbor4 = myPeer.getPeerInDirection(my_side4.getPosition().getX(), - my_side4.getPosition().getY()); for (int i = 0; i < myObjects.size() - 1; i++) { for (int j = i + 1; j < myObjects.size(); j++) { @@ -275,6 +267,15 @@ public class World implements Observer { //if 'i' is a side and a neighbor exists, transmit j object to that node if (collisions.size() > 0) { + PeerInformation neighbor1 = myPeer.getPeerInDirection(my_side1.getPosition().getX(), + my_side1.getPosition().getY()); + PeerInformation neighbor2 = myPeer.getPeerInDirection(my_side2.getPosition().getX(), + my_side2.getPosition().getY()); + PeerInformation neighbor3 = myPeer.getPeerInDirection(my_side3.getPosition().getX(), + my_side3.getPosition().getY()); + PeerInformation neighbor4 = myPeer.getPeerInDirection(my_side4.getPosition().getX(), + my_side4.getPosition().getY()); + if (myObjects.get(i).equals(my_side1) && neighbor1 != null) { myPeer.sendPayloadToPeer(myPeer.getPeerInDirection (my_side1.getPosition().getX(), my_side1.getPosition().getY()), myObjects.get(j)); |