summaryrefslogtreecommitdiff
path: root/src/tesseract/World.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/tesseract/World.java')
-rw-r--r--src/tesseract/World.java107
1 files changed, 50 insertions, 57 deletions
diff --git a/src/tesseract/World.java b/src/tesseract/World.java
index 456fed6..2e2b222 100644
--- a/src/tesseract/World.java
+++ b/src/tesseract/World.java
@@ -353,33 +353,20 @@ public class World implements Observer {
int test = myPeer.getPeerSize();
if(test > 0) {
System.out.println("Hit Side 1" + i_object.getPosition());
- PeerInformation info2 = myPeer.getPeerInDirection(j_object.getVelocity().getX(), j_object.getVelocity().getZ());
- System.out.println("PeerInfo: " + info2);
-
- myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
- (j_object.getVelocity().getX(), j_object.getVelocity().getZ()), j_object);
- indexToRemove = j;
- j_object.detach();
+ PeerInformation info = myPeer.getPeerInDirection(j_object.getVelocity().getX(), j_object.getVelocity().getZ());
+ System.out.println("PeerInfo: " + info);
+ if (info != null) {
+ myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
+ (j_object.getVelocity().getX(), j_object.getVelocity().getZ()), j_object);
+ indexToRemove = j;
+ j_object.detach();
+ }
}
i_object.resolveCollisions(j_object);
}
- //if 'i' side and a neighbor exists, transmit j object to that node
- /*if (i_object.equals(my_side1) && myPeer.getPeerInDirection
- (j_object.getVelocity().getX(), j_object.getVelocity().getZ()) != null) {
-
- System.out.println("Hit Side 1" + i_object.getPosition());
- PeerInformation info = myPeer.getPeerInDirection(j_object.getVelocity().getX(), j_object.getVelocity().getZ());
- System.out.println("PeerInfo: " + info);
-
- myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
- (j_object.getVelocity().getX(), j_object.getVelocity().getZ()), j_object);
- indexToRemove = j;
- j_object.detach();
-
- i_object.resolveCollisions(j_object);
- } */
+
if (i_object.equals(my_side2)) {
int test = myPeer.getPeerSize();
if(test > 0) {
@@ -387,11 +374,12 @@ public class World implements Observer {
System.out.println("Hit Side 2" + i_object.getPosition());
PeerInformation info = myPeer.getPeerInDirection(j_object.getVelocity().getX(), j_object.getVelocity().getZ());
System.out.println("PeerInfo: " + info);
-
- myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
+ if (info != null) {
+ myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
(j_object.getVelocity().getX(), j_object.getVelocity().getZ()), j_object);
- indexToRemove = j;
- j_object.detach();
+ indexToRemove = j;
+ j_object.detach();
+ }
}
i_object.resolveCollisions(j_object);
@@ -403,11 +391,12 @@ public class World implements Observer {
System.out.println("Hit Side 3" + i_object.getPosition());
PeerInformation info = myPeer.getPeerInDirection(j_object.getVelocity().getX(), j_object.getVelocity().getZ());
System.out.println("PeerInfo: " + info);
-
- myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
- (j_object.getVelocity().getX(), j_object.getVelocity().getZ()), j_object);
- indexToRemove = j;
- j_object.detach();
+ if (info != null) {
+ myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
+ (j_object.getVelocity().getX(), j_object.getVelocity().getZ()), j_object);
+ indexToRemove = j;
+ j_object.detach();
+ }
}
i_object.resolveCollisions(j_object);
@@ -419,11 +408,12 @@ public class World implements Observer {
System.out.println("Hit Side 4" + i_object.getPosition());
PeerInformation info = myPeer.getPeerInDirection(j_object.getVelocity().getX(), j_object.getVelocity().getZ());
System.out.println("PeerInfo: " + info);
-
- myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
- (j_object.getVelocity().getX(), j_object.getVelocity().getZ()), j_object);
- indexToRemove = j;
- j_object.detach();
+ if (info != null) {
+ myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
+ (j_object.getVelocity().getX(), j_object.getVelocity().getZ()), j_object);
+ indexToRemove = j;
+ j_object.detach();
+ }
}
i_object.resolveCollisions(j_object);
}
@@ -436,13 +426,13 @@ public class World implements Observer {
System.out.println("Hit Side 1" + j_object.getPosition());
PeerInformation info = myPeer.getPeerInDirection(i_object.getVelocity().getX(), i_object.getVelocity().getZ());
System.out.println("PeerInfo: " + info);
-
- myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
- (i_object.getVelocity().getX(), i_object.getVelocity().getZ()), i_object);
- indexToRemove = i;
- i_object.detach();
+ if (info != null) {
+ myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
+ (i_object.getVelocity().getX(), i_object.getVelocity().getZ()), i_object);
+ indexToRemove = i;
+ i_object.detach();
+ }
}
-
j_object.resolveCollisions(i_object);
}
if (j_object.equals(my_side2)) {
@@ -452,11 +442,12 @@ public class World implements Observer {
System.out.println("Hit Side 2" + i_object.getPosition());
PeerInformation info = myPeer.getPeerInDirection(i_object.getVelocity().getX(), i_object.getVelocity().getZ());
System.out.println("PeerInfo: " + info);
-
- myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
- (i_object.getVelocity().getX(), i_object.getVelocity().getZ()), i_object);
- indexToRemove = i;
- i_object.detach();
+ if (info != null) {
+ myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
+ (i_object.getVelocity().getX(), i_object.getVelocity().getZ()), i_object);
+ indexToRemove = i;
+ i_object.detach();
+ }
}
j_object.resolveCollisions(i_object);
@@ -468,11 +459,12 @@ public class World implements Observer {
System.out.println("Hit Side 3" + j_object.getPosition());
PeerInformation info = myPeer.getPeerInDirection(i_object.getVelocity().getX(), i_object.getVelocity().getZ());
System.out.println("PeerInfo: " + info);
-
- myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
- (i_object.getVelocity().getX(), i_object.getVelocity().getZ()), i_object);
- indexToRemove = i;
- i_object.detach();
+ if (info != null) {
+ myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
+ (i_object.getVelocity().getX(), i_object.getVelocity().getZ()), i_object);
+ indexToRemove = i;
+ i_object.detach();
+ }
}
j_object.resolveCollisions(i_object);
@@ -484,11 +476,12 @@ public class World implements Observer {
System.out.println("Hit Side 4" + j_object.getPosition());
PeerInformation info = myPeer.getPeerInDirection(i_object.getVelocity().getX(), i_object.getVelocity().getZ());
System.out.println("PeerInfo: " + info);
-
- myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
- (i_object.getVelocity().getX(), i_object.getVelocity().getZ()), i_object);
- indexToRemove = i;
- i_object.detach();
+ if (info != null) {
+ myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
+ (i_object.getVelocity().getX(), i_object.getVelocity().getZ()), i_object);
+ indexToRemove = i;
+ i_object.detach();
+ }
}
j_object.resolveCollisions(i_object);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-15 21:41:03 +0000