From 4702bff7813e2d8d7f11fcdb1f0daa749808cb54 Mon Sep 17 00:00:00 2001
From: magnsskj <magnsskj@stud.ntnu.no>
Date: Thu, 30 Mar 2023 14:22:55 +0200
Subject: [PATCH] (#18): connect hud input to tank shoot and movement
---
.../tankwars/controller/GameController.java | 27 ++++++-------------
1 file changed, 8 insertions(+), 19 deletions(-)
diff --git a/frontend/core/src/com/game/tankwars/controller/GameController.java b/frontend/core/src/com/game/tankwars/controller/GameController.java
index a5ec548..35873e2 100644
--- a/frontend/core/src/com/game/tankwars/controller/GameController.java
+++ b/frontend/core/src/com/game/tankwars/controller/GameController.java
@@ -5,7 +5,6 @@ import com.badlogic.gdx.Input;
import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.InputListener;
-import com.badlogic.gdx.scenes.scene2d.Touchable;
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import com.game.tankwars.TankWarsGame;
import com.game.tankwars.model.Bullet;
@@ -39,17 +38,20 @@ public class GameController {
tank.rotateCannonRight();
}
- if(Gdx.input.justTouched()) {
- bullet = new Bullet(tank);
- bullet.shoot();
+ if(moveRightTouched) {
+ tank.moveRight();
+ }
+ else if(moveLeftTouched) {
+ tank.moveLeft();
}
}
public void handleHudEvents() {
hud.getFireButton().addListener(new ChangeListener() {
public void changed (ChangeEvent event, Actor actor) {
- System.out.println("Changed!");
- actor.setTouchable(Touchable.disabled);
+ bullet = new Bullet(tank);
+ bullet.shoot();
+ //actor.setTouchable(Touchable.disabled);
// TODO: send turn to server + enable touchable when it is players turn
endPlayerTurn();
}
@@ -91,20 +93,7 @@ public class GameController {
});
- if(moveRightTouched) {
- tank.moveRight();
- }
- if(moveLeftTouched) {
- tank.moveLeft();
- }
- }
-
- public boolean isMoveRightTouched() {
- return moveRightTouched;
- }
- public boolean isMoveLeftTouched() {
- return moveLeftTouched;
}
public boolean endPlayerTurn() {
--
GitLab