support mousemove

Author: AdaRoseCannon

src/components/cursor.js

@@ -63,6 +63,7 @@ module.exports.Component = registerComponent('cursor', {
     this.fuseTimeout = undefined;
     this.cursorDownEl = null;
     this.intersectedEl = null;
+    this.activeXRInputs = new Set();
     this.canvasBounds = document.body.getBoundingClientRect();
     this.isCursorDown = false;
 
@@ -88,6 +89,19 @@ module.exports.Component = registerComponent('cursor', {
     this.updateMouseEventListeners();
   },
 
+  tick: function () {
+    if (this.data.rayOrigin === 'xrselect' && this.el.sceneEl.frame) {
+      var inputSource = Array.from(this.activeXRInputs).pop();
+      if (inputSource) {
+        this.onMouseMove({
+          inputSource: inputSource,
+          type: 'fakeselectmove',
+          frame: this.el.sceneEl.frame
+        });
+      }
+    }
+  },
+
   play: function () {
     this.addEventListeners();
   },
@@ -210,6 +224,12 @@ module.exports.Component = registerComponent('cursor', {
       var point;
       var top;
 
+      var frame;
+      var inputSource;
+      var referenceSpace;
+      var pose;
+      var transform;
+
       camera.parent.updateMatrixWorld();
 
       // Calculate mouse position based on the canvas element
@@ -225,12 +245,13 @@ module.exports.Component = registerComponent('cursor', {
       mouse.x = (left / bounds.width) * 2 - 1;
       mouse.y = -(top / bounds.height) * 2 + 1;
 
-      if (this.data.rayOrigin === 'xrselect' && evt.type === 'selectstart') {
-        const frame = evt.frame;
-        const inputSource = evt.inputSource;
-        const referenceSpace = this.el.renderer.xr.getReferenceSpace();
-        const pose = frame.getPose(inputSource.targetRaySpace, referenceSpace);
-        const transform = pose.transform;
+      if (this.data.rayOrigin === 'xrselect' && (evt.type === 'selectstart' || evt.type === 'fakeselectmove')) {
+        frame = evt.frame;
+        inputSource = evt.inputSource;
+        this.activeXRInputs.add(inputSource);
+        referenceSpace = this.el.renderer.xr.getReferenceSpace();
+        pose = frame.getPose(inputSource.targetRaySpace, referenceSpace);
+        transform = pose.transform;
         direction.set(0, 0, -1);
         direction.applyQuaternion(transform.orientation);
         origin.copy(transform.position);
@@ -310,6 +331,10 @@ module.exports.Component = registerComponent('cursor', {
       this.cursorDownEl.emit(EVENTS.MOUSEUP, this.intersectedEventDetail);
     }
 
+    if (data.rayOrigin === 'xrselect') {
+      this.activeXRInputs.delete(evt.inputSource);
+    }
+
     if ((!data.fuse || data.rayOrigin === 'mouse' || data.rayOrigin === 'xrselect') &&
         this.intersectedEl && this.cursorDownEl === this.intersectedEl) {
       this.twoWayEmit(EVENTS.CLICK);

src/index.js

@@ -90,7 +90,7 @@ require('./core/a-mixin');
 require('./extras/components/');
 require('./extras/primitives/');
 
-console.log('A-Frame Version: 1.3.0 (Date 2022-06-16, Commit #6da23e99)');
+console.log('A-Frame Version: 1.3.0 (Date 2022-07-07, Commit #8c4fbd63)');
 console.log('THREE Version (https://github.com/supermedium/three.js):',
             pkg.dependencies['super-three']);
 console.log('WebVR Polyfill Version:', pkg.dependencies['webvr-polyfill']);