@zappar/zappar-cv 2.0.0-beta.8 → 2.0.0-beta.9

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.3.17] - 2022-07-21
+
+### Fixed
+
+- Preserve `TextureAttribDivisor`, `VertexAttribDivisor` and `STENCIL_TEST` WebGL state.
+
 ## [0.3.16] - 2021-02-07
 
 ### Fixed

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

package/lib/image-process-gl.d.ts

@@ -23,7 +23,9 @@ export declare class ImageProcessGL {
     private _vertexBuffer;
     private _indexBuffer;
     private _greyscaleShader;
-    constructor(_gl: WebGLRenderingContext);
+    private _isWebGL2;
+    private _instancedArraysExtension;
+    constructor(_gl: WebGL2RenderingContext | WebGLRenderingContext);
     resetGLContext(): void;
     destroy(): void;
     uploadFrame(texture: WebGLTexture, img: HTMLVideoElement | HTMLImageElement | ImageBitmap, rotation: number, fc: boolean): void;

package/lib/image-process-gl.js

@@ -17,6 +17,11 @@ export class ImageProcessGL {
         this._framebufferHeight = 0;
         this._framebufferId = null;
         this._renderTexture = null;
+        this._isWebGL2 = false;
+        this._isWebGL2 = _gl.getParameter(_gl.VERSION).indexOf("WebGL 2") >= 0;
+        if (!this._isWebGL2) {
+            this._instancedArraysExtension = this._gl.getExtension("ANGLE_instanced_arrays");
+        }
     }
     resetGLContext() {
         this._framebufferId = null;
@@ -36,6 +41,7 @@ export class ImageProcessGL {
         const reenableDepthTest = gl.isEnabled(gl.DEPTH_TEST);
         const reenableBlend = gl.isEnabled(gl.BLEND);
         const reenableCullFace = gl.isEnabled(gl.CULL_FACE);
+        const reenableStencilTest = gl.isEnabled(gl.STENCIL_TEST);
         const previousActiveTexture = gl.getParameter(gl.ACTIVE_TEXTURE);
         const previousUnpackFlip = gl.getParameter(gl.UNPACK_FLIP_Y_WEBGL);
         const previousProgram = gl.getParameter(gl.CURRENT_PROGRAM);
@@ -48,6 +54,7 @@ export class ImageProcessGL {
         gl.disable(gl.DEPTH_TEST);
         gl.disable(gl.BLEND);
         gl.disable(gl.CULL_FACE);
+        gl.disable(gl.STENCIL_TEST);
         gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, false);
         gl.bindTexture(gl.TEXTURE_2D, texture);
         const level = 0;
@@ -84,8 +91,22 @@ export class ImageProcessGL {
         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);
+        const previousTextureAttribEnabled = gl.getVertexAttrib(shader.aTextureCoordLoc, gl.VERTEX_ATTRIB_ARRAY_ENABLED);
+        let previousVertexAttribDivisor = 0;
+        let previousTextureAttribDivisor = 0;
+        if (this._isWebGL2) {
+            previousVertexAttribDivisor = gl.getVertexAttrib(shader.aVertexPositionLoc, gl.VERTEX_ATTRIB_ARRAY_DIVISOR);
+            previousTextureAttribDivisor = gl.getVertexAttrib(shader.aTextureCoordLoc, gl.VERTEX_ATTRIB_ARRAY_DIVISOR);
+            gl.vertexAttribDivisor(shader.aVertexPositionLoc, 0);
+            gl.vertexAttribDivisor(shader.aTextureCoordLoc, 0);
+        }
+        else if (this._instancedArraysExtension) {
+            previousVertexAttribDivisor = gl.getVertexAttrib(shader.aVertexPositionLoc, this._instancedArraysExtension.VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE);
+            previousTextureAttribDivisor = gl.getVertexAttrib(shader.aTextureCoordLoc, this._instancedArraysExtension.VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE);
+            this._instancedArraysExtension.vertexAttribDivisorANGLE(shader.aVertexPositionLoc, 0);
+            this._instancedArraysExtension.vertexAttribDivisorANGLE(shader.aTextureCoordLoc, 0);
+        }
         // Rendering to the greyscale conversion buffer - bind the framebuffer
         gl.bindFramebuffer(gl.FRAMEBUFFER, framebuffer);
         gl.viewport(0, 0, this._framebufferWidth, this._framebufferHeight);
@@ -121,6 +142,14 @@ export class ImageProcessGL {
             gl.disableVertexAttribArray(shader.aVertexPositionLoc);
         if (!previousTextureAttribEnabled)
             gl.disableVertexAttribArray(shader.aTextureCoordLoc);
+        if (this._isWebGL2) {
+            gl.vertexAttribDivisor(shader.aVertexPositionLoc, previousVertexAttribDivisor);
+            gl.vertexAttribDivisor(shader.aTextureCoordLoc, previousTextureAttribDivisor);
+        }
+        else if (this._instancedArraysExtension) {
+            this._instancedArraysExtension.vertexAttribDivisorANGLE(shader.aVertexPositionLoc, previousVertexAttribDivisor);
+            this._instancedArraysExtension.vertexAttribDivisorANGLE(shader.aTextureCoordLoc, previousTextureAttribDivisor);
+        }
         gl.bindFramebuffer(gl.FRAMEBUFFER, previousBoundFramebuffer);
         gl.useProgram(previousProgram);
         gl.bindTexture(gl.TEXTURE_2D, previousBoundTexture);
@@ -135,6 +164,8 @@ export class ImageProcessGL {
             gl.enable(gl.DEPTH_TEST);
         if (reenableScissorTest)
             gl.enable(gl.SCISSOR_TEST);
+        if (reenableStencilTest)
+            gl.enable(gl.STENCIL_TEST);
     }
     readFrame(texture, pixels) {
         let gl = this._gl;

package/lib/index.d.ts

@@ -3,4 +3,4 @@ import { Additional } from "./additional";
 import { Options } from "./options";
 export declare type Zappar = zappar & Additional;
 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";
+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, image_target_type_t } from "./gen/zappar";

package/lib/index.js

@@ -4,4 +4,4 @@ export function initialize(opts) {
     console.log(`Zappar CV v${VERSION}`);
     return nativeInitialize(opts);
 }
-export { barcode_format_t, face_landmark_name_t, instant_world_tracker_transform_orientation_t, log_level_t } from "./gen/zappar";
+export { barcode_format_t, face_landmark_name_t, instant_world_tracker_transform_orientation_t, log_level_t, image_target_type_t } from "./gen/zappar";

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "2.0.0-beta.8";
+export declare const VERSION = "2.0.0-beta.9";

package/lib/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.8";
+export const VERSION = "2.0.0-beta.9";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zappar/zappar-cv",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0-beta.9",
   "description": "Zappar's core computer vision library, supporting image, face and world tracking.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -8,6 +8,7 @@
     "build-standalone": "webpack --config=webpack.config.standalone.js --mode=production",
     "build-standalone-debug": "webpack --config=webpack.config.standalone.js --mode=development",
     "build-module": "tsc",
+    "tsc-watch": "tsc --watch",
     "test-module": "jest puppeteer/module",
     "test-standalone": "jest puppeteer/standalone",
     "tests": "webpack --config=webpack.tests.config.js --mode=development && webpack serve --mode=development --config=webpack.tests.config.js",