Merge branch '62-scorestate' into 'dev'

Resolve "ScoreState"

Closes #62

See merge request !59

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

@@ -47,8 +47,6 @@ public class BubbleWrapState extends PlayStateTemplate {
         // Creates the bubbles, the table to put them in and adds them to the stage as Actors
         createBubbles();
         createBubbleWrapLayout();
-
-        Gdx.input.setInputProcessor(stage);
     }
 
     @Override
@@ -73,6 +71,7 @@ public class BubbleWrapState extends PlayStateTemplate {
 
     @Override
     public void update(float dt) {
+        Gdx.input.setInputProcessor(stage);
         this.handleInput();
 
         this.currentTime += dt;

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

@@ -181,6 +181,7 @@ public class CreateJoinTournamentState extends State {
 
     @Override
     public void update(float dt) {
+        Gdx.input.setInputProcessor(stage);
         stage.act(dt);
     }
 

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

 package com.gameware.game.states;
 
+import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.ui.Label;
@@ -103,7 +104,10 @@ public class MenuState extends State{
     protected void handleInput() { }
 
     @Override
-    public void update(float dt) { stage.act(dt); }
+    public void update(float dt) {
+        Gdx.input.setInputProcessor(stage);
+        stage.act(dt);
+    }
 
     @Override
     public void render(SpriteBatch sb) { stage.draw(); }

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

@@ -43,9 +43,11 @@ public abstract class PlayStateTemplate extends State {
         }
         GameWare.getInstance().updateGameMap(id, new ColorRushState(gsm));
         if(round == null) {
-            gsm.set(new SinglePlayerSelectGameState(gsm));
+            gsm.set(new ScoreState(gsm, this.score, new SinglePlayerSelectGameState(gsm)));
         } else{
-            gsm.set(new ViewTournamentState(gsm, tournament, nextRound));
+            //TODO: nextRound blir null :/
+//            gsm.set(new ScoreState(gsm, this.score, new ViewTournamentState(gsm, tournament, nextRound)));
+            gsm.set(new ScoreState(gsm, this.score, new CreateJoinTournamentState(gsm)));
         }
     }
 

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

+package com.gameware.game.states;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.gameware.game.models.Round;
+import com.gameware.game.models.Tournament;
+
+public class ScoreState extends State {
+
+    private int score;
+    private State nextState;
+    private float currentTime = 0f;
+
+    private Table table;
+    private Label titleLabel = new Label("Your score:", skin, "big");
+    private Label continueLabel = new Label("Touch to continue", skin);
+
+    public ScoreState(GameStateManager gsm, int score, State nextState){
+        super(gsm);
+        this.score = score;
+        this.nextState = nextState;
+
+        makeStage();
+    }
+
+
+    private void makeStage(){
+        table = new Table();
+        table.setFillParent(true);
+        table.setBackground(backgroundScore);
+        titleLabel.setFontScale(titleFontBigScale);
+
+        table.add(titleLabel).spaceBottom(spacingOnBottom);
+        table.row();
+        Label scoreLabel = new Label(score+"", skin, "big");
+        scoreLabel.setFontScale(titleFontBigScale);
+        table.add(scoreLabel).spaceBottom(spacingOnBottomInputFIeld);
+        table.row();
+        table.add(continueLabel);
+
+        stage.addActor(table);
+    }
+
+    private void handleTouch(){
+        gsm.set(nextState);
+    }
+
+    @Override
+    protected void handleInput() {
+        if (Gdx.input.justTouched()) {
+            handleTouch();
+        }
+    }
+
+    @Override
+    public void update(float dt) {
+        this.currentTime += dt;
+        if(currentTime>2f){
+            this.handleInput();
+        }
+        stage.act(dt);
+    }
+
+    @Override
+    public void render(SpriteBatch sb) {
+        stage.draw();
+    }
+
+    @Override
+    public void dispose() {
+        stage.dispose();
+    }
+
+    @Override
+    public void reset() {
+
+    }
+
+    @Override
+    public Object report() {
+        return null;
+    }
+}

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

 package com.gameware.game.states;
 
+import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.ui.Label;
@@ -56,6 +57,7 @@ public class SinglePlayerSelectGameState extends State {
 
     @Override
     public void update(float dt) {
+        Gdx.input.setInputProcessor(stage);
         stage.act();
     }
 

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

@@ -26,6 +26,7 @@ public abstract class State {
     protected static final int buttonHeight = Gdx.graphics.getHeight()/12;
     protected TextureRegionDrawable background = new TextureRegionDrawable(new TextureRegion(new Texture("bg1.jpg")));
     protected TextureRegionDrawable backgroundLighter = new TextureRegionDrawable(new TextureRegion(new Texture("bg1_lighter.jpg")));
+    protected TextureRegionDrawable backgroundScore = new TextureRegionDrawable(new TextureRegion(new Texture("bg_score.jpg")));
 
     protected State(GameStateManager gsm){
         this.gsm = gsm;

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

 package com.gameware.game.states;
 
+import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.ui.Label;
@@ -118,6 +119,7 @@ public class ViewTournamentState extends State {
 
     @Override
     public void update(float dt) {
+        Gdx.input.setInputProcessor(stage);
         stage.act(dt);
     }