iets

Als ie niet goed is moet je het zeggen

Agenda/Event.java

@@ -34,8 +34,8 @@ public class Event implements Serializable {
 				endHour, endMinute);
 		this.startHour = startHour;
 		this.startMinute = startMinute;
-		this.stopHour = endHour;
-		this.stopMinute = endMinute;
+		this.stopHour = stopHour;
+		this.stopMinute = stopMinute;
 		this.stage = stage;
 		this.artist = artist;
 		this.description = description;
@@ -55,11 +55,11 @@ public class Event implements Serializable {
 	}
 	
 	public int getStart(){
-		return (startHour * 60) + startMinute;
+		return (startHour * 100) + startMinute;
 	}
 	
 	public int getStop(){
-		return (stopHour * 60) + stopMinute;
+		return (stopHour * 100) + stopMinute;
 	}
 	
 	public int getStopHour(){

Agenda/Stage.java

@@ -1,41 +0,0 @@
-package Agenda;
-import java.io.Serializable;
-
-public class Stage implements Serializable {
-
-	private static final long serialVersionUID = 1;
-	
-	private String name;
-	private String description;
-	
-	public Stage(String name, String description)
-	{
-		this.name = name;
-		this.description = description;
-	}
-	
-	public String getName()
-	{
-		return this.name;
-	}
-		
-	public String getDescription()
-	{
-		return this.description;
-	}
-	
-	public void setDescription(String description)
-	{
-		this.description = description;
-	}
-	
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	
-	public String toString()
-	{
-		return name;
-	}
-}

Applicatie/Action.java

@@ -11,15 +11,13 @@ public class Action
 	private int starttime;
 	private int duration;
 	private DrawObject target;
-	private Waypoint waypoint;
 
-	public Action(Point2D position, int starttime, int duration, DrawObject tar, Waypoint waypoint)
+	public Action(Point2D position, int starttime, int duration, DrawObject tar)
 	{
 		this.position = position;
 		this.starttime = starttime;
 		this.duration = duration;
 		this.target = tar;
-		this.waypoint = waypoint;
 	}
 
 	public Point2D getPosition()
@@ -46,8 +44,4 @@ public class Action
 	{
 		return duration;
 	}
-
-	public Waypoint getWaypoint(){
-		return waypoint;
-	}
 }

Applicatie/ControlPanel.java

@@ -19,16 +19,13 @@ public class ControlPanel extends JPanel
 	private static final long serialVersionUID = 6805244250902524351L;
 
 	private Panel p;
-	private int people;
 	JLabel timeLabel;
-	JLabel peopleLabel;
 	
 	public ControlPanel()
 	{
 		super();
 		BoxLayout box = new BoxLayout(this, BoxLayout.X_AXIS);
 		setLayout(box);
-		people = 0;
 		
 		setPreferredSize(new Dimension(0,50));
 		setBorder(BorderFactory.createLineBorder(new Color(180, 180, 180)));
@@ -108,7 +105,7 @@ public class ControlPanel extends JPanel
 		peoplePanel.setMaximumSize(new Dimension(285,50));
 		add(peoplePanel);
 		{
-			peopleLabel = new JLabel(people + " People");
+			JLabel peopleLabel = new JLabel("0/0 People");
 			peopleLabel.setFont(new Font("Segoe UI", Font.PLAIN, 20));
 			peoplePanel.add(peopleLabel);
 			
@@ -118,7 +115,7 @@ public class ControlPanel extends JPanel
 			peopleButton.addActionListener(new ActionListener(){
 				public void actionPerformed(ActionEvent e)
 				{
-					new AddPeoplePanel(p);
+					p.addVisitors();
 				}
 			});
 			peoplePanel.add(peopleButton);
@@ -150,7 +147,6 @@ public class ControlPanel extends JPanel
 	
 	public void setPeople(int people)
 	{
-		this.people = people;
-		peopleLabel.setText(people + " People");
+		
 	}
 }

Applicatie/DrawObject.java

@@ -1,268 +0,0 @@
-package Applicatie;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.Shape;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.NoninvertibleTransformException;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-
-import javax.swing.ImageIcon;
-
-public abstract class DrawObject
-{
-	Point2D position;
-	double rotation;
-	double scale;
-	private Image image;
-	protected boolean selected;
-	private Rectangle2D rektAngle;
-	private Rectangle2D upperLeftCorner;
-	private Rectangle2D upperRightCorner;
-	private Rectangle2D bottomLeftCorner;
-	private Rectangle2D bottomRightCorner;
-	private Ellipse2D rotateDot;
-	static final int UPPERLEFT = 0;
-	static final int UPPERRIGHT = 1;
-	static final int BOTTOMLEFT = 2;
-	static final int BOTTOMRIGHT = 3;
-	private Color rectangleColor;
-
-	public DrawObject(String filename, Point2D position)
-	{
-		image = new ImageIcon(filename).getImage();
-		scale = 1;
-		rotation = 0;
-		this.position = position;
-		rectangleColor = Color.BLACK;
-	}
-
-	public abstract String getName();
-
-	public void draw(Graphics2D g)
-	{
-		AffineTransform tx = getTransform();
-		g.drawImage(image, tx, null);
-		if (selected)
-		{
-			// g.rotate(Math.toRadians(rotation), image.getWidth(null)/2,
-			// image.getHeight(null)/2);
-
-			AffineTransform rotate = AffineTransform.getRotateInstance(Math.toRadians(rotation), position.getX() + image.getWidth(null) / 2, position.getY() + image.getHeight(null) / 2);
-			//g.transform(rotate);
-			g.setColor(rectangleColor);
-			g.setStroke(new BasicStroke(7));
-			rektAngle = new Rectangle2D.Double((int) position.getX(), (int) position.getY(), image.getWidth(null), image.getHeight(null));
-			tx = getTransformRectangle();
-			rektAngle.setFrame(tx.createTransformedShape(rektAngle).getBounds());
-			g.draw(rektAngle);
-			g.setColor(Color.YELLOW);
-			upperLeftCorner = new Rectangle2D.Double(rektAngle.getX() - 7, rektAngle.getY() - 7, 15, 15);
-			upperRightCorner = new Rectangle2D.Double(rektAngle.getX() + rektAngle.getWidth() - 8, rektAngle.getY() - 7, 15, 15);
-			bottomLeftCorner = new Rectangle2D.Double(rektAngle.getX() - 7, rektAngle.getY() + rektAngle.getHeight() - 8, 15, 15);
-			bottomRightCorner = new Rectangle2D.Double(rektAngle.getX() + rektAngle.getWidth() - 8, rektAngle.getY() + rektAngle.getHeight() - 8, 15, 15);
-			g.fill(upperLeftCorner); // upperleft
-			g.fill(upperRightCorner); // upperright
-			g.fill(bottomLeftCorner); // bottomleft
-			g.fill(bottomRightCorner); // bottomright
-			g.setColor(Color.RED);
-			rotateDot = new Ellipse2D.Double((rektAngle.getX() + (rektAngle.getWidth() / 2)) - 8, rektAngle.getY() - 8, 15, 15);
-			g.fill(rotateDot);
-
-		}
-	}
-
-	protected AffineTransform getTransform()
-	{
-		AffineTransform tx = new AffineTransform();
-		tx.scale(scale, scale);
-		tx.translate(position.getX(), position.getY());
-		tx.rotate(Math.toRadians(rotation), image.getWidth(null) / 2, image.getHeight(null) / 2);
-		return tx;
-	}
-
-	protected AffineTransform getTransformSelection()
-	{
-		AffineTransform tx = new AffineTransform();
-		tx.scale(scale, scale);
-		tx.translate(position.getX(), position.getY());
-		return tx;
-	}
-
-	/**
-	 * Special transformation for the selection rectangle, because the
-	 * translation of the image one places the rectangle translated from the
-	 * image.
-	 * 
-	 * @return affineTransform
-	 */
-	private AffineTransform getTransformRectangle()
-	{
-		AffineTransform tx = new AffineTransform();
-		tx.scale(scale, scale);
-		return tx;
-	}
-
-	public boolean contains(Point2D clickPoint)
-	{
-		Shape shape;
-		if (rektAngle == null)
-		{
-			shape = new Rectangle2D.Double(0, 0, image.getWidth(null), image.getHeight(null));
-			return getTransform().createTransformedShape(shape).contains(clickPoint);
-
-		}
-		else
-		{
-			shape = new Rectangle2D.Double(-9, -9, image.getWidth(null) + 13, image.getHeight(null) + 13);
-			return getTransformSelection().createTransformedShape(shape).contains(clickPoint);
-		}
-
-	}
-
-	public Point2D getObjectPoint(Point2D point)
-	{
-		try
-		{
-			return getTransform().inverseTransform(point, null);
-
-		}
-		catch (NoninvertibleTransformException e)
-		{
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * Checking collision.
-	 * @param object. the drawObject to check collision with.
-	 * @return if there is a collision.
-	 */
-	public boolean collision(DrawObject object)
-	{
-		Shape ownShape = getRectangle();
-		Rectangle2D otherRectangle = object.getTransform().createTransformedShape(object.getImageRectangle()).getBounds2D();
-		if(ownShape.intersects(otherRectangle))
-			return true;
-		else 
-			return false;
-	}
-
-	/**
-	 * This method checks if the place thats clicked is inside one of the
-	 * corners.
-	 * 
-	 * @param point
-	 * @param corner
-	 * @return if the clicked point is inside one of the corners
-	 */
-	public boolean containsCorner(Point2D point, int corner)
-	{
-		Rectangle2D chosenCorner = null;
-		switch (corner)
-		{
-			case 0:
-				chosenCorner = upperLeftCorner;
-				break;
-			case 1:
-				chosenCorner = upperRightCorner;
-				break;
-			case 2:
-				chosenCorner = bottomLeftCorner;
-				break;
-			case 3:
-				chosenCorner = bottomRightCorner;
-				break;
-			case 4:
-				if (point.getX() > rotateDot.getX() && point.getX() < rotateDot.getX() + rotateDot.getWidth() && point.getY() > rotateDot.getY() && point.getY() < rotateDot.getY() + rotateDot.getHeight())
-					return true;
-				else
-					return false;
-
-		}
-		if (point.getX() > chosenCorner.getX() && point.getX() < chosenCorner.getX() + chosenCorner.getWidth() && point.getY() > chosenCorner.getY() && point.getY() < chosenCorner.getY() + chosenCorner.getHeight())
-			return true;
-		else
-			return false;
-	}
-
-	public void setSelected(boolean b)
-	{
-		selected = b;
-	}
-
-	public Point2D getPosition()
-	{
-		return position;
-	}
-
-	public void setPosition(Point2D position)
-	{
-		this.position = position;
-	}
-
-	public double getRotation()
-	{
-		return rotation;
-	}
-
-	public void setRotation(double rotation)
-	{
-		this.rotation = rotation;
-	}
-
-	public double getScale()
-	{
-		return scale;
-	}
-
-	public void setScale(double scale)
-	{
-		this.scale = scale;
-	}
-
-	public Image getImage()
-	{
-		return image;
-	}
-
-	public void setImage(Image image)
-	{
-		this.image = image;
-	}
-
-	public boolean isSelected()
-	{
-		return selected;
-	}
-
-	public Rectangle2D getRectangle()
-	{
-		return rektAngle;
-	}
-
-	public void setRectangle(Rectangle2D rectangle)
-	{
-		rektAngle = rectangle;
-	}
-
-	public Color getRectangleColor()
-	{
-		return rectangleColor;
-	}
-
-	public void setRectangleColor(Color rectangleColor)
-	{
-		this.rectangleColor = rectangleColor;
-	}
-	
-	public Rectangle2D getImageRectangle() {
-		return new Rectangle2D.Double(0,0, image.getWidth(null), image.getHeight(null));
-	}
-
-}

Applicatie/Main.java

@@ -2,6 +2,7 @@ package Applicatie;
 
 public class Main
 {
+
 	public static void main(String[] args)
 	{
 		new Window();

Applicatie/Panel.java

@@ -63,6 +63,7 @@ public class Panel extends JPanel implements ActionListener
 	private Path currentPath;
 	private static int width = 1920;
 	private static int height = 1080;
+	private boolean play = false;
 
 	Point2D cameraPoint = new Point2D.Double(getWidth() / 2, getHeight() / 2);
 	float cameraScale = 1;
@@ -148,7 +149,7 @@ public class Panel extends JPanel implements ActionListener
 		addMouseWheelListener(new MouseWheel(this));
 
 		addFocusListener(new WindowFocusListener(this));
-		t = new Timer(1000 / 10, this);
+		t = new Timer(1000 / 100, this);
 	}
 
 	public int getPanelInfoLength()
@@ -229,16 +230,7 @@ public class Panel extends JPanel implements ActionListener
 		return waypoints;
 	}
 
-	public void addVisitors(ArrayList<DrawObject> entrances)
-	{
-		
-			DrawObject entrance = entrances.get((int) Math.floor(Math.random()*entrances.size()));
-			Point point = new Point((int)entrance.getPosition().getX(),(int)entrance.getPosition().getY());
-			visitors.add(new Visitor("visitor",point, agenda, objects, waypoints, date));
-		
-	}
-
-	public void addVisitors(int count)
+	public void addVisitors()
 	{
 		ArrayList<DrawObject> entrances = new ArrayList<>();
 		for(DrawObject object : objects) {
@@ -247,14 +239,21 @@ public class Panel extends JPanel implements ActionListener
 			}
 		}
 		if(!entrances.isEmpty()) {
-			for (int i = 0; i < count; i++)
-			{
-				addVisitors(entrances);
-			}
+			DrawObject entrance = entrances.get((int) Math.floor(Math.random()*entrances.size()));
+			Point point = new Point((int)entrance.getPosition().getX(),(int)entrance.getPosition().getY());
+			visitors.add(new Visitor("visitor",point, agenda, objects, waypoints, date));
 		}
-		else 
+		else {
 			JOptionPane.showMessageDialog(this, "You don't have an entrance");
-		cp.setPeople(visitors.size());
+		}
+	}
+
+	public void addVisitors(int count)
+	{
+		for (int i = 0; i < count; i++)
+		{
+			addVisitors();
+		}
 	}
 
 	public void paintComponent(Graphics g)
@@ -664,6 +663,16 @@ public class Panel extends JPanel implements ActionListener
 	{
 		this.t = t;
 	}
+	
+	public void setPlay(boolean play)
+	{
+		this.play = play;
+	}
+	
+	public boolean getPlay()
+	{
+		return play;
+	}
 
 	public void newWorld(int width, int height, int terrainIndex)
 	{
@@ -671,7 +680,6 @@ public class Panel extends JPanel implements ActionListener
 		this.height = height;
 		paths.clear();
 		objects.clear();
-		visitors.clear();
 		cameraScale = 1;
 		switch (terrainIndex)
 		{

Applicatie/PathPopup.java

@@ -1,7 +1,9 @@
 package Applicatie;
 
+import java.awt.BorderLayout;
 import java.awt.FlowLayout;
 import java.awt.Font;
+import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 

Applicatie/Visitor.java

@@ -5,10 +5,8 @@ import java.awt.Image;
 import java.awt.Rectangle;
 import java.awt.Shape;
 import java.awt.geom.AffineTransform;
-import java.awt.geom.Area;
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
-import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -17,7 +15,6 @@ import Agenda.Event;
 import Objects.DrawObject;
 import Objects.Entrance;
 import Objects.Path;
-import Objects.Stage;
 
 public class Visitor
 {
@@ -30,28 +27,23 @@ public class Visitor
 	ArrayList<Action> actions;
 	Agenda agenda;
 	ArrayList<DrawObject> objects;
-
-	ArrayList<Waypoint> waypoints;
-	GregorianCalendar date;
 	int target;
 	int finalTarget;
 
-	public Visitor(String filename, Point2D position, Agenda agenda, ArrayList<DrawObject> objects, ArrayList<Waypoint> waypoints, GregorianCalendar date)
-
+	public Visitor(String filename, Point2D position, Agenda agenda, ArrayList<DrawObject> objects)
 	{
 		this.position = position;
 		this.filename = filename;
 		this.rotation = 0;
 		this.speed = 1 + Math.random() * 4;
-		this.waypoints = waypoints;
-		this.date = date;
 		scale = 1;
 		actions = new ArrayList<Action>();
 		this.agenda = agenda;
 		this.objects = objects;
 		fillActions();
+		System.out.println(actions.size());
 		target = 1;
-		finalTarget = 0;
+		finalTarget = 4;
 	}
 
 	public void draw(Graphics2D g2)
@@ -90,11 +82,10 @@ public class Visitor
 		{
 			if (currentTime >= a.getStartTime() && currentTime < a.getStoptime())
 			{
-				this.finalTarget = a.getWaypoint().getSelf();
+				target = a.getTargetObject();
 			}
 
 		}
-		System.out.println(actions.size());
 
 		// moveToTarget(target, objects, visitors, paths);
 		move(target, panel);
@@ -137,8 +128,7 @@ public class Visitor
 			{
 				continue;
 			}
-
-			if (hasCollisionDO(object))
+			if (hitTest(object))
 			{
 				possible = false;
 			}
@@ -155,11 +145,15 @@ public class Visitor
 			{
 				options.put(w.getSelf(), w.getOptions());
 			}
-
 			for (Map.Entry<Integer, int[]> e : options.entrySet())
 			{
 				for (int i : e.getValue())
 				{
+					System.out.println("KEY:" + e.getKey());
+					System.out.println("VAL:" + i);
+					System.out.println("TAR: " + target);
+
+					System.out.println("____________");
 					if (finalTarget != target)
 					{
 						if (finalTarget == i && e.getKey() == target)
@@ -237,15 +231,14 @@ public class Visitor
 			boolean possible = true;
 			for (DrawObject object : objects)
 			{
-				if (hasCollisionDO(object))
+				if (hitTest(object))
 				{
 					possible = false;
 				}
 			}
 			for (Visitor object : visitors)
 			{
-
-				if (hasCollision(object) && object != this)
+				if (hitTestVisitor(object) && object != this)
 				{
 					possible = false;
 				}
@@ -341,14 +334,14 @@ public class Visitor
 			boolean possible = true;
 			for (DrawObject object : objects)
 			{
-				if (hasCollisionDO(object))
+				if (hitTest(object))
 				{
 					possible = false;
 				}
 			}
 			for (Visitor object : visitors)
 			{
-				if (hasCollision(object) && object != this)
+				if (hitTestVisitor(object) && object != this)
 				{
 					possible = false;
 				}
@@ -361,7 +354,6 @@ public class Visitor
 		}
 	}
 
-	@SuppressWarnings("static-access")
 	public void fillActions()
 	{
 		int startTime = 540;
@@ -370,91 +362,65 @@ public class Visitor
 		while (startTime < stopTime)
 		{
 			int random = (int) Math.floor(Math.random() * 51);
-			if (random < 40)
+			if (random < 30)
 			{
 				Point2D position = null;
 				DrawObject targetStage = null;
-				ArrayList<Event> posEvents = new ArrayList<Event>();
 				for (Event e : agenda.getEvents())
 				{
-					if (startTime >= e.getStart() && startTime < e.getStop())
+					if (convertMinutesToHours(startTime) > e.getStart() && convertMinutesToHours(startTime) < e.getStop())
 					{
-						posEvents.add(e);
-					}
-				}
-
-				if (posEvents.size() != 0)
-				{
-					int r = (int) Math.floor(Math.random() * posEvents.size());
-					Event evs = posEvents.get(r);
-					for (DrawObject d : objects)
-					{
-						if (d.getFileName().equals("stage"))
+						for (DrawObject d : objects)
 						{
-							Stage s = (Stage) d;
-							if (s.getStage().getName().equals(evs.getStage().getName()))
+							if (d.getFileName().equals(e.getStage().getName()))
 							{
-								position = s.getPosition();
+								position = d.getPosition();
 								targetStage = d;
 							}
 						}
 					}
 				}
-
 				int randomtime = (int) (40 + (Math.random() * (60 - 40)));
 				if (position != null)
 				{
-					Waypoint w = getClosestWaypoint(position);
-					actions.add(new Action(position, startTime, randomtime, targetStage, w));
+					actions.add(new Action(position, startTime, randomtime, targetStage));
 				}
 				startTime = startTime + randomtime;
 
 			}
-			else if (random >= 40 && random < 45)
+			else if (random >= 30 && random < 35)
 			{
 				Point2D position = null;
-				DrawObject targetStage = null;
-				ArrayList<DrawObject> foodPlaces = new ArrayList<DrawObject>();
+				DrawObject targetDraw = null;
 				for (DrawObject d : objects)
 				{
-					if (d.getFileName().equals("food"))
+					if (d.getFileName().equals("entrance"))
 					{
-						foodPlaces.add(d);
+						position = d.getPosition();
 					}
 				}
-
-				if (foodPlaces.size() != 0)
+				if (position != null)
 				{
-					int r = (int) Math.floor(Math.random() * foodPlaces.size());
-					position = foodPlaces.get(r).getPosition();
-					targetStage = foodPlaces.get(r);
-					Waypoint w = getClosestWaypoint(position);
-					actions.add(new Action(position, startTime, 35, targetStage, w));
-					startTime = startTime + 20;
+					actions.add(new Action(position, startTime, 35, targetDraw));
+					startTime = startTime + 35;
 				}
 				startTime = startTime + 35;
 
 			}
-			else if (random > 45)
+			else if (random > 35)
 			{
 				Point2D position = null;
-				DrawObject targetStage = null;
-				ArrayList<DrawObject> toilets = new ArrayList<DrawObject>();
+				DrawObject targetDrawobj = null;
 				for (DrawObject d : objects)
 				{
 					if (d.getFileName().equals("wc"))
 					{
-						toilets.add(d);
+						position = d.getPosition();
 					}
 				}
-				if (toilets.size() != 0)
+				if (position != null)
 				{
-					int r = (int) Math.floor(Math.random() * toilets.size());
-					position = toilets.get(r).getPosition();
-					targetStage = toilets.get(r);
-					Waypoint w = getClosestWaypoint(position);
-					actions.add(new Action(position, startTime, 35, targetStage, w));
-					startTime = startTime + 20;
+					actions.add(new Action(position, startTime, 35, targetDrawobj));
 				}
 				startTime = startTime + 35;
 
@@ -462,69 +428,35 @@ public class Visitor
 		}
 	}
 
-	public Waypoint getClosestWaypoint(Point2D point)
+	public int convertMinutesToHours(int startTime)
 	{
-		Waypoint waypoint = null;
-		int distance = 10000;
-		for (Waypoint w : waypoints)
-		{
-			if (w.getPosition().distance(point) < distance)
-			{
-				waypoint = w;
-				distance = (int) w.getPosition().distance(point);
-			}
-		}
-		return waypoint;
+		int time = 0;
+		int hours = startTime / 60;
+		int minutes = startTime % 60;
+		time = (hours * 100) + minutes;
+		return time;
 	}
 
-	public boolean hasCollisionDO(DrawObject object)
+	public int getEndX()
 	{
 		Image image = Images.getImage(filename);
-		Image image2 = Images.getImage(object.getFileName());
-		Rectangle recta = new Rectangle((int) position.getX(), (int) position.getY(), image.getWidth(null), image.getHeight(null));
-		Rectangle rectb = new Rectangle((int) object.getPosition().getX(), (int) object.getPosition().getY(), image2.getWidth(null), image2.getHeight(null));
-
-		Area a = new Area(recta);
-		Area b = new Area(rectb);
-
-		AffineTransform transA = new AffineTransform();
-		transA.rotate(rotation, position.getX(), position.getY());
-
-		AffineTransform transB = new AffineTransform();
-		transB.rotate(Math.toRadians(object.getRotation()), object.getPosition().getX(), object.getPosition().getY());
-
-		Area aa = a.createTransformedArea(transA);
-		Area bb = b.createTransformedArea(transB);
-
-		if (bb.intersects(aa.getBounds2D()))
-		{
-			return true;
-		}
-		return false;
+		return (int) (position.getX() + image.getWidth(null));
 	}
 
-	public boolean hasCollision(Visitor v)
+	public int getEndY()
 	{
 		Image image = Images.getImage(filename);
-		Rectangle a = new Rectangle((int) position.getX(), (int) position.getY(), image.getWidth(null), image.getHeight(null));
-		Rectangle b = new Rectangle((int) v.position.getX(), (int) v.position.getY(), image.getWidth(null), image.getHeight(null));
+		return (int) (position.getY() + image.getHeight(null));
+	}
 
-		Area aa = new Area(a);
-		Area bb = new Area(b);
+	public boolean hitTest(DrawObject to2)
+	{
+		return (getEndX() >= to2.getPosition().getX() && getEndY() >= to2.getPosition().getY() && to2.getEndX() >= position.getX() && to2.getEndY() >= position.getY());
 
-		AffineTransform af = new AffineTransform();
-		af.rotate(rotation, position.getX(), position.getY());
+	}
 
-		AffineTransform bf = new AffineTransform();
-		bf.rotate(v.rotation, v.position.getX(), v.position.getY());
-
-		Area ra = aa.createTransformedArea(af);
-		Area rb = bb.createTransformedArea(bf);
-
-		if (ra.intersects(rb.getBounds2D()))
-		{
-			return true;
-		}
-		return false;
+	public boolean hitTestVisitor(Visitor v)
+	{
+		return (getEndX() >= v.position.getX() && getEndY() >= v.position.getY() && v.getEndX() >= position.getX() && v.getEndY() >= position.getY());
 	}
 }

Applicatie/WaypointPopup.java

@@ -111,6 +111,7 @@ public class WaypointPopup extends JFrame {
 				for(int i = 0; i < options.length; i++)
 				{
 					ioptions[i] = Integer.valueOf(options[i]);
+					System.out.println(ioptions[i]);
 				}
 				wp.setOptions(ioptions);
 				

Listeners/Mouse.java

@@ -4,15 +4,19 @@ import java.awt.Color;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 
 import javax.swing.SwingUtilities;
 
 import Applicatie.Panel;
+import Applicatie.PathPopup;
+
 import Applicatie.Waypoint;
 import Applicatie.WaypointPopup;
 import Objects.DrawObject;
 import Objects.Path;
+import Objects.Entrance;
 
 public class Mouse extends MouseAdapter
 {
@@ -31,130 +35,133 @@ public class Mouse extends MouseAdapter
 		Point2D clickPoint = panel.getClickPoint(e.getPoint());
 		panel.setLastClickPosition(clickPoint);
 		panel.setLastMousePosition(e.getPoint());
-
-		if (!panel.getClickedOption().equals("Path"))
+		
+		if(!panel.getPlay())
 		{
-			if (e.getY() < 150)
+			if (!panel.getClickedOption().equals("Path"))
 			{
-				int i = 0;
-				int last = 0;
-				for (BufferedImage image : panel.getPanelInfo())
+				if (e.getY() < 150)
 				{
-					if (e.getX() >= panel.getScrollfactor() && e.getX() < last + image.getWidth() + panel.getScrollfactor())
+					int i = 0;
+					int last = 0;
+					for (BufferedImage image : panel.getPanelInfo())
 					{
-						DrawObject tempDrawObj = panel.createNewDrawObject(i);
-						if (tempDrawObj != null)
+						if (e.getX() >= panel.getScrollfactor() && e.getX() < last + image.getWidth() + panel.getScrollfactor())
 						{
-							tempDrawObj.setPosition(clickPoint);
-							if (!panel.getObjects().isEmpty())
-								panel.clearObjectSelection();
-							panel.setDragObject(tempDrawObj);
-							panel.getDragObject().setSelected(true);
-							panel.getPP().setSelected(tempDrawObj);
-							panel.setSelectedObject(tempDrawObj);
-							selectedObject = tempDrawObj;
+							DrawObject tempDrawObj = panel.createNewDrawObject(i);
+							if (tempDrawObj != null)
+							{
+								tempDrawObj.setPosition(clickPoint);
+								if (!panel.getObjects().isEmpty())
+									panel.clearObjectSelection();
+								panel.setDragObject(tempDrawObj);
+								panel.getDragObject().setSelected(true);
+								panel.getPP().setSelected(tempDrawObj);
+								panel.setSelectedObject(tempDrawObj);
+								selectedObject = tempDrawObj;
+							}
+							break;
 						}
-						break;
+						i++;
+						last += image.getWidth();
 					}
-					i++;
-					last += image.getWidth();
-				}
-				if (panel.getDragObject() != null)
-				{
-					panel.add(panel.getDragObject());
-				}
-			}
-			else
-			{
-				for (DrawObject o : panel.getObjects())
-				{
-					if (o.contains(clickPoint))
+					if (panel.getDragObject() != null)
 					{
-						if (SwingUtilities.isRightMouseButton(e))
-						{
-							if (o instanceof Waypoint)
-							{
-								new WaypointPopup(o, panel);
-
-							}
-						}
-						if (o == selectedObject)
-						{
-							boolean upperLeft = o.containsCorner(clickPoint, 0);
-							boolean upperRight = o.containsCorner(clickPoint, 1);
-							boolean bottomLeft = o.containsCorner(clickPoint, 2);
-							boolean bottomRight = o.containsCorner(clickPoint, 3);
-							boolean rotate = o.containsCorner(clickPoint, 4);
-							if (upperLeft)
-							{
-								panel.setClickedOption("upperLeft");
-							}
-							else if (upperRight)
-							{
-								panel.setClickedOption("upperRight");
-							}
-							else if (bottomLeft)
-							{
-								panel.setClickedOption("bottomLeft");
-							}
-							else if (bottomRight)
-							{
-								panel.setClickedOption("bottomRight");
-							}
-							else if (rotate)
-							{
-								panel.setClickedOption("rotate");
-							}
-							else
-							{
-								panel.setClickedOption("drag");
-							}
-						}
-						if (selectedObject != null)
-							selectedObject.setSelected(false);
-						o.setSelected(true);
-						selectedObject = o;
-						panel.setDragObject(o);
-						panel.getPP().setSelected(o);
-						panel.setSelectedObject(o);
-						panel.setSelectionPosition(panel.getDragObject().getPosition());
-
-					}
-				}
-				Path clickedPath = panel.getClickedPath(clickPoint);
-				if (clickedPath != null)
-				{
-					if (SwingUtilities.isRightMouseButton(e))
-					{
-						//new PathPopup(clickedPath, panel);
+						panel.add(panel.getDragObject());
 					}
 				}
 				else
 				{
-					panel.checkPath(clickPoint);
+					for (DrawObject o : panel.getObjects())
+					{
+						if (o.contains(clickPoint))
+						{
+							if (SwingUtilities.isRightMouseButton(e))
+							{
+								if (o instanceof Waypoint)
+								{
+									new WaypointPopup(o, panel);
+
+								}
+							}
+							if (o == selectedObject)
+							{
+								boolean upperLeft = o.containsCorner(clickPoint, 0);
+								boolean upperRight = o.containsCorner(clickPoint, 1);
+								boolean bottomLeft = o.containsCorner(clickPoint, 2);
+								boolean bottomRight = o.containsCorner(clickPoint, 3);
+								boolean rotate = o.containsCorner(clickPoint, 4);
+								if (upperLeft)
+								{
+									panel.setClickedOption("upperLeft");
+								}
+								else if (upperRight)
+								{
+									panel.setClickedOption("upperRight");
+								}
+								else if (bottomLeft)
+								{
+									panel.setClickedOption("bottomLeft");
+								}
+								else if (bottomRight)
+								{
+									panel.setClickedOption("bottomRight");
+								}
+								else if (rotate)
+								{
+									panel.setClickedOption("rotate");
+								}
+								else
+								{
+									panel.setClickedOption("drag");
+								}
+							}
+							if (selectedObject != null)
+								selectedObject.setSelected(false);
+							o.setSelected(true);
+							selectedObject = o;
+							panel.setDragObject(o);
+							panel.getPP().setSelected(o);
+							panel.setSelectedObject(o);
+							panel.setSelectionPosition(panel.getDragObject().getPosition());
+
+						}
+					}
+					Path clickedPath = panel.getClickedPath(clickPoint);
+					if (clickedPath != null)
+					{
+						if (SwingUtilities.isRightMouseButton(e))
+						{
+							new PathPopup(clickedPath, panel);
+						}
+					}
+					else
+					{
+						panel.checkPath(clickPoint);
+					}
+
 				}
+				if (panel.getDragObject() == null && selectedObject != null)
+				{
+					selectedObject.setSelected(false);
+					panel.setSelectedObject(null);
+					panel.getPP().clearSelected();
+					selectedObject = null;
+				}
+			}
+			else
+			{ // Making path.
+
+				panel.getCurrentPath().addPoint(new Point2D.Double(clickPoint.getX(), clickPoint.getY()));
 
 			}
-			if (panel.getDragObject() == null && selectedObject != null)
-			{
-				selectedObject.setSelected(false);
-				panel.setSelectedObject(null);
-				panel.getPP().clearSelected();
-				selectedObject = null;
-			}
-		}
-		else
-		{ // Making path.
-
-			panel.getCurrentPath().addPoint(new Point2D.Double(clickPoint.getX(), clickPoint.getY()));
-
 		}
 		panel.repaint();
 	}
 
 	public void mouseReleased(MouseEvent e)
 	{
-		if (panel.getDragObject() != null)
+		if (panel.getDragObject() != null && !panel.getPlay())
 		{
 			if (panel.getDragObject().getRectangleColor() != Color.RED)
 			{

Objects/Podium.java

@@ -1,13 +0,0 @@
-package Objects;
-import java.awt.geom.Point2D;
-
-import Applicatie.DrawObject;
-
-
-public class Podium extends DrawObject {
-
-	public Podium(Point2D position) {
-		super("images/stage3.png", position);
-	}
-
-}