From 81ce75c7c9e43e6e23a08782142ae07adb2f1023 Mon Sep 17 00:00:00 2001 From: Seraina Date: Sat, 14 May 2022 14:27:37 +0200 Subject: [PATCH] Smoothed out the view changes from day to night --- .../unibas/dmi/dbis/cs108/multiplayer/client/gui/ChatApp.java | 1 + .../cs108/multiplayer/client/gui/DayNightChangeListener.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/ChatApp.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/ChatApp.java index dd2d860..915b5f7 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/ChatApp.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/ChatApp.java @@ -157,6 +157,7 @@ public class ChatApp extends Application { this.setGameC(gameController); gameC.setClient(cModel); gameC.setGameStateModel(GameController.getGameStateModel()); + Sprites.setNightSprites(GameController.getGameStateModel().getPassengerTrainClone()[1], GameController.getGameStateModel().getKickedOff()); Sprites.setDaySprites(GameController.getGameStateModel().getPassengerTrainClone()[1], GameController.getGameStateModel().getKickedOff()); SpritesDay.setBells(); SpritesDay.setWheels(); diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/DayNightChangeListener.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/DayNightChangeListener.java index 069103b..992be4e 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/DayNightChangeListener.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/DayNightChangeListener.java @@ -27,6 +27,7 @@ public class DayNightChangeListener implements Runnable { if(gameStateModel.getDayClone()) { //its Day LoungeSceneViewController.getTrainAnimationDayController().dontShowFullWagon(); Sprites.setDaySprites(gameStateModel.getPassengerTrainClone()[1], GameController.getGameStateModel().getKickedOff()); + chatApp.getGameController().updateGameSprites(LoungeSceneViewController.getTrainAnimationDayController()); chatApp.getGameController().setNoiseButtonVisible(); chatApp.getGameController().setVoteButtonVisibilityDay(gameStateModel); } else { //its night @@ -34,6 +35,7 @@ public class DayNightChangeListener implements Runnable { LoungeSceneViewController.getTrainAnimationDayController().showFullWagon(); } Sprites.setNightSprites(gameStateModel.getPassengerTrainClone()[1], GameController.getGameStateModel().getKickedOff()); + chatApp.getGameController().updateGameSprites(LoungeSceneViewController.getTrainAnimationDayController()); chatApp.getGameController().setNoiseButtonInvisible(); chatApp.getGameController().setVoteButtonVisibilityNight(gameStateModel); } @@ -49,6 +51,5 @@ public class DayNightChangeListener implements Runnable { } catch (Exception e) { e.printStackTrace(); } - } }