EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2025-07-26 01:35:28 +02:00
Code Issues Projects Releases Wiki Activity

Rydder opp i PhaseTest og kjører automatisk opprydding

Browse Source 
Prøver å forenkle PhaseTest tester der det er mulig
This commit is contained in:
Kristian Knarvik
2020-04-24 23:35:59 +02:00
parent ddc0adc552
commit fca361b750
7 changed files with 156 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/inf112/fiasko/roborally/gamewrapper/RoboRallyWrapper.java
View File

@@ -12,14 +12,14 @@ import inf112.fiasko.roborally.objects.RoboRallyGame;
* This class acts as a wrapper around the different screens of the game
*/
public class RoboRallyWrapper extends Game {
public final int defaultTCPPort = 54555;
public final int discoverUDPPort = 54777;
public SpriteBatch batch;
public BitmapFont font;
public ScreenManager screenManager;
public RoboRallyGame roboRallyGame;
public RoboRallyServer server;
public RoboRallyClient client;
public int defaultTCPPort = 54555;
public int discoverUDPPort = 54777;
@Override
public void create() {

6
src/main/java/inf112/fiasko/roborally/gamewrapper/screens/AbstractScreen.java
View File

@@ -15,10 +15,10 @@ public abstract class AbstractScreen implements Screen {
protected final int applicationWidth = 600;
protected final int applicationHeight = 800;
protected OrthographicCamera camera = new OrthographicCamera();
protected final OrthographicCamera camera = new OrthographicCamera();
protected final Stage stage = new Stage();
protected final InputMultiplexer inputMultiplexer = new InputMultiplexer();
protected Viewport viewport;
protected Stage stage = new Stage();
protected InputMultiplexer inputMultiplexer = new InputMultiplexer();
@Override
public void show() {

20
src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java
View File

@@ -12,7 +12,9 @@ import inf112.fiasko.roborally.elementproperties.GameState;
import inf112.fiasko.roborally.elementproperties.RobotID;
import inf112.fiasko.roborally.elementproperties.TileType;
import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
import inf112.fiasko.roborally.objects.DrawableGame;
import inf112.fiasko.roborally.objects.DrawableObject;
import inf112.fiasko.roborally.objects.InteractableGame;
import inf112.fiasko.roborally.objects.Player;
import inf112.fiasko.roborally.objects.Robot;
import inf112.fiasko.roborally.objects.Tile;
@@ -29,6 +31,8 @@ public class BoardActiveScreen extends InteractiveScreen {
private final int tileDimensions = 64;
private final int viewPortWidth;
private final int viewPortHeight;
private final DrawableGame drawableGame;
private final InteractableGame interactableGame;
private float cameraZoom = 1;
private int cameraX = 0;
private int cameraY = 0;
@@ -41,9 +45,11 @@ public class BoardActiveScreen extends InteractiveScreen {
*/
public BoardActiveScreen(final RoboRallyWrapper roboRallyWrapper) {
this.roboRallyWrapper = roboRallyWrapper;
this.drawableGame = this.roboRallyWrapper.roboRallyGame;
this.interactableGame = this.roboRallyWrapper.roboRallyGame;
viewPortWidth = roboRallyWrapper.roboRallyGame.getWidth() * tileDimensions;
viewPortHeight = roboRallyWrapper.roboRallyGame.getHeight() * tileDimensions;
viewPortWidth = drawableGame.getWidth() * tileDimensions;
viewPortHeight = drawableGame.getHeight() * tileDimensions;
camera.setToOrtho(false, viewPortWidth, viewPortHeight);
camera.position.set(viewPortWidth / 2f, viewPortHeight / 2f, 0);
@@ -67,7 +73,7 @@ public class BoardActiveScreen extends InteractiveScreen {
drawBoard(roboRallyWrapper.batch);
roboRallyWrapper.batch.end();
switch (roboRallyWrapper.roboRallyGame.getGameState()) {
switch (interactableGame.getGameState()) {
case GAME_IS_WON:
roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getWinnerScreen(roboRallyWrapper));
break;
@@ -93,7 +99,7 @@ public class BoardActiveScreen extends InteractiveScreen {
@Override
public boolean keyUp(int keyCode) {
if (keyCode == Input.Keys.TAB && roboRallyWrapper.roboRallyGame.getGameState() == GameState.CHOOSING_CARDS) {
if (keyCode == Input.Keys.TAB && interactableGame.getGameState() == GameState.CHOOSING_CARDS) {
roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getCardChoiceScreen(roboRallyWrapper));
return true;
}
@@ -163,7 +169,7 @@ public class BoardActiveScreen extends InteractiveScreen {
*/
private void drawBoard(SpriteBatch batch) {
List<DrawableObject> elementsToDraw =
IOUtil.getDrawableObjectsFromGame(roboRallyWrapper.roboRallyGame, tileDimensions, tileDimensions);
IOUtil.getDrawableObjectsFromGame(drawableGame, tileDimensions, tileDimensions);
for (DrawableObject object : elementsToDraw) {
TextureRegion objectTextureRegion = object.getTexture();
batch.draw(objectTextureRegion.getTexture(), object.getXPosition(), object.getYPosition(),
@@ -175,7 +181,7 @@ public class BoardActiveScreen extends InteractiveScreen {
}
int index = 1;
//Draws all participating players to the right of the board
for (Player player : roboRallyWrapper.roboRallyGame.getPlayers()) {
for (Player player : drawableGame.getPlayers()) {
String playerName = player.getName();
Robot robot = getPlayersRobot(player.getRobotID());
if (robot == null) {
@@ -210,7 +216,7 @@ public class BoardActiveScreen extends InteractiveScreen {
* @return The robot with the robot id
*/
private Robot getPlayersRobot(RobotID robotID) {
for (Robot robot : roboRallyWrapper.roboRallyGame.getAllRobots()) {
for (Robot robot : drawableGame.getAllRobots()) {
if (robot.getRobotId() == robotID) {
return robot;
}

6
src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java
View File

@@ -2,7 +2,6 @@ package inf112.fiasko.roborally.gamewrapper.screens;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input;
import com.badlogic.gdx.InputMultiplexer;
import com.badlogic.gdx.Screen;
import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.g2d.GlyphLayout;
@@ -137,11 +136,6 @@ public class CardChoiceScreen extends InteractiveScreen implements Screen {
}
}
@Override
public void show() {
super.show();
}
@Override
public void render(float v) {
Gdx.gl.glClearColor(0.2f, 0.2f, 0.2f, 1);

1
src/main/java/inf112/fiasko/roborally/gamewrapper/screens/LobbyScreen.java
View File

@@ -3,7 +3,6 @@ package inf112.fiasko.roborally.gamewrapper.screens;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input;
import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.ui.Dialog;
import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
import com.badlogic.gdx.scenes.scene2d.ui.Skin;
import com.badlogic.gdx.scenes.scene2d.ui.TextButton;

2
src/main/java/inf112/fiasko/roborally/networking/RoboRallyClient.java
View File

@@ -13,7 +13,7 @@ import java.util.List;
*/
public class RoboRallyClient {
private final Client client;
private RoboRallyWrapper wrapper;
private final RoboRallyWrapper wrapper;
/**
* Instantiates a new Robo Rally client