Skip to content
Snippets Groups Projects
Commit ad39fda6 authored by Marcus Christopher Wildish's avatar Marcus Christopher Wildish
Browse files

Merge branch 'add-startview' into 'main'

added StartPage. Appears for 2 seconds before going on to mainmenu

See merge request !28
parents 5af35424 70d43084
No related branches found
No related tags found
1 merge request!28added StartPage. Appears for 2 seconds before going on to mainmenu
......@@ -8,7 +8,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:8.2.2'
classpath 'com.android.tools.build:gradle:8.3.0'
classpath 'com.google.gms:google-services:4.4.1'
......
......@@ -7,6 +7,7 @@ import com.badlogic.gdx.utils.ScreenUtils;
import com.wordbattle.game.model.CreateWords;
import com.wordbattle.game.network.FirebaseInterface;
import com.wordbattle.game.states.MainMenuState;
import com.wordbattle.game.states.StartState;
import com.wordbattle.game.states.StateManager;
import com.wordbattle.game.manager.SoundManager;
import com.wordbattle.game.manager.MusicManager;
......@@ -33,7 +34,7 @@ public class WordBattle extends ApplicationAdapter {
// CreateWords createWords = new CreateWords(_FBIC);
// createWords.updateDB();
ScreenUtils.clear(1, 0, 0, 1);
stateManager.setState(new MainMenuState(stateManager, _FBIC)); // Set the main menu as the initial state
stateManager.setState(new StartState(stateManager,_FBIC)); // Set the main menu as the initial state
MusicManager.initialize();
MusicManager.playMusic();
SoundManager.initialize();
......
......@@ -13,11 +13,18 @@ public class StartController {
StartView startView;
float timer;
float loadingTime;
public StartController(StartState state) {
this.state = state;
startView= new StartView(state.getCam());
timer=0;
loadingTime= 2;
}
......@@ -34,6 +41,11 @@ public class StartController {
public void update(float dt){
handleInput();
timer+=dt;
if (timer>=loadingTime){
state.getStateManager().setState(new MainMenuState(state.getStateManager(), state.get_FBIC()));
}
}
......
......@@ -5,15 +5,19 @@ import com.badlogic.gdx.utils.compression.lzma.Base;
import com.wordbattle.game.WordBattle;
import com.wordbattle.game.controller.MainMenuController;
import com.wordbattle.game.controller.StartController;
import com.wordbattle.game.network.FirebaseInterface;
public class StartState extends BaseState {
StartController controller;
FirebaseInterface _FBIC;
public StartState(StateManager gsm) {
public StartState(StateManager gsm, FirebaseInterface _FBIC) {
super(gsm);
this.controller = new StartController(this); // 'this' provides context
this._FBIC=_FBIC;
cam.setToOrtho(false, WordBattle.WIDTH, WordBattle.HEIGHT);
}
......@@ -39,6 +43,10 @@ public class StartState extends BaseState {
return gsm;
}
public FirebaseInterface get_FBIC() {
return _FBIC;
}
@Override
public void enter() {
......
......@@ -20,6 +20,7 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion;
import java.util.ArrayList;
import java.util.List;
public class LobbyView {
private Texture backgroundTexture;
private BitmapFont font;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment