diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java index 72c564f2..895f0af1 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java @@ -435,7 +435,7 @@ public class RaceViewController extends Controller { // Track player boat with camera viewSubjects.add(boatModel); Platform.runLater(() -> { - view3D.trackSubject(boatModel); + view3D.trackSubject(boatModel, 0); view3D.setThirdPerson(); }); diff --git a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java index 2cb263c2..29326fd3 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java @@ -9,6 +9,7 @@ import javafx.scene.AmbientLight; import javafx.scene.PointLight; import javafx.scene.control.Button; import javafx.scene.control.RadioButton; +import javafx.scene.control.ToggleGroup; import javafx.scene.image.Image; import javafx.scene.image.ImageView; import javafx.scene.layout.GridPane; @@ -44,11 +45,14 @@ public class TitleController extends Controller { private @FXML RadioButton dayModeRD; private @FXML RadioButton nightModeRD; private @FXML Button tutorialButton; - private @FXML Pane menuPane; private @FXML ImageView imgSun; private @FXML GridPane view3DContainer; + private ToggleGroup toggleGroup = new ToggleGroup(); public void initialize() { + dayModeRD.setToggleGroup(toggleGroup); + nightModeRD.setToggleGroup(toggleGroup); + AmbientLight ambientLight = new AmbientLight(Color.web("#CCCCFF")); ambientLight.setTranslateX(250); ambientLight.setTranslateZ(210); @@ -128,10 +132,7 @@ public class TitleController extends Controller { */ public void setDayMode(){ dayModeRD.getScene().getStylesheets().clear(); - menuPane.getStylesheets().clear(); - imgSun.setImage(new Image(getClass().getResource("/visualiser/images/sun.png").toExternalForm())); dayModeRD.getScene().getStylesheets().add("/css/dayMode.css"); - menuPane.setStyle("-fx-background-color: #6be6ff;"); nightModeRD.setSelected(false); App.dayMode = true; } @@ -141,10 +142,7 @@ public class TitleController extends Controller { */ public void setNightMode(){ nightModeRD.getScene().getStylesheets().clear(); - menuPane.getStylesheets().clear(); - //imgSun.setImage(new Image(getClass().getResource("/visualiser/images/sunsleep.png").toExternalForm())); nightModeRD.getScene().getStylesheets().add("/css/nightMode.css"); - menuPane.setStyle("-fx-background-color: #1f2c60;"); dayModeRD.setSelected(false); App.dayMode = false; }