#22 Added stage

frontend/core/src/com/gameware/game/GameWare.java

@@ -5,31 +5,47 @@ import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.gameware.game.states.CreateJoinTournamentState;
+import com.gameware.game.states.GameStateManager;
 
 public class GameWare extends ApplicationAdapter {
-	SpriteBatch batch;
-	Texture img;
+	private SpriteBatch batch;
+	private GameStateManager gsm;
 	public static final int WIDTH = 480;
 	public static final int HEIGHT = 800;
+	public static final String TITLE = "WackyWare!";
+	public static final String skinFilePath = "glassy/skin/glassy-ui.json";
 
+	private static GameWare instance = null;
+
+	public static GameWare getInstance(){
+		if( instance == null){
+			instance = new GameWare();
+		}
+		return instance;
+	}
 	@Override
 	public void create () {
+		gsm = new GameStateManager();
 		batch = new SpriteBatch();
-		img = new Texture("badlogic.jpg");
+		//music = Gdx.audio.newMusic(Gdx.files.internal(("music.mp3")));
+		//music.setLooping(true);
+		//music.setVolume(0.1f);
+		//music.play();
+		gsm.push(new CreateJoinTournamentState(gsm));
 	}
 
 	@Override
 	public void render () {
-		Gdx.gl.glClearColor(1, 0, 0, 1);
+		Gdx.gl.glClearColor(1, 1, 1, 1);
 		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
-		batch.begin();
-		batch.draw(img, 0, 0);
-		batch.end();
+		gsm.update(Gdx.graphics.getDeltaTime());
+		gsm.render(batch);
 	}
 
+
 	@Override
 	public void dispose () {
 		batch.dispose();
-		img.dispose();
 	}
 }

frontend/core/src/com/gameware/game/sprites/Sprite.java

 package com.gameware.game.sprites;
 
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.Vector3;
 
 public abstract class Sprite {
@@ -12,7 +13,7 @@ public abstract class Sprite {
     public abstract void reset();
     public abstract Object report();
 
-    public abstract void draw();
+    public abstract void draw(SpriteBatch sb);
     public abstract void update();
     public abstract void dispose();
 

frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java

@@ -3,50 +3,71 @@ package com.gameware.game.states;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.Vector3;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.Stage;
 import com.badlogic.gdx.scenes.scene2d.ui.Button;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 import com.gameware.game.GameWare;
 
 public class CreateJoinTournamentState extends State {
 
-    private Button backBtn;
     private Vector3 androidClick;
+    private Stage stage;
+    private Table table;
 
-    protected CreateJoinTournamentState(GameStateManager gsm) {
+    private int spacingOnBottom = Gdx.graphics.getHeight()/15;
+    private float fontScaleX = 3f;
+    private float fontScaleY = 3f;
+    private String backBtnText = "Back";
+
+
+
+    public CreateJoinTournamentState(GameStateManager gsm) {
         super(gsm);
-        cam.setToOrtho(false, GameWare.WIDTH, GameWare.HEIGHT);
-        backBtn = new Button();
-    }
+        stage = new Stage();
+        Gdx.input.setInputProcessor(stage);
+        Skin skin = new Skin(Gdx.files.internal(GameWare.skinFilePath));
+        skin.getFont("font").getData().setScale(fontScaleX,fontScaleY);
+        cam.setToOrtho(false, Gdx.graphics.getWidth()/2, Gdx.graphics.getHeight()/2);
 
+        table = new Table();
+        table.setFillParent(true);
+
+        table.row();
+
+        TextButton loginBtn = new TextButton(backBtnText, skin);
+        loginBtn.addListener(new ClickListener() {
             @Override
-    protected void handleInput() {
-        if(Gdx.input.justTouched()){
-            androidClick = cam.unproject(new Vector3(Gdx.input.getX(),Gdx.input.getY(),0));
-            if(backBtn.isBtnClicked(androidClick.x,androidClick.y)){
-                gsm.push(new MenuState(gsm));
+            public void clicked(InputEvent e, float x, float y){
+                handleBtnClick();
             }
+        });
+        table.add(loginBtn);
+
+        stage.addActor(table);
     }
+
+    @Override
+    protected void handleInput() {
+
     }
 
     @Override
     public void update(float dt) {
-        handleInput();
-        backBtn.update(dt);
-        cam.update();    }
+        stage.act(dt);
+    }
 
     @Override
     public void render(SpriteBatch sb) {
-        sb.setProjectionMatrix(cam.combined);
-        sb.begin();
-        //sb.draw(bg, cam.position.x - (cam.viewportWidth / 2),0,HeliGame_2.WIDTH,HeliGame_2.HEIGHT);
-        //sb.draw(heli.getSprite(),heli.getPosition().x,heli.getPosition().y);
-        //sb.draw(skull.getTexture(),skull.getPosition().x,skull.getPosition().y);
-        //posText.getFont().draw(sb, posText.getText(), 10, HeliGame_2.HEIGHT - 10);
-        sb.end();
+        stage.draw();
     }
 
     @Override
     public void dispose() {
-        backBtn.dispose();
+        stage.dispose();
     }
 
     @Override
@@ -58,4 +79,8 @@ public class CreateJoinTournamentState extends State {
     public Object report() {
         return this;
     }
+
+    private void handleBtnClick(){
+        gsm.set(new MenuState(gsm));
+    }
 }

frontend/core/src/com/gameware/game/states/MenuState.java

+package com.gameware.game.states;
+
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+
+public class MenuState extends State{
+    protected MenuState(GameStateManager gsm) {
+        super(gsm);
+        System.out.println("Du er i menu state :0");
+    }
+
+    @Override
+    protected void handleInput() {
+
+    }
+
+    @Override
+    public void update(float dt) {
+
+    }
+
+    @Override
+    public void render(SpriteBatch sb) {
+
+    }
+
+    @Override
+    public void dispose() {
+
+    }
+
+    @Override
+    public void reset() {
+
+    }
+
+    @Override
+    public Object report() {
+        return null;
+    }
+
+    private void optionsBtnClick(){
+
+    }
+
+    private void multiBtnClick(){
+
+    }
+
+    private void singleBtnClick(){
+
+    }
+
+    private void highscoreBtnClick(){
+
+    }
+
+}

frontend/core/src/com/gameware/game/states/ViewHighScoreState.java

@@ -3,51 +3,69 @@ package com.gameware.game.states;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.Vector3;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.Stage;
 import com.badlogic.gdx.scenes.scene2d.ui.Button;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 import com.gameware.game.GameWare;
 
 public class ViewHighScoreState extends State {
 
-    private Button backBtn;
     private Vector3 androidClick;
+    private Stage stage;
+    private Table table;
+
+    private int spacingOnBottom = Gdx.graphics.getHeight()/15;
+    private float fontScaleX = 3f;
+    private float fontScaleY = 3f;
+    private String backBtnText = "Back";
 
     protected ViewHighScoreState(GameStateManager gsm) {
         super(gsm);
-        cam.setToOrtho(false, GameWare.WIDTH, GameWare.HEIGHT);
-        backBtn = new Button();
-    }
+        stage = new Stage();
+        Gdx.input.setInputProcessor(stage);
+        Skin skin = new Skin(Gdx.files.internal(GameWare.skinFilePath));
+        skin.getFont("font").getData().setScale(fontScaleX,fontScaleY);
+        cam.setToOrtho(false, Gdx.graphics.getWidth()/2, Gdx.graphics.getHeight()/2);
+
+        table = new Table();
+        table.setFillParent(true);
 
+        table.row();
+
+        TextButton loginBtn = new TextButton(backBtnText, skin);
+        loginBtn.addListener(new ClickListener() {
             @Override
-    protected void handleInput() {
-        if(Gdx.input.justTouched()){
-            androidClick = cam.unproject(new Vector3(Gdx.input.getX(),Gdx.input.getY(),0));
-            if(backBtn.isBtnClicked(androidClick.x,androidClick.y)){
-                gsm.push(new MenuState(gsm));
+            public void clicked(InputEvent e, float x, float y){
+                handleBtnClick();
             }
+        });
+        table.add(loginBtn);
+
+        stage.addActor(table);
     }
+
+    @Override
+    protected void handleInput() {
+
     }
 
     @Override
     public void update(float dt) {
-        handleInput();
-        backBtn.update(dt);
-        cam.update();
+        stage.act(dt);
     }
 
     @Override
     public void render(SpriteBatch sb) {
-        sb.setProjectionMatrix(cam.combined);
-        sb.begin();
-        //sb.draw(bg, cam.position.x - (cam.viewportWidth / 2),0,HeliGame_2.WIDTH,HeliGame_2.HEIGHT);
-        //sb.draw(heli.getSprite(),heli.getPosition().x,heli.getPosition().y);
-        //sb.draw(skull.getTexture(),skull.getPosition().x,skull.getPosition().y);
-        //posText.getFont().draw(sb, posText.getText(), 10, HeliGame_2.HEIGHT - 10);
-        sb.end();
+        stage.draw();
     }
 
     @Override
     public void dispose() {
-        backBtn.dispose();
+        stage.dispose();
     }
 
     @Override
@@ -59,4 +77,8 @@ public class ViewHighScoreState extends State {
     public Object report() {
         return this;
     }
+
+    private void handleBtnClick(){
+        gsm.set(new CreateJoinTournamentState(gsm));
+    }
 }
\ No newline at end of file

frontend/core/src/com/gameware/game/states/ViewTournamentState.java

@@ -4,51 +4,69 @@ import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.math.Vector3;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.Stage;
 import com.badlogic.gdx.scenes.scene2d.ui.Button;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 import com.gameware.game.GameWare;
 
 public class ViewTournamentState extends State {
 
-    private Button backBtn;
     private Vector3 androidClick;
+    private Stage stage;
+    private Table table;
+
+    private int spacingOnBottom = Gdx.graphics.getHeight()/15;
+    private float fontScaleX = 3f;
+    private float fontScaleY = 3f;
+    private String backBtnText = "Back";
 
     protected ViewTournamentState(GameStateManager gsm) {
         super(gsm);
-        cam.setToOrtho(false, GameWare.WIDTH, GameWare.HEIGHT);
-        backBtn = new Button();
-    }
+        stage = new Stage();
+        Gdx.input.setInputProcessor(stage);
+        Skin skin = new Skin(Gdx.files.internal(GameWare.skinFilePath));
+        skin.getFont("font").getData().setScale(fontScaleX,fontScaleY);
+        cam.setToOrtho(false, Gdx.graphics.getWidth()/2, Gdx.graphics.getHeight()/2);
+
+        table = new Table();
+        table.setFillParent(true);
 
+        table.row();
+
+        TextButton loginBtn = new TextButton(backBtnText, skin);
+        loginBtn.addListener(new ClickListener() {
             @Override
-    protected void handleInput() {
-        if(Gdx.input.justTouched()){
-            androidClick = cam.unproject(new Vector3(Gdx.input.getX(),Gdx.input.getY(),0));
-            if(backBtn.isBtnClicked(androidClick.x,androidClick.y)){
-                gsm.push(new CreateJoinTournamentState(gsm));
+            public void clicked(InputEvent e, float x, float y){
+                handleBtnClick();
             }
+        });
+        table.add(loginBtn);
+
+        stage.addActor(table);
     }
+
+    @Override
+    protected void handleInput() {
+
     }
 
     @Override
     public void update(float dt) {
-        handleInput();
-        backBtn.update(dt);
-        cam.update();
+        stage.act(dt);
     }
 
     @Override
     public void render(SpriteBatch sb) {
-        sb.setProjectionMatrix(cam.combined);
-        sb.begin();
-        //sb.draw(bg, cam.position.x - (cam.viewportWidth / 2),0,HeliGame_2.WIDTH,HeliGame_2.HEIGHT);
-        //sb.draw(heli.getSprite(),heli.getPosition().x,heli.getPosition().y);
-        //sb.draw(skull.getTexture(),skull.getPosition().x,skull.getPosition().y);
-        //posText.getFont().draw(sb, posText.getText(), 10, HeliGame_2.HEIGHT - 10);
-        sb.end();
+        stage.draw();
     }
 
     @Override
     public void dispose() {
-        backBtn.dispose();
+        stage.dispose();
     }
 
     @Override
@@ -60,4 +78,8 @@ public class ViewTournamentState extends State {
     public Object report() {
         return this;
     }
+
+    private void handleBtnClick(){
+        gsm.set(new MenuState(gsm));
+    }
 }