From 386186bbeca4ef2dabdf4d73dc08886f04474bc9 Mon Sep 17 00:00:00 2001
From: samuel <samnej@uni-bremen.de>
Date: Sat, 27 Jun 2020 14:39:33 +0200
Subject: [PATCH] Optionen gehen, Back Button
Back Button in Optionen funktioniert
---
core/assets/options/escape_back_on.png | Bin 0 -> 1514 bytes
core/assets/options/pdn/escape_back_on.pdn | Bin 0 -> 10610 bytes
.../InGameButtons/OptionenBackButton.java | 36 ++++++++++++++++++
.../View/Screen/GamePlay.java | 5 +++
.../View/UI/Options/OptionUI.java | 26 +++++++++++--
.../View/UI/Options/PauseMenuUI.java | 14 ++++---
6 files changed, 72 insertions(+), 9 deletions(-)
create mode 100644 core/assets/options/escape_back_on.png
create mode 100644 core/assets/options/pdn/escape_back_on.pdn
create mode 100644 core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/OptionenBackButton.java
diff --git a/core/assets/options/escape_back_on.png b/core/assets/options/escape_back_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ea87315b341ca8fc5e00ec1560d6238ac7e0251
GIT binary patch
literal 1514
zcmeAS@N?(olHy`uVBq!ia0vp^4L~fx!3-o>ud-eTQVPi)LB0$ORjNR_W(J0z|AF*N
z28L1t28LG&3=CE?7#PI!C&eFiV_;xr2=EDU1?rJBG=BE+;mgmDUwwJ<`s-7m$S4>M
zfe{h{5Bb+JGB7YQlmz(&{~y_aA^1Bxu-staEbxddW?<kJ0%68WckBKD1tm*dBT9nv
z(@M${i&7a15;OBk^zu?m6ioCC^o$HYDr8OthN7{ji(`m~_t9w&`3@^^v|N9A@Bc*W
z1I$xGvo_1uo#bjirhF}JpWma+oZp_YDVSf7YPi8<-cTa^oZEB3qvcnsBs3gZJNNKg
zPG+lXWEA9D?9$h@V$Nwct;Q)6=Y(l*-E-7q$<C5XPN!d1o-SqX$Z*}Y@acu{{H2C$
zo|S*5o#eZ)Uf^D*p4R#7mlLAC`j;it@Xl?uRO8k8ZExA~XH9|V&7jGA&vZU6U}O!d
zU1A`0YYpoqwqMg9c(WZ>n7Lnig0sb(25xuv?6$DE8zPSX5%{FZV}0RT>*D6X_7H9T
z2_^~m8QY6wTw~TUN-8y_+*-5H<mo}hD-trAulMoFf05LjY`kFhdws|2uWeaQ7~VLb
z%U|ZuIK?4Ck#E(h$XtbgvcDgN{gC`($@yDf<@frO-}+0f*FSy!la+H%%qww+_n$!d
N&C}J-Wt~$(69B6n#)tp_
literal 0
HcmV?d00001
diff --git a/core/assets/options/pdn/escape_back_on.pdn b/core/assets/options/pdn/escape_back_on.pdn
new file mode 100644
index 0000000000000000000000000000000000000000..ab1baac0c8a1a56cb6f8cb9b97e9dd5e8b199c6f
GIT binary patch
literal 10610
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
literal 0
HcmV?d00001
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/OptionenBackButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/OptionenBackButton.java
new file mode 100644
index 00000000..a56cb099
--- /dev/null
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/OptionenBackButton.java
@@ -0,0 +1,36 @@
+package com.galaxytrucker.galaxytruckerreloaded.View.Buttons.InGameButtons;
+
+import com.badlogic.gdx.audio.Sound;
+import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.galaxytrucker.galaxytruckerreloaded.Main;
+import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
+import com.galaxytrucker.galaxytruckerreloaded.View.UI.Options.OptionUI;
+import com.galaxytrucker.galaxytruckerreloaded.View.UI.Options.PauseMenuUI;
+
+public class OptionenBackButton extends ImButton {
+
+ private Sound clickSound;
+
+ private OptionUI optionUI;
+
+ private PauseMenuUI pauseMenuUI;
+
+ public OptionenBackButton(float x, float y, float width, float height, OptionUI optionUI, PauseMenuUI pauseMenuUI) {
+ super(new Texture("options/escape_back_on.png"), x, y, width, height);
+ this.optionUI = optionUI;
+ this.pauseMenuUI = pauseMenuUI;
+ this.addListener(new ClickListener() {
+ public void clicked(InputEvent event, float x, float y) {
+ leftClick();
+ }
+ });
+ }
+
+ @Override
+ public void leftClick() {
+ optionUI.disposeOptionsUI();
+ pauseMenuUI.showPauseMenuUI();
+ }
+}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/GamePlay.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/GamePlay.java
index 37d9ead8..e75a4ac2 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/GamePlay.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/GamePlay.java
@@ -110,6 +110,11 @@ public class GamePlay implements Screen {
*/
private PauseMenu pauseMenu;
+
+ public PauseMenuUI getPauseMenuUI() {
+ return pauseMenuUI;
+ }
+
private PauseMenuUI pauseMenuUI;
/**
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Options/OptionUI.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Options/OptionUI.java
index 6d49acc4..364bad5b 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Options/OptionUI.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Options/OptionUI.java
@@ -1,11 +1,14 @@
package com.galaxytrucker.galaxytruckerreloaded.View.UI.Options;
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Input;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.scenes.scene2d.Stage;
import com.galaxytrucker.galaxytruckerreloaded.Main;
import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.InGameButtons.ContinueButton;
import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.InGameButtons.MainMenuButton;
import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.InGameButtons.OptionButton;
+import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.InGameButtons.OptionenBackButton;
import com.galaxytrucker.galaxytruckerreloaded.View.Screen.GamePlay;
import com.galaxytrucker.galaxytruckerreloaded.View.Screen.PauseMenu;
@@ -24,10 +27,14 @@ public class OptionUI {
*/
private MainMenuButton mainMenuButton;
+ private OptionenBackButton optionenBackButton;
+
private Main main;
private GamePlay game;
+ private PauseMenuUI pauseMenuUI;
+
private float x, y;
/**
@@ -38,15 +45,15 @@ public class OptionUI {
public OptionUI(Main main, Stage stage, GamePlay game) {
this.main = main;
this.game = game;
-
+ this.pauseMenuUI = game.getPauseMenuUI();
optionsBackgroundTexture = new Texture("options/options.png");
x = main.WIDTH/2 - optionsBackgroundTexture.getWidth()/2;
y = main.HEIGHT/2 - optionsBackgroundTexture.getHeight()/2;
- mainMenuButton = new MainMenuButton(x+220, y+270, 128, 24, main);
+ optionenBackButton = new OptionenBackButton(x+220, y+270, 128, 24, this, pauseMenuUI);
- stage.addActor(mainMenuButton);
+ stage.addActor(optionenBackButton);
}
/**
@@ -54,6 +61,7 @@ public class OptionUI {
* no stage stuff
*/
public void render() {
+ updateInput();
main.batch.begin();
main.batch.draw(optionsBackgroundTexture, x, y, 601, 471);
main.batch.end();
@@ -64,7 +72,7 @@ public class OptionUI {
*/
public void disposeOptionsUI() {
optionsBackgroundTexture.dispose();
- mainMenuButton.remove();
+ optionenBackButton.remove();
game.deleteOptions();
}
@@ -85,4 +93,14 @@ public class OptionUI {
*/
public void hideOptionsUI() {
}
+
+ /**
+ * handles input to pause game, open options
+ */
+ public void updateInput() {
+ if(Gdx.input.isKeyPressed(Input.Keys.ESCAPE)) {
+ disposeOptionsUI();
+ pauseMenuUI.showPauseMenuUI();
+ }
+ }
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Options/PauseMenuUI.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Options/PauseMenuUI.java
index 46a5f828..2ec3a209 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Options/PauseMenuUI.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Options/PauseMenuUI.java
@@ -95,19 +95,23 @@ public class PauseMenuUI {
/**
* Open the options menu
*/
- public void showOptionsUI() {
+ public void showPauseMenuUI() {
+ continueButton.setVisible(true);
+ mainMenuButton.setVisible(true);
+ optionButton.setVisible(true);
}
/**
* Close the options menu
*/
- public void hideOptionsUI() {
- }
-
- public void openOptions () {
+ public void hidePauseMenuUI() {
continueButton.setVisible(false);
mainMenuButton.setVisible(false);
optionButton.setVisible(false);
+ }
+
+ public void openOptions () {
+ this.hidePauseMenuUI();
game.createOptions();
}
}
--
GitLab