Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 15 additions & 26 deletions jme3-core/src/main/java/com/jme3/bounding/BoundingBox.java
Original file line number Diff line number Diff line change
Expand Up @@ -960,47 +960,36 @@ public boolean intersects(Vector3f point) {

@Override
public float distanceToEdge(Vector3f point) {
// compute coordinates of point in box coordinate system
TempVars vars = TempVars.get();
Vector3f closest = vars.vect1;

point.subtract(center, closest);

// project test point onto box
float sqrDistance = 0.0f;
float delta;
float closestX = point.x - center.x;

if (closest.x < -xExtent) {
delta = closest.x + xExtent;
if (closestX < -xExtent) {
delta = closestX + xExtent;
sqrDistance += delta * delta;
closest.x = -xExtent;
} else if (closest.x > xExtent) {
delta = closest.x - xExtent;
} else if (closestX > xExtent) {
delta = closestX - xExtent;
sqrDistance += delta * delta;
closest.x = xExtent;
}

if (closest.y < -yExtent) {
delta = closest.y + yExtent;
float closestY = point.y - center.y;
if (closestY < -yExtent) {
delta = closestY + yExtent;
sqrDistance += delta * delta;
closest.y = -yExtent;
} else if (closest.y > yExtent) {
delta = closest.y - yExtent;
} else if (closestY > yExtent) {
delta = closestY - yExtent;
sqrDistance += delta * delta;
closest.y = yExtent;
}

if (closest.z < -zExtent) {
delta = closest.z + zExtent;
float closestZ = point.z - center.z;
if (closestZ < -zExtent) {
delta = closestZ + zExtent;
sqrDistance += delta * delta;
closest.z = -zExtent;
} else if (closest.z > zExtent) {
delta = closest.z - zExtent;
} else if (closestZ > zExtent) {
delta = closestZ - zExtent;
sqrDistance += delta * delta;
closest.z = zExtent;
}

vars.release();
return FastMath.sqrt(sqrDistance);
Comment thread
8Keep marked this conversation as resolved.
}

Expand Down
14 changes: 14 additions & 0 deletions jme3-core/src/test/java/com/jme3/bounding/TestBoundingBox.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
*/
package com.jme3.bounding;

import com.jme3.math.FastMath;
import com.jme3.math.Vector3f;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
Expand All @@ -41,6 +42,19 @@
* @author Stephen Gold
*/
public class TestBoundingBox {
/**
* Verify distanceToEdge() for points inside and outside a non-origin box.
*/
@Test
public void testDistanceToEdge() {
BoundingBox box = new BoundingBox(new Vector3f(3f, -2f, 7f), 5f, 9f, 13f);

Assertions.assertEquals(0f, box.distanceToEdge(new Vector3f(4f, 0f, 9f)), 0f);
Assertions.assertEquals(0f, box.distanceToEdge(new Vector3f(8f, -2f, 7f)), 0f);
Assertions.assertEquals(3f, box.distanceToEdge(new Vector3f(11f, -2f, 7f)), 0f);
Assertions.assertEquals(6f, box.distanceToEdge(new Vector3f(10f, -15f, 24f)), FastMath.ZERO_TOLERANCE);
}

/**
* Verify that equals() behaves as expected.
*/
Expand Down
Loading