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

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.3.16] - 2021-02-07
+
+### Fixed
+
+- External WebGL state is preserved during `process_gl` calls
+
+## [0.3.15] - 2021-01-25
+
+### Fixed
+
+- Issues on iPad Pro
+
 ## [0.3.14] - 2021-10-25
 
 ### Changed

package/README.md

@@ -18,8 +18,8 @@ npm i @zappar/zappar-cv
 
 You can use our CDN from within your HTML:
 ```
-<script src="https://libs.zappar.com/zappar-cv/0.4.0-beta.9/zappar-cv.js"></script>
+<script src="https://libs.zappar.com/zappar-cv/2.0.0-beta.3/zappar-cv.js"></script>
 ```
 
 Or you can download and host our standalone JavaScript bundle:
-[https://libs.zappar.com/zappar-cv/0.4.0-beta.9/zappar-cv.zip](https://libs.zappar.com/zappar-cv/0.4.0-beta.9/zappar-cv.zip)
+[https://libs.zappar.com/zappar-cv/2.0.0-beta.3/zappar-cv.zip](https://libs.zappar.com/zappar-cv/2.0.0-beta.3/zappar-cv.zip)

package/lib/additional.d.ts

@@ -1,4 +1,4 @@
-import { zappar_face_mesh_t, zappar_face_tracker_t, zappar_pipeline_t } from "./gen/zappar";
+import { zappar_face_mesh_t, zappar_face_tracker_t, zappar_pipeline_t, zappar_image_tracker_t, zappar_sequence_source_t } from "./gen/zappar";
 export declare type zappar_html_element_source_t = number & {
     _: 'zappar_html_element_source_t';
 };
@@ -8,6 +8,7 @@ export interface Additional {
     pipeline_draw_face(pipeline: zappar_pipeline_t, projectionMatrix: Float32Array, cameraMatrix: Float32Array, targetMatrix: Float32Array, o: zappar_face_mesh_t): void;
     pipeline_draw_face_project(pipeline: zappar_pipeline_t, drawwMatrix: Float32Array, vertices: Float32Array, uvMatrix: Float32Array, uvs: Float32Array, indices: Uint16Array, texture: WebGLTexture): void;
     draw_plane(gl: WebGLRenderingContext, projectionMatrix: Float32Array, cameraMatrix: Float32Array, targetMatrix: Float32Array, texture: string): void;
+    image_tracker_target_image(o: zappar_image_tracker_t, indx: number): HTMLImageElement | undefined;
     face_mesh_load_default(o: zappar_face_mesh_t): Promise<void>;
     face_mesh_load_default_face(o: zappar_face_mesh_t, fillMouth: boolean, fillEyeL: boolean, fillEyeR: boolean): Promise<void>;
     face_mesh_load_default_full_head_simplified(o: zappar_face_mesh_t, fillMouth: boolean, fillEyeL: boolean, fillEyeR: boolean, fillNeck: boolean): Promise<void>;
@@ -20,4 +21,5 @@ export interface Additional {
     html_element_source_destroy(o: zappar_html_element_source_t): void;
     browser_incompatible: () => boolean;
     browser_incompatible_ui: () => void;
+    sequence_source_time_set: (o: zappar_sequence_source_t, ms: number) => void;
 }

package/lib/additional.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/lib/camera-source-map.js

@@ -1,40 +1,32 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCameraSource = exports.deleteCameraSource = exports.getCameraSource = exports.setCameraSourceId = exports.getNextCameraSourceId = void 0;
-const camera_source_1 = require("./camera-source");
-const imagebitmap_camera_source_1 = require("./imagebitmap-camera-source");
-const loglevel_1 = require("./loglevel");
-const mstp_camera_source_1 = require("./mstp-camera-source");
-const profile_1 = require("./profile");
+import { CameraSource } from "./camera-source";
+import { ImageBitmapCameraSource } from "./imagebitmap-camera-source";
+import { zcout } from "./loglevel";
+import { MSTPCameraSource } from "./mstp-camera-source";
+import { profile } from "./profile";
 let latest = 1;
 let byId = new Map();
-function getNextCameraSourceId() {
+export function getNextCameraSourceId() {
     return (latest++);
 }
-exports.getNextCameraSourceId = getNextCameraSourceId;
-function setCameraSourceId(id, c) {
+export function setCameraSourceId(id, c) {
     byId.set(id, c);
 }
-exports.setCameraSourceId = setCameraSourceId;
-function getCameraSource(id) {
+export function getCameraSource(id) {
     return byId.get(id);
 }
-exports.getCameraSource = getCameraSource;
-function deleteCameraSource(id) {
+export function deleteCameraSource(id) {
     byId.delete(id);
 }
-exports.deleteCameraSource = deleteCameraSource;
-function createCameraSource(p, deviceId) {
+export function createCameraSource(p, deviceId) {
     let ret = getNextCameraSourceId();
-    if (profile_1.profile.preferMediaStreamTrackProcessorCamera &&
+    if (profile.preferMediaStreamTrackProcessorCamera &&
         'MediaStreamTrackProcessor' in window &&
         'MediaStreamTrackGenerator' in window)
-        setCameraSourceId(ret, new mstp_camera_source_1.MSTPCameraSource(ret, p, deviceId));
-    else if (profile_1.profile.preferImageBitmapCamera && typeof OffscreenCanvas !== "undefined")
-        setCameraSourceId(ret, new imagebitmap_camera_source_1.ImageBitmapCameraSource(ret, p, deviceId));
+        setCameraSourceId(ret, new MSTPCameraSource(ret, p, deviceId));
+    else if (profile.preferImageBitmapCamera && typeof OffscreenCanvas !== "undefined")
+        setCameraSourceId(ret, new ImageBitmapCameraSource(ret, p, deviceId));
     else
-        setCameraSourceId(ret, new camera_source_1.CameraSource(ret, p, deviceId));
-    loglevel_1.zcout("camera_source_t initialized");
+        setCameraSourceId(ret, new CameraSource(ret, p, deviceId));
+    zcout("camera_source_t initialized");
     return ret;
 }
-exports.createCameraSource = createCameraSource;

package/lib/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,23 +7,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CameraSource = void 0;
-const html_element_source_1 = require("./html-element-source");
-const profile_1 = require("./profile");
-const pipeline_1 = require("./pipeline");
-const cameramodel_1 = require("./cameramodel");
-const loglevel_1 = require("./loglevel");
-const camera_source_map_1 = require("./camera-source-map");
+import { HTMLElementSource } from "./html-element-source";
+import { profile } from "./profile";
+import { Pipeline } from "./pipeline";
+import { cameraRotationForScreenOrientation } from "./cameramodel";
+import { zcout } from "./loglevel";
+import { deleteCameraSource } from "./camera-source-map";
 let _videoSingleton = document.createElement("video");
 _videoSingleton.setAttribute('playsinline', '');
 _videoSingleton.setAttribute('webkit-playsinline', '');
-if (profile_1.profile.videoElementInDOM) {
+if (profile.videoElementInDOM) {
     _videoSingleton.style.width = "0px";
     _videoSingleton.style.height = "0px";
     document.body.appendChild(_videoSingleton);
 }
-class CameraSource extends html_element_source_1.HTMLElementSource {
+export class CameraSource extends HTMLElementSource {
     constructor(_impl, pipeline, _deviceId) {
         super(_videoSingleton, pipeline);
         this._impl = _impl;
@@ -33,7 +30,7 @@ class CameraSource extends html_element_source_1.HTMLElementSource {
         this._activeDeviceId = null;
         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();
@@ -41,7 +38,7 @@ class CameraSource extends html_element_source_1.HTMLElementSource {
                 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 &&
@@ -56,7 +53,7 @@ class CameraSource extends html_element_source_1.HTMLElementSource {
         };
     }
     destroy() {
-        camera_source_map_1.deleteCameraSource(this._impl);
+        deleteCameraSource(this._impl);
         super.destroy();
     }
     _stop() {
@@ -92,9 +89,9 @@ class CameraSource extends html_element_source_1.HTMLElementSource {
                 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
                 }
             };
@@ -122,14 +119,14 @@ class CameraSource extends html_element_source_1.HTMLElementSource {
                 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;
         });
     }
     getFrame(allowRead) {
-        this._cameraToScreenRotation = cameramodel_1.cameraRotationForScreenOrientation(false);
+        this._cameraToScreenRotation = cameraRotationForScreenOrientation(false);
         super.getFrame(allowRead);
     }
     _getUserMedia() {
@@ -179,7 +176,7 @@ class CameraSource extends html_element_source_1.HTMLElementSource {
             return;
         this._hasStartedOrientation = true;
         this._deviceOrientationListener = (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();
@@ -198,6 +195,5 @@ class CameraSource extends html_element_source_1.HTMLElementSource {
             window.removeEventListener("deviceorientation", this._deviceOrientationListener);
     }
 }
-exports.CameraSource = CameraSource;
 CameraSource.USER_DEFAULT_DEVICE_ID = "Simulated User Default Device ID: a908df7f-5661-4d20-b227-a1c15d2fdb4b";
 CameraSource.DEFAULT_DEVICE_ID = "Simulated Default Device ID: a908df7f-5661-4d20-b227-a1c15d2fdb4b";

package/lib/cameramodel.js

@@ -1,12 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.cameraRotationForScreenOrientation = exports.projectionMatrix = void 0;
-const gl_matrix_1 = require("gl-matrix");
-function projectionMatrix(params, screenWidth, screenHeight, near = 0.01, far = 100.0) {
+import { mat4, vec3 } from "gl-matrix";
+export function projectionMatrix(params, screenWidth, screenHeight, near = 0.01, far = 100.0) {
     let cam_x = params[2] * 2;
     let cam_y = params[3] * 2;
-    let projection = gl_matrix_1.mat4.create();
-    gl_matrix_1.mat4.frustum(projection, near * (-0.5 - params[2]) / params[0], near * (cam_x - 0.5 - params[2]) / params[0], near * (cam_y - 0.5 - params[3]) / params[1], near * (-0.5 - params[3]) / params[1], near, far);
+    let projection = mat4.create();
+    mat4.frustum(projection, near * (-0.5 - params[2]) / params[0], near * (cam_x - 0.5 - params[2]) / params[0], near * (cam_y - 0.5 - params[3]) / params[1], near * (-0.5 - params[3]) / params[1], near, far);
     // Flip camera y axis (before any other transformations) - converts from
     // the y axis downwards of the  tracking camera models to the y axis upwards
     // of rendering coordinate systems
@@ -14,18 +11,18 @@ function projectionMatrix(params, screenWidth, screenHeight, near = 0.01, far =
     projection[5] *= -1.0;
     projection[6] *= -1.0;
     projection[7] *= -1.0;
-    let mult = gl_matrix_1.mat4.create();
-    gl_matrix_1.mat4.fromScaling(mult, [0.5 * cam_x, 0.5 * cam_y, 1]);
-    gl_matrix_1.mat4.multiply(projection, mult, projection);
+    let mult = mat4.create();
+    mat4.fromScaling(mult, [0.5 * cam_x, 0.5 * cam_y, 1]);
+    mat4.multiply(projection, mult, projection);
     // If it's user facing or not doesn't matter here as long as we apply the same-but-opposite
     // rotation at the end of the function
-    gl_matrix_1.mat4.fromRotation(mult, cameraRotationForScreenOrientation(false) * Math.PI / 180.0, [0, 0, 1]);
-    gl_matrix_1.mat4.multiply(projection, mult, projection);
-    let vec = gl_matrix_1.vec3.create();
+    mat4.fromRotation(mult, cameraRotationForScreenOrientation(false) * Math.PI / 180.0, [0, 0, 1]);
+    mat4.multiply(projection, mult, projection);
+    let vec = vec3.create();
     vec[0] = cam_x;
     vec[1] = cam_y;
     vec[2] = 0;
-    gl_matrix_1.vec3.transformMat4(vec, vec, mult);
+    vec3.transformMat4(vec, vec, mult);
     let absWidth = Math.abs(vec[0]);
     let absHeight = Math.abs(vec[1]);
     let scaleFactor = 1;
@@ -35,16 +32,15 @@ function projectionMatrix(params, screenWidth, screenHeight, near = 0.01, far =
     else {
         scaleFactor = screenWidth / absWidth;
     }
-    gl_matrix_1.mat4.fromScaling(mult, [scaleFactor, scaleFactor, 1]);
-    gl_matrix_1.mat4.multiply(projection, mult, projection);
-    gl_matrix_1.mat4.fromScaling(mult, [2 / screenWidth, 2 / screenHeight, 1]);
-    gl_matrix_1.mat4.multiply(projection, mult, projection);
-    gl_matrix_1.mat4.fromRotation(mult, cameraRotationForScreenOrientation(false) * Math.PI / -180.0, [0, 0, 1]);
-    gl_matrix_1.mat4.multiply(projection, projection, mult);
+    mat4.fromScaling(mult, [scaleFactor, scaleFactor, 1]);
+    mat4.multiply(projection, mult, projection);
+    mat4.fromScaling(mult, [2 / screenWidth, 2 / screenHeight, 1]);
+    mat4.multiply(projection, mult, projection);
+    mat4.fromRotation(mult, cameraRotationForScreenOrientation(false) * Math.PI / -180.0, [0, 0, 1]);
+    mat4.multiply(projection, projection, mult);
     return projection;
 }
-exports.projectionMatrix = projectionMatrix;
-function cameraRotationForScreenOrientation(isUserFacing) {
+export function cameraRotationForScreenOrientation(isUserFacing) {
     if (window.screen.orientation) {
         switch (window.screen.orientation.type) {
             case "portrait-primary":
@@ -67,4 +63,3 @@ function cameraRotationForScreenOrientation(isUserFacing) {
     }
     return 0;
 }
-exports.cameraRotationForScreenOrientation = cameraRotationForScreenOrientation;

package/lib/compatibility.js

@@ -1,5 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 function getUnsupportedMessage() {
     let ret = document.createElement("div");
     let idealBrowser = "a recent web browser";
@@ -160,7 +158,7 @@ function isSupportedBrowser() {
         return false;
     return true;
 }
-exports.default = {
+export default {
     incompatible: () => !isSupportedBrowser(),
     incompatible_ui: incompatibleUI,
 };

package/lib/deserializer.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MessageDeserializer = void 0;
-class MessageDeserializer {
+export class MessageDeserializer {
     constructor() {
         this._buffer = new ArrayBuffer(0);
         this._i32View = new Int32Array(this._buffer);
@@ -113,4 +110,3 @@ class MessageDeserializer {
         }
     }
 }
-exports.MessageDeserializer = MessageDeserializer;

package/lib/direct.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,25 +7,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.launchWorker = exports.messageManager = void 0;
-const messages_1 = require("./messages");
-const worker_server_1 = require("./worker-server");
-const worker_server_2 = require("./worker-server");
-exports.messageManager = new messages_1.MsgManager();
-function launchWorker(wasm) {
+import { MsgManager } from "./messages";
+import { launchWorkerServer } from "./worker-server";
+import { messageManager as workerMessageManager } from "./worker-server";
+export let messageManager = new MsgManager();
+export function launchWorker(wasm) {
     return __awaiter(this, void 0, void 0, function* () {
-        exports.messageManager.onOutgoingMessage.bind(() => {
-            let msgs = exports.messageManager.getOutgoingMessages();
+        messageManager.onOutgoingMessage.bind(() => {
+            let msgs = messageManager.getOutgoingMessages();
             for (let msg of msgs)
-                worker_server_2.messageManager.postIncomingMessage(msg.msg);
+                workerMessageManager.postIncomingMessage(msg.msg);
         });
-        worker_server_2.messageManager.onOutgoingMessage.bind(() => {
-            let msgs = worker_server_2.messageManager.getOutgoingMessages();
+        workerMessageManager.onOutgoingMessage.bind(() => {
+            let msgs = workerMessageManager.getOutgoingMessages();
             for (let msg of msgs)
-                exports.messageManager.postIncomingMessage(msg.msg);
+                messageManager.postIncomingMessage(msg.msg);
         });
-        worker_server_1.launchWorkerServer(wasm);
+        launchWorkerServer(wasm);
     });
 }
-exports.launchWorker = launchWorker;

package/lib/drawcamera.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.cameraFrameTextureMatrix = exports.CameraDraw = void 0;
-const shader_1 = require("./shader");
-const gl_matrix_1 = require("gl-matrix");
-let identity = gl_matrix_1.mat4.create();
-class CameraDraw {
+import { compileShader, linkProgram } from "./shader";
+import { mat4, vec3 } from "gl-matrix";
+let identity = mat4.create();
+export class CameraDraw {
     constructor(_gl) {
         this._gl = _gl;
     }
@@ -69,11 +66,11 @@ class CameraDraw {
         let prog = gl.createProgram();
         if (!prog)
             throw new Error("Unable to create program");
-        let vertexShader = shader_1.compileShader(gl, gl.VERTEX_SHADER, vertexShaderSrc);
-        let fragmentShader = shader_1.compileShader(gl, gl.FRAGMENT_SHADER, fragmentShaderSrc);
+        let vertexShader = compileShader(gl, gl.VERTEX_SHADER, vertexShaderSrc);
+        let fragmentShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentShaderSrc);
         gl.attachShader(prog, vertexShader);
         gl.attachShader(prog, fragmentShader);
-        shader_1.linkProgram(gl, prog);
+        linkProgram(gl, prog);
         let unif_skinTexTransform = gl.getUniformLocation(prog, "skinTexTransform");
         if (!unif_skinTexTransform)
             throw new Error("Unable to get uniform location skinTexTransform");
@@ -90,7 +87,6 @@ class CameraDraw {
         return this._shader;
     }
 }
-exports.CameraDraw = CameraDraw;
 let vertexShaderSrc = `
 #ifndef GL_ES
 #define highp
@@ -149,45 +145,44 @@ function cameraRotationForScreenOrientation() {
     }
     return 0;
 }
-function cameraFrameTextureMatrix(frameWidth, frameHeight, screenWidth, screenHeight, uvMatrix, mirror) {
-    let ret = gl_matrix_1.mat4.create();
-    let trans = gl_matrix_1.mat4.create();
+export function cameraFrameTextureMatrix(frameWidth, frameHeight, screenWidth, screenHeight, uvMatrix, mirror) {
+    let ret = mat4.create();
+    let trans = mat4.create();
     // Translate to centre UV coords
-    gl_matrix_1.mat4.fromTranslation(trans, [-0.5, -0.5, 0]);
-    gl_matrix_1.mat4.multiply(ret, trans, ret);
+    mat4.fromTranslation(trans, [-0.5, -0.5, 0]);
+    mat4.multiply(ret, trans, ret);
     if (mirror) {
-        gl_matrix_1.mat4.fromScaling(trans, [-1, 1, 1]);
-        gl_matrix_1.mat4.multiply(ret, trans, ret);
+        mat4.fromScaling(trans, [-1, 1, 1]);
+        mat4.multiply(ret, trans, ret);
     }
     // Apply rotation back into ZCV's landscape space
-    gl_matrix_1.mat4.fromRotation(trans, -1 * cameraRotationForScreenOrientation() * Math.PI / 180.0, [0, 0, 1]);
-    gl_matrix_1.mat4.multiply(ret, trans, ret);
+    mat4.fromRotation(trans, -1 * cameraRotationForScreenOrientation() * Math.PI / 180.0, [0, 0, 1]);
+    mat4.multiply(ret, trans, ret);
     // Get our screenWidth and screenHeight into that same space
-    let vec = gl_matrix_1.vec3.create();
+    let vec = vec3.create();
     vec[0] = screenWidth;
     vec[1] = screenHeight;
     vec[2] = 0;
-    gl_matrix_1.vec3.transformMat4(vec, vec, trans);
+    vec3.transformMat4(vec, vec, trans);
     let absScreenX = Math.abs(vec[0]);
     let absScreenY = Math.abs(vec[1]);
     // Apply a flip since the texture is upside-down
-    gl_matrix_1.mat4.fromScaling(trans, [1, -1, 1]);
-    gl_matrix_1.mat4.multiply(ret, trans, ret);
+    mat4.fromScaling(trans, [1, -1, 1]);
+    mat4.multiply(ret, trans, ret);
     // Apply cropping
     let screenAspect = absScreenX / absScreenY;
     let frameAspect = frameWidth / frameHeight;
     if (screenAspect > frameAspect) {
-        gl_matrix_1.mat4.fromScaling(trans, [1, frameAspect / screenAspect, 1]);
+        mat4.fromScaling(trans, [1, frameAspect / screenAspect, 1]);
     }
     else {
-        gl_matrix_1.mat4.fromScaling(trans, [screenAspect / frameAspect, 1, 1]);
+        mat4.fromScaling(trans, [screenAspect / frameAspect, 1, 1]);
     }
-    gl_matrix_1.mat4.multiply(ret, trans, ret);
+    mat4.multiply(ret, trans, ret);
     // Translate back to UV coords
-    gl_matrix_1.mat4.fromTranslation(trans, [0.5, 0.5, 0]);
-    gl_matrix_1.mat4.multiply(ret, trans, ret);
+    mat4.fromTranslation(trans, [0.5, 0.5, 0]);
+    mat4.multiply(ret, trans, ret);
     // Apply the camera frame's UV matrix
-    gl_matrix_1.mat4.multiply(ret, uvMatrix, ret);
+    mat4.multiply(ret, uvMatrix, ret);
     return ret;
 }
-exports.cameraFrameTextureMatrix = cameraFrameTextureMatrix;

package/lib/drawface.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FaceDraw = void 0;
-const shader_1 = require("./shader");
-class FaceDraw {
+import { compileShader, linkProgram } from "./shader";
+export class FaceDraw {
     constructor(_gl) {
         this._gl = _gl;
     }
@@ -82,11 +79,11 @@ class FaceDraw {
         let prog = gl.createProgram();
         if (!prog)
             throw new Error("Unable to create program");
-        let vertexShader = shader_1.compileShader(gl, gl.VERTEX_SHADER, vertexShaderSrc);
-        let fragmentShader = shader_1.compileShader(gl, gl.FRAGMENT_SHADER, fragmentShaderSrc);
+        let vertexShader = compileShader(gl, gl.VERTEX_SHADER, vertexShaderSrc);
+        let fragmentShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentShaderSrc);
         gl.attachShader(prog, vertexShader);
         gl.attachShader(prog, fragmentShader);
-        shader_1.linkProgram(gl, prog);
+        linkProgram(gl, prog);
         let unif_matrix = gl.getUniformLocation(prog, "matrix");
         if (!unif_matrix)
             throw new Error("Unable to get uniform location mattrix");
@@ -99,7 +96,6 @@ class FaceDraw {
         return this._shader;
     }
 }
-exports.FaceDraw = FaceDraw;
 let vertexShaderSrc = `
 #ifndef GL_ES
 #define highp

package/lib/drawfaceproject.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FaceDrawProject = void 0;
-const shader_1 = require("./shader");
-class FaceDrawProject {
+import { compileShader, linkProgram } from "./shader";
+export class FaceDrawProject {
     constructor(_gl) {
         this._gl = _gl;
     }
@@ -89,11 +86,11 @@ class FaceDrawProject {
         let prog = gl.createProgram();
         if (!prog)
             throw new Error("Unable to create program");
-        let vertexShader = shader_1.compileShader(gl, gl.VERTEX_SHADER, vertexShaderSrc);
-        let fragmentShader = shader_1.compileShader(gl, gl.FRAGMENT_SHADER, fragmentShaderSrc);
+        let vertexShader = compileShader(gl, gl.VERTEX_SHADER, vertexShaderSrc);
+        let fragmentShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentShaderSrc);
         gl.attachShader(prog, vertexShader);
         gl.attachShader(prog, fragmentShader);
-        shader_1.linkProgram(gl, prog);
+        linkProgram(gl, prog);
         let unif_matrix = gl.getUniformLocation(prog, "matrix");
         if (!unif_matrix)
             throw new Error("Unable to get uniform location matrix");
@@ -115,7 +112,6 @@ class FaceDrawProject {
         return this._shader;
     }
 }
-exports.FaceDrawProject = FaceDrawProject;
 let vertexShaderSrc = `
 #ifndef GL_ES
 #define highp

package/lib/drawplane.js

@@ -1,18 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.drawPlane = exports.disposeDrawPlane = void 0;
-const shader_1 = require("./shader");
+import { compileShader, linkProgram } from "./shader";
 let shader;
 let vbo;
 let uvbo;
 let texturesByUrl = {};
-function disposeDrawPlane() {
+export function disposeDrawPlane() {
     shader = undefined;
     vbo = undefined;
     uvbo = undefined;
     texturesByUrl = {};
 }
-exports.disposeDrawPlane = disposeDrawPlane;
 function generate(gl) {
     if (vbo)
         return vbo;
@@ -47,7 +43,7 @@ function generateUVBO(gl) {
     gl.bindBuffer(gl.ARRAY_BUFFER, null);
     return uvbo;
 }
-function drawPlane(gl, projectionMatrix, cameraMatrix, targetMatrix, textureUrl) {
+export function drawPlane(gl, projectionMatrix, cameraMatrix, targetMatrix, textureUrl) {
     let shader = getShader(gl);
     let v = generate(gl);
     let uvbo = generateUVBO(gl);
@@ -69,7 +65,6 @@ function drawPlane(gl, projectionMatrix, cameraMatrix, targetMatrix, textureUrl)
     gl.disableVertexAttribArray(shader.attr_position);
     gl.bindBuffer(gl.ARRAY_BUFFER, null);
 }
-exports.drawPlane = drawPlane;
 function generateLocalMatrix() {
     let position = [0, 0, -5];
     return new Float32Array([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, position[0], position[1], position[2], 1]);
@@ -118,11 +113,11 @@ function getShader(gl) {
     let prog = gl.createProgram();
     if (!prog)
         throw new Error("Unable to create program");
-    let vertexShader = shader_1.compileShader(gl, gl.VERTEX_SHADER, vertexShaderSrc);
-    let fragmentShader = shader_1.compileShader(gl, gl.FRAGMENT_SHADER, fragmentShaderSrc);
+    let vertexShader = compileShader(gl, gl.VERTEX_SHADER, vertexShaderSrc);
+    let fragmentShader = compileShader(gl, gl.FRAGMENT_SHADER, fragmentShaderSrc);
     gl.attachShader(prog, vertexShader);
     gl.attachShader(prog, fragmentShader);
-    shader_1.linkProgram(gl, prog);
+    linkProgram(gl, prog);
     let unif_proj = gl.getUniformLocation(prog, "projMatrix");
     if (!unif_proj)
         throw new Error("Unable to get uniform location projMatrix");

package/lib/event.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Event5 = exports.Event3 = exports.Event2 = exports.Event1 = exports.Event = void 0;
-class Event {
+export class Event {
     constructor() {
         this._funcs = [];
     }
@@ -20,8 +17,7 @@ class Event {
         }
     }
 }
-exports.Event = Event;
-class Event1 {
+export class Event1 {
     constructor() {
         this._funcs = [];
     }
@@ -40,8 +36,7 @@ class Event1 {
         }
     }
 }
-exports.Event1 = Event1;
-class Event2 {
+export class Event2 {
     constructor() {
         this._funcs = [];
     }
@@ -60,8 +55,7 @@ class Event2 {
         }
     }
 }
-exports.Event2 = Event2;
-class Event3 {
+export class Event3 {
     constructor() {
         this._funcs = [];
     }
@@ -80,8 +74,7 @@ class Event3 {
         }
     }
 }
-exports.Event3 = Event3;
-class Event5 {
+export class Event5 {
     constructor() {
         this._funcs = [];
     }
@@ -100,4 +93,3 @@ class Event5 {
         }
     }
 }
-exports.Event5 = Event5;