Merge branch 'zoom_in_clipping_fix' into ac35_map_boundary

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

@@ -576,7 +576,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

@@ -268,8 +268,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);
             }
@@ -372,4 +374,4 @@ public class View3D extends Pane {
     public void addPointLight(PointLight pointLight) {
         this.world.getChildren().add(pointLight);
     }
-}
+}