diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin index 7c37640..904cd73 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 714a218..8e4c169 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 2cea9d8..c0b34fc 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 01322a3..a113b12 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 60bc1bf..7f658a4 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 7dc4537..ed79a47 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 0014bdd..b46c9ca 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 c2e51d0..ed3be96 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 5280a4e..8d19766 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 @@ -95,7 +95,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", 50, 35, false, false); + private final Image bird = new Image("file:src/main/resources/com/example/happy_bird/pics/bird.png", 45, 30, false, false); 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"); @@ -109,16 +109,13 @@ public class HappyBirdMain extends Application { private TranslateTransition top; private TranslateTransition bottom; + private TranslateTransition birdTransition; private Timeline timeline; private final ArrayList transitions = new ArrayList();; public static void main(String[] args) { - - launch(args); - - } @Override @@ -141,7 +138,6 @@ public class HappyBirdMain extends Application { startGameButtonClick(); }); - stage.show(); } @@ -159,17 +155,18 @@ public class HappyBirdMain extends Application { Rectangle topPipe = new Rectangle(900, y, 91, 500); /* Pipe unten; spawnt auf der gleichen Höhe wie obere Pipe - * +400, da y-Koord die untere linke Ecke ist - * +250, der Abstand zwischen oberer Pipe und unterer Pipe */ + * +400 +250, für Abstand zwischen oberer Pipe und unterer Pipe */ Rectangle bottomPipe = new Rectangle(900, y + 400 + 250, 91, 500); /* oberer Pipe ein Hintergrundbild geben */ Image img = new Image("file:src/main/resources/com/example/happy_bird/pics/PipeTop.png"); topPipe.setFill(new ImagePattern(pipeTop)); + topPipe.setStyle("-fx-view-order: 1"); /* unterer Pipe ein Hintergrundbild geben */ img = new Image("file:src/main/resources/com/example/happy_bird/pics/PipeBottom.png"); bottomPipe.setFill(new ImagePattern(pipeBottom)); + bottomPipe.setStyle("-fx-view-order: 1"); /* neue Animationen über TranslateTransitions */ top = new TranslateTransition();