From 26265b5a3ed05960e68cb81f7d52690e94b38c31 Mon Sep 17 00:00:00 2001 From: Yorick Date: Wed, 8 Apr 2015 21:03:29 +0200 Subject: [PATCH] Waypoint move --- Applicatie/Panel.java | 2 +- Applicatie/Visitor.java | 4 +--- Applicatie/Waypoint.java | 6 +++++- Listeners/Mouse.java | 11 +++++++++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Applicatie/Panel.java b/Applicatie/Panel.java index d69710b..959601a 100644 --- a/Applicatie/Panel.java +++ b/Applicatie/Panel.java @@ -148,7 +148,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 / 50, this); } public int getPanelInfoLength() diff --git a/Applicatie/Visitor.java b/Applicatie/Visitor.java index bf3ec7f..7379ee0 100644 --- a/Applicatie/Visitor.java +++ b/Applicatie/Visitor.java @@ -94,7 +94,6 @@ public class Visitor } } - System.out.println(actions.size()); // moveToTarget(target, objects, visitors, paths); move(target, panel); @@ -102,7 +101,7 @@ public class Visitor public void move(DrawObject tar, Panel panel) { - Point2D targetPoint = panel.getWaypoint(target).getPosition(); + Point2D targetPoint = panel.getWaypoint(target).getAccuratePoint(); double newRot = Math.atan2(targetPoint.getY() - position.getY(), targetPoint.getX() - position.getX()); @@ -118,7 +117,6 @@ public class Visitor { rotation += 0.15; } - Point2D oldPosition = position; // face direction diff --git a/Applicatie/Waypoint.java b/Applicatie/Waypoint.java index 0152618..02c9a5c 100644 --- a/Applicatie/Waypoint.java +++ b/Applicatie/Waypoint.java @@ -13,6 +13,11 @@ public class Waypoint extends DrawObject super("waypoint", position); } + public Point2D getAccuratePoint() + { + return new Point2D.Double(super.getPosition().getX() + (super.getImageRectangle().getWidth()/2), super.getPosition().getY() + super.getImageRectangle().getHeight()); + } + @Override public String getName() { @@ -36,7 +41,6 @@ public class Waypoint extends DrawObject public void setSelf(int self) { - System.out.println(self); this.self = self; } diff --git a/Listeners/Mouse.java b/Listeners/Mouse.java index 75d8b1c..4f7e70b 100644 --- a/Listeners/Mouse.java +++ b/Listeners/Mouse.java @@ -169,8 +169,15 @@ public class Mouse extends MouseAdapter } else { - panel.getDragObject().setPosition(panel.getSelectionPosition()); - panel.getDragObject().setRectangleColor(Color.BLACK); + if (panel.getDragObject() instanceof Waypoint == false) + { + panel.getDragObject().setPosition(panel.getSelectionPosition()); + panel.getDragObject().setRectangleColor(Color.BLACK); + } + else + { + panel.getDragObject().setRectangleColor(Color.BLACK); + } } panel.setSelectionPosition(panel.getSelectedObject().getPosition()); }