@zappar/zappar-cv 3.8.0-beta.2 → 3.8.3

package/README.md

@@ -18,8 +18,8 @@ npm i @zappar/zappar-cv
 
 You can use our CDN from within your HTML:
 ```
-<script src="https://libs.zappar.com/zappar-cv/3.8.0-beta.2/zappar-cv.js"></script>
+<script src="https://libs.zappar.com/zappar-cv/3.8.3/zappar-cv.js"></script>
 ```
 
 Or you can download and host our standalone JavaScript bundle:
-[https://libs.zappar.com/zappar-cv/3.8.0-beta.2/zappar-cv.zip](https://libs.zappar.com/zappar-cv/3.8.0-beta.2/zappar-cv.zip)
+[https://libs.zappar.com/zappar-cv/3.8.3/zappar-cv.zip](https://libs.zappar.com/zappar-cv/3.8.3/zappar-cv.zip)

package/lib/permission.js

@@ -16,6 +16,7 @@ let _permissionGrantedCamera = false;
 let _permissionGrantedMotion = false;
 let _permissionDeniedCamera = false;
 let _permissionDeniedMotion = false;
+let _hadOneSuccessfulActivation = false;
 if (!window.DeviceOrientationEvent || !window.DeviceOrientationEvent.requestPermission) {
     _permissionGrantedMotion = true;
 }
@@ -166,6 +167,7 @@ export function permissionRequestUI(options) {
                         return false;
                     }
                     if (permissionGrantedAll()) {
+                        _hadOneSuccessfulActivation = true;
                         return true;
                     }
                 }
@@ -173,7 +175,7 @@ export function permissionRequestUI(options) {
             });
         }
         try {
-            if (_isWebXRSupported && !((_d = navigator.userActivation) === null || _d === void 0 ? void 0 : _d.isActive))
+            if (_isWebXRSupported && (!((_d = navigator.userActivation) === null || _d === void 0 ? void 0 : _d.isActive) || _hadOneSuccessfulActivation))
                 throw new Error("WebXR - need user interaction");
             return yield attempt();
         }

package/lib/src/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.8.0-beta.2";
+export declare const VERSION = "3.8.3";

package/lib/src/webxr-camera-source.d.ts

@@ -52,6 +52,7 @@ export declare class WebXRCameraSource extends Source {
     private _planeHitTestSource;
     private _customAnchorSetRequests;
     private _customAnchors;
+    private _groundH;
     static IsSupported(): boolean;
     constructor(_impl: zappar_camera_source_t, _pipeline: zappar_pipeline_t);
     destroy(): void;

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.8.0-beta.2";
+export declare const VERSION = "3.8.3";

package/lib/version.js

@@ -1 +1 @@
-export const VERSION = "3.8.0-beta.2";
+export const VERSION = "3.8.3";

package/lib/webxr-camera-source.d.ts

@@ -52,6 +52,7 @@ export declare class WebXRCameraSource extends Source {
     private _planeHitTestSource;
     private _customAnchorSetRequests;
     private _customAnchors;
+    private _groundH;
     static IsSupported(): boolean;
     constructor(_impl: zappar_camera_source_t, _pipeline: zappar_pipeline_t);
     destroy(): void;

package/lib/webxr-camera-source.js

@@ -26,6 +26,7 @@ for (let i = 0; i < 32; i++) {
 const _quat = quat.create();
 const _trans = vec3.create();
 const _up = vec3.fromValues(0, 1, 0);
+const _ground = mat4.create();
 export class WebXRCameraSource extends Source {
     constructor(_impl, _pipeline) {
         super();
@@ -55,7 +56,7 @@ export class WebXRCameraSource extends Source {
         this._customAnchorSetRequests = new Map();
         this._customAnchors = new Map();
         this._onXRFrame = (time, frame) => {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f;
             if (this._isPaused)
                 return;
             (_a = this._xrSession) === null || _a === void 0 ? void 0 : _a.requestAnimationFrame(this._onXRFrame);
@@ -203,6 +204,16 @@ export class WebXRCameraSource extends Source {
                         continue; // skip vertical planes if not requested
                     }
                     if (poseInCamera) {
+                        // Update ground height to the lowest detected plane
+                        if (localPose) {
+                            const planeY = worldPose.transform.matrix[13];
+                            const viewerHeight = localPose.transform.matrix[13] - planeY;
+                            if (viewerHeight > 0.8 && viewerHeight < 1.8) {
+                                if (this._groundH === undefined || planeY < this._groundH) {
+                                    this._groundH = planeY;
+                                }
+                            }
+                        }
                         plane_anchors.push({
                             id: "plane-" + plane_anchors.length,
                             horizontal: true,
@@ -236,11 +247,15 @@ export class WebXRCameraSource extends Source {
             }
             else {
                 const world_pose = rotateMatrix(localPose.transform.inverse.matrix, rot);
+                let ground_pose = mat4.create();
+                mat4.fromTranslation(_ground, [0, (_f = this._groundH) !== null && _f !== void 0 ? _f : -1.5, 0]);
+                mat4.multiply(ground_pose, localPose.transform.inverse.matrix, _ground);
+                ground_pose = rotateMatrix(ground_pose, rot);
                 this._latestWtData = {
                     world_anchor_status: anchor_status_t.ANCHOR_STATUS_TRACKING,
                     world_anchor_pose: world_pose,
-                    ground_anchor_pose: mat4.create(),
-                    ground_anchor_status: anchor_status_t.ANCHOR_STATUS_INITIALIZING,
+                    ground_anchor_pose: ground_pose,
+                    ground_anchor_status: this._groundH === undefined ? anchor_status_t.ANCHOR_STATUS_INITIALIZING : anchor_status_t.ANCHOR_STATUS_TRACKING,
                     plane_anchors,
                     custom_anchors,
                     quality: world_tracker_quality_t.WORLD_TRACKER_QUALITY_GOOD,
@@ -255,6 +270,7 @@ export class WebXRCameraSource extends Source {
             this._customAnchorSetRequests.clear();
             this._customAnchors.clear();
             this._planeHitTestSource = null;
+            this._groundH = undefined;
             if (this._isPaused)
                 return;
             if (this._permissionRequestShown)
@@ -445,8 +461,11 @@ export class WebXRCameraSource extends Source {
                     this._xrSession = session;
                     this._xrLocalSpace = refSpace;
                     this._xrGlBinding = new XRWebGLBinding(session, this._offscreenContext);
+                    // Create a reference space that is a ray pointing down [0, -0.3] in normalized device coordinates
+                    const offsetRay = new XRRay(new DOMPointReadOnly(0, 0, 0), { x: 0, y: -0.3, z: -1, w: 0 });
                     (_c = (_b = session.requestHitTestSource) === null || _b === void 0 ? void 0 : _b.call(session, {
                         space: this._xrViewerSpace,
+                        offsetRay: offsetRay,
                         entityTypes: ['plane']
                     })) === null || _c === void 0 ? void 0 : _c.then((hitTestSource) => {
                         this._planeHitTestSource = hitTestSource;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zappar/zappar-cv",
-  "version": "3.8.0-beta.2",
+  "version": "3.8.3",
   "description": "Zappar's core computer vision library, supporting image, face and world tracking.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",