diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java index da8d913d..b64860e6 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java @@ -67,8 +67,6 @@ public class HostGameController extends Controller { sliderLength.setShowTickLabels(true); sliderLength.setMajorTickUnit(MAX_RACE_LENGTH-1); sliderLength.setBlockIncrement(1); - - sliderLength.getStylesheets().add("/css/slider.css"); } @@ -85,8 +83,8 @@ public class HostGameController extends Controller { listOfMaps = new ArrayList(Arrays.asList(ac35Map, oMap, iMap, mMap)); mapImage.setImage(listOfMaps.get(currentMapIndex)); Platform.runLater(() -> { - mapImage.fitWidthProperty() - .bind(mapImage.getScene().getWindow().widthProperty().multiply(0.6)); + mapImage.fitHeightProperty() + .bind(mapImage.getScene().getWindow().heightProperty().multiply(0.6)); }); } diff --git a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java index 29326fd3..ec27d068 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java @@ -2,6 +2,7 @@ package visualiser.Controllers; import com.interactivemesh.jfx.importer.stl.StlMeshImporter; import javafx.animation.AnimationTimer; +import javafx.application.Platform; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.fxml.FXML; @@ -12,6 +13,7 @@ import javafx.scene.control.RadioButton; import javafx.scene.control.ToggleGroup; import javafx.scene.image.Image; import javafx.scene.image.ImageView; +import javafx.scene.layout.AnchorPane; import javafx.scene.layout.GridPane; import javafx.scene.layout.Pane; import javafx.scene.media.AudioClip; @@ -42,6 +44,7 @@ import java.util.logging.Logger; * the game. */ public class TitleController extends Controller { + private @FXML AnchorPane titleWrapper; private @FXML RadioButton dayModeRD; private @FXML RadioButton nightModeRD; private @FXML Button tutorialButton; @@ -106,6 +109,8 @@ public class TitleController extends Controller { } }; loop.start(); + + titleWrapper.getStylesheets().add("/css/dayMode.css"); } /** diff --git a/racevisionGame/src/main/java/visualiser/layout/View3D.java b/racevisionGame/src/main/java/visualiser/layout/View3D.java index 8bc92b2b..6ca5ec8f 100644 --- a/racevisionGame/src/main/java/visualiser/layout/View3D.java +++ b/racevisionGame/src/main/java/visualiser/layout/View3D.java @@ -81,9 +81,9 @@ public class View3D extends Pane { /** * Distance to stop zoom */ - private final double ZOOM_IN_LIMIT = 3; + private final double ZOOM_IN_LIMIT = 15; private final double ZOOM_OUT_LIMIT = 700; - private final double MAX_ZOOM_LIMIT = 1500; + private final double MAX_ZOOM_LIMIT = 1150; private final double MAX_PITCH = 60; // birds eye view private final double MIN_PITCH = 5; // third person view private final double ZOOM_PER_KEYPRESS = 5; // distance changed per zoom @@ -188,7 +188,7 @@ public class View3D extends Pane { * Configures camera to third person view */ public void setThirdPerson() { - this.setDistance(ZOOM_IN_LIMIT * 2); + this.setDistance(ZOOM_IN_LIMIT * 5); adjustPitchForZoom(); adjustScaleForZoom(); } diff --git a/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java b/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java index b6f41a07..c46651e3 100644 --- a/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java +++ b/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java @@ -605,7 +605,7 @@ public class ResizableRaceCanvas extends ResizableCanvas { //Prepare to draw. gc.setLineWidth(1); - gc.setFill(Color.DEEPSKYBLUE); + gc.setFill(Color.web("#f1f1d4")); //Calculate the screen coordinates of the boundary. diff --git a/racevisionGame/src/main/resources/css/dayMode.css b/racevisionGame/src/main/resources/css/dayMode.css index 39903bdb..ec68f091 100644 --- a/racevisionGame/src/main/resources/css/dayMode.css +++ b/racevisionGame/src/main/resources/css/dayMode.css @@ -1,6 +1,6 @@ .root { -fx-base: rgb(215, 232, 218); - -fx-background: rgb(242, 242, 242); + -fx-background: rgba(0, 255, 190, 0.11); /* make controls (buttons, thumb, etc.) slightly lighter */ -fx-color: derive(-fx-base, 2.5%); @@ -25,6 +25,121 @@ -fx-focus-color: rgb(128, 128, 128); } +/* Titles */ +#title { + -fx-font-size: 32px; + -fx-font-family: "Trebuchet MS"; + -fx-text-fill: rgb(10, 123, 125); +} + +/* Regular text */ +#lblLength { + -fx-font-family: "Trebuchet MS"; +} + + +/* Buttons */ +#hostAGameBtn, #hostGameBtn, #btnJoin, #tutorialButton, #controlsBtn, + #mainMenuBtn, #addBtn, #refreshBtn, #joinGameBtn, #spectateButton, + #quitBtn, #startButton +{ + -fx-background-size: 150px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; + -fx-text-fill: transparent; + /*-fx-border-color: rgb(10, 123, 125);*/ + /*-fx-border-width: 2px;*/ +} + +/* Smaller buttons */ +#mainMenuBtn, #addBtn, #refreshBtn, #joinGameBtn, #spectateButton, #quitBtn, #startButton{ + -fx-background-size: 115px; +} + +/* Images for buttons */ + /* Title menu buttons */ + #hostAGameBtn { + -fx-background-image: url("/visualiser/images/hostAGameBtn.png"); + } + #hostAGameBtn:pressed { + -fx-background-image: url("/visualiser/images/hostAGameBtnPressed.png"); + } + #btnJoin { + -fx-background-image: url("/visualiser/images/JoinAGameBtn.png"); + } + #btnJoin:pressed { + -fx-background-image: url("/visualiser/images/JoinAGameBtnPressed.png"); + } + #tutorialButton { + -fx-background-image: url("/visualiser/images/howToPlayBtn.png"); + } + #tutorialButton:pressed { + -fx-background-image: url("/visualiser/images/howToPlayBtnPressed.png"); + } + #controlsBtn { + -fx-background-image: url("/visualiser/images/controlsBtn.png"); + } + #controlsBtn:pressed { + -fx-background-image: url("/visualiser/images/controlsBtnPressed.png"); + } + + /* host game lobby buttons */ + #hostGameBtn { + -fx-background-image: url("/visualiser/images/startGameBtn.png"); + } + #hostGameBtn:pressed { + -fx-background-image: url("/visualiser/images/startGameBtnPressed.png"); + } + #mainMenuBtn { + -fx-background-image: url("/visualiser/images/mainMenuBtn.png"); + /*-fx-background-size: 115px;*/ + } + #mainMenuBtn:pressed { + -fx-background-image: url("/visualiser/images/mainMenuBtnPressed.png"); + } + #startButton{ + -fx-background-image: url("/visualiser/images/startBtn.png"); + } + + #startButton:pressed { + -fx-background-image: url("/visualiser/images/startBtnPressed.png"); + } + /* match browsing lobby buttons */ + #addBtn { + -fx-background-image: url("/visualiser/images/addBtn.png"); + } + #addBtn:pressed { + -fx-background-image: url("/visualiser/images/addBtnPressed.png"); + } + #refreshBtn { + -fx-background-image: url("/visualiser/images/refreshBtn.png"); + } + #refreshBtn:pressed { + -fx-background-image: url("/visualiser/images/refreshBtnPressed.png"); + } + #joinGameBtn { + -fx-background-image: url("/visualiser/images/participateBtn.png"); + } + #joinGameBtn:pressed { + -fx-background-image: url("/visualiser/images/participateBtnPressed.png"); + } + #spectateButton { + -fx-background-image: url("/visualiser/images/spectateBtn.png"); + } + #spectateButton:pressed { + -fx-background-image: url("/visualiser/images/spectateBtnPressed.png"); + } + + /* in-game lobby buttons */ + #quitBtn { + -fx-background-image: url("/visualiser/images/quitBtn.png"); + } + #quitBtn:pressed { + -fx-background-image: url("/visualiser/images/quitBtnPressed.png"); + } + /* Fix derived prompt color for text fields */ .text-input { -fx-prompt-text-fill: derive(-fx-control-inner-background, +0%); @@ -56,39 +171,45 @@ -fx-graphic: url("/visualiser/images/arrow.png"); } -#nextButton { - -fx-background-image: url("/visualiser/images/ArrowRoundRight.png"); - -fx-background-size: 60px; - -fx-background-repeat: no-repeat; - -fx-background-position: center center; - -fx-focus-color: transparent; - -fx-background-color: transparent; -} -#nextButton:pressed { - -fx-background-image: url("/visualiser/images/ArrowRoundRightClicked.png"); - -fx-background-size: 60px; - -fx-background-repeat: no-repeat; - -fx-background-position: center center; - -fx-focus-color: transparent; - -fx-background-color: transparent; -} - -#previousButton { - -fx-background-image: url("/visualiser/images/ArrowRoundLeft.png"); - -fx-background-size: 60px; - -fx-background-repeat: no-repeat; - -fx-background-position: center center; - -fx-focus-color: transparent; - -fx-background-color: transparent; -} -#previousButton:pressed { - -fx-background-image: url("/visualiser/images/ArrowRoundLeftClicked.png"); - -fx-background-size: 60px; - -fx-background-repeat: no-repeat; - -fx-background-position: center center; - -fx-focus-color: transparent; - -fx-background-color: transparent; -} +/* Host Game / Map Selection */ + #nextButton, #previousButton { + -fx-background-image: url("/visualiser/images/ArrowClick.png"); + -fx-background-size: 60px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; + -fx-border-color: transparent; + } + + #nextButton { + -fx-rotate: 180; + } + + #nextButton:pressed { + -fx-background-image: url("/visualiser/images/ArrowSelect.png"); + } + + #previousButton:pressed { + -fx-background-image: url("/visualiser/images/ArrowSelect.png"); + } + + .slider .thumb { + -fx-background-image: url("/visualiser/images/sun.png"); + -fx-background-size: 25px; + -fx-pref-height: 25px; + -fx-pref-width: 25px; + -fx-background-position: top; + -fx-background-repeat: no-repeat; + -fx-focus-color: transparent; + -fx-background-color: transparent; + } + + .slider .track { + -fx-control-inner-background: #166df1; + -fx-border-color: #6a80ff; + -fx-border-radius: 0.25em, 0.25em, 0.166667em; + } #lineChartWrapper{ -fx-border-color: #02378c; diff --git a/racevisionGame/src/main/resources/css/keyBindings.css b/racevisionGame/src/main/resources/css/keyBindings.css index a572116e..a2118380 100644 --- a/racevisionGame/src/main/resources/css/keyBindings.css +++ b/racevisionGame/src/main/resources/css/keyBindings.css @@ -1,3 +1,7 @@ +.label, .list-view { + -fx-text-fill: black; +} + .list-view .list-cell { -fx-cell-size: 40; -fx-font-family: "Tahoma"; diff --git a/racevisionGame/src/main/resources/css/nightMode.css b/racevisionGame/src/main/resources/css/nightMode.css index 514893aa..098c2931 100644 --- a/racevisionGame/src/main/resources/css/nightMode.css +++ b/racevisionGame/src/main/resources/css/nightMode.css @@ -102,3 +102,236 @@ -fx-border-color: #012256; -fx-border-width: 3; } + +/* Title menu buttons */ +#hostAGameBtn { + -fx-background-image: url("/visualiser/images/hostAGameBtn.png"); + -fx-background-size: 150px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +#hostAGameBtn:pressed { + -fx-background-image: url("/visualiser/images/hostAGameBtnPressed.png"); + -fx-background-size: 150px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +#btnJoin { + -fx-background-image: url("/visualiser/images/JoinAGameBtn.png"); + -fx-background-size: 150px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +#btnJoin:pressed { + -fx-background-image: url("/visualiser/images/JoinAGameBtnPressed.png"); + -fx-background-size: 150px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +#tutorialButton { + -fx-background-image: url("/visualiser/images/howToPlayBtn.png"); + -fx-background-size: 150px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +#tutorialButton:pressed { + -fx-background-image: url("/visualiser/images/howToPlayBtnPressed.png"); + -fx-background-size: 150px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +#controlsBtn { + -fx-background-image: url("/visualiser/images/controlsBtn.png"); + -fx-background-size: 150px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +#controlsBtn:pressed { + -fx-background-image: url("/visualiser/images/controlsBtnPressed.png"); + -fx-background-size: 150px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +/* host game lobby buttons */ + +#hostGameBtn { + -fx-background-image: url("/visualiser/images/startGameBtn.png"); + -fx-background-size: 150px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +#hostGameBtn:pressed { + -fx-background-image: url("/visualiser/images/startGameBtnPressed.png"); + -fx-background-size: 150px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +#mainMenuBtn { + -fx-background-image: url("/visualiser/images/mainMenuBtn.png"); + -fx-background-size: 115px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + + +#mainMenuBtn:pressed { + -fx-background-image: url("/visualiser/images/mainMenuBtnPressed.png"); + -fx-background-size: 115px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +/* match browsing lobby buttons */ + +#addBtn { + -fx-background-image: url("/visualiser/images/addBtn.png"); + -fx-background-size: 115px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +#addBtn:pressed { + -fx-background-image: url("/visualiser/images/addBtnPressed.png"); + -fx-background-size: 115px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +#refreshBtn { + -fx-background-image: url("/visualiser/images/refreshBtn.png"); + -fx-background-size: 115px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +#refreshBtn:pressed { + -fx-background-image: url("/visualiser/images/refreshBtnPressed.png"); + -fx-background-size: 115px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +#refreshBtn { + -fx-background-image: url("/visualiser/images/refreshBtn.png"); + -fx-background-size: 115px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +#joinGameBtn { + -fx-background-image: url("/visualiser/images/participateBtn.png"); + -fx-background-size: 115px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +#joinGameBtn:pressed { + -fx-background-image: url("/visualiser/images/participateBtnPressed.png"); + -fx-background-size: 115px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +#spectateButton { + -fx-background-image: url("/visualiser/images/spectateBtn.png"); + -fx-background-size: 115px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +#spectateButton:pressed { + -fx-background-image: url("/visualiser/images/spectateBtnPressed.png"); + -fx-background-size: 115px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +/* in-game lobby buttons */ + +#quitBtn { + -fx-background-image: url("/visualiser/images/quitBtn.png"); + -fx-background-size: 115px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +#quitBtn:pressed { + -fx-background-image: url("/visualiser/images/quitBtnPressed.png"); + -fx-background-size: 115px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +#startButton { + -fx-background-image: url("/visualiser/images/startBtn.png"); + -fx-background-size: 115px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} + +#startButton:pressed { + -fx-background-image: url("/visualiser/images/startBtnPressed.png"); + -fx-background-size: 115px; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-focus-color: transparent; + -fx-background-color: transparent; +} diff --git a/racevisionGame/src/main/resources/css/slider.css b/racevisionGame/src/main/resources/css/slider.css deleted file mode 100644 index 2cb9832d..00000000 --- a/racevisionGame/src/main/resources/css/slider.css +++ /dev/null @@ -1,16 +0,0 @@ -.slider .thumb { - -fx-background-image: url("/visualiser/images/sun.png"); - -fx-background-size: 25px; - -fx-pref-height: 25px; - -fx-pref-width: 25px; - -fx-background-position: top; - -fx-background-repeat: no-repeat; - -fx-focus-color: transparent; - -fx-background-color: transparent; -} - -.slider .track { - -fx-control-inner-background: dodgerblue; - -fx-border-color: rgba(30, 144, 255, 0.44); - -fx-border-radius: 0.25em, 0.25em, 0.166667em; -} \ No newline at end of file diff --git a/racevisionGame/src/main/resources/images/AC35_Racecourse_MAP.png b/racevisionGame/src/main/resources/images/AC35_Racecourse_MAP.png index 1b5e39ca..01fdd3d9 100644 Binary files a/racevisionGame/src/main/resources/images/AC35_Racecourse_MAP.png and b/racevisionGame/src/main/resources/images/AC35_Racecourse_MAP.png differ diff --git a/racevisionGame/src/main/resources/images/iMapLayout.png b/racevisionGame/src/main/resources/images/iMapLayout.png index 5932a60d..7ff2291a 100644 Binary files a/racevisionGame/src/main/resources/images/iMapLayout.png and b/racevisionGame/src/main/resources/images/iMapLayout.png differ diff --git a/racevisionGame/src/main/resources/images/mMapLayout.png b/racevisionGame/src/main/resources/images/mMapLayout.png index fa0af51f..63cf11a2 100644 Binary files a/racevisionGame/src/main/resources/images/mMapLayout.png and b/racevisionGame/src/main/resources/images/mMapLayout.png differ diff --git a/racevisionGame/src/main/resources/images/oMapLayout.png b/racevisionGame/src/main/resources/images/oMapLayout.png index ca520959..57be0b99 100644 Binary files a/racevisionGame/src/main/resources/images/oMapLayout.png and b/racevisionGame/src/main/resources/images/oMapLayout.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/ArrowClick.png b/racevisionGame/src/main/resources/visualiser/images/ArrowClick.png new file mode 100644 index 00000000..5d665164 Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/ArrowClick.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/ArrowSelect.png b/racevisionGame/src/main/resources/visualiser/images/ArrowSelect.png new file mode 100644 index 00000000..f6c4149d Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/ArrowSelect.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/JoinAGameBtn.png b/racevisionGame/src/main/resources/visualiser/images/JoinAGameBtn.png new file mode 100644 index 00000000..be04d4fe Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/JoinAGameBtn.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/JoinAGameBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/JoinAGameBtnPressed.png new file mode 100644 index 00000000..0289a2e9 Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/JoinAGameBtnPressed.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/addBtn.png b/racevisionGame/src/main/resources/visualiser/images/addBtn.png new file mode 100644 index 00000000..e7df63a2 Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/addBtn.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/addBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/addBtnPressed.png new file mode 100644 index 00000000..3ce9fdcd Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/addBtnPressed.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/cancelBtn.png b/racevisionGame/src/main/resources/visualiser/images/cancelBtn.png new file mode 100644 index 00000000..9af6c7f8 Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/cancelBtn.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/cancelBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/cancelBtnPressed.png new file mode 100644 index 00000000..58bf2227 Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/cancelBtnPressed.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/controlsBtn.png b/racevisionGame/src/main/resources/visualiser/images/controlsBtn.png new file mode 100644 index 00000000..4042382a Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/controlsBtn.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/controlsBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/controlsBtnPressed.png new file mode 100644 index 00000000..bcb5b951 Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/controlsBtnPressed.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/hostAGameBtn.png b/racevisionGame/src/main/resources/visualiser/images/hostAGameBtn.png new file mode 100644 index 00000000..56656b92 Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/hostAGameBtn.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/hostAGameBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/hostAGameBtnPressed.png new file mode 100644 index 00000000..5dea25cc Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/hostAGameBtnPressed.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/howToPlayBtn.png b/racevisionGame/src/main/resources/visualiser/images/howToPlayBtn.png new file mode 100644 index 00000000..8bf6b96d Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/howToPlayBtn.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/howToPlayBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/howToPlayBtnPressed.png new file mode 100644 index 00000000..2ae2a63a Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/howToPlayBtnPressed.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/mainMenuBtn.png b/racevisionGame/src/main/resources/visualiser/images/mainMenuBtn.png new file mode 100644 index 00000000..60a8435e Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/mainMenuBtn.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/mainMenuBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/mainMenuBtnPressed.png new file mode 100644 index 00000000..8d6048e9 Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/mainMenuBtnPressed.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/okBtn.png b/racevisionGame/src/main/resources/visualiser/images/okBtn.png new file mode 100644 index 00000000..7f9d636c Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/okBtn.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/okBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/okBtnPressed.png new file mode 100644 index 00000000..8bb6f9a9 Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/okBtnPressed.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/participateBtn.png b/racevisionGame/src/main/resources/visualiser/images/participateBtn.png new file mode 100644 index 00000000..0926afed Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/participateBtn.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/participateBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/participateBtnPressed.png new file mode 100644 index 00000000..2c296328 Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/participateBtnPressed.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/quitBtn.png b/racevisionGame/src/main/resources/visualiser/images/quitBtn.png new file mode 100644 index 00000000..1387f565 Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/quitBtn.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/quitBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/quitBtnPressed.png new file mode 100644 index 00000000..0b47b32e Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/quitBtnPressed.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/refreshBtn.png b/racevisionGame/src/main/resources/visualiser/images/refreshBtn.png new file mode 100644 index 00000000..0f2c2cb8 Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/refreshBtn.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/refreshBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/refreshBtnPressed.png new file mode 100644 index 00000000..86185747 Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/refreshBtnPressed.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/spectateBtn.png b/racevisionGame/src/main/resources/visualiser/images/spectateBtn.png new file mode 100644 index 00000000..d462f072 Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/spectateBtn.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/spectateBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/spectateBtnPressed.png new file mode 100644 index 00000000..1c7c39e1 Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/spectateBtnPressed.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/startBtn.png b/racevisionGame/src/main/resources/visualiser/images/startBtn.png new file mode 100644 index 00000000..ad79020c Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/startBtn.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/startBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/startBtnPressed.png new file mode 100644 index 00000000..fa4eacaa Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/startBtnPressed.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/startGameBtn.png b/racevisionGame/src/main/resources/visualiser/images/startGameBtn.png new file mode 100644 index 00000000..4b2a651d Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/startGameBtn.png differ diff --git a/racevisionGame/src/main/resources/visualiser/images/startGameBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/startGameBtnPressed.png new file mode 100644 index 00000000..c3421b3c Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/startGameBtnPressed.png differ diff --git a/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml b/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml index b0c5dc2e..c84c16a6 100644 --- a/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml +++ b/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml @@ -9,11 +9,11 @@ - + - + - diff --git a/racevisionGame/src/main/resources/visualiser/scenes/hostGame.fxml b/racevisionGame/src/main/resources/visualiser/scenes/hostGame.fxml index 3218c802..97c1d31f 100644 --- a/racevisionGame/src/main/resources/visualiser/scenes/hostGame.fxml +++ b/racevisionGame/src/main/resources/visualiser/scenes/hostGame.fxml @@ -20,13 +20,13 @@ - - - - + + + + - - -