EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2025-10-22 06:13:44 +02:00
Code Issues Projects Releases Wiki Activity

Fjerner unødvendig kode fra LoadingScreen

Browse Source
This commit is contained in:
Kristian Knarvik
2020-04-17 12:42:42 +02:00
parent fc7fd6fa12
commit d24eb1aa64
1 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/inf112/fiasko/roborally/gamewrapper/screens/LoadingScreen.java
View File

@@ -17,8 +17,6 @@ public class LoadingScreen extends AbstractScreen {
private final OrthographicCamera camera;
private final Viewport viewport;
private GameState initialGameState;
/**
* Instantiates a new loading screen
* @param roboRallyWrapper The Robo Rally wrapper which is parent of this screen
@@ -30,8 +28,6 @@ public class LoadingScreen extends AbstractScreen {
viewport = new ExtendViewport(applicationWidth, applicationHeight, camera);
}
@Override
public void render(float delta) {
Gdx.gl.glClearColor(0f, 0f, 0f, 0f);
@@ -40,20 +36,24 @@ public class LoadingScreen extends AbstractScreen {
roboRallyWrapper.batch.setProjectionMatrix(camera.combined);
roboRallyWrapper.batch.begin();
roboRallyWrapper.font.draw(roboRallyWrapper.batch, "Loading...", applicationWidth/2f-380/2f,
roboRallyWrapper.font.draw(roboRallyWrapper.batch, "Loading...", applicationWidth / 2f - 380 / 2f,
applicationHeight / 2f,380, 1, true);
roboRallyWrapper.batch.end();
//if (roboRallyWrapper.roboRallyGame != null){
// System.out.println(roboRallyWrapper.roboRallyGame.getGameState());
//}
if (roboRallyWrapper.roboRallyGame != null && roboRallyWrapper.roboRallyGame.getGameState() != GameState.LOADING) {
handleScreenChange();
if (roboRallyWrapper.roboRallyGame != null) {
GameState gameState = roboRallyWrapper.roboRallyGame.getGameState();
if (gameState != GameState.LOADING) {
handleScreenChange(gameState);
}
}
}
private void handleScreenChange() {
switch (roboRallyWrapper.roboRallyGame.getGameState()) {
/**
* Changes to another screen depending on which state the game is in
* @param gameState The current state of the game
*/
private void handleScreenChange(GameState gameState) {
switch (gameState) {
case RUNNING_PROGRAMS:
roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getBoardActiveScreen(this.roboRallyWrapper));
break;
@@ -70,14 +70,4 @@ public class LoadingScreen extends AbstractScreen {
viewport.update(width, height);
}
@Override
public void show() {
if (roboRallyWrapper.roboRallyGame == null){
initialGameState = GameState.INITIAL_SETUP;
}
else {
initialGameState = roboRallyWrapper.roboRallyGame.getGameState();
}
}
}