@zappar/zappar-cv 3.0.1-beta.0 → 3.0.1-beta.10

package/lib/gen/zappar-server.js

@@ -480,7 +480,7 @@ export class zappar_server {
                     let obj = this._custom_anchor_by_instance.get(clientId);
                     if (obj === undefined)
                         return;
-                    this._impl.custom_anchor_enabled_set(obj, msg.bool());
+                    this._impl.custom_anchor_pose_set_from_camera_offset_raw(obj, msg.float(), msg.float(), msg.float(), msg.transformOrientation());
                     break;
                 }
                 case 56: {
@@ -488,7 +488,7 @@ export class zappar_server {
                     let obj = this._custom_anchor_by_instance.get(clientId);
                     if (obj === undefined)
                         return;
-                    this._impl.custom_anchor_pose_set_from_camera_offset_raw(obj, msg.float(), msg.float(), msg.float(), msg.transformOrientation());
+                    this._impl.custom_anchor_pose_set_from_anchor_offset(obj, msg.string(), msg.float(), msg.float(), msg.float(), msg.transformOrientation());
                     break;
                 }
                 case 57: {
@@ -496,7 +496,15 @@ export class zappar_server {
                     let obj = this._custom_anchor_by_instance.get(clientId);
                     if (obj === undefined)
                         return;
-                    this._impl.custom_anchor_pose_set_from_anchor_offset(obj, msg.string(), msg.float(), msg.float(), msg.float(), msg.transformOrientation());
+                    this._impl.custom_anchor_pose_set(obj, msg.matrix4x4());
+                    break;
+                }
+                case 58: {
+                    let clientId = msg.type();
+                    let obj = this._custom_anchor_by_instance.get(clientId);
+                    if (obj === undefined)
+                        return;
+                    this._impl.custom_anchor_pose_set_with_parent(obj, msg.matrix4x4(), msg.string());
                     break;
                 }
             }
@@ -510,7 +518,7 @@ export class zappar_server {
             let serializer = this.serializersByPipelineId.get(pipeline);
             if (!serializer)
                 continue;
-            serializer.sendMessage(7, msg => {
+            serializer.sendMessage(9, msg => {
                 msg.type(k);
                 msg.int(this._impl.pipeline_frame_number(v));
             });
@@ -518,15 +526,23 @@ export class zappar_server {
                 msg.type(k);
                 msg.cameraModel(this._impl.pipeline_camera_model(v));
             });
+            serializer.sendMessage(7, msg => {
+                msg.type(k);
+                msg.int(this._impl.pipeline_camera_data_width(v));
+            });
+            serializer.sendMessage(8, msg => {
+                msg.type(k);
+                msg.int(this._impl.pipeline_camera_data_height(v));
+            });
             serializer.sendMessage(5, msg => {
                 msg.type(k);
                 msg.int(this._impl.pipeline_camera_frame_user_data(v));
             });
-            serializer.sendMessage(11, msg => {
+            serializer.sendMessage(13, msg => {
                 msg.type(k);
                 msg.matrix4x4(this._impl.pipeline_camera_frame_camera_attitude(v));
             });
-            serializer.sendMessage(12, msg => {
+            serializer.sendMessage(14, msg => {
                 msg.type(k);
                 msg.matrix4x4(this._impl.pipeline_camera_frame_device_attitude(v));
             });
@@ -554,7 +570,7 @@ export class zappar_server {
             let serializer = this.serializersByPipelineId.get(pipeline);
             if (!serializer)
                 continue;
-            serializer.sendMessage(19, msg => {
+            serializer.sendMessage(21, msg => {
                 msg.type(k);
                 msg.int(this._impl.image_tracker_target_loaded_version(v));
             });
@@ -584,37 +600,37 @@ export class zappar_server {
             let serializer = this.serializersByPipelineId.get(pipeline);
             if (!serializer)
                 continue;
-            serializer.sendMessage(18, msg => {
+            serializer.sendMessage(20, msg => {
                 msg.type(k);
                 msg.int(this._impl.face_tracker_model_loaded_version(v));
             });
-            serializer.sendMessage(13, msg => {
+            serializer.sendMessage(15, msg => {
                 msg.type(k);
                 msg.int(this._impl.face_tracker_anchor_count(v));
             });
             for (let i = 0; i < this._impl.face_tracker_anchor_count(v); i++) {
-                serializer.sendMessage(14, msg => {
+                serializer.sendMessage(16, msg => {
                     msg.type(k);
                     msg.int(i);
                     msg.string(this._impl.face_tracker_anchor_id(v, i));
                 });
             }
             for (let i = 0; i < this._impl.face_tracker_anchor_count(v); i++) {
-                serializer.sendMessage(15, msg => {
+                serializer.sendMessage(17, msg => {
                     msg.type(k);
                     msg.int(i);
                     msg.matrix4x4(this._impl.face_tracker_anchor_pose_raw(v, i));
                 });
             }
             for (let i = 0; i < this._impl.face_tracker_anchor_count(v); i++) {
-                serializer.sendMessage(16, msg => {
+                serializer.sendMessage(18, msg => {
                     msg.type(k);
                     msg.int(i);
                     msg.identityCoefficients(this._impl.face_tracker_anchor_identity_coefficients(v, i));
                 });
             }
             for (let i = 0; i < this._impl.face_tracker_anchor_count(v); i++) {
-                serializer.sendMessage(17, msg => {
+                serializer.sendMessage(19, msg => {
                     msg.type(k);
                     msg.int(i);
                     msg.expressionCoefficients(this._impl.face_tracker_anchor_expression_coefficients(v, i));
@@ -644,19 +660,19 @@ export class zappar_server {
             let serializer = this.serializersByPipelineId.get(pipeline);
             if (!serializer)
                 continue;
-            serializer.sendMessage(8, msg => {
+            serializer.sendMessage(10, msg => {
                 msg.type(k);
                 msg.int(this._impl.barcode_finder_found_number(v));
             });
             for (let i = 0; i < this._impl.barcode_finder_found_number(v); i++) {
-                serializer.sendMessage(9, msg => {
+                serializer.sendMessage(11, msg => {
                     msg.type(k);
                     msg.int(i);
                     msg.string(this._impl.barcode_finder_found_text(v, i));
                 });
             }
             for (let i = 0; i < this._impl.barcode_finder_found_number(v); i++) {
-                serializer.sendMessage(10, msg => {
+                serializer.sendMessage(12, msg => {
                     msg.type(k);
                     msg.int(i);
                     msg.barcodeFormat(this._impl.barcode_finder_found_format(v, i));
@@ -682,23 +698,23 @@ export class zappar_server {
             let serializer = this.serializersByPipelineId.get(pipeline);
             if (!serializer)
                 continue;
-            serializer.sendMessage(24, msg => {
+            serializer.sendMessage(26, msg => {
                 msg.type(k);
                 msg.int(this._impl.zapcode_tracker_target_loaded_version(v));
             });
-            serializer.sendMessage(21, msg => {
+            serializer.sendMessage(23, msg => {
                 msg.type(k);
                 msg.int(this._impl.zapcode_tracker_anchor_count(v));
             });
             for (let i = 0; i < this._impl.zapcode_tracker_anchor_count(v); i++) {
-                serializer.sendMessage(22, msg => {
+                serializer.sendMessage(24, msg => {
                     msg.type(k);
                     msg.int(i);
                     msg.string(this._impl.zapcode_tracker_anchor_id(v, i));
                 });
             }
             for (let i = 0; i < this._impl.zapcode_tracker_anchor_count(v); i++) {
-                serializer.sendMessage(23, msg => {
+                serializer.sendMessage(25, msg => {
                     msg.type(k);
                     msg.int(i);
                     msg.matrix4x4(this._impl.zapcode_tracker_anchor_pose_raw(v, i));
@@ -712,108 +728,108 @@ export class zappar_server {
             let serializer = this.serializersByPipelineId.get(pipeline);
             if (!serializer)
                 continue;
-            serializer.sendMessage(40, msg => {
+            serializer.sendMessage(42, msg => {
                 msg.type(k);
                 msg.int(this._impl.world_tracker_quality(v));
             });
-            serializer.sendMessage(25, msg => {
+            serializer.sendMessage(27, msg => {
                 msg.type(k);
                 msg.int(this._impl.world_tracker_plane_anchor_count(v));
             });
             for (let i = 0; i < this._impl.world_tracker_plane_anchor_count(v); i++) {
-                serializer.sendMessage(33, msg => {
+                serializer.sendMessage(35, msg => {
                     msg.type(k);
                     msg.int(i);
                     msg.string(this._impl.world_tracker_plane_anchor_id(v, i));
                 });
             }
             for (let i = 0; i < this._impl.world_tracker_plane_anchor_count(v); i++) {
-                serializer.sendMessage(26, msg => {
+                serializer.sendMessage(28, msg => {
                     msg.type(k);
                     msg.int(i);
                     msg.matrix4x4(this._impl.world_tracker_plane_anchor_pose_raw(v, i));
                 });
             }
             for (let i = 0; i < this._impl.world_tracker_plane_anchor_count(v); i++) {
-                serializer.sendMessage(28, msg => {
+                serializer.sendMessage(30, msg => {
                     msg.type(k);
                     msg.int(i);
                     msg.anchorStatus(this._impl.world_tracker_plane_anchor_status(v, i));
                 });
             }
             for (let i = 0; i < this._impl.world_tracker_plane_anchor_count(v); i++) {
-                serializer.sendMessage(29, msg => {
+                serializer.sendMessage(31, msg => {
                     msg.type(k);
                     msg.int(i);
                     msg.int(this._impl.world_tracker_plane_anchor_polygon_data_size(v, i));
                 });
             }
             for (let i = 0; i < this._impl.world_tracker_plane_anchor_count(v); i++) {
-                serializer.sendMessage(30, msg => {
+                serializer.sendMessage(32, msg => {
                     msg.type(k);
                     msg.int(i);
                     msg.floatArray(this._impl.world_tracker_plane_anchor_polygon_data(v, i));
                 });
             }
             for (let i = 0; i < this._impl.world_tracker_plane_anchor_count(v); i++) {
-                serializer.sendMessage(31, msg => {
+                serializer.sendMessage(33, msg => {
                     msg.type(k);
                     msg.int(i);
                     msg.int(this._impl.world_tracker_plane_anchor_polygon_version(v, i));
                 });
             }
             for (let i = 0; i < this._impl.world_tracker_plane_anchor_count(v); i++) {
-                serializer.sendMessage(32, msg => {
+                serializer.sendMessage(34, msg => {
                     msg.type(k);
                     msg.int(i);
                     msg.planeOrientation(this._impl.world_tracker_plane_anchor_orientation(v, i));
                 });
             }
-            serializer.sendMessage(36, msg => {
+            serializer.sendMessage(38, msg => {
                 msg.type(k);
                 msg.anchorStatus(this._impl.world_tracker_world_anchor_status(v));
             });
-            serializer.sendMessage(35, msg => {
+            serializer.sendMessage(37, msg => {
                 msg.type(k);
                 msg.string(this._impl.world_tracker_world_anchor_id(v));
             });
-            serializer.sendMessage(34, msg => {
+            serializer.sendMessage(36, msg => {
                 msg.type(k);
                 msg.matrix4x4(this._impl.world_tracker_world_anchor_pose_raw(v));
             });
-            serializer.sendMessage(38, msg => {
+            serializer.sendMessage(40, msg => {
                 msg.type(k);
                 msg.string(this._impl.world_tracker_ground_anchor_id(v));
             });
-            serializer.sendMessage(39, msg => {
+            serializer.sendMessage(41, msg => {
                 msg.type(k);
                 msg.anchorStatus(this._impl.world_tracker_ground_anchor_status(v));
             });
-            serializer.sendMessage(37, msg => {
+            serializer.sendMessage(39, msg => {
                 msg.type(k);
                 msg.matrix4x4(this._impl.world_tracker_ground_anchor_pose_raw(v));
             });
-            serializer.sendMessage(43, msg => {
+            serializer.sendMessage(45, msg => {
                 msg.type(k);
                 msg.int(this._impl.world_tracker_tracks_data_size(v));
             });
-            serializer.sendMessage(42, msg => {
+            serializer.sendMessage(44, msg => {
                 msg.type(k);
                 msg.floatArray(this._impl.world_tracker_tracks_data(v));
             });
-            serializer.sendMessage(45, msg => {
+            serializer.sendMessage(47, msg => {
                 msg.type(k);
                 msg.int(this._impl.world_tracker_tracks_type_data_size(v));
             });
-            serializer.sendMessage(44, msg => {
+            serializer.sendMessage(46, msg => {
                 msg.type(k);
                 msg.ucharArray(this._impl.world_tracker_tracks_type_data(v));
             });
-            serializer.sendMessage(48, msg => {
+            serializer.sendMessage(50, msg => {
                 msg.type(k);
                 msg.int(this._impl.world_tracker_projections_data_size(v));
             });
-            serializer.sendMessage(47, msg => {
+            serializer.sendMessage(49, msg => {
                 msg.type(k);
                 msg.floatArray(this._impl.world_tracker_projections_data(v));
             });
@@ -825,11 +841,15 @@ export class zappar_server {
             let serializer = this.serializersByPipelineId.get(pipeline);
             if (!serializer)
                 continue;
-            serializer.sendMessage(50, msg => {
+            serializer.sendMessage(52, msg => {
                 msg.type(k);
                 msg.anchorStatus(this._impl.custom_anchor_status(v));
             });
-            serializer.sendMessage(49, msg => {
+            serializer.sendMessage(53, msg => {
+                msg.type(k);
+                msg.int(this._impl.custom_anchor_pose_version(v));
+            });
+            serializer.sendMessage(51, msg => {
                 msg.type(k);
                 msg.matrix4x4(this._impl.custom_anchor_pose_raw(v));
             });

package/lib/gen/zappar.d.ts

@@ -61,8 +61,8 @@ export interface zappar {
     camera_id(indx: number): string;
     camera_name(indx: number): string;
     camera_user_facing(indx: number): boolean;
-    projection_matrix_from_camera_model(model: Float32Array, renderWidth: number, renderHeight: number): Float32Array;
-    projection_matrix_from_camera_model_ext(model: Float32Array, renderWidth: number, renderHeight: number, zNear: number, zFar: number): Float32Array;
+    projection_matrix_from_camera_model_and_size(model: Float32Array, cameraDataWidth: number, cameraDataHeight: number, renderWidth: number, renderHeight: number): Float32Array;
+    projection_matrix_from_camera_model_and_size_ext(model: Float32Array, cameraDataWidth: number, cameraDataHeight: number, renderWidth: number, renderHeight: number, zNear: number, zFar: number): Float32Array;
     pose_from_raw(raw_pose: Float32Array, mirror: boolean): Float32Array;
     log_level(): log_level_t;
     log_level_set(level: log_level_t): void;
@@ -87,6 +87,8 @@ export interface zappar {
     pipeline_frame_update(o: zappar_pipeline_t): void;
     pipeline_frame_number(o: zappar_pipeline_t): number;
     pipeline_camera_model(o: zappar_pipeline_t): Float32Array;
+    pipeline_camera_data_width(o: zappar_pipeline_t): number;
+    pipeline_camera_data_height(o: zappar_pipeline_t): number;
     pipeline_camera_pose_default(o: zappar_pipeline_t): Float32Array;
     pipeline_camera_pose_with_attitude(o: zappar_pipeline_t, mirror: boolean): Float32Array;
     pipeline_camera_pose_with_origin(o: zappar_pipeline_t, pose: Float32Array): Float32Array;
@@ -254,12 +256,13 @@ export interface zappar {
     custom_anchor_destroy(o: zappar_custom_anchor_t): void;
     custom_anchor_id(o: zappar_custom_anchor_t): string;
     custom_anchor_status(o: zappar_custom_anchor_t): anchor_status_t;
-    custom_anchor_enabled_set(o: zappar_custom_anchor_t, enabled: boolean): void;
-    custom_anchor_enabled(o: zappar_custom_anchor_t): boolean;
+    custom_anchor_pose_version(o: zappar_custom_anchor_t): number;
     custom_anchor_pose_raw(o: zappar_custom_anchor_t): Float32Array;
     custom_anchor_pose_camera_relative(o: zappar_custom_anchor_t, mirror: boolean): Float32Array;
     custom_anchor_pose(o: zappar_custom_anchor_t, camera_pose: Float32Array, mirror: boolean): Float32Array;
     custom_anchor_pose_set_from_camera_offset_raw(o: zappar_custom_anchor_t, x: number, y: number, z: number, orientation: transform_orientation_t): void;
     custom_anchor_pose_set_from_camera_offset(o: zappar_custom_anchor_t, x: number, y: number, z: number, orientation: transform_orientation_t): void;
     custom_anchor_pose_set_from_anchor_offset(o: zappar_custom_anchor_t, anchor_id: string, x: number, y: number, z: number, orientation: transform_orientation_t): void;
+    custom_anchor_pose_set(o: zappar_custom_anchor_t, pose: Float32Array): void;
+    custom_anchor_pose_set_with_parent(o: zappar_custom_anchor_t, pose: Float32Array, anchor_id: string): void;
 }

package/lib/html-element-source.js

@@ -159,7 +159,7 @@ export class HTMLElementSource extends Source {
         }
         let tex = this._currentVideoTexture;
         this._currentVideoTexture = undefined;
-        let focalLength = 240.0 * dataWidth / 320.0;
+        let focalLength = (this._isUserFacing ? 300.0 : 240.0) * dataWidth / 320.0;
         this._cameraModel[0] = focalLength;
         this._cameraModel[1] = focalLength;
         this._cameraModel[2] = dataWidth * 0.5;

package/lib/mstp-camera-source.js

@@ -317,10 +317,11 @@ export class MSTPCameraSource extends Source {
         let texture = pipeline.getVideoTexture();
         if (!texture)
             return;
+        const previousBoundTexture = gl.getParameter(gl.TEXTURE_BINDING_2D);
         gl.bindTexture(gl.TEXTURE_2D, texture);
         gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, false);
         gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, info.frame);
-        gl.bindTexture(gl.TEXTURE_2D, null);
+        gl.bindTexture(gl.TEXTURE_2D, previousBoundTexture);
         info.texture = texture;
         info.frame.close();
         delete info.frame;