@zappar/zappar-cv 3.0.1-beta.5 → 3.0.1-beta.8

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/3.0.1-beta.5/zappar-cv.js"></script>
+<script src="https://libs.zappar.com/zappar-cv/3.0.1-beta.8/zappar-cv.js"></script>
 ```
 
 Or you can download and host our standalone JavaScript bundle:
-[https://libs.zappar.com/zappar-cv/3.0.1-beta.5/zappar-cv.zip](https://libs.zappar.com/zappar-cv/3.0.1-beta.5/zappar-cv.zip)
+[https://libs.zappar.com/zappar-cv/3.0.1-beta.8/zappar-cv.zip](https://libs.zappar.com/zappar-cv/3.0.1-beta.8/zappar-cv.zip)

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/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/native.js

@@ -49,7 +49,7 @@ 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) {
+    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);

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.0.1-beta.5";
+export declare const VERSION = "3.0.1-beta.8";

package/lib/version.js

@@ -1 +1 @@
-export const VERSION = "3.0.1-beta.5";
+export const VERSION = "3.0.1-beta.8";

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;