Made getBlockVolume have an epsilon tolerance

Author: sweetniamhy

libraries/math/src/aabb/coreHelpers.test.ts

@@ -9,6 +9,13 @@ import type { Vector3 } from '@minecraft/server';
 import { VECTOR3_FORWARD, VECTOR3_ONE, VECTOR3_ZERO, Vector3Utils } from '../vector3/coreHelpers.js';
 import { AABB, AABBUtils } from './coreHelpers.js';
 
+function expectVector3(expected: Vector3, actual: Vector3) {
+    return expect(
+        Vector3Utils.equals(expected, actual),
+        `Expected ${Vector3Utils.toString(expected)} but actual is ${Vector3Utils.toString(actual)}`
+    );
+}
+
 describe('AABB factories', () => {
     it('successfully reports invalid AABB when created from identical corner points', () => {
         const aabb = AABBUtils.createFromCornerPoints(VECTOR3_ONE, VECTOR3_ONE);
@@ -158,28 +165,70 @@ describe('AABB BlockVolume operations', () => {
     it('successfully creates a BlockVolume when AABB extents are VECTOR3_ONE', () => {
         const aabb: AABB = { center: VECTOR3_ZERO, extents: VECTOR3_ONE };
         const blockVolume = AABBUtils.getBlockVolume(aabb);
-        expect(Vector3Utils.equals(blockVolume.from, { x: -1.0, y: -1.0, z: -1.0 })).toBe(true);
-        expect(Vector3Utils.equals(blockVolume.to, { x: 1.0, y: 1.0, z: 1.0 })).toBe(true);
+        expectVector3({ x: -1.0, y: -1.0, z: -1.0 }, blockVolume.from).toBe(true);
+        expectVector3({ x: 1.0, y: 1.0, z: 1.0 }, blockVolume.to).toBe(true);
+    });
+
+    it('successfully creates a BlockVolume when AABB extents coords are 0.5', () => {
+        const aabb: AABB = { center: VECTOR3_ZERO, extents: { x: 0.5, y: 0.5, z: 0.5 } };
+        const blockVolume = AABBUtils.getBlockVolume(aabb);
+        expectVector3({ x: -1.0, y: -1.0, z: -1.0 }, blockVolume.from).toBe(true);
+        expectVector3({ x: 1.0, y: 1.0, z: 1.0 }, blockVolume.to).toBe(true);
+    });
+
+    it('successfully creates a BlockVolume when AABB center and extent coords are 0.5', () => {
+        const aabb: AABB = { center: { x: 0.5, y: 0.5, z: 0.5 }, extents: { x: 0.5, y: 0.5, z: 0.5 } };
+        const blockVolume = AABBUtils.getBlockVolume(aabb);
+        expectVector3({ x: 0.0, y: 0.0, z: 0.0 }, blockVolume.from).toBe(true);
+        expectVector3({ x: 1.0, y: 1.0, z: 1.0 }, blockVolume.to).toBe(true);
+    });
+
+    it('successfully creates a BlockVolume when AABB center coords are -0.5 and extent coords are 0.5', () => {
+        const aabb: AABB = { center: { x: -0.5, y: -0.5, z: -0.5 }, extents: { x: 0.5, y: 0.5, z: 0.5 } };
+        const blockVolume = AABBUtils.getBlockVolume(aabb);
+        expectVector3({ x: -1.0, y: -1.0, z: -1.0 }, blockVolume.from).toBe(true);
+        expectVector3({ x: 0.0, y: 0.0, z: 0.0 }, blockVolume.to).toBe(true);
     });
 
-    it('successfully creates a BlockVolume when AABB extents are close but less than VECTOR3_ONE', () => {
+    it('successfully creates a BlockVolume when AABB extents are less than VECTOR3_ONE within epsilon', () => {
         const aabb: AABB = { center: VECTOR3_ZERO, extents: { x: 0.99999, y: 0.99999, z: 0.99999 } };
         const blockVolume = AABBUtils.getBlockVolume(aabb);
-        expect(Vector3Utils.equals(blockVolume.from, { x: -1.0, y: -1.0, z: -1.0 })).toBe(true);
-        expect(Vector3Utils.equals(blockVolume.to, { x: 1.0, y: 1.0, z: 1.0 })).toBe(true);
+        expectVector3({ x: -1.0, y: -1.0, z: -1.0 }, blockVolume.from).toBe(true);
+        expectVector3({ x: 1.0, y: 1.0, z: 1.0 }, blockVolume.to).toBe(true);
     });
 
-    it('successfully creates a BlockVolume when AABB extents are close but greater than VECTOR3_ZERO', () => {
+    it('successfully creates a BlockVolume when AABB extents are less than VECTOR3_ONE exceeding epsilon', () => {
+        const aabb: AABB = { center: VECTOR3_ZERO, extents: { x: 0.99998, y: 0.99998, z: 0.99998 } };
+        const blockVolume = AABBUtils.getBlockVolume(aabb);
+        expectVector3({ x: -1.0, y: -1.0, z: -1.0 }, blockVolume.from).toBe(true);
+        expectVector3({ x: 1.0, y: 1.0, z: 1.0 }, blockVolume.to).toBe(true);
+    });
+
+    it('successfully creates a BlockVolume when AABB extents are greater than VECTOR3_ZERO within epsilon', () => {
         const aabb: AABB = { center: VECTOR3_ZERO, extents: { x: 0.00001, y: 0.00001, z: 0.00001 } };
         const blockVolume = AABBUtils.getBlockVolume(aabb);
-        expect(Vector3Utils.equals(blockVolume.from, { x: -1.0, y: -1.0, z: -1.0 })).toBe(true);
-        expect(Vector3Utils.equals(blockVolume.to, { x: 1.0, y: 1.0, z: 1.0 })).toBe(true);
+        expectVector3({ x: 0.0, y: 0.0, z: 0.0 }, blockVolume.from).toBe(true);
+        expectVector3({ x: 0.0, y: 0.0, z: 0.0 }, blockVolume.to).toBe(true);
     });
 
-    it('successfully creates a BlockVolume when AABB extents are close but greater than VECTOR3_ONE', () => {
+    it('successfully creates a BlockVolume when AABB extents are greater than VECTOR3_ZERO exceeding epsilon', () => {
+        const aabb: AABB = { center: VECTOR3_ZERO, extents: { x: 0.00002, y: 0.00002, z: 0.00002 } };
+        const blockVolume = AABBUtils.getBlockVolume(aabb);
+        expectVector3({ x: -1.0, y: -1.0, z: -1.0 }, blockVolume.from).toBe(true);
+        expectVector3({ x: 1.0, y: 1.0, z: 1.0 }, blockVolume.to).toBe(true);
+    });
+
+    it('successfully creates a BlockVolume when AABB extents are greater than VECTOR3_ONE within epsilon', () => {
         const aabb: AABB = { center: VECTOR3_ZERO, extents: { x: 1.00001, y: 1.00001, z: 1.00001 } };
         const blockVolume = AABBUtils.getBlockVolume(aabb);
-        expect(Vector3Utils.equals(blockVolume.from, { x: -2.0, y: -2.0, z: -2.0 })).toBe(true);
-        expect(Vector3Utils.equals(blockVolume.to, { x: 2.0, y: 2.0, z: 2.0 })).toBe(true);
+        expectVector3({ x: -1.0, y: -1.0, z: -1.0 }, blockVolume.from).toBe(true);
+        expectVector3({ x: 1.0, y: 1.0, z: 1.0 }, blockVolume.to).toBe(true);
+    });
+
+    it('successfully creates a BlockVolume when AABB extents are greater than VECTOR3_ONE exceeding epsilon', () => {
+        const aabb: AABB = { center: VECTOR3_ZERO, extents: { x: 1.00002, y: 1.00002, z: 1.00002 } };
+        const blockVolume = AABBUtils.getBlockVolume(aabb);
+        expectVector3({ x: -2.0, y: -2.0, z: -2.0 }, blockVolume.from).toBe(true);
+        expectVector3({ x: 2.0, y: 2.0, z: 2.0 }, blockVolume.to).toBe(true);
     });
 });

libraries/math/src/aabb/coreHelpers.ts

@@ -111,8 +111,10 @@ export class AABBUtils {
      * @returns - The BlockVolume containing the source AABB.
      */
     static getBlockVolume(aabb: AABB): BlockVolume {
-        const from = Vector3Utils.floor(this.getMin(aabb));
-        const to = Vector3Utils.ceil(this.getMax(aabb));
+        const epsilon = 0.00001;
+        const epsilonVec: Vector3 = { x: epsilon, y: epsilon, z: epsilon };
+        const from = Vector3Utils.floor(Vector3Utils.add(this.getMin(aabb), epsilonVec));
+        const to = Vector3Utils.ceil(Vector3Utils.subtract(this.getMax(aabb), epsilonVec));
         return new BlockVolume(from, to);
     }