From 6b51bb927526f79e48f0ea4a986a95813ba0f35c Mon Sep 17 00:00:00 2001 From: pbs2h20aal Date: Mon, 20 Dec 2021 19:53:23 +0100 Subject: [PATCH] PauseScreen komplett --- .../dependencies-accessors.lock | Bin 17 -> 38 bytes .../executionHistory/executionHistory.bin | Bin 71354 -> 71354 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 38 bytes .../.gradle/7.1.1/fileHashes/fileHashes.bin | Bin 24447 -> 24447 bytes .../.gradle/7.1.1/fileHashes/fileHashes.lock | Bin 17 -> 38 bytes .../buildOutputCleanup.lock | Bin 17 -> 38 bytes Happy_Bird/.gradle/checksums/checksums.lock | Bin 17 -> 38 bytes .../example/happy_bird/HappyBirdMain.class | Bin 13250 -> 15462 bytes .../build/libs/Happy_Bird-1.0-SNAPSHOT.jar | Bin 365228 -> 366047 bytes .../compileJava/previous-compilation-data.bin | Bin 17729 -> 17729 bytes .../com/example/happy_bird/HappyBirdMain.java | 444 +++++++++++------- 11 files changed, 277 insertions(+), 167 deletions(-) diff --git a/Happy_Bird/.gradle/7.1.1/dependencies-accessors/dependencies-accessors.lock b/Happy_Bird/.gradle/7.1.1/dependencies-accessors/dependencies-accessors.lock index 1504b9c09125b7c12d2aa3f6bd196d435b80f3fa..8a618fb1711a1d8b012c6fbbfc38c4ab13f50a5b 100644 GIT binary patch literal 38 pcmZQhzQrlOW~*-$0~9bbF#I`j%wXc}wYm3yFtC^#ni()K007qu3ta#J literal 17 TcmZQhzQrlOW~*-$0~7!ND^3G( diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin index 3ec5b8d4a93fd5d441c4fec322da69424af44cf5..1f0af1521fcf618cc9d66c4b75de2f12dd0736fc 100644 GIT binary patch delta 420 zcmdnBmSxvkmJLSFl?p0z&5e^yjVg+gjnk5g%FW9wi&84hit|kvAfS13p@$aB=DOGJ zECM?WeJcdwtkhjLOikVJZpq=v533|6^FQF*tiSdZm*9zsrw`wKw5#4XXNuYCbg3g3 zCo2X8Zm!-@$0*^tiNiDQ@BjUAkCFsrB&Iq4{JQJpUH$v3H{bhnkCC7o*bZ-=aG`^D zdm0a89+SY+bPg5;_n)VnU5m~id$nNaW`lV%88`PotY#GWpc0;4_(Yid&9;X5TlNV& zo*a0leR{tTqbKXM&p->O-xXq1W4{Yx>hGJ(cveCJ-9xv*a?dIz8=lpgo+8YcX|~~* ztkSKJ{-aaA1=LPDdN7ljK|t(PkJ6d*o$I1Ab7xt7usRA9`mptF*xs{li(hs%__-u6 z-#&R`neb%Zb3)S3!3KU{0;)j|p3VACuQ7^7GyRCz5wW|7**WXWKfUYe2fu(Eswc+S F0|1In!FT`w delta 420 zcmdnBmSxvkmJLSFmGUx@%X7+2jdJqR3#*chjf!)O3eAesauO>UAi!sHp@$aB=DOGJ zECSaa|LnP4pK777AuM9c)i}1v533|6^FQF*tiSdZm*DE?DIOD?w*nr#fJk<-PwNlw*H!>oA3R($4Jl(jP{!+TqI?+P)hu^$65_4iF?JS!oA?jf);{X^-K4bN&#PZ4I!G`r|) zow3Z;$H8Fgo{P-C{~l&$5ZKf6?tXKUOz;B38GB{9(%67PHjl4PQV+C0&pYFUe~H?% zpvfD{geUW!6Ox8l_JIkg20eH->p#85C>rrUllAQHO^4ez+SEvTK2&@PcBq~hV-EnK C_r1UX diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock index 3d83a6b6d52a83165a52fd96329249bbb1e8839c..9fbbe5594e59fc37926a8c8c08e8e4a97a64c642 100644 GIT binary patch literal 38 qcmZRcFR$V0A8pga00t~=%nS^FPCR@6Jrzy1S=j kMe*SPi0nHruu-g&)@*+0_kjas*tW?Nqog*!51+se0394o4*&oF diff --git a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock index 6abfaca43fe1543e0167cceb3e38d57320ad3c05..f62941c4067a42b907faac9abf556a57020b3e9c 100644 GIT binary patch literal 38 qcmZP;4v=Q+u;Wl;00S-+W(I~oCrCI~YC literal 17 UcmZP;4v=Q+u;Wl;00Z`5022KH)&Kwi diff --git a/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 44aa94264c703775e873f7fdb2853e42440c535a..57be8ac7727d5cc0824d22a738feef6e412864dd 100644 GIT binary patch literal 38 rcmZR6*X{eBQS{781~6d1&dk8@=LDlZ?}|yzo1ZhVm>ZfIFfafB>l6zQ literal 17 VcmZR6*X{eBQS{781~6b<1pqfP1oHp@ diff --git a/Happy_Bird/.gradle/checksums/checksums.lock b/Happy_Bird/.gradle/checksums/checksums.lock index 1f8032a98ec5c85a4aff5bfc6d804d16661182e6..3f50b6f8e4b49ee5cdb0e0e273f3d43d60e02906 100644 GIT binary patch literal 38 qcmZSHBc?B=__%_P0Sp*FFf%axIia3obieWG%UujC=7wel3=9Cr6$;z{ literal 17 VcmZSHBc?B=__%_P0Sp*F001Iu1C{^) diff --git a/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class b/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class index 288b295790411d0e688f0395d73f543e08a5c930..3911c557f90e4a92e0f09ad18e6bfcff2dbb7cec 100644 GIT binary patch literal 15462 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 diff --git a/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar b/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar index b1b108ecb170a6df7125ce48b7e7f58f3a4b7014..1c948c183a3ee7324e2b70809117a3914aa050d1 100644 GIT binary patch delta 7116 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 C5qdQM delta 6322 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 startButtonClick()); - /**ClickEvents:*/ - startButton.setOnAction(event -> { - startButtonClick(); - }); + settingsButton.setOnAction(event -> settingsButtonClick()); - settingsButton.setOnAction(event -> { - settingsButtonClick(); - }); + highscoresButton.setOnAction(event -> highscoresButtonClick()); - highscoresButton.setOnAction(event -> { - highscoresButtonClick(); - }); - - menuButton.setOnAction(event -> { - menuButtonClick(); - }); + menuButton.setOnAction(event -> menuButtonClick()); startGameButton.setOnAction(event -> { - gameRuns = true; + gameRunning = true; startGameButtonClick(); }); - - stage.show(); } public void generateMenueScene() { - /**Bild für Hintergrund erstellen:*/ + menuScreenRunning = true; + + /*Bild für Hintergrund erstellen:*/ Image image = new Image("file:src/main/resources/com/example/happy_bird/pics/Background.png"); - /**Hintergrund erstellen:*/ + /*Hintergrund erstellen:*/ BackgroundImage backgroundImage = new BackgroundImage( image, BackgroundRepeat.NO_REPEAT, @@ -114,29 +122,15 @@ public class HappyBirdMain extends Application { BackgroundSize.DEFAULT ); - /**Hintergrund zu Pane hinzufügen:*/ + /*Hintergrund zu Pane hinzufügen:*/ Background background = new Background(backgroundImage); pane.setBackground(background); - - - /**Labels erstellen:*/ - //nameLabel = new Label("NAME"); - //acronymLabel = new Label("KÜRZEL"); - //headline = new Label("HAPPY BIRD"); - //soundLabel = new Label("SOUND"); - //currentScoreLabel = new Label("SCORE"); - //highscoreLabel = new Label("HIGHSCORE"); - - - /**Labels in Arrays speichern:*/ - - - /**Labels formatieren:*/ + /*Labels formatieren:*/ labelsFormating(labels, pane); headlineFormating(headlineLabels, pane); - /**alle labels an ihre Stelle:*/ + /*alle labels an ihre Stelle:*/ int yPositionLabels = 225; for (Label label : labels) { label.setLayoutX(275); @@ -144,60 +138,44 @@ public class HappyBirdMain extends Application { yPositionLabels += 150; } - /**headline an ihre Stelle:*/ + /*headline an ihre Stelle:*/ headline.setLayoutX(250); headline.setLayoutY(100); + headline.setVisible(true); - /**soundLabel an seine Stelle:*/ + /*soundLabel an seine Stelle:*/ soundLabel.setLayoutY(225); - - - /**Buttons erstellen:*/ - //startButton = new Button("START"); - //highscoresButton = new Button("HIGHSCORES"); - //settingsButton = new Button("EINSTELLUNGEN"); - //startGameButton = new Button("SPIEL STARTEN"); - //menuButton = new Button("ZURÜCK"); - - /**Buttons in Array speichern:*/ - - - /**Buttons formatieren:*/ + /*Buttons formatieren:*/ buttonsFormating(buttons, pane); - /**alle Buttons an ihre Stelle:*/ + /*alle Buttons an ihre Stelle:*/ int yPositionButtons = 225; for (Button button : buttons) { button.setLayoutX(300); button.setLayoutY(yPositionButtons); yPositionButtons += 100; + button.setVisible(true); } - /**menuButton an seine Stelle und vorerst ausblenden:*/ + /*menuButton an seine Stelle und vorerst ausblenden:*/ menuButton.setLayoutX(575); menuButton.setLayoutY(625); menuButton.setVisible(false); - /**startGameButton unsichtbar*/ + /*startGameButton unsichtbar*/ startGameButton.setVisible(false); - /**continueButton unsichtbar*/ + /*continueButton unsichtbar*/ continueButton.setVisible(false); + /*settingsButtonPause unsichtbar*/ + settingsButtonPause.setVisible(false); - - /**Textfelder erstellen:*/ - //name = new TextField(); - //acronym = new TextField(); - - /**Textfelder in Array speichern:*/ - - - /**Textfelder formatieren:*/ + /*Textfelder formatieren:*/ textfieldsFormating(inputFields, pane); - /**Textfelder an ihre Position:*/ + /*Textfelder an ihre Position:*/ int yPositionInputFields = 290; for (TextField feld : inputFields) { feld.setLayoutX(275); @@ -205,14 +183,8 @@ public class HappyBirdMain extends Application { yPositionInputFields += 150; } - - - /**SoundSlider erstellen:*/ - //soundSlider = new Slider(); - - /**SoundSlicer anpassen:*/ + /*SoundSlicer anpassen:*/ soundSliderFormating(soundSlider, pane); - } /** @@ -220,50 +192,53 @@ public class HappyBirdMain extends Application { * Sichtbarmachen der richtigen Buttons, Labels, ... */ public void generateGameScreen() { - /**Headline-Label umbenennen*/ - nameLabel.setText("NAME: " + acronym.getText()); + menuScreenRunning = false; - /**Textfelder ausblenden*/ + /*Headline-Label umbenennen*/ + nameLabel.setText("KÜRZEL: " + acronym.getText()); + + /*Textfelder ausblenden*/ for(TextField feld : inputFields) { feld.setVisible(false); } - /**Labels ausblenden*/ - for (Label label : labels ) - { + /*Labels ausblenden*/ + for (Label label : labels ) { label.setVisible(false); } headline.setVisible(false); - /**nameLabel, currentScoreLabel und highscoreLabel positionieren und sichtbar machen*/ + /*nameLabel positionieren und sichtbar machen*/ nameLabel.setLayoutX(10); nameLabel.setLayoutY(10); nameLabel.setVisible(true); + /*currentScoreLabel positionieren und sichtbar machen*/ currentScoreLabel.setLayoutX(540); currentScoreLabel.setLayoutY(10); currentScoreLabel.setVisible(true); + /*highscoreLabel positionieren und sichtbar machen*/ highscoreLabel.setLayoutX(540); highscoreLabel.setLayoutY(70); highscoreLabel.setVisible(true); - /**Übrige Buttons ausblenden*/ - startGameButton.setVisible(false); - menuButton.setVisible(false); - - /**Pause-Button positionieren und sichtbar machen*/ + /*Pause-Button positionieren und sichtbar machen*/ pauseButton.setLayoutX(575); pauseButton.setLayoutY(625); pauseButton.setVisible(true); - /**Vogel hinzufügen, bisher nur als Bild*/ + /*übrige Buttons ausblenden*/ + startGameButton.setVisible(false); + menuButton.setVisible(false); + + /*Vogel hinzufügen, bisher nur als Bild*/ ImageView birdView = new ImageView(bird); pane.getChildren().add(birdView); birdView.setLayoutY(325); birdView.setLayoutX(50); - /**Pipes oben, unten hinzufügen, bisher nur als Bild*/ + /*Pipes oben, unten hinzufügen, bisher nur als Bild*/ ImageView upperPipeView = new ImageView(upperPipe); pane.getChildren().add(upperPipeView); upperPipeView.setLayoutX(400); @@ -382,41 +357,71 @@ public class HappyBirdMain extends Application { * Formatiert den PauseScreen */ public void pauseScreenFormating() { + /*pause-Pane formatieren*/ + pause.setPrefSize(400, 400); pause.setLayoutX(200); - pause.setLayoutY(100); - pause.setPrefSize(400, 500); + pause.setLayoutY(150); pause.setStyle("-fx-background-color: #DED894; " + "-fx-border-width: 5px;" + "-fx-border-color: #543847;" + "-fx-border-radius: 15px;" + "-fx-background-radius: 20px;"); + + /*pauseMenuLabel formatieren*/ + pauseMenuLabel.setPrefSize(300,50); + pauseMenuLabel.setLayoutX(50); + pauseMenuLabel.setLayoutY(10); + pauseMenuLabel.setStyle("-fx-background-color: #DED894; " + + "-fx-text-fill: #000000; " + + "-fx-font-size: 35px; " + + "-fx-font-weight: bold;" + + "-fx-alignment: center;"); + + /*soundLabelPause formatieren*/ + soundLabelPause.setPrefSize(100, 50); + soundLabelPause.setLayoutX(150); + soundLabelPause.setLayoutY(100); + soundLabelPause.setStyle("-fx-background-color: #DED894; " + + "-fx-text-fill: #000000; " + + "-fx-font-size: 20px; " + + "-fx-font-weight: bold;" + + "-fx-alignment: center;"); } /*** * Hauptmenü wird ausgeblendet, Nameneingabe folgt */ public void startButtonClick() { + /*Überschrift umbenennen*/ headline.setText("START"); - startGameButton.setOnAction(event -> { - startGameButtonClick(); - }); + + /*alle Buttons ausblenden*/ for(Button button : buttons) { button.setVisible(false); } - startGameButton.setVisible(true); + /*gebrauchte Buttons einblenden, ggf. anpassen*/ menuButton.setVisible(true); + startGameButton.setVisible(true); startGameButton.setLayoutY(520); + + /*Textfelder einblenden*/ for(TextField feld : inputFields) { feld.setVisible(true); } + + /*Labels einblenden*/ for (Label label : labels ) { label.setVisible(true); } + + /*nicht verwendete Labels ausblenden*/ highscoreLabel.setVisible(false); currentScoreLabel.setVisible(false); soundLabel.setVisible(false); + /*Click-Events*/ + startGameButton.setOnAction(event -> startGameButtonClick()); } @@ -424,7 +429,10 @@ public class HappyBirdMain extends Application { * Hauptmenü wird ausgeblendet, Einstellungen folgen */ public void settingsButtonClick() { + /*Überschrift umbenennen*/ headline.setText("EINSTELLUNGEN"); + + /*nicht verwendete Buttons/ Labels ausblenden, gebrauchte einblenden*/ startButton.setVisible(false); highscoresButton.setVisible(false); settingsButton.setVisible(false); @@ -433,11 +441,56 @@ public class HappyBirdMain extends Application { soundLabel.setVisible(true); } + /*** + * Hauptmenü wird ausgeblendet, Einstellungen folgen + */ + public void settingsButtonPauseClick() { + /*Überschrift umbenennen*/ + pauseMenuLabel.setText("EINSTELLUNGEN"); + + /*alle Buttons ausblenden*/ + for(Button button : pauseButtons) { + button.setVisible(false); + } + + /*gebrauchte Buttons einblenden und anpassen*/ + backButtonPause.setVisible(true); + backButtonPause.setLayoutY(300); + + /*soundSliderPause anpassen und einblenden*/ + soundSliderPause.setPrefSize(200, 5); + soundSliderPause.setLayoutX(100); + soundSliderPause.setLayoutY(150); + soundSliderPause.setVisible(true); + + /*soundLabelPause einblenden*/ + soundLabelPause.setVisible(true); + + /*Click-Events*/ + backButtonPause.setOnAction(event -> { + /*Überschrift umbenennen*/ + pauseMenuLabel.setText("PAUSE"); + + /*alle Buttons einblenden*/ + for(Button button : pauseButtons) { + button.setVisible(true); + } + + /*nicht verwendete Buttons ausblenden*/ + backButtonPause.setVisible(false); + soundSliderPause.setVisible(false); + soundLabelPause.setVisible(false); + }); + } + /*** * Hauptmenü wird ausgeblendet, Highscores folgen */ public void highscoresButtonClick() { + /*Überschrift umbenennen*/ headline.setText("HIGHSCORES"); + + /*nicht verwendete Buttons ausblenden, verwendete einblenden*/ startButton.setVisible(false); highscoresButton.setVisible(false); settingsButton.setVisible(false); @@ -449,19 +502,28 @@ public class HappyBirdMain extends Application { * Erneutes Anzeigen des Hauptmenüs */ public void menuButtonClick() { + /*Überschrift umbenennen*/ headline.setText("HAPPY BIRD"); + + /*nicht verwendete Buttons ausblenden, verwendete einblenden*/ startButton.setVisible(true); highscoresButton.setVisible(true); settingsButton.setVisible(true); menuButton.setVisible(false); - soundSlider.setVisible(false); - soundLabel.setVisible(false); startGameButton.setVisible(false); + /*soundSlider ausblenden*/ + soundSlider.setVisible(false); + + /*soundLabel ausblenden*/ + //soundLabel.setVisible(false); + + /*Textfelder ausblenden*/ for(TextField feld : inputFields) { feld.setVisible(false); } + /*alle Labels ausblenden*/ for (Label label : labels ) { label.setVisible(false); } @@ -473,66 +535,114 @@ public class HappyBirdMain extends Application { public void startGameButtonClick() { generateGameScreen(); - - /**Klick auf den Pause-Button, um das Pause-Menü aufzurufen*/ + /*Klick auf den Pause-Button, um das Pause-Menü aufzurufen*/ pauseButton.setOnAction(event -> { - // - if(gameRuns) { - gameRuns = false; - } else { - gameRuns = true; + if(!menuScreenRunning) { + pauseButtonClick(gameRunning); + gameRunning = !gameRunning; } - pauseButtonClick(gameRuns); }); - /**ESC-Tast drücken, um das Pause-Menü aufzurufen*/ + /*ESC-Tast drücken, um das Pause-Menü aufzurufen*/ scene.setOnKeyPressed(e -> { - if(e.getCode() == KeyCode.ESCAPE) { - if(gameRuns) { - gameRuns = false; - pauseButtonClick(false); - } else { - gameRuns = true; - pauseButtonClick(true); - } + if(e.getCode() == KeyCode.ESCAPE && !menuScreenRunning) { + pauseButtonClick(gameRunning); + gameRunning = !gameRunning; } }); } + /*** + * Zurück zum Spiel aus dem PauseScreen heraus + */ + public void continueButtonClick() { + /*pauseButton einblenden*/ + pauseButton.setVisible(true); + + /*PauseScreen ausblenden*/ + pause.setVisible(false); + + /*Vom PauseScreen entfernen*/ + pause.getChildren().clear(); + pane.getChildren().remove(pause); + + /*gameRunning auf false setzen, da sonst 2x Click auf Pause-Button bzw. ESC*/ + gameRunning = false; + } + + /*** + * alles vom pane entfernen, da als nächstes zum Hauptmenü + */ + private void menuButtonPauseClick() { + /*alles vom pauseScreen entfernen*/ + pause.getChildren().clear(); + + /*pause von pane entfernen*/ + pane.getChildren().clear(); + + /*gameRunning auf false, da zurück zum Hauptmenü*/ + gameRunning = false; + } + /*** * Ruft das Pause-Menü im Spiel auf oder blendet es wieder aus */ public void pauseButtonClick(Boolean gameRuns) { pauseScreenFormating(); - /**PauseScreen aufrufen, wenn das Spiel läuft, sonst wieder ausblenden*/ - if(gameRuns) { - /**PauseScreen ausblenden*/ - pause.setVisible(true); + /*PauseScreen aufrufen, wenn das Spiel läuft, sonst wieder ausblenden*/ + if(!gameRuns) { pauseButton.setVisible(false); - highscoresButton.setVisible(true); - settingsButton.setVisible(true); - highscoresButton.setLayoutX(100); - settingsButton.setLayoutX(100); - /**Zum PauseScreen hinzufügen*/ - pause.getChildren().add(settingsButton); - pause.getChildren().add(highscoresButton); + /*PauseScreen einblenden*/ + pause.setVisible(true); + + /*Buttons anpassen, zum pauseScreen hinzufügen und einblenden*/ + int yPosition = 100; + for(Button button : pauseButtons) { + button.setLayoutX(100); + button.setLayoutY(yPosition); + yPosition += 100; + pause.getChildren().add(button); + button.setVisible(true); + } + + /*backButtonPause vorerst ausblenden und zu pause hinzufügen*/ + backButtonPause.setVisible(false); + pause.getChildren().add(pauseMenuLabel); + + /*soundSliderPause vorerst ausblenden und zu pause hinzufügen*/ + soundSliderPause.setVisible(false); + pause.getChildren().add(soundSliderPause); + + /*soundLabelPause vorerst ausblenden und zu pause hinzufügen*/ + soundLabelPause.setVisible(false); + pause.getChildren().add(soundLabelPause); + + /*pause zu pane hinzufügen*/ pane.getChildren().add(pause); + + /*ClickEvents*/ + continueButton.setOnAction(event -> continueButtonClick()); + + menuButtonPause.setOnAction(event -> { + menuButtonPauseClick(); + generateMenueScene(); + }); + + settingsButtonPause.setOnAction(event -> settingsButtonPauseClick()); } else { - /**PauseScreen aufrufen/ sichtbar machen*/ + /*pauseButton einblenden*/ + pauseButton.setVisible(true); + + /*PauseScreen ausblenden*/ pause.setVisible(false); - pauseButton.setVisible(true); - highscoresButton.setVisible(false); - settingsButton.setVisible(false); - highscoresButton.setLayoutX(300); - settingsButton.setLayoutX(300); + /*alles vom PauseScreen entfernen*/ + pause.getChildren().clear(); - /**Vom PauseScreen entfernen*/ - pause.getChildren().remove(settingsButton); - pause.getChildren().remove(highscoresButton); + /*pause von pane entfernen*/ pane.getChildren().remove(pause); } } -} +} \ No newline at end of file