Woo
@@ -114,9 +114,11 @@ public abstract class DrawObject
|
|||||||
{
|
{
|
||||||
shape = new Rectangle2D.Double(0, 0, image.getWidth(null), image.getHeight(null));
|
shape = new Rectangle2D.Double(0, 0, image.getWidth(null), image.getHeight(null));
|
||||||
return getTransform().createTransformedShape(shape).contains(clickPoint);
|
return getTransform().createTransformedShape(shape).contains(clickPoint);
|
||||||
|
|
||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
shape = new Rectangle2D.Double(-7, -7, image.getWidth(null) + 7, image.getHeight(null) + 7);
|
shape = new Rectangle2D.Double(-9, -9, image.getWidth(null) + 13, image.getHeight(null) + 13);
|
||||||
|
|
||||||
return getTransformSelection().createTransformedShape(shape).contains(clickPoint);
|
return getTransformSelection().createTransformedShape(shape).contains(clickPoint);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,15 +1,12 @@
|
|||||||
package Applicatie;
|
package Applicatie;
|
||||||
|
|
||||||
import java.awt.BasicStroke;
|
import java.awt.BasicStroke;
|
||||||
|
|
||||||
import java.awt.Graphics;
|
import java.awt.Graphics;
|
||||||
import java.awt.Graphics2D;
|
import java.awt.Graphics2D;
|
||||||
import java.awt.Point;
|
import java.awt.Point;
|
||||||
import java.awt.TexturePaint;
|
import java.awt.TexturePaint;
|
||||||
import java.awt.geom.AffineTransform;
|
import java.awt.geom.AffineTransform;
|
||||||
|
|
||||||
import java.awt.geom.GeneralPath;
|
import java.awt.geom.GeneralPath;
|
||||||
|
|
||||||
import java.awt.geom.NoninvertibleTransformException;
|
import java.awt.geom.NoninvertibleTransformException;
|
||||||
import java.awt.geom.Point2D;
|
import java.awt.geom.Point2D;
|
||||||
import java.awt.geom.Rectangle2D;
|
import java.awt.geom.Rectangle2D;
|
||||||
@@ -26,9 +23,9 @@ import Listeners.Mouse;
|
|||||||
import Listeners.MouseMotion;
|
import Listeners.MouseMotion;
|
||||||
import Listeners.MouseWheel;
|
import Listeners.MouseWheel;
|
||||||
import Objects.Entrance;
|
import Objects.Entrance;
|
||||||
|
import Objects.Food;
|
||||||
import Objects.Path;
|
import Objects.Path;
|
||||||
import Objects.Stage;
|
import Objects.Stage;
|
||||||
|
|
||||||
import Objects.Toilet;
|
import Objects.Toilet;
|
||||||
import Objects.Wall;
|
import Objects.Wall;
|
||||||
|
|
||||||
@@ -37,7 +34,7 @@ public class Panel extends JPanel
|
|||||||
{
|
{
|
||||||
|
|
||||||
BufferedImage background;
|
BufferedImage background;
|
||||||
BufferedImage podiumImage, toiletImage, entranceImage, pathImage, wallImage;
|
BufferedImage podiumImage, toiletImage, entranceImage, pathImage, wallImage, foodImage;
|
||||||
|
|
||||||
private int panelInfox, panelInfoy, scrollfactor;
|
private int panelInfox, panelInfoy, scrollfactor;
|
||||||
|
|
||||||
@@ -75,6 +72,7 @@ public class Panel extends JPanel
|
|||||||
entranceImage = ImageIO.read(new File("images/entranceIcon.png"));
|
entranceImage = ImageIO.read(new File("images/entranceIcon.png"));
|
||||||
pathImage = ImageIO.read(new File("images/pathIcon.png"));
|
pathImage = ImageIO.read(new File("images/pathIcon.png"));
|
||||||
wallImage = ImageIO.read(new File("images/wallIcon.png"));
|
wallImage = ImageIO.read(new File("images/wallIcon.png"));
|
||||||
|
foodImage = ImageIO.read(new File("images/foodIcon.png"));
|
||||||
} catch (IOException e)
|
} catch (IOException e)
|
||||||
{
|
{
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
@@ -84,6 +82,7 @@ public class Panel extends JPanel
|
|||||||
panelInfo.add(entranceImage);
|
panelInfo.add(entranceImage);
|
||||||
panelInfo.add(pathImage);
|
panelInfo.add(pathImage);
|
||||||
panelInfo.add(wallImage);
|
panelInfo.add(wallImage);
|
||||||
|
panelInfo.add(foodImage);
|
||||||
|
|
||||||
panelInfox = 0;
|
panelInfox = 0;
|
||||||
panelInfoy = 0;
|
panelInfoy = 0;
|
||||||
@@ -125,6 +124,8 @@ public class Panel extends JPanel
|
|||||||
return new Path(null);
|
return new Path(null);
|
||||||
case 4:
|
case 4:
|
||||||
return new Wall(null);
|
return new Wall(null);
|
||||||
|
case 5:
|
||||||
|
return new Food(null);
|
||||||
default:
|
default:
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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";
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -7,7 +7,7 @@ import Applicatie.DrawObject;
|
|||||||
public class Stage extends DrawObject {
|
public class Stage extends DrawObject {
|
||||||
|
|
||||||
public Stage(Point2D position) {
|
public Stage(Point2D position) {
|
||||||
super("images/stage3.png", position);
|
super("images/stage4.png", position);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 6.6 KiB |
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 5.7 KiB |