Skip to content

Commit 791ed5a

Browse files
committed
Addons: Refactored InteractiveGroup.
1 parent a15b926 commit 791ed5a

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

examples/jsm/interactive/InteractiveGroup.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,10 @@ const _event = { type: '', data: _pointer };
1010

1111
class InteractiveGroup extends Group {
1212

13-
constructor( renderer, camera ) {
14-
15-
super();
13+
listenToPointerEvents( renderer, camera ) {
1614

1715
const scope = this;
18-
1916
const raycaster = new Raycaster();
20-
const tempMatrix = new Matrix4();
21-
22-
// Pointer Events
2317

2418
const element = renderer.domElement;
2519

@@ -60,7 +54,15 @@ class InteractiveGroup extends Group {
6054
element.addEventListener( 'mousemove', onPointerEvent );
6155
element.addEventListener( 'click', onPointerEvent );
6256

63-
// WebXR Controller Events
57+
}
58+
59+
listenToXRControllerEvents( renderer ) {
60+
61+
const scope = this;
62+
63+
const raycaster = new Raycaster();
64+
const tempMatrix = new Matrix4();
65+
6466
// TODO: Dispatch pointerevents too
6567

6668
const events = {

examples/webxr_vr_layers.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,8 @@
247247

248248
}
249249

250-
const group = new InteractiveGroup( renderer, camera );
250+
const group = new InteractiveGroup();
251+
group.listenToXRControllerEvents( renderer );
251252
scene.add( group );
252253

253254
guiMesh = new HTMLMesh( gui.domElement );

examples/webxr_vr_sandbox.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,9 @@
183183
gui.add( parameters, 'thickness', 0, 1 ).onChange( onThicknessChange );
184184
gui.domElement.style.visibility = 'hidden';
185185

186-
const group = new InteractiveGroup( renderer, camera );
186+
const group = new InteractiveGroup();
187+
group.listenToPointerEvents( renderer, camera );
188+
group.listenToXRControllerEvents( renderer );
187189
scene.add( group );
188190

189191
const mesh = new HTMLMesh( gui.domElement );

0 commit comments

Comments
 (0)