Skip to content
Snippets Groups Projects
Commit f4c9203c authored by Turid Cecilie Dahl's avatar Turid Cecilie Dahl
Browse files

#40 added logout btn, commented set user to null, made gsm into singleton

parent 4c819895
No related branches found
No related tags found
1 merge request!31Resolve "MenuState"
...@@ -32,7 +32,7 @@ public class GameWare extends ApplicationAdapter { ...@@ -32,7 +32,7 @@ public class GameWare extends ApplicationAdapter {
@Override @Override
public void create () { public void create () {
gsm = new GameStateManager(); gsm = GameStateManager.getInstance();
batch = new SpriteBatch(); batch = new SpriteBatch();
//music = Gdx.audio.newMusic(Gdx.files.internal(("music.mp3"))); //music = Gdx.audio.newMusic(Gdx.files.internal(("music.mp3")));
//music.setLooping(true); //music.setLooping(true);
......
...@@ -7,7 +7,17 @@ import java.util.Stack; ...@@ -7,7 +7,17 @@ import java.util.Stack;
public class GameStateManager { public class GameStateManager {
private Stack<State> states; private Stack<State> states;
public GameStateManager(){ private static GameStateManager instance = null;
//Singleton (lazy initialization)
public static GameStateManager getInstance(){
if( instance == null){
instance = new GameStateManager();
}
return instance;
}
private GameStateManager(){
states = new Stack<State>(); states = new Stack<State>();
} }
......
...@@ -11,6 +11,8 @@ import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; ...@@ -11,6 +11,8 @@ import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import com.gameware.game.GameWare; import com.gameware.game.GameWare;
public class MenuState extends State{ public class MenuState extends State{
//TODO: Burde kanskje dispose en state når bytter state?
private Stage stage; private Stage stage;
private Table table; private Table table;
...@@ -26,7 +28,6 @@ public class MenuState extends State{ ...@@ -26,7 +28,6 @@ public class MenuState extends State{
public MenuState(GameStateManager gsm) { public MenuState(GameStateManager gsm) {
super(gsm); super(gsm);
System.out.println("Du er i menu state :0");
stage = new Stage(); stage = new Stage();
Gdx.input.setInputProcessor(stage); Gdx.input.setInputProcessor(stage);
...@@ -69,6 +70,14 @@ public class MenuState extends State{ ...@@ -69,6 +70,14 @@ public class MenuState extends State{
}); });
table.add(highScoreBtn); table.add(highScoreBtn);
table.row();
TextButton logOutBtn = new TextButton(logOutBtnText, skin);
logOutBtn.addListener(new ClickListener() {
@Override
public void clicked(InputEvent e, float x, float y){ handleLogOutBtnClick(); }
});
table.add(logOutBtn);
stage.addActor(table); stage.addActor(table);
} }
...@@ -120,7 +129,8 @@ public class MenuState extends State{ ...@@ -120,7 +129,8 @@ public class MenuState extends State{
} }
private void handleLogOutBtnClick(){ private void handleLogOutBtnClick(){
gsm.set(new LoginState(gsm));
//TODO: antar at når ikke logget inn at user i GameWare skal bli satt til null
//Gameware.setUser(null);
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment