Noratrieb/Java2DGame
1
0
Fork 0
mirror of https://github.com/Noratrieb/Java2DGame.git synced 2026-01-15 22:45:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

"fixed" sub

Browse source
This commit is contained in:
nora 2020-12-12 14:57:30 +01:00
parent 87ca37c9ca
commit 3566916125
6 changed files with 43 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/core/Master.java
View file

@ -76,7 +76,7 @@ public class Master extends JPanel {
create(bs);
create(battleShip);
create(new Submarine(new Vector2D(), new Vector2D(20, 20)));
create(new Submarine(new Vector2D(), new Vector2D(5, 5)));
create(new Wall(20, 80, 50, 2));
}
@ -173,8 +173,14 @@ public class Master extends JPanel {
for (Collidable c : collidables) {
double distance = Vector2D.distance(c.getCenterPos(), col.getCenterPos());
if (!(distance > c.getSize().magnitude() && distance > col.getSize().magnitude())) {
if (c != col /*&& !(distance > c.getSize().magnitude() && distance > col.getSize().magnitude())*/) {
System.out.println("\n\nCOLL POSSIBLE");
System.out.println("This: " + c.getHitbox() + "\n\nother: " + col.getHitbox());
if (c.collidesWith(col)) {
System.err.println("COLL");
collides = true;
}
}

5
src/main/java/core/physics/Hitbox.java
View file

@ -1,8 +1,13 @@
package core.physics;
import core.Drawable;
import core.math.Vector2D;
import objects.GameObject;
public abstract class Hitbox implements Drawable {
@Override
public String toString() {
return super.toString();
}
}