Legger til libGdx skjermer og en skjermhåndterer

Legger til en BoardActiveScreen som erstatter GameLauncher sin tidligere funksjon
Legger til en MainMenuScreen som foreløbig bare er en spash screen
Legger til RoboRallyLauncher som fungerer som en forelder til skjermene
Legger til en ScreenManager som kan hente et objekt av hver type skjerm

src/main/java/inf112/fiasko/roborally/game_wrapper/BoardActiveScreen.java

@@ -1,9 +1,9 @@
-package inf112.fiasko.roborally;
+package inf112.fiasko.roborally.game_wrapper;
 
-import com.badlogic.gdx.ApplicationAdapter;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
 import com.badlogic.gdx.InputProcessor;
+import com.badlogic.gdx.Screen;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
@@ -13,21 +13,17 @@ import com.badlogic.gdx.math.Vector3;
 import com.badlogic.gdx.utils.Disposable;
 import com.badlogic.gdx.utils.viewport.ExtendViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
-import inf112.fiasko.roborally.game.Game;
+import inf112.fiasko.roborally.objects.IDrawableGame;
-import inf112.fiasko.roborally.game.IDrawableGame;
 import inf112.fiasko.roborally.objects.IDrawableObject;
+import inf112.fiasko.roborally.objects.RoboRallyGame;
 import inf112.fiasko.roborally.utility.IOUtil;
 import inf112.fiasko.roborally.utility.TextureConverterUtil;
 
 import java.util.List;
 
-/**
+public class BoardActiveScreen implements Screen, InputProcessor {
- * This class renders a game using libgdx
+    final RoboRallyLauncher roboRallyLauncher;
- */
+    private final OrthographicCamera camera;
-public class GameLauncher extends ApplicationAdapter implements InputProcessor {
-    private OrthographicCamera camera;
-    private SpriteBatch batch;
-    private IDrawableGame game;
     private IDrawableGame debugGame;
 
     private final int tileDimensions = 64;
@@ -37,12 +33,12 @@ public class GameLauncher extends ApplicationAdapter implements InputProcessor {
     private Vector2 lastTouch;
     private final int viewPortWidth = 12 * tileDimensions;
     private final int viewPortHeight = 12 * tileDimensions;
-    private Viewport viewport;
+    private final Viewport viewport;
 
-    @Override
+    public BoardActiveScreen(final RoboRallyLauncher roboRallyLauncher) {
-    public void create() {
+        this.roboRallyLauncher = roboRallyLauncher;
-        debugGame = new Game(true);
+        roboRallyLauncher.roboRallyGame = new RoboRallyGame();
-        game = new Game(false);
+        debugGame = new RoboRallyGame(true);
 
         camera = new OrthographicCamera();
         camera.setToOrtho(false, viewPortWidth, viewPortHeight);
@@ -50,60 +46,48 @@ public class GameLauncher extends ApplicationAdapter implements InputProcessor {
         viewport = new ExtendViewport(viewPortWidth, viewPortHeight, camera);
 
         Gdx.input.setInputProcessor(this);
-        batch = new SpriteBatch();
         lastTouch = new Vector2();
     }
 
+    @Override
+    public void show() {
+        resetCamera();
+    }
+
     @Override
     public void resize(int width, int height) {
         viewport.update(width, height);
     }
 
-    /**
+    @Override
-     * Renders all textures necessary to display a game
+    public void pause() {
-     */
+        //Nothing to do
-    public void render() {
+    }
+
+    @Override
+    public void resume() {
+        //Nothing to do
+    }
+
+    @Override
+    public void hide() {
+        //Nothing to do
+    }
+
+    @Override
+    public void render(float delta) {
         Gdx.gl.glClearColor(0,0,0,1);
         Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT | GL20.GL_DEPTH_BUFFER_BIT |
                 (Gdx.graphics.getBufferFormat().coverageSampling?GL20.GL_COVERAGE_BUFFER_BIT_NV:0));
         updateCamera();
-        batch.setProjectionMatrix(camera.combined);
+        roboRallyLauncher.batch.setProjectionMatrix(camera.combined);
-        batch.begin();
+        roboRallyLauncher.batch.begin();
-        drawBoard(batch);
+        drawBoard(roboRallyLauncher.batch);
-        batch.end();
+        roboRallyLauncher.batch.end();
-    }
-
-    /**
-     * Renders all drawable objects on the board
-     * @param batch The sprite batch to use for drawing
-     */
-    private void drawBoard(SpriteBatch batch) {
-        List<IDrawableObject> elementsToDraw = IOUtil.getDrawableObjectsFromGame(game, tileDimensions, tileDimensions);
-        for (IDrawableObject object : elementsToDraw) {
-            TextureRegion objectTextureRegion = object.getTexture();
-            batch.draw(objectTextureRegion.getTexture(), object.getXPosition(), object.getYPosition(),
-                    (float)object.getWidth()/2, (float)object.getHeight()/2,
-                    object.getWidth(), object.getHeight(), 1, 1, object.getRotation(),
-                    objectTextureRegion.getRegionX(), objectTextureRegion.getRegionY(),
-                    objectTextureRegion.getRegionWidth(), objectTextureRegion.getRegionHeight(),
-                    object.flipX(), object.flipY());
-        }
-    }
-
-    /**
-     * Updates the camera according to any user input
-     */
-    private void updateCamera() {
-        camera.translate(cameraX, cameraY);
-        cameraX = 0;
-        cameraY = 0;
-        camera.zoom = cameraZoom;
-        camera.update();
     }
 
     @Override
     public void dispose() {
-        batch.dispose();
         for (Disposable disposable : TextureConverterUtil.getDisposableElements()) {
             disposable.dispose();
         }
@@ -117,8 +101,8 @@ public class GameLauncher extends ApplicationAdapter implements InputProcessor {
     @Override
     public boolean keyUp(int keycode) {
         if (keycode == Input.Keys.HOME) {
-            IDrawableGame temp = game;
+            IDrawableGame temp = roboRallyLauncher.roboRallyGame;
-            this.game = debugGame;
+            roboRallyLauncher.roboRallyGame = debugGame;
             this.debugGame = temp;
             return true;
         }
@@ -134,10 +118,7 @@ public class GameLauncher extends ApplicationAdapter implements InputProcessor {
                     new Vector3(0, 0, 1), 90);
             return true;
         } else if (character == 'q') {
-            camera.up.x = 0;
+            resetCamera();
-            camera.up.y = 1;
-            cameraZoom = 1;
-            camera.position.set(viewPortWidth/2f, viewPortHeight/2f, 0);
         }
         return false;
     }
@@ -165,6 +146,58 @@ public class GameLauncher extends ApplicationAdapter implements InputProcessor {
         return true;
     }
 
+    @Override
+    public boolean mouseMoved(int screenX, int screenY) {
+        return false;
+    }
+
+    @Override
+    public boolean scrolled(int amount) {
+        if (amount < 0 && cameraZoom > 0.3 || amount > 0 && cameraZoom < 3) {
+            cameraZoom += 0.2 * amount;
+        }
+        return true;
+    }
+
+    /**
+     * Resets the camera to its initial position
+     */
+    private void resetCamera() {
+        camera.up.x = 0;
+        camera.up.y = 1;
+        cameraZoom = 1;
+        camera.position.set(viewPortWidth/2f, viewPortHeight/2f, 0);
+    }
+
+    /**
+     * Renders all drawable objects on the board
+     * @param batch The sprite batch to use for drawing
+     */
+    private void drawBoard(SpriteBatch batch) {
+        List<IDrawableObject> elementsToDraw =
+                IOUtil.getDrawableObjectsFromGame(roboRallyLauncher.roboRallyGame, tileDimensions, tileDimensions);
+        for (IDrawableObject object : elementsToDraw) {
+            TextureRegion objectTextureRegion = object.getTexture();
+            batch.draw(objectTextureRegion.getTexture(), object.getXPosition(), object.getYPosition(),
+                    (float)object.getWidth()/2, (float)object.getHeight()/2,
+                    object.getWidth(), object.getHeight(), 1, 1, object.getRotation(),
+                    objectTextureRegion.getRegionX(), objectTextureRegion.getRegionY(),
+                    objectTextureRegion.getRegionWidth(), objectTextureRegion.getRegionHeight(),
+                    object.flipX(), object.flipY());
+        }
+    }
+
+    /**
+     * Updates the camera according to any user input
+     */
+    private void updateCamera() {
+        camera.translate(cameraX, cameraY);
+        cameraX = 0;
+        cameraY = 0;
+        camera.zoom = cameraZoom;
+        camera.update();
+    }
+
     /**
      * Translates x and y coordinates according to the camera's direction
      * @param x The x coordinate to translate
@@ -191,17 +224,4 @@ public class GameLauncher extends ApplicationAdapter implements InputProcessor {
         }
         return new int[]{outX, outY};
     }
-
-    @Override
-    public boolean mouseMoved(int screenX, int screenY) {
-        return false;
-    }
-
-    @Override
-    public boolean scrolled(int amount) {
-        if (amount < 0 && cameraZoom > 0.3 || amount > 0 && cameraZoom < 3) {
-            cameraZoom += 0.2 * amount;
-        }
-        return true;
-    }
 }

src/main/java/inf112/fiasko/roborally/game_wrapper/MainMenuScreen.java

@@ -0,0 +1,71 @@
+package inf112.fiasko.roborally.game_wrapper;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Screen;
+import com.badlogic.gdx.graphics.GL20;
+import com.badlogic.gdx.graphics.OrthographicCamera;
+import com.badlogic.gdx.utils.viewport.ExtendViewport;
+import com.badlogic.gdx.utils.viewport.Viewport;
+
+public class MainMenuScreen implements Screen {
+    final RoboRallyLauncher roboRallyLauncher;
+
+    final OrthographicCamera camera;
+    final Viewport viewport;
+
+    public MainMenuScreen(final RoboRallyLauncher roboRallyLauncher) {
+        this.roboRallyLauncher = roboRallyLauncher;
+        camera = new OrthographicCamera();
+        camera.setToOrtho(false, 400, 400);
+        viewport = new ExtendViewport(400, 400, camera);
+    }
+
+    @Override
+    public void show() {
+        //Nothing to do
+    }
+
+    @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();
+        roboRallyLauncher.batch.setProjectionMatrix(camera.combined);
+
+        roboRallyLauncher.batch.begin();
+        roboRallyLauncher.font.draw(roboRallyLauncher.batch, "Robo Rally", 0, 250,
+                200, 0, false);
+        roboRallyLauncher.font.draw(roboRallyLauncher.batch, "Click anywhere to run the demo", 70, 200);
+        roboRallyLauncher.batch.end();
+
+        if (Gdx.input.isTouched()) {
+            roboRallyLauncher.setScreen(roboRallyLauncher.screenManager.getBoardActiveScreen(this.roboRallyLauncher));
+            dispose();
+        }
+    }
+
+    @Override
+    public void resize(int width, int height) {
+        viewport.update(width, height);
+    }
+
+    @Override
+    public void pause() {
+        //Nothing to do
+    }
+
+    @Override
+    public void resume() {
+        //Nothing to do
+    }
+
+    @Override
+    public void hide() {
+        //Nothing to do
+    }
+
+    @Override
+    public void dispose() {
+        //Nothing to do
+    }
+}

src/main/java/inf112/fiasko/roborally/game_wrapper/RoboRallyLauncher.java

@@ -0,0 +1,25 @@
+package inf112.fiasko.roborally.game_wrapper;
+
+import com.badlogic.gdx.Game;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import inf112.fiasko.roborally.objects.IDrawableGame;
+
+public class RoboRallyLauncher extends Game {
+    SpriteBatch batch;
+    BitmapFont font;
+    ScreenManager screenManager;
+    IDrawableGame roboRallyGame;
+
+    @Override
+    public void create() {
+        batch = new SpriteBatch();
+        font = new BitmapFont();
+        this.screenManager = new ScreenManager();
+        this.setScreen(screenManager.getMainMenuScreen(this));
+    }
+
+    public void dispose() {
+        batch.dispose();
+    }
+}

src/main/java/inf112/fiasko/roborally/game_wrapper/ScreenManager.java

@@ -0,0 +1,33 @@
+package inf112.fiasko.roborally.game_wrapper;
+
+/**
+ * Keeps track of screen instances
+ */
+public class ScreenManager {
+    private MainMenuScreen mainMenuScreen;
+    private BoardActiveScreen boardActiveScreen;
+
+    /**
+     * Gets an instance of the main menu screen
+     * @param roboRallyLauncher The robo rally launcher instance to use
+     * @return A main menu screen instance
+     */
+    public synchronized MainMenuScreen getMainMenuScreen(RoboRallyLauncher roboRallyLauncher) {
+        if (this.mainMenuScreen == null) {
+            this.mainMenuScreen = new MainMenuScreen(roboRallyLauncher);
+        }
+        return mainMenuScreen;
+    }
+
+    /**
+     * Gets an instance of the board active screen
+     * @param roboRallyLauncher The robo rally launcher instance to use
+     * @return A board active screen instance
+     */
+    public synchronized BoardActiveScreen getBoardActiveScreen(RoboRallyLauncher roboRallyLauncher) {
+        if (this.boardActiveScreen == null) {
+            this.boardActiveScreen = new BoardActiveScreen(roboRallyLauncher);
+        }
+        return boardActiveScreen;
+    }
+}