fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed toggling and application of style

Browse Source 
#story[1301]
This commit is contained in:
Connor Taylor-Brown
2017-09-28 11:38:19 +13:00
parent 88d5a60696
commit 0da840a37e
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+1 -1
View File
@@ -435,7 +435,7 @@ public class RaceViewController extends Controller {
// Track player boat with camera // Track player boat with camera
viewSubjects.add(boatModel); viewSubjects.add(boatModel);
Platform.runLater(() -> { Platform.runLater(() -> {
view3D.trackSubject(boatModel); view3D.trackSubject(boatModel, 0);
view3D.setThirdPerson(); view3D.setThirdPerson();
}); });
racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
+5 -7
View File
@@ -9,6 +9,7 @@ import javafx.scene.AmbientLight;
import javafx.scene.PointLight; import javafx.scene.PointLight;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.control.RadioButton; import javafx.scene.control.RadioButton;
import javafx.scene.control.ToggleGroup;
import javafx.scene.image.Image; import javafx.scene.image.Image;
import javafx.scene.image.ImageView; import javafx.scene.image.ImageView;
import javafx.scene.layout.GridPane; import javafx.scene.layout.GridPane;
@@ -44,11 +45,14 @@ public class TitleController extends Controller {
private @FXML RadioButton dayModeRD; private @FXML RadioButton dayModeRD;
private @FXML RadioButton nightModeRD; private @FXML RadioButton nightModeRD;
private @FXML Button tutorialButton; private @FXML Button tutorialButton;
private @FXML Pane menuPane;
private @FXML ImageView imgSun; private @FXML ImageView imgSun;
private @FXML GridPane view3DContainer; private @FXML GridPane view3DContainer;
private ToggleGroup toggleGroup = new ToggleGroup();
public void initialize() { public void initialize() {
dayModeRD.setToggleGroup(toggleGroup);
nightModeRD.setToggleGroup(toggleGroup);
AmbientLight ambientLight = new AmbientLight(Color.web("#CCCCFF")); AmbientLight ambientLight = new AmbientLight(Color.web("#CCCCFF"));
ambientLight.setTranslateX(250); ambientLight.setTranslateX(250);
ambientLight.setTranslateZ(210); ambientLight.setTranslateZ(210);
@@ -128,10 +132,7 @@ public class TitleController extends Controller {
*/ */
public void setDayMode(){ public void setDayMode(){
dayModeRD.getScene().getStylesheets().clear(); 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"); dayModeRD.getScene().getStylesheets().add("/css/dayMode.css");
menuPane.setStyle("-fx-background-color: #6be6ff;");
nightModeRD.setSelected(false); nightModeRD.setSelected(false);
App.dayMode = true; App.dayMode = true;
} }
@@ -141,10 +142,7 @@ public class TitleController extends Controller {
*/ */
public void setNightMode(){ public void setNightMode(){
nightModeRD.getScene().getStylesheets().clear(); 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"); nightModeRD.getScene().getStylesheets().add("/css/nightMode.css");
menuPane.setStyle("-fx-background-color: #1f2c60;");
dayModeRD.setSelected(false); dayModeRD.setSelected(false);
App.dayMode = false; App.dayMode = false;
} }