Merge pull request #732 from TheBlek/master

Extend _bvhClosestPointToPoint to accept maxDistance
gkjohnson · Jan 21, 2025 · 3e01a32 · 3e01a32
2 parents 0bcbc7a + ae7607b
commit 3e01a32
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -1136,18 +1136,29 @@ Dispose of the associated textures.
 ### shaderStructs
 
 ```js
+BVHShaderGLSL.bvh_struct_definitions : string
+
+or equivalent, legacy:
+
 shaderStructs : string
 ```
 
-Set of shaders structs and defined constants used for interacting with the packed BVH in a shader. See [src/gpu/shaderFunctions.js](https://github.com/gkjohnson/three-mesh-bvh/blob/master/src/gpu/shaderFunctions.js) for full implementations and declarations.
+Set of shaders structs and defined constants used for interacting with the packed BVH in a shader. See [src/gpu/bvh_struct_definitions.glsl.js](https://github.com/gkjohnson/three-mesh-bvh/blob/master/src/gpu/bvh_struct_definitions.glsl.js) for full implementations and declarations.
 
 ### shaderFunctions
 
 ```js
-shaderFunctions : string
+BVHShaderGLSL.bvh_distance_functions : string
+BVHShaderGLSL.bvh_ray_functions : string
+BVHShaderGLSL.common_functions : string
+
+or equivalent, bundled for specific usage (legacy):
+
+shaderDistanceFunction : string
+shaderIntersectFunction : string
 ```
 
-Set of shader functions used for interacting with the packed BVH in a shader and sampling [VertexAttributeTextures](#VertexAttributeTexture). See [src/gpu/shaderFunctions.js](https://github.com/gkjohnson/three-mesh-bvh/blob/master/src/gpu/shaderFunctions.js) for full implementations and declarations.
+Set of shader functions used for interacting with the packed BVH in a shader and sampling [VertexAttributeTextures](#VertexAttributeTexture). See [src/gpu/glsl](https://github.com/gkjohnson/three-mesh-bvh/tree/master/src/gpu/glsl) for full implementations and declarations.
 
 ## Gotchas
 

diff --git a/example/utils/GenerateSDFMaterial.js b/example/utils/GenerateSDFMaterial.js
@@ -64,7 +64,7 @@ export class GenerateSDFMaterial extends ShaderMaterial {
 					float side;
 					float rayDist;
 					vec3 outPoint;
-					float dist = bvhClosestPointToPoint( bvh, point.xyz, faceIndices, faceNormal, barycoord, side, outPoint );
+					float dist = bvhClosestPointToPoint( bvh, point.xyz, 100000.0, faceIndices, faceNormal, barycoord, side, outPoint );
 
 					// This currently causes issues on some devices when rendering to 3d textures and texture arrays
 					#if USE_SHADER_RAYCAST

diff --git a/src/gpu/glsl/bvh_distance_functions.glsl.js b/src/gpu/glsl/bvh_distance_functions.glsl.js
@@ -115,19 +115,19 @@ float distanceSqToBVHNodeBoundsPoint( vec3 point, sampler2D bvhBounds, uint curr
 #define\
 	bvhClosestPointToPoint(\
 		bvh,\
-		point, faceIndices, faceNormal, barycoord, side, outPoint\
+		point, maxDistance, faceIndices, faceNormal, barycoord, side, outPoint\
 	)\
 	_bvhClosestPointToPoint(\
 		bvh.position, bvh.index, bvh.bvhBounds, bvh.bvhContents,\
-		point, faceIndices, faceNormal, barycoord, side, outPoint\
+		point, maxDistance, faceIndices, faceNormal, barycoord, side, outPoint\
 	)
 
 float _bvhClosestPointToPoint(
 	// bvh info
 	sampler2D bvh_position, usampler2D bvh_index, sampler2D bvh_bvhBounds, usampler2D bvh_bvhContents,
 
 	// point to check
-	vec3 point,
+	vec3 point, float maxDistance,
 
 	// output variables
 	inout uvec4 faceIndices, inout vec3 faceNormal, inout vec3 barycoord,
@@ -140,7 +140,7 @@ float _bvhClosestPointToPoint(
 	uint stack[ BVH_STACK_DEPTH ];
 	stack[ 0 ] = 0u;
 
-	float closestDistanceSquared = pow( 100000.0, 2.0 );
+	float closestDistanceSquared = maxDistance * maxDistance;
 	bool found = false;
 	while ( ptr > - 1 && ptr < BVH_STACK_DEPTH ) {