diff --git a/Applicatie/Panel.java b/Applicatie/Panel.java index 62ab697..3a4d363 100644 --- a/Applicatie/Panel.java +++ b/Applicatie/Panel.java @@ -3,10 +3,7 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Point; import java.awt.TexturePaint; -import java.awt.event.MouseWheelEvent; -import java.awt.event.MouseWheelListener; 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; @@ -14,7 +11,6 @@ import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; import java.util.ArrayList; -import java.util.HashMap; import javax.imageio.ImageIO; import javax.swing.JPanel; @@ -22,18 +18,21 @@ import javax.swing.JPanel; import Listeners.Mouse; import Listeners.MouseMotion; import Listeners.MouseWheel; +import Objects.Entrance; +import Objects.Path; import Objects.Podium; import Objects.Toilet; +import Objects.Wall; public class Panel extends JPanel { BufferedImage background; - BufferedImage podiumImage, toiletImage; + BufferedImage podiumImage, toiletImage, entranceImage, pathImage,wallImage; private int panelInfox, panelInfoy,scrollfactor; private ArrayList panelInfo = new ArrayList(); - private ArrayList panelTypes = new ArrayList(); +// private ArrayList panelTypes = new ArrayList(); ArrayList objects = new ArrayList<>(); DrawObject dragObject = null; @@ -54,16 +53,18 @@ public class Panel extends JPanel { try { background = ImageIO.read(new File("images/grass.jpg")); podiumImage = ImageIO.read(new File("images/stageIcon.png")); - toiletImage = ImageIO.read(new File("images/toilet.png")); + toiletImage = ImageIO.read(new File("images/wcIcon.png")); + entranceImage = ImageIO.read(new File("images/entranceIcon.png")); + pathImage = ImageIO.read(new File("images/pathIcon.png")); + wallImage = ImageIO.read(new File("images/wallIcon.png")); } catch (IOException e) { e.printStackTrace(); } panelInfo.add(podiumImage); panelInfo.add(toiletImage); - panelTypes.add(new Podium(null)); - panelTypes.add(new Toilet(null)); - panelInfo.add(toiletImage); - panelTypes.add(new Toilet(null)); + panelInfo.add(entranceImage); + panelInfo.add(pathImage); + panelInfo.add(wallImage); panelInfox = 0; panelInfoy = 0; @@ -101,7 +102,11 @@ public class Panel extends JPanel { case 1: return new Toilet(null); case 2: - return new Podium(null); + return new Entrance(null); + case 3: + return new Path(null); + case 4: + return new Wall(null); default: return null; } @@ -251,15 +256,6 @@ public class Panel extends JPanel { } - public ArrayList getPanelTypes() { - return panelTypes; - } - - - public void setPanelTypes(ArrayList panelTypes) { - this.panelTypes = panelTypes; - } - public int getScrollfactor() { return scrollfactor; } diff --git a/Objects/Entrance.java b/Objects/Entrance.java new file mode 100644 index 0000000..7cd5803 --- /dev/null +++ b/Objects/Entrance.java @@ -0,0 +1,13 @@ +package Objects; +import java.awt.geom.Point2D; + +import Applicatie.DrawObject; + + +public class Entrance extends DrawObject { + + public Entrance(Point2D position) { + super("images/entrance.png", position); + } + +} \ No newline at end of file diff --git a/Objects/Path.java b/Objects/Path.java new file mode 100644 index 0000000..0a2beec --- /dev/null +++ b/Objects/Path.java @@ -0,0 +1,13 @@ +package Objects; +import java.awt.geom.Point2D; + +import Applicatie.DrawObject; + + +public class Path extends DrawObject { + + public Path(Point2D position) { + super("images/path.jpg", position); + } + +} diff --git a/Objects/Toilet.java b/Objects/Toilet.java index bbba72c..162b4d7 100644 --- a/Objects/Toilet.java +++ b/Objects/Toilet.java @@ -7,7 +7,7 @@ import Applicatie.DrawObject; public class Toilet extends DrawObject { public Toilet(Point2D position) { - super("images/toilet.png", position); + super("images/wc.png", position); } } diff --git a/Objects/Wall.java b/Objects/Wall.java new file mode 100644 index 0000000..284f0c5 --- /dev/null +++ b/Objects/Wall.java @@ -0,0 +1,13 @@ +package Objects; +import java.awt.geom.Point2D; + +import Applicatie.DrawObject; + + +public class Wall extends DrawObject { + + public Wall(Point2D position) { + super("images/wall.png", position); + } + +} \ No newline at end of file diff --git a/images/entrance.png b/images/entrance.png new file mode 100644 index 0000000..e506580 Binary files /dev/null and b/images/entrance.png differ diff --git a/images/entranceIcon.png b/images/entranceIcon.png new file mode 100644 index 0000000..1bf4e05 Binary files /dev/null and b/images/entranceIcon.png differ diff --git a/images/images/entrance.png b/images/images/entrance.png new file mode 100644 index 0000000..e506580 Binary files /dev/null and b/images/images/entrance.png differ diff --git a/images/images/entranceIcon.png b/images/images/entranceIcon.png new file mode 100644 index 0000000..1bf4e05 Binary files /dev/null and b/images/images/entranceIcon.png differ diff --git a/images/images/grass.jpg b/images/images/grass.jpg new file mode 100644 index 0000000..92e12c2 Binary files /dev/null and b/images/images/grass.jpg differ diff --git a/images/images/path.jpg b/images/images/path.jpg new file mode 100644 index 0000000..7fe1940 Binary files /dev/null and b/images/images/path.jpg differ diff --git a/images/images/pathIcon.png b/images/images/pathIcon.png new file mode 100644 index 0000000..1b36611 Binary files /dev/null and b/images/images/pathIcon.png differ diff --git a/images/images/selection.png b/images/images/selection.png new file mode 100644 index 0000000..0676738 Binary files /dev/null and b/images/images/selection.png differ diff --git a/images/images/stage0.png b/images/images/stage0.png new file mode 100644 index 0000000..52b3b9b Binary files /dev/null and b/images/images/stage0.png differ diff --git a/images/images/stage1.png b/images/images/stage1.png new file mode 100644 index 0000000..bac1662 Binary files /dev/null and b/images/images/stage1.png differ diff --git a/images/images/stage2.png b/images/images/stage2.png new file mode 100644 index 0000000..df1d2d4 Binary files /dev/null and b/images/images/stage2.png differ diff --git a/images/images/stage3.png b/images/images/stage3.png new file mode 100644 index 0000000..b18ffec Binary files /dev/null and b/images/images/stage3.png differ diff --git a/images/images/stageIcon.png b/images/images/stageIcon.png new file mode 100644 index 0000000..060c7d2 Binary files /dev/null and b/images/images/stageIcon.png differ diff --git a/images/images/toilet.png b/images/images/toilet.png new file mode 100644 index 0000000..ac4027b Binary files /dev/null and b/images/images/toilet.png differ diff --git a/images/images/wall.png b/images/images/wall.png new file mode 100644 index 0000000..f68a18f Binary files /dev/null and b/images/images/wall.png differ diff --git a/images/images/wallIcon.png b/images/images/wallIcon.png new file mode 100644 index 0000000..6d105ac Binary files /dev/null and b/images/images/wallIcon.png differ diff --git a/images/images/wc.png b/images/images/wc.png new file mode 100644 index 0000000..e8cceb9 Binary files /dev/null and b/images/images/wc.png differ diff --git a/images/images/wcIcon.png b/images/images/wcIcon.png new file mode 100644 index 0000000..33e1bd8 Binary files /dev/null and b/images/images/wcIcon.png differ diff --git a/images/path.jpg b/images/path.jpg new file mode 100644 index 0000000..7fe1940 Binary files /dev/null and b/images/path.jpg differ diff --git a/images/pathIcon.png b/images/pathIcon.png new file mode 100644 index 0000000..1b36611 Binary files /dev/null and b/images/pathIcon.png differ diff --git a/images/stageIcon.png b/images/stageIcon.png new file mode 100644 index 0000000..060c7d2 Binary files /dev/null and b/images/stageIcon.png differ diff --git a/images/wall.png b/images/wall.png new file mode 100644 index 0000000..f68a18f Binary files /dev/null and b/images/wall.png differ diff --git a/images/wallIcon.png b/images/wallIcon.png new file mode 100644 index 0000000..6d105ac Binary files /dev/null and b/images/wallIcon.png differ diff --git a/images/wc.png b/images/wc.png new file mode 100644 index 0000000..e8cceb9 Binary files /dev/null and b/images/wc.png differ diff --git a/images/wcIcon.png b/images/wcIcon.png new file mode 100644 index 0000000..33e1bd8 Binary files /dev/null and b/images/wcIcon.png differ