@lightningjs/renderer 0.6.1 → 0.7.0

package/dist/src/core/renderers/webgl/WebGlCoreShader.js

@@ -32,7 +32,7 @@ export class WebGlCoreShader extends CoreShader {
      */
     vao;
     renderer;
-    gl;
+    glw;
     attributeBuffers;
     attributeLocations;
     attributeNames;
@@ -42,16 +42,16 @@ export class WebGlCoreShader extends CoreShader {
     constructor(options) {
         super();
         const renderer = (this.renderer = options.renderer);
-        const gl = (this.gl = this.renderer.gl);
+        const glw = (this.glw = this.renderer.glw);
         this.supportsIndexedTextures = options.supportsIndexedTextures || false;
         // Check that extensions are supported
-        const webGl2 = isWebGl2(gl);
+        const webGl2 = glw.isWebGl2();
         const requiredExtensions = (webGl2 && options.webgl2Extensions) ||
             (!webGl2 && options.webgl1Extensions) ||
             [];
         const glVersion = webGl2 ? '2.0' : '1.0';
         requiredExtensions.forEach((extensionName) => {
-            if (!gl.getExtension(extensionName)) {
+            if (!glw.getExtension(extensionName)) {
                 throw new Error(`Shader "${this.constructor.name}" requires extension "${extensionName}" for WebGL ${glVersion} but wasn't found`);
             }
         });
@@ -77,33 +77,33 @@ export class WebGlCoreShader extends CoreShader {
         const fragmentSource = shaderSources.fragment instanceof Function
             ? shaderSources.fragment(textureUnits)
             : shaderSources.fragment;
-        const vertexShader = createShader(gl, gl.VERTEX_SHADER, vertexSource);
-        const fragmentShader = createShader(gl, gl.FRAGMENT_SHADER, fragmentSource);
+        const vertexShader = createShader(glw, glw.VERTEX_SHADER, vertexSource);
+        const fragmentShader = createShader(glw, glw.FRAGMENT_SHADER, fragmentSource);
         if (!vertexShader || !fragmentShader) {
             throw new Error();
         }
-        const program = createProgram(gl, vertexShader, fragmentShader);
+        const program = createProgram(glw, vertexShader, fragmentShader);
         if (!program) {
             throw new Error();
         }
         this.program = program;
         if (webGl2) {
-            const vao = gl.createVertexArray();
+            const vao = glw.createVertexArray();
             if (!vao) {
                 throw new Error();
             }
             this.vao = vao;
-            gl.bindVertexArray(this.vao);
+            glw.bindVertexArray(this.vao);
         }
         this.attributeLocations = {};
         this.attributeBuffers = {};
         this.attributeNames = [];
         [...options.attributes].forEach((attributeName) => {
-            const location = gl.getAttribLocation(this.program, attributeName);
+            const location = glw.getAttribLocation(this.program, attributeName);
             if (location < 0) {
                 throw new Error(`${this.constructor.name}: Vertex shader must have an attribute "${attributeName}"!`);
             }
-            const buffer = gl.createBuffer();
+            const buffer = glw.createBuffer();
             if (!buffer) {
                 throw new Error(`${this.constructor.name}: Could not create buffer for attribute "${attributeName}"`);
             }
@@ -114,7 +114,7 @@ export class WebGlCoreShader extends CoreShader {
         this.uniformLocations = {};
         this.uniformTypes = {};
         options.uniforms.forEach((uniform) => {
-            const location = gl.getUniformLocation(this.program, uniform.name);
+            const location = glw.getUniformLocation(this.program, uniform.name);
             this.uniformTypes[uniform.name] = uniform.uniform;
             if (!location) {
                 console.warn(`Shader "${this.constructor.name}" could not get uniform location for "${uniform.name}"`);
@@ -124,13 +124,12 @@ export class WebGlCoreShader extends CoreShader {
         });
     }
     bindBufferAttribute(location, buffer, attribute) {
-        const gl = this.gl;
-        gl.enableVertexAttribArray(location);
-        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
-        gl.vertexAttribPointer(location, attribute.size, attribute.type, attribute.normalized, attribute.stride, attribute.offset);
+        const { glw } = this;
+        glw.enableVertexAttribArray(location);
+        glw.vertexAttribPointer(buffer, location, attribute.size, attribute.type, attribute.normalized, attribute.stride, attribute.offset);
     }
     disableAttribute(location) {
-        this.gl.disableVertexAttribArray(location);
+        this.glw.disableVertexAttribArray(location);
     }
     disableAttributes() {
         for (const loc in this.attributeLocations) {
@@ -161,9 +160,9 @@ export class WebGlCoreShader extends CoreShader {
         if (renderOp.textures.length > 0) {
             this.bindTextures(renderOp.textures);
         }
-        const { gl } = renderOp;
+        const { glw } = renderOp;
         // Bind standard automatic uniforms
-        this.setUniform('u_resolution', [gl.canvas.width, gl.canvas.height]); // !!!
+        this.setUniform('u_resolution', [glw.canvas.width, glw.canvas.height]);
         this.setUniform('u_pixelRatio', renderOp.options.pixelRatio);
         if (props) {
             // Bind optional automatic uniforms
@@ -186,8 +185,8 @@ export class WebGlCoreShader extends CoreShader {
         }
     }
     setUniform(name, ...value) {
-        // @ts-expect-error Typing of args is too funky apparently for TS
-        this.gl[this.uniformTypes[name]](this.uniformLocations[name], ...value);
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion, @typescript-eslint/no-unsafe-argument
+        this.glw.setUniform(this.uniformTypes[name], this.uniformLocations[name], ...value);
     }
     bindBufferCollection(buffer) {
         if (this.boundBufferCollection === buffer) {
@@ -209,9 +208,10 @@ export class WebGlCoreShader extends CoreShader {
         // no defaults
     }
     attach() {
-        this.gl.useProgram(this.program);
-        if (isWebGl2(this.gl) && this.vao) {
-            this.gl.bindVertexArray(this.vao);
+        this.glw.useProgram(this.program);
+        this.glw.useProgram(this.program);
+        if (this.glw.isWebGl2() && this.vao) {
+            this.glw.bindVertexArray(this.vao);
         }
     }
     detach() {

package/dist/src/core/renderers/webgl/WebGlCoreShader.js.map

@@ -1 +1 @@
-{"version":3,"file":"WebGlCoreShader.js","sourceRoot":"","sources":["../../../../../src/core/renderers/webgl/WebGlCoreShader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAK9C,OAAO,EACL,aAAa,EACb,YAAY,GAMb,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AA+BpD,MAAM,OAAgB,eAAgB,SAAQ,UAAU;IAC5C,qBAAqB,GAA4B,IAAI,CAAC;IACtD,YAAY,GAAG,KAAK,CAAC;IACrB,OAAO,CAAe;IAChC;;;;;OAKG;IACO,GAAG,CAAqC;IACxC,QAAQ,CAAoB;IAC5B,EAAE,CAAwB;IAC1B,gBAAgB,CAA8B;IAC9C,kBAAkB,CAAyB;IAC3C,cAAc,CAAW;IACzB,gBAAgB,CAAuC;IACvD,YAAY,CAAyC;IACtD,uBAAuB,CAAU;IAE1C,YAAY,OAAsB;QAChC,KAAK,EAAE,CAAC;QACR,MAAM,QAAQ,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;QACpD,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACxC,IAAI,CAAC,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,IAAI,KAAK,CAAC;QAExE,sCAAsC;QACtC,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC5B,MAAM,kBAAkB,GACtB,CAAC,MAAM,IAAI,OAAO,CAAC,gBAAgB,CAAC;YACpC,CAAC,CAAC,MAAM,IAAI,OAAO,CAAC,gBAAgB,CAAC;YACrC,EAAE,CAAC;QACL,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;QACzC,kBAAkB,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;YAC3C,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE;gBACnC,MAAM,IAAI,KAAK,CACb,WAAW,IAAI,CAAC,WAAW,CAAC,IAAI,yBAAyB,aAAa,eAAe,SAAS,mBAAmB,CAClH,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QAEH,wBAAwB;QACxB,0FAA0F;QAC1F,yCAAyC;QACzC,wGAAwG;QACxG,kBAAkB;QAClB,MAAM,aAAa,GACjB,OAAO,CAAC,aAAa;YACpB,IAAI,CAAC,WAAsC,CAAC,aAAa,CAAC;QAC7D,IAAI,CAAC,aAAa,EAAE;YAClB,MAAM,IAAI,KAAK,CACb,WAAW,IAAI,CAAC,WAAW,CAAC,IAAI,6BAA6B,CAC9D,CAAC;SACH;aAAM,IAAI,MAAM,IAAI,aAAa,EAAE,MAAM,EAAE;YAC1C,aAAa,CAAC,QAAQ,GAAG,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC;YACvD,aAAa,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC;YACnD,OAAO,aAAa,CAAC,MAAM,CAAC;SAC7B;QAED,MAAM,YAAY,GAChB,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,8BAA8B,CAAC;QAE5D,MAAM,YAAY,GAChB,aAAa,CAAC,MAAM,YAAY,QAAQ;YACtC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC;YACpC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC;QAE3B,MAAM,cAAc,GAClB,aAAa,CAAC,QAAQ,YAAY,QAAQ;YACxC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC;YACtC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC;QAE7B,MAAM,YAAY,GAAG,YAAY,CAAC,EAAE,EAAE,EAAE,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;QACtE,MAAM,cAAc,GAAG,YAAY,CAAC,EAAE,EAAE,EAAE,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;QAC5E,IAAI,CAAC,YAAY,IAAI,CAAC,cAAc,EAAE;YACpC,MAAM,IAAI,KAAK,EAAE,CAAC;SACnB;QAED,MAAM,OAAO,GAAG,aAAa,CAAC,EAAE,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;QAChE,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,KAAK,EAAE,CAAC;SACnB;QACD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,IAAI,MAAM,EAAE;YACV,MAAM,GAAG,GAAG,EAAE,CAAC,iBAAiB,EAAE,CAAC;YACnC,IAAI,CAAC,GAAG,EAAE;gBACR,MAAM,IAAI,KAAK,EAAE,CAAC;aACnB;YACD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;YAEf,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC9B;QAED,IAAI,CAAC,kBAAkB,GAAG,EAA4B,CAAC;QACvD,IAAI,CAAC,gBAAgB,GAAG,EAA4B,CAAC;QACrD,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QAEzB,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;YAChD,MAAM,QAAQ,GAAG,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YACnE,IAAI,QAAQ,GAAG,CAAC,EAAE;gBAChB,MAAM,IAAI,KAAK,CACb,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,2CAA2C,aAAa,IAAI,CACrF,CAAC;aACH;YACD,MAAM,MAAM,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC;YACjC,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,KAAK,CACb,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,4CAA4C,aAAa,GAAG,CACrF,CAAC;aACH;YAED,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,GAAG,QAAQ,CAAC;YAClD,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC;YAC9C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,GAAG,EAA2C,CAAC;QACpE,IAAI,CAAC,YAAY,GAAG,EAA4C,CAAC;QACjE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAoB,EAAE,EAAE;YAChD,MAAM,QAAQ,GAAG,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YACnE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;YAClD,IAAI,CAAC,QAAQ,EAAE;gBACb,OAAO,CAAC,IAAI,CACV,WAAW,IAAI,CAAC,WAAW,CAAC,IAAI,yCAAyC,OAAO,CAAC,IAAI,GAAG,CACzF,CAAC;gBACF,OAAO;aACR;YACD,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,mBAAmB,CACzB,QAAgB,EAChB,MAAmB,EACnB,SAAwB;QAExB,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QACnB,EAAE,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QAErC,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAEvC,EAAE,CAAC,mBAAmB,CACpB,QAAQ,EACR,SAAS,CAAC,IAAI,EACd,SAAS,CAAC,IAAI,EACd,SAAS,CAAC,UAAU,EACpB,SAAS,CAAC,MAAM,EAChB,SAAS,CAAC,MAAM,CACjB,CAAC;IACJ,CAAC;IAED,gBAAgB,CAAC,QAAgB;QAC/B,IAAI,CAAC,EAAE,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC;IAED,iBAAiB;QACf,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,kBAAkB,EAAE;YACzC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAW,CAAC,CAAC;SAC/D;QACD,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;IACpC,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACH,mBAAmB,CACjB,MAA+B,EAC/B,MAA+B;QAE/B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,YAAY,CACV,QAA2B,EAC3B,KAAqC;QAErC,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YAChC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;SACtC;QACD,MAAM,EAAE,EAAE,EAAE,GAAG,QAAQ,CAAC;QACxB,mCAAmC;QACnC,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM;QAC5E,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC7D,IAAI,KAAK,EAAE;YACT,mCAAmC;YACnC,+DAA+D;YAC/D,IAAI,MAAM,CAAC,KAAK,EAAE,aAAa,CAAC,EAAE;gBAChC,IAAI,UAAU,GAAG,KAAK,CAAC,WAAgC,CAAC;gBACxD,IAAI,CAAC,UAAU,EAAE;oBACf,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;iBAClC;gBACD,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;aACxE;YACD,IAAI,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE;gBAC3B,IAAI,KAAK,GAAG,KAAK,CAAC,MAAuB,CAAC;gBAC1C,IAAI,CAAC,KAAK,EAAE;oBACV,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;iBACxB;gBACD,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;aACnC;YACD,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;SACvB;IACH,CAAC;IAED,UAAU,CAAC,IAAY,EAAE,GAAG,KAAY;QACtC,iEAAiE;QACjE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC;IAC1E,CAAC;IAED,oBAAoB,CAAC,MAAwB;QAC3C,IAAI,IAAI,CAAC,qBAAqB,KAAK,MAAM,EAAE;YACzC,OAAO;SACR;QACD,KAAK,MAAM,aAAa,IAAI,IAAI,CAAC,kBAAkB,EAAE;YACnD,MAAM,cAAc,GAAG,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;YACvD,MAAM,YAAY,GAAG,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;YAC5D,YAAY,CAAC,cAAc,EAAE,eAAe,aAAa,aAAa,CAAC,CAAC;YACxE,YAAY,CAAC,YAAY,CAAC,CAAC;YAC3B,IAAI,CAAC,mBAAmB,CACtB,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAE,EACvC,cAAc,EACd,YAAY,CACb,CAAC;SACH;QACD,IAAI,CAAC,qBAAqB,GAAG,MAAM,CAAC;IACtC,CAAC;IAEkB,SAAS,CAAC,KAA8B;QACzD,2BAA2B;IAC7B,CAAC;IAED,YAAY,CAAC,QAA+B;QAC1C,cAAc;IAChB,CAAC;IAEQ,MAAM;QACb,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE;YACjC,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnC;IACH,CAAC;IAEQ,MAAM;QACb,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAES,MAAM,CAAC,aAAa,CAAwB;CACvD"}
+{"version":3,"file":"WebGlCoreShader.js","sourceRoot":"","sources":["../../../../../src/core/renderers/webgl/WebGlCoreShader.ts"],"names":[],"mappings":"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"}

package/dist/src/core/renderers/webgl/internal/RendererUtils.d.ts

@@ -1,3 +1,4 @@
+import type { WebGlContextWrapper } from '../../../lib/WebGlContextWrapper.js';
 export interface CoreWebGlParameters {
     MAX_RENDERBUFFER_SIZE: number;
     MAX_TEXTURE_SIZE: number;
@@ -12,9 +13,9 @@ export interface CoreWebGlParameters {
 }
 /**
  * Get device specific webgl parameters
- * @param gl
+ * @param glw
  */
-export declare function getWebGlParameters(gl: WebGLRenderingContext | WebGL2RenderingContext): CoreWebGlParameters;
+export declare function getWebGlParameters(glw: WebGlContextWrapper): CoreWebGlParameters;
 export interface CoreWebGlExtensions {
     ANGLE_instanced_arrays: ANGLE_instanced_arrays | null;
     WEBGL_compressed_texture_s3tc: WEBGL_compressed_texture_s3tc | null;
@@ -28,12 +29,14 @@ export interface CoreWebGlExtensions {
 }
 /**
  * Get device webgl extensions
- * @param gl
+ * @param glw
  */
-export declare function getWebGlExtensions(gl: WebGLRenderingContext): CoreWebGlExtensions;
+export declare function getWebGlExtensions(glw: WebGlContextWrapper): CoreWebGlExtensions;
 /**
  * Allocate big memory chunk that we
  * can re-use to draw quads
+ *
+ * @param glw
  * @param size
  */
-export declare function createIndexBuffer(gl: WebGLRenderingContext | WebGL2RenderingContext, size: number): void;
+export declare function createIndexBuffer(glw: WebGlContextWrapper, size: number): void;

package/dist/src/core/renderers/webgl/internal/RendererUtils.js

@@ -18,9 +18,9 @@
  */
 /**
  * Get device specific webgl parameters
- * @param gl
+ * @param glw
  */
-export function getWebGlParameters(gl) {
+export function getWebGlParameters(glw) {
     const params = {
         MAX_RENDERBUFFER_SIZE: 0,
         MAX_TEXTURE_SIZE: 0,
@@ -38,15 +38,15 @@ export function getWebGlParameters(gl) {
     const keys = Object.keys(params);
     keys.forEach((key) => {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        params[key] = gl.getParameter(gl[key]);
+        params[key] = glw.getParameter(glw[key]);
     });
     return params;
 }
 /**
  * Get device webgl extensions
- * @param gl
+ * @param glw
  */
-export function getWebGlExtensions(gl) {
+export function getWebGlExtensions(glw) {
     const extensions = {
         ANGLE_instanced_arrays: null,
         WEBGL_compressed_texture_s3tc: null,
@@ -62,19 +62,18 @@ export function getWebGlExtensions(gl) {
     const keys = Object.keys(extensions);
     keys.forEach((key) => {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        extensions[key] = gl.getExtension(key);
+        extensions[key] = glw.getExtension(key);
     });
     return extensions;
 }
 /**
  * Allocate big memory chunk that we
  * can re-use to draw quads
+ *
+ * @param glw
  * @param size
  */
-export function createIndexBuffer(gl, size) {
-    if (!gl) {
-        throw new Error('No WebGL context');
-    }
+export function createIndexBuffer(glw, size) {
     const maxQuads = ~~(size / 80);
     const indices = new Uint16Array(maxQuads * 6);
     for (let i = 0, j = 0; i < maxQuads; i += 6, j += 4) {
@@ -85,8 +84,7 @@ export function createIndexBuffer(gl, size) {
         indices[i + 4] = j + 1;
         indices[i + 5] = j + 3;
     }
-    const buffer = gl.createBuffer();
-    gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, buffer);
-    gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, indices, gl.STATIC_DRAW);
+    const buffer = glw.createBuffer();
+    glw.elementArrayBufferData(buffer, indices, glw.STATIC_DRAW);
 }
 //# sourceMappingURL=RendererUtils.js.map

package/dist/src/core/renderers/webgl/internal/RendererUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"RendererUtils.js","sourceRoot":"","sources":["../../../../../../src/core/renderers/webgl/internal/RendererUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RendererUtils.js","sourceRoot":"","sources":["../../../../../../src/core/renderers/webgl/internal/RendererUtils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAiBH;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAChC,GAAwB;IAExB,MAAM,MAAM,GAAwB;QAClC,qBAAqB,EAAE,CAAC;QACxB,gBAAgB,EAAE,CAAC;QACnB,uGAAuG;QACvG,iBAAiB,EAAE,CAAQ;QAC3B,8BAA8B,EAAE,CAAC;QACjC,uBAAuB,EAAE,CAAC;QAC1B,gCAAgC,EAAE,CAAC;QACnC,kBAAkB,EAAE,CAAC;QACrB,mBAAmB,EAAE,CAAC;QACtB,0BAA0B,EAAE,CAAC;QAC7B,4BAA4B,EAAE,CAAC;KAChC,CAAC;IAEF,uCAAuC;IACvC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAqC,CAAC;IACrE,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACnB,mEAAmE;QACnE,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AAgBD;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAChC,GAAwB;IAExB,MAAM,UAAU,GAAwB;QACtC,sBAAsB,EAAE,IAAI;QAC5B,6BAA6B,EAAE,IAAI;QACnC,6BAA6B,EAAE,IAAI;QACnC,4BAA4B,EAAE,IAAI;QAClC,6BAA6B,EAAE,IAAI;QACnC,8BAA8B,EAAE,IAAI;QACpC,qCAAqC,EAAE,IAAI;QAC3C,kCAAkC,EAAE,IAAI;QACxC,uBAAuB,EAAE,IAAI;KAC9B,CAAC;IAEF,uCAAuC;IACvC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAqC,CAAC;IACzE,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACnB,mEAAmE;QACnE,UAAU,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAAC,GAAwB,EAAE,IAAY;IACtE,MAAM,QAAQ,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;IAC/B,MAAM,OAAO,GAAG,IAAI,WAAW,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;IAE9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;QACnD,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACf,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACvB,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACvB,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACvB,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACvB,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KACxB;IAED,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC;IAClC,GAAG,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;AAC/D,CAAC"}

package/dist/src/core/renderers/webgl/internal/ShaderUtils.d.ts

@@ -1,3 +1,4 @@
+import type { WebGlContextWrapper } from '../../../lib/WebGlContextWrapper.js';
 import type { WebGlCoreRenderer } from '../WebGlCoreRenderer.js';
 export interface AttributeInfo {
     name: string;
@@ -41,6 +42,6 @@ export interface ShaderProgramSources {
         fragment: ShaderSource;
     };
 }
-export declare function createShader(gl: WebGLRenderingContext, type: number, source: string): WebGLShader | undefined;
-export declare function createProgram(gl: WebGLRenderingContext, vertexShader: WebGLShader, fragmentShader: WebGLShader): WebGLProgram | undefined;
+export declare function createShader(glw: WebGlContextWrapper, type: number, source: string): WebGLShader | undefined;
+export declare function createProgram(glw: WebGlContextWrapper, vertexShader: WebGLShader, fragmentShader: WebGLShader): WebGLProgram | undefined;
 export {};

package/dist/src/core/renderers/webgl/internal/ShaderUtils.js

@@ -17,34 +17,34 @@
  * limitations under the License.
  */
 //#endregion Types
-export function createShader(gl, type, source) {
-    const shader = gl.createShader(type);
+export function createShader(glw, type, source) {
+    const shader = glw.createShader(type);
     if (!shader) {
         throw new Error();
     }
-    gl.shaderSource(shader, source);
-    gl.compileShader(shader);
-    const success = gl.getShaderParameter(shader, gl.COMPILE_STATUS);
+    glw.shaderSource(shader, source);
+    glw.compileShader(shader);
+    const success = glw.getShaderParameter(shader, glw.COMPILE_STATUS);
     if (success) {
         return shader;
     }
-    console.log(gl.getShaderInfoLog(shader));
-    gl.deleteShader(shader);
+    console.log(glw.getShaderInfoLog(shader));
+    glw.deleteShader(shader);
 }
-export function createProgram(gl, vertexShader, fragmentShader) {
-    const program = gl.createProgram();
+export function createProgram(glw, vertexShader, fragmentShader) {
+    const program = glw.createProgram();
     if (!program) {
         throw new Error();
     }
-    gl.attachShader(program, vertexShader);
-    gl.attachShader(program, fragmentShader);
-    gl.linkProgram(program);
-    const success = gl.getProgramParameter(program, gl.LINK_STATUS);
+    glw.attachShader(program, vertexShader);
+    glw.attachShader(program, fragmentShader);
+    glw.linkProgram(program);
+    const success = glw.getProgramParameter(program, glw.LINK_STATUS);
     if (success) {
         return program;
     }
-    console.log(gl.getProgramInfoLog(program));
-    gl.deleteProgram(program);
+    console.log(glw.getProgramInfoLog(program));
+    glw.deleteProgram(program);
     return undefined;
 }
 //# sourceMappingURL=ShaderUtils.js.map

package/dist/src/core/renderers/webgl/internal/ShaderUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"ShaderUtils.js","sourceRoot":"","sources":["../../../../../../src/core/renderers/webgl/internal/ShaderUtils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AA2EH,kBAAkB;AAElB,MAAM,UAAU,YAAY,CAC1B,EAAyB,EACzB,IAAY,EACZ,MAAc;IAEd,MAAM,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,EAAE,CAAC;KACnB;IACD,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IACzB,MAAM,OAAO,GAAG,EAAE,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC;IACjE,IAAI,OAAO,EAAE;QACX,OAAO,MAAM,CAAC;KACf;IAED,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;IACzC,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,EAAyB,EACzB,YAAyB,EACzB,cAA2B;IAE3B,MAAM,OAAO,GAAG,EAAE,CAAC,aAAa,EAAE,CAAC;IACnC,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,EAAE,CAAC;KACnB;IACD,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACvC,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IACzC,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACxB,MAAM,OAAO,GAAG,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC;IAChE,IAAI,OAAO,EAAE;QACX,OAAO,OAAO,CAAC;KAChB;IAED,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3C,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAC1B,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"file":"ShaderUtils.js","sourceRoot":"","sources":["../../../../../../src/core/renderers/webgl/internal/ShaderUtils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AA4EH,kBAAkB;AAElB,MAAM,UAAU,YAAY,CAC1B,GAAwB,EACxB,IAAY,EACZ,MAAc;IAEd,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACtC,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,EAAE,CAAC;KACnB;IACD,GAAG,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAC1B,MAAM,OAAO,GAAG,GAAG,CAAC,kBAAkB,CAAC,MAAM,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;IACnE,IAAI,OAAO,EAAE;QACX,OAAO,MAAM,CAAC;KACf;IAED,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1C,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,GAAwB,EACxB,YAAyB,EACzB,cAA2B;IAE3B,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,EAAE,CAAC;IACpC,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,EAAE,CAAC;KACnB;IACD,GAAG,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACxC,GAAG,CAAC,YAAY,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAC1C,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACzB,MAAM,OAAO,GAAG,GAAG,CAAC,mBAAmB,CAAC,OAAO,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAClE,IAAI,OAAO,EAAE;QACX,OAAO,OAAO,CAAC;KAChB;IAED,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC5C,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAC3B,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/src/core/renderers/webgl/shaders/DefaultShader.js

@@ -30,12 +30,9 @@ export class DefaultShader extends WebGlCoreShader {
         });
     }
     bindTextures(textures) {
-        const { gl } = this;
-        if (gl.getParameter(gl.TEXTURE_BINDING_2D) === textures[0].ctxTexture) {
-            return;
-        }
-        gl.activeTexture(gl.TEXTURE0);
-        gl.bindTexture(gl.TEXTURE_2D, textures[0].ctxTexture);
+        const { glw } = this;
+        glw.activeTexture(0);
+        glw.bindTexture(textures[0].ctxTexture);
     }
     static shaderSources = {
         vertex: `

package/dist/src/core/renderers/webgl/shaders/DefaultShader.js.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultShader.js","sourceRoot":"","sources":["../../../../../../src/core/renderers/webgl/shaders/DefaultShader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAIxD,MAAM,OAAO,aAAc,SAAQ,eAAe;IAChD,YAAY,QAA2B;QACrC,KAAK,CAAC;YACJ,QAAQ;YACR,UAAU,EAAE,CAAC,YAAY,EAAE,qBAAqB,EAAE,SAAS,CAAC;YAC5D,QAAQ,EAAE;gBACR,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,YAAY,EAAE;gBAC/C,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE;gBAC9C,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE;aAC7C;SACF,CAAC,CAAC;IACL,CAAC;IAEQ,YAAY,CAAC,QAA+B;QACnD,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;QACpB,IAAI,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,kBAAkB,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAE,CAAC,UAAU,EAAE;YACtE,OAAO;SACR;QAED,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QAC9B,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAE,CAAC,UAAU,CAAC,CAAC;IACzD,CAAC;IAED,MAAM,CAAU,aAAa,GAAyB;QACpD,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA8BP;QACD,QAAQ,EAAE;;;;;;;;;;;;;;;;;KAiBT;KACF,CAAC"}
+{"version":3,"file":"DefaultShader.js","sourceRoot":"","sources":["../../../../../../src/core/renderers/webgl/shaders/DefaultShader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAIxD,MAAM,OAAO,aAAc,SAAQ,eAAe;IAChD,YAAY,QAA2B;QACrC,KAAK,CAAC;YACJ,QAAQ;YACR,UAAU,EAAE,CAAC,YAAY,EAAE,qBAAqB,EAAE,SAAS,CAAC;YAC5D,QAAQ,EAAE;gBACR,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,YAAY,EAAE;gBAC/C,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE;gBAC9C,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE;aAC7C;SACF,CAAC,CAAC;IACL,CAAC;IAEQ,YAAY,CAAC,QAA+B;QACnD,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QACrB,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACrB,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,CAAU,aAAa,GAAyB;QACpD,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA8BP;QACD,QAAQ,EAAE;;;;;;;;;;;;;;;;;KAiBT;KACF,CAAC"}

package/dist/src/core/renderers/webgl/shaders/DefaultShaderBatched.js

@@ -37,13 +37,13 @@ export class DefaultShaderBatched extends WebGlCoreShader {
         });
     }
     bindTextures(texture) {
-        const { renderer, gl } = this;
+        const { renderer, glw } = this;
         if (texture.length > renderer.system.parameters.MAX_VERTEX_TEXTURE_IMAGE_UNITS) {
             throw new Error(`DefaultShaderBatched: Cannot bind more than ${renderer.system.parameters.MAX_VERTEX_TEXTURE_IMAGE_UNITS} textures`);
         }
         texture.forEach((t, i) => {
-            gl.activeTexture(gl.TEXTURE0 + i);
-            gl.bindTexture(gl.TEXTURE_2D, t.ctxTexture);
+            glw.activeTexture(i);
+            glw.bindTexture(t.ctxTexture);
         });
         const samplers = Array.from(Array(texture.length).keys());
         this.setUniform('u_textures[0]', samplers);

package/dist/src/core/renderers/webgl/shaders/DefaultShaderBatched.js.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultShaderBatched.js","sourceRoot":"","sources":["../../../../../../src/core/renderers/webgl/shaders/DefaultShaderBatched.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,sDAAsD;AAEtD,MAAM,OAAO,oBAAqB,SAAQ,eAAe;IAC9C,uBAAuB,GAAG,IAAI,CAAC;IAExC,YAAY,QAA2B;QACrC,KAAK,CAAC;YACJ,QAAQ;YACR,UAAU,EAAE;gBACV,YAAY;gBACZ,qBAAqB;gBACrB,SAAS;gBACT,gBAAgB;aACjB;YACD,QAAQ,EAAE;gBACR,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,YAAY,EAAE;gBAC/C,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE;gBAC9C,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,YAAY,EAAE;aACjD;SACF,CAAC,CAAC;IACL,CAAC;IAEQ,YAAY,CAAC,OAA8B;QAClD,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;QAC9B,IACE,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,8BAA8B,EAC1E;YACA,MAAM,IAAI,KAAK,CACb,+CAA+C,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,8BAA8B,WAAW,CACpH,CAAC;SACH;QACD,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACvB,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;YAClC,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,CAAU,aAAa,GAAyB;QACpD,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAiCP;QACD,QAAQ,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC;wBACR,YAAY;;;;;;;;;;;;;;;kDAec,YAAY;UACpD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE,CAAC;aACrC,GAAG,CACF,CAAC,GAAG,EAAE,EAAE,CAAC;YACT,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,cAAc,GAAG;wCACb,GAAG;;SAElC,CACE;aACA,IAAI,CAAC,EAAE,CAAC;;;;;;;KAOd;KACF,CAAC"}
+{"version":3,"file":"DefaultShaderBatched.js","sourceRoot":"","sources":["../../../../../../src/core/renderers/webgl/shaders/DefaultShaderBatched.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,sDAAsD;AAEtD,MAAM,OAAO,oBAAqB,SAAQ,eAAe;IAC9C,uBAAuB,GAAG,IAAI,CAAC;IAExC,YAAY,QAA2B;QACrC,KAAK,CAAC;YACJ,QAAQ;YACR,UAAU,EAAE;gBACV,YAAY;gBACZ,qBAAqB;gBACrB,SAAS;gBACT,gBAAgB;aACjB;YACD,QAAQ,EAAE;gBACR,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,YAAY,EAAE;gBAC/C,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE;gBAC9C,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,YAAY,EAAE;aACjD;SACF,CAAC,CAAC;IACL,CAAC;IAEQ,YAAY,CAAC,OAA8B;QAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAC/B,IACE,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,8BAA8B,EAC1E;YACA,MAAM,IAAI,KAAK,CACb,+CAA+C,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,8BAA8B,WAAW,CACpH,CAAC;SACH;QACD,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACvB,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;YACrB,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,CAAU,aAAa,GAAyB;QACpD,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAiCP;QACD,QAAQ,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC;wBACR,YAAY;;;;;;;;;;;;;;;kDAec,YAAY;UACpD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE,CAAC;aACrC,GAAG,CACF,CAAC,GAAG,EAAE,EAAE,CAAC;YACT,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,cAAc,GAAG;wCACb,GAAG;;SAElC,CACE;aACA,IAAI,CAAC,EAAE,CAAC;;;;;;;KAOd;KACF,CAAC"}

package/dist/src/core/renderers/webgl/shaders/DynamicShader.d.ts

@@ -50,6 +50,7 @@ export declare class DynamicShader extends WebGlCoreShader {
     effects: Array<InstanceType<EffectMap[keyof EffectMap]>>;
     constructor(renderer: WebGlCoreRenderer, props: DynamicShaderProps, effectContructors: Partial<EffectMap>);
     bindTextures(textures: WebGlCoreCtxTexture[]): void;
+    private calculateProps;
     protected bindProps(props: Required<DynamicShaderProps>): void;
     static createShader(props: DynamicShaderProps, effectContructors: Partial<EffectMap>): {
         effects: ShaderEffect[];

package/dist/src/core/renderers/webgl/shaders/DynamicShader.js

@@ -1,5 +1,19 @@
 import { WebGlCoreShader, } from '../WebGlCoreShader.js';
 import { ShaderEffect } from './effects/ShaderEffect.js';
+import memize from 'memize';
+const effectCache = new Map();
+const getResolvedEffect = (effects, effectContructors) => {
+    const key = JSON.stringify(effects);
+    if (effectCache.has(key)) {
+        return effectCache.get(key);
+    }
+    const value = (effects ?? []).map((effect) => ({
+        type: effect.type,
+        props: effectContructors[effect.type].resolveDefaults((effect.props || {})),
+    }));
+    effectCache.set(key, value);
+    return value;
+};
 export class DynamicShader extends WebGlCoreShader {
     effects = [];
     constructor(renderer, props, effectContructors) {
@@ -21,17 +35,19 @@ export class DynamicShader extends WebGlCoreShader {
             },
         });
         this.effects = shader.effects;
+        this.calculateProps = memize(this.calculateProps.bind(this));
     }
     bindTextures(textures) {
-        const { gl } = this;
-        gl.activeTexture(gl.TEXTURE0);
-        gl.bindTexture(gl.TEXTURE_2D, textures[0].ctxTexture);
+        const { glw } = this;
+        glw.activeTexture(0);
+        glw.bindTexture(textures[0].ctxTexture);
     }
-    bindProps(props) {
-        const effects = this.renderer.shManager.getRegisteredEffects();
-        props.effects?.forEach((eff, index) => {
+    calculateProps(effects) {
+        const regEffects = this.renderer.shManager.getRegisteredEffects();
+        const results = [];
+        effects?.forEach((eff, index) => {
             const effect = this.effects[index];
-            const fxClass = effects[effect.name];
+            const fxClass = regEffects[effect.name];
             const props = eff.props ?? {};
             const uniInfo = effect.uniformInfo;
             Object.keys(props).forEach((p) => {
@@ -43,9 +59,16 @@ export class DynamicShader extends WebGlCoreShader {
                 if (Array.isArray(value)) {
                     value = new Float32Array(value);
                 }
-                this.setUniform(propInfo.name, value);
+                results.push({ name: propInfo.name, value });
             });
         });
+        return results;
+    }
+    bindProps(props) {
+        const results = this.calculateProps(props.effects);
+        results.forEach((r) => {
+            this.setUniform(r.name, r.value);
+        });
     }
     static createShader(props, effectContructors) {
         //counts duplicate effects
@@ -183,10 +206,7 @@ export class DynamicShader extends WebGlCoreShader {
     }
     static resolveDefaults(props, effectContructors) {
         return {
-            effects: (props.effects ?? []).map((effect) => ({
-                type: effect.type,
-                props: effectContructors[effect.type].resolveDefaults((effect.props || {})),
-            })),
+            effects: getResolvedEffect(props.effects, effectContructors),
             $dimensions: {
                 width: 0,
                 height: 0,

package/dist/src/core/renderers/webgl/shaders/DynamicShader.js.map

@@ -1 +1 @@
-{"version":3,"file":"DynamicShader.js","sourceRoot":"","sources":["../../../../../../src/core/renderers/webgl/shaders/DynamicShader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DynamicShader.js","sourceRoot":"","sources":["../../../../../../src/core/renderers/webgl/shaders/DynamicShader.ts"],"names":[],"mappings":"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"}

package/dist/src/core/renderers/webgl/shaders/RoundedRectangle.js

@@ -46,9 +46,9 @@ export class RoundedRectangle extends WebGlCoreShader {
         };
     }
     bindTextures(textures) {
-        const { gl } = this;
-        gl.activeTexture(gl.TEXTURE0);
-        gl.bindTexture(gl.TEXTURE_2D, textures[0].ctxTexture);
+        const { glw } = this;
+        glw.activeTexture(0);
+        glw.bindTexture(textures[0].ctxTexture);
     }
     bindProps(props) {
         this.setUniform('u_radius', props.radius);

package/dist/src/core/renderers/webgl/shaders/RoundedRectangle.js.map

@@ -1 +1 @@
-{"version":3,"file":"RoundedRectangle.js","sourceRoot":"","sources":["../../../../../../src/core/renderers/webgl/shaders/RoundedRectangle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EACL,eAAe,GAEhB,MAAM,uBAAuB,CAAC;AAgB/B;;;GAGG;AACH,MAAM,OAAO,gBAAiB,SAAQ,eAAe;IACnD,YAAY,QAA2B;QACrC,KAAK,CAAC;YACJ,QAAQ;YACR,UAAU,EAAE,CAAC,YAAY,EAAE,qBAAqB,EAAE,SAAS,CAAC;YAC5D,QAAQ,EAAE;gBACR,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,YAAY,EAAE;gBAC/C,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE;gBAC9C,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE;gBAC3C,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,YAAY,EAAE;gBAC/C,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE;aAC3C;SACF,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,eAAe,CAAwB;IAE9C,MAAM,CAAU,eAAe,CAC7B,KAA4B;QAE5B,OAAO;YACL,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,EAAE;YAC1B,WAAW,EAAE;gBACX,KAAK,EAAE,CAAC;gBACR,MAAM,EAAE,CAAC;aACV;SACF,CAAC;IACJ,CAAC;IAEQ,YAAY,CAAC,QAA+B;QACnD,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;QACpB,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QAC9B,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAE,CAAC,UAAU,CAAC,CAAC;IACzD,CAAC;IAEkB,SAAS,CAAC,KAAsC;QACjE,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAEQ,mBAAmB,CAC1B,MAAuC,EACvC,MAAuC;QAEvC,OAAO,CACL,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;YAC/B,MAAM,CAAC,WAAW,CAAC,KAAK,KAAK,MAAM,CAAC,WAAW,CAAC,KAAK;YACrD,MAAM,CAAC,WAAW,CAAC,MAAM,KAAK,MAAM,CAAC,WAAW,CAAC,MAAM,CACxD,CAAC;IACJ,CAAC;IAED,MAAM,CAAU,aAAa,GAAyB;QACpD,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA+BP;QACD,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAgCT;KACF,CAAC"}
+{"version":3,"file":"RoundedRectangle.js","sourceRoot":"","sources":["../../../../../../src/core/renderers/webgl/shaders/RoundedRectangle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EACL,eAAe,GAEhB,MAAM,uBAAuB,CAAC;AAgB/B;;;GAGG;AACH,MAAM,OAAO,gBAAiB,SAAQ,eAAe;IACnD,YAAY,QAA2B;QACrC,KAAK,CAAC;YACJ,QAAQ;YACR,UAAU,EAAE,CAAC,YAAY,EAAE,qBAAqB,EAAE,SAAS,CAAC;YAC5D,QAAQ,EAAE;gBACR,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,YAAY,EAAE;gBAC/C,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE;gBAC9C,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE;gBAC3C,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,YAAY,EAAE;gBAC/C,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE;aAC3C;SACF,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,eAAe,CAAwB;IAE9C,MAAM,CAAU,eAAe,CAC7B,KAA4B;QAE5B,OAAO;YACL,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,EAAE;YAC1B,WAAW,EAAE;gBACX,KAAK,EAAE,CAAC;gBACR,MAAM,EAAE,CAAC;aACV;SACF,CAAC;IACJ,CAAC;IAEQ,YAAY,CAAC,QAA+B;QACnD,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QACrB,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACrB,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;IAEkB,SAAS,CAAC,KAAsC;QACjE,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAEQ,mBAAmB,CAC1B,MAAuC,EACvC,MAAuC;QAEvC,OAAO,CACL,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;YAC/B,MAAM,CAAC,WAAW,CAAC,KAAK,KAAK,MAAM,CAAC,WAAW,CAAC,KAAK;YACrD,MAAM,CAAC,WAAW,CAAC,MAAM,KAAK,MAAM,CAAC,WAAW,CAAC,MAAM,CACxD,CAAC;IACJ,CAAC;IAED,MAAM,CAAU,aAAa,GAAyB;QACpD,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA+BP;QACD,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAgCT;KACF,CAAC"}

package/dist/src/core/renderers/webgl/shaders/SdfShader.js

@@ -51,9 +51,9 @@ export class SdfShader extends WebGlCoreShader {
         });
     }
     bindTextures(textures) {
-        const { gl } = this;
-        gl.activeTexture(gl.TEXTURE0);
-        gl.bindTexture(gl.TEXTURE_2D, textures[0].ctxTexture);
+        const { glw } = this;
+        glw.activeTexture(0);
+        glw.bindTexture(textures[0].ctxTexture);
     }
     bindProps(props) {
         const resolvedProps = SdfShader.resolveDefaults(props);

package/dist/src/core/renderers/webgl/shaders/SdfShader.js.map

@@ -1 +1 @@
-{"version":3,"file":"SdfShader.js","sourceRoot":"","sources":["../../../../../../src/core/renderers/webgl/shaders/SdfShader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SdfShader.js","sourceRoot":"","sources":["../../../../../../src/core/renderers/webgl/shaders/SdfShader.ts"],"names":[],"mappings":"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"}

package/dist/src/core/renderers/webgl/shaders/effects/BorderEffect.js

@@ -48,7 +48,7 @@ export class BorderEffect extends ShaderEffect {
     };
     static onEffectMask = `
   float mask = clamp(shaderMask + width, 0.0, 1.0) - clamp(shaderMask, 0.0, 1.0);
-  return mix(shaderColor, maskColor, mask);
+  return mix(shaderColor, mix(shaderColor, maskColor, maskColor.a), mask);
   `;
     static onColorize = `
     return color;