diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin
index 7d42531..f30fc72 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 9c06703..93c397d 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 cc758a9..21ec155 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 106c7d7..306f385 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 bf1163e..b397bff 100644
Binary files a/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/Happy_Bird/.gradle/checksums/checksums.lock b/Happy_Bird/.gradle/checksums/checksums.lock
index 1964ecb..2a7fbdd 100644
Binary files a/Happy_Bird/.gradle/checksums/checksums.lock and b/Happy_Bird/.gradle/checksums/checksums.lock differ
diff --git a/Happy_Bird/.gradle/checksums/md5-checksums.bin b/Happy_Bird/.gradle/checksums/md5-checksums.bin
index e6fbe73..402934b 100644
Binary files a/Happy_Bird/.gradle/checksums/md5-checksums.bin and b/Happy_Bird/.gradle/checksums/md5-checksums.bin differ
diff --git a/Happy_Bird/.gradle/checksums/sha1-checksums.bin b/Happy_Bird/.gradle/checksums/sha1-checksums.bin
index 44b1816..2099080 100644
Binary files a/Happy_Bird/.gradle/checksums/sha1-checksums.bin and b/Happy_Bird/.gradle/checksums/sha1-checksums.bin differ
diff --git a/Happy_Bird/.idea/Happy_Bird.iml b/Happy_Bird/.idea/Happy_Bird.iml
deleted file mode 100644
index 78b2cc5..0000000
--- a/Happy_Bird/.idea/Happy_Bird.iml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/Happy_Bird/.idea/compiler.xml b/Happy_Bird/.idea/compiler.xml
index b73660a..539824c 100644
--- a/Happy_Bird/.idea/compiler.xml
+++ b/Happy_Bird/.idea/compiler.xml
@@ -3,4 +3,9 @@
+
+
+
\ No newline at end of file
diff --git a/Happy_Bird/.idea/runConfigurations.xml b/Happy_Bird/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea..0000000
--- a/Happy_Bird/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
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 5ce8d71..5d1ab67 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/classes/java/main/module-info.class b/Happy_Bird/build/classes/java/main/module-info.class
index 9ac6a58..c6bee7e 100644
Binary files a/Happy_Bird/build/classes/java/main/module-info.class and b/Happy_Bird/build/classes/java/main/module-info.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 51f0dae..79a181c 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 76dba79..cfed9b0 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 a25834e..b52c40b 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
@@ -21,6 +21,10 @@ import java.sql.ResultSet;
import java.util.ArrayList;
public class HappyBirdMain extends Application {
+ Thread thread;
+
+ private float velocity = 0f;
+ private float gravity = 0.25f;
private int birdPositionMovedBy = 0;
private int collectedPoints;
private int playerhighscore;
@@ -505,6 +509,7 @@ public class HappyBirdMain extends Application {
}
}
+
/***
* Hauptmenü wird ausgeblendet, Nameneingabe folgt
*/
@@ -694,18 +699,19 @@ public class HappyBirdMain extends Application {
/***
* Startet Spiel nach Namenseingabe
*/
+
public void startGameButtonClick() {
if (correctName() == 0 && correctAcronym() == 0)
{
generateGameScreen();
- System.out.println(gameRunning);
+ System.out.println(this.gameRunning);
pauseButton.setDefaultButton(false);
/*Klick auf den Pause-Button, um das Pause-Menü aufzurufen*/
pauseButton.setOnAction(event -> {
if (!menuScreenRunning) {
- pauseButtonClick(gameRunning);
- gameRunning = !gameRunning;
+ pauseButtonClick(this.gameRunning);
+ this.gameRunning = !this.gameRunning;
}
});
@@ -717,20 +723,37 @@ public class HappyBirdMain extends Application {
*/
birdPositionMovedBy = 0;
scene.setOnKeyPressed(event -> {
- if (event.getCode() == KeyCode.S) {
- moveBirdDown();
- System.out.println(birdPositionMovedBy);
- }
+ /*if (event.getCode() == KeyCode.S) {
+ moveBirdDown();
+ System.out.println(birdPositionMovedBy);
+ }*/
+
+
+ // FUNKTIONIERT
+ // aktuelle birdPositionMovedBy rausfid
+
+
+ /*if (event.getCode() == KeyCode.W) {
+ moveBirdUp();
+ }
+ if (event.getCode() == KeyCode.S) {
+ moveBirdDown();
+ }*/
+
+
if (event.getCode() == KeyCode.W) {
moveBirdUp();
- System.out.println(birdPositionMovedBy);
+ }
+ else {
+ moveBirdDown();
}
if (event.getCode() == KeyCode.ESCAPE && !menuScreenRunning) {
- pauseButtonClick(gameRunning);
- gameRunning = !gameRunning;
+ pauseButtonClick(this.gameRunning);
+ this.gameRunning = !this.gameRunning;
}
});
+
} else {
checkNameLabel.setVisible(false);
checkAcronymLabel.setVisible(false);
@@ -1168,12 +1191,16 @@ public class HappyBirdMain extends Application {
}
private void moveBirdUp() {
- birdPositionMovedBy = birdPositionMovedBy - 10;
+ velocity = (float) -1.5;
+ var pos = velocity += gravity;
+ birdPositionMovedBy += pos;
happyBird.setLayoutY(birdPositionMovedBy);
}
+ // Soll Automatisch runter fallen
private void moveBirdDown() {
- birdPositionMovedBy = birdPositionMovedBy + 10;
+ var pos = velocity -= gravity;
+ birdPositionMovedBy -= pos;
happyBird.setLayoutY(birdPositionMovedBy);
}
}
\ No newline at end of file