@zappar/zappar-cv 0.4.0-beta.9 → 2.0.0-beta.0

package/lib/gl-state-manager.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GLStateManager = void 0;
 const managers = new Map();
-class GLStateManager {
+export class GLStateManager {
     constructor(_gl) {
         this._gl = _gl;
         this._viewports = [];
@@ -32,4 +29,3 @@ class GLStateManager {
         }
     }
 }
-exports.GLStateManager = GLStateManager;

package/lib/html-element-source.js

@@ -1,15 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HTMLElementSource = void 0;
-const pipeline_1 = require("./pipeline");
-const source_1 = require("./source");
-const profile_1 = require("./profile");
-const gl_matrix_1 = require("gl-matrix");
-const loglevel_1 = require("./loglevel");
-const image_process_gl_1 = require("./image-process-gl");
+import { Pipeline } from "./pipeline";
+import { Source } from "./source";
+import { profile } from "./profile";
+import { mat4 } from "gl-matrix";
+import { zcout } from "./loglevel";
+import { ImageProcessGL } from "./image-process-gl";
 let latest = 1;
 let byId = new Map();
-class HTMLElementSource extends source_1.Source {
+export class HTMLElementSource extends Source {
     constructor(_video, _pipeline) {
         super();
         this._video = _video;
@@ -19,10 +16,10 @@ class HTMLElementSource extends source_1.Source {
         this._isUserFacing = false;
         this._cameraToScreenRotation = 0;
         this._isUploadFrame = true;
-        this._cameraToDeviceTransform = gl_matrix_1.mat4.create();
-        this._cameraToDeviceTransformUserFacing = gl_matrix_1.mat4.create();
+        this._cameraToDeviceTransform = mat4.create();
+        this._cameraToDeviceTransformUserFacing = mat4.create();
         this._cameraModel = new Float32Array([300, 300, 160, 120, 0, 0]);
-        gl_matrix_1.mat4.fromScaling(this._cameraToDeviceTransformUserFacing, [-1, 1, -1]);
+        mat4.fromScaling(this._cameraToDeviceTransformUserFacing, [-1, 1, -1]);
         let video = this._video;
         if (this._video instanceof HTMLVideoElement) {
             video.addEventListener("loadedmetadata", () => { this._hadFrames = true; });
@@ -31,14 +28,14 @@ class HTMLElementSource extends source_1.Source {
             this._hadFrames = true;
         }
         this._resetGLContext = this._resetGLContext.bind(this);
-        let p = pipeline_1.Pipeline.get(this._pipeline);
+        let p = Pipeline.get(this._pipeline);
         if (p)
             p.onGLContextReset.bind(this._resetGLContext);
     }
     static createVideoElementSource(p, element) {
         let ret = (latest++);
         byId.set(ret, new HTMLElementSource(element, p));
-        loglevel_1.zcout("html_element_source_t initialized");
+        zcout("html_element_source_t initialized");
         return ret;
     }
     static getVideoElementSource(m) {
@@ -50,7 +47,7 @@ class HTMLElementSource extends source_1.Source {
         (_b = (_a = this._imageProcessor) === null || _a === void 0 ? void 0 : _a.resetGLContext) === null || _b === void 0 ? void 0 : _b.call(_a);
     }
     destroy() {
-        let p = pipeline_1.Pipeline.get(this._pipeline);
+        let p = Pipeline.get(this._pipeline);
         if (p)
             p.onGLContextReset.unbind(this._resetGLContext);
         this.pause();
@@ -58,7 +55,7 @@ class HTMLElementSource extends source_1.Source {
     }
     pause() {
         this._isPaused = true;
-        let p = pipeline_1.Pipeline.get(this._pipeline);
+        let p = Pipeline.get(this._pipeline);
         if (p && p.currentCameraSource === this)
             p.currentCameraSource = undefined;
     }
@@ -70,14 +67,14 @@ class HTMLElementSource extends source_1.Source {
                 this._hadFrames = false;
         }
         this._isPaused = false;
-        let p = pipeline_1.Pipeline.get(this._pipeline);
+        let p = Pipeline.get(this._pipeline);
         if (p && p.currentCameraSource !== this) {
             (_a = p.currentCameraSource) === null || _a === void 0 ? void 0 : _a.pause();
             p.currentCameraSource = this;
         }
     }
     getFrame(currentlyProcessing) {
-        let pipeline = pipeline_1.Pipeline.get(this._pipeline);
+        let pipeline = Pipeline.get(this._pipeline);
         if (!pipeline)
             return;
         let gl = pipeline.glContext;
@@ -100,11 +97,11 @@ class HTMLElementSource extends source_1.Source {
         return;
     }
     _processFrame(gl, rotation, currentlyProcessing) {
-        let pipeline = pipeline_1.Pipeline.get(this._pipeline);
+        let pipeline = Pipeline.get(this._pipeline);
         if (!pipeline)
             return undefined;
         if (!this._imageProcessor)
-            this._imageProcessor = new image_process_gl_1.ImageProcessGL(gl);
+            this._imageProcessor = new ImageProcessGL(gl);
         if (this._isUploadFrame) {
             if (!this._currentVideoTexture) {
                 this._currentVideoTexture = pipeline.getVideoTexture();
@@ -118,7 +115,7 @@ class HTMLElementSource extends source_1.Source {
         if (currentlyProcessing || !this._currentVideoTexture)
             return undefined;
         this._isUploadFrame = !this._isUploadFrame;
-        let greySize = profile_1.profile.dataWidth * profile_1.profile.dataHeight;
+        let greySize = profile.dataWidth * profile.dataHeight;
         let pixels = pipeline.cameraPixelArrays.pop();
         while (pixels) {
             if (pixels.byteLength === greySize)
@@ -130,15 +127,14 @@ class HTMLElementSource extends source_1.Source {
         }
         let tex = this._currentVideoTexture;
         this._currentVideoTexture = undefined;
-        let focalLength = 300.0 * profile_1.profile.dataWidth / 320.0;
+        let focalLength = 300.0 * profile.dataWidth / 320.0;
         this._cameraModel[0] = focalLength;
         this._cameraModel[1] = focalLength;
-        this._cameraModel[2] = profile_1.profile.dataWidth * 0.5;
-        this._cameraModel[3] = profile_1.profile.dataHeight * 0.5;
-        return Object.assign(Object.assign({}, this._imageProcessor.readFrame(tex, pixels)), { cameraModel: this._cameraModel, cameraSource: this, cameraToDevice: this._isUserFacing ? this._cameraToDeviceTransformUserFacing : this._cameraToDeviceTransform });
+        this._cameraModel[2] = profile.dataWidth * 0.5;
+        this._cameraModel[3] = profile.dataHeight * 0.5;
+        return Object.assign(Object.assign({}, this._imageProcessor.readFrame(tex, pixels)), { cameraModel: this._cameraModel, cameraSource: this, cameraToDevice: (this._isUserFacing ? this._cameraToDeviceTransformUserFacing : this._cameraToDeviceTransform) });
     }
     uploadGL() {
         // No-op as already uploaded
     }
 }
-exports.HTMLElementSource = HTMLElementSource;

package/lib/image-process-gl.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImageProcessGL = void 0;
-const gl_matrix_1 = require("gl-matrix");
-const gl_state_manager_1 = require("./gl-state-manager");
-const profile_1 = require("./profile");
-const shader_1 = require("./shader");
-class ImageProcessGL {
+import { mat4 } from "gl-matrix";
+import { GLStateManager } from "./gl-state-manager";
+import { profile } from "./profile";
+import { compileShader, linkProgram } from "./shader";
+export class ImageProcessGL {
     constructor(_gl) {
         this._gl = _gl;
         this._isPaused = true;
@@ -15,7 +12,7 @@ class ImageProcessGL {
         this._isUploadFrame = true;
         this._computedTransformRotation = -1;
         this._computedFrontCameraRotation = false;
-        this._cameraUvTransform = gl_matrix_1.mat4.create();
+        this._cameraUvTransform = mat4.create();
         this._framebufferWidth = 0;
         this._framebufferHeight = 0;
         this._framebufferId = null;
@@ -33,7 +30,7 @@ class ImageProcessGL {
     }
     uploadFrame(texture, img, rotation, fc) {
         let gl = this._gl;
-        const glStateManager = gl_state_manager_1.GLStateManager.get(gl);
+        const glStateManager = GLStateManager.get(gl);
         glStateManager.push();
         const reenableScissorTest = gl.isEnabled(gl.SCISSOR_TEST);
         const reenableDepthTest = gl.isEnabled(gl.DEPTH_TEST);
@@ -71,7 +68,7 @@ class ImageProcessGL {
         if (videoHeight > videoWidth)
             videoHeight = [videoWidth, videoWidth = videoHeight][0];
         this._updateTransforms(rotation, fc);
-        let framebuffer = this._getFramebuffer(gl, profile_1.profile.dataWidth / 4, profile_1.profile.dataHeight);
+        let framebuffer = this._getFramebuffer(gl, profile.dataWidth / 4, profile.dataHeight);
         let vbo = this._getVertexBuffer(gl);
         let ibo = this._getIndexBuffer(gl);
         let shader = this._getGreyscaleShader(gl);
@@ -80,11 +77,15 @@ class ImageProcessGL {
         const previousVertexAttribNormalized = gl.getVertexAttrib(shader.aVertexPositionLoc, gl.VERTEX_ATTRIB_ARRAY_NORMALIZED);
         const previousVertexAttribStride = gl.getVertexAttrib(shader.aVertexPositionLoc, gl.VERTEX_ATTRIB_ARRAY_STRIDE);
         const previousVertexAttribOffset = gl.getVertexAttribOffset(shader.aVertexPositionLoc, gl.VERTEX_ATTRIB_ARRAY_POINTER);
+        const previousVertexAttribEnabled = gl.getVertexAttrib(shader.aVertexPositionLoc, gl.VERTEX_ATTRIB_ARRAY_ENABLED);
+        const previousVertexAttribBufferBinding = gl.getVertexAttrib(shader.aVertexPositionLoc, gl.VERTEX_ATTRIB_ARRAY_BUFFER_BINDING);
         const previousTextureAttribSize = gl.getVertexAttrib(shader.aTextureCoordLoc, gl.VERTEX_ATTRIB_ARRAY_SIZE);
         const previousTextureAttribType = gl.getVertexAttrib(shader.aTextureCoordLoc, gl.VERTEX_ATTRIB_ARRAY_TYPE);
         const previousTextureAttribNormalized = gl.getVertexAttrib(shader.aTextureCoordLoc, gl.VERTEX_ATTRIB_ARRAY_NORMALIZED);
         const previousTextureAttribStride = gl.getVertexAttrib(shader.aTextureCoordLoc, gl.VERTEX_ATTRIB_ARRAY_STRIDE);
         const previousTextureAttribOffset = gl.getVertexAttribOffset(shader.aTextureCoordLoc, gl.VERTEX_ATTRIB_ARRAY_POINTER);
+        const previousTextureAttribEnabled = gl.getVertexAttrib(shader.aTextureCoordLoc, gl.VERTEX_ATTRIB_ARRAY_ENABLED);
+        const previousTextureAttribBufferBinding = gl.getVertexAttrib(shader.aTextureCoordLoc, gl.VERTEX_ATTRIB_ARRAY_BUFFER_BINDING);
         // Rendering to the greyscale conversion buffer - bind the framebuffer
         gl.bindFramebuffer(gl.FRAMEBUFFER, framebuffer);
         gl.viewport(0, 0, this._framebufferWidth, this._framebufferHeight);
@@ -101,7 +102,7 @@ class ImageProcessGL {
         // Tell WebGL to use our program when drawing
         gl.useProgram(shader.program);
         // Specify greyscale width for the correct offsets, and the uv transform
-        gl.uniform1f(shader.uTexWidthLoc, profile_1.profile.dataWidth);
+        gl.uniform1f(shader.uTexWidthLoc, profile.dataWidth);
         gl.uniformMatrix4fv(shader.uUvTransformLoc, false, this._cameraUvTransform);
         gl.activeTexture(gl.TEXTURE0);
         // Bind the texture to texture unit 0
@@ -110,15 +111,22 @@ class ImageProcessGL {
         gl.uniform1i(shader.uSamplerLoc, 0);
         // Do the drawing...
         gl.drawElements(gl.TRIANGLES, 6, gl.UNSIGNED_SHORT, 0);
+        gl.bindBuffer(gl.ARRAY_BUFFER, previousVertexAttribBufferBinding);
         gl.vertexAttribPointer(shader.aVertexPositionLoc, previousVertexAttribSize, previousVertexAttribType, previousVertexAttribNormalized, previousVertexAttribStride, previousVertexAttribOffset);
+        gl.bindBuffer(gl.ARRAY_BUFFER, previousTextureAttribBufferBinding);
         gl.vertexAttribPointer(shader.aTextureCoordLoc, previousTextureAttribSize, previousTextureAttribType, previousTextureAttribNormalized, previousTextureAttribStride, previousTextureAttribOffset);
-        gl.bindFramebuffer(gl.FRAMEBUFFER, previousBoundFramebuffer);
         gl.bindBuffer(gl.ARRAY_BUFFER, previousBoundArrayBuffer);
         gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, previousBoundElementArrayBuffer);
+        if (!previousVertexAttribEnabled)
+            gl.disableVertexAttribArray(shader.aVertexPositionLoc);
+        if (!previousTextureAttribEnabled)
+            gl.disableVertexAttribArray(shader.aTextureCoordLoc);
+        gl.bindFramebuffer(gl.FRAMEBUFFER, previousBoundFramebuffer);
         gl.useProgram(previousProgram);
         gl.bindTexture(gl.TEXTURE_2D, previousBoundTexture);
         gl.activeTexture(previousActiveTexture);
         gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, previousUnpackFlip);
+        glStateManager.pop();
         if (reenableBlend)
             gl.enable(gl.BLEND);
         if (reenableCullFace)
@@ -131,8 +139,8 @@ class ImageProcessGL {
     readFrame(texture, pixels) {
         let gl = this._gl;
         let pixelsView = new Uint8Array(pixels);
-        let framebuffer = this._getFramebuffer(gl, profile_1.profile.dataWidth / 4, profile_1.profile.dataHeight);
         const previousBoundFramebuffer = gl.getParameter(gl.FRAMEBUFFER_BINDING);
+        let framebuffer = this._getFramebuffer(gl, profile.dataWidth / 4, profile.dataHeight);
         gl.bindFramebuffer(gl.FRAMEBUFFER, framebuffer);
         gl.readPixels(0, 0, this._framebufferWidth, this._framebufferHeight, gl.RGBA, gl.UNSIGNED_BYTE, pixelsView);
         gl.bindFramebuffer(gl.FRAMEBUFFER, previousBoundFramebuffer);
@@ -140,8 +148,8 @@ class ImageProcessGL {
             uvTransform: this._cameraUvTransform,
             data: pixels,
             texture,
-            dataWidth: profile_1.profile.dataWidth,
-            dataHeight: profile_1.profile.dataHeight,
+            dataWidth: profile.dataWidth,
+            dataHeight: profile.dataHeight,
             userFacing: this._computedFrontCameraRotation
         };
     }
@@ -179,6 +187,7 @@ class ImageProcessGL {
         if (!this._renderTexture)
             throw new Error("Unable to create render texture");
         gl.activeTexture(gl.TEXTURE0);
+        const previousBoundTexture = gl.getParameter(gl.TEXTURE_BINDING_2D);
         gl.bindTexture(gl.TEXTURE_2D, this._renderTexture);
         gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, fbWidth, fbHeight, 0, gl.RGBA, gl.UNSIGNED_BYTE, null);
         gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
@@ -190,7 +199,7 @@ class ImageProcessGL {
             throw new Error("Framebuffer not complete: " + fbStatus.toString());
         this._framebufferWidth = fbWidth;
         this._framebufferHeight = fbHeight;
-        gl.bindTexture(gl.TEXTURE_2D, null);
+        gl.bindTexture(gl.TEXTURE_2D, previousBoundTexture);
         gl.bindFramebuffer(gl.FRAMEBUFFER, null);
         return this._framebufferId;
     }
@@ -225,11 +234,11 @@ class ImageProcessGL {
         let prog = gl.createProgram();
         if (!prog)
             throw new Error("Unable to create program");
-        let vertexShader = shader_1.compileShader(gl, gl.VERTEX_SHADER, greyscaleVsSource);
-        let fragmentShader = shader_1.compileShader(gl, gl.FRAGMENT_SHADER, greyscaleFsSource);
+        let vertexShader = compileShader(gl, gl.VERTEX_SHADER, greyscaleVsSource);
+        let fragmentShader = compileShader(gl, gl.FRAGMENT_SHADER, greyscaleFsSource);
         gl.attachShader(prog, vertexShader);
         gl.attachShader(prog, fragmentShader);
-        shader_1.linkProgram(gl, prog);
+        linkProgram(gl, prog);
         let uTexWidthLoc = gl.getUniformLocation(prog, "uTexWidth");
         if (!uTexWidthLoc)
             throw new Error("Unable to get uniform location uTexWidth");
@@ -250,7 +259,6 @@ class ImageProcessGL {
         return this._greyscaleShader;
     }
 }
-exports.ImageProcessGL = ImageProcessGL;
 let greyscaleVsSource = `
     attribute vec4 aVertexPosition;
     attribute vec2 aTextureCoord;

package/lib/imagebitmap-camera-source.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,16 +7,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImageBitmapCameraSource = void 0;
-const profile_1 = require("./profile");
-const pipeline_1 = require("./pipeline");
-const source_1 = require("./source");
-const cameramodel_1 = require("./cameramodel");
-const loglevel_1 = require("./loglevel");
-const camera_source_map_1 = require("./camera-source-map");
-const gl_matrix_1 = require("gl-matrix");
-class ImageBitmapCameraSource extends source_1.Source {
+import { profile } from "./profile";
+import { Pipeline } from "./pipeline";
+import { Source } from "./source";
+import { cameraRotationForScreenOrientation } from "./cameramodel";
+import { zcout } from "./loglevel";
+import { deleteCameraSource } from "./camera-source-map";
+import { mat4 } from "gl-matrix";
+export class ImageBitmapCameraSource extends Source {
     constructor(_impl, _pipeline, _deviceId) {
         super();
         this._impl = _impl;
@@ -32,12 +29,12 @@ class ImageBitmapCameraSource extends source_1.Source {
         this._context = this._canvas.getContext("2d");
         this._lastFrameTime = -1;
         this._video = document.createElement("video");
-        this._cameraToDeviceTransform = gl_matrix_1.mat4.create();
-        this._cameraToDeviceTransformUserFacing = gl_matrix_1.mat4.create();
+        this._cameraToDeviceTransform = mat4.create();
+        this._cameraToDeviceTransformUserFacing = mat4.create();
         this._cameraModel = new Float32Array([300, 300, 160, 120, 0, 0]);
         this._hasStartedOrientation = false;
         this._deviceMotionListener = (ev) => {
-            let pipeline = pipeline_1.Pipeline.get(this._pipeline);
+            let pipeline = Pipeline.get(this._pipeline);
             if (!pipeline)
                 return;
             let timeStamp = (ev.timeStamp !== undefined && ev.timeStamp !== null) ? ev.timeStamp : performance.now();
@@ -45,7 +42,7 @@ class ImageBitmapCameraSource extends source_1.Source {
                 ev.accelerationIncludingGravity.x !== null &&
                 ev.accelerationIncludingGravity.y !== null &&
                 ev.accelerationIncludingGravity.z !== null) {
-                pipeline.motionAccelerometerSubmit(timeStamp, ev.accelerationIncludingGravity.x * profile_1.profile.deviceMotionMutliplier, ev.accelerationIncludingGravity.y * profile_1.profile.deviceMotionMutliplier, ev.accelerationIncludingGravity.z * profile_1.profile.deviceMotionMutliplier);
+                pipeline.motionAccelerometerSubmit(timeStamp, ev.accelerationIncludingGravity.x * profile.deviceMotionMutliplier, ev.accelerationIncludingGravity.y * profile.deviceMotionMutliplier, ev.accelerationIncludingGravity.z * profile.deviceMotionMutliplier);
             }
             if (ev.rotationRate !== null &&
                 ev.rotationRate.alpha !== null &&
@@ -58,12 +55,12 @@ class ImageBitmapCameraSource extends source_1.Source {
                 this._startDeviceOrientation();
             }
         };
-        loglevel_1.zcout("Using ImageBitmap camera source");
-        gl_matrix_1.mat4.fromScaling(this._cameraToDeviceTransformUserFacing, [-1, 1, -1]);
+        zcout("Using ImageBitmap camera source");
+        mat4.fromScaling(this._cameraToDeviceTransformUserFacing, [-1, 1, -1]);
         this._video.muted = true;
         this._video.setAttribute('playsinline', '');
         this._video.setAttribute('webkit-playsinline', '');
-        if (profile_1.profile.videoElementInDOM) {
+        if (profile.videoElementInDOM) {
             this._video.style.width = "0px";
             this._video.style.height = "0px";
             document.body.appendChild(this._video);
@@ -72,7 +69,7 @@ class ImageBitmapCameraSource extends source_1.Source {
     }
     destroy() {
         this.pause();
-        camera_source_map_1.deleteCameraSource(this._impl);
+        deleteCameraSource(this._impl);
     }
     _stop() {
         if (!this._currentStream)
@@ -83,7 +80,7 @@ class ImageBitmapCameraSource extends source_1.Source {
     }
     pause() {
         this._isPaused = true;
-        let p = pipeline_1.Pipeline.get(this._pipeline);
+        let p = Pipeline.get(this._pipeline);
         if (p && p.currentCameraSource === this)
             p.currentCameraSource = undefined;
         this._stopDeviceMotion();
@@ -91,7 +88,7 @@ class ImageBitmapCameraSource extends source_1.Source {
     }
     start() {
         var _a;
-        let p = pipeline_1.Pipeline.get(this._pipeline);
+        let p = Pipeline.get(this._pipeline);
         if (p && p.currentCameraSource !== this) {
             (_a = p.currentCameraSource) === null || _a === void 0 ? void 0 : _a.pause();
             p.currentCameraSource = this;
@@ -116,9 +113,9 @@ class ImageBitmapCameraSource extends source_1.Source {
                 audio: false,
                 video: {
                     facingMode: facingMode,
-                    width: profile_1.profile.videoWidth,
-                    height: profile_1.profile.videoHeight,
-                    frameRate: profile_1.profile.requestHighFrameRate ? 60 : undefined,
+                    width: profile.videoWidth,
+                    height: profile.videoHeight,
+                    frameRate: profile.requestHighFrameRate ? 60 : undefined,
                     deviceId: deviceId
                 }
             };
@@ -146,7 +143,7 @@ class ImageBitmapCameraSource extends source_1.Source {
                 return constraints;
             }
             if (typeof constraints.video === "object") {
-                loglevel_1.zcout("choosing device ID", devices[devices.length - 1].deviceId);
+                zcout("choosing device ID", devices[devices.length - 1].deviceId);
                 constraints.video.deviceId = devices[devices.length - 1].deviceId;
             }
             return constraints;
@@ -170,15 +167,15 @@ class ImageBitmapCameraSource extends source_1.Source {
             this._canvas.height = this._video.videoHeight;
         this._context.drawImage(this._video, 0, 0);
         const imageBitmap = this._canvas.transferToImageBitmap();
-        let rotation = cameramodel_1.cameraRotationForScreenOrientation(false);
-        let pipeline = pipeline_1.Pipeline.get(this._pipeline);
+        let rotation = cameraRotationForScreenOrientation(false);
+        let pipeline = Pipeline.get(this._pipeline);
         if (!pipeline)
             return;
-        let focalLength = 300.0 * profile_1.profile.dataWidth / 320.0;
+        let focalLength = 300.0 * profile.dataWidth / 320.0;
         this._cameraModel[0] = focalLength;
         this._cameraModel[1] = focalLength;
-        this._cameraModel[2] = profile_1.profile.dataWidth * 0.5;
-        this._cameraModel[3] = profile_1.profile.dataHeight * 0.5;
+        this._cameraModel[2] = profile.dataWidth * 0.5;
+        this._cameraModel[3] = profile.dataHeight * 0.5;
         let token = pipeline.registerToken({
             dataWidth: this._canvas.width,
             dataHeight: this._canvas.height,
@@ -188,7 +185,7 @@ class ImageBitmapCameraSource extends source_1.Source {
             cameraModel: this._cameraModel.slice(),
             cameraToDevice: this._isUserFacing ? this._cameraToDeviceTransformUserFacing : this._cameraToDeviceTransform
         });
-        (_b = (_a = pipeline_1.Pipeline.get(this._pipeline)) === null || _a === void 0 ? void 0 : _a.sendImageBitmapToWorker) === null || _b === void 0 ? void 0 : _b.call(_a, imageBitmap, rotation, this._isUserFacing, token, this._cameraModel, this._isUserFacing ? this._cameraToDeviceTransformUserFacing : this._cameraToDeviceTransform);
+        (_b = (_a = Pipeline.get(this._pipeline)) === null || _a === void 0 ? void 0 : _a.sendImageBitmapToWorker) === null || _b === void 0 ? void 0 : _b.call(_a, imageBitmap, rotation, this._isUserFacing, token, this._cameraModel, this._isUserFacing ? this._cameraToDeviceTransformUserFacing : this._cameraToDeviceTransform);
         return;
     }
     _getUserMedia() {
@@ -236,7 +233,7 @@ class ImageBitmapCameraSource extends source_1.Source {
             return;
         this._hasStartedOrientation = true;
         window.addEventListener("deviceorientation", (ev) => {
-            let pipeline = pipeline_1.Pipeline.get(this._pipeline);
+            let pipeline = Pipeline.get(this._pipeline);
             if (!pipeline)
                 return;
             let timeStamp = (ev.timeStamp !== undefined && ev.timeStamp !== null) ? ev.timeStamp : performance.now();
@@ -252,7 +249,7 @@ class ImageBitmapCameraSource extends source_1.Source {
         window.removeEventListener("devicemotion", this._deviceMotionListener);
     }
     uploadGL(info) {
-        const pipeline = pipeline_1.Pipeline.get(this._pipeline);
+        const pipeline = Pipeline.get(this._pipeline);
         const gl = pipeline === null || pipeline === void 0 ? void 0 : pipeline.glContext;
         if (!info ||
             info.texture ||
@@ -272,6 +269,5 @@ class ImageBitmapCameraSource extends source_1.Source {
         delete info.frame;
     }
 }
-exports.ImageBitmapCameraSource = ImageBitmapCameraSource;
 ImageBitmapCameraSource.USER_DEFAULT_DEVICE_ID = "Simulated User Default Device ID: a908df7f-5661-4d20-b227-a1c15d2fdb4b";
 ImageBitmapCameraSource.DEFAULT_DEVICE_ID = "Simulated Default Device ID: a908df7f-5661-4d20-b227-a1c15d2fdb4b";

package/lib/imagetracker.d.ts

@@ -0,0 +1,28 @@
+import { zappar_image_tracker_t, zappar_pipeline_t } from "./gen/zappar";
+import { zappar_cwrap } from "./gen/zappar-native";
+interface PreviewInfo {
+    compressed: Uint8Array;
+    mimeType: string;
+}
+interface ParsedTargetInfo {
+    preview?: PreviewInfo;
+    physicalScaleFactor: number;
+    topRadius: number;
+    bottomRadius: number;
+    sideLength: number;
+}
+export declare class ImageTracker {
+    private _client;
+    private _impl;
+    private _targets;
+    static create(pipeline: zappar_pipeline_t, client: zappar_cwrap): zappar_image_tracker_t;
+    static get(p: zappar_image_tracker_t): ImageTracker | undefined;
+    private constructor();
+    destroy(): void;
+    loadFromMemory(data: ArrayBuffer): void;
+    targetCount(): number;
+    getTargetInfo(i: number): ParsedTargetInfo;
+    private _parseOdle;
+    getDecodedPreview(i: number): HTMLImageElement | undefined;
+}
+export {};

package/lib/imagetracker.js

@@ -0,0 +1,115 @@
+import { RiffReader } from "./riff-reader";
+let byId = new Map();
+const decoder = new TextDecoder();
+export class ImageTracker {
+    constructor(_client, _impl) {
+        this._client = _client;
+        this._impl = _impl;
+        this._targets = [];
+    }
+    static create(pipeline, client) {
+        let ret = client.image_tracker_create(pipeline);
+        byId.set(ret, new ImageTracker(client, ret));
+        return ret;
+    }
+    static get(p) {
+        return byId.get(p);
+    }
+    destroy() {
+        this._client.image_tracker_destroy(this._impl);
+        byId.delete(this._impl);
+    }
+    loadFromMemory(data) {
+        this._targets.push({ data });
+        this._client.image_tracker_target_load_from_memory(this._impl, data);
+    }
+    targetCount() {
+        return this._targets.length;
+    }
+    getTargetInfo(i) {
+        let current = this._targets[i];
+        if (current && current.info)
+            return current.info;
+        current.info = {
+            topRadius: -1,
+            bottomRadius: -1,
+            sideLength: -1,
+            physicalScaleFactor: -1
+        };
+        try {
+            const reader = new RiffReader(current.data, false);
+            const imgChunk = reader.find("IMG ");
+            if (imgChunk) {
+                let mimeType = "image/png";
+                const mimeTypeChunk = reader.find("IMGM");
+                if (mimeTypeChunk)
+                    mimeType = decoder.decode(mimeTypeChunk.data);
+                current.info.preview = { mimeType, compressed: imgChunk.data };
+            }
+            const odleChunk = reader.find("ODLE");
+            if (odleChunk) {
+                const odle = decoder.decode(odleChunk.data);
+                this._parseOdle(odle, current.info);
+            }
+        }
+        catch (err) { }
+        return current.info;
+    }
+    _parseOdle(data, info) {
+        let currentOffset = 0;
+        let version = "0";
+        [version, currentOffset] = readLine(currentOffset, data);
+        if (version === "3") {
+            let treeOrFlat = "0";
+            [treeOrFlat, currentOffset] = readLine(currentOffset, data);
+            if (treeOrFlat !== "0" && treeOrFlat !== "1")
+                return;
+            let numberTargets = "0";
+            [numberTargets, currentOffset] = readLine(currentOffset, data);
+            const parsedTargets = parseInt(numberTargets);
+            if (isNaN(parsedTargets) || parsedTargets < 1)
+                return;
+            let emptyLine = "";
+            [emptyLine, currentOffset] = readLine(currentOffset, data);
+            if (emptyLine.length !== 0)
+                return;
+            let infoLine = "";
+            [infoLine, currentOffset] = readLine(currentOffset, data);
+            const infoLineParts = infoLine.split(" ");
+            if (infoLineParts.length < 7)
+                return;
+            info.physicalScaleFactor = parseFloat(infoLineParts[6]);
+            if (isNaN(info.physicalScaleFactor))
+                info.physicalScaleFactor = -1;
+            if (infoLineParts.length >= 8) {
+                info.topRadius = parseFloat(infoLineParts[7]);
+                if (isNaN(info.topRadius))
+                    info.topRadius = -1;
+                info.bottomRadius = info.topRadius;
+            }
+            if (infoLineParts.length >= 9) {
+                info.bottomRadius = parseFloat(infoLineParts[8]);
+                if (isNaN(info.bottomRadius))
+                    info.bottomRadius = -1;
+            }
+            if (infoLineParts.length >= 10) {
+                info.sideLength = parseFloat(infoLineParts[9]);
+                if (isNaN(info.sideLength))
+                    info.sideLength = -1;
+            }
+        }
+    }
+    getDecodedPreview(i) {
+        const info = this.getTargetInfo(i);
+        if (!info.preview)
+            return undefined;
+        const blob = new Blob([info.preview.compressed], { type: info.preview.mimeType });
+        const image = new Image();
+        image.src = URL.createObjectURL(blob);
+        return image;
+    }
+}
+function readLine(offset, str) {
+    let indx = str.indexOf("\n", offset);
+    return [str.substring(offset, indx >= 0 ? indx : undefined).replace("\r", ""), indx + 1];
+}

package/lib/index-standalone.d.ts

@@ -0,0 +1,3 @@
+import { Options } from "./options";
+export * from "./index";
+export declare function initialize(opts?: Options): import(".").Zappar;

package/lib/index-standalone.js

@@ -0,0 +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)() }));
+}

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 import { zappar } from "./gen/zappar";
 import { Additional } from "./additional";
+import { Options } from "./options";
 export declare type Zappar = zappar & Additional;
-export declare function initialize(): Zappar;
+export declare function initialize(opts?: Options): Zappar;
 export { zappar_image_tracker_t, zappar_instant_world_tracker_t, zappar_barcode_finder_t, zappar_face_tracker_t, zappar_face_landmark_t, barcode_format_t, face_landmark_name_t, instant_world_tracker_transform_orientation_t, log_level_t, zappar_face_mesh_t, zappar_pipeline_t, zappar_camera_source_t, zappar_sequence_source_t } from "./gen/zappar";