fixed overlapping objects
banaan
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package Applicatie;
|
||||
|
||||
import java.awt.BasicStroke;
|
||||
import java.awt.Color;
|
||||
import java.awt.Graphics;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.Point;
|
||||
@@ -53,6 +54,7 @@ public class Panel extends JPanel
|
||||
|
||||
Point2D lastClickPosition = new Point(0, 0);
|
||||
Point lastMousePosition = new Point(0, 0);
|
||||
Point2D selectionPosition = new Point(0,0);
|
||||
|
||||
// how to nieuwe dingen aan het panel toe te voegen:
|
||||
// maak bufferedimage global aan, voeg er een image aan toe, en voeg de
|
||||
@@ -60,6 +62,14 @@ public class Panel extends JPanel
|
||||
// en maak een case statement die een new Object returnt in
|
||||
// createNewDrawObject.
|
||||
|
||||
public Point2D getSelectionPosition() {
|
||||
return selectionPosition;
|
||||
}
|
||||
|
||||
public void setSelectionPosition(Point2D selectionPosition) {
|
||||
this.selectionPosition = selectionPosition;
|
||||
}
|
||||
|
||||
Panel(PropertiesPanel pp)
|
||||
{
|
||||
this.pp = pp;
|
||||
@@ -339,4 +349,27 @@ public class Panel extends JPanel
|
||||
repaint();
|
||||
}
|
||||
}
|
||||
|
||||
public void clearObjectSelection() {
|
||||
for(DrawObject o : objects) {
|
||||
o.setSelected(false);
|
||||
}
|
||||
}
|
||||
|
||||
public void checkCollision() {
|
||||
boolean collision = false;
|
||||
for(DrawObject o : getObjects()) {
|
||||
if(getSelectedObject().collision(o) && o != getSelectedObject()) {
|
||||
collision = true;
|
||||
getSelectedObject().setRectangleColor(Color.RED);
|
||||
break;
|
||||
}
|
||||
if(!collision)
|
||||
getSelectedObject().setRectangleColor(Color.BLACK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user