summaryrefslogtreecommitdiff
path: root/src/tesseract
diff options
context:
space:
mode:
authorSteve <steveb9@u.washington.edu>2011-03-06 12:08:56 +0000
committerSteve <steveb9@u.washington.edu>2011-03-06 12:08:56 +0000
commit1ff58190d720ec3d09b66c9aa9b576caeccbdc35 (patch)
treeba6a5f3b0ed92aebe40422716e7f772dbf5a323d /src/tesseract
parent9ffaaac2d072edea8c4b1dfe84ad75d355d11baf (diff)
fixed bug with switchposition caused 2 obj to appear. split method up into two methods for switchX and swithZ. side1 uses Z, side2 usesX, side3 uses Z, side4 usesX
Diffstat (limited to 'src/tesseract')
-rw-r--r--src/tesseract/World.java16
-rw-r--r--src/tesseract/objects/PhysicalObject.java15
2 files changed, 19 insertions, 12 deletions
diff --git a/src/tesseract/World.java b/src/tesseract/World.java
index 73b712b..53a7fa3 100644
--- a/src/tesseract/World.java
+++ b/src/tesseract/World.java
@@ -356,7 +356,7 @@ public class World implements Observer {
PeerInformation info = myPeer.getPeerInDirection(j_object.getVelocity().getX(), j_object.getVelocity().getZ());
System.out.println("PeerInfo: " + info);
if (info != null) {
- j_object.switchPosition();
+ j_object.switchZ();
myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
(j_object.getVelocity().getX(), j_object.getVelocity().getZ()), j_object);
indexToRemove = j;
@@ -374,7 +374,7 @@ public class World implements Observer {
PeerInformation info = myPeer.getPeerInDirection(j_object.getVelocity().getX(), j_object.getVelocity().getZ());
System.out.println("PeerInfo: " + info);
if (info != null) {
- j_object.switchPosition();
+ j_object.switchX();
myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
(j_object.getVelocity().getX(), j_object.getVelocity().getZ()), j_object);
indexToRemove = j;
@@ -392,7 +392,7 @@ public class World implements Observer {
PeerInformation info = myPeer.getPeerInDirection(j_object.getVelocity().getX(), j_object.getVelocity().getZ());
System.out.println("PeerInfo: " + info);
if (info != null) {
- j_object.switchPosition();
+ j_object.switchZ();
myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
(j_object.getVelocity().getX(), j_object.getVelocity().getZ()), j_object);
indexToRemove = j;
@@ -409,7 +409,7 @@ public class World implements Observer {
PeerInformation info = myPeer.getPeerInDirection(j_object.getVelocity().getX(), j_object.getVelocity().getZ());
System.out.println("PeerInfo: " + info);
if (info != null) {
- j_object.switchPosition();
+ j_object.switchX();
myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
(j_object.getVelocity().getX(), j_object.getVelocity().getZ()), j_object);
indexToRemove = j;
@@ -428,7 +428,7 @@ public class World implements Observer {
PeerInformation info = myPeer.getPeerInDirection(i_object.getVelocity().getX(), i_object.getVelocity().getZ());
System.out.println("PeerInfo: " + info);
if (info != null) {
- i_object.switchPosition();
+ i_object.switchZ();
myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
(i_object.getVelocity().getX(), i_object.getVelocity().getZ()), i_object);
indexToRemove = i;
@@ -445,7 +445,7 @@ public class World implements Observer {
PeerInformation info = myPeer.getPeerInDirection(i_object.getVelocity().getX(), i_object.getVelocity().getZ());
System.out.println("PeerInfo: " + info);
if (info != null) {
- i_object.switchPosition();
+ i_object.switchX();
myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
(i_object.getVelocity().getX(), i_object.getVelocity().getZ()), i_object);
indexToRemove = i;
@@ -462,7 +462,7 @@ public class World implements Observer {
PeerInformation info = myPeer.getPeerInDirection(i_object.getVelocity().getX(), i_object.getVelocity().getZ());
System.out.println("PeerInfo: " + info);
if (info != null) {
- i_object.switchPosition();
+ i_object.switchZ();
myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
(i_object.getVelocity().getX(), i_object.getVelocity().getZ()), i_object);
indexToRemove = i;
@@ -479,7 +479,7 @@ public class World implements Observer {
PeerInformation info = myPeer.getPeerInDirection(i_object.getVelocity().getX(), i_object.getVelocity().getZ());
System.out.println("PeerInfo: " + info);
if (info != null) {
- i_object.switchPosition();
+ i_object.switchX();
myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
(i_object.getVelocity().getX(), i_object.getVelocity().getZ()), i_object);
indexToRemove = i;
diff --git a/src/tesseract/objects/PhysicalObject.java b/src/tesseract/objects/PhysicalObject.java
index 2497153..34cbec9 100644
--- a/src/tesseract/objects/PhysicalObject.java
+++ b/src/tesseract/objects/PhysicalObject.java
@@ -112,14 +112,21 @@ public class PhysicalObject extends CollidableObject {
}
/**
- * Switches the position of the object before transmission.
+ * Switches the z position of the object before transmission.
*/
- public void switchPosition() {
- float x = position.getX();
+ public void switchZ() {
+
float z = position.getZ();
+ position.z = -z;
+ }
+
+ /**
+ * Switches the z position of the object before transmission.
+ */
+ public void switchX() {
+ float x = position.getX();
position.x = -x;
- position.z = -z;
}
/**