From 88f1a393f2428e55dd012937674ea06b661c9e47 Mon Sep 17 00:00:00 2001 From: hba56 Date: Thu, 14 Sep 2017 23:40:02 +1200 Subject: [PATCH] Made the info tab into an overlay #story[1195] --- .../Controllers/HostController.java | 0 .../Controllers/RaceViewController.java | 17 ++-- .../src/main/resources/css/dayMode.css | 12 +++ .../src/main/resources/css/nightMode.css | 11 +++ .../visualiser/scenes/newRaceView.fxml | 88 +++++++++---------- 5 files changed, 72 insertions(+), 56 deletions(-) delete mode 100644 racevisionGame/src/main/java/visualiser/Controllers/HostController.java diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java deleted file mode 100644 index e69de29b..00000000 diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java index a6f34bca..946ffe2d 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java @@ -3,7 +3,6 @@ package visualiser.Controllers; import com.interactivemesh.jfx.importer.stl.StlMeshImporter; import javafx.animation.AnimationTimer; import javafx.application.Platform; -import javafx.beans.value.ChangeListener; import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; @@ -13,7 +12,6 @@ import javafx.scene.AmbientLight; import javafx.scene.PointLight; import javafx.scene.chart.LineChart; import javafx.scene.control.*; -import javafx.scene.effect.Light; import javafx.scene.input.KeyCode; import javafx.scene.input.KeyEvent; import javafx.scene.layout.AnchorPane; @@ -22,7 +20,8 @@ import javafx.scene.layout.StackPane; import javafx.scene.paint.Color; import javafx.scene.paint.Material; import javafx.scene.paint.PhongMaterial; -import javafx.scene.shape.*; +import javafx.scene.shape.MeshView; +import javafx.scene.shape.Shape3D; import javafx.scene.transform.Translate; import javafx.util.Callback; import network.Messages.Enums.RaceStatusEnum; @@ -33,11 +32,8 @@ import visualiser.app.App; import visualiser.enums.TutorialState; import visualiser.gameController.ControllerClient; import visualiser.gameController.Keys.ControlKey; -import visualiser.layout.*; -import visualiser.model.*; import visualiser.gameController.Keys.KeyFactory; -import visualiser.layout.Subject3D; -import visualiser.layout.View3D; +import visualiser.layout.*; import visualiser.model.Sparkline; import visualiser.model.VisualiserBoat; import visualiser.model.VisualiserRaceEvent; @@ -82,7 +78,7 @@ public class RaceViewController extends Controller { // note: it says it's not used but it is! do not remove :) private @FXML ArrowController arrowController; private @FXML GridPane canvasBase; - private @FXML AnchorPane newRacePane; + private @FXML SplitPane racePane; private @FXML StackPane arrowPane; private @FXML Label timer; private @FXML Label FPS; @@ -96,6 +92,7 @@ public class RaceViewController extends Controller { private @FXML LineChart sparklineChart; private @FXML Label tutorialText; private @FXML AnchorPane infoWrapper; + private @FXML AnchorPane lineChartWrapper; /** * Displays a specified race. @@ -143,7 +140,7 @@ public class RaceViewController extends Controller { private AnimationTimer arrowToNextMark; private void initKeypressHandler() { - newRacePane.addEventFilter(KeyEvent.KEY_PRESSED, event -> { + racePane.addEventFilter(KeyEvent.KEY_PRESSED, event -> { String codeString = event.getCode().toString(); // tab key @@ -353,7 +350,7 @@ public class RaceViewController extends Controller { }); // Bind zooming to keypress (Z/X default) - newRacePane.addEventFilter(KeyEvent.KEY_PRESSED, e -> { + racePane.addEventFilter(KeyEvent.KEY_PRESSED, e -> { ControlKey key = keyFactory.getKey(e.getCode().toString()); if(key != null) { switch (key.toString()) { diff --git a/racevisionGame/src/main/resources/css/dayMode.css b/racevisionGame/src/main/resources/css/dayMode.css index b62f8391..39903bdb 100644 --- a/racevisionGame/src/main/resources/css/dayMode.css +++ b/racevisionGame/src/main/resources/css/dayMode.css @@ -89,3 +89,15 @@ -fx-focus-color: transparent; -fx-background-color: transparent; } + +#lineChartWrapper{ + -fx-border-color: #02378c; + -fx-background-color: #4783e0; + -fx-border-width: 3; +} + +#boatInfoTable{ + -fx-border-color: #012256; + -fx-border-width: 3; +} + diff --git a/racevisionGame/src/main/resources/css/nightMode.css b/racevisionGame/src/main/resources/css/nightMode.css index deefa51a..514893aa 100644 --- a/racevisionGame/src/main/resources/css/nightMode.css +++ b/racevisionGame/src/main/resources/css/nightMode.css @@ -91,3 +91,14 @@ -fx-focus-color: transparent; -fx-background-color: transparent; } + +#lineChartWrapper{ + -fx-border-color: #02378c; + -fx-background-color: #012256; + -fx-border-width: 3; +} + +#boatInfoTable{ + -fx-border-color: #012256; + -fx-border-width: 3; +} diff --git a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml index 1404636d..5c9c2660 100644 --- a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml +++ b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml @@ -1,11 +1,5 @@ - - - - - - @@ -28,11 +22,11 @@ - - + + - + @@ -111,42 +105,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +