Started bugfixes

This commit is contained in:
2015-03-10 12:23:08 +01:00
parent 281bd9fa4a
commit b47ea12829
3 changed files with 79 additions and 2 deletions
+62 -2
View File
@@ -48,9 +48,9 @@ public class Panel extends JPanel {
objects.add(new Podium(new Point2D.Double(500, 100)));
objects.add(new Podium(new Point2D.Double(300, 400)));
addMouseListener(new Mouse());
addMouseListener(new Mouse(this));
addMouseMotionListener(new MouseMotion());
addMouseMotionListener(new MouseMotion(this));
addMouseWheelListener(new MouseWheelListener() {
public void mouseWheelMoved(MouseWheelEvent e) {
@@ -117,4 +117,64 @@ public class Panel extends JPanel {
}
public ArrayList<DrawObject> getObjects() {
return objects;
}
public void setObjects(ArrayList<DrawObject> objects) {
this.objects = objects;
}
public DrawObject getDragObject() {
return dragObject;
}
public void setDragObject(DrawObject dragObject) {
this.dragObject = dragObject;
}
public Point2D getCameraPoint() {
return cameraPoint;
}
public void setCameraPoint(Point2D cameraPoint) {
this.cameraPoint = cameraPoint;
}
public float getCameraScale() {
return cameraScale;
}
public void setCameraScale(float cameraScale) {
this.cameraScale = cameraScale;
}
public Point2D getLastClickPosition() {
return lastClickPosition;
}
public void setLastClickPosition(Point2D lastClickPosition) {
this.lastClickPosition = lastClickPosition;
}
public Point getLastMousePosition() {
return lastMousePosition;
}
public void setLastMousePosition(Point lastMousePosition) {
this.lastMousePosition = lastMousePosition;
}
}
+8
View File
@@ -5,10 +5,18 @@ import java.awt.event.MouseEvent;
import java.awt.geom.Point2D;
import Applicatie.DrawObject;
import Applicatie.Panel;
import Objects.Podium;
import Objects.Toilet;
public class Mouse extends MouseAdapter {
Panel p;
public Mouse(Panel p)
{
this.p = p;
}
public void mousePressed(MouseEvent e) {
Point2D clickPoint = getClickPoint(e.getPoint());
lastClickPosition = clickPoint;
+9
View File
@@ -6,7 +6,16 @@ import java.awt.geom.Point2D;
import javax.swing.SwingUtilities;
import Applicatie.Panel;
public class MouseMotion extends MouseMotionAdapter {
Panel p;
public MouseMotion(Panel p)
{
this.p = p;
}
public void mouseDragged(MouseEvent e) {
Point2D clickPoint = getClickPoint(e.getPoint());
if(dragObject != null)