@zappar/zappar-cv 4.0.0-beta.0 → 4.0.0-beta.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/4.0.0-beta.0/zappar-cv.js"></script>
+<script src="https://libs.zappar.com/zappar-cv/4.0.0-beta.3/zappar-cv.js"></script>
 ```
 
 Or you can download and host our standalone JavaScript bundle:
-[https://libs.zappar.com/zappar-cv/4.0.0-beta.0/zappar-cv.zip](https://libs.zappar.com/zappar-cv/4.0.0-beta.0/zappar-cv.zip)
+[https://libs.zappar.com/zappar-cv/4.0.0-beta.3/zappar-cv.zip](https://libs.zappar.com/zappar-cv/4.0.0-beta.3/zappar-cv.zip)

package/lib/additional.d.ts

@@ -47,4 +47,5 @@ export interface Additional {
     cookies_permitted: (p: boolean) => void;
     world_tracker_points_data_matrix(wt: zappar_world_tracker_t, screenWidth: number, screenHeight: number, mirror: boolean): Float32Array;
     in_app_clip: () => boolean;
+    webxr_camera_source_dom_overlay_element_set: (element: Element | null) => void;
 }

package/lib/native.js

@@ -996,7 +996,7 @@ export function initialize(opts) {
             }
             mat4.multiply(res, cameraPose, res);
             return res;
-        }, html_element_source_create: (pipeline, elm) => HTMLElementSource.createVideoElementSource(pipeline, elm), html_element_source_start: o => { var _a; return (_a = HTMLElementSource.getVideoElementSource(o)) === null || _a === void 0 ? void 0 : _a.start(); }, html_element_source_pause: o => { var _a; return (_a = HTMLElementSource.getVideoElementSource(o)) === null || _a === void 0 ? void 0 : _a.pause(); }, html_element_source_destroy: o => { var _a; return (_a = HTMLElementSource.getVideoElementSource(o)) === null || _a === void 0 ? void 0 : _a.destroy(); }, sequence_source_create: p => SequenceSource.create(p), sequence_source_load_from_memory: (o, data) => { var _a; return (_a = SequenceSource.get(o)) === null || _a === void 0 ? void 0 : _a.loadFromMemory(data); }, sequence_source_pause: o => { var _a; return (_a = SequenceSource.get(o)) === null || _a === void 0 ? void 0 : _a.pause(); }, sequence_source_start: o => { var _a; return (_a = SequenceSource.get(o)) === null || _a === void 0 ? void 0 : _a.start(); }, sequence_source_max_playback_fps_set: (o, fps) => { var _a; return (_a = SequenceSource.get(o)) === null || _a === void 0 ? void 0 : _a.maxPlaybackFpsSet(fps); }, sequence_source_time_set: (o, t) => { var _a; return (_a = SequenceSource.get(o)) === null || _a === void 0 ? void 0 : _a.setTime(t); }, sequence_source_destroy: o => { var _a; return (_a = SequenceSource.get(o)) === null || _a === void 0 ? void 0 : _a.destroy(); }, permission_granted_all: permissionGrantedAll, permission_granted_camera: permissionGrantedCamera, permission_granted_motion: permissionGrantedMotion, permission_denied_any: permissionDeniedAny, permission_denied_camera: permissionDeniedCamera, permission_denied_motion: permissionDeniedMotion, permission_request_motion: permissionRequestMotion, permission_request_camera: permissionRequestCamera, permission_request_all: permissionRequestAll, permission_request_ui: permissionRequestUI, permission_request_ui_promise: permissionRequestUI, permission_denied_ui: permissionDeniedUI, browser_incompatible: compatibility.incompatible, browser_incompatible_ui: compatibility.incompatible_ui, in_app_clip: () => BridgedCameraSource.IsSupported(), log_level_set: l => {
+        }, html_element_source_create: (pipeline, elm) => HTMLElementSource.createVideoElementSource(pipeline, elm), html_element_source_start: o => { var _a; return (_a = HTMLElementSource.getVideoElementSource(o)) === null || _a === void 0 ? void 0 : _a.start(); }, html_element_source_pause: o => { var _a; return (_a = HTMLElementSource.getVideoElementSource(o)) === null || _a === void 0 ? void 0 : _a.pause(); }, html_element_source_destroy: o => { var _a; return (_a = HTMLElementSource.getVideoElementSource(o)) === null || _a === void 0 ? void 0 : _a.destroy(); }, sequence_source_create: p => SequenceSource.create(p), sequence_source_load_from_memory: (o, data) => { var _a; return (_a = SequenceSource.get(o)) === null || _a === void 0 ? void 0 : _a.loadFromMemory(data); }, sequence_source_pause: o => { var _a; return (_a = SequenceSource.get(o)) === null || _a === void 0 ? void 0 : _a.pause(); }, sequence_source_start: o => { var _a; return (_a = SequenceSource.get(o)) === null || _a === void 0 ? void 0 : _a.start(); }, sequence_source_max_playback_fps_set: (o, fps) => { var _a; return (_a = SequenceSource.get(o)) === null || _a === void 0 ? void 0 : _a.maxPlaybackFpsSet(fps); }, sequence_source_time_set: (o, t) => { var _a; return (_a = SequenceSource.get(o)) === null || _a === void 0 ? void 0 : _a.setTime(t); }, sequence_source_destroy: o => { var _a; return (_a = SequenceSource.get(o)) === null || _a === void 0 ? void 0 : _a.destroy(); }, permission_granted_all: permissionGrantedAll, permission_granted_camera: permissionGrantedCamera, permission_granted_motion: permissionGrantedMotion, permission_denied_any: permissionDeniedAny, permission_denied_camera: permissionDeniedCamera, permission_denied_motion: permissionDeniedMotion, permission_request_motion: permissionRequestMotion, permission_request_camera: permissionRequestCamera, permission_request_all: permissionRequestAll, permission_request_ui: permissionRequestUI, permission_request_ui_promise: permissionRequestUI, permission_denied_ui: permissionDeniedUI, browser_incompatible: compatibility.incompatible, browser_incompatible_ui: compatibility.incompatible_ui, in_app_clip: () => BridgedCameraSource.IsSupported(), webxr_camera_source_dom_overlay_element_set: elm => WebXRCameraSource.setDomOverlayElement(elm), log_level_set: l => {
             setLogLevel(l);
             c.impl.log_level_set(l);
         }, cookies_permitted: p => {

package/lib/profile.js

@@ -11,8 +11,8 @@ export let profile = {
     showGyroPermissionsWarningIfNecessary: false,
     showSafariPermissionsResetIfNecessary: false,
     requestHighFrameRate: false,
-    videoWidth: 1280,
-    videoHeight: 720,
+    videoWidth: 640,
+    videoHeight: 480,
     videoElementInDOM: false,
     preferMediaStreamTrackProcessorCamera: false,
     preferImageBitmapCamera: false,

package/lib/src/additional.d.ts

@@ -47,4 +47,5 @@ export interface Additional {
     cookies_permitted: (p: boolean) => void;
     world_tracker_points_data_matrix(wt: zappar_world_tracker_t, screenWidth: number, screenHeight: number, mirror: boolean): Float32Array;
     in_app_clip: () => boolean;
+    webxr_camera_source_dom_overlay_element_set: (element: Element | null) => void;
 }

package/lib/src/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "4.0.0-beta.0";
+export declare const VERSION = "4.0.0-beta.3";

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

@@ -58,6 +58,8 @@ export declare class WebXRCameraSource extends Source {
     private _customAnchors;
     private _groundH;
     static IsSupported(): boolean;
+    private static _domOverlayElement;
+    static setDomOverlayElement(element: Element | null): void;
     constructor(_impl: zappar_camera_source_t, _pipeline: zappar_pipeline_t);
     destroy(): void;
     setProfile(p: camera_profile_t): void;

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "4.0.0-beta.0";
+export declare const VERSION = "4.0.0-beta.3";

package/lib/version.js

@@ -1 +1 @@
-export const VERSION = "4.0.0-beta.0";
+export const VERSION = "4.0.0-beta.3";

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

@@ -58,6 +58,8 @@ export declare class WebXRCameraSource extends Source {
     private _customAnchors;
     private _groundH;
     static IsSupported(): boolean;
+    private static _domOverlayElement;
+    static setDomOverlayElement(element: Element | null): void;
     constructor(_impl: zappar_camera_source_t, _pipeline: zappar_pipeline_t);
     destroy(): void;
     setProfile(p: camera_profile_t): void;

package/lib/webxr-camera-source.js

@@ -53,8 +53,8 @@ export class WebXRCameraSource extends Source {
         this._rawCameraWidth = 320;
         this._rawCameraHeight = 240;
         this._profile = camera_profile_t.DEFAULT;
-        this._preferredWidth = profile.videoWidth;
-        this._preferredHeight = profile.videoHeight;
+        this._preferredWidth = Math.max(profile.videoWidth, 1280);
+        this._preferredHeight = Math.max(profile.videoHeight, 720);
         this._permissionRequestShown = false;
         this._planeHitTestSource = null;
         this._customAnchorSetRequests = new Map();
@@ -352,6 +352,9 @@ export class WebXRCameraSource extends Source {
             return false;
         return true;
     }
+    static setDomOverlayElement(element) {
+        WebXRCameraSource._domOverlayElement = element;
+    }
     destroy() {
         this.pause();
         deleteCameraSource(this._impl);
@@ -360,8 +363,8 @@ export class WebXRCameraSource extends Source {
         this._profile = p;
     }
     setPreferredResolution(w, h) {
-        this._preferredWidth = w;
-        this._preferredHeight = h;
+        this._preferredWidth = Math.max(w, 1280);
+        this._preferredHeight = Math.max(h, 720);
     }
     _stop() {
         if (!this._xrSession)
@@ -456,7 +459,7 @@ export class WebXRCameraSource extends Source {
         return;
     }
     _syncCamera() {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             if (this._isPaused) {
                 if (this._xrSession)
@@ -478,7 +481,8 @@ export class WebXRCameraSource extends Source {
             }
             if (navigator.xr) {
                 try {
-                    const session = yield navigator.xr.requestSession('immersive-ar', { requiredFeatures: ['dom-overlay', 'camera-access', 'hit-test', 'anchors'], domOverlay: { root: document.documentElement } });
+                    const overlayElement = (_b = WebXRCameraSource._domOverlayElement) !== null && _b !== void 0 ? _b : document.documentElement;
+                    const session = yield navigator.xr.requestSession('immersive-ar', { requiredFeatures: ['dom-overlay', 'camera-access', 'hit-test', 'anchors'], domOverlay: { root: overlayElement } });
                     const refSpace = yield session.requestReferenceSpace('local');
                     this._xrViewerSpace = yield session.requestReferenceSpace('viewer');
                     this._xrWebGLLayer = new XRWebGLLayer(session, this._offscreenContext);
@@ -491,11 +495,11 @@ export class WebXRCameraSource extends Source {
                     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, {
+                    (_d = (_c = session.requestHitTestSource) === null || _c === void 0 ? void 0 : _c.call(session, {
                         space: this._xrViewerSpace,
                         offsetRay: offsetRay,
                         entityTypes: ['plane']
-                    })) === null || _c === void 0 ? void 0 : _c.then((hitTestSource) => {
+                    })) === null || _d === void 0 ? void 0 : _d.then((hitTestSource) => {
                         this._planeHitTestSource = hitTestSource;
                     });
                 }
@@ -593,3 +597,4 @@ export class WebXRCameraSource extends Source {
         return false;
     }
 }
+WebXRCameraSource._domOverlayElement = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zappar/zappar-cv",
-  "version": "4.0.0-beta.0",
+  "version": "4.0.0-beta.3",
   "description": "Zappar's core computer vision library, supporting image, face and world tracking.",
   "type": "module",
   "main": "lib/index.js",
@@ -10,7 +10,10 @@
       "types": "./lib/index.d.ts",
       "default": "./lib/index.js"
     },
-    "./lib/*": "./lib/*"
+    "./lib/*": {
+      "types": "./lib/*.d.ts",
+      "default": "./lib/*"
+    }
   },
   "scripts": {
     "build-standalone": "webpack --config=webpack.config.standalone.cjs --mode=production",