Addons: Refactored InteractiveGroup.

mrdoob · Feb 16, 2024 · 791ed5a · 791ed5a
1 parent a15b926
commit 791ed5a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/examples/jsm/interactive/InteractiveGroup.js b/examples/jsm/interactive/InteractiveGroup.js
@@ -10,16 +10,10 @@ const _event = { type: '', data: _pointer };
 
 class InteractiveGroup extends Group {
 
-	constructor( renderer, camera ) {
-
-		super();
+	listenToPointerEvents( renderer, camera ) {
 
 		const scope = this;
-
 		const raycaster = new Raycaster();
-		const tempMatrix = new Matrix4();
-
-		// Pointer Events
 
 		const element = renderer.domElement;
 
@@ -60,7 +54,15 @@ class InteractiveGroup extends Group {
 		element.addEventListener( 'mousemove', onPointerEvent );
 		element.addEventListener( 'click', onPointerEvent );
 
-		// WebXR Controller Events
+	}
+
+	listenToXRControllerEvents( renderer ) {
+
+		const scope = this;
+
+		const raycaster = new Raycaster();
+		const tempMatrix = new Matrix4();
+
 		// TODO: Dispatch pointerevents too
 
 		const events = {

diff --git a/examples/webxr_vr_layers.html b/examples/webxr_vr_layers.html
@@ -247,7 +247,8 @@
 
 				}
 
-				const group = new InteractiveGroup( renderer, camera );
+				const group = new InteractiveGroup();
+				group.listenToXRControllerEvents( renderer );
 				scene.add( group );
 
 				guiMesh = new HTMLMesh( gui.domElement );

diff --git a/examples/webxr_vr_sandbox.html b/examples/webxr_vr_sandbox.html
@@ -183,7 +183,9 @@
 				gui.add( parameters, 'thickness', 0, 1 ).onChange( onThicknessChange );
 				gui.domElement.style.visibility = 'hidden';
 
-				const group = new InteractiveGroup( renderer, camera );
+				const group = new InteractiveGroup();
+				group.listenToPointerEvents( renderer, camera );
+				group.listenToXRControllerEvents( renderer );
 				scene.add( group );
 
 				const mesh = new HTMLMesh( gui.domElement );