Skip to content

Commit 9d0703e

Browse files
committed
Disable controllers when on XR session end
1 parent 91ca005 commit 9d0703e

File tree

5 files changed

+383
-322
lines changed

5 files changed

+383
-322
lines changed

Packages/webxr/Hidden~/WebGLTemplates/WebXR/webxr.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,11 @@
265265
this.xrData.handLeft.enabled = 0;
266266
this.xrData.handRight.enabled = 0;
267267

268+
this.xrData.controllerA.frame = -1;
269+
this.xrData.controllerB.frame = -1;
270+
this.xrData.handLeft.frame = -1;
271+
this.xrData.handRight.frame = -1;
272+
268273
document.dispatchEvent(new CustomEvent('XRControllersData', { detail: {
269274
controllerA: this.xrData.controllerA,
270275
controllerB: this.xrData.controllerB

Packages/webxr/Hidden~/WebGLTemplates/WebXR2020/webxr.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,11 @@
265265
this.xrData.handLeft.enabled = 0;
266266
this.xrData.handRight.enabled = 0;
267267

268+
this.xrData.controllerA.frame = -1;
269+
this.xrData.controllerB.frame = -1;
270+
this.xrData.handLeft.frame = -1;
271+
this.xrData.handRight.frame = -1;
272+
268273
document.dispatchEvent(new CustomEvent('XRControllersData', { detail: {
269274
controllerA: this.xrData.controllerA,
270275
controllerB: this.xrData.controllerB

Packages/webxr/Hidden~/WebGLTemplates/WebXRFullView/webxr.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,11 @@
265265
this.xrData.handLeft.enabled = 0;
266266
this.xrData.handRight.enabled = 0;
267267

268+
this.xrData.controllerA.frame = -1;
269+
this.xrData.controllerB.frame = -1;
270+
this.xrData.handLeft.frame = -1;
271+
this.xrData.handRight.frame = -1;
272+
268273
document.dispatchEvent(new CustomEvent('XRControllersData', { detail: {
269274
controllerA: this.xrData.controllerA,
270275
controllerB: this.xrData.controllerB

Packages/webxr/Hidden~/WebGLTemplates/WebXRFullView2020/webxr.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,11 @@
265265
this.xrData.handLeft.enabled = 0;
266266
this.xrData.handRight.enabled = 0;
267267

268+
this.xrData.controllerA.frame = -1;
269+
this.xrData.controllerB.frame = -1;
270+
this.xrData.handLeft.frame = -1;
271+
this.xrData.handRight.frame = -1;
272+
268273
document.dispatchEvent(new CustomEvent('XRControllersData', { detail: {
269274
controllerA: this.xrData.controllerA,
270275
controllerB: this.xrData.controllerB

0 commit comments

Comments
 (0)