Ignore the previous pull request

.gitignore

@@ -1,8 +1,7 @@
 
 # Created by https://www.gitignore.io/api/git,netbeans,intellij,intellij+iml,intellij+all,eclipse,java
-
+.DS_Store
 ### Eclipse ###
-
 .metadata
 bin/
 tmp/

README.md

@@ -1,7 +1,7 @@
 # Aidos
 A beginner friendly project with aim of creating our own version of Bomberman.
 
-![Alt Text](https://media.giphy.com/media/xUOxf8uHAc2OIclI9a/giphy.gif)
+![Alt Text](assets/img/ezgif-6-e0f2fc739fb7.gif)
 
 ## Getting Started
 

build.xml

@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- You may freely edit this file. See commented blocks below for --><!-- some examples of how to customize the build. --><!-- (If you delete it and reopen the project it will be recreated.) --><!-- By default, only the Clean and Build commands use this build script. --><project name="Bomberman" default="default" basedir="." xmlns:fx="javafx:com.sun.javafx.tools.ant">
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<project name="Bomberman" default="default" basedir="." xmlns:fx="javafx:com.sun.javafx.tools.ant">
     <description>Builds, tests, and runs the project Bomberman.</description>
     <import file="nbproject/build-impl.xml"/>
     <!--

src/bomberman/Bomberman.java

@@ -1,7 +1,6 @@
 package bomberman;
 
 import bomberman.constants.GlobalConstants;
-import bomberman.scenes.Sandbox;
 import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
@@ -11,12 +10,16 @@ public class Bomberman extends Application {
     @Override
     public void start(Stage primaryStage) {
         primaryStage.setTitle(GlobalConstants.GAME_NAME + GlobalConstants.GAME_VERSION);
-        Sandbox.setupScene();
-        Scene s = Sandbox.getScene();
+        GameHandler gh = new GameHandler();
+        GameController controller = new GameController(gh);
+        GameView view = new GameView(controller);
+        controller.setView(view);
+        controller.newGame();
+        Scene s = view.getScene();
         primaryStage.setScene(s);
         primaryStage.show();
     }
-
+    
     public static void main(String[] args) {
         launch(args);
     }

src/bomberman/GameController.java

@@ -0,0 +1,71 @@
+package bomberman;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+public class GameController implements GameObserver {
+
+	private GameHandler game;
+	private GameView view;
+	private StringProperty level, state, lives;
+
+	public GameController(GameHandler gh) {
+		game = gh;
+		gh.addObserver(this);
+		level = new SimpleStringProperty("");
+		state = new SimpleStringProperty("");
+		lives = new SimpleStringProperty("");
+	}
+
+	StringProperty levelLabel() {
+		return level;
+	}
+
+	StringProperty stateLabel() {
+		return state;
+	}
+
+	StringProperty livesLabel() {
+		return lives;
+	}
+
+	void setView(GameView view) {
+		this.view = view;
+	}
+
+	void newGame() {
+		game.newGame();
+		updateLabels();
+	}
+
+	void pause() {
+		game.stopGame();
+		updateLabels();
+	}
+
+	void play() {
+		game.resumeGame();
+		updateLabels();
+	}
+
+	void loadLevel(int newLevel) {
+		game.loadLevel(newLevel);
+		updateLabels();
+	}
+
+	public void update() {
+		updateLabels();
+	}
+
+	public void newLevel(double width, double height) {
+		view.resetCanvas(width, height);
+		updateLabels();
+	}
+
+	private void updateLabels() {
+		level.setValue("Level: " + game.getLCurrentLevel());
+		state.setValue("Game Status: " + game.getGameStatus());
+		lives.setValue("Lives: " + game.getLives());
+	}
+
+}

src/bomberman/GameHandler.java

@@ -0,0 +1,114 @@
+package bomberman;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Observable;
+import java.util.Observer;
+
+import bomberman.constants.GlobalConstants;
+import bomberman.constants.GlobalConstants.GameStatus;
+
+import static bomberman.constants.GlobalConstants.GameStatus.*;
+import static bomberman.constants.GlobalConstants.NUM_LEVELS;
+
+/**
+ * Manages the game at the highest level, and holds information such as the
+ * current level, etc. When a player has won a map, it is responsible for
+ * loading the second map onto the window.
+ * 
+ * @author tialim
+ *
+ */
+
+public class GameHandler implements Observer {
+
+	private MapLoader mapL;
+	private Sandbox sb;
+	private GameLoop loop;
+	private GameStatus state;
+	private Collection<GameObserver> observers;
+	private int lives, level = 1;
+
+	public GameHandler() {
+		lives = GlobalConstants.LIVES;
+		mapL = new MapLoader();
+		loop = new GameLoop();
+		observers = new ArrayList<GameObserver>();
+	}
+
+	public void update(Observable o, Object arg) {
+		if (sb.gameWon()) {
+			nextLevel();
+		} else if (sb.playerDead()) {
+			if (lives > 0) { // still have lives left
+				lives--;
+				mapL.getPlayers()
+						.forEach(p -> {
+							p.reset(); // reset player
+							sb.addEntityToGame(p); // reinitialize player
+						});
+			} else { // no more lives left
+				state = GameOver;
+			}
+		}
+		observers.forEach(GameObserver::update);
+	}
+
+	public void addObserver(GameObserver ob) {
+		observers.add(ob);
+	}
+
+	// -------- Methods for buttons and screen controls---------
+
+	void newGame() {
+		lives = GlobalConstants.LIVES;
+		loadLevel(1);
+	}
+
+	void stopGame() {
+		state = Paused;
+		loop.stop();
+	}
+
+	void resumeGame() {
+		state = Running;
+		loop.start();
+	}
+
+	// -------- Getters and Setters---------
+
+	int getLives() {
+		return lives;
+	}
+
+	int getLCurrentLevel() {
+		return level;
+	}
+
+	GameStatus getGameStatus() {
+		return state;
+	}
+
+	// -------- Private Methods -----------
+
+	private void nextLevel() {
+		if ((level) < NUM_LEVELS) {
+			loadLevel(++level);
+		}
+	}
+
+	void loadLevel(int newLevel) { // TODO change to private later; kept open for dev.
+		this.level = newLevel;
+
+		mapL.loadLevel(level);
+		double sceneW = mapL.getSceneWidth();
+		double sceneH = mapL.getSceneHeight();
+		observers.forEach(ob -> ob.newLevel(sceneW, sceneH));
+
+		sb = new Sandbox(this, mapL.getEntities());
+		stopGame();
+		loop.init(sb, sceneW, sceneH);
+		resumeGame();
+	}
+
+}

src/bomberman/GameLoop.java

@@ -1,66 +1,64 @@
 package bomberman;
 
-import bomberman.constants.GlobalConstants;
-import bomberman.entity.Entity;
-import bomberman.entity.staticobjects.BlackBomb;
-import bomberman.gamecontroller.InputManager;
-import bomberman.scenes.Sandbox;
-import java.util.Iterator;
-import java.util.Vector;
 import javafx.animation.AnimationTimer;
-import javafx.scene.canvas.GraphicsContext;
 
 public class GameLoop {
 
-    static double currentGameTime;
-    static double oldGameTime;
-    static double deltaTime;
-    final static long startNanoTime = System.nanoTime();
+	private static double currentGameTime, oldGameTime, deltaTime, width, height;
+	private final long startNanoTime = System.nanoTime();
+	private boolean isStopped;
+	private AnimationTimer animationT;
+	private Sandbox sb;
 
-    public static double getCurrentGameTime() {
-        return currentGameTime;
-    }
+	public GameLoop() {
+		isStopped = true;
+	};
 
-    public static void start(GraphicsContext gc) {
-        GameState.gameStatus=GlobalConstants.GameStatus.Running;
-        new AnimationTimer() {
-            public void handle(long currentNanoTime) {
-            	oldGameTime = currentGameTime;
-            	currentGameTime = (currentNanoTime - startNanoTime) / 1000000000.0;
-            	deltaTime = currentGameTime - oldGameTime;
-                gc.clearRect(0, 0, GlobalConstants.CANVAS_WIDTH, GlobalConstants.CANVAS_WIDTH);
-                //TODO This will have to be something like, currentScene.getEntities()
-                updateGame();
-                renderGame();
-            }
-        }.start();
-    }
+	public GameLoop( Sandbox sandbox, double w, double h) {
+		isStopped = true;
+		init(sandbox, w, h);
+	}
 
-    public static double getDeltaTime() {
-    	return deltaTime * 100;
-    }
+	public void init(Sandbox sandbox, double w, double h) {
+		width = w;
+		height = h;
+		sb = sandbox;
+		animationT = new AnimationTimer() {
+			public void handle(long currentNanoTime) {
+				oldGameTime = currentGameTime;
+				currentGameTime = (currentNanoTime - startNanoTime) / 1000000000.0;
+				deltaTime = currentGameTime - oldGameTime;
+				Renderer.gc.clearRect(0, 0, width, height);
+				sb.update();
+				renderGame(sb);
+			}
+		};
+	}
 
-    public static void updateGame() {
-        InputManager.handlePlayerMovements();
-        Vector<Entity> entities = Sandbox.getEntities();
-        Iterator<Entity> it = entities.iterator();
-        //remove the current bomb
-        while (it.hasNext()) {
-            Entity entity = it.next();
-            if(entity instanceof BlackBomb){
-                boolean alive = ((BlackBomb) entity).isAlive();
-                if(!alive){
-                    // not removig directly from list to prevent ConcurrentModification
-                    it.remove();
-                }
-            }
-        }
-    }
+	public static double getCurrentGameTime() {
+		return currentGameTime;
+	}
 
-    public static void renderGame() {
-        for (Entity e : Sandbox.getEntities()) {
-            e.draw();
-        }
-    }
+	public void start() {
+		if (isStopped) {
+			animationT.start();
+			isStopped = false;
+		}
+	}
+
+	public void stop() {
+		if (!isStopped) {
+			animationT.stop();
+			isStopped = true;
+		}
+	}
+
+	public double getDeltaTime() {
+		return deltaTime * 100;
+	}
+
+	public static void renderGame(Sandbox sb) {
+		sb.forEach(e -> e.draw(sb));
+	}
 
 }

src/bomberman/GameObserver.java

@@ -0,0 +1,6 @@
+package bomberman;
+
+public interface GameObserver {
+	void newLevel(double width, double height);
+	void update();
+}

src/bomberman/GameState.java

@@ -16,5 +16,5 @@ public class GameState {
     public static int level;
     public static Date lastSaved;
     public static boolean hasUnsavedChanges;
-    public static GlobalConstants.GameStatus gameStatus;
+    public static GlobalConstants.GameStatus gameStatus = GlobalConstants.GameStatus.Running;
 }