diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin index f30fc72..271b283 100644 Binary files a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin and b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin differ diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock index 93c397d..c184486 100644 Binary files a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock and b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock differ diff --git a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin index 21ec155..bf36bd3 100644 Binary files a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin and b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin differ diff --git a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock index 306f385..6d2c09f 100644 Binary files a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock and b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock differ diff --git a/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock index b397bff..d6567d0 100644 Binary files a/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ 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 5d1ab67..e762818 100644 Binary files a/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class and b/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class differ 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 79a181c..81949f2 100644 Binary files a/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar and b/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar differ diff --git a/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin b/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin index cfed9b0..7c8d14d 100644 Binary files a/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin and b/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin differ 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 b52c40b..607f8b6 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 @@ -9,6 +9,7 @@ import javafx.scene.control.Label; import javafx.scene.control.TextField; import javafx.scene.image.Image; import javafx.scene.input.KeyCode; +import javafx.scene.input.KeyEvent; import javafx.scene.layout.*; import javafx.scene.paint.ImagePattern; import javafx.stage.Stage; @@ -21,7 +22,6 @@ import java.sql.ResultSet; import java.util.ArrayList; public class HappyBirdMain extends Application { - Thread thread; private float velocity = 0f; private float gravity = 0.25f; @@ -103,8 +103,7 @@ public class HappyBirdMain extends Application { private final Slider soundSliderPause = new Slider(); /*Bilder*/ - private final Image bird = new Image("file:src/main/resources/com/example/happy_bird/pics/bird.png", - 45, 30, false, false); + private final Image bird = new Image("file:src/main/resources/com/example/happy_bird/pics/bird.png"); private final Image pipeTop = new Image("file:src/main/resources/com/example/happy_bird/pics/PipeTop.png"); private final Image pipeBottom = new Image("file:src/main/resources/com/example/happy_bird/pics/PipeBottom.png"); @@ -412,7 +411,7 @@ public class HappyBirdMain extends Application { /*Timeline: alle 2 Sekunden spawnt eine neue Pipe am rechten Rand*/ - timeline = new Timeline(new KeyFrame(Duration.seconds(2), e ->{ + timeline = new Timeline(new KeyFrame(Duration.seconds(1.5), e ->{ /*Pipes erstellen*/ Rectangle[] pipesTopBottom = createPipes(); @@ -696,6 +695,17 @@ public class HappyBirdMain extends Application { } } + public void keyPressed(KeyEvent e) { + scene.setOnKeyPressed(event -> { + if (event.getCode() == KeyCode.W) { + moveBirdUp(); + } + + if (event.getCode() == KeyCode.S) { + moveBirdDown(); + } + }); + }; /*** * Startet Spiel nach Namenseingabe */ @@ -740,7 +750,6 @@ public class HappyBirdMain extends Application { moveBirdDown(); }*/ - if (event.getCode() == KeyCode.W) { moveBirdUp(); } @@ -1191,7 +1200,7 @@ public class HappyBirdMain extends Application { } private void moveBirdUp() { - velocity = (float) -1.5; + velocity = (float) -4.5; var pos = velocity += gravity; birdPositionMovedBy += pos; happyBird.setLayoutY(birdPositionMovedBy); diff --git a/Happy_Bird/src/main/resources/com/example/happy_bird/pics/bird.png b/Happy_Bird/src/main/resources/com/example/happy_bird/pics/bird.png index f05baa3..fb6f7ba 100644 Binary files a/Happy_Bird/src/main/resources/com/example/happy_bird/pics/bird.png and b/Happy_Bird/src/main/resources/com/example/happy_bird/pics/bird.png differ