From 8507e0f68120cfd6abebcd79c4f030f3129e906d Mon Sep 17 00:00:00 2001 From: pbs2h20apa Date: Mon, 10 Jan 2022 12:05:54 +0100 Subject: [PATCH] Datenbank --- .../dependencies-accessors.lock | Bin 39 -> 17 bytes .../executionHistory/executionHistory.bin | Bin 71354 -> 71354 bytes .../executionHistory/executionHistory.lock | Bin 39 -> 17 bytes .../.gradle/7.1.1/fileHashes/fileHashes.bin | Bin 24947 -> 24947 bytes .../.gradle/7.1.1/fileHashes/fileHashes.lock | Bin 39 -> 17 bytes .../buildOutputCleanup.lock | Bin 39 -> 17 bytes Happy_Bird/.gradle/checksums/checksums.lock | Bin 39 -> 17 bytes .../build/libs/Happy_Bird-1.0-SNAPSHOT.jar | Bin 365913 -> 366732 bytes .../compileJava/previous-compilation-data.bin | Bin 17828 -> 17798 bytes .../com/example/happy_bird/HappyBirdMain.java | 502 +++++------------- 10 files changed, 130 insertions(+), 372 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 9ebe6b9cc637ecb458956dea93d0e28156ec47f2..1504b9c09125b7c12d2aa3f6bd196d435b80f3fa 100644 GIT binary patch literal 17 TcmZQhzQrlOW~*-$0~7!ND^3G( literal 39 qcmZQhzQrlOW~*-$0~9bbFnn(MK5@;{jn|$eGq4&OnVFk0FaQAPY75%{ diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin index 2936f57822edaeea50a9f1c145c0db980331a86e..8a8d89fe471ed00d1d25923957931b9f8c25776a 100644 GIT binary patch delta 491 zcmdnBmSxvkmJLSFm2ylHQ_@PSOpLSA3JX%Is*Fv_DiRBFGfh$%AfRY-p@$aB=DOFV z%mO9hauN-)ISHEYY7z-l2?QB=9tygGIsp=P75`qVvaIE!a8PV4n8&<$R2vm;|Ib z+ZR;j9kJULb3_yfC9G%Rvy!Lzq$15n}j!K4u1i<&ND4 z#2&vWL;r9J{s_woQjAfX- zu}paSQDH_Q>9b%&9t#uEh+-*+$xCHV> L+xCf~jGBx9wqx4G delta 492 zcmdnBmSxvkmJLSFm6G$!vy93TQ!2Ak3bJx?lT3?^Q%cHA%kxSZARu^ip@$aB=DOFV z%mUXQ|LnP4pK777AuM9c)i}1v533|6^FQF5tiP6Zv;O;KoPry5mGw_An`t9`O0A4F zc>Uw;lM_FiZI=0|$0&dHnQ&Fp?h{Y!t|@J|S+2bBeaqcbclB?s5@TUxU=Vhkys@@+ z^Rr*qmXF*QM8llBxAO#$Y~2J^JHFXvF=A&cveCJ-LL1sa);6<8=lo-eFxT(a8`%q6Oc7sUYJpp>EPszWx~^s3Ns2x-vSzXSHFcBqz^4O(4~9 diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock index aa4d25d24a23377701e78fb514957d6f95721e97..7ecbf778ba7b2fb9bb309e3918082bd1499cee3b 100644 GIT binary patch literal 17 UcmZRcFR$V0A8pga00zv_03j>`0{{R3 literal 39 rcmZRcFR$V0A8pga00zwA%nS^ln?$v`?#FU4n=!B&8kw1!F)#oCqgw~a diff --git a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin index aea6d4f0a7535108fa2174a65e0e1d264b628d5c..d7bf435ad7bb77dfc2725d30a9bb9fd8ca882393 100644 GIT binary patch delta 297 zcmex-i1G6w#tmNs?d}+8%w+%rMmr#-XAC4XfmjiQ1$G$vRtUsdsk>~Ln!4fLlEVxP zjI}@=Gl7yoV3Riat&bWDP+;fezaDxZ#@@;OK_G_u-^mAq^gyPcg{Wn00n%uutDpUA z7&K$&sV}$IJ&baSwQX|0xBBFeU|EHy=^QKy?mtgCyB3{4_G-aSkiwfW ztO5{)VY@a@44%fUF#9Y+rqZhn(^bNz&R3NDI3UJpv4T~x&ghx^-&1XKZny~t$f2#1 fCq_w4-XFgT;@Ef~r#<1008r*2#8hTAAgu=gb8}m* delta 228 zcmex-i1G6w#tmNsS*~wR44S;zM-RmCoBR~Q$eaAv11wTBxjzWRNH{h5V33~O&2YzC z3}C?60;KeefrKUyD}t~wS;)&fgrR_G$l@~&^I^~0PvQCYh{NGb; rb8ff^2gsRLlP5+=P2L~B3gob3ljDJ$_JlhEK&vi+)iW@w0ckw|)38$S diff --git a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock index 705470997f3db35345fefae10f5f64b03a8f9a1d..e096cb1c7be39c00af4f9c5c9ec2b8e744c8b130 100644 GIT binary patch literal 17 UcmZP;4v=Q+u;Wl;00Z`g0250BBme*a literal 39 rcmZP;4v=Q+u;Wl;00Z_3%nS^lo952^etXrU2dWILhDK)QW(*7fu09Gc diff --git a/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 9564819ec40beb8902036a08712888f0299bed8d..2ae839f08964bdbdefa228940639a5118a561101 100644 GIT binary patch literal 17 VcmZR6*X{eBQS{781~6bf0RT5p1rY!M literal 39 rcmZR6*X{eBQS{781~6bf$jrd-xv8ToVfG2G|DPFH4UNpq%@`N}1+NTV diff --git a/Happy_Bird/.gradle/checksums/checksums.lock b/Happy_Bird/.gradle/checksums/checksums.lock index 7b6baa653f34231af7d69afe4227a26835a298ef..1f8032a98ec5c85a4aff5bfc6d804d16661182e6 100644 GIT binary patch literal 17 VcmZSHBc?B=__%_P0Sp*F001Iu1C{^) literal 39 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 EADQbBO8@`> diff --git a/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin b/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin index 4b70fdff4ccd191eec1b7f87e804f7f487877b75..db80939bc4ef9228df5f3f8304d8d4f7e7417e69 100644 GIT binary patch delta 198 zcmZ3|&Dhq>IN_MU4nyAxfjBF5mkm=>H@sVNc;mI_&WxOs_qnLoGYTH&&^yB6w4a0H z5C;PT10%yx4!vU>zQ;M7PH=ea=aAr#goult`dKWkx&v6Jq_`DZ6^o~Q#7Q4iucbS8sCpSN(G$&OzGcQdkAEN3q#}y8} Ws~rB_qnLoGacq|I>O;{l!Kwo zH?b%)k)2)e7>C|*4yXMb9EUg<7#J8CPH^ZQhO!THoaE3u#o>FJ!|4o%$9@h84oQe2 z(X$+S=Qx7TbGYy4kdcLmNnPO3yU5{u38au;9wH`pnM3aihvOv<0SMoL_bP|pX{hO9 v*Esa9b1?Me=BJeAr0QnorR76ZUFW#Lp?8zR{}xB^ehzLPh#)5;&~*#|n~*}z diff --git a/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java b/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java index 29811c0..362c52a 100644 --- a/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java +++ b/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java @@ -1,79 +1,58 @@ package com.example.happy_bird; import javafx.application.Application; +import javafx.event.ActionEvent; +import javafx.event.EventHandler; +import javafx.fxml.FXMLLoader; +import javafx.geometry.Insets; +import javafx.geometry.Pos; import javafx.scene.Scene; import javafx.scene.control.Button; import javafx.scene.control.Label; -import javafx.scene.control.Slider; import javafx.scene.control.TextField; +import javafx.scene.control.Slider; +import javafx.scene.image.*; import javafx.scene.image.Image; -import javafx.scene.image.ImageView; -import javafx.scene.input.KeyCode; import javafx.scene.layout.*; import javafx.scene.text.TextAlignment; import javafx.stage.Stage; +import java.awt.*; +import java.io.IOException; + public class HappyBirdMain extends Application { - /*Panes erstellen und zuweisen*/ - private final Pane pane = new Pane(); - private final Pane pause = new Pane(); + private Pane pane = new Pane(); + private Scene scene = new Scene(pane, 800, 700); - /*Scene erstellen und zuweisen*/ - private final Scene scene = new Scene(pane, 800, 700); + private Label nameLabel = new Label("NAME"); + private Label acronymLabel = new Label("KÜRZEL"); + private Label headline = new Label("HAPPY BIRD"); + private Label soundLabel = new Label("SOUND"); + private Label currentScoreLabel = new Label("SCORE"); + private Label highscoreLabel = new Label("HIGHSCORE"); + private Label labels[] = {nameLabel, acronymLabel, soundLabel, currentScoreLabel, highscoreLabel}; + private Label headlineLabels[] = {headline}; - /*Labels erstellen und zuweisen*/ - private final Label nameLabel = new Label("NAME"); - private final Label acronymLabel = new Label("KÜRZEL"); - private final Label headline = new Label("HAPPY BIRD"); - private final Label soundLabel = new Label("SOUND"); - private final Label currentScoreLabel = new Label("SCORE"); - private final Label highscoreLabel = new Label("HIGHSCORE"); - private final Label pauseMenuLabel = new Label("PAUSE"); - private final Label soundLabelPause = new Label("SOUND"); + private Button startButton = new Button("START"); + private Button highscoresButton = new Button("HIGHSCORES"); + private Button settingsButton = new Button("EINSTELLUNGEN"); + private Button startGameButton = new Button("SPIEL STARTEN"); + private Button menuButton = new Button("ZURÜCK"); - /*Labels in Arrays speichern*/ - private final Label[] labels = {nameLabel, acronymLabel, soundLabel, currentScoreLabel, highscoreLabel}; - private final Label[] headlineLabels = {headline}; + private Button[] buttons = {startButton, highscoresButton, settingsButton, startGameButton, menuButton}; - /*Buttons erstellen und zuweisen*/ - private final Button startButton = new Button("START"); - private final Button highscoresButton = new Button("HIGHSCORES"); - private final Button settingsButton = new Button("EINSTELLUNGEN"); - private final Button startGameButton = new Button("SPIEL STARTEN"); - private final Button menuButton = new Button("ZURÜCK"); - private final Button pauseButton = new Button("PAUSE"); - private final Button continueButton = new Button("WEITERSPIELEN"); - private final Button settingsButtonPause = new Button("EINSTELLUNGEN"); - private final Button menuButtonPause = new Button("HAUPTMENÜ"); - private final Button backButtonPause = new Button("ZURÜCK"); + private TextField name = new TextField(); + private TextField acronym = new TextField(); - /*Buttons in Arrays speichern*/ - private final Button[] buttons = {startButton, highscoresButton, settingsButton, startGameButton, menuButton, pauseButton, continueButton, settingsButtonPause, menuButtonPause, backButtonPause}; - private final Button[] pauseButtons = {continueButton, settingsButtonPause, menuButtonPause, backButtonPause}; + private TextField inputFields[] = {name, acronym}; - /*Textfelder erstellen und zuweisen*/ - private final TextField name = new TextField(); - private final TextField acronym = new TextField(); + private Slider soundSlider = new Slider(); - /*Textfelder in Arrays speichern*/ - private final TextField[] inputFields = {name, acronym}; + private Image bird = new Image("file:src/main/resources/com/example/happy_bird/pics/bird.png", 50, 35, false, false); - /*Slider erstellen und zuweisen*/ - private final Slider soundSlider = new Slider(); - private final Slider soundSliderPause = new Slider(); - - /*Bilder*/ - private final Image bird = new Image("file:src/main/resources/com/example/happy_bird/pics/bird.png", 50, 35, false, false); - - private final Image upperPipe = new Image("file:src/main/resources/com/example/happy_bird/pics/PipeOben.png", 86, 300, false, false); - private final Image lowerPipe = new Image("file:src/main/resources/com/example/happy_bird/pics/PipeUnten.png", 86, 300, false, false); - - /*Variablen für den Spielverlauf*/ - //menuScreenRunning: das Hauptmenü ist aufgerufen - private boolean menuScreenRunning; - //gameRunning: das Spiel läuft/ GameScreen ist aufgerufen - private boolean gameRunning; + private Image upperPipe = new Image("file:src/main/resources/com/example/happy_bird/pics/PipeOben.png", 86, 300, false, false); + private Image lowerPipe = new Image("file:src/main/resources/com/example/happy_bird/pics/PipeUnten.png", 86, 300, false, false); @@ -82,38 +61,15 @@ public class HappyBirdMain extends Application { } @Override - public void start(Stage stage) { + public void start(Stage stage) throws IOException { stage.setTitle("Happy Bird"); stage.setScene(scene); - generateMenueScene(); - - /*ClickEvents:*/ - startButton.setOnAction(event -> startButtonClick()); - - settingsButton.setOnAction(event -> settingsButtonClick()); - - highscoresButton.setOnAction(event -> highscoresButtonClick()); - - menuButton.setOnAction(event -> menuButtonClick()); - - startGameButton.setOnAction(event -> { - gameRunning = true; - startGameButtonClick(); - }); - - stage.show(); - } - - - public void generateMenueScene() { - menuScreenRunning = true; - - /*Bild für Hintergrund erstellen:*/ + /**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, @@ -122,15 +78,23 @@ 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 formatieren:*/ + + + /**Labels erstellen:*/ + + + /**Labels in Arrays speichern:*/ + + + /**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); @@ -138,44 +102,52 @@ 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 formatieren:*/ + + + /**Buttons erstellen:*/ + + + /**Buttons in Array speichern:*/ + + + /**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.setVisible(false); - /*settingsButtonPause unsichtbar*/ - settingsButtonPause.setVisible(false); - /*Textfelder formatieren:*/ + /**Textfelder erstellen:*/ + + + /**Textfelder in Array speichern:*/ + + + /**Textfelder formatieren:*/ textfieldsFormating(inputFields, pane); - /*Textfelder an ihre Position:*/ + /**Textfelder an ihre Position:*/ int yPositionInputFields = 290; for (TextField feld : inputFields) { feld.setLayoutX(275); @@ -183,71 +155,34 @@ public class HappyBirdMain extends Application { yPositionInputFields += 150; } - /*SoundSlicer anpassen:*/ + + + /**SoundSlider erstellen:*/ + + + /**SoundSlicer anpassen:*/ soundSliderFormating(soundSlider, pane); - } - /** - * Generiert den GameScreen durch Ausblenden und - * Sichtbarmachen der richtigen Buttons, Labels, ... - */ - public void generateGameScreen() { - menuScreenRunning = false; - /*Headline-Label umbenennen*/ - nameLabel.setText("KÜRZEL: " + acronym.getText()); - /*Textfelder ausblenden*/ - for(TextField feld : inputFields) { - feld.setVisible(false); - } + /**ClickEvents:*/ + startButton.setOnAction(event -> { + startButtonClick(); + }); - /*Labels ausblenden*/ - for (Label label : labels ) { - label.setVisible(false); - } - headline.setVisible(false); + settingsButton.setOnAction(event -> { + settingsButtonClick(); + }); - /*nameLabel positionieren und sichtbar machen*/ - nameLabel.setLayoutX(10); - nameLabel.setLayoutY(10); - nameLabel.setVisible(true); + highscoresButton.setOnAction(event -> { + highscoresButtonClick(); + }); - /*currentScoreLabel positionieren und sichtbar machen*/ - currentScoreLabel.setLayoutX(540); - currentScoreLabel.setLayoutY(10); - currentScoreLabel.setVisible(true); + menuButton.setOnAction(event -> { + menuButtonClick(); + }); - /*highscoreLabel positionieren und sichtbar machen*/ - highscoreLabel.setLayoutX(540); - highscoreLabel.setLayoutY(70); - highscoreLabel.setVisible(true); - - /*Pause-Button positionieren und sichtbar machen*/ - pauseButton.setLayoutX(575); - pauseButton.setLayoutY(625); - pauseButton.setVisible(true); - - /*ü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*/ - ImageView upperPipeView = new ImageView(upperPipe); - pane.getChildren().add(upperPipeView); - upperPipeView.setLayoutX(400); - upperPipeView.setLayoutY(0); - - ImageView lowerPipeView = new ImageView(lowerPipe); - pane.getChildren().add(lowerPipeView); - lowerPipeView.setLayoutX(400); - lowerPipeView.setLayoutY(430); + stage.show(); } /*** @@ -353,75 +288,31 @@ public class HappyBirdMain extends Application { slider.setVisible(false); } - /*** - * Formatiert den PauseScreen - */ - public void pauseScreenFormating() { - /*pause-Pane formatieren*/ - pause.setPrefSize(400, 400); - pause.setLayoutX(200); - 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"); - - /*alle Buttons ausblenden*/ + startGameButton.setOnAction(event -> { + startGameButtonClick(); + }); for(Button button : buttons) { button.setVisible(false); } - /*gebrauchte Buttons einblenden, ggf. anpassen*/ - menuButton.setVisible(true); startGameButton.setVisible(true); + menuButton.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()); } @@ -429,10 +320,7 @@ 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); @@ -441,56 +329,11 @@ 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); @@ -502,28 +345,19 @@ 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); } @@ -533,116 +367,40 @@ public class HappyBirdMain extends Application { * Startet Spiel nach Namenseingabe */ public void startGameButtonClick() { - generateGameScreen(); - - /*Klick auf den Pause-Button, um das Pause-Menü aufzurufen*/ - pauseButton.setOnAction(event -> { - if(!menuScreenRunning) { - pauseButtonClick(gameRunning); - gameRunning = !gameRunning; - } - }); - - /*ESC-Tast drücken, um das Pause-Menü aufzurufen*/ - scene.setOnKeyPressed(e -> { - 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) { - pauseButton.setVisible(false); - - /*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 { - /*pauseButton einblenden*/ - pauseButton.setVisible(true); - - /*PauseScreen ausblenden*/ - pause.setVisible(false); - - /*alles vom PauseScreen entfernen*/ - pause.getChildren().clear(); - - /*pause von pane entfernen*/ - pane.getChildren().remove(pause); + nameLabel.setText("NAME: " + acronym.getText()); + fgit or(TextField feld : inputFields) { + feld.setVisible(false); } + for (Label label : labels ) + { + label.setVisible(false); + } + startGameButton.setVisible(false); + menuButton.setVisible(false); + headline.setVisible(false); + ImageView birdView = new ImageView(bird); + pane.getChildren().add(birdView); + birdView.setLayoutY(325); + birdView.setLayoutX(50); + nameLabel.setLayoutX(10); + nameLabel.setLayoutY(10); + nameLabel.setVisible(true); + + ImageView upperPipeView = new ImageView(upperPipe); + pane.getChildren().add(upperPipeView); + upperPipeView.setLayoutX(400); + upperPipeView.setLayoutY(0); + + ImageView lowerPipeView = new ImageView(lowerPipe); + pane.getChildren().add(lowerPipeView); + lowerPipeView.setLayoutX(400); + lowerPipeView.setLayoutY(430); + + currentScoreLabel.setLayoutX(540); + currentScoreLabel.setLayoutY(10); + currentScoreLabel.setVisible(true); + highscoreLabel.setLayoutX(540); + highscoreLabel.setLayoutY(70); + highscoreLabel.setVisible(true); } -} \ No newline at end of file +}