From cf397c78dafd5dafd7d2472f8ee64a09d9ef2ed4 Mon Sep 17 00:00:00 2001
From: Aaron <rudkowsk@uni-bremen.de>
Date: Thu, 4 Jun 2020 22:43:49 +0100
Subject: [PATCH] buttons, teilw screens
paused angefangen
shipselector ohne schiffe
anfang anfang gamescreen
---
.../buttons/FTL => core/assets}/FTL_JUMP.png | Bin
.../systemUI => core/assets}/autofire_on.png | Bin
core/assets/continue.png | Bin 0 -> 3335 bytes
.../assets}/continue_on.png | Bin
core/assets/desktop.ini | 7 +
.../assets/ingame_continue.png | Bin
.../game_data/img => core/assets}/pause.png | Bin
.../assets}/sell_buy_on.png | Bin
core/assets/shippick_on.png | Bin 0 -> 2988 bytes
core/assets/startgame.png | Bin 0 -> 3294 bytes
.../assets}/store_close_on.png | Bin
.../statusUI => core/assets}/top_ship_on.png | Bin
core/assets/yes.png | Bin 0 -> 2999 bytes
.../Buttons/InGameButtons/AutofireButton.java | 43 ++----
.../Buttons/InGameButtons/ContinueButton.java | 33 ++---
.../InGameButtons/CrewDismissButton.java | 24 ++--
.../InGameButtons/EventPageButton.java | 34 +++--
.../InGameButtons/InventoryCloseButton.java | 36 ++---
.../Buttons/InGameButtons/MainMenuButton.java | 31 ++---
.../Buttons/InGameButtons/MoveButton.java | 30 ++---
.../Buttons/InGameButtons/ShipButton.java | 27 ++--
.../Buttons/InGameButtons/ShopBuyButton.java | 33 ++---
.../Buttons/InGameButtons/SystemButton.java | 126 +++---------------
.../InGameButtons/WeaponActivateButton.java | 23 +---
.../Buttons/MenuButtons/DifficultyButton.java | 34 ++---
.../View/Buttons/MenuButtons/LoginButton.java | 30 ++---
.../Buttons/MenuButtons/ShipSelectButton.java | 31 ++---
.../MenuButtons/SinglePlayerButton.java | 32 ++---
.../View/Buttons/MenuButtons/StartButton.java | 45 ++-----
.../View/Screen/GamePlay.java | 58 ++++----
.../View/Screen/LoginScreen.java | 63 ++++++---
.../View/Screen/MainMenu.java | 3 +-
.../View/Screen/PauseMenu.java | 36 ++---
.../View/Screen/ShipSelector.java | 21 ++-
.../View/UI/Events/EventGUI.java | 2 +-
35 files changed, 333 insertions(+), 469 deletions(-)
rename {Ressourcen/Rainmeter-skin/resources/game_data/img/buttons/FTL => core/assets}/FTL_JUMP.png (100%)
rename {Ressourcen/Rainmeter-skin/resources/game_data/img/ipad/systemUI => core/assets}/autofire_on.png (100%)
create mode 100644 core/assets/continue.png
rename {Ressourcen/Rainmeter-skin/resources/game_data/img/main_menus => core/assets}/continue_on.png (100%)
create mode 100644 core/assets/desktop.ini
rename Ressourcen/Rainmeter-skin/resources/game_data/img/optionsUI/escape_continue_on.png => core/assets/ingame_continue.png (100%)
rename {Ressourcen/Rainmeter-skin/resources/game_data/img => core/assets}/pause.png (100%)
rename {Ressourcen/Rainmeter-skin/resources/game_data/img/upgradeUI/Equipment/tabButtons => core/assets}/sell_buy_on.png (100%)
create mode 100644 core/assets/shippick_on.png
create mode 100644 core/assets/startgame.png
rename {Ressourcen/Rainmeter-skin/resources/game_data/img/storeUI => core/assets}/store_close_on.png (100%)
rename {Ressourcen/Rainmeter-skin/resources/game_data/img/statusUI => core/assets}/top_ship_on.png (100%)
create mode 100644 core/assets/yes.png
diff --git a/Ressourcen/Rainmeter-skin/resources/game_data/img/buttons/FTL/FTL_JUMP.png b/core/assets/FTL_JUMP.png
similarity index 100%
rename from Ressourcen/Rainmeter-skin/resources/game_data/img/buttons/FTL/FTL_JUMP.png
rename to core/assets/FTL_JUMP.png
diff --git a/Ressourcen/Rainmeter-skin/resources/game_data/img/ipad/systemUI/autofire_on.png b/core/assets/autofire_on.png
similarity index 100%
rename from Ressourcen/Rainmeter-skin/resources/game_data/img/ipad/systemUI/autofire_on.png
rename to core/assets/autofire_on.png
diff --git a/core/assets/continue.png b/core/assets/continue.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd3c275ecab1abfcb7098cb91d92e7ed4d5a2fbb
GIT binary patch
literal 3335
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
RZB+mO002ovPDHLkV1mamBSQcH
literal 0
HcmV?d00001
diff --git a/Ressourcen/Rainmeter-skin/resources/game_data/img/main_menus/continue_on.png b/core/assets/continue_on.png
similarity index 100%
rename from Ressourcen/Rainmeter-skin/resources/game_data/img/main_menus/continue_on.png
rename to core/assets/continue_on.png
diff --git a/core/assets/desktop.ini b/core/assets/desktop.ini
new file mode 100644
index 00000000..227ca5f2
--- /dev/null
+++ b/core/assets/desktop.ini
@@ -0,0 +1,7 @@
+[LocalizedFileNames]
+autofire_on.png=@autofire_on,0
+store_close_on.png=@store_close_on,0
+top_ship_on.png=@top_ship_on,0
+sell_buy_on.png=@sell_buy_on,0
+continue_on.png=@continue_on,0
+pause.png=@pause,0
diff --git a/Ressourcen/Rainmeter-skin/resources/game_data/img/optionsUI/escape_continue_on.png b/core/assets/ingame_continue.png
similarity index 100%
rename from Ressourcen/Rainmeter-skin/resources/game_data/img/optionsUI/escape_continue_on.png
rename to core/assets/ingame_continue.png
diff --git a/Ressourcen/Rainmeter-skin/resources/game_data/img/pause.png b/core/assets/pause.png
similarity index 100%
rename from Ressourcen/Rainmeter-skin/resources/game_data/img/pause.png
rename to core/assets/pause.png
diff --git a/Ressourcen/Rainmeter-skin/resources/game_data/img/upgradeUI/Equipment/tabButtons/sell_buy_on.png b/core/assets/sell_buy_on.png
similarity index 100%
rename from Ressourcen/Rainmeter-skin/resources/game_data/img/upgradeUI/Equipment/tabButtons/sell_buy_on.png
rename to core/assets/sell_buy_on.png
diff --git a/core/assets/shippick_on.png b/core/assets/shippick_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9eb655ad403cc6722cc5837d34cb1c61321f333
GIT binary patch
literal 2988
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
literal 0
HcmV?d00001
diff --git a/core/assets/startgame.png b/core/assets/startgame.png
new file mode 100644
index 0000000000000000000000000000000000000000..041c7f0dd1f9044c668468c1049fae1fbb69fe61
GIT binary patch
literal 3294
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
literal 0
HcmV?d00001
diff --git a/Ressourcen/Rainmeter-skin/resources/game_data/img/storeUI/store_close_on.png b/core/assets/store_close_on.png
similarity index 100%
rename from Ressourcen/Rainmeter-skin/resources/game_data/img/storeUI/store_close_on.png
rename to core/assets/store_close_on.png
diff --git a/Ressourcen/Rainmeter-skin/resources/game_data/img/statusUI/top_ship_on.png b/core/assets/top_ship_on.png
similarity index 100%
rename from Ressourcen/Rainmeter-skin/resources/game_data/img/statusUI/top_ship_on.png
rename to core/assets/top_ship_on.png
diff --git a/core/assets/yes.png b/core/assets/yes.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6f8d7b869b6cc21219c28d595d195e9a392f1fd
GIT binary patch
literal 2999
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
literal 0
HcmV?d00001
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/AutofireButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/AutofireButton.java
index 9fed8d88..040f2185 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/AutofireButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/AutofireButton.java
@@ -6,35 +6,24 @@ import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import com.galaxytrucker.galaxytruckerreloaded.Main;
import com.galaxytrucker.galaxytruckerreloaded.Model.Weapons.Weapon;
import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.Button;
+import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
import com.galaxytrucker.galaxytruckerreloaded.View.UI.Ship.ShipView;
/**
* Button to activate Autofire-Function during fights
*/
-public class AutofireButton extends Button
+public class AutofireButton extends ImButton
{
- /**
- * Sprite batch
- */
- private SpriteBatch batch;
- /**
- * Orthographic camera
- */
- private OrthographicCamera camera;
- /**
- * Background
- */
- private Texture background;
/**
* Click sound effect
*/
private Sound clickSound;
- boolean down = false;
-
/**
* the ui this button is on
*/
@@ -43,27 +32,21 @@ public class AutofireButton extends Button
/**
* Constructor
*
- * @param main - main class
* @param ui the ui this button is on
*/
- public AutofireButton(Main main, ShipView ui) {
-
-// /**
-// * Send data to server
-// */
-// private void sendData(Packet data) {
-// }
-//
-// /**
-// * Receive data from server
-// */
-// private Packet receiveData() {
-// return null;
+ public AutofireButton(float x, float y, float width, float height, ShipView ui) {
+ super(new Texture("autofire_on.png"), x, y, width, height);
+ this.ui = ui;
+ this.addListener(new ClickListener() {
+ public void clicked(InputEvent event, float x, float y) {
+ leftClick();
+ }
+ });
}
public void leftClick()
{
- down = !down;
+ ui.autofire();
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/ContinueButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/ContinueButton.java
index 9cd99f2b..925711fc 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/ContinueButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/ContinueButton.java
@@ -4,34 +4,24 @@ import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import com.galaxytrucker.galaxytruckerreloaded.Main;
import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.Button;
+import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
import com.galaxytrucker.galaxytruckerreloaded.View.UI.Options.OptionsUI;
/**
* continue button for ingame options
*/
-public class ContinueButton extends Button {
+public class ContinueButton extends ImButton {
- /**
- * Sprite batch
- */
- private SpriteBatch batch;
- /**
- * Orthographic camera
- */
- private OrthographicCamera camera;
- /**
- * Background
- */
- private Texture background;
/**
* Click sound effect
*/
private Sound clickSound;
- boolean down = false;
-
/**
* the options ui this button is on
*/
@@ -40,17 +30,20 @@ public class ContinueButton extends Button {
/**
* Left-Click action of the Button.
*/
- @Override
public void leftClick() {
-
}
/**
* constructor
- * @param main the main class
* @param ui the ui this is on
*/
- public ContinueButton(Main main, OptionsUI ui) {
-
+ public ContinueButton(float x, float y, float width, float height, OptionsUI ui) {
+ super(new Texture("ingame_continue.png"), x, y, width, height);
+ this.ui = ui;
+ this.addListener(new ClickListener() {
+ public void clicked(InputEvent event, float x, float y) {
+ leftClick();
+ }
+ });
}
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/CrewDismissButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/CrewDismissButton.java
index a139d6e0..bc4e95cc 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/CrewDismissButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/CrewDismissButton.java
@@ -4,24 +4,18 @@ import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import com.galaxytrucker.galaxytruckerreloaded.Main;
import com.galaxytrucker.galaxytruckerreloaded.Model.Crew.Crew;
import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.Button;
+import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
/**
* Button for dismissing a Crew Member
*/
-public class CrewDismissButton extends Button
+public class CrewDismissButton extends ImButton
{
-
- /**
- * Sprite batch
- */
- private SpriteBatch batch;
- /**
- * Orthographic camera
- */
- private OrthographicCamera camera;
/**
* Background
*/
@@ -36,10 +30,16 @@ public class CrewDismissButton extends Button
/**
* Constructor
*
- * @param main - main class
* @param crew the crew member
*/
- public CrewDismissButton(Main main, int crew) {
+ public CrewDismissButton(Texture texture, float x, float y, float width, float height, int crew) {
+ super(texture, x, y, width, height);
+ this.crewID = crew;
+ this.addListener(new ClickListener() {
+ public void clicked(InputEvent event, float x, float y) {
+ leftClick();
+ }
+ });
}
public void leftClick()
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/EventPageButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/EventPageButton.java
index 26b091b1..d80e0379 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/EventPageButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/EventPageButton.java
@@ -4,31 +4,20 @@ import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+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.Button;
+import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
import com.galaxytrucker.galaxytruckerreloaded.View.UI.Events.EventGUI;
-public class EventPageButton extends Button {
+public class EventPageButton extends ImButton {
- /**
- * Sprite batch
- */
- private SpriteBatch batch;
- /**
- * Orthographic camera
- */
- private OrthographicCamera camera;
- /**
- * Background
- */
- private Texture background;
/**
* Click sound effect
*/
private Sound clickSound;
- boolean down = false;
-
/**
* the ui the button is on
*/
@@ -37,16 +26,23 @@ public class EventPageButton extends Button {
/**
* what happens when there is a left click on the button
*/
- public void leftClick() {down=!down;}
+ public void leftClick() {
+ eventgui.nextPage();
+ }
/**
* constructor
*
- * @param main the main class
- *
* @param eventgui the ui the button is on
*/
- public EventPageButton(Main main, EventGUI eventgui) {
+ public EventPageButton(float x, float y, float width, float height, EventGUI eventgui) {
+ super(new Texture("continue_on.png"), x, y, width, height);
+ this.eventgui = eventgui;
+ this.addListener(new ClickListener() {
+ public void clicked(InputEvent event, float x, float y) {
+ leftClick();
+ }
+ });
}
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/InventoryCloseButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/InventoryCloseButton.java
index 060093f9..5b05dd5e 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/InventoryCloseButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/InventoryCloseButton.java
@@ -4,35 +4,24 @@ import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+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.Button;
+import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
import com.galaxytrucker.galaxytruckerreloaded.View.UI.Events.ShopUI;
import com.galaxytrucker.galaxytruckerreloaded.View.UI.Inventory.InventoryUI;
/**
* used to close the inventory
*/
-public class InventoryCloseButton extends Button {
+public class InventoryCloseButton extends ImButton {
- /**
- * Sprite batch
- */
- private SpriteBatch batch;
- /**
- * Orthographic camera
- */
- private OrthographicCamera camera;
- /**
- * Background
- */
- private Texture background;
/**
* Click sound effect
*/
private Sound clickSound;
- boolean down = false;
-
/**
* shop ui, if button on shop
* otherwise null
@@ -50,16 +39,27 @@ public class InventoryCloseButton extends Button {
*/
@Override
public void leftClick() {
+ if(shop != null) {
+ }
+ else if(inventory != null) {
+
+ }
}
/**
* constructor
- * @param main the main class
* @param ui the shop ui this is on, or null
* @param inventory the inventory ui this is on, or null
*/
- public InventoryCloseButton(Main main, ShopUI ui, InventoryUI inventory) {
-
+ public InventoryCloseButton(float x, float y, float width, float height, ShopUI ui, InventoryUI inventory) {
+ super(new Texture("close_on.png"), x, y, width, height);
+ shop = ui;
+ this.inventory = inventory;
+ this.addListener(new ClickListener() {
+ public void clicked(InputEvent event, float x, float y) {
+ leftClick();
+ }
+ });
}
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/MainMenuButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/MainMenuButton.java
index 862c0eec..7114d6f9 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/MainMenuButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/MainMenuButton.java
@@ -4,35 +4,22 @@ import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+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.Button;
+import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
import com.galaxytrucker.galaxytruckerreloaded.View.UI.Events.GameOver;
/***
* button used to return to the main menu
*/
-public class MainMenuButton extends Button {
-
- /**
- * Sprite batch
- */
- private SpriteBatch batch;
- /**
- * Orthographic camera
- */
- private OrthographicCamera camera;
- /**
- * Background
- */
- private Texture background;
+public class MainMenuButton extends ImButton {
/**
* Click sound effect
*/
private Sound clickSound;
- boolean down = false;
-
-
/**
* Left-Click action of the Button. opens the main menu screen
*/
@@ -43,9 +30,13 @@ public class MainMenuButton extends Button {
/**
* constructor
- * @param main the main class
*/
- public MainMenuButton(Main main) {
-
+ public MainMenuButton(float x, float y, float width, float height) {
+ super(new Texture("sd"), x, y, width, height);
+ this.addListener(new ClickListener() {
+ public void clicked(InputEvent event, float x, float y) {
+ leftClick();
+ }
+ });
}
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/MoveButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/MoveButton.java
index 3b62e99e..6ced27fb 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/MoveButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/MoveButton.java
@@ -4,34 +4,23 @@ import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+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.Button;
+import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
import com.galaxytrucker.galaxytruckerreloaded.View.UI.Ship.ShipView;
/**
* button used to move the ship. upper middle corner, opens the map
*/
-public class MoveButton extends Button {
+public class MoveButton extends ImButton {
- /**
- * Sprite batch
- */
- private SpriteBatch batch;
- /**
- * Orthographic camera
- */
- private OrthographicCamera camera;
- /**
- * Background
- */
- private Texture background;
/**
* Click sound effect
*/
private Sound clickSound;
- boolean down = false;
-
/**
* the ui this button is on
*/
@@ -47,10 +36,15 @@ public class MoveButton extends Button {
/**
* constructor
- * @param main the main class
* @param ui the ui this button is on
*/
- public MoveButton(Main main, ShipView ui) {
-
+ public MoveButton(float x, float y, float width, float height, ShipView ui) {
+ super(new Texture("FTL_JUMP.png"), x, y, width, height);
+ this.ui = ui;
+ this.addListener(new ClickListener() {
+ public void clicked(InputEvent event, float x, float y) {
+ leftClick();
+ }
+ });
}
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/ShipButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/ShipButton.java
index eb6cc83e..6f0eeaa5 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/ShipButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/ShipButton.java
@@ -4,28 +4,19 @@ import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import com.galaxytrucker.galaxytruckerreloaded.Main;
import com.galaxytrucker.galaxytruckerreloaded.Model.Ship;
import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.Button;
+import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
import com.galaxytrucker.galaxytruckerreloaded.View.UI.Ship.ShipView;
/**
* Button for opening the Ship-Interface
* */
-public class ShipButton extends Button
+public class ShipButton extends ImButton
{
- /**
- * Sprite batch
- */
- private SpriteBatch batch;
- /**
- * Orthographic camera
- */
- private OrthographicCamera camera;
- /**
- * Background
- */
- private Texture background;
/**
* Click sound effect
*/
@@ -39,10 +30,16 @@ public class ShipButton extends Button
/**
* Constructor
*
- * @param main - main class
* @param ui the ui this button is on
*/
- public ShipButton(Main main, ShipView ui) {
+ public ShipButton(float x, float y, float width, float height, ShipView ui) {
+ super(new Texture("top_ship_on.png"), x, y, width, height);
+ this.ui = ui;
+ this.addListener(new ClickListener() {
+ public void clicked(InputEvent event, float x, float y) {
+ leftClick();
+ }
+ });
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/ShopBuyButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/ShopBuyButton.java
index 93f732b3..e0fed47c 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/ShopBuyButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/ShopBuyButton.java
@@ -4,34 +4,23 @@ import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+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.Button;
+import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
import com.galaxytrucker.galaxytruckerreloaded.View.UI.Events.ShopUI;
/**
* button used to buy something in the shop
*/
-public class ShopBuyButton extends Button {
+public class ShopBuyButton extends ImButton {
- /**
- * Sprite batch
- */
- private SpriteBatch batch;
- /**
- * Orthographic camera
- */
- private OrthographicCamera camera;
- /**
- * Background
- */
- private Texture background;
/**
* Click sound effect
*/
private Sound clickSound;
- boolean down = false;
-
/**
* the item this button belongs to
* index of list in shopui
@@ -46,16 +35,22 @@ public class ShopBuyButton extends Button {
/**
* Constructor
*
- * @param main - main class
* @param item the item
* @param ui the ui this button is on
*/
- public ShopBuyButton(Main main, int item, ShopUI ui) {
-
+ public ShopBuyButton(float x, float y, float width, float height, int item, ShopUI ui) {
+ super(new Texture("sell_buy_on.png"), x, y, width, height);
+ this.item = item;
+ shop = ui;
+ this.addListener(new ClickListener() {
+ public void clicked(InputEvent event, float x, float y) {
+ leftClick();
+ }
+ });
}
public void leftClick()
{
- down = !down;
+ shop.buy(item);
}
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/SystemButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/SystemButton.java
index 51029a3b..5632b25b 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/SystemButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/SystemButton.java
@@ -1,41 +1,28 @@
package com.galaxytrucker.galaxytruckerreloaded.View.Buttons.InGameButtons;
import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Input;
import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+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.Button;
+import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
import com.galaxytrucker.galaxytruckerreloaded.View.UI.ShipInformation.SubsystemUI;
/**
* Button for regulation of (Sub)-System energie supplyment
*/
-public class SystemButton extends Button
+public class SystemButton extends ImButton
{
- /**
- * Sprite batch
- */
- private SpriteBatch batch;
- /**
- * Orthographic camera
- */
- private OrthographicCamera camera;
- /**
- * Background
- */
- private Texture background;
/**
* Click sound effect
*/
private Sound clickSound;
- private Texture image_off;
- private Texture image_hover_off;
-
- Texture glow;
-
/**
* the ui this button belongs to
*/
@@ -44,21 +31,21 @@ public class SystemButton extends Button
/**
* Constructor
*
- * @param main - main class
* @param ui the ui this button belongs to
*/
- public SystemButton(Main main, SubsystemUI ui) {
- }
-
- public void setGlowTexture(Texture glow)
- {
- this.glow = glow;
- }
-
- public void setOffTextures(Texture image_off, Texture image_hover_off)
- {
- this.image_off = image_off;
- this.image_hover_off = image_hover_off;
+ public SystemButton(Texture texture, float x, float y, float width, float height, SubsystemUI ui) {
+ super(texture, x, y, width, height);
+ this.ui = ui;
+ this.addListener(new ClickListener() {
+ public void clicked(InputEvent event, float x, float y) {
+ if(event.getButton() == Input.Buttons.RIGHT) {
+ rightClick();
+ }
+ else if(event.getButton() == Input.Buttons.LEFT) {
+ leftClick();
+ }
+ }
+ });
}
@@ -67,82 +54,13 @@ public class SystemButton extends Button
*/
public void rightClick()
{
-// int power = -1;
-// if(system instanceof ShieldSystem)
-// power = -2;
-//
-// if(system instanceof WeaponSystem)
-// {
-// WeaponSystem weaponSystem = (WeaponSystem)system;
-// for(int i = 3; i >= 0; i--)
-// {
-// if(weaponSystem.getWeapon(i) != null && weaponSystem.getWeapon(i).isPowered())
-// {
-// int prevPower = system.getPower();
-// weaponSystem.powerDownWeapon(i);
-// if(prevPower != system.getPower())
-// {
-// Sounds.playSound("buttonOff");
-// }
-// break;
-// }
-// }
-// }
-// else
-// {
-// int prevPower = system.getPower();
-// system.addPower(power);
-// if(prevPower != system.getPower())
-// {
-// Sounds.playSound("buttonOff");
-// }
-// }
+
}
/**
* increases the Energie provided for a System
*/
- @Override
- public void leftClick(){
-// {
-// int power = 1;
-// if(system instanceof ShieldSystem)
-// power = 2;
-//
-// if(system instanceof WeaponSystem)
-// {
-// WeaponSystem weaponSystem = (WeaponSystem)system;
-// for(int i = 0; i < 4; i++)
-// {
-// if(!weaponSystem.getWeapon(i).isPowered())
-// {
-// int prevPower = system.getPower();
-// weaponSystem.powerOnWeapon(i);
-// if(prevPower != system.getPower())
-// {
-// Sounds.playSound("buttonOn");
-// }
-// else
-// {
-// Sounds.playSound("buttonFail");
-// }
-// break;
-// }
-// }
-// }
-// else
-// {
-// int prevPower = system.getPower();
-// system.addPower(power);
-// if(prevPower != system.getPower())
-// {
-// Sounds.playSound("buttonOn");
-// }
-// else
-// {
-// Sounds.playSound("buttonFail");
-// }
-// }
-// }
-}
+ public void leftClick() {
+
+ }
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/WeaponActivateButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/WeaponActivateButton.java
index 40ea4db5..4ca9745b 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/WeaponActivateButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/WeaponActivateButton.java
@@ -6,6 +6,7 @@ import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.galaxytrucker.galaxytruckerreloaded.Main;
import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.Button;
+import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
import com.galaxytrucker.galaxytruckerreloaded.View.UI.ShipInformation.WeaponUI;
import java.io.BufferedWriter;
@@ -13,27 +14,13 @@ import java.io.BufferedWriter;
/**
* button used to activate/deactivate weapon
*/
-public class WeaponActivateButton extends Button {
+public class WeaponActivateButton extends ImButton {
- /**
- * Sprite batch
- */
- private SpriteBatch batch;
- /**
- * Orthographic camera
- */
- private OrthographicCamera camera;
- /**
- * Background
- */
- private Texture background;
/**
* Click sound effect
*/
private Sound clickSound;
- boolean down = false;
-
/**
* the ui this button belongs to
*/
@@ -49,10 +36,10 @@ public class WeaponActivateButton extends Button {
/**
* constructor
- * @param main the main class
* @param ui the ui this button belongs to
*/
- public WeaponActivateButton(Main main, WeaponUI ui) {
-
+ public WeaponActivateButton(Texture texture, float x, float y, float width, float height, WeaponUI ui) {
+ super(texture, x, y, width, height);
+ this.ui = ui;
}
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/DifficultyButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/DifficultyButton.java
index c1d9672a..b40733ba 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/DifficultyButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/DifficultyButton.java
@@ -4,32 +4,26 @@ import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+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.Button;
+import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
import com.galaxytrucker.galaxytruckerreloaded.View.Screen.ShipSelector;
/**
* Button for setting the degree of diffiulty
*/
-public class DifficultyButton extends Button
+public class DifficultyButton extends ImButton
{
- /**
- * Sprite batch
- */
- private SpriteBatch batch;
- /**
- * Orthographic camera
- */
- private OrthographicCamera camera;
- /**
- * Background
- */
- private Texture background;
/**
* Click sound effect
*/
private Sound clickSound;
+ /**
+ * the difficulty
+ */
private int difficulty;
/**
@@ -40,11 +34,17 @@ public class DifficultyButton extends Button
/**
* Constructor
*
- * @param main - main class
- * @param difficulty the difficulty this button represents
* @param screen the screen this button is on
*/
- public DifficultyButton(Main main, int difficulty, ShipSelector screen) {
+ public DifficultyButton(float x, float y, float width, float height, ShipSelector screen, int difficulty) {
+ super(new Texture("yes.png"), x, y, width, height);
+ this.screen = screen;
+ this.difficulty = difficulty;
+ this.addListener(new ClickListener() {
+ public void clicked(InputEvent event, float x, float y) {
+ leftClick();
+ }
+ });
}
/**
@@ -53,7 +53,7 @@ public class DifficultyButton extends Button
@Override
public void leftClick()
{
- // setDifficulty(difficulty);
+ screen.setDifficulty(difficulty);
}
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/LoginButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/LoginButton.java
index b577b59b..0679459c 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/LoginButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/LoginButton.java
@@ -4,27 +4,18 @@ import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+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.Button;
+import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
import com.galaxytrucker.galaxytruckerreloaded.View.Screen.LoginScreen;
/**
* the login button for the login screen
*/
-public class LoginButton extends Button {
+public class LoginButton extends ImButton {
- /**
- * Sprite batch
- */
- private SpriteBatch batch;
- /**
- * Orthographic camera
- */
- private OrthographicCamera camera;
- /**
- * Background
- */
- private Texture background;
/**
* Click sound effect
*/
@@ -41,15 +32,20 @@ public class LoginButton extends Button {
*/
@Override
public void leftClick() {
-
+ screen.login();
}
/**
* the constructor
- * @param main the main class
* @param screen the login screen this button belongs to
*/
- public LoginButton(Main main, LoginScreen screen) {
-
+ public LoginButton(float x, float y, float width, float height, LoginScreen screen) {
+ super(new Texture("yes.png"), x, y, width, height);
+ this.screen = screen;
+ this.addListener(new ClickListener() {
+ public void clicked(InputEvent event, float x, float y) {
+ leftClick();
+ }
+ });
}
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/ShipSelectButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/ShipSelectButton.java
index 8f8916bd..f1306744 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/ShipSelectButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/ShipSelectButton.java
@@ -4,27 +4,18 @@ import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+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.Button;
+import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
import com.galaxytrucker.galaxytruckerreloaded.View.Screen.ShipSelector;
/**
* the button representing one ship in the ship selector
*/
-public class ShipSelectButton extends Button {
+public class ShipSelectButton extends ImButton {
- /**
- * Sprite batch
- */
- private SpriteBatch batch;
- /**
- * Orthographic camera
- */
- private OrthographicCamera camera;
- /**
- * Background
- */
- private Texture background;
/**
* Click sound effect
*/
@@ -45,16 +36,22 @@ public class ShipSelectButton extends Button {
*/
@Override
public void leftClick() {
-
+ screen.setShip(ship);
}
/**
* constructor
- * @param main the main class
* @param ship the ship, (index of ship in list in shipselector)
* @param screen the screen this button is on
*/
- public ShipSelectButton(Main main, int ship, ShipSelector screen) {
-
+ public ShipSelectButton(float x, float y, float width, float height, int ship, ShipSelector screen) {
+ super(new Texture("yes.png"), x, y, width, height);
+ this.screen = screen;
+ this.ship = ship;
+ this.addListener(new ClickListener() {
+ public void clicked(InputEvent event, float x, float y) {
+ leftClick();
+ }
+ });
}
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/SinglePlayerButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/SinglePlayerButton.java
index 07408046..a7b06f37 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/SinglePlayerButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/SinglePlayerButton.java
@@ -4,27 +4,17 @@ import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+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.Button;
+import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
import com.galaxytrucker.galaxytruckerreloaded.View.Screen.ShipSelector;
/**
* button to choose single player in the ship selector
*/
-public class SinglePlayerButton extends Button {
-
- /**
- * Sprite batch
- */
- private SpriteBatch batch;
- /**
- * Orthographic camera
- */
- private OrthographicCamera camera;
- /**
- * Background
- */
- private Texture background;
+public class SinglePlayerButton extends ImButton {
/**
* Click sound effect
*/
@@ -45,16 +35,22 @@ public class SinglePlayerButton extends Button {
*/
@Override
public void leftClick() {
-
+ singlePlayer = !singlePlayer;
+ screen.setSinglePlayer(singlePlayer);
}
/**
* constructor
*
* @param screen the screen this button is on
- * @param main the main class
*/
- public SinglePlayerButton(Main main, ShipSelector screen) {
-
+ public SinglePlayerButton(float x, float y, float width, float height, ShipSelector screen) {
+ super(new Texture("yes.png"), x, y, width, height);
+ this.screen = screen;
+ this.addListener(new ClickListener() {
+ public void clicked(InputEvent event, float x, float y) {
+ leftClick();
+ }
+ });
}
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/StartButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/StartButton.java
index eb9e3328..a20dbb8a 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/StartButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/MenuButtons/StartButton.java
@@ -1,30 +1,22 @@
package com.galaxytrucker.galaxytruckerreloaded.View.Buttons.MenuButtons;
+import com.badlogic.gdx.Screen;
import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+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.Button;
+import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
import com.galaxytrucker.galaxytruckerreloaded.View.Screen.MainMenu;
/**
* Starts a new Game
*/
-public class StartButton extends Button
+public class StartButton extends ImButton
{
- /**
- * Sprite batch
- */
- private SpriteBatch batch;
- /**
- * Orthographic camera
- */
- private OrthographicCamera camera;
- /**
- * Background
- */
- private Texture background;
/**
* Click sound effect
*/
@@ -35,35 +27,26 @@ public class StartButton extends Button
*/
private MainMenu screen;
-
/**
* Constructor
*
- * @param main - main class
* @param screen the screen this button is on
*/
- public StartButton(Main main, MainMenu screen) {
+ public StartButton(float x, float y, float width, float height, MainMenu screen) {
+ super(new Texture("continue.png"), x, y, width, height);
+ this.screen = screen;
+ this.addListener(new ClickListener() {
+ public void clicked(InputEvent event, float x, float y) {
+ leftClick();
+ }
+ });
}
-// /**
-// * Send data to server
-// */
-// private void sendData(Packet data) {
-// }
-//
-// /**
-// * Receive data from server
-// */
-// private Packet receiveData() {
-// return null;
-// }
-
/**
* Creates s a new Instance of PLayer an an new Ship
*/
public void leftClick()
{
- // FTLGame.instance().setPlayer(hanger.getShip());
- // FTLView.instance().setScreen(new SpaceScreen());
+ screen.resumeGame();
}
}
\ No newline at end of file
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/GamePlay.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/GamePlay.java
index 2b6bc820..77149d5e 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/GamePlay.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/GamePlay.java
@@ -1,8 +1,10 @@
package com.galaxytrucker.galaxytruckerreloaded.View.Screen;
+import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Screen;
import com.badlogic.gdx.audio.Music;
import com.badlogic.gdx.audio.Sound;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
@@ -17,16 +19,6 @@ import com.galaxytrucker.galaxytruckerreloaded.View.UI.Ship.ShipView;
*/
public class GamePlay implements Screen {
- /**
- * SpriteBatch
- */
- private SpriteBatch batch;
-
- /**
- * Orthographic camera
- */
- private OrthographicCamera camera;
-
/**
* Background texture
*/
@@ -43,9 +35,9 @@ public class GamePlay implements Screen {
private Sound clickSound;
/**
- * MultiPlayer active
+ * single Player active
*/
- private boolean multiPlayer;
+ private boolean singlePlayer;
/**
* Current map
@@ -57,6 +49,20 @@ public class GamePlay implements Screen {
*/
private ShipView player;
+ private Main main;
+
+ /**
+ * Constructor
+ *
+ * @param main - main class
+ */
+ public GamePlay(Main main) {
+ this.main = main;
+ background = new Texture("1080p.png");
+
+ player = new ShipView(main, null); //TODO wie schiff aus controller?
+ }
+
@Override
public void show() {
@@ -65,7 +71,11 @@ public class GamePlay implements Screen {
@Override
public void render(float delta) {
-
+ Gdx.gl.glClearColor(1, 1, 1, 1);
+ Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+ main.batch.begin();
+ main.batch.draw(background, 0, 0, main.WIDTH, main.HEIGHT);
+ main.batch.end();
}
@Override
@@ -90,7 +100,7 @@ public class GamePlay implements Screen {
@Override
public void dispose() {
-
+ background.dispose();
}
/**
@@ -102,24 +112,4 @@ public class GamePlay implements Screen {
this.background = background;
}
- /**
- * Constructor
- *
- * @param main - main class
- */
- public GamePlay(Main main) {
- }
-
-// /**
-// * Send data to server
-// */
-// private void sendData(Packet data) {
-// }
-//
-// /**
-// * Receive data from server
-// */
-// private Packet receiveData() {
-// return null;
-// }
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/LoginScreen.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/LoginScreen.java
index 1c5fac76..32f9c585 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/LoginScreen.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/LoginScreen.java
@@ -1,12 +1,17 @@
package com.galaxytrucker.galaxytruckerreloaded.View.Screen;
+import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Screen;
+import com.badlogic.gdx.assets.loaders.AssetLoader;
import com.badlogic.gdx.audio.Music;
import com.badlogic.gdx.audio.Sound;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.scenes.scene2d.Stage;
import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
import com.badlogic.gdx.scenes.scene2d.ui.TextField;
import com.galaxytrucker.galaxytruckerreloaded.Main;
import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.MenuButtons.LoginButton;
@@ -16,16 +21,6 @@ import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.MenuButtons.LoginBut
*/
public class LoginScreen implements Screen {
- /**
- * SpriteBatch
- */
- private SpriteBatch batch;
-
- /**
- * Orthographic camera
- */
- private OrthographicCamera camera;
-
/**
* Background image
*/
@@ -51,6 +46,33 @@ public class LoginScreen implements Screen {
*/
private Sound clickSound;
+ /**
+ * the main game class
+ */
+ private Main main;
+
+ /**
+ * the stage
+ */
+ private Stage stage;
+
+ /**
+ * Constructor
+ *
+ * @param main - main class
+ */
+ public LoginScreen(Main main) {
+ this.main = main;
+ background = new Texture("1080p.png");
+ loginButton = new LoginButton(main.WIDTH/2, main.HEIGHT/2, 248, 50, this);
+ username = new TextField("", new Skin());
+
+ stage = new Stage();
+ stage.addActor(loginButton);
+
+ Gdx.input.setInputProcessor(stage);
+ }
+
@Override
public void show() {
@@ -58,7 +80,12 @@ public class LoginScreen implements Screen {
@Override
public void render(float delta) {
-
+ Gdx.gl.glClearColor(1, 1, 1, 1);
+ Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+ main.batch.begin();
+ main.batch.draw(background, 0, 0, main.WIDTH, main.HEIGHT);
+ main.batch.end();
+ stage.draw();
}
@Override
@@ -83,21 +110,15 @@ public class LoginScreen implements Screen {
@Override
public void dispose() {
-
+ background.dispose();
+ stage.dispose();
}
/**
* login method, called by the button
*/
public void login() {
-
- }
-
- /**
- * Constructor
- *
- * @param main - main class
- */
- public LoginScreen(Main main) {
+ String name = username.getText();
+ //TODO welcher controller??
}
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/MainMenu.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/MainMenu.java
index 9a3bd104..79c531e0 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/MainMenu.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/MainMenu.java
@@ -28,7 +28,7 @@ public class MainMenu implements Screen {
this.main = main;
background = new Texture("1080p.png");
newGame = new NewGameButton(main.WIDTH/2, main.HEIGHT/2, 248, 50, this);
- quit = new QuitButton(main.WIDTH/2, main.HEIGHT/2-100, 248, 50, this);
+ quit = new QuitButton(main.WIDTH/2, main.HEIGHT/2 - 100, 248, 50, this);
stage = new Stage();
stage.addActor(quit);
@@ -107,7 +107,6 @@ public class MainMenu implements Screen {
* called by button
*/
public void newGame() {
- System.out.println("here");
main.setScreen(new ShipSelector(main));
dispose();
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/PauseMenu.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/PauseMenu.java
index 52900862..feb5615c 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/PauseMenu.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/PauseMenu.java
@@ -1,6 +1,8 @@
package com.galaxytrucker.galaxytruckerreloaded.View.Screen;
+import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Screen;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
@@ -12,19 +14,22 @@ import com.galaxytrucker.galaxytruckerreloaded.Main;
public class PauseMenu implements Screen {
/**
- * Sptire batch
+ * Game paused texture
*/
- private SpriteBatch batch;
+ private Texture pausedTexture;
- /**
- * Orthographic camera
- */
- private OrthographicCamera camera;
+ private Main main;
/**
- * Game paused texture
- */
- private Texture pausedTexture;
+ * Constructor
+ *
+ * @param main - main class
+ *
+ * */
+ public PauseMenu(Main main) {
+ this.main = main;
+ pausedTexture = new Texture("pause.png");
+ }
@Override
public void show() {
@@ -33,7 +38,11 @@ public class PauseMenu implements Screen {
@Override
public void render(float delta) {
-
+ Gdx.gl.glClearColor(1, 1, 1, 1);
+ Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+ main.batch.begin();
+ main.batch.draw(pausedTexture, 0, 0, main.WIDTH, main.HEIGHT);
+ main.batch.end();
}
@Override
@@ -58,11 +67,6 @@ public class PauseMenu implements Screen {
@Override
public void dispose() {
-
- }
-
- /** Constructor
- * @param main - main class */
- public PauseMenu(Main main) {
+ pausedTexture.dispose();
}
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/ShipSelector.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/ShipSelector.java
index fad4dda2..ba8df00f 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/ShipSelector.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/ShipSelector.java
@@ -9,11 +9,15 @@ import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.scenes.scene2d.Stage;
-import com.badlogic.gdx.scenes.scene2d.ui.List;
+import com.galaxytrucker.galaxytruckerreloaded.Controller.HangerController;
import com.galaxytrucker.galaxytruckerreloaded.Main;
import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.MenuButtons.DifficultyButton;
import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.MenuButtons.ShipSelectButton;
import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.MenuButtons.SinglePlayerButton;
+import jdk.internal.org.jline.utils.DiffHelper;
+
+import java.util.LinkedList;
+import java.util.List;
/**
* Ship selector screen when creating new game
@@ -49,15 +53,28 @@ public class ShipSelector implements Screen {
*/
private SinglePlayerButton singlePlayerButton;
+ private HangerController controller;
+
/** Constructor TODO wie werden die schiffe dargestellt
* @param main - main class */
public ShipSelector(Main main){
this.main = main;
+ controller = new HangerController();
+ //TODO methode um mögliche schiffe zu bekommen, dann für jeden eine Textur in liste + einen button
background = new Texture("1080p.png");
stage = new Stage();
+ singlePlayerButton = new SinglePlayerButton(main.WIDTH-100, main.HEIGHT-100, 248, 50, this);
+ stage.addActor(singlePlayerButton);
+ difficulties = new LinkedList<>();
+ for(int i=0; i<=3; i++) {
+ DifficultyButton difficulty1 = new DifficultyButton(main.WIDTH-100, main.HEIGHT/2 - 100 - 75*i, 248, 50, this, i);
+ difficulties.add(difficulty1);
+ stage.addActor(difficulty1);
+ }
+
Gdx.input.setInputProcessor(stage);
}
@@ -115,7 +132,7 @@ public class ShipSelector implements Screen {
* @param ship the index of the ship in the list of possible ships
*/
public void setShip(int ship) {
-
+ //TODO was für 1 username??
}
/**
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Events/EventGUI.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Events/EventGUI.java
index fc9f5a3f..964097c7 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Events/EventGUI.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Events/EventGUI.java
@@ -85,7 +85,7 @@ public class EventGUI {
*
* called by button
*/
- private void nextPage() {
+ public void nextPage() {
}
/**
--
GitLab