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

(#18): connect hud input to tank shoot and movement

parent fd8cfb8f
No related branches found
No related tags found
3 merge requests!51Resolve "Adjust cannon angle from touch input",!35Draft: Resolve "Adjust cannon angle from touch input",!32Combine hud with gameplay
...@@ -5,7 +5,6 @@ import com.badlogic.gdx.Input; ...@@ -5,7 +5,6 @@ import com.badlogic.gdx.Input;
import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.InputListener; import com.badlogic.gdx.scenes.scene2d.InputListener;
import com.badlogic.gdx.scenes.scene2d.Touchable;
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import com.game.tankwars.TankWarsGame; import com.game.tankwars.TankWarsGame;
import com.game.tankwars.model.Bullet; import com.game.tankwars.model.Bullet;
...@@ -39,17 +38,20 @@ public class GameController { ...@@ -39,17 +38,20 @@ public class GameController {
tank.rotateCannonRight(); tank.rotateCannonRight();
} }
if(Gdx.input.justTouched()) { if(moveRightTouched) {
bullet = new Bullet(tank); tank.moveRight();
bullet.shoot(); }
else if(moveLeftTouched) {
tank.moveLeft();
} }
} }
public void handleHudEvents() { public void handleHudEvents() {
hud.getFireButton().addListener(new ChangeListener() { hud.getFireButton().addListener(new ChangeListener() {
public void changed (ChangeEvent event, Actor actor) { public void changed (ChangeEvent event, Actor actor) {
System.out.println("Changed!"); bullet = new Bullet(tank);
actor.setTouchable(Touchable.disabled); bullet.shoot();
//actor.setTouchable(Touchable.disabled);
// TODO: send turn to server + enable touchable when it is players turn // TODO: send turn to server + enable touchable when it is players turn
endPlayerTurn(); endPlayerTurn();
} }
...@@ -91,20 +93,7 @@ public class GameController { ...@@ -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() { public boolean endPlayerTurn() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment