Merge branch 'gio-dev' of https://github.com/GioeleBucci/TBOOOP into simo-dev

Author: SimoneM-17

src/main/java/tbooop/view/InputManagerImpl.java

@@ -85,6 +85,11 @@ public void handleInput(final Optional<Keybinds> keybind) {
             case SHOOT_LEFT -> sendCommand(new ShootCommand(CardinalDirection.LEFT));
             case SHOOT_RIGHT -> sendCommand(new ShootCommand(CardinalDirection.RIGHT));
             case FULLSCREEN -> view.getStage().setFullScreen(!view.getStage().isFullScreen());
+            case EXIT_FULLSCREEN -> {
+                System.out.println("Exiting fullscreen");
+                view.getStage().setWidth(view.getStage().getWidth() / 2);
+                resizeWindow(false);
+            }
             case ZOOM_IN -> resizeWindow(true);
             case ZOOM_OUT -> resizeWindow(false);
             default -> {

src/main/java/tbooop/view/MusicPlayer.java

@@ -32,7 +32,6 @@ public class RoomRenderer extends ViewComponentImpl {
     private static final ImageView COMMANDS_TOOLTIP = new ImageView(new Image("tileset/commands.png"));
 
     private final Map<DoorUnmodifiable, ImageView> doorsSpriteMap = new HashMap<>();
-    private final MusicPlayer musicPlayer = new MusicPlayer();
 
     private final ViewElements view;
 
@@ -105,10 +104,8 @@ private void updateTooltipVisibility(final RoomUnmodifiable newRoom) {
 
     private void playRoomMusic(final RoomUnmodifiable newRoom) {
         if (newRoom.isSpecial()) {
-            musicPlayer.playSpecialRoomMusic();
             return;
         }
-        musicPlayer.playDefaultMusic();
     }
 
     private void rotateDoor(final ImageView imgView, final CardinalDirection dir) {

src/main/java/tbooop/view/RoomRenderer.java

@@ -182,6 +182,6 @@ private synchronized Point2d worldToScreenPos(final Point2d worldPos) {
     @Override
     public void showDeathScreen() {
         super.getStage().setScene(new DeathScreen().getDeathScene(getStage().getWidth(), getStage().getHeight()));
-    }
+    } 
 
 }

src/main/java/tbooop/view/ViewImpl.java

@@ -61,7 +61,12 @@ public enum Keybinds {
     /**
      * Keybind for toggling fullscreen mode.
      */
-    FULLSCREEN(KeyCode.F11);
+    FULLSCREEN(KeyCode.F11),
+
+    /** 
+     * Keybind for exiting fullscreen mode. 
+    */
+    EXIT_FULLSCREEN(KeyCode.ESCAPE);
 
     private final KeyCode keyCode;
 
@@ -92,7 +97,8 @@ public KeyCode getKeyCode() {
     public static boolean isGui(final Keybinds keybind) {
         return keybind == Keybinds.FULLSCREEN
                 || keybind == Keybinds.ZOOM_IN
-                || keybind == Keybinds.ZOOM_OUT;
+                || keybind == Keybinds.ZOOM_OUT
+                || keybind == Keybinds.EXIT_FULLSCREEN;
     }
 
     /**