@zappar/zappar-cv 3.0.1-beta.6 → 3.1.0-beta.1

package/lib/drawmesh.js

@@ -0,0 +1,123 @@
+import { compileShader, linkProgram } from "./shader";
+export class MeshDraw {
+    constructor(_gl) {
+        this._gl = _gl;
+    }
+    dispose() {
+        if (this._vbo)
+            this._gl.deleteBuffer(this._vbo);
+        if (this._uvbo)
+            this._gl.deleteBuffer(this._uvbo);
+        if (this._ibo)
+            this._gl.deleteBuffer(this._ibo);
+        if (this._shader)
+            this._gl.deleteProgram(this._shader.prog);
+        this._vbo = undefined;
+        this._uvbo = undefined;
+        this._ibo = undefined;
+        this._shader = undefined;
+    }
+    _generateIBO(indices, gl) {
+        if (this._ibo && this._lastIndices === indices)
+            return this._ibo;
+        this._lastIndices = indices;
+        if (!this._ibo)
+            this._ibo = gl.createBuffer();
+        if (!this._ibo)
+            throw new Error("Unable to create buffer object");
+        gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._ibo);
+        gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, indices, gl.DYNAMIC_DRAW);
+        gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, null);
+        return this._ibo;
+    }
+    _generateVBO(face, gl) {
+        if (!this._vbo)
+            this._vbo = gl.createBuffer();
+        if (!this._vbo)
+            throw new Error("Unable to create buffer object");
+        gl.bindBuffer(gl.ARRAY_BUFFER, this._vbo);
+        gl.bufferData(gl.ARRAY_BUFFER, face, gl.DYNAMIC_DRAW);
+        gl.bindBuffer(gl.ARRAY_BUFFER, null);
+        return this._vbo;
+    }
+    draw(projectionMatrix, cameraMatrix, targetMatrix, vertices, indices, vertexOffset, vertexStride, indicesCount) {
+        let gl = this._gl;
+        let shader = this._getShader(gl);
+        let v = this._generateVBO(vertices, gl);
+        let i = this._generateIBO(indices, gl);
+        gl.disable(gl.DEPTH_TEST);
+        gl.disable(gl.CULL_FACE);
+        gl.useProgram(shader.prog);
+        gl.uniformMatrix4fv(shader.unif_proj, false, projectionMatrix);
+        gl.uniformMatrix4fv(shader.unif_camera, false, cameraMatrix);
+        gl.uniformMatrix4fv(shader.unif_matrix, false, targetMatrix);
+        gl.bindBuffer(gl.ARRAY_BUFFER, v);
+        gl.vertexAttribPointer(shader.attr_position, 3, gl.FLOAT, false, vertexStride, vertexOffset);
+        gl.enableVertexAttribArray(shader.attr_position);
+        gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, i);
+        gl.drawElements(gl.LINE_STRIP, indicesCount, gl.UNSIGNED_INT, 0);
+        gl.disableVertexAttribArray(shader.attr_position);
+        gl.bindBuffer(gl.ARRAY_BUFFER, null);
+        gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, null);
+    }
+    _getShader(gl) {
+        if (this._shader)
+            return this._shader;
+        let prog = gl.createProgram();
+        if (!prog)
+            throw new Error("Unable to create program");
+        let vertexShader = compileShader(gl, gl.VERTEX_SHADER, vertexShaderSrc);
+        let fragmentShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentShaderSrc);
+        gl.attachShader(prog, vertexShader);
+        gl.attachShader(prog, fragmentShader);
+        linkProgram(gl, prog);
+        let unif_proj = gl.getUniformLocation(prog, "projMatrix");
+        if (!unif_proj)
+            throw new Error("Unable to get uniform location projMatrix");
+        let unif_matrix = gl.getUniformLocation(prog, "modelViewMatrix");
+        if (!unif_matrix)
+            throw new Error("Unable to get uniform location modelViewMatrix");
+        let unif_camera = gl.getUniformLocation(prog, "cameraMatrix");
+        if (!unif_camera)
+            throw new Error("Unable to get uniform location cameraMatrix");
+        this._shader = {
+            prog,
+            unif_matrix,
+            unif_camera,
+            unif_proj,
+            attr_position: gl.getAttribLocation(prog, "position"),
+        };
+        return this._shader;
+    }
+}
+let vertexShaderSrc = `
+#ifndef GL_ES
+#define highp
+#define mediump
+#define lowp
+#endif
+
+uniform mat4 projMatrix;
+uniform mat4 cameraMatrix;
+uniform mat4 modelViewMatrix;
+attribute vec4 position;
+
+void main()
+{
+    gl_Position = projMatrix * cameraMatrix * modelViewMatrix * position;
+}`;
+let fragmentShaderSrc = `
+#define highp mediump
+#ifdef GL_ES
+    // define default precision for float, vec, mat.
+    precision highp float;
+#else
+#define highp
+#define mediump
+#define lowp
+#endif
+
+void main()
+{
+    gl_FragColor = vec4(1.0, 0.0, 0.0, 0.5);
+}`;

package/lib/drawquad.d.ts

@@ -0,0 +1,2 @@
+export declare function disposeDrawQuad(): void;
+export declare function drawQuad(gl: WebGLRenderingContext, projectionMatrix: Float32Array, modelviewMatrix: Float32Array, color: Float32Array): void;

package/lib/drawquad.js

@@ -0,0 +1,99 @@
+import { compileShader, linkProgram } from "./shader";
+let shader;
+let vbo;
+export function disposeDrawQuad() {
+    shader = undefined;
+    vbo = undefined;
+}
+function generate(gl) {
+    if (vbo)
+        return vbo;
+    vbo = gl.createBuffer();
+    if (!vbo)
+        throw new Error("Unable to create buffer object");
+    let coords = [
+        -0.5, 0.5, 0,
+        -0.5, -0.5, 0,
+        0.5, 0.5, 0,
+        0.5, -0.5, 0
+    ];
+    gl.bindBuffer(gl.ARRAY_BUFFER, vbo);
+    gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(coords), gl.STATIC_DRAW);
+    gl.bindBuffer(gl.ARRAY_BUFFER, null);
+    return vbo;
+}
+export function drawQuad(gl, projectionMatrix, modelviewMatrix, color) {
+    let shader = getShader(gl);
+    let v = generate(gl);
+    gl.useProgram(shader.prog);
+    gl.uniformMatrix4fv(shader.unif_projection, false, projectionMatrix);
+    gl.uniformMatrix4fv(shader.unif_modelView, false, modelviewMatrix);
+    gl.uniform4fv(shader.unif_color, color);
+    gl.bindBuffer(gl.ARRAY_BUFFER, v);
+    gl.vertexAttribPointer(shader.attr_position, 3, gl.FLOAT, false, 3 * 4, 0);
+    gl.enableVertexAttribArray(shader.attr_position);
+    gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
+    gl.disableVertexAttribArray(shader.attr_position);
+    gl.bindBuffer(gl.ARRAY_BUFFER, null);
+}
+let vertexShaderSrc = `
+#ifndef GL_ES
+#define highp
+#define mediump
+#define lowp
+#endif
+
+uniform mat4 projMatrix;
+uniform mat4 modelViewMatrix;
+attribute vec4 position;
+
+void main()
+{
+    gl_Position = projMatrix * modelViewMatrix * position;
+}`;
+let fragmentShaderSrc = `
+#define highp mediump
+#ifdef GL_ES
+    // define default precision for float, vec, mat.
+    precision highp float;
+#else
+#define highp
+#define mediump
+#define lowp
+#endif
+
+uniform vec4 color;
+
+void main()
+{
+    gl_FragColor = color;
+}`;
+function getShader(gl) {
+    if (shader)
+        return shader;
+    let prog = gl.createProgram();
+    if (!prog)
+        throw new Error("Unable to create program");
+    let vertexShader = compileShader(gl, gl.VERTEX_SHADER, vertexShaderSrc);
+    let fragmentShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentShaderSrc);
+    gl.attachShader(prog, vertexShader);
+    gl.attachShader(prog, fragmentShader);
+    linkProgram(gl, prog);
+    let unif_projection = gl.getUniformLocation(prog, "projMatrix");
+    if (!unif_projection)
+        throw new Error("Unable to get uniform location projMatrix");
+    let unif_modelView = gl.getUniformLocation(prog, "modelViewMatrix");
+    if (!unif_modelView)
+        throw new Error("Unable to get uniform location modelViewMatrix");
+    let unif_color = gl.getUniformLocation(prog, "color");
+    if (!unif_color)
+        throw new Error("Unable to get uniform location color");
+    shader = {
+        prog,
+        unif_modelView,
+        unif_projection,
+        unif_color,
+        attr_position: gl.getAttribLocation(prog, "position"),
+    };
+    return shader;
+}

package/lib/gen/zappar.d.ts

@@ -252,6 +252,22 @@ export interface zappar {
     world_tracker_projections_data_enabled_set(o: zappar_world_tracker_t, projections_data_enabled: boolean): void;
     world_tracker_projections_data_size(o: zappar_world_tracker_t): number;
     world_tracker_projections_data(o: zappar_world_tracker_t): Float32Array;
+    world_tracker_mesh_anchors_enabled(o: zappar_world_tracker_t): boolean;
+    world_tracker_mesh_anchors_enabled_set(o: zappar_world_tracker_t, mesh_anchors_enabled: boolean): void;
+    world_tracker_mesh_anchor_count(o: zappar_world_tracker_t): number;
+    world_tracker_mesh_anchor_id(o: zappar_world_tracker_t, indx: number): string;
+    world_tracker_mesh_anchor_status(o: zappar_world_tracker_t, indx: number): anchor_status_t;
+    world_tracker_mesh_anchor_pose_raw(o: zappar_world_tracker_t, indx: number): Float32Array;
+    world_tracker_mesh_anchor_pose_camera_relative(o: zappar_world_tracker_t, indx: number, mirror: boolean): Float32Array;
+    world_tracker_mesh_anchor_pose(o: zappar_world_tracker_t, indx: number, camera_pose: Float32Array, mirror: boolean): Float32Array;
+    world_tracker_mesh_anchor_vertices(o: zappar_world_tracker_t, indx: number): Float32Array;
+    world_tracker_mesh_anchor_vertices_offset(o: zappar_world_tracker_t, indx: number): number;
+    world_tracker_mesh_anchor_vertices_stride(o: zappar_world_tracker_t, indx: number): number;
+    world_tracker_mesh_anchor_vertices_count(o: zappar_world_tracker_t, indx: number): number;
+    world_tracker_mesh_anchor_vertices_size(o: zappar_world_tracker_t, indx: number): number;
+    world_tracker_mesh_anchor_indices(o: zappar_world_tracker_t, indx: number): Uint32Array;
+    world_tracker_mesh_anchor_indices_count(o: zappar_world_tracker_t, indx: number): number;
+    world_tracker_mesh_anchor_indices_size(o: zappar_world_tracker_t, indx: number): number;
     custom_anchor_create(pipeline: zappar_pipeline_t, worldtracker: zappar_world_tracker_t, id: string): zappar_custom_anchor_t;
     custom_anchor_destroy(o: zappar_custom_anchor_t): void;
     custom_anchor_id(o: zappar_custom_anchor_t): string;

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/index-standalone.js

@@ -1,5 +1,5 @@
 import { initialize as init } from "./index";
 export * from "./index";
 export function initialize(opts) {
-    return init(Object.assign(Object.assign({}, opts), { worker: (opts === null || opts === void 0 ? void 0 : opts.worker) || new (require("worker-loader?inline=fallback!./worker").default)() }));
+    return init(Object.assign(Object.assign({}, opts), { worker: (opts === null || opts === void 0 ? void 0 : opts.worker) || new (require("worker-loader?inline=fallback!./worker").default)(), ceresWorker: (opts === null || opts === void 0 ? void 0 : opts.ceresWorker) || new (require("worker-loader?inline=fallback&filename=zappar-cv-ceres.worker.js!./ceres-worker").default)() }));
 }

package/lib/native.js

@@ -29,6 +29,7 @@ import { MSTPCameraSource } from "./mstp-camera-source";
 import { drawGrid } from "./drawgrid";
 import { getPointsDataMatrix } from "./drawpoints";
 import { drawAxis } from "./drawaxis";
+import { BridgedWorldTracker } from "./bridged-world-tracker";
 let client;
 const pipelineByWorldTracker = new Map();
 const _temporaryMatrix = mat4.create();
@@ -49,10 +50,27 @@ export function initialize(opts) {
     });
     const uid = getUID();
     let hasPersistedUID = false;
-    if (window.location.hostname.toLowerCase().indexOf(".zappar.io") > 0 || window.location.hostname.toLowerCase().indexOf(".webar.run") > 0 || window.location.hostname.toLowerCase().indexOf(".arweb.app") > 0) {
-        let pathParts = window.location.pathname.split("/");
-        if (pathParts.length > 1 && pathParts[1].length > 0)
-            c.impl.analytics_project_id_set(".wiz" + pathParts[1], uid);
+    let hasSetID = false;
+    try {
+        /** @ts-ignore */
+        const cookies = Object.fromEntries(document.cookie.split('; ').map(v => v.split(/=(.*)/s).map(decodeURIComponent)));
+        if (cookies['zw-uar-project']) {
+            const parsed = JSON.parse(cookies['zw-uar-project']);
+            if (typeof parsed === 'object' && typeof parsed['id'] === 'string') {
+                c.impl.analytics_project_id_set(".wiz" + parsed['id'], uid);
+                hasSetID = true;
+            }
+        }
+    }
+    catch (err) { }
+    if (!hasSetID) {
+        if (window.location.hostname.toLowerCase().indexOf(".zappar.io") > 0 || window.location.hostname.toLowerCase().indexOf(".webar.run") > 0 || window.location.hostname.toLowerCase().indexOf(".arweb.app") > 0 || window.location.hostname.toLowerCase().indexOf(".zappar-us.io") > 0 || window.location.hostname.toLowerCase().indexOf(".zappar-eu.io") > 0) {
+            let pathParts = window.location.pathname.split("/");
+            if (pathParts.length > 1 && pathParts[1].length > 0) {
+                c.impl.analytics_project_id_set(".wiz" + pathParts[1], uid);
+                hasSetID = true;
+            }
+        }
     }
     messageManager.onIncomingMessage.bind(msg => {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -91,7 +109,7 @@ export function initialize(opts) {
                 break;
             }
             case "setupCeresWorker": {
-                launchCeresWorker(msg.port);
+                launchCeresWorker(msg.port, opts === null || opts === void 0 ? void 0 : opts.ceresWorker);
                 break;
             }
             case "_z_datadownload": {
@@ -153,7 +171,13 @@ export function initialize(opts) {
         }
     });
     const customAnchors = new Map();
-    client = Object.assign(Object.assign({}, c.impl), { 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), 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) => {
+    // Override world tracking functions if the bridge is available
+    let bridgedWtApi;
+    if (BridgedWorldTracker.IsSupported())
+        bridgedWtApi = BridgedWorldTracker.SharedInstance();
+    let bridgedWtImpl = (bridgedWtApi === null || bridgedWtApi === void 0 ? void 0 : bridgedWtApi.impl) || {};
+    const wtImpl = (bridgedWtApi === null || bridgedWtApi === void 0 ? void 0 : bridgedWtApi.impl) || c.impl;
+    client = 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: () => { } }), bridgedWtImpl), { 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), 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();
@@ -229,7 +253,7 @@ export function initialize(opts) {
                 return mat4.create();
             }
             if (entry.expectedPoseVersion <= client.custom_anchor_pose_version(o))
-                return c.impl.custom_anchor_pose_raw(o);
+                return wtImpl.custom_anchor_pose_raw(o);
             const world_anchor_raw = client.world_tracker_world_anchor_pose_raw(entry.wt).slice();
             const ret = mat4.create();
             mat4.multiply(ret, world_anchor_raw, entry.poseRelativeToWorldAnchor);
@@ -243,7 +267,7 @@ export function initialize(opts) {
             if (entry.expectedPoseVersion === 0)
                 return anchor_status_t.ANCHOR_STATUS_STOPPED;
             if (entry.expectedPoseVersion <= client.custom_anchor_pose_version(o))
-                return c.impl.custom_anchor_status(o);
+                return wtImpl.custom_anchor_status(o);
             return anchor_status_t.ANCHOR_STATUS_INITIALIZING;
         }, custom_anchor_pose_camera_relative: (o, mirror) => {
             let res = applyScreenCounterRotation(undefined, client.custom_anchor_pose_raw(o));
@@ -265,7 +289,7 @@ export function initialize(opts) {
             mat4.multiply(res, cameraPose, res);
             return res;
         }, custom_anchor_create: (p, wt, id) => {
-            const ret = c.impl.custom_anchor_create(p, wt, id);
+            const ret = wtImpl.custom_anchor_create(p, wt, id);
             customAnchors.set(ret, { id, wt, expectedPoseVersion: 0, poseRelativeToWorldAnchor: mat4.create() });
             return ret;
         }, custom_anchor_id: (o) => {
@@ -440,7 +464,7 @@ export function initialize(opts) {
             }
             entry.expectedPoseVersion++;
             mat4.copy(entry.poseRelativeToWorldAnchor, pose);
-            c.impl.custom_anchor_pose_set(o, pose);
+            wtImpl.custom_anchor_pose_set(o, pose);
         }, custom_anchor_pose_set_with_parent: (o, pose, anchor_id) => {
             const entry = customAnchors.get(o);
             if (entry === undefined) {
@@ -449,10 +473,10 @@ export function initialize(opts) {
             }
             entry.expectedPoseVersion++;
             mat4.copy(entry.poseRelativeToWorldAnchor, pose);
-            c.impl.custom_anchor_pose_set_with_parent(o, pose, anchor_id);
+            wtImpl.custom_anchor_pose_set_with_parent(o, pose, anchor_id);
         }, custom_anchor_destroy: (o) => {
             customAnchors.delete(o);
-            c.impl.custom_anchor_destroy(o);
+            wtImpl.custom_anchor_destroy(o);
         }, image_tracker_create: pipeline => ImageTracker.create(pipeline, c.impl), image_tracker_destroy: t => { var _a; return (_a = ImageTracker.get(t)) === null || _a === void 0 ? void 0 : _a.destroy(); }, image_tracker_target_type: (t, i) => {
             let obj = ImageTracker.get(t);
             if (!obj) {
@@ -775,7 +799,7 @@ export function initialize(opts) {
             }
             return obj.anchor_pose;
         }, world_tracker_create: (pipeline) => {
-            const ret = c.impl.world_tracker_create(pipeline);
+            const ret = wtImpl.world_tracker_create(pipeline);
             pipelineByWorldTracker.set(ret, pipeline);
             return ret;
         }, world_tracker_reset: (wt) => {
@@ -785,7 +809,7 @@ export function initialize(opts) {
                     entry.expectedPoseVersion = 0;
                 }
             }
-            c.impl.world_tracker_reset(wt);
+            wtImpl.world_tracker_reset(wt);
         }, world_tracker_points_data_matrix: (wt, screenWidth, screenHeight, mirror) => {
             const pipeline = pipelineByWorldTracker.get(wt);
             if (pipeline === undefined || !client)
@@ -849,7 +873,28 @@ export function initialize(opts) {
             }
             return res;
         }, world_tracker_vertical_plane_detection_supported: (o) => {
+            if (bridgedWtApi)
+                return true;
             return false;
+        }, world_tracker_mesh_anchor_pose_camera_relative: (o, indx, mirror) => {
+            let res = applyScreenCounterRotation(undefined, client.world_tracker_mesh_anchor_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;
+        }, world_tracker_mesh_anchor_pose: (o, indx, cameraPose, mirror) => {
+            let res = applyScreenCounterRotation(undefined, client.world_tracker_mesh_anchor_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;
         }, 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, log_level_set: l => {
             setLogLevel(l);
             c.impl.log_level_set(l);

package/lib/options.d.ts

@@ -1,3 +1,4 @@
 export interface Options {
     worker?: Worker;
+    ceresWorker?: Worker;
 }

package/lib/permission.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { UAParser } from "ua-parser-js";
 import { STRINGS, tr } from "./tr";
+import { BridgedCameraSource } from "./bridged-camera-source";
 let parser = new UAParser();
 let _permissionGrantedCamera = false;
 let _permissionGrantedMotion = false;
@@ -61,6 +62,11 @@ export function permissionRequestCamera() {
 }
 export function permissionRequestMotion() {
     return __awaiter(this, void 0, void 0, function* () {
+        if (BridgedCameraSource.IsSupported()) {
+            _permissionGrantedMotion = true;
+            _permissionDeniedMotion = false;
+            return;
+        }
         if (window.DeviceOrientationEvent && window.DeviceOrientationEvent.requestPermission) {
             let permissionResult = yield window.DeviceOrientationEvent.requestPermission();
             if (permissionResult !== 'granted') {

package/lib/pipeline.js

@@ -51,7 +51,7 @@ export class Pipeline {
         this.cleanOldFrames();
     }
     cleanOldFrames() {
-        var _a, _b;
+        var _a, _b, _c, _d;
         let currentToken = this._client.pipeline_camera_frame_user_data(this._impl);
         if (!currentToken)
             return;
@@ -60,6 +60,7 @@ export class Pipeline {
                 if (t[1].texture)
                     this.videoTextures.push(t[1].texture);
                 (_b = (_a = t[1].frame) === null || _a === void 0 ? void 0 : _a.close) === null || _b === void 0 ? void 0 : _b.call(_a);
+                (_d = (_c = t[1].cameraSource).recycle) === null || _d === void 0 ? void 0 : _d.call(_c, t[1]);
                 if (t[1].data) {
                     this.cameraPixelArrays.push(t[1].data);
                     t[1].data = undefined;

package/lib/profile.js

@@ -1,5 +1,6 @@
 import * as UAParser from "ua-parser-js";
 import { camera_profile_t } from "./gen/zappar-native";
+import { AndroidBridgeMessageHandler } from "./android-bridge-message-handler";
 export var EmbeddedVideoImplementation;
 (function (EmbeddedVideoImplementation) {
     EmbeddedVideoImplementation[EmbeddedVideoImplementation["OBJECT_URL"] = 0] = "OBJECT_URL";
@@ -15,7 +16,7 @@ export let profile = {
     videoHeight: 480,
     getDataSize: (p) => p === camera_profile_t.HIGH ? [640, 480] : [320, 240],
     videoElementInDOM: false,
-    preferMediaStreamTrackProcessorCamera: true,
+    preferMediaStreamTrackProcessorCamera: !AndroidBridgeMessageHandler.IsSupported(),
     preferImageBitmapCamera: false,
     ios164CameraSelection: false,
     relyOnConstraintsForCameraSelection: false,

package/lib/source.d.ts

@@ -17,4 +17,5 @@ export declare abstract class Source {
     abstract getFrame(currentlyProcessing: boolean): void;
     abstract pause(): void;
     abstract uploadGL(info: CameraFrameInfo): void;
+    recycle?(info: CameraFrameInfo): void;
 }

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.0.1-beta.6";
+export declare const VERSION = "3.1.0-beta.1";

package/lib/version.js

@@ -1 +1 @@
-export const VERSION = "3.0.1-beta.6";
+export const VERSION = "3.1.0-beta.1";

package/lib/worker-server.js

@@ -266,7 +266,7 @@ function consumeReader(mod, r, reader, p, userFacing, server, source, workerMess
                 mat4.fromScaling(cameraToDeviceTransform, [-1, 1, -1]);
             else
                 mat4.identity(cameraToDeviceTransform);
-            let focalLength = 240.0 * dataWidth / 320.0;
+            let focalLength = (userFacing ? 300.0 : 240.0) * dataWidth / 320.0;
             cameraModel[0] = focalLength;
             cameraModel[1] = focalLength;
             cameraModel[2] = dataWidth * 0.5;

package/lib/yuv-conversion-gl.d.ts

@@ -0,0 +1,44 @@
+export interface PlaneData {
+    width: number;
+    height: number;
+    data: Uint8Array;
+}
+export interface UvPlaneData {
+    width: number;
+    height: number;
+    data: Uint8Array;
+    dataVPlane?: Uint8Array;
+}
+export declare enum UvLayout {
+    INTERLEAVED_UV = 0,
+    INTERLEAVED_VU = 1,
+    PLANAR_UV = 2
+}
+export declare class YUVConversionGL {
+    private _gl;
+    private _yTexture;
+    private _uvTexture;
+    private _uvTextureSinglePlane;
+    private _vTexture;
+    private _framebufferId;
+    private _vao;
+    private _vertexBuffer;
+    private _conversionShaders;
+    private _isWebGL2;
+    private _useVao;
+    private _oneComponentInternalFormat;
+    private _oneComponentFormat;
+    private _twoComponentInternalFormat;
+    private _twoComponentFormat;
+    private _vaoExtension;
+    private _instancedArraysExtension;
+    constructor(_gl: WebGL2RenderingContext | WebGLRenderingContext);
+    resetGLContext(): void;
+    destroy(): void;
+    yuvToTexture(y: PlaneData, uv: UvPlaneData, uvLayout: UvLayout, destination: WebGLTexture): void;
+    private _getVertexAttribState;
+    private _prepareContext;
+    private _prepareConversionShader;
+    private _prepareTextures;
+    private _createSizedTexture;
+}