diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java index dac62be0..392d309d 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"); } diff --git a/racevisionGame/src/main/resources/css/dayMode.css b/racevisionGame/src/main/resources/css/dayMode.css index df43c3dc..1eb2bef4 100644 --- a/racevisionGame/src/main/resources/css/dayMode.css +++ b/racevisionGame/src/main/resources/css/dayMode.css @@ -27,33 +27,6 @@ /*Focus colour*/ -fx-focus-color: rgb(128, 128, 128); } -/* BUTTONS */ - /* Small Buttons */ - .button { - -fx-background-color: rgba(11, 158, 160, 0.42); - -fx-border-color: #0b9ea0; - -fx-text-fill: rgb(10, 123, 125); - -fx-border-radius: 20px; - -fx-background-radius: 20px; - -fx-font-family: "Trebuchet MS"; - } - - .button:hover { - -fx-background-color: #0b9ea0; - -fx-border-color: #0b9ea0; - -fx-text-fill: rgba(255, 230, 146, 0.43); - -fx-font-size: 14px; - -fx-font-weight: bold; - } - - /* Large buttons */ - #hostGameBtn { - -fx-font-size: 18px; - } - - #hostGameBtn:hover { - -fx-font-size: 22px; - } /* Titles */ #title { @@ -67,6 +40,102 @@ -fx-font-family: "Trebuchet MS"; } + +/* Buttons */ +#hostAGameBtn, #hostGameBtn, #btnJoin, #tutorialButton, #controlsBtn, + #mainMenuBtn, #addBtn, #refreshBtn, #joinGameBtn, #spectateButton, + #quitBtn +{ + -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 { + -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"); + } + #mainMenuBtn:pressed { + -fx-background-image: url("/visualiser/images/mainMenuBtnPressed.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%); @@ -98,27 +167,45 @@ -fx-graphic: url("/visualiser/images/arrow.png"); } -#nextButton, #previousButton { - -fx-background-image: url("/visualiser/images/ArrowSelect.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; -} +/* Host Game / Map Selection */ + #nextButton, #previousButton { + -fx-background-image: url("/visualiser/images/ArrowSelect.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 { + -fx-rotate: 180; + } -#nextButton:pressed { - -fx-background-image: url("/visualiser/images/ArrowClick.png"); -} + #nextButton:pressed { + -fx-background-image: url("/visualiser/images/ArrowClick.png"); + } -#previousButton:pressed { - -fx-background-image: url("/visualiser/images/ArrowClick.png"); -} + #previousButton:pressed { + -fx-background-image: url("/visualiser/images/ArrowClick.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/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/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