Merge branch 'master' of https://github.com/pacien/upem-java-wallj

7 files changed, 74 insertions, 11 deletions

diff --git a/src/main/java/fr/umlv/java/wallj/Main.java b/src/main/java/fr/umlv/java/wallj/Main.java
index 0ac4136..37a99b0 100644
--- a/src/main/java/fr/umlv/java/wallj/Main.java
+++ b/src/main/java/fr/umlv/java/wallj/Main.java
@@ -27,7 +27,7 @@ public class Main {
         paths.add(Paths.get(string));
       }
     } else {
-      paths.add(getResourcePath("/maps/smallvalid.txt"));
+      paths.add(getResourcePath("/maps/level0.txt"));
     }
     return paths;
   }
diff --git a/src/main/java/fr/umlv/java/wallj/block/Stage.java b/src/main/java/fr/umlv/java/wallj/block/Stage.java
new file mode 100644
index 0000000..5d2d07c
--- /dev/null
+++ b/src/main/java/fr/umlv/java/wallj/block/Stage.java
@@ -0,0 +1,43 @@
+package fr.umlv.java.wallj.block;
+
+import fr.umlv.java.wallj.board.Board;
+import fr.umlv.java.wallj.context.Context;
+import fr.umlv.java.wallj.event.Event;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author
+ */
+public class Stage {
+  //TODO Class Stage
+  private final Board currentBoard;
+
+  public Stage(Board board) {
+    currentBoard = Objects.requireNonNull(board);
+  }
+
+  /**
+   * @return the current board of the game
+   */
+  public Board getCurrentBoard() {
+    return currentBoard;
+  }
+
+  /**
+   * @param context the current context
+   * @return a list of new events to perform
+   */
+  public List<Event> update(Context context) {
+    //TODO
+    return Collections.emptyList();
+  }
+
+  public boolean isCleared() {
+    // TODO
+    return false;
+  }
+
+}
diff --git a/src/main/java/fr/umlv/java/wallj/context/Game.java b/src/main/java/fr/umlv/java/wallj/context/Game.java
index 3ef725e..41d51db 100644
--- a/src/main/java/fr/umlv/java/wallj/context/Game.java
+++ b/src/main/java/fr/umlv/java/wallj/context/Game.java
@@ -63,7 +63,8 @@ public final class Game implements Updateable {
   public boolean isOver() {
     return over;
   }
-  public void setOver(){
+
+  public void setOver() {
     over = true;
   }
 
diff --git a/src/main/java/fr/umlv/java/wallj/context/InputHandler.java b/src/main/java/fr/umlv/java/wallj/context/InputHandler.java
index 64591df..2dcd512 100644
--- a/src/main/java/fr/umlv/java/wallj/context/InputHandler.java
+++ b/src/main/java/fr/umlv/java/wallj/context/InputHandler.java
@@ -2,6 +2,8 @@ package fr.umlv.java.wallj.context;
 
 import fr.umlv.java.wallj.board.TileVec2;
 import fr.umlv.java.wallj.event.BombSetupOrder;
+import fr.umlv.java.wallj.event.ConfirmOrder;
+import fr.umlv.java.wallj.event.GameOverEvent;
 import fr.umlv.java.wallj.event.MoveRobotOrder;
 import fr.umlv.zen5.ApplicationContext;
 import fr.umlv.zen5.Event;
@@ -53,6 +55,12 @@ public final class InputHandler {
             case SPACE:
               events.add(new BombSetupOrder());
               break;
+            case R:
+              events.add(new ConfirmOrder());
+              break;
+            case Q:
+              events.add(new GameOverEvent());
+              break;
           }
         }
       }
diff --git a/src/main/java/fr/umlv/java/wallj/controller/GameStateController.java b/src/main/java/fr/umlv/java/wallj/controller/GameStateController.java
index c2c28a7..d7b1638 100644
--- a/src/main/java/fr/umlv/java/wallj/controller/GameStateController.java
+++ b/src/main/java/fr/umlv/java/wallj/controller/GameStateController.java
@@ -14,23 +14,23 @@ public class GameStateController implements Controller {
   @Override
   public List<Event> update(Context context) {
     boolean isConfirmEvent = context.getEvents().stream().anyMatch(event -> event instanceof ConfirmOrder);
-    boolean isGameOver = context.getEvents().stream().allMatch(event -> event instanceof GameOverEvent);
+    boolean isGameOverEvent = context.getEvents().stream().anyMatch(event -> event instanceof GameOverEvent);
     Game currentGame = context.getGame();
     LinkedList<Event> events = new LinkedList<>();
-    if (isConfirmEvent) {
-      //TODO exiting
-      if (!isGameOver) {
+    //TODO exiting
+    if (isGameOverEvent) {
+      currentGame.setOver();
+    } else {
+      if (isConfirmEvent) {
         if (currentGame.getCurrentStage().isCleared()) {
           if (currentGame.hasNextBoard()) { //continue
             currentGame.nextStage();
-          } else {
-            events.add(new GameOverEvent());
+          } else { //no more board so game over
+            currentGame.setOver();
           }
         } else {//retry
           currentGame.retryStage();
         }
-      } else {
-        currentGame.setOver();
       }
     }
     return events;
diff --git a/src/main/java/fr/umlv/java/wallj/controller/StageController.java b/src/main/java/fr/umlv/java/wallj/controller/StageController.java
index d62e246..57a87fd 100644
--- a/src/main/java/fr/umlv/java/wallj/controller/StageController.java
+++ b/src/main/java/fr/umlv/java/wallj/controller/StageController.java
@@ -3,6 +3,7 @@ package fr.umlv.java.wallj.controller;
 import fr.umlv.java.wallj.context.Context;
 import fr.umlv.java.wallj.event.Event;
 
+import java.util.Collections;
 import java.util.List;
 
 public class StageController implements Controller {
@@ -10,7 +11,7 @@ public class StageController implements Controller {
 
   @Override
   public List<Event> update(Context context) {
-    return null;
+    return Collections.emptyList();
   }
 
 }
diff --git a/src/main/java/fr/umlv/java/wallj/viewer/Viewer.java b/src/main/java/fr/umlv/java/wallj/viewer/Viewer.java
index 463a461..a424f99 100644
--- a/src/main/java/fr/umlv/java/wallj/viewer/Viewer.java
+++ b/src/main/java/fr/umlv/java/wallj/viewer/Viewer.java
@@ -30,6 +30,7 @@ import java.util.Objects;
 public final class Viewer {
 
   private final Game currentGame;
+
   /**
    * @param boards the valid list of boards charged in the application
    */
@@ -43,10 +44,19 @@ public final class Viewer {
   public void eventLoop(ApplicationContext applicationContext) {
     List<Event> events = new LinkedList<>();
     while (!currentGame.isOver()) {
+      long timeBeforeExec = System.currentTimeMillis();
       applicationContext.renderFrame(graphics2D -> {
         events.addAll(renderFrame(graphics2D, applicationContext, events)); //add the new events returned by updates
       });
+      long timeAfterExec = System.currentTimeMillis();
+      long delay = timeAfterExec - timeBeforeExec;
+      try {
+        Thread.sleep(delay > 0 ? delay : 0);
+      } catch (Exception e) {
+        applicationContext.exit(-1);
+      }
     }
+    applicationContext.exit(0);
   }
 
   /**