- Adjusted server tick rate to test smoothing

tags : #story[1273]

src/main/java/seng302/model/ClientYacht.java

@@ -15,8 +15,8 @@ import javafx.beans.property.ReadOnlyLongWrapper;
 import javafx.scene.paint.Color;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import seng302.visualiser.fxObjects.assets_3D.BoatObject;
 import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
+import seng302.visualiser.fxObjects.assets_3D.BoatObject;
 
 /**
  * Yacht class for the racing boat. <p> Class created to store more variables (eg. boat statuses)
@@ -79,6 +79,7 @@ public class ClientYacht extends Observable {
         this.country = country;
         this.location = new GeoPoint(57.670341, 11.826856);
         this.heading = 120.0;   //In degrees
+        this.headingProperty.set(this.heading);
         this.currentVelocity = 0d;
         this.boatStatus = 1;
         this.colour = Color.rgb(0, 0, 0, 1.0);
@@ -271,7 +272,12 @@ public class ClientYacht extends Observable {
         Double oldHeading = getHeadingProperty().get();
         Double currHeading = heading;
         while (oldHeading.equals(currHeading)) {
-            oldHeading++;
+            try {
+                Thread.sleep(500);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            oldHeading += 0.5;
             headingProperty.set(oldHeading);
         }
     }
@@ -314,7 +320,6 @@ public class ClientYacht extends Observable {
     }
 
     public ReadOnlyDoubleWrapper getHeadingProperty() {
-
         return headingProperty;
     }
 

src/main/java/seng302/visualiser/ClientToServerThread.java

@@ -68,7 +68,7 @@ public class ClientToServerThread implements Runnable {
     private Timer upWindPacketTimer = new Timer();
     private Timer downWindPacketTimer = new Timer();
     private boolean upwindTimerFlag = false, downwindTimerFlag = false;
-    static public final int PACKET_SENDING_INTERVAL_MS = 100;
+    static public final int PACKET_SENDING_INTERVAL_MS = 60;
 
     private int clientId = -1;
 

src/main/java/seng302/visualiser/cameras/ChaseCamera.java

@@ -29,7 +29,7 @@ public class ChaseCamera extends PerspectiveCamera implements RaceCamera {
     public void setPlayerBoat(BoatObject playerBoat, ClientYacht playerYacht) {
         this.playerBoat = playerBoat;
         this.playerYacht = playerYacht;
-
+        System.out.println(playerYacht.getHeadingProperty().get());
         this.playerYacht.getHeadingProperty().addListener(new ChangeListener<Number>() {
             @Override
             public void changed(ObservableValue<? extends Number> observable, Number oldValue,
@@ -74,17 +74,21 @@ public class ChaseCamera extends PerspectiveCamera implements RaceCamera {
         );
     }
 
+    private void adjustZoomFactor(Double adjustment) {
+        if (zoomFactor + adjustment < -15.0 && zoomFactor + adjustment > -125.0) {
+            zoomFactor = zoomFactor + adjustment;
+        }
+    }
+
     @Override
     public void zoomIn() {
-        //transforms.addAll(new Translate(0, 0, 1.5));
+        adjustZoomFactor(5.0);
-        this.zoomFactor += 5;
         repositionCamera();
     }
 
     @Override
     public void zoomOut() {
-        //transforms.addAll(new Translate(0, 0, -1.5));
+        adjustZoomFactor(-5.0);
-        this.zoomFactor -= 5;
         repositionCamera();
     }