Supermaniac101 10 anni fa
parent
commit
f3698a0696

BIN
res/simulator/tent2.png


+ 2 - 2
src/gui/panels/agenda/DaySelectorPane.java

@@ -29,8 +29,8 @@ public class DaySelectorPane extends JPanel{
 		dateLabel.setFont(new Font("Arial", Font.PLAIN, 11));
 		dateLabel.setForeground(new Color(51,51,51));
 		buttonRight = new JLabel();
-		buttonLeft.setIcon(new ImageIcon("E:\\Bibliotheek\\Documenten\\Workspaces\\FestivalPlanner\\res\\left.png"));
-		buttonRight.setIcon(new ImageIcon("E:\\Bibliotheek\\Documenten\\Workspaces\\FestivalPlanner\\res\\right.png"));
+		buttonLeft.setIcon(new ImageIcon(getClass().getResource("/left.png")));
+		buttonRight.setIcon(new ImageIcon(getClass().getResource("/right.png")));
 		this.add(buttonLeft);
 		this.add(dateLabel);
 		this.add(buttonRight);

+ 2 - 1
src/gui/simulator/Images.java

@@ -87,7 +87,8 @@ public class Images{
 		TopbarFasterButton,
 		TopbarGridButton,
 		TopbarPeopleButton,
-		TopbarPauzeButton
+		TopbarPauzeButton,
+		BeerBar
 	}
 
 	public enum TextPaint

+ 1 - 1
src/gui/simulator/SimulatorPane.java

@@ -22,7 +22,7 @@ public class SimulatorPane extends JPanel{
 	//terrain type enums
 	public enum Terrains{BEACH, GRASS, URBAN, UNDEFINED};
 	//object type enums
-	public enum Objects{STAGE, DRINK, SNACKBAR, RESTROOM, SUNGLAS, WAYPOINT, ENTRANCE, EXIT, BORDER, TREE1, PALMTREE1, FENCE};
+	public enum Objects{STAGE, DRINK, SNACKBAR, RESTROOM, SUNGLAS, WAYPOINT, ENTRANCE, EXIT, BORDER, TREE1, PALMTREE1, FENCE, BEERBAR};
 	//time control enums
 	public enum Time{STOP, PAUZE, PLAY, FASTER, FASTEST};
 	

+ 28 - 0
src/gui/simulator/facilities/BeerBar.java

@@ -0,0 +1,28 @@
+package gui.simulator.facilities;
+
+import gui.simulator.DrawEngine;
+import gui.simulator.Images;
+import gui.simulator.SimulatorPane;
+import gui.simulator.Terrain;
+
+import java.awt.geom.Rectangle2D;
+import java.io.Serializable;
+
+public class BeerBar extends DrawEngine implements Serializable{
+
+	private static Images.ImageType images = Images.ImageType.BeerBar;
+	private static String facilityName = "BeerBar";
+
+    //TODO change visibility
+    public BeerBar(int x, int y, Terrain terrain) {
+        super(images, x, y, 1, 0, SimulatorPane.Objects.BEERBAR, terrain, new Rectangle2D.Double(-30, -30, 450, 450), true);
+    }
+
+    public BeerBar(int x, int y, double scale, double distance, Terrain terrain) {
+        super(images, x, y, scale, distance, SimulatorPane.Objects.BEERBAR, terrain, new Rectangle2D.Double(-30, -30, 450, 450), true);
+    }
+    
+    public String getFacilityName(){
+    	return facilityName;
+    }
+}

+ 0 - 5
src/gui/simulator/facilities/Drinks.java

@@ -1,5 +0,0 @@
-package gui.simulator.facilities;
-
-public class Drinks {
-
-}

+ 26 - 0
src/gui/simulator/facilities/Stage.java

@@ -0,0 +1,26 @@
+package gui.simulator.facilities;
+
+import java.io.Serializable;
+
+import gui.simulator.DrawEngine;
+import gui.simulator.Images;
+import gui.simulator.SimulatorPane;
+import gui.simulator.Terrain;
+
+public class Stage extends DrawEngine implements Serializable{
+
+	private static Images.ImageType images = Images.ImageType.Tent;
+	private static String facilityName = "Stage";
+
+    public Stage(int x, int y, Terrain terrain) {
+        super(images, x, y, 1, 0,SimulatorPane.Objects.STAGE, terrain);
+    }
+
+    public Stage(int x, int y, double scale, double distance, Terrain terrain) {
+        super(images, x, y, scale, distance,SimulatorPane.Objects.STAGE, terrain);
+    }
+    
+    public String getFacilityName(){
+    	return facilityName;
+    }
+}