mirror of
https://github.com/inf112-v20/Fiasko.git
synced 2025-07-31 12:15:27 +02:00
Merge branch 'master' of https://github.com/inf112-v20/Fiasko
Conflicts: src/main/java/inf112/fiasko/roborally/gamewrapper/ScreenManager.java src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java src/main/java/inf112/fiasko/roborally/gamewrapper/screens/WinnerScreen.java src/test/java/inf112/fiasko/roborally/objects/RoboRallyGameTest.java
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
package inf112.fiasko.roborally.gamewrapper;
|
||||
package inf112.fiasko.roborally.game_wrapper;
|
||||
|
||||
|
||||
import inf112.fiasko.roborally.gamewrapper.screens.BoardActiveScreen;
|
||||
@@ -19,6 +19,19 @@ public class ScreenManager {
|
||||
private UsernameScreen usernameScreen;
|
||||
private IPAddressScreen ipAddressScreen;
|
||||
private LobbyScreen lobbyScreen;
|
||||
private WinnerScreen winnerScreen;
|
||||
|
||||
/**
|
||||
* Gets an instance of the winner screen
|
||||
* @param roboRallyWrapper The Robo Rally launcher instance to use
|
||||
* @return A winner screen instance
|
||||
*/
|
||||
public synchronized WinnerScreen getWinnerScreen(RoboRallyWrapper roboRallyWrapper) {
|
||||
if (this.winnerScreen == null) {
|
||||
this.winnerScreen = new WinnerScreen(roboRallyWrapper);
|
||||
}
|
||||
return winnerScreen;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets an instance of the power down screen
|
||||
|
@@ -1,4 +1,4 @@
|
||||
package inf112.fiasko.roborally.gamewrapper.screens;
|
||||
package inf112.fiasko.roborally.game_wrapper.screens;
|
||||
|
||||
import com.badlogic.gdx.Gdx;
|
||||
import com.badlogic.gdx.Input;
|
||||
@@ -74,6 +74,11 @@ public class BoardActiveScreen extends AbstractScreen implements InputProcessor
|
||||
roboRallyWrapper.batch.begin();
|
||||
drawBoard(roboRallyWrapper.batch);
|
||||
roboRallyWrapper.batch.end();
|
||||
|
||||
// Checks if there has been found a winning player and then changes the screen to display the winning screen
|
||||
if (roboRallyWrapper.roboRallyGame.getGameState() == GameState.GAME_IS_WON) {
|
||||
roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getWinnerScreen(roboRallyWrapper));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -0,0 +1,76 @@
|
||||
package inf112.fiasko.roborally.game_wrapper.screens;
|
||||
|
||||
import com.badlogic.gdx.Gdx;
|
||||
import com.badlogic.gdx.graphics.GL20;
|
||||
import com.badlogic.gdx.graphics.OrthographicCamera;
|
||||
import com.badlogic.gdx.scenes.scene2d.InputEvent;
|
||||
import com.badlogic.gdx.scenes.scene2d.InputListener;
|
||||
import com.badlogic.gdx.scenes.scene2d.Stage;
|
||||
import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
|
||||
import com.badlogic.gdx.utils.viewport.FitViewport;
|
||||
import com.badlogic.gdx.utils.viewport.Viewport;
|
||||
import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
|
||||
import inf112.fiasko.roborally.game_wrapper.SimpleButton;
|
||||
|
||||
public class WinnerScreen extends AbstractScreen {
|
||||
private final RoboRallyWrapper roboRallyWrapper;
|
||||
|
||||
private final OrthographicCamera camera;
|
||||
private final Viewport viewport;
|
||||
private final Stage stage;
|
||||
|
||||
/**
|
||||
* Instantiates a new winner screen
|
||||
* @param roboRallyWrapper The Robo Rally wrapper which is parent of this screen
|
||||
*/
|
||||
public WinnerScreen(final RoboRallyWrapper roboRallyWrapper) {
|
||||
camera = new OrthographicCamera();
|
||||
viewport = new FitViewport(applicationWidth, applicationHeight, camera);
|
||||
stage = new Stage();
|
||||
stage.setViewport(viewport);
|
||||
TextButton quitButton = new SimpleButton("Quit", roboRallyWrapper.font).getButton();
|
||||
stage.addActor(quitButton);
|
||||
quitButton.setY(applicationHeight / 2f);
|
||||
camera.setToOrtho(false, applicationWidth, applicationHeight);
|
||||
quitButton.addListener(new InputListener() {
|
||||
@Override
|
||||
public boolean touchDown (InputEvent event, float x, float y, int pointer, int button) {
|
||||
Gdx.app.exit();
|
||||
return true;
|
||||
}
|
||||
});
|
||||
quitButton.setX(applicationWidth / 2f + quitButton.getWidth()/2);
|
||||
this.roboRallyWrapper = roboRallyWrapper;
|
||||
camera.setToOrtho(false, applicationWidth, applicationHeight);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render(float delta) {
|
||||
Gdx.gl.glClearColor(0.2f, 1f, 0.2f, 1);
|
||||
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
|
||||
camera.update();
|
||||
roboRallyWrapper.batch.setProjectionMatrix(camera.combined);
|
||||
|
||||
roboRallyWrapper.batch.begin();
|
||||
roboRallyWrapper.font.draw(roboRallyWrapper.batch, "The winner is: " +
|
||||
roboRallyWrapper.roboRallyGame.getWinningPlayerName(),applicationWidth / 2f - 380 / 2f,
|
||||
applicationHeight / 2f + 100,380, 1,
|
||||
true);
|
||||
roboRallyWrapper.font.draw(roboRallyWrapper.batch, "Click the button to exit the game",
|
||||
applicationWidth / 2f - 380 / 2f,applicationHeight / 2f + 100,380, 1,
|
||||
true);
|
||||
roboRallyWrapper.batch.end();
|
||||
stage.draw();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void resize(int width, int height) {
|
||||
viewport.update(width, height);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void show() {
|
||||
Gdx.input.setInputProcessor(stage);
|
||||
}
|
||||
|
||||
}
|
Reference in New Issue
Block a user