9 files changed, 47 insertions, 13 deletions

diff --git a/src/docs/class.puml b/src/docs/class.puml
index dda61b7..dd294df 100644
--- a/src/docs/class.puml
+++ b/src/docs/class.puml
@@ -36,6 +36,7 @@ package context {
     final ScreenInfo
     paintCircle(Color, Vec2, float)
     paintSquare(Color, Vec2, float, float)
+    paintString(Color, Vec2,String)
   }
 
   class InputHandler {
diff --git a/src/main/java/fr/umlv/java/wallj/context/GraphicsContext.java b/src/main/java/fr/umlv/java/wallj/context/GraphicsContext.java
index 0475973..2c1c72a 100644
--- a/src/main/java/fr/umlv/java/wallj/context/GraphicsContext.java
+++ b/src/main/java/fr/umlv/java/wallj/context/GraphicsContext.java
@@ -1,5 +1,6 @@
 package fr.umlv.java.wallj.context;
 
+import fr.umlv.java.wallj.board.TileVec2;
 import fr.umlv.zen5.ScreenInfo;
 import org.jbox2d.common.Vec2;
 
@@ -47,7 +48,7 @@ public final class GraphicsContext {
    */
   public void paintCircle(Color color, Vec2 position, float size) {
     graphics2D.setColor(color);
-    graphics2D.fill(new Ellipse2D.Float(position.x, position.y, size, size));
+    graphics2D.fillOval(Math.round(position.x + (TileVec2.TILE_DIM - size) / 2) - 1, Math.round(position.y + (TileVec2.TILE_DIM - size) / 2) - 1, Math.round(size), Math.round(size));
   }
 
   /**
@@ -58,6 +59,11 @@ public final class GraphicsContext {
    */
   public void paintRectangle(Color color, Vec2 position, float width, float height) {
     graphics2D.setColor(color);
-    graphics2D.fill(new Rectangle2D.Float(position.x, position.y, width, height));
+    graphics2D.fillRect(Math.round(position.x), Math.round(position.y), Math.round(width), Math.round(height));
+  }
+
+  public void paintString(Color color, Vec2 position, String string){
+    graphics2D.setColor(color);
+    graphics2D.drawString(string,position.x, position.y);
   }
 }
diff --git a/src/main/java/fr/umlv/java/wallj/controller/BombDisplayController.java b/src/main/java/fr/umlv/java/wallj/controller/BombDisplayController.java
index aa652a8..86a857f 100644
--- a/src/main/java/fr/umlv/java/wallj/controller/BombDisplayController.java
+++ b/src/main/java/fr/umlv/java/wallj/controller/BombDisplayController.java
@@ -1,9 +1,14 @@
 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.BombBlock;
+import org.jbox2d.common.Vec2;
 
+import java.awt.*;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -18,8 +23,13 @@ public class BombDisplayController extends DisplayController {
 
   @Override
   public List<Event> update(Context context) {
-    //TODO
-    return null;
+    GraphicsContext graphicsContext = context.getGraphicsContext();
+    graphicsContext.paintCircle(Color.BLACK, bomb.getPos(), TileVec2.TILE_DIM);
+    Vec2 textPosition = bomb.getPos();
+    textPosition.x += TileVec2.TILE_DIM / 4.0f;
+    textPosition.y += 3 * TileVec2.TILE_DIM / 4.0f;
+    graphicsContext.paintString(Color.RED, textPosition, Integer.toString(bomb.getTimer()));
+    return Collections.emptyList();
   }
 
 }
diff --git a/src/main/java/fr/umlv/java/wallj/controller/BombPhysicsController.java b/src/main/java/fr/umlv/java/wallj/controller/BombPhysicsController.java
index 45a3626..ed7e520 100644
--- a/src/main/java/fr/umlv/java/wallj/controller/BombPhysicsController.java
+++ b/src/main/java/fr/umlv/java/wallj/controller/BombPhysicsController.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.BombBlock;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -19,7 +20,7 @@ public class BombPhysicsController 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/controller/GarbageDisplayController.java b/src/main/java/fr/umlv/java/wallj/controller/GarbageDisplayController.java
index e878fb2..e5e53ab 100644
--- a/src/main/java/fr/umlv/java/wallj/controller/GarbageDisplayController.java
+++ b/src/main/java/fr/umlv/java/wallj/controller/GarbageDisplayController.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.GarbageBlock;
 
+import java.awt.*;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -18,8 +22,9 @@ public class GarbageDisplayController extends DisplayController {
 
   @Override
   public List<Event> update(Context context) {
-    //TODO
-    return null;
+    GraphicsContext graphicsContext = context.getGraphicsContext();
+    graphicsContext.paintCircle(new Color(102, 51, 0), garbage.getPos(),TileVec2.TILE_DIM);
+    return Collections.emptyList();
   }
 
 }
diff --git a/src/main/java/fr/umlv/java/wallj/controller/RobotDisplayController.java b/src/main/java/fr/umlv/java/wallj/controller/RobotDisplayController.java
index 96ba68c..de3c4c4 100644
--- a/src/main/java/fr/umlv/java/wallj/controller/RobotDisplayController.java
+++ b/src/main/java/fr/umlv/java/wallj/controller/RobotDisplayController.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.RobotBlock;
 
+import java.awt.*;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -18,8 +22,9 @@ public class RobotDisplayController extends DisplayController {
 
   @Override
   public List<Event> update(Context context) {
-    //TODO
-    return null;
+    GraphicsContext graphicsContext = context.getGraphicsContext();
+    graphicsContext.paintCircle(Color.BLUE,robot.getPos(),TileVec2.TILE_DIM/2);
+    return Collections.emptyList();
   }
 
 }
diff --git a/src/main/java/fr/umlv/java/wallj/controller/RobotPhysicsController.java b/src/main/java/fr/umlv/java/wallj/controller/RobotPhysicsController.java
index f320480..57d098c 100644
--- a/src/main/java/fr/umlv/java/wallj/controller/RobotPhysicsController.java
+++ b/src/main/java/fr/umlv/java/wallj/controller/RobotPhysicsController.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.RobotBlock;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -19,7 +20,7 @@ public class RobotPhysicsController extends PhysicsController {
   @Override
   public List<Event> update(Context context) {