From 2554ceb151002cb2f4bb51a06fcac3a09b20ae50 Mon Sep 17 00:00:00 2001
From: Steve <steveb9@u.washington.edu>
Date: Sat, 5 Mar 2011 14:18:39 +0000
Subject: reverting tired now

---
 src/tesseract/World.java | 56 ++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 30 deletions(-)

(limited to 'src/tesseract/World.java')

diff --git a/src/tesseract/World.java b/src/tesseract/World.java
index 5275525..447c6b2 100644
--- a/src/tesseract/World.java
+++ b/src/tesseract/World.java
@@ -28,7 +28,6 @@ import common.CollidableObject;
 import common.CollisionDetector;
 import common.CollisionInfo;
 import common.Peer;
-import common.PeerInformation;
 
 /**
  * Model of the 3D world.
@@ -258,67 +257,64 @@ public class World implements Observer {
 		 */
 		
 		// Collision Detection with Aldens mar4 suggestions
-		
 		for (int i = 0; i < myObjects.size() - 1; i++) {
 			for (int j = i + 1; j < myObjects.size(); j++) {
 				ArrayList<CollisionInfo> collisions = 
 					CollisionDetector.calculateCollisions(myObjects.get(i),myObjects.get(j));
-				
-				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 'i' is a side and a neighbor exists, transmit j object to that node
-				if (collisions.size() > 0 && neighbor1 != null || neighbor2 != null ||
-						neighbor3 != null || neighbor4 != null  ) {
+				if (collisions.size() > 0) {
 					
-					if (myObjects.get(i).equals(my_side1) && neighbor1 != null) {
+					if (myObjects.get(i).equals(my_side1) && myPeer.getPeerInDirection
+							(my_side1.getPosition().getX(), my_side1.getPosition().getY()) != null) {
 						myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
 								(my_side1.getPosition().getX(), my_side1.getPosition().getY()), myObjects.get(j));
-						//myObjects.get(j).detach();
+						myObjects.get(j).detach();
 					}
-					if (myObjects.get(i).equals(my_side2)&& neighbor2 != null) {
+					if (myObjects.get(i).equals(my_side2)&& myPeer.getPeerInDirection
+							(my_side2.getPosition().getX(), my_side2.getPosition().getY()) != null) {
 						myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
 								(my_side2.getPosition().getX(), my_side2.getPosition().getY()), myObjects.get(j));
-						//myObjects.get(j).detach();
+						myObjects.get(j).detach();
 					} 
-					if (myObjects.get(i).equals(my_side3)&& neighbor3 != null) {
+					if (myObjects.get(i).equals(my_side3)&& myPeer.getPeerInDirection
+							(my_side3.getPosition().getX(), my_side3.getPosition().getY()) != null) {
 						myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
 								(my_side3.getPosition().getX(), my_side3.getPosition().getY()), myObjects.get(j));
-						//myObjects.get(j).detach();
+						myObjects.get(j).detach();
 					} 
-					if (myObjects.get(i).equals(my_side4)&& neighbor4 != null) {
+					if (myObjects.get(i).equals(my_side4)&& myPeer.getPeerInDirection
+							(my_side4.getPosition().getX(), my_side4.getPosition().getY()) != null) {
 						myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
 								(my_side4.getPosition().getX(), my_side4.getPosition().getY()), myObjects.get(j));
-						//myObjects.get(j).detach();
+						myObjects.get(j).detach();
 					}
 				
 				//if 'j' is a side transmit i object
-					if (myObjects.get(j).equals(my_side1)&& neighbor1 != null) {
+				/*	if (myObjects.get(j).equals(my_side1)&& myPeer.getPeerInDirection
+							(my_side1.getPosition().getX(), my_side1.getPosition().getY()) != null) {
 						myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
 								(my_side1.getPosition().getX(), my_side1.getPosition().getY()), myObjects.get(i));
-						//myObjects.get(i).detach();
+						myObjects.get(i).detach();
 					} 
-					if (myObjects.get(j).equals(my_side2)&& neighbor2 != null) {
+					if (myObjects.get(j).equals(my_side2)&& myPeer.getPeerInDirection
+							(my_side2.getPosition().getX(), my_side2.getPosition().getY()) != null) {
 						myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
 								(my_side2.getPosition().getX(), my_side2.getPosition().getY()), myObjects.get(i));
-						//myObjects.get(i).detach();
+						myObjects.get(i).detach();
 					} 
-					if (myObjects.get(j).equals(my_side3)&& neighbor3 != null) {
+					if (myObjects.get(j).equals(my_side3)&& myPeer.getPeerInDirection
+							(my_side3.getPosition().getX(), my_side3.getPosition().getY()) != null) {
 						myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
 								(my_side3.getPosition().getX(), my_side3.getPosition().getY()), myObjects.get(i));
-						//myObjects.get(i).detach();
+						myObjects.get(i).detach();
 					} 
-					if (myObjects.get(j).equals(my_side4)&& neighbor4!= null) {
+					if (myObjects.get(j).equals(my_side4)&& myPeer.getPeerInDirection
+							(my_side4.getPosition().getX(), my_side4.getPosition().getY()) != null) {
 						myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
 								(my_side4.getPosition().getX(), my_side4.getPosition().getY()), myObjects.get(i));
-						//myObjects.get(i).detach();
-					}
+						myObjects.get(i).detach();
+					}*/
 					
 					myObjects.get(i).resolveCollisions(myObjects.get(j));
 				}
-- 
cgit v1.2.3