From bf53777577aea4615559b56b319bfc8b24ed3fa0 Mon Sep 17 00:00:00 2001 From: mithe24 Date: Sat, 17 May 2025 20:18:12 +0200 Subject: refactor(EntityUtils) Use getPositionX/Y to position (#22) EntityUtils should use entities builin method for getting position as double containing both integer and decimal part. --- .../java/com/gr15/pacman/model/entities/EntityUtils.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'pacman/model/src') diff --git a/pacman/model/src/main/java/com/gr15/pacman/model/entities/EntityUtils.java b/pacman/model/src/main/java/com/gr15/pacman/model/entities/EntityUtils.java index 355a6f4..0bdc6d5 100644 --- a/pacman/model/src/main/java/com/gr15/pacman/model/entities/EntityUtils.java +++ b/pacman/model/src/main/java/com/gr15/pacman/model/entities/EntityUtils.java @@ -25,10 +25,10 @@ public final class EntityUtils { * @return the distance between the centers of the two entities. */ public static double distance(Entity arg0, Entity arg1) { - double arg0X = arg0.getPosition().x() + arg0.getSubTileX(); - double arg0Y = arg0.getPosition().y() + arg0.getSubTileY(); - double arg1X = arg1.getPosition().x() + arg1.getSubTileX(); - double arg1Y = arg1.getPosition().y() + arg1.getSubTileY(); + double arg0X = arg0.getPositionX(); + double arg0Y = arg0.getPositionY(); + double arg1X = arg1.getPositionX(); + double arg1Y = arg1.getPositionY(); return Math.hypot(arg0X - arg1X, arg0Y - arg1Y); } @@ -42,10 +42,10 @@ public final class EntityUtils { * @return true if the entities have collided; false otherwise. */ public static boolean hasCollided(Entity arg0, Entity arg1) { - double arg0X = arg0.getPosition().x() + arg0.getSubTileX(); - double arg0Y = arg0.getPosition().y() + arg0.getSubTileY(); - double arg1X = arg1.getPosition().x() + arg1.getSubTileX(); - double arg1Y = arg1.getPosition().y() + arg1.getSubTileY(); + double arg0X = arg0.getPositionX(); + double arg0Y = arg0.getPositionY(); + double arg1X = arg1.getPositionX(); + double arg1Y = arg1.getPositionY(); double dx = arg0X - arg1X; double dy = arg0Y - arg1Y; -- cgit v1.2.3-70-g09d2