Add ar.viewer to the plugins

plugins/aframe-with-encantar.js

@@ -39,7 +39,22 @@ const ARUtils = () => ({
         return null;
     },
 
-    getTrackablePointers(frame)
+    findViewer(frame)
+    {
+        if(frame === null)
+            return null;
+
+        for(const result of frame.results) {
+            if(result.tracker.type == 'image-tracker') {
+                if(result.trackables.length > 0)
+                    return result.viewer;
+            }
+        }
+
+        return null;
+    },
+
+    findTrackablePointers(frame)
     {
         if(frame === null)
             return [];
@@ -67,6 +82,7 @@ AFRAME.registerSystem('ar', {
 
     session: /** @type {Session | null} */ (null),
     frame: /** @type {Frame | null} */ (null),
+    viewer: /** @type {Viewer | null} */ (null),
     pointers: /** @type {TrackablePointer[]} */ ([]),
 
     _utils: ARUtils(),
@@ -207,6 +223,7 @@ AFRAME.registerSystem('ar', {
         }
 
         session.addEventListener('end', () => {
+            this.viewer = null;
             this.frame = null;
             this.pointers.length = 0;
         });
@@ -230,6 +247,7 @@ AFRAME.registerSystem('ar', {
         // animation loop
         const animate = (time, frame) => {
             this.frame = frame;
+            this.viewer = this._utils.findViewer(frame);
             this._updateTrackablePointers();
 
             scene.render();
@@ -312,7 +330,7 @@ AFRAME.registerSystem('ar', {
     {
         this.pointers.length = 0;
 
-        const newPointers = this._utils.getTrackablePointers(this.frame);
+        const newPointers = this._utils.findTrackablePointers(this.frame);
         if(newPointers.length > 0)
             this.pointers.push.apply(this.pointers, newPointers);
     },

plugins/babylon-with-encantar.js

@@ -83,6 +83,15 @@ class ARSystem
     }
 
     /**
+     * AR Viewer
+     * @returns {Viewer | null}
+     */
+    get viewer()
+    {
+        return this._viewer;
+    }
+
+    /**
      * Pointer-based input in the current frame (touch, mouse, pen...)
      * You need a PointerTracker in your session in order to use these
      * @returns {TrackablePointer[]}
@@ -136,6 +145,7 @@ class ARSystem
     {
         this._session = null;
         this._frame = null;
+        this._viewer = null;
         this._pointers = [];
         this._origin = null;
         this._root = null;
@@ -174,6 +184,7 @@ function encantar(demo)
     function mix(frame)
     {
         let found = false;
+        ar._viewer = null;
         ar._pointers.length = 0;
 
         for(const result of frame.results) {
@@ -186,6 +197,7 @@ function encantar(demo)
 
                     align(projectionMatrix, viewMatrix, modelMatrix);
                     ar._origin.setEnabled(true);
+                    ar._viewer = result.viewer;
 
                     found = true;
                 }
@@ -260,7 +272,9 @@ function encantar(demo)
 
         session.addEventListener('end', event => {
             ar._origin.setEnabled(false);
+            ar._viewer = null;
             ar._frame = null;
+            ar._pointers.length = 0;
         });
 
         session.viewport.addEventListener('resize', event => {

plugins/three-with-encantar.js

@@ -83,6 +83,15 @@ class ARSystem
     }
 
     /**
+     * AR Viewer
+     * @returns {Viewer | null}
+     */
+    get viewer()
+    {
+        return this._viewer;
+    }
+
+    /**
      * Pointer-based input in the current frame (touch, mouse, pen...)
      * You need a PointerTracker in your session in order to use these
      * @returns {TrackablePointer[]}
@@ -136,6 +145,7 @@ class ARSystem
     {
         this._session = null;
         this._frame = null;
+        this._viewer = null;
         this._pointers = [];
         this._origin = null;
         this._root = null;
@@ -168,6 +178,7 @@ function encantar(demo)
     function mix(frame)
     {
         let found = false;
+        ar._viewer = null;
         ar._pointers.length = 0;
 
         for(const result of frame.results) {
@@ -180,6 +191,7 @@ function encantar(demo)
 
                     align(projectionMatrix, viewMatrixInverse, modelMatrix);
                     ar._origin.visible = true;
+                    ar._viewer = result.viewer;
 
                     found = true;
                 }
@@ -232,7 +244,9 @@ function encantar(demo)
 
         session.addEventListener('end', event => {
             ar._origin.visible = false;
+            ar._viewer = null;
             ar._frame = null;
+            ar._pointers.length = 0;
         });
 
         session.viewport.addEventListener('resize', event => {