Add functions

gkjohnson · Aug 21, 2023 · da90d5d · da90d5d
1 parent 79797dd
commit da90d5d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/src/core/build/computeBoundsUtils.js b/src/core/build/computeBoundsUtils.js
@@ -1,5 +1,6 @@
 import { FLOAT32_EPSILON } from '../Constants.js';
 import { makeEmptyBounds } from '../../utils/ArrayBoxUtilities.js';
+import { getTriCount } from './geometryUtils.js';
 
 // computes the union of the bounds of all of the given triangles and puts the resulting box in target. If
 // centroidTarget is provided then a bounding box is computed for the centroids of the triangles, as well.
@@ -122,7 +123,7 @@ export function computeTriangleBounds( geo, fullBounds ) {
 
 	const posAttr = geo.attributes.position;
 	const index = geo.index.array;
-	const triCount = index.length / 3;
+	const triCount = getTriCount( geo );
 	const triangleBounds = new Float32Array( triCount * 6 );
 	const normalized = posAttr.normalized;
 

diff --git a/src/core/build/geometryUtils.js b/src/core/build/geometryUtils.js
@@ -1,5 +1,11 @@
 import { BufferAttribute } from 'three';
 
+export function getTriCount( geo ) {
+
+	return ( geo.index ? geo.index.count : geo.attributes.position.count ) / 3;
+
+}
+
 // ensures that an index is present on the geometry
 export function ensureIndex( geo, options ) {
 
@@ -41,11 +47,18 @@ export function ensureIndex( geo, options ) {
 //                      g1 = [16, 40]           g2 = [41, 60]
 //
 // we would need four BVH roots: [0, 15], [16, 20], [21, 40], [41, 60].
+export function getFullGeometryRange( geo ) {
+
+	const triCount = getTriCount( geo );
+	return [ { offset: 0, count: triCount } ];
+
+}
+
 export function getRootIndexRanges( geo ) {
 
 	if ( ! geo.groups || ! geo.groups.length ) {
 
-		return [ { offset: 0, count: geo.index.count / 3 } ];
+		return getFullGeometryRange( geo );
 
 	}
 

diff --git a/src/core/cast/closestPointToGeometry.js b/src/core/cast/closestPointToGeometry.js
@@ -2,6 +2,7 @@ import { Vector3, Matrix4 } from 'three';
 import { OrientedBox } from '../../math/OrientedBox.js';
 import { setTriangle } from '../../utils/TriangleUtilities.js';
 import { ExtendedTrianglePool } from '../../utils/ExtendedTrianglePool.js';
+import { getTriCount } from '../build/geometryUtils.js';
 
 const tempMatrix = /* @__PURE__ */ new Matrix4();
 const obb = /* @__PURE__ */ new OrientedBox();
@@ -154,7 +155,7 @@ export function closestPointToGeometry(
 				} else {
 
 					// If no bounds tree then we'll just check every triangle.
-					const triCount = otherIndex ? otherIndex.count : otherPos.count;
+					const triCount = getTriCount( otherGeometry );
 					for ( let i2 = 0, l2 = triCount; i2 < l2; i2 += 3 ) {
 
 						setTriangle( triangle2, i2, otherIndex, otherPos );