Send event info on touched event

mozilla · Feb 27, 2018 · 50326e4 · 50326e4
1 parent 676555a
commit 50326e4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/dist/aframe-xr.js b/dist/aframe-xr.js
@@ -164,8 +164,6 @@ AFRAME.registerSystem('xr', {
       }
     }
 
-    this.el.emit('xrInitialized');
-
     var options = {
       // Flag to start AR if is the unique display available.
       AR_AUTOSTART: this.data.arAutostart // Default: true
@@ -185,6 +183,8 @@ AFRAME.registerSystem('xr', {
         this.addEnterButtons(displays);
       }
     }
+
+    this.el.emit('xrInitialized');
   },
 
   // NOW it only supports one VR and one AR display
@@ -550,7 +550,7 @@ AFRAME.registerComponent('reticle', {
       return;
     }
     this.tapData = [ev.touches[0].clientX / window.innerWidth, ev.touches[0].clientY / window.innerHeight];
-    this.el.emit('touched');
+    this.el.emit('touched', ev);
   },
 
   updateFrame: function updateFrame(data) {
@@ -563,6 +563,7 @@ AFRAME.registerComponent('reticle', {
     if (hit && hit.length > 0) {
       if (this.el.getAttribute('visible') === false) {
         this.el.setAttribute('visible', true);
+        this.el.emit('planeDetected');
         window.addEventListener('touchstart', this.onTouchStart);
       }
       model.fromArray(hit[0].modelMatrix);

diff --git a/src/components/reticle.js b/src/components/reticle.js
@@ -22,7 +22,7 @@ AFRAME.registerComponent('reticle', {
       ev.touches[0].clientX / window.innerWidth,
       ev.touches[0].clientY / window.innerHeight
     ];
-    this.el.emit('touched');
+    this.el.emit('touched', ev);
   },
 
   updateFrame: function (data) {
@@ -35,6 +35,7 @@ AFRAME.registerComponent('reticle', {
     if (hit && hit.length > 0) {
       if (this.el.getAttribute('visible') === false) {
         this.el.setAttribute('visible', true);
+        this.el.emit('planeDetected');
         window.addEventListener('touchstart', this.onTouchStart);
       }
       model.fromArray(hit[0].modelMatrix);

diff --git a/src/systems/xr.js b/src/systems/xr.js
@@ -76,8 +76,6 @@ AFRAME.registerSystem('xr', {
       }
     }
 
-    this.el.emit('xrInitialized');
-
     var options = {
       // Flag to start AR if is the unique display available.
       AR_AUTOSTART: this.data.arAutostart // Default: true
@@ -97,6 +95,8 @@ AFRAME.registerSystem('xr', {
         this.addEnterButtons(displays);
       }
     }
+
+    this.el.emit('xrInitialized');
   },
 
   // NOW it only supports one VR and one AR display