Merge branch 'master' into patch-3

src/components/cursor.js

@@ -86,7 +86,7 @@
 
   update: function (oldData) {
     if (this.data.rayOrigin === oldData.rayOrigin) { return; }
-    if (this.data.rayOrigin === "entity") { this.updateOriginAndDirection(); }
+    if (this.data.rayOrigin === 'entity') { this.resetRaycaster(); }
     this.updateMouseEventListeners();
     // Update the WebXR event listeners if needed
     if (this.data.rayOrigin === 'xrselect') {
@@ -221,14 +221,37 @@
     this.updateCanvasBounds();
   },
 
-  updateOriginAndDirection: function () {
-    var rayCasterConfig = {
-      direction: new THREE.Vector3(),
-      origin: new THREE.Vector3(),
-    };
-    rayCasterConfig.direction.set(0,0,-1);
-    rayCasterConfig.origin.set(0,0,0);
-    this.el.setAttribute('raycaster', rayCasterConfig);
+  resetRaycaster: function () {
+    this.el.setAttribute('raycaster', {
+      direction: new THREE.Vector3().set(0, 0, -1),
+      origin: new THREE.Vector3()
+    });
+  },
+
+  addWebXREventListeners: function () {
+    var self = this;
+    var xrSession = this.el.sceneEl.xrSession;
+    if (xrSession) {
+      WEBXR_EVENTS.DOWN.forEach(function (downEvent) {
+        xrSession.addEventListener(downEvent, self.onCursorDown);
+      });
+      WEBXR_EVENTS.UP.forEach(function (upEvent) {
+        xrSession.addEventListener(upEvent, self.onCursorUp);
+      });
+    }
+  },
+
+  removeWebXREventListeners: function () {
+    var self = this;
+    var xrSession = this.el.sceneEl.xrSession;
+    if (xrSession) {
+      WEBXR_EVENTS.DOWN.forEach(function (downEvent) {
+        xrSession.removeEventListener(downEvent, self.onCursorDown);
+      });
+      WEBXR_EVENTS.UP.forEach(function (upEvent) {
+        xrSession.removeEventListener(upEvent, self.onCursorUp);
+      });
+    }
   },
 
   onMouseMove: (function () {