Fix cast function generation

gkjohnson · Mar 2, 2021 · 11f8d11 · 11f8d11
1 parent f5d41ab
commit 11f8d11
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 23 deletions.
diff --git a/scripts/generate-cast-functions.js b/scripts/generate-cast-functions.js
@@ -5,27 +5,6 @@ const path = require( 'path' );
 // a function definition so we can replace that with local variable definitions we need.
 function replaceUnneededCode( str ) {
 
-	str = str.replace(
-		/if \( [^)]*node.continueGeneration \)(.|\n|\r)*?}[\r|\n]/mg,
-		match => {
-
-			if ( match.indexOf( '/* skip */' ) !== - 1 ) {
-
-				return '';
-
-			} else {
-
-				return 'let stride2Offset = stride4Offset * 2, ' +
-					'float32Array = _float32Array, ' +
-					'uint16Array = _uint16Array, ' +
-					'uint32Array = _uint32Array;\n';
-
-			}
-
-		}
-
-	);
-
 	str = str.replace( /function intersectRay\((.|[\r\n])*?}[\r|\n]/mg, '' );
 
 	str = str.replace( /import { arrayToBox.*?;[\r\n]/g, '' );
@@ -152,6 +131,20 @@ function replaceFunctionNames( str ) {
 		}
 	);
 
+	str = str.replace(
+		new RegExp( `\n(.+?)${ orNames }.+? {`, 'gm' ),
+		match => {
+
+			const whitespace = match.match( /^\s+/ )[ 0 ];
+			return match + '\n' + whitespace + '\t' +
+				'let stride2Offset = stride4Offset * 2, ' +
+				'float32Array = _float32Array, ' +
+				'uint16Array = _uint16Array, ' +
+				'uint32Array = _uint32Array;\n';
+
+		}
+	);
+
 	return str;
 
 }

diff --git a/src/castFunctionsBuffer.js b/src/castFunctionsBuffer.js
@@ -118,6 +118,8 @@ export function raycastFirstBuffer( stride4Offset, mesh, raycaster, ray ) {
 
 export const shapecastBuffer = ( function () {
 
+	let stride2Offset = stride4Offset * 2, float32Array = _float32Array, uint16Array = _uint16Array, uint32Array = _uint32Array;
+
 	const _triangle = new SeparatingAxisTriangle();
 	const _cachedBox1 = new Box3();
 	const _cachedBox2 = new Box3();
@@ -192,8 +194,6 @@ export const shapecastBuffer = ( function () {
 
 		}
 
-		let stride2Offset = stride4Offset * 2, float32Array = _float32Array, uint16Array = _uint16Array, uint32Array = _uint32Array;
-
 		const isLeaf = ! /* node count */ ( uint16Array[ stride2Offset + 15 ] !== 0xffff );
 		if ( isLeaf && intersectsTriangleFunc ) {
 
@@ -327,6 +327,8 @@ export const shapecastBuffer = ( function () {
 
 export const intersectsGeometryBuffer = ( function () {
 
+	let stride2Offset = stride4Offset * 2, float32Array = _float32Array, uint16Array = _uint16Array, uint32Array = _uint32Array;
+
 	const triangle = new SeparatingAxisTriangle();
 	const triangle2 = new SeparatingAxisTriangle();
 	const cachedMesh = new Mesh();