56 files changed, 5435 insertions, 0 deletions

diff --git a/img/Animal/Bear.png b/img/Animal/Bear.png
new file mode 100644
index 0000000..1ba6ec6
--- /dev/null
+++ b/img/Animal/Bear.png
diff --git a/img/Animal/Hamster.png b/img/Animal/Hamster.png
new file mode 100644
index 0000000..3aadd70
--- /dev/null
+++ b/img/Animal/Hamster.png
diff --git a/img/Animal/Monkey.png b/img/Animal/Monkey.png
new file mode 100644
index 0000000..bcea339
--- /dev/null
+++ b/img/Animal/Monkey.png
diff --git a/img/Animal/Mouse.png b/img/Animal/Mouse.png
new file mode 100644
index 0000000..6b9e95d
--- /dev/null
+++ b/img/Animal/Mouse.png
diff --git a/img/Animal/Panda.png b/img/Animal/Panda.png
new file mode 100644
index 0000000..199238a
--- /dev/null
+++ b/img/Animal/Panda.png
diff --git a/img/Animal/SpaceInvader.png b/img/Animal/SpaceInvader.png
new file mode 100644
index 0000000..cd9ebe8
--- /dev/null
+++ b/img/Animal/SpaceInvader.png
diff --git a/img/Predator/Blinky.png b/img/Predator/Blinky.png
new file mode 100644
index 0000000..7143fd2
--- /dev/null
+++ b/img/Predator/Blinky.png
diff --git a/img/Predator/Clyde.png b/img/Predator/Clyde.png
new file mode 100644
index 0000000..04c7c30
--- /dev/null
+++ b/img/Predator/Clyde.png
diff --git a/img/Predator/Inky.png b/img/Predator/Inky.png
new file mode 100644
index 0000000..f6efa4a
--- /dev/null
+++ b/img/Predator/Inky.png
diff --git a/img/Predator/Pinky.png b/img/Predator/Pinky.png
new file mode 100644
index 0000000..d50102e
--- /dev/null
+++ b/img/Predator/Pinky.png
diff --git a/img/Prey/PacMan.big.png b/img/Prey/PacMan.big.png
new file mode 100644
index 0000000..c1b0e17
--- /dev/null
+++ b/img/Prey/PacMan.big.png
diff --git a/img/Prey/PacMan.png b/img/Prey/PacMan.png
new file mode 100644
index 0000000..d766f25
--- /dev/null
+++ b/img/Prey/PacMan.png
diff --git a/img/tiles/exit.png b/img/tiles/exit.png
new file mode 100644
index 0000000..5286a5a
--- /dev/null
+++ b/img/tiles/exit.png
diff --git a/img/tiles/free.png b/img/tiles/free.png
new file mode 100644
index 0000000..1804c42
--- /dev/null
+++ b/img/tiles/free.png
diff --git a/img/tiles/nothing.png b/img/tiles/nothing.png
new file mode 100644
index 0000000..5219d54
--- /dev/null
+++ b/img/tiles/nothing.png
diff --git a/img/tiles/start.png b/img/tiles/start.png
new file mode 100644
index 0000000..ff429b6
--- /dev/null
+++ b/img/tiles/start.png
diff --git a/img/tiles/wall.png b/img/tiles/wall.png
new file mode 100644
index 0000000..c216e26
--- /dev/null
+++ b/img/tiles/wall.png
diff --git a/img/unknown.png b/img/unknown.png
new file mode 100644
index 0000000..97c58b8
--- /dev/null
+++ b/img/unknown.png
diff --git a/labyrinth.txt b/labyrinth.txt
new file mode 100644
index 0000000..4b7a42b
--- /dev/null
+++ b/labyrinth.txt
@@ -0,0 +1,16 @@
+
+To load this labyrinth, write :
+
+        int[][] labyrinth = LabyrinthGenerator.readFromFile("labyrinth.txt");
+
+1 2 1 1 1 1 1 1 1 1 1 
+1 0 0 0 0 1 0 0 0 0 1
+1 0 1 1 1 1 1 0 1 0 1
+1 0 1 0 0 0 0 0 1 0 1
+1 0 1 0 1 1 1 0 1 0 1
+1 0 0 0 1 0 1 0 1 1 1
+1 1 1 1 1 0 1 0 1 0 3
+1 0 0 0 0 0 1 0 1 0 1
+1 0 1 1 1 1 1 0 1 0 1
+1 0 0 0 0 0 0 0 0 0 1
+1 1 1 1 1 1 1 1 1 1 1
\ No newline at end of file
diff --git a/src/ch/epfl/maze/graphics/Animation.java b/src/ch/epfl/maze/graphics/Animation.java
new file mode 100644
index 0000000..0502a92
--- /dev/null
+++ b/src/ch/epfl/maze/graphics/Animation.java
@@ -0,0 +1,245 @@
+package ch.epfl.maze.graphics;
+
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.awt.image.ImageObserver;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import javax.imageio.ImageIO;
+
+import ch.epfl.maze.physical.Animal;
+import ch.epfl.maze.util.Action;
+import ch.epfl.maze.util.Direction;
+import ch.epfl.maze.util.Vector2D;
+
+/**
+ * Handles the animation of a {@code Simulation} by extrapolating the positions
+ * of animals.
+ * 
+ */
+
+public final class Animation {
+
+        /** Default number of waiting frames to display when animation is aborting. */
+        public static final int DEFAULT_WAITING_FRAMES = 2;
+
+        /** Maps animals identity to graphical components that will be  animated. */
+        private Map<Integer, GraphicComponent> mGraphMap;
+
+        /** Buffer of images of animals. Key format: "superclass.class" */
+        private Map<String, BufferedImage> mImages;
+
+        /** Drawing ratio variable. */
+        private float mRatio;
+
+        /** Control variable. */
+        private boolean mDone;
+
+        /** Current number of waiting frames, to prevent screen from flashing. */
+        private int mWaitingFrames;
+
+        /**
+         * Constructs an animation handler that will animate animals on a graphic
+         * environment by extrapolating their position.
+         * 
+         * @param animals
+         *            The {@code List} of animals that will be shown on the first
+         *            frame
+         */
+
+        public Animation(List<Animal> animals) {
+                mGraphMap = new TreeMap<Integer, GraphicComponent>();
+                mImages = new HashMap<String, BufferedImage>();
+
+                // sanity check
+                if (animals != null) {
+                        // puts default action to draw animals and loads corresponding image
+                        Action none = new Action(Direction.NONE);
+                        for (int i = 0; i < animals.size(); i++) {
+                                Animal animal = animals.get(i);
+                                BufferedImage img = loadImage(animal);
+                                Vector2D position = animal.getPosition().mul(Display.SQUARE_SIZE);
+        
+                                mGraphMap.put(i, new GraphicComponent(img, position, none));
+                        }
+                }
+
+                // default values
+                mDone = true;
+                mWaitingFrames = 0;
+        }
+
+        /**
+         * Asks the animation to update an animal on the screen with a corresponding
+         * action. The animal is identified by a number, so it can be overwritten in
+         * case of a future update.
+         * 
+         * @param animal
+         *            Animal to update with action
+         * @param id
+         *            Unique identifier for animal
+         * @param action
+         *            Action that animal needs to perform
+         */
+
+        public void update(Animal animal, int id, Action action) {
+                // sanity checks
+                if (action == null) {
+                        action = new Action(Direction.NONE, false);