summaryrefslogtreecommitdiff
path: root/pacman/model/src/main/java/com
diff options
context:
space:
mode:
authormithe24 <mithe24@student.sdu.dk>2025-05-17 20:18:12 +0200
committerGitHub <noreply@github.com>2025-05-17 20:18:12 +0200
commitbf53777577aea4615559b56b319bfc8b24ed3fa0 (patch)
tree87e6350eb2cdfd5d1c30d606444e782c111c1f0c /pacman/model/src/main/java/com
parent7a1f9b5fbe334836732a79a3ca1205293b220dad (diff)
downloadpacman-bf53777577aea4615559b56b319bfc8b24ed3fa0.tar.gz
pacman-bf53777577aea4615559b56b319bfc8b24ed3fa0.zip
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.
Diffstat (limited to '')
-rw-r--r--pacman/model/src/main/java/com/gr15/pacman/model/entities/EntityUtils.java16
1 files changed, 8 insertions, 8 deletions
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;