Skip to content
Snippets Groups Projects
Commit 8dc38db9 authored by Magnus Segtnan Skjølberg's avatar Magnus Segtnan Skjølberg
Browse files

Add leave game button

parent 41a0281a
Branches
No related tags found
1 merge request!79Add leave game button
......@@ -54,7 +54,7 @@ com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle: {
font: default
fontColor: black
},
"regular-white": {
regular-white: {
font: default,
fontColor: white
},
......@@ -66,6 +66,10 @@ com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle: {
font: large
fontColor: white
}
large-red: {
font: large
fontColor: red
}
}
com.badlogic.gdx.scenes.scene2d.ui.ProgressBar$ProgressBarStyle: {
default-horizontal: {
......
......@@ -52,7 +52,7 @@ public class GameController {
private final Tank tank1, tank2;
private ChangeListener fireChangeListener, powerSliderChangeListener;
private InputListener moveRightInputListener, moveLeftInputListener, aimUpInputListener, aimDownInputListener;
private InputListener leaveInputListener, moveRightInputListener, moveLeftInputListener, aimUpInputListener, aimDownInputListener;
public GameController(TankWarsGame tankWarsGame, GameHud hud, Terrain terrain, Box2dWorld model) {
this.tankWarsGame = tankWarsGame;
......@@ -81,12 +81,19 @@ public class GameController {
hud.showTurnInformationContainer();
hud.showOpponentTurnLabel();
fetchGameState();
// fetchGameState();
defineEventListeners();
}
private void defineEventListeners() {
leaveInputListener = new InputListener() {
public boolean touchDown(InputEvent event, float x, float y, int pointer, int button) {
System.out.println("asdfasdfsdfdsafasdfs");
return true;
}
};
/*
* Fire a bullet according to tank position and turret angle, and then end turn
*/
......@@ -126,6 +133,7 @@ public class GameController {
moveRightInputListener = new InputListener() {
@Override
public boolean touchDown(InputEvent event, float x, float y, int pointer, int button) {
System.out.println("asdfasfsadf");
moveRightTouched = true;
return true;
}
......@@ -187,6 +195,8 @@ public class GameController {
}
public void setTurnListeners() {
hud.getLeaveLabel().addListener(leaveInputListener);
hud.getFireButton().addListener(fireChangeListener);
hud.getPowerSlider().addListener(powerSliderChangeListener);
......@@ -198,6 +208,8 @@ public class GameController {
}
public void removeTurnListeners() {
hud.getLeaveLabel().removeListener(leaveInputListener);
hud.getFireButton().removeListener(fireChangeListener);
hud.getPowerSlider().removeListener(powerSliderChangeListener);
......
......@@ -29,6 +29,8 @@ public class GameHud {
private Skin skin;
private Label leaveLabel;
private ProgressBar healthProgressBarPlayer;
private ProgressBar healthProgressBarOpponent;
......@@ -64,6 +66,8 @@ public class GameHud {
skin = ResourceManager.getInstance().loadAndGetGameplayHudAssets();
leaveLabel = new Label("X", skin.get("large-red", Label.LabelStyle.class));
healthProgressBarPlayer = new ProgressBar(0, 100, 1, false, skin);
healthProgressBarPlayer.setValue(100);
healthProgressBarOpponent = new ProgressBar(0, 100, 1, false, skin);
......@@ -74,14 +78,15 @@ public class GameHud {
HpOpponentWrapper.setOrigin(HpOpponentWrapper.getPrefWidth() / 2, HpOpponentWrapper.getPrefHeight() / 2);
HpOpponentWrapper.setRotation(180);
turnLabel = new Label("It's your turn!", skin.get("large-white", Label.LabelStyle.class));
turnInformationLabel = new Label("Touch screen to start your turn.", skin.get("regular-white", Label.LabelStyle.class));
table.add(healthProgressBarPlayer).expand().top().left().padTop(10).padLeft(10);
table.add(HpOpponentWrapper).colspan(2).top().right().padTop(10).padRight(10);
table.add(leaveLabel).expand().top().left().padTop(10).padLeft(10);
table.add(healthProgressBarPlayer).expand().top().left().padTop(10);
table.add(HpOpponentWrapper).expand().top().right().padTop(10).padRight(10);
table.row();
turnLabel = new Label("It's your turn!", skin.get("large-white", Label.LabelStyle.class));
turnInformationLabel = new Label("Touch screen to start your turn.", skin.get("regular-white", Label.LabelStyle.class));
turnContainer = new Container(turnLabel);
turnInformationContainer = new Container(turnInformationLabel);
......@@ -149,6 +154,10 @@ public class GameHud {
return skin;
}
public Label getLeaveLabel() {
return leaveLabel;
}
public TextButton getFireButton() {
return fireButton;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment