diff --git a/Applicatie/Panel.java b/Applicatie/Panel.java index a1119e9..a64b699 100644 --- a/Applicatie/Panel.java +++ b/Applicatie/Panel.java @@ -1,15 +1,12 @@ package Applicatie; import java.awt.BasicStroke; - import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Point; import java.awt.TexturePaint; import java.awt.geom.AffineTransform; - import java.awt.geom.GeneralPath; - import java.awt.geom.NoninvertibleTransformException; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; @@ -26,9 +23,9 @@ import Listeners.Mouse; import Listeners.MouseMotion; import Listeners.MouseWheel; import Objects.Entrance; +import Objects.Food; import Objects.Path; import Objects.Stage; - import Objects.Toilet; import Objects.Wall; @@ -37,7 +34,7 @@ public class Panel extends JPanel { BufferedImage background; BufferedImage podiumImage, toiletImage, entranceImage, pathImage, - wallImage; + wallImage, foodImage; private int panelInfox, panelInfoy, scrollfactor; @@ -73,6 +70,7 @@ public class Panel extends JPanel { entranceImage = ImageIO.read(new File("images/entranceIcon.png")); pathImage = ImageIO.read(new File("images/pathIcon.png")); wallImage = ImageIO.read(new File("images/wallIcon.png")); + foodImage = ImageIO.read(new File("images/foodIcon.png")); } catch (IOException e) { e.printStackTrace(); } @@ -81,6 +79,7 @@ public class Panel extends JPanel { panelInfo.add(entranceImage); panelInfo.add(pathImage); panelInfo.add(wallImage); + panelInfo.add(foodImage); panelInfox = 0; panelInfoy = 0; @@ -118,6 +117,8 @@ public class Panel extends JPanel { return new Path(null); case 4: return new Wall(null); + case 5: + return new Food(null); default: return null; } diff --git a/Objects/Food.java b/Objects/Food.java new file mode 100644 index 0000000..cdd5028 --- /dev/null +++ b/Objects/Food.java @@ -0,0 +1,17 @@ +package Objects; +import java.awt.geom.Point2D; + +import Applicatie.DrawObject; + + +public class Food extends DrawObject { + + public Food(Point2D position) { + super("images/food.png", position); + } + + public String getName() { + return "Food"; + } + +} diff --git a/Objects/Stage.java b/Objects/Stage.java index 82e47f2..c11f02a 100644 --- a/Objects/Stage.java +++ b/Objects/Stage.java @@ -7,7 +7,7 @@ import Applicatie.DrawObject; public class Stage extends DrawObject { public Stage(Point2D position) { - super("images/stage3.png", position); + super("images/stage4.png", position); } @Override diff --git a/images/entrance.png b/images/entrance.png index 997705d..3b1ea6a 100644 Binary files a/images/entrance.png and b/images/entrance.png differ diff --git a/images/entranceIcon.png b/images/entranceIcon.png index 1bf4e05..0b0bc61 100644 Binary files a/images/entranceIcon.png and b/images/entranceIcon.png differ diff --git a/images/food.png b/images/food.png index 01d0a58..1c0cee1 100644 Binary files a/images/food.png and b/images/food.png differ diff --git a/images/foodIcon.png b/images/foodIcon.png new file mode 100644 index 0000000..f946a5f Binary files /dev/null and b/images/foodIcon.png differ diff --git a/images/stageIcon.png b/images/stageIcon.png index 97311d7..634d160 100644 Binary files a/images/stageIcon.png and b/images/stageIcon.png differ diff --git a/images/wc.png b/images/wc.png index cda15b6..9ac7415 100644 Binary files a/images/wc.png and b/images/wc.png differ diff --git a/images/wcIcon.png b/images/wcIcon.png index 33e1bd8..1456aa8 100644 Binary files a/images/wcIcon.png and b/images/wcIcon.png differ