Avans/FestivalPlanner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

laatste versie

Browse Source
This commit is contained in:
unknown
2015-04-08 15:56:46 +02:00
parent c2cb07cf3e
commit 69c05da3fd
18 changed files with 726 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Listeners/Keyboard.java
+32 -4
View File
@@ -27,23 +27,51 @@ public class Keyboard implements KeyListener {
}
else if(e.getKeyCode() == e.VK_LEFT) {
if(panel.getSelectedObject() != null)
panel.getSelectedObject().setPosition(new Point2D.Double(panel.getSelectedObject().getPosition().getX()-5,panel.getSelectedObject().getPosition().getY()));
panel.getSelectedObject().setPosition(new Point2D.Double(panel.getSelectedObject().getPosition().getX()-5,panel.getSelectedObject().getPosition().getY()), true);
panel.checkCollision();
panel.getPP().update();
}
else if(e.getKeyCode() == e.VK_RIGHT) {
if(panel.getSelectedObject() != null)
panel.getSelectedObject().setPosition(new Point2D.Double(panel.getSelectedObject().getPosition().getX()+5,panel.getSelectedObject().getPosition().getY()));
panel.getSelectedObject().setPosition(new Point2D.Double(panel.getSelectedObject().getPosition().getX()+5,panel.getSelectedObject().getPosition().getY()), true);
panel.checkCollision();
panel.getPP().update();
}
else if(e.getKeyCode() == e.VK_UP) {
if(panel.getSelectedObject() != null)
panel.getSelectedObject().setPosition(new Point2D.Double(panel.getSelectedObject().getPosition().getX(),panel.getSelectedObject().getPosition().getY()-5));
panel.getSelectedObject().setPosition(new Point2D.Double(panel.getSelectedObject().getPosition().getX(),panel.getSelectedObject().getPosition().getY()-5), true);
panel.checkCollision();
panel.getPP().update();
}
else if(e.getKeyCode() == e.VK_DOWN) {
if(panel.getSelectedObject() != null)
panel.getSelectedObject().setPosition(new Point2D.Double(panel.getSelectedObject().getPosition().getX(),panel.getSelectedObject().getPosition().getY()+5));
panel.getSelectedObject().setPosition(new Point2D.Double(panel.getSelectedObject().getPosition().getX(),panel.getSelectedObject().getPosition().getY()+5), true);
panel.checkCollision();
panel.getPP().update();
}
else if(e.getKeyCode() == e.VK_ADD) {
if(panel.getSelectedObject() != null)
panel.getSelectedObject().setScale(panel.getSelectedObject().getScale()+0.2);
panel.checkCollision();
panel.getPP().update();
}
else if(e.getKeyCode() == e.VK_SUBTRACT) {
if(panel.getSelectedObject() != null)
panel.getSelectedObject().setScale(Math.max(panel.getSelectedObject().getScale()-0.2, 0.2));
panel.checkCollision();
panel.getPP().update();
}
else if(e.getKeyCode() == e.VK_COMMA) {
if(panel.getSelectedObject() != null)
panel.getSelectedObject().setRotation((panel.getSelectedObject().getRotation()-5)%360);
panel.checkCollision();
panel.getPP().update();
}
else if(e.getKeyCode() == e.VK_PERIOD) {
if(panel.getSelectedObject() != null)
panel.getSelectedObject().setRotation((panel.getSelectedObject().getRotation()+5)%360);
panel.checkCollision();
panel.getPP().update();
}
else if(e.getKeyCode() == e.VK_ENTER) {
if(panel.getClickedOption().equals("Path")) {
Listeners/Mouse.java
+45 -42
View File
@@ -7,8 +7,13 @@ import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
import javax.swing.SwingUtilities;
import Applicatie.Panel;
import Applicatie.PathPopup;
import Applicatie.Waypoint;
import Applicatie.WaypointPopup;
import Objects.DrawObject;
import Objects.Path;
import Objects.Entrance;
@@ -30,6 +35,7 @@ public class Mouse extends MouseAdapter
Point2D clickPoint = panel.getClickPoint(e.getPoint());
panel.setLastClickPosition(clickPoint);
panel.setLastMousePosition(e.getPoint());
if (!panel.getClickedOption().equals("Path"))
{
if (e.getY() < 150)
@@ -41,15 +47,16 @@ public class Mouse extends MouseAdapter
if (e.getX() >= panel.getScrollfactor() && e.getX() < last + image.getWidth() + panel.getScrollfactor())
{
DrawObject tempDrawObj = panel.createNewDrawObject(i);
if (tempDrawObj != null){
tempDrawObj.setPosition(clickPoint);
if (!panel.getObjects().isEmpty())
panel.clearObjectSelection();
panel.setDragObject(tempDrawObj);
panel.getDragObject().setSelected(true);
panel.getPP().setSelected(tempDrawObj);
panel.setSelectedObject(tempDrawObj);
selectedObject = tempDrawObj;
if (tempDrawObj != null)
{
tempDrawObj.setPosition(clickPoint);
if (!panel.getObjects().isEmpty())
panel.clearObjectSelection();
panel.setDragObject(tempDrawObj);
panel.getDragObject().setSelected(true);
panel.getPP().setSelected(tempDrawObj);
panel.setSelectedObject(tempDrawObj);
selectedObject = tempDrawObj;
}
break;
}
@@ -67,6 +74,14 @@ public class Mouse extends MouseAdapter
{
if (o.contains(clickPoint))
{
if (SwingUtilities.isRightMouseButton(e))
{
if (o instanceof Waypoint)
{
new WaypointPopup(o, panel);
}
}
if (o == selectedObject)
{
boolean upperLeft = o.containsCorner(clickPoint, 0);
@@ -110,7 +125,19 @@ public class Mouse extends MouseAdapter
}
}
panel.checkPath(clickPoint);
Path clickedPath = panel.getClickedPath(clickPoint);
if (clickedPath != null)
{
if (SwingUtilities.isRightMouseButton(e))
{
new PathPopup(clickedPath, panel);
}
}
else
{
panel.checkPath(clickPoint);
}
}
if (panel.getDragObject() == null && selectedObject != null)
{
@@ -122,45 +149,21 @@ public class Mouse extends MouseAdapter
}
else
{ // Making path.
panel.getCurrentPath().addPoint(new Point2D.Double(clickPoint.getX(), clickPoint.getY()));
}
panel.repaint();
}
public void mouseReleased(MouseEvent e)
{
if(panel.getDragObject() != null) {
if(panel.getDragObject().getRectangleColor() != Color.RED) {
if(panel.getDragObject() instanceof Entrance)
{
Rectangle2D rect = panel.getDragObject().getRectangle();
double xl = (panel.getFieldWidth()/2) + rect.getMinX();
double xr = panel.getFieldWidth() - xl+rect.getWidth();
double yt = (panel.getFieldHeight()/2) + rect.getMinY();
double yb = panel.getFieldHeight() - yt+rect.getHeight();
if(xl < xr && xl < yt && xl < yb)
{
panel.getDragObject().setPosition(new Point2D.Double(-panel.getFieldWidth()/2, rect.getMinY()));
}
else if(xr < xl && xr < yt && xr < yb)
{
panel.getDragObject().setPosition(new Point2D.Double(panel.getFieldWidth()/2 - rect.getWidth(), rect.getMinY()));
}
else if(yt < xl && yt < xr && yt < yb)
{
panel.getDragObject().setPosition(new Point2D.Double(rect.getMinX(), -panel.getFieldHeight()/2));
}
else if(yb < xl && yb < yt && yb < xr)
{
panel.getDragObject().setPosition(new Point2D.Double(rect.getMinX(), panel.getFieldHeight()/2 - rect.getHeight()));
}
else
{
panel.getDragObject().setPosition(new Point2D.Double(-panel.getFieldWidth()/2, -panel.getFieldHeight()/2));
}
}
if (panel.getDragObject() != null)
{
if (panel.getDragObject().getRectangleColor() != Color.RED)
{
panel.getDragObject().setPosition(panel.getDragObject().getPosition(), true);
panel.getPP().update();
panel.setDragObject(null);
panel.setClickedOption("drag");
}
Listeners/WindowFocusListener.java
+25
View File
@@ -0,0 +1,25 @@
package Listeners;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
import Applicatie.Panel;
public class WindowFocusListener implements FocusListener
{
Panel p;
public WindowFocusListener(Panel p)
{
this.p = p;
}
@Override
public void focusGained(FocusEvent e){}
@Override
public void focusLost(FocusEvent e)
{
p.requestFocus();
}
}