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

collision optimization

Browse source
This commit is contained in:
nora 2020-12-13 13:28:38 +01:00
parent 0c1178d1d1
commit 90c5950e0b
11 changed files with 61 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/objects/GameObject.java
View file

@ -1,6 +1,6 @@
package objects;
import core.Coords;
import core.math.Coords;
import core.Drawable;
import core.Master;
import core.math.Vector2D;
@ -23,6 +23,8 @@ public abstract class GameObject implements Drawable {
protected Master master;
protected int layer;
public GameObject(double x, double y, double xSize, double ySize) {
this(new Vector2D(x, y), new Vector2D(xSize, ySize));
}
@ -33,6 +35,7 @@ public abstract class GameObject implements Drawable {
this.velocity = new Vector2D();
mainColor = Color.BLACK;
this.master = Master.getMaster();
this.layer = 0;
}
@ -133,4 +136,8 @@ public abstract class GameObject implements Drawable {
public Vector2D getCenterPosition() {
return new Vector2D(position.x - size.x / 2, position.y - size.y / 2);
}
public int getLayer() {
return layer;
}
}

6
src/main/java/objects/ships/Submarine.java
View file

@ -1,10 +1,10 @@
package objects.ships;
import core.Coords;
import core.math.Coords;
import core.math.Vector2D;
import core.physics.Collidable;
import core.physics.Hitbox;
import core.physics.RectHitBox;
import core.physics.hitboxes.Hitbox;
import core.physics.hitboxes.RectHitBox;
import objects.GameObject;
import java.awt.*;

4
src/main/java/objects/world/Wall.java
View file

@ -2,8 +2,8 @@ package objects.world;
import core.math.Vector2D;
import core.physics.Collidable;
import core.physics.Hitbox;
import core.physics.RectHitBox;
import core.physics.hitboxes.Hitbox;
import core.physics.hitboxes.RectHitBox;
import objects.GameObject;
import java.awt.*;