Merge pull request #140 from lewibs/maintenance/raycaster

Raycaster refactoring
ThatOpen · Nov 29, 2023 · 1c16724 · 1c16724
2 parents 925ca79 + 2bb68e7
commit 1c16724
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/core/SimpleRaycaster/index.ts b/src/core/SimpleRaycaster/index.ts
@@ -48,9 +48,7 @@ export class SimpleRaycaster extends BaseRaycaster implements Disposable {
   ): THREE.Intersection | null {
     const camera = this.components.camera.get();
     this._raycaster.setFromCamera(this.mouse.position, camera);
-    const result = this._raycaster.intersectObjects(items);
-    const filtered = this.filterClippingPlanes(result);
-    return filtered.length > 0 ? filtered[0] : null;
+    return this.intersect(items)
   }
 
   castRayFromVector(
@@ -59,6 +57,12 @@ export class SimpleRaycaster extends BaseRaycaster implements Disposable {
     items = this.components.meshes
   ) {
     this._raycaster.set(origin, direction);
+    return this.intersect(items);
+  }
+
+  private intersect(
+    items: THREE.Mesh[] = this.components.meshes
+  ) {
     const result = this._raycaster.intersectObjects(items);
     const filtered = this.filterClippingPlanes(result);
     return filtered.length > 0 ? filtered[0] : null;