more collision detection!!!

This commit is contained in:
toksikk
2014-11-07 15:20:44 +01:00
parent f95a85cf2e
commit 8770014845
2 changed files with 11 additions and 0 deletions
@@ -1,9 +1,12 @@
package de.heatup.mapengine; package de.heatup.mapengine;
import java.util.ArrayList;
import de.heatup.logging.Logger; import de.heatup.logging.Logger;
import de.heatup.testing.Player; import de.heatup.testing.Player;
public class CollisionHandler { public class CollisionHandler {
private static ArrayList<Player> movingObjects = new ArrayList<Player>();
/** /**
* Prüfe ob eine Kollision vorliegt * Prüfe ob eine Kollision vorliegt
* @param movingObject Kann alles sein, dass sich bewegt. Spieler oder KI. * @param movingObject Kann alles sein, dass sich bewegt. Spieler oder KI.
@@ -36,4 +39,7 @@ public class CollisionHandler {
return true; return true;
} }
} }
public static void addMovingObject(Player movingObject) {
movingObjects.add(movingObject);
}
} }
+5
View File
@@ -14,6 +14,7 @@ import javax.swing.JComponent;
import de.heatup.cfg.Config; import de.heatup.cfg.Config;
import de.heatup.logging.Logger; import de.heatup.logging.Logger;
import de.heatup.mapengine.CollisionHandler;
public class Player extends JComponent { public class Player extends JComponent {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@@ -33,6 +34,10 @@ public class Player extends JComponent {
int stepCounter = 25; int stepCounter = 25;
private Point currentGridPosition; private Point currentGridPosition;
public Player() {
CollisionHandler.addMovingObject(this);
}
public void setSpeedMultiplicator(int factor) { public void setSpeedMultiplicator(int factor) {
this.speedMultiplicator *= factor; this.speedMultiplicator *= factor;
} }