added more walk areas.

src/gui/simulator/AccessPoint.java

@@ -2,6 +2,7 @@ package gui.simulator;
 
 import gui.simulator.Terrain.Location;
 
+import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
 
 public class AccessPoint extends DrawEngine implements Serializable {
@@ -11,19 +12,19 @@ public class AccessPoint extends DrawEngine implements Serializable {
 	private Terrain terrain;
 	
 	
-
+    //TODO change visilibty
     public AccessPoint(Terrain terrain, int x, int y) {
-        super(images, x, y, 1, 0, SimulatorPane.Objects.ENTRANCE, terrain);
+        super(images, x, y, 1, 0, SimulatorPane.Objects.ENTRANCE, terrain, new Rectangle2D.Double(-10, -10, 430, 170), true);
         this.terrain = terrain;
     }
 
     public AccessPoint(Terrain terrain, int x, int y, double scale, double distance) {
-        super(images, x, y, scale, distance, SimulatorPane.Objects.ENTRANCE, terrain);
+        super(images, x, y, scale, distance, SimulatorPane.Objects.ENTRANCE, terrain, new Rectangle2D.Double(-10, -10, 430, 170), true);
         this.terrain = terrain;
     }
     
     public AccessPoint(int x, int y, double scale, double distance, Terrain terrain) {
-        super(images, x, y, scale, distance, SimulatorPane.Objects.ENTRANCE, terrain);
+        super(images, x, y, scale, distance, SimulatorPane.Objects.ENTRANCE, terrain, new Rectangle2D.Double(-10, -10, 430, 170), true);
         this.terrain = terrain;
     }
     

src/gui/simulator/Border.java

@@ -16,7 +16,7 @@ public class Border extends DrawEngine implements Serializable {
 	private int height;
 
     public  Border(int x, int y, int width, int heigth, Terrain terrain) {
-        super(images, x, y, 1, 0, SimulatorPane.Objects.BORDER, terrain);
+        super(images, x, y, 1, 0, SimulatorPane.Objects.BORDER, terrain, null, false);
     }
     
     public String getFacilityName(){

src/gui/simulator/DrawEngine.java

@@ -21,8 +21,10 @@ public abstract class DrawEngine {
     private double distanceToOtherObjects;
     public SimulatorPane.Objects type;
     private Terrain terrain;
+    private boolean drawWalkArea;
+    private Rectangle2D.Double walkArea;
 
-    public DrawEngine(Images.ImageType image, int x, int y, double scale, double distanceToOtherObjects, SimulatorPane.Objects objecttype, Terrain terrain){
+    public DrawEngine(Images.ImageType image, int x, int y, double scale, double distanceToOtherObjects, SimulatorPane.Objects objecttype, Terrain terrain, Rectangle2D.Double walkArea, boolean drawWalkArea){
         this.image = image;
         this.type = objecttype;
         this.x = x;
@@ -30,6 +32,8 @@ public abstract class DrawEngine {
         this.scale = scale;
         this.distanceToOtherObjects = distanceToOtherObjects;
         this.terrain = terrain;
+        this.walkArea = walkArea;
+        this.drawWalkArea = drawWalkArea;
     }
 
     public AffineTransform getAffineTransform(){
@@ -40,8 +44,12 @@ public abstract class DrawEngine {
         return transform;
     }
 
-    public void draw(Graphics2D g){
+    public void draw(Graphics2D g) {
         g.drawImage(Images.getImage(image), this.getAffineTransform(), null);
+        if(this.drawWalkArea){
+            g.setColor(new Color(0, 255, 0, 100));
+            g.fill(getAffineTransform().createTransformedShape(this.walkArea));
+        }
     }
 
     public boolean contains(Point2D point){

src/gui/simulator/ExitPoint.java

@@ -2,6 +2,7 @@ package gui.simulator;
 
 import gui.simulator.Terrain.Location;
 
+import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
 
 public class ExitPoint extends DrawEngine implements Serializable {
@@ -10,14 +11,14 @@ public class ExitPoint extends DrawEngine implements Serializable {
 	private static String facilityName = "Uitgang";
 	private Terrain terrain;
 
-
+    //TODO change visibility
     public ExitPoint(Terrain terrain, int x, int y, double scale, double distance) {
-        super(images, x, y, scale, distance, SimulatorPane.Objects.EXIT, terrain);
+        super(images, x, y, scale, distance, SimulatorPane.Objects.EXIT, terrain, new Rectangle2D.Double(-10, -10, 430, 170), true);
         this.terrain = terrain;
     }
     
     public ExitPoint(int x, int y, double scale, double distance, Terrain terrain) {
-        super(images, x, y, scale, distance, SimulatorPane.Objects.EXIT, terrain);
+        super(images, x, y, scale, distance, SimulatorPane.Objects.EXIT, terrain, new Rectangle2D.Double(-10, -10, 430, 170), true);
         this.terrain = terrain;
     }
     

src/gui/simulator/facilities/Fence.java

@@ -5,6 +5,7 @@ import gui.simulator.Images;
 import gui.simulator.SimulatorPane;
 import gui.simulator.Terrain;
 
+import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
 
 public class Fence extends DrawEngine implements Serializable {
@@ -12,12 +13,13 @@ public class Fence extends DrawEngine implements Serializable {
 	private static Images.ImageType images = Images.ImageType.Fence;
 	private static String facilityName = "Fence";
 
+    //TODO Make this invisible
     public Fence(int x, int y, Terrain terrain) {
-        super(images, x, y, 1, 0, SimulatorPane.Objects.FENCE, terrain);
+        super(images, x, y, 1, 0, SimulatorPane.Objects.FENCE, terrain, new Rectangle2D.Double(-10, -10, 280, 50), true);
     }
 
     public Fence(int x, int y, double scale, double distance, Terrain terrain) {
-        super(images, x, y, scale, distance, SimulatorPane.Objects.FENCE, terrain);
+        super(images, x, y, scale, distance, SimulatorPane.Objects.FENCE, terrain, new Rectangle2D.Double(-10, -10, 280, 50), true);
     }
     
     public String getFacilityName(){

src/gui/simulator/facilities/PalmTree1.java

@@ -13,11 +13,11 @@ public class PalmTree1 extends DrawEngine implements Serializable {
 	private static String facilityName = "PalmTree1";
 
     public PalmTree1(int x, int y, Terrain terrain) {
-        super(images, x, y, 1, 0, SimulatorPane.Objects.PALMTREE1, terrain);
+        super(images, x, y, 1, 0, SimulatorPane.Objects.PALMTREE1, terrain, null, false);
     }
 
     public PalmTree1(int x, int y, double scale, double distance, Terrain terrain) {
-        super(images, x, y, scale, distance, SimulatorPane.Objects.PALMTREE1, terrain);
+        super(images, x, y, scale, distance, SimulatorPane.Objects.PALMTREE1, terrain, null, false);
     }
     
     public String getFacilityName(){

src/gui/simulator/facilities/RestRoom.java

@@ -1,5 +1,6 @@
 package gui.simulator.facilities;
 
+import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
 
 import gui.simulator.DrawEngine;
@@ -12,12 +13,13 @@ public class RestRoom extends DrawEngine implements Serializable {
 	private static Images.ImageType images = Images.ImageType.Toilet;
 	private static String facilityName = "Toilet";
 
+    //TODO change visibility
     public RestRoom(int x, int y, Terrain terrain) {
-        super(images, x, y, 1, 0, SimulatorPane.Objects.RESTROOM, terrain);
+        super(images, x, y, 1, 0, SimulatorPane.Objects.RESTROOM, terrain, new Rectangle2D.Double(-10, -10, 120, 120), true);
     }
 
     public RestRoom(int x, int y, double scale, double distance, Terrain terrain) {
-        super(images, x, y, scale, distance, SimulatorPane.Objects.RESTROOM, terrain);
+        super(images, x, y, scale, distance, SimulatorPane.Objects.RESTROOM, terrain, new Rectangle2D.Double(-10, -10, 120, 120), true);
     }
     
     public String getFacilityName(){

src/gui/simulator/facilities/SimulatorStage.java

@@ -22,32 +22,27 @@ public class SimulatorStage extends DrawEngine implements Serializable {
     private Act playingact;
     private int movement1,movement2;
     private long lastTime;
-	private boolean drawWalkArea;
 	private Rectangle2D.Double walkArea = new Rectangle2D.Double(20, 250, 350, 100);
 
     public SimulatorStage(int x, int y, Terrain terrain, boolean drawWalkArea) {
-        super(images, x, y, 1, 0,SimulatorPane.Objects.STAGE, terrain);
+        super(images, x, y, 1, 0, SimulatorPane.Objects.STAGE, terrain, new Rectangle2D.Double(20, 250, 350, 100), drawWalkArea);
         changeLightbeam();
-		this.drawWalkArea = drawWalkArea;
     }
 
     public SimulatorStage(int x, int y, double scale, double distance, Terrain terrain, boolean drawWalkArea) {
-        super(images, x, y, scale, distance, SimulatorPane.Objects.STAGE, terrain);
-		this.drawWalkArea = drawWalkArea;
+        super(images, x, y, scale, distance, SimulatorPane.Objects.STAGE, terrain, new Rectangle2D.Double(20, 250, 350, 100), drawWalkArea);
         changeLightbeam();
     }
 
 	public SimulatorStage(int x, int y, double scale, double distance, Terrain terrain) {
-		super(images, x, y, scale, distance, SimulatorPane.Objects.STAGE, terrain);
-		this.drawWalkArea = false;
+		super(images, x, y, scale, distance, SimulatorPane.Objects.STAGE, terrain, new Rectangle2D.Double(20, 250, 350, 100), false);
 		changeLightbeam();
 	}
 
 
 	public SimulatorStage(int x, int y, Terrain terrain) {
-		super(images, x, y, 1, 0,SimulatorPane.Objects.STAGE, terrain);
+		super(images, x, y, 1, 0,SimulatorPane.Objects.STAGE, terrain, new Rectangle2D.Double(20, 250, 350, 100), false);
 		changeLightbeam();
-		this.drawWalkArea = false;
 	}
     
     public String getFacilityName(){
@@ -90,10 +85,7 @@ public class SimulatorStage extends DrawEngine implements Serializable {
 	    	g.fill(this.getAffineTransform().createTransformedShape(lightbeam));
     	}
     	super.draw(g);
-		if(this.drawWalkArea){
-			g.setColor(Color.GREEN);
-			g.fill(getAffineTransform().createTransformedShape(this.walkArea));
-		}
+
     }
 
     public void changeLightbeam(){

src/gui/simulator/facilities/SnackBar.java

@@ -1,5 +1,6 @@
 package gui.simulator.facilities;
 
+import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
 
 import gui.simulator.DrawEngine;
@@ -12,12 +13,13 @@ public class SnackBar extends DrawEngine implements Serializable{
 	private static Images.ImageType images = Images.ImageType.Snackbar;
 	private static String facilityName = "Snackbar";
 
+    //TODO change visibility
     public SnackBar(int x, int y, Terrain terrain) {
-        super(images, x, y, 1, 0, SimulatorPane.Objects.SNACKBAR, terrain);
+        super(images, x, y, 1, 0, SimulatorPane.Objects.SNACKBAR, terrain, new Rectangle2D.Double(-10, -10, 420, 420), true);
     }
 
     public SnackBar(int x, int y, double scale, double distance, Terrain terrain) {
-        super(images, x, y, scale, distance, SimulatorPane.Objects.SNACKBAR, terrain);
+        super(images, x, y, scale, distance, SimulatorPane.Objects.SNACKBAR, terrain, new Rectangle2D.Double(-10, -10, 420, 420), true);
     }
     
     public String getFacilityName(){

src/gui/simulator/facilities/Tree1.java

@@ -13,11 +13,11 @@ public class Tree1 extends DrawEngine implements Serializable {
 	private static String facilityName = "Tree1";
 
     public Tree1(int x, int y, Terrain terrain) {
-        super(images, x, y, 1, 0, SimulatorPane.Objects.TREE1, terrain);
+        super(images, x, y, 1, 0, SimulatorPane.Objects.TREE1, terrain, null, false);
     }
 
     public Tree1(int x, int y, double scale, double distance, Terrain terrain) {
-        super(images, x, y, scale, distance, SimulatorPane.Objects.TREE1, terrain);
+        super(images, x, y, scale, distance, SimulatorPane.Objects.TREE1, terrain, null, false);
     }
     
     public String getFacilityName(){

src/gui/simulator/facilities/WayPoint.java

@@ -12,7 +12,7 @@ public class WayPoint extends DrawEngine{
 	private static String facilityName = "WayPoint";
 	
 	public WayPoint(int x, int y, double scale, double distance, Terrain terrain) {
-		super(Images.ImageType.Crosspoint, x, y, scale, 1, SimulatorPane.Objects.WAYPOINT, terrain);
+		super(Images.ImageType.Crosspoint, x, y, scale, 1, SimulatorPane.Objects.WAYPOINT, terrain, null, false);
 	}
 	
     public String getFacilityName(){