Update plugins: add pointer-based input

plugins/aframe-with-encantar.js

@@ -39,6 +39,19 @@ const ARUtils = () => ({
         return null;
     },
 
+    getTrackablePointers(frame)
+    {
+        if(frame === null)
+            return [];
+
+        for(const result of frame.results) {
+            if(result.tracker.type == 'pointer-tracker')
+                return result.trackables;
+        }
+
+        return [];
+    },
+
 });
 
 /* ========================================================================= */
@@ -52,8 +65,10 @@ AFRAME.registerSystem('ar', {
     // data;
     // schema;
 
-    session: null,
-    frame: null,
+    session: /** @type {Session | null} */ (null),
+    frame: /** @type {Frame | null} */ (null),
+    pointers: /** @type {TrackablePointer[]} */ ([]),
+
     _utils: ARUtils(),
     _started: false,
     _components: [],
@@ -95,6 +110,14 @@ AFRAME.registerSystem('ar', {
     {
         const scene = this.el;
 
+        // read trackable pointers
+        this.pointers.length = 0;
+        if(this.frame) {
+            const newPointers = this._utils.getTrackablePointers(this.frame);
+            if(newPointers.length > 0)
+                this.pointers.push.apply(this.pointers, newPointers);
+        }
+
         // we take control of the rendering
         scene.renderer.setAnimationLoop(null);
 
@@ -696,6 +719,35 @@ AFRAME.registerPrimitive('ar-canvas-source', {
     }
 });
 
+/**
+ * AR Pointer Source
+ */
+AFRAME.registerComponent('ar-pointer-source', ARComponent({
+
+    schema: {
+    },
+
+    validate()
+    {
+        if(!this.el.parentNode.getAttribute('ar-sources'))
+            throw new Error('ar-pointer-source must be a direct child of ar-sources');
+    },
+
+    source()
+    {
+        return AR.Source.Pointer();
+    },
+
+}));
+
+AFRAME.registerPrimitive('ar-pointer-source', {
+    defaultComponents: {
+        'ar-pointer-source': {}
+    },
+    mappings: {
+    }
+});
+
 /* ========================================================================= */
 
 /**
@@ -827,6 +879,33 @@ AFRAME.registerPrimitive('ar-reference-image', {
     }
 });
 
+/**
+ * AR Pointer Tracker
+ */
+AFRAME.registerComponent('ar-pointer-tracker', ARComponent({
+
+    schema: {
+    },
+
+    validate()
+    {
+        if(!this.el.parentNode.getAttribute('ar-trackers'))
+            throw new Error('ar-pointer-tracker must be a direct child of ar-trackers');
+    },
+
+    tracker()
+    {
+        return AR.Tracker.Pointer();
+    },
+
+}));
+
+AFRAME.registerPrimitive('ar-pointer-tracker', {
+    defaultComponents: {
+        'ar-pointer-tracker': {}
+    }
+});
+
 /* ========================================================================= */
 
 /**

plugins/babylon-with-encantar.js

@@ -83,6 +83,16 @@ class ARSystem
     }
 
     /**
+     * Pointer-based input in the current frame (touch, mouse, pen...)
+     * You need a PointerTracker in your session in order to use these
+     * @returns {TrackablePointer[]}
+     */
+    get pointers()
+    {
+        return this._pointers;
+    }
+
+    /**
      * The root is a node that is automatically aligned to the physical scene.
      * Objects of your virtual scene should be descendants of this node.
      * @returns {BABYLON.TransformNode}
@@ -126,6 +136,7 @@ class ARSystem
     {
         this._session = null;
         this._frame = null;
+        this._pointers = [];
         this._origin = null;
         this._root = null;
         this._scene = null;
@@ -162,6 +173,9 @@ function encantar(demo)
 
     function mix(frame)
     {
+        let found = false;
+        ar._pointers.length = 0;
+
         for(const result of frame.results) {
             if(result.tracker.type == 'image-tracker') {
                 if(result.trackables.length > 0) {
@@ -173,12 +187,17 @@ function encantar(demo)
                     align(projectionMatrix, viewMatrix, modelMatrix);
                     ar._origin.setEnabled(true);
 
-                    return;
+                    found = true;
                 }
             }
+            else if(result.tracker.type == 'pointer-tracker') {
+                if(result.trackables.length > 0)
+                    ar._pointers.push.apply(ar._pointers, result.trackables);
+            }
         }
 
-        ar._origin.setEnabled(false);
+        if(!found)
+            ar._origin.setEnabled(false);
     }
 
     function align(projectionMatrix, viewMatrix, modelMatrix)

plugins/three-with-encantar.js

@@ -83,6 +83,16 @@ class ARSystem
     }
 
     /**
+     * Pointer-based input in the current frame (touch, mouse, pen...)
+     * You need a PointerTracker in your session in order to use these
+     * @returns {TrackablePointer[]}
+     */
+    get pointers()
+    {
+        return this._pointers;
+    }
+
+    /**
      * The root is a node that is automatically aligned to the physical scene.
      * Objects of your virtual scene should be descendants of this node.
      * @returns {THREE.Group}
@@ -126,6 +136,7 @@ class ARSystem
     {
         this._session = null;
         this._frame = null;
+        this._pointers = [];
         this._origin = null;
         this._root = null;
         this._scene = null;
@@ -156,6 +167,9 @@ function encantar(demo)
 
     function mix(frame)
     {
+        let found = false;
+        ar._pointers.length = 0;
+
         for(const result of frame.results) {
             if(result.tracker.type == 'image-tracker') {
                 if(result.trackables.length > 0) {
@@ -167,12 +181,17 @@ function encantar(demo)
                     align(projectionMatrix, viewMatrixInverse, modelMatrix);
                     ar._origin.visible = true;
 
-                    return;
+                    found = true;
                 }
             }
+            else if(result.tracker.type == 'pointer-tracker') {
+                if(result.trackables.length > 0)
+                    ar._pointers.push.apply(ar._pointers, result.trackables);
+            }
         }
 
-        ar._origin.visible = false;
+        if(!found)
+            ar._origin.visible = false;
     }
 
     function align(projectionMatrix, viewMatrixInverse, modelMatrix)