Improve the way overridenRaycast works

src/three/TilesGroup.js

@@ -15,7 +15,11 @@ export class TilesGroup extends Group {
 
 	raycast( raycaster, intersects ) {
 
-		this.tilesRenderer.raycast( raycaster, intersects );
+		if ( this.tilesRenderer.optimizeRaycast ) {
+
+			this.tilesRenderer.raycast( raycaster, intersects );
+
+		}
 
 	}
 

src/three/TilesRenderer.js

@@ -28,16 +28,6 @@ const vecZ = new Vector3();
 const X_AXIS = new Vector3( 1, 0, 0 );
 const Y_AXIS = new Vector3( 0, 1, 0 );
 
-function overridenRaycast( raycaster, intersects ) {
-
-	if ( ! this.userData.tilesRenderer.optimizeRaycast ) {
-
-		Object.getPrototypeOf( this ).raycast.call( this, raycaster, intersects );
-
-	}
-
-}
-
 function updateFrustumCulled( object, toInitialValue ) {
 
 	object.traverse( c => {
@@ -107,6 +97,19 @@ export class TilesRenderer extends TilesRendererBase {
 		} );
 		this.manager = manager;
 
+		// Setting up the override raycasting function to be used by
+		// 3D objects created by this renderer
+		const tilesRenderer = this;
+		this._overridenRaycast = function ( raycaster, intersects ) {
+
+			if ( ! tilesRenderer.optimizeRaycast ) {
+
+				Object.getPrototypeOf( this ).raycast.call( this, raycaster, intersects );
+
+			}
+
+		};
+
 	}
 
 	/* Public API */
@@ -181,28 +184,24 @@ export class TilesRenderer extends TilesRendererBase {
 
 	raycast( raycaster, intersects ) {
 
-		if ( this.optimizeRaycast ) {
-
-			if ( ! this.root ) {
-
-				return;
+		if ( ! this.root ) {
 
-			}
+			return;
 
-			if ( raycaster.firstHitOnly ) {
+		}
 
-				const hit = raycastTraverseFirstHit( this.root, this.group, this.activeTiles, raycaster );
-				if ( hit ) {
+		if ( raycaster.firstHitOnly ) {
 
-					intersects.push( hit );
+			const hit = raycastTraverseFirstHit( this.root, this.group, this.activeTiles, raycaster );
+			if ( hit ) {
 
-				}
+				intersects.push( hit );
 
-			} else {
+			}
 
-				raycastTraverse( this.root, this.group, this.activeTiles, raycaster, intersects );
+		} else {
 
-			}
+			raycastTraverse( this.root, this.group, this.activeTiles, raycaster, intersects );
 
 		}
 
@@ -627,12 +626,10 @@ export class TilesRenderer extends TilesRendererBase {
 
 			cached.scene = scene;
 
-			let renderer = this;
 			// We handle raycasting in a custom way so remove it from here
 			scene.traverse( c => {
 
-				c.userData.tilesRenderer = renderer;
-				c.raycast = overridenRaycast;
+				c.raycast = this._overridenRaycast;
 
 			} );