From 0abae880d3d987e12bd22c4cd9ebf6d4d63931da Mon Sep 17 00:00:00 2001
From: Matt Low <mattjlow94@gmail.com>
Date: Tue, 13 Nov 2018 17:58:42 +0400
Subject: [PATCH] Add MenuState, start with it and switch back when a game is
 finished

---
 core/assets/playBtn.png                       | Bin 0 -> 2794 bytes
 core/src/com/me/brickbuster/BrickBuster.java  |   4 +-
 .../com/me/brickbuster/state/MenuState.java   |  49 ++++++++++++++++++
 .../com/me/brickbuster/state/PlayState.java   |  17 +++++-
 core/src/com/me/brickbuster/state/State.java  |  10 +++-
 5 files changed, 75 insertions(+), 5 deletions(-)
 create mode 100644 core/assets/playBtn.png
 create mode 100644 core/src/com/me/brickbuster/state/MenuState.java

diff --git a/core/assets/playBtn.png b/core/assets/playBtn.png
new file mode 100644
index 0000000000000000000000000000000000000000..fde35774c7ca2425c4269607aeb318effd1680f3
GIT binary patch
literal 2794
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

literal 0
HcmV?d00001

diff --git a/core/src/com/me/brickbuster/BrickBuster.java b/core/src/com/me/brickbuster/BrickBuster.java
index 30add0e..eff946f 100644
--- a/core/src/com/me/brickbuster/BrickBuster.java
+++ b/core/src/com/me/brickbuster/BrickBuster.java
@@ -10,7 +10,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import com.badlogic.gdx.utils.viewport.FitViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
-import com.me.brickbuster.state.PlayState;
+import com.me.brickbuster.state.MenuState;
 
 public class BrickBuster extends Game {
 
@@ -39,7 +39,7 @@ public class BrickBuster extends Game {
 		sb = new SpriteBatch();
 		sr = new ShapeRenderer();
 
-		setScreen(new PlayState(this));
+		setScreen(new MenuState(this));
 	}
 
 	@Override
diff --git a/core/src/com/me/brickbuster/state/MenuState.java b/core/src/com/me/brickbuster/state/MenuState.java
new file mode 100644
index 0000000..09c6708
--- /dev/null
+++ b/core/src/com/me/brickbuster/state/MenuState.java
@@ -0,0 +1,49 @@
+package com.me.brickbuster.state;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.math.Vector3;
+import com.me.brickbuster.BrickBuster;
+
+public class MenuState extends State {
+
+	private Texture playButton;
+
+	public MenuState(BrickBuster game) {
+		super(game);
+	}
+
+	@Override
+	public void setup() {
+		this.playButton = new Texture(Gdx.files.internal("playBtn.png"));
+	}
+
+	@Override
+	public void render() {
+		game.sb.begin();
+		game.sb.draw(playButton,
+					BrickBuster.BOARD_WIDTH/2-playButton.getWidth()/2,
+					BrickBuster.BOARD_HEIGHT/2-playButton.getHeight()/2);
+		game.sb.end();
+	}
+
+	@Override
+	public void update(float dt) {
+		if (Gdx.input.justTouched()) {
+			Vector3 clickLoc = game.cam.unproject(new Vector3(Gdx.input.getX(), Gdx.input.getY(), 0));
+			if (clickLoc.x >= BrickBuster.BOARD_WIDTH/2-playButton.getWidth()/2
+					&& clickLoc.x <= BrickBuster.BOARD_WIDTH/2+playButton.getWidth()/2
+					&& clickLoc.y >= BrickBuster.BOARD_HEIGHT/2-playButton.getHeight()/2
+					&& clickLoc.y <= BrickBuster.BOARD_HEIGHT/2+playButton.getHeight()/2) {
+				game.setScreen(new PlayState(game));
+				dispose();
+			}
+		}
+	}
+
+	@Override
+	public void dispose() {
+		super.dispose();
+		playButton.dispose();
+	}
+}
diff --git a/core/src/com/me/brickbuster/state/PlayState.java b/core/src/com/me/brickbuster/state/PlayState.java
index 813935c..787ef93 100644
--- a/core/src/com/me/brickbuster/state/PlayState.java
+++ b/core/src/com/me/brickbuster/state/PlayState.java
@@ -115,12 +115,25 @@ public class PlayState extends State {
 		}
 
 		if (bricks.isEmpty()) {
-			// TODO: Fix this - go to an after-game menu
-			//create();
+			game.setScreen(new MenuState(game));
+			dispose();
 		}
 		updateTime = System.nanoTime() - start;
 	}
 
+	@Override
+	public void dispose() {
+		super.dispose();
+
+		powerUps.clear();
+		powerUps = null;
+		balls.clear();
+		balls = null;
+		bricks.clear();
+		bricks = null;
+		paddle = null;
+	}
+
 	public int getShieldCount() {
 		return shieldCount;
 	}
diff --git a/core/src/com/me/brickbuster/state/State.java b/core/src/com/me/brickbuster/state/State.java
index 22fe224..84abf53 100644
--- a/core/src/com/me/brickbuster/state/State.java
+++ b/core/src/com/me/brickbuster/state/State.java
@@ -6,6 +6,7 @@ import com.me.brickbuster.BrickBuster;
 public abstract class State extends ScreenAdapter {
 
 	protected final BrickBuster game;
+	private boolean disposed;
 
 	public State(BrickBuster game) {
 		this.game = game;
@@ -15,7 +16,14 @@ public abstract class State extends ScreenAdapter {
 	@Override
 	public final void render(float delta) {
 		update(delta);
-		render();
+		if (!disposed) {
+			render();
+		}
+	}
+
+	@Override
+	public void dispose() {
+		this.disposed = true;
 	}
 
 	public abstract void setup();