feat: use our own joml-primitives fork

AllayMC · Feb 3, 2025 · 27cdeff · 27cdeff
1 parent 2bd71c6
commit 27cdeff
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/api/src/main/java/org/allaymc/api/math/MathUtils.java b/api/src/main/java/org/allaymc/api/math/MathUtils.java
@@ -4,7 +4,6 @@
 import org.allaymc.api.math.location.Location3fc;
 import org.joml.*;
 import org.joml.primitives.AABBd;
-import org.joml.primitives.AABBdc;
 import org.joml.primitives.AABBf;
 
 import java.lang.Math;
@@ -414,13 +413,4 @@ public static AABBd grow(AABBd aabb, double growth) {
         aabb.maxZ += growth;
         return aabb;
     }
-
-    /**
-     * NOTICE: This is a temporary method due to a bug in JOML-primitives, and will be removed after
-     * <a href="https://github.com/JOML-CI/joml-primitives/pull/4">this pr</a> got merged.
-     */
-    public static boolean intersectsAABB(AABBdc aabb1, AABBdc aabb2) {
-        return aabb1.maxX() > aabb2.minX() && aabb1.maxY() > aabb2.minY() && aabb1.maxZ() > aabb2.minZ() &&
-               aabb1.minX() < aabb2.maxX() && aabb1.minY() < aabb2.maxY() && aabb1.minZ() < aabb2.maxZ();
-    }
 }
diff --git a/api/src/main/java/org/allaymc/api/math/voxelshape/VoxelShape.java b/api/src/main/java/org/allaymc/api/math/voxelshape/VoxelShape.java
@@ -4,7 +4,6 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.allaymc.api.block.data.BlockFace;
-import org.allaymc.api.math.MathUtils;
 import org.joml.Vector2d;
 import org.joml.Vector3d;
 import org.joml.Vector3dc;
@@ -135,7 +134,7 @@ public VoxelShape translate(Vector3dc vec) {
     public boolean intersectsAABB(AABBdc other) {
         var aabb = unionAABB();
         // TODO: This is a bug in JOML-primitives
-        if (!MathUtils.intersectsAABB(aabb, other)) return false;
+        if (!aabb.intersectsAABB(other)) return false;
 
         other.intersection(aabb, aabb);
         if (vacancies.stream().anyMatch(vacancy -> vacancy.containsAABB(aabb))) return false;

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -62,7 +62,7 @@ javapoet = { module = "com.palantir.javapoet:javapoet", version = "0.6.0" }
 fastreflect = { group = "com.github.AllayMC", name = "fast-reflection", version = "8733a599fa" }
 # Math computing
 joml = { group = "org.joml", name = "joml", version = "1.10.8" }
-joml-primitives = { group = "org.joml", name = "joml-primitives", version = "1.10.0" }
+joml-primitives = { group = "org.allaymc", name = "joml-primitives", version = "404d04f6b7" }
 # Netty
 netty-epoll = { group = "io.netty", name = "netty-transport-classes-epoll", version.ref = "netty" }
 netty-kqueue = { group = "io.netty", name = "netty-transport-classes-kqueue", version.ref = "netty" }

diff --git a/server/src/main/java/org/allaymc/server/datastruct/aabb/AABBTree.java b/server/src/main/java/org/allaymc/server/datastruct/aabb/AABBTree.java
@@ -2,7 +2,6 @@
 
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import lombok.Getter;
-import org.allaymc.api.math.MathUtils;
 import org.allaymc.api.world.service.AABBOverlapFilter;
 import org.allaymc.api.world.service.HasAABB;
 import org.allaymc.api.world.service.HasLongId;
@@ -11,7 +10,7 @@
 import org.joml.RayAabIntersection;
 import org.joml.primitives.AABBd;
 import org.joml.primitives.AABBdc;
-import org.joml.primitives.Rayf;
+import org.joml.primitives.Rayfc;
 
 import java.util.*;
 import java.util.function.Predicate;
@@ -367,7 +366,7 @@ public void detectOverlaps(AABBdc overlapWith, List<T> result) {
     }
 
     public void detectOverlaps(AABBdc overlapWith, AABBOverlapFilter<T> filter, List<T> result) {
-        traverseTree(aabb -> MathUtils.intersectsAABB(aabb, overlapWith), filter, result);
+        traverseTree(aabb -> aabb.intersectsAABB(overlapWith), filter, result);
     }
 
     public void detectCollisionPairs(List<CollisionPair<T>> result) {
@@ -400,13 +399,13 @@ public void detectInFrustum(Matrix4fc worldViewProjection, AABBOverlapFilter<T>
         traverseTree(aabb -> frustumIntersection.testAab((float) aabb.minX(), (float) aabb.minY(), (float) aabb.minZ(), (float) aabb.maxX(), (float) aabb.maxY(), (float) aabb.maxZ()), filter, result);
     }
 
-    public void detectRayIntersection(Rayf ray, List<T> result) {
+    public void detectRayIntersection(Rayfc ray, List<T> result) {
         detectRayIntersection(ray, defaultAABBOverlapFilter, result);
     }
 
     // TODO: Use Rayfc here
-    public void detectRayIntersection(Rayf ray, AABBOverlapFilter<T> filter, List<T> result) {
-        rayIntersection.set(ray.oX, ray.oY, ray.oZ, ray.dX, ray.dY, ray.dZ);
+    public void detectRayIntersection(Rayfc ray, AABBOverlapFilter<T> filter, List<T> result) {
+        rayIntersection.set(ray.oX(), ray.oY(), ray.oZ(), ray.dX(), ray.dY(), ray.dZ());
         traverseTree(aabb -> rayIntersection.test((float) aabb.minX(), (float) aabb.minY(), (float) aabb.minZ(), (float) aabb.maxX(), (float) aabb.maxY(), (float) aabb.maxZ()), filter, result);
     }