PandacubeFr/PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix AABBBlockGroup

Browse Source
This commit is contained in:
Marc Baloup 2023-12-27 18:56:44 +01:00
parent b82b59d57b
commit 075468854d
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandalib-paper/src/main/java/fr/pandacube/lib/paper/geometry/blocks/AABBBlock.java
View File

@ -180,7 +180,16 @@ public class AABBBlock implements BlockSet, Cloneable {
} }
@Override
public String toString() {
return "{(" + pos1.getBlockX() +
", " + pos1.getBlockY() +
", " + pos1.getBlockZ() +
"), (" + pos2.getBlockX() +
", " + pos2.getBlockY() +
", " + pos2.getBlockZ() +
")}";
}
static boolean overlap(AABBBlock aabb1, AABBBlock aabb2) { static boolean overlap(AABBBlock aabb1, AABBBlock aabb2) {
return aabb1.asBukkitBoundingBox().overlaps(aabb2.asBukkitBoundingBox()); return aabb1.asBukkitBoundingBox().overlaps(aabb2.asBukkitBoundingBox());

18
pandalib-paper/src/main/java/fr/pandacube/lib/paper/geometry/blocks/AABBBlockGroup.java
View File

@ -35,11 +35,11 @@ public class AABBBlockGroup implements BlockSet {
for (int i = 1; i < subAABB.size(); i++) { for (int i = 1; i < subAABB.size(); i++) {
AABBBlock aabb = subAABB.get(i); AABBBlock aabb = subAABB.get(i);
pos1.setX(Math.min(pos1.getBlockX(), aabb.pos1.getBlockX())); pos1.setX(Math.min(pos1.getBlockX(), aabb.pos1.getBlockX()));
pos1.setY(Math.min(pos1.getBlockY(), aabb.pos1.getBlockZ())); pos1.setY(Math.min(pos1.getBlockY(), aabb.pos1.getBlockY()));
pos1.setZ(Math.min(pos1.getBlockY(), aabb.pos1.getBlockZ())); pos1.setZ(Math.min(pos1.getBlockZ(), aabb.pos1.getBlockZ()));
pos2.setX(Math.max(pos2.getBlockX(), aabb.pos2.getBlockX() - 1)); pos2.setX(Math.max(pos2.getBlockX(), aabb.pos2.getBlockX() - 1));
pos2.setY(Math.max(pos2.getBlockY(), aabb.pos2.getBlockZ() - 1)); pos2.setY(Math.max(pos2.getBlockY(), aabb.pos2.getBlockY() - 1));
pos2.setZ(Math.max(pos2.getBlockY(), aabb.pos2.getBlockZ() - 1)); pos2.setZ(Math.max(pos2.getBlockZ(), aabb.pos2.getBlockZ() - 1));
} }
return new AABBBlock(pos1, pos2); return new AABBBlock(pos1, pos2);
} }
@ -86,9 +86,13 @@ public class AABBBlockGroup implements BlockSet {
return IteratorIterator.ofCollectionOfIterator(subAABB.stream().map(AABBBlock::iterator).toList()); return IteratorIterator.ofCollectionOfIterator(subAABB.stream().map(AABBBlock::iterator).toList());
} }
@Override
public String toString() {
return "AABBBlockGroup{" +
"subAABB=" + subAABB +
", englobingAABB=" + englobingAABB +
'}';
}
/* package */ static boolean overlap(AABBBlockGroup aabbGroup, AABBBlock aabb) { /* package */ static boolean overlap(AABBBlockGroup aabbGroup, AABBBlock aabb) {
if (!aabbGroup.englobingAABB.overlaps(aabb)) if (!aabbGroup.englobingAABB.overlaps(aabb))