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

5 files changed, 92 insertions, 26 deletions

diff --git a/src/main/java/fr/umlv/java/wallj/Main.java b/src/main/java/fr/umlv/java/wallj/Main.java
index 7511980..3b3ad54 100644
--- a/src/main/java/fr/umlv/java/wallj/Main.java
+++ b/src/main/java/fr/umlv/java/wallj/Main.java
@@ -1,20 +1,51 @@
 package fr.umlv.java.wallj;
 
+import fr.umlv.java.wallj.board.Board;
+import fr.umlv.java.wallj.board.BoardParser;
+import fr.umlv.java.wallj.viewer.Viewer;
 import fr.umlv.zen5.Application;
 
 import java.awt.*;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.LinkedList;
+import java.util.List;
 
 public class Main {
 
-  /**
-   * Dummy entry point.
-   *
-   * @param args no need to argue
-   */
-  public static void main(String[] args) {
-    System.out.println("Hello World!");
-    Application.run(Color.BLACK, (ac) -> {
-    });
+  private static Path getResourcePath(String str) throws URISyntaxException {
+    return Paths.get(Main.class.getResource(str).toURI());
+  }
+
+  private static java.util.List<Path> getResourcePaths(String[] args) throws URISyntaxException {
+    LinkedList<Path> paths = new LinkedList<>();
+    if (args.length > 0) {
+      for (String string : args) {
+        paths.add(Paths.get(string));
+      }
+    } else {
+      paths.add(getResourcePath("/maps/smallvalid.txt"));
+    }
+    return paths;
   }
 
+  public static void main(String[] args) {
+    java.util.List<Board> boards = new LinkedList<>();
+    try {
+      List<Path> boardPaths = Main.getResourcePaths(args);
+      for (Path path : boardPaths) {
+        boards.add(BoardParser.parse(path));
+      }
+      Viewer viewer = new Viewer(boards);
+      Application.run(Color.BLACK, viewer::eventLoop);
+    } catch (URISyntaxException e) {
+      System.err.println(e.getMessage());
+      System.exit(1);
+    } catch (IOException e) {
+      System.err.println(e.getMessage());
+      System.exit(2);
+    }
+  }
 }
diff --git a/src/main/java/fr/umlv/java/wallj/board/TileVec2.java b/src/main/java/fr/umlv/java/wallj/board/TileVec2.java
index 82200a7..1d95690 100644
--- a/src/main/java/fr/umlv/java/wallj/board/TileVec2.java
+++ b/src/main/java/fr/umlv/java/wallj/board/TileVec2.java
@@ -14,7 +14,7 @@ import java.util.stream.Collectors;
  */
 public final class TileVec2 {
 
-  private static final int TILE_DIM = 20;
+  public static final int TILE_DIM = 20;
   private static final List<TileVec2> NEIGHBOR_OFFSETS = Arrays.asList(
   of(0, -1),
   of(-1, 0),
diff --git a/src/main/java/fr/umlv/java/wallj/controller/WallDisplayController.java b/src/main/java/fr/umlv/java/wallj/controller/WallDisplayController.java
index 3700acb..7b7011c 100644
--- a/src/main/java/fr/umlv/java/wallj/controller/WallDisplayController.java
+++ b/src/main/java/fr/umlv/java/wallj/controller/WallDisplayController.java
@@ -1,9 +1,13 @@
 package fr.umlv.java.wallj.controller;
 
+import fr.umlv.java.wallj.board.TileVec2;
 import fr.umlv.java.wallj.context.Context;
+import fr.umlv.java.wallj.context.GraphicsContext;
 import fr.umlv.java.wallj.event.Event;
 import fr.umlv.java.wallj.model.WallBlock;
 
+import java.awt.*;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -18,8 +22,9 @@ public class WallDisplayController extends BlockController {
 
   @Override
   public List<Event> update(Context context) {
-    //TODO
-    return null;
+    GraphicsContext graphicsContext = context.getGraphicsContext();
+    graphicsContext.paintRectangle(Color.GRAY,wall.getPos(), TileVec2.TILE_DIM,TileVec2.TILE_DIM);
+    return Collections.emptyList();
   }
 
 }
diff --git a/src/main/java/fr/umlv/java/wallj/controller/WallPhysicsController.java b/src/main/java/fr/umlv/java/wallj/controller/WallPhysicsController.java
index 146ca34..3fb00bb 100644
--- a/src/main/java/fr/umlv/java/wallj/controller/WallPhysicsController.java
+++ b/src/main/java/fr/umlv/java/wallj/controller/WallPhysicsController.java
@@ -4,6 +4,7 @@ import fr.umlv.java.wallj.context.Context;
 import fr.umlv.java.wallj.event.Event;
 import fr.umlv.java.wallj.model.WallBlock;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -19,7 +20,7 @@ public class WallPhysicsController extends PhysicsController {
   @Override
   public List<Event> update(Context context) {
     //TODO
-    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 4ff432c..a87f418 100644
--- a/src/main/java/fr/umlv/java/wallj/viewer/Viewer.java
+++ b/src/main/java/fr/umlv/java/wallj/viewer/Viewer.java
@@ -1,34 +1,63 @@
 package fr.umlv.java.wallj.viewer;
 
+import fr.umlv.java.wallj.board.Board;
+import fr.umlv.java.wallj.board.BoardParser;
+import fr.umlv.java.wallj.board.BoardValidator;
+import fr.umlv.java.wallj.context.Context;
+import fr.umlv.java.wallj.context.Game;
+import fr.umlv.java.wallj.context.InputHandler;
+import fr.umlv.java.wallj.context.ScreenManager;
+import fr.umlv.java.wallj.event.Event;
+import fr.umlv.zen5.Application;
 import fr.umlv.zen5.ApplicationContext;
+import sun.awt.image.ImageWatched;
 
 import java.awt.*;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * Link between application and Zen 5
  */
-public class Viewer {
-
-  public static void main(String[] strings) {
+public final class Viewer {
 
+  private final Game currentGame;
+  /**
+   * @param boards the valid list of boards charged in the application
+   */
+  public Viewer(List<Board> boards) {
+    this.currentGame = new Game(Objects.requireNonNull(boards));
   }
 
   /**
-   *
    * @param applicationContext the application context from Zen 5
    */
-  public static void eventLoop(ApplicationContext applicationContext) {
-    //TODO lambda exp for Application.run(Consumer<...>)
-    //usage : Viewer::eventLoop
+  public void eventLoop(ApplicationContext applicationContext) {
+    List<Event> events = new LinkedList<>();
+    while (!currentGame.isOver()) {
+      applicationContext.renderFrame(graphics2D -> {
+        events.addAll(renderFrame(graphics2D, applicationContext, events)); //add the new events returned by updates
+      });
+    }
   }
 
   /**
-   *
-   * @param graphics2D the graphic2D from Zen 5
+   * @param graphics2D         the graphic2D from Zen 5
    * @param applicationContext the application context from Zen 5
    */
-  public static void renderFrame(Graphics2D graphics2D,ApplicationContext applicationContext) {
-    //TODO lambda exp for ApplicationContext.renderFrame(Consumer<...>)
+  public List<Event> renderFrame(Graphics2D graphics2D, ApplicationContext applicationContext, List<Event> events) {
+    InputHandler inputHandler = new InputHandler(applicationContext);