@zappar/zappar-cv 3.9.1 → 3.10.0

package/lib/native.js

@@ -36,6 +36,20 @@ import { WebXRCameraSource } from "./webxr-camera-source";
 import { WebXRWorldTracker } from "./webxr-world-tracker";
 let client;
 const pipelineByWorldTracker = new Map();
+const d3TrackerSizeById = new Map();
+function applyD3SizeToPose(o, indx, pose) {
+    var _a;
+    const anchor_id = client.d3_tracker_id(o, indx);
+    if (anchor_id.length <= 0)
+        return;
+    const size = (_a = d3TrackerSizeById.get(o)) === null || _a === void 0 ? void 0 : _a.get(anchor_id);
+    if (size === undefined)
+        return pose;
+    const scale = 0.5 * size;
+    pose[12] *= scale;
+    pose[13] *= scale;
+    pose[14] *= scale;
+}
 const _temporaryMatrix = mat4.create();
 const _temporaryVec3 = vec3.create();
 export function initialize(opts) {
@@ -194,25 +208,31 @@ export function initialize(opts) {
     let bridgedWtImpl = (bridgedWtApi === null || bridgedWtApi === void 0 ? void 0 : bridgedWtApi.impl) || {};
     const wtImpl = (bridgedWtApi === null || bridgedWtApi === void 0 ? void 0 : bridgedWtApi.impl) || c.impl;
     let bridgedD3Impl = (bridgedD3Api === null || bridgedD3Api === void 0 ? void 0 : bridgedD3Api.impl) || {};
-    client = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, c.impl), { world_tracker_mesh_anchor_count: () => 0, world_tracker_mesh_anchor_id: () => "", world_tracker_mesh_anchor_indices: () => new Uint32Array(0), world_tracker_mesh_anchor_indices_count: () => 0, world_tracker_mesh_anchor_indices_size: () => 0, world_tracker_mesh_anchor_vertices: () => new Float32Array(0), world_tracker_mesh_anchor_vertices_count: () => 0, world_tracker_mesh_anchor_vertices_size: () => 0, world_tracker_mesh_anchor_vertices_offset: () => 0, world_tracker_mesh_anchor_vertices_stride: () => 0, world_tracker_mesh_anchor_pose_raw: () => new Float32Array(), world_tracker_mesh_anchor_status: () => anchor_status_t.ANCHOR_STATUS_STOPPED, world_tracker_mesh_anchors_enabled: () => false, world_tracker_mesh_anchors_enabled_set: () => { }, d3_tracker_create: (p) => { return -1; }, d3_tracker_destroy: (o) => { }, d3_tracker_count: (o) => { return 0; }, d3_tracker_enabled: (o) => { return false; }, d3_tracker_enabled_set: (o, v) => { }, d3_tracker_process_max_resolution_set: (o, v) => { }, d3_tracker_pose_raw: (o, indx) => { return mat4.create(); }, d3_tracker_pose0_raw: (o, indx) => { return mat4.create(); }, d3_tracker_pose1_raw: (o, indx) => { return mat4.create(); }, d3_tracker_id: (o, indx) => { return ''; }, d3_tracker_qr: (o, indx) => { return ''; }, d3_tracker_landmarks_data: (o, indx) => { return new Float32Array(0); }, d3_tracker_landmarks_data_size: (o, indx) => { return 0; }, d3_tracker_type: (o, indx) => { return 0; }, d3_tracker_dense: (o, indx) => { return 0; }, d3_tracker_category: (o, indx) => { return 0; }, d3_tracker_size_for_id_set: (o, id, size) => { return 0; }, d3_tracker_pose: (o, indx, cameraPose, mirror) => {
-            let res = applyScreenCounterRotation(undefined, client.d3_tracker_pose_raw(o, indx));
-            if (mirror) {
-                let scale = mat4.create();
-                mat4.fromScaling(scale, [-1, 1, 1]);
-                mat4.multiply(res, scale, res);
-                mat4.multiply(res, res, scale);
-            }
-            mat4.multiply(res, cameraPose, res);
-            return res;
+    let d3Impl = (bridgedD3Api === null || bridgedD3Api === void 0 ? void 0 : bridgedD3Api.impl) || c.impl;
+    client = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, c.impl), { world_tracker_mesh_anchor_count: () => 0, world_tracker_mesh_anchor_id: () => "", world_tracker_mesh_anchor_indices: () => new Uint32Array(0), world_tracker_mesh_anchor_indices_count: () => 0, world_tracker_mesh_anchor_indices_size: () => 0, world_tracker_mesh_anchor_vertices: () => new Float32Array(0), world_tracker_mesh_anchor_vertices_count: () => 0, world_tracker_mesh_anchor_vertices_size: () => 0, world_tracker_mesh_anchor_vertices_offset: () => 0, world_tracker_mesh_anchor_vertices_stride: () => 0, world_tracker_mesh_anchor_pose_raw: () => new Float32Array(), world_tracker_mesh_anchor_status: () => anchor_status_t.ANCHOR_STATUS_STOPPED, world_tracker_mesh_anchors_enabled: () => false, world_tracker_mesh_anchors_enabled_set: () => { }, d3_tracker_process_max_resolution_set: () => { } }), bridgedWtImpl), bridgedD3Impl), { d3_tracker_create: (pipeline) => {
+            let ret = d3Impl.d3_tracker_create(pipeline);
+            d3TrackerSizeById.set(ret, new Map());
+            return ret;
+        }, d3_tracker_destroy: (o) => {
+            d3TrackerSizeById.delete(o);
+            d3Impl.d3_tracker_destroy(o);
+        }, d3_tracker_pose0_raw: (o, indx) => {
+            let pose = d3Impl.d3_tracker_pose0_raw(o, indx).slice();
+            applyD3SizeToPose(o, indx, pose);
+            return pose;
+        }, d3_tracker_pose1_raw: (o, indx) => {
+            let pose = d3Impl.d3_tracker_pose1_raw(o, indx).slice();
+            applyD3SizeToPose(o, indx, pose);
+            return pose;
+        }, d3_tracker_size_for_id_set: (o, id, size) => {
+            var _a;
+            (_a = d3TrackerSizeById.get(o)) === null || _a === void 0 ? void 0 : _a.set(id, size);
+        }, d3_tracker_pose_raw: (o, indx) => {
+            return client.d3_tracker_pose0_raw(o, indx);
+        }, d3_tracker_pose: (o, indx, cameraPose, mirror) => {
+            return client.d3_tracker_pose0(o, indx, cameraPose, mirror);
         }, d3_tracker_pose_camera_relative: (o, indx, mirror) => {
-            let res = applyScreenCounterRotation(undefined, client.d3_tracker_pose_raw(o, indx));
-            if (mirror) {
-                let scale = mat4.create();
-                mat4.fromScaling(scale, [-1, 1, 1]);
-                mat4.multiply(res, scale, res);
-                mat4.multiply(res, res, scale);
-            }
-            return res;
+            return client.d3_tracker_pose0_camera_relative(o, indx, mirror);
         }, d3_tracker_pose0: (o, indx, cameraPose, mirror) => {
             let res = applyScreenCounterRotation(undefined, client.d3_tracker_pose0_raw(o, indx));
             if (mirror) {
@@ -251,7 +271,7 @@ export function initialize(opts) {
                 mat4.multiply(res, res, scale);
             }
             return res;
-        } }), bridgedWtImpl), bridgedD3Impl), { loaded: () => loaded, camera_default_device_id: userFacing => userFacing ? CameraSource.USER_DEFAULT_DEVICE_ID : CameraSource.DEFAULT_DEVICE_ID, camera_source_create: (p, deviceId) => createCameraSource(p, deviceId, preferWebXRCamera), camera_source_destroy: cam => { var _a; return (_a = getCameraSource(cam)) === null || _a === void 0 ? void 0 : _a.destroy(); }, camera_source_pause: cam => { var _a; return (_a = getCameraSource(cam)) === null || _a === void 0 ? void 0 : _a.pause(); }, camera_source_start: cam => { var _a; return (_a = getCameraSource(cam)) === null || _a === void 0 ? void 0 : _a.start(); }, camera_source_profile_set: (cam, p) => { var _a; return (_a = getCameraSource(cam)) === null || _a === void 0 ? void 0 : _a.setProfile(p); }, camera_count: () => 2, camera_id: indx => indx === 0 ? CameraSource.DEFAULT_DEVICE_ID : CameraSource.USER_DEFAULT_DEVICE_ID, camera_name: indx => indx === 0 ? "Rear-facing Camera" : "User-facing Camera", camera_user_facing: indx => indx !== 0, pose_from_raw: (raw_pose, mirror) => {
+        }, loaded: () => loaded, camera_default_device_id: userFacing => userFacing ? CameraSource.USER_DEFAULT_DEVICE_ID : CameraSource.DEFAULT_DEVICE_ID, camera_source_create: (p, deviceId) => createCameraSource(p, deviceId, preferWebXRCamera), camera_source_destroy: cam => { var _a; return (_a = getCameraSource(cam)) === null || _a === void 0 ? void 0 : _a.destroy(); }, camera_source_pause: cam => { var _a; return (_a = getCameraSource(cam)) === null || _a === void 0 ? void 0 : _a.pause(); }, camera_source_start: cam => { var _a; return (_a = getCameraSource(cam)) === null || _a === void 0 ? void 0 : _a.start(); }, camera_source_profile_set: (cam, p) => { var _a; return (_a = getCameraSource(cam)) === null || _a === void 0 ? void 0 : _a.setProfile(p); }, camera_count: () => 2, camera_id: indx => indx === 0 ? CameraSource.DEFAULT_DEVICE_ID : CameraSource.USER_DEFAULT_DEVICE_ID, camera_name: indx => indx === 0 ? "Rear-facing Camera" : "User-facing Camera", camera_user_facing: indx => indx !== 0, pose_from_raw: (raw_pose, mirror) => {
             let res = applyScreenCounterRotation(undefined, raw_pose);
             if (mirror) {
                 let scale = mat4.create();

package/lib/sequencesource.js

@@ -97,7 +97,7 @@ export class SequenceSource extends Source {
         // updates will be one frame later
         this._submitMotionUpdates(pipeline);
         const token = pipeline.registerToken(info);
-        pipeline.sendDataToWorker(info.data || new ArrayBuffer(0), token, info.dataWidth, info.dataHeight, info.userFacing, info.cameraToDevice, info.cameraModel, -1);
+        pipeline.sendDataToWorker(info.data || new ArrayBuffer(0), token, info.dataWidth, info.dataHeight, info.userFacing, info.cameraToDevice.slice(), info.cameraModel.slice(), -1);
     }
     destroy() {
         byId.delete(this._impl);
@@ -154,7 +154,7 @@ export class SequenceSource extends Source {
                     pendingMotionUpdate = true;
                     break;
                 case SequenceRecorderPacketType.ATTITUDE_MATRIX:
-                    pipeline.motionAttitudeMatrix(packet.attitude);
+                    pipeline.motionAttitudeMatrix(packet.attitude.slice());
                     pendingMotionUpdate = true;
                     break;
                 case SequenceRecorderPacketType.ACCELEROMETER_WO_GRAVITY_INT:

package/lib/src/gen/zappar-bridge.d.ts

@@ -186,4 +186,16 @@ export interface zappar {
     custom_anchor_pose_set_with_parent(o: zappar_custom_anchor_t, pose: Float32Array, anchor_id: string): void;
     d3_tracker_create(pipeline: zappar_pipeline_t): zappar_d3_tracker_t;
     d3_tracker_destroy(o: zappar_d3_tracker_t): void;
+    d3_tracker_enabled(o: zappar_d3_tracker_t): boolean;
+    d3_tracker_enabled_set(o: zappar_d3_tracker_t, enabled: boolean): void;
+    d3_tracker_count(o: zappar_d3_tracker_t): number;
+    d3_tracker_id(o: zappar_d3_tracker_t, indx: number): string;
+    d3_tracker_pose0_raw(o: zappar_d3_tracker_t, indx: number): Float32Array;
+    d3_tracker_pose1_raw(o: zappar_d3_tracker_t, indx: number): Float32Array;
+    d3_tracker_type(o: zappar_d3_tracker_t, indx: number): number;
+    d3_tracker_category(o: zappar_d3_tracker_t, indx: number): number;
+    d3_tracker_qr(o: zappar_d3_tracker_t, indx: number): string;
+    d3_tracker_dense(o: zappar_d3_tracker_t, indx: number): number;
+    d3_tracker_landmarks_data(o: zappar_d3_tracker_t, indx: number): Float32Array;
+    d3_tracker_landmarks_data_size(o: zappar_d3_tracker_t, indx: number): number;
 }

package/lib/src/gen/zappar-native.d.ts

@@ -263,4 +263,16 @@ export interface zappar_cwrap {
     custom_anchor_pose_set_with_parent(o: zappar_custom_anchor_t, pose: Float32Array, anchor_id: string): void;
     d3_tracker_create(pipeline: zappar_pipeline_t): zappar_d3_tracker_t;
     d3_tracker_destroy(o: zappar_d3_tracker_t): void;
+    d3_tracker_enabled(o: zappar_d3_tracker_t): boolean;
+    d3_tracker_enabled_set(o: zappar_d3_tracker_t, enabled: boolean): void;
+    d3_tracker_count(o: zappar_d3_tracker_t): number;
+    d3_tracker_id(o: zappar_d3_tracker_t, indx: number): string;
+    d3_tracker_pose0_raw(o: zappar_d3_tracker_t, indx: number): Float32Array;
+    d3_tracker_pose1_raw(o: zappar_d3_tracker_t, indx: number): Float32Array;
+    d3_tracker_type(o: zappar_d3_tracker_t, indx: number): number;
+    d3_tracker_category(o: zappar_d3_tracker_t, indx: number): number;
+    d3_tracker_qr(o: zappar_d3_tracker_t, indx: number): string;
+    d3_tracker_dense(o: zappar_d3_tracker_t, indx: number): number;
+    d3_tracker_landmarks_data(o: zappar_d3_tracker_t, indx: number): Float32Array;
+    d3_tracker_landmarks_data_size(o: zappar_d3_tracker_t, indx: number): number;
 }

package/lib/src/gen/zappar.d.ts

@@ -295,25 +295,25 @@ export interface zappar {
     custom_anchor_pose_set_with_parent(o: zappar_custom_anchor_t, pose: Float32Array, anchor_id: string): void;
     d3_tracker_create(pipeline: zappar_pipeline_t): zappar_d3_tracker_t;
     d3_tracker_destroy(o: zappar_d3_tracker_t): void;
-    d3_tracker_id(o: zappar_d3_tracker_t, indx: number): string;
     d3_tracker_enabled(o: zappar_d3_tracker_t): boolean;
     d3_tracker_enabled_set(o: zappar_d3_tracker_t, enabled: boolean): void;
     d3_tracker_process_max_resolution_set(o: zappar_d3_tracker_t, v: boolean): void;
     d3_tracker_count(o: zappar_d3_tracker_t): number;
-    d3_tracker_qr(o: zappar_d3_tracker_t, indx: number): string;
-    d3_tracker_pose_raw(o: zappar_d3_tracker_t, indx: number): Float32Array;
-    d3_tracker_pose_camera_relative(o: zappar_d3_tracker_t, indx: number, mirror: boolean): Float32Array;
-    d3_tracker_pose(o: zappar_d3_tracker_t, indx: number, camera_pose: Float32Array, mirror: boolean): Float32Array;
+    d3_tracker_id(o: zappar_d3_tracker_t, indx: number): string;
     d3_tracker_pose0_raw(o: zappar_d3_tracker_t, indx: number): Float32Array;
     d3_tracker_pose0_camera_relative(o: zappar_d3_tracker_t, indx: number, mirror: boolean): Float32Array;
     d3_tracker_pose0(o: zappar_d3_tracker_t, indx: number, camera_pose: Float32Array, mirror: boolean): Float32Array;
     d3_tracker_pose1_raw(o: zappar_d3_tracker_t, indx: number): Float32Array;
     d3_tracker_pose1_camera_relative(o: zappar_d3_tracker_t, indx: number, mirror: boolean): Float32Array;
     d3_tracker_pose1(o: zappar_d3_tracker_t, indx: number, camera_pose: Float32Array, mirror: boolean): Float32Array;
-    d3_tracker_landmarks_data(o: zappar_d3_tracker_t, indx: number): Float32Array;
-    d3_tracker_landmarks_data_size(o: zappar_d3_tracker_t, indx: number): number;
     d3_tracker_type(o: zappar_d3_tracker_t, indx: number): number;
-    d3_tracker_dense(o: zappar_d3_tracker_t, indx: number): number;
     d3_tracker_category(o: zappar_d3_tracker_t, indx: number): number;
+    d3_tracker_qr(o: zappar_d3_tracker_t, indx: number): string;
+    d3_tracker_dense(o: zappar_d3_tracker_t, indx: number): number;
+    d3_tracker_landmarks_data(o: zappar_d3_tracker_t, indx: number): Float32Array;
+    d3_tracker_landmarks_data_size(o: zappar_d3_tracker_t, indx: number): number;
+    d3_tracker_pose_raw(o: zappar_d3_tracker_t, indx: number): Float32Array;
+    d3_tracker_pose_camera_relative(o: zappar_d3_tracker_t, indx: number, mirror: boolean): Float32Array;
+    d3_tracker_pose(o: zappar_d3_tracker_t, indx: number, camera_pose: Float32Array, mirror: boolean): Float32Array;
     d3_tracker_size_for_id_set(o: zappar_d3_tracker_t, id: string, size: number): void;
 }

package/lib/src/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.9.1";
+export declare const VERSION = "3.10.0";

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.9.1";
+export declare const VERSION = "3.10.0";

package/lib/version.js

@@ -1 +1 @@
-export const VERSION = "3.9.1";
+export const VERSION = "3.10.0";