Merge branch 'master' into story1301-start

racevisionGame/src/main/java/mock/app/Event.java

@@ -77,7 +77,7 @@ public class Event {
         String boatsXMLFile = "mock/mockXML/boatTest.xml";
         String regattaXMLFile = "mock/mockXML/regattaTest.xml";
         switch (mapIndex){
-            case 0:raceXMLFile = "mock/mockXML/raceSixPlayers.xml";
+            case 0:raceXMLFile = "mock/mockXML/ac35MapLayout.xml";
                 break;
             case 1:raceXMLFile = "mock/mockXML/oMapLayout.xml";
                 break;
@@ -90,13 +90,12 @@ public class Event {
                 boatsXMLFile = "mock/mockXML/boatTutorial.xml";
                 regattaXMLFile = "mock/mockXML/regattaTutorial.xml";
                 break;
-            default: raceXMLFile = "mock/mockXML/raceSixPlayers.xml";
+            default: raceXMLFile = "mock/mockXML/ac35MapLayout.xml";
 
         }
 
 
         if (singlePlayer) {
-            raceXMLFile = "mock/mockXML/raceSinglePlayer.xml";
             boatsXMLFile = "mock/mockXML/boatsSinglePlayer.xml";
         }
 

racevisionGame/src/main/java/mock/model/MockRace.java

@@ -109,8 +109,6 @@ public class MockRace extends RaceState {
             colliderRegistry.addCollider(mark.getMark1());
             if(mark.getMark2() != null) colliderRegistry.addCollider(mark.getMark2());
         }
-
-        this.colliderRegistry.addAllColliders(boats);
     }
 
 
@@ -133,9 +131,9 @@ public class MockRace extends RaceState {
 
         this.boats.add(mockBoat);
         this.activeObserverCommands.put(boat.getSourceID(), new ActiveObserverCommand());
+        this.colliderRegistry.addCollider(mockBoat);
 
         getRaceDataSource().incrementSequenceNumber();
-
     }
 
     /**

racevisionGame/src/main/java/shared/model/Boat.java

@@ -418,7 +418,7 @@ public class Boat extends Collider {
     @Override
     public boolean rayCast(Boat boat) {
         if(boat != this) {
-            return rayCast(boat, 15);
+            return rayCast(boat, 50);
         } else return false;
     }
 

racevisionGame/src/main/java/shared/model/Constants.java

@@ -28,7 +28,7 @@ public class Constants {
      * Frame periods are multiplied by this to get the amount of time a single frame represents.
      * E.g., frame period = 20ms, scale = 5, frame represents 20 * 5 = 100ms, and so boats are simulated for 100ms, even though only 20ms actually occurred.
      */
-    public static final int RaceTimeScale = 2;
+    public static final int RaceTimeScale = 1;
 
     /**
      * The race pre-start time, in milliseconds. 30 seconds.

racevisionGame/src/main/java/shared/model/MarkRoundingSequence.java

@@ -17,8 +17,9 @@ public class MarkRoundingSequence {
 
     /**
      * For each leg, mark rounding information.
+     * Maps between leg number and rounding data.
      */
-    private Map<Leg, MarkRoundingData> roundingPoints;
+    private Map<Integer, MarkRoundingData> roundingPoints;
 
 
 
@@ -34,7 +35,7 @@ public class MarkRoundingSequence {
      * @return Rounding points for leg.
      */
     public MarkRoundingData getRoundingData(Leg leg) {
-        return roundingPoints.get(leg);
+        return roundingPoints.get(leg.getLegNumber());
     }
 
 
@@ -139,7 +140,7 @@ public class MarkRoundingSequence {
         roundingData.setRoundCheck2Halfway(roundCheck2Halfway);
 
 
-        this.roundingPoints.put(currentLeg, roundingData);
+        this.roundingPoints.put(currentLeg.getLegNumber(), roundingData);
 
 
         //Rounding points:

racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java

@@ -574,7 +574,12 @@ public class RaceViewController extends Controller {
 
         // Bind zooming to scrolling
         view3D.setOnScroll(e -> {
-            view3D.updateDistance(e.getDeltaY());
+            //view3D.updateDistance(e.getDeltaY());
+            if (e.getDeltaY() > 0) {
+                view3D.zoomIn();
+            } else {
+                view3D.zoomOut();
+            }
         });
 
         // Bind zooming to keypress (Z/X default)

racevisionGame/src/main/java/visualiser/layout/View3D.java

@@ -269,8 +269,10 @@ public class View3D extends Pane {
     public void updateDistance(double delta) {
         double newDistance = -this.distance.getZ() + delta;
         if (target.get() == null){
-            if (newDistance > MAX_ZOOM_LIMIT){
+            if (newDistance > MAX_ZOOM_LIMIT) {
                 setDistance(MAX_ZOOM_LIMIT);
+            } else if (newDistance <= ZOOM_IN_LIMIT) {
+                setDistance(ZOOM_IN_LIMIT);
             } else {
                 setDistance(newDistance);
             }
@@ -373,4 +375,4 @@ public class View3D extends Pane {
     public void addPointLight(PointLight pointLight) {
         this.world.getChildren().add(pointLight);
     }
-}
+}