@lightningjs/renderer 0.6.1 → 0.7.1

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;

package/dist/src/core/renderers/webgl/shaders/effects/GrayscaleEffect.d.ts

@@ -1,9 +1,22 @@
-import { ShaderEffect } from './ShaderEffect.js';
+import { ShaderEffect, type DefaultEffectProps, type ShaderEffectUniforms } from './ShaderEffect.js';
+/**
+ * Properties of the {@link GrayscaleEffect} effect
+ */
+export interface GrayscaleEffectProps extends DefaultEffectProps {
+    /**
+     * Grey scale amount between 0 - 1.
+     *
+     * @default 1
+     */
+    amount?: number;
+}
 /**
  * Grayscale effect grayscales the color values of the current mask color
  */
 export declare class GrayscaleEffect extends ShaderEffect {
     readonly name = "grayscale";
     static getEffectKey(): string;
+    static resolveDefaults(props: GrayscaleEffectProps): Required<GrayscaleEffectProps>;
+    static uniforms: ShaderEffectUniforms;
     static onColorize: string;
 }

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ShaderEffect } from './ShaderEffect.js';
+import { ShaderEffect, } from './ShaderEffect.js';
 /**
  * Grayscale effect grayscales the color values of the current mask color
  */
@@ -25,11 +25,21 @@ export class GrayscaleEffect extends ShaderEffect {
     static getEffectKey() {
         return `grayscale`;
     }
+    static resolveDefaults(props) {
+        return {
+            amount: props.amount ?? 1,
+        };
+    }
+    static uniforms = {
+        amount: {
+            value: 1,
+            method: 'uniform1f',
+            type: 'float',
+        },
+    };
     static onColorize = `
-    vec3 color = pow(maskColor.rgb, vec3(2.0));
-    float gray = dot(color, vec3(0.2126, 0.7152, 0.0722));
-    float gammaGray = sqrt(gray);
-    return vec4(gammaGray, gammaGray, gammaGray, 1.0);
+    float grayness = 0.2 * maskColor.r + 0.6 * maskColor.g + 0.2 * maskColor.b;
+    return vec4(amount * vec3(grayness) + (1.0 - amount) * maskColor.rgb, maskColor.a);
   `;
 }
 //# sourceMappingURL=GrayscaleEffect.js.map

package/dist/src/core/renderers/webgl/shaders/effects/GrayscaleEffect.js.map

@@ -1 +1 @@
-{"version":3,"file":"GrayscaleEffect.js","sourceRoot":"","sources":["../../../../../../../src/core/renderers/webgl/shaders/effects/GrayscaleEffect.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD;;GAEG;AACH,MAAM,OAAO,eAAgB,SAAQ,YAAY;IAC7B,IAAI,GAAG,WAAW,CAAC;IAErC,MAAM,CAAU,YAAY;QAC1B,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,MAAM,CAAU,UAAU,GAAG;;;;;GAK5B,CAAC"}
+{"version":3,"file":"GrayscaleEffect.js","sourceRoot":"","sources":["../../../../../../../src/core/renderers/webgl/shaders/effects/GrayscaleEffect.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,EACL,YAAY,GAGb,MAAM,mBAAmB,CAAC;AAc3B;;GAEG;AACH,MAAM,OAAO,eAAgB,SAAQ,YAAY;IAC7B,IAAI,GAAG,WAAW,CAAC;IAErC,MAAM,CAAU,YAAY;QAC1B,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,MAAM,CAAU,eAAe,CAC7B,KAA2B;QAE3B,OAAO;YACL,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,CAAC;SAC1B,CAAC;IACJ,CAAC;IAED,MAAM,CAAU,QAAQ,GAAyB;QAC/C,MAAM,EAAE;YACN,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,WAAW;YACnB,IAAI,EAAE,OAAO;SACd;KACF,CAAC;IAEF,MAAM,CAAU,UAAU,GAAG;;;GAG5B,CAAC"}

package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/SdfTrFontFace.js

@@ -51,14 +51,14 @@ export class SdfTrFontFace extends TrFontFace {
             .then(async (response) => {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             this.data = await response.json();
-            // We know `data` is defined here, because we just set it
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            this.shaper = new SdfFontShaper(this.data);
             // Add all the glyphs to the glyph map
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             this.data.chars.forEach((glyph) => {
                 this.glyphMap.set(glyph.id, glyph);
             });
+            // We know `data` is defined here, because we just set it
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            this.shaper = new SdfFontShaper(this.data, this.glyphMap);
             this.checkLoaded();
         })
             .catch(console.error);

package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/SdfTrFontFace.js.map

@@ -1 +1 @@
-{"version":3,"file":"SdfTrFontFace.js","sourceRoot":"","sources":["../../../../../../src/core/text-rendering/font-face-types/SdfTrFontFace/SdfTrFontFace.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SdfTrFontFace.js","sourceRoot":"","sources":["../../../../../../src/core/text-rendering/font-face-types/SdfTrFontFace/SdfTrFontFace.ts"],"names":[],"mappings":"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"}

package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/SdfFontShaper.d.ts

@@ -2,8 +2,9 @@ import type { PeekableIterator } from '../../../renderers/SdfTextRenderer/intern
 import { FontShaper, type FontShaperProps, type MappedGlyphInfo, type UnmappedCharacterInfo } from './FontShaper.js';
 export declare class SdfFontShaper extends FontShaper {
     private readonly data;
+    private readonly glyphMap;
     private readonly kernings;
-    constructor(data: SdfFontData);
+    constructor(data: SdfFontData, glyphMap: Map<number, SdfFontData['chars'][0]>);
     shapeText(props: FontShaperProps, codepoints: PeekableIterator<number>): Generator<MappedGlyphInfo | UnmappedCharacterInfo, void>;
 }
 export interface SdfFontData {

package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/SdfFontShaper.js

@@ -20,10 +20,12 @@ import { SpecialCodepoints } from '../../../renderers/SdfTextRenderer/internal/S
 import { FontShaper, } from './FontShaper.js';
 export class SdfFontShaper extends FontShaper {
     data;
+    glyphMap;
     kernings;
-    constructor(data) {
+    constructor(data, glyphMap) {
         super();
         this.data = data;
+        this.glyphMap = glyphMap;
         const kernings = (this.kernings = {});
         data.kernings.forEach((kerning) => {
             const second = kerning.second;
@@ -37,7 +39,7 @@ export class SdfFontShaper extends FontShaper {
         let lastGlyphId = undefined;
         while ((codepointResult = codepoints.peek()) && !codepointResult.done) {
             const codepoint = codepointResult.value;
-            const glyph = this.data.chars.find((char) => char.id === codepoint);
+            const glyph = this.glyphMap.get(codepoint);
             codepoints.next();
             if (glyph !== undefined) {
                 // We found a glyph for this codepoint

package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/SdfFontShaper.js.map

@@ -1 +1 @@
-{"version":3,"file":"SdfFontShaper.js","sourceRoot":"","sources":["../../../../../../../src/core/text-rendering/font-face-types/SdfTrFontFace/internal/SdfFontShaper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kEAAkE,CAAC;AACrG,OAAO,EACL,UAAU,GAIX,MAAM,iBAAiB,CAAC;AAUzB,MAAM,OAAO,aAAc,SAAQ,UAAU;IAC1B,IAAI,CAAc;IAClB,QAAQ,CAAe;IAExC,YAAY,IAAiB;QAC3B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QAEjB,MAAM,QAAQ,GAAiB,CAAC,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAChC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAC9B,MAAM,MAAM,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YAC3D,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;QACzC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED,CAAC,SAAS,CACR,KAAsB,EACtB,UAAoC;QAEpC,IAAI,eAAuC,CAAC;QAC5C,IAAI,WAAW,GAAuB,SAAS,CAAC;QAChD,OAAO,CAAC,eAAe,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE;YACrE,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC;YACxC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC;YACpE,UAAU,CAAC,IAAI,EAAE,CAAC;YAClB,IAAI,KAAK,KAAK,SAAS,EAAE;gBACvB,sCAAsC;gBACtC,8BAA8B;gBAE9B;;mBAEG;gBACH,MAAM,OAAO,GACX,WAAW,KAAK,SAAS;oBACvB,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;wBAC7C,KAAK,CAAC,aAAa;oBACrB,CAAC,CAAC,CAAC,CAAC;gBAER,WAAW,GAAG,KAAK,CAAC,EAAE,CAAC;gBACvB,MAAM;oBACJ,MAAM,EAAE,IAAI;oBACZ,OAAO,EAAE,KAAK,CAAC,EAAE;oBACjB,SAAS;oBACT,OAAO,EAAE,UAAU,CAAC,SAAS;oBAC7B,QAAQ,EAAE,KAAK,CAAC,QAAQ,GAAG,OAAO;oBAClC,QAAQ,EAAE,CAAC;oBACX,OAAO,EAAE,KAAK,CAAC,OAAO,GAAG,OAAO;oBAChC,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,QAAQ,EAAE,CAAC;oBACX,QAAQ,EAAE,CAAC;oBACX,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,MAAM,EAAE,KAAK,CAAC,MAAM;iBACrB,CAAC;aACH;iBAAM;gBACL,4CAA4C;gBAC5C,oCAAoC;gBAEpC,sEAAsE;gBACtE,uEAAuE;gBACvE,iBAAiB;gBACjB,IAAI,SAAS,KAAK,iBAAiB,CAAC,SAAS,EAAE;oBAC7C,WAAW,GAAG,SAAS,CAAC;iBACzB;gBACD,MAAM;oBACJ,MAAM,EAAE,KAAK;oBACb,SAAS;oBACT,OAAO,EAAE,UAAU,CAAC,SAAS;iBAC9B,CAAC;aACH;SACF;IACH,CAAC;CACF"}
+{"version":3,"file":"SdfFontShaper.js","sourceRoot":"","sources":["../../../../../../../src/core/text-rendering/font-face-types/SdfTrFontFace/internal/SdfFontShaper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kEAAkE,CAAC;AACrG,OAAO,EACL,UAAU,GAIX,MAAM,iBAAiB,CAAC;AAUzB,MAAM,OAAO,aAAc,SAAQ,UAAU;IAC1B,IAAI,CAAc;IAClB,QAAQ,CAAuC;IAC/C,QAAQ,CAAe;IAExC,YAAY,IAAiB,EAAE,QAA8C;QAC3E,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEzB,MAAM,QAAQ,GAAiB,CAAC,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAChC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAC9B,MAAM,MAAM,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YAC3D,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;QACzC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED,CAAC,SAAS,CACR,KAAsB,EACtB,UAAoC;QAEpC,IAAI,eAAuC,CAAC;QAC5C,IAAI,WAAW,GAAuB,SAAS,CAAC;QAChD,OAAO,CAAC,eAAe,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE;YACrE,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC;YACxC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC3C,UAAU,CAAC,IAAI,EAAE,CAAC;YAClB,IAAI,KAAK,KAAK,SAAS,EAAE;gBACvB,sCAAsC;gBACtC,8BAA8B;gBAE9B;;mBAEG;gBACH,MAAM,OAAO,GACX,WAAW,KAAK,SAAS;oBACvB,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;wBAC7C,KAAK,CAAC,aAAa;oBACrB,CAAC,CAAC,CAAC,CAAC;gBAER,WAAW,GAAG,KAAK,CAAC,EAAE,CAAC;gBACvB,MAAM;oBACJ,MAAM,EAAE,IAAI;oBACZ,OAAO,EAAE,KAAK,CAAC,EAAE;oBACjB,SAAS;oBACT,OAAO,EAAE,UAAU,CAAC,SAAS;oBAC7B,QAAQ,EAAE,KAAK,CAAC,QAAQ,GAAG,OAAO;oBAClC,QAAQ,EAAE,CAAC;oBACX,OAAO,EAAE,KAAK,CAAC,OAAO,GAAG,OAAO;oBAChC,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,QAAQ,EAAE,CAAC;oBACX,QAAQ,EAAE,CAAC;oBACX,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,MAAM,EAAE,KAAK,CAAC,MAAM;iBACrB,CAAC;aACH;iBAAM;gBACL,4CAA4C;gBAC5C,oCAAoC;gBAEpC,sEAAsE;gBACtE,uEAAuE;gBACvE,iBAAiB;gBACjB,IAAI,SAAS,KAAK,iBAAiB,CAAC,SAAS,EAAE;oBAC7C,WAAW,GAAG,SAAS,CAAC;iBACzB;gBACD,MAAM;oBACJ,MAAM,EAAE,KAAK;oBACb,SAAS;oBACT,OAAO,EAAE,UAAU,CAAC,SAAS;iBAC9B,CAAC;aACH;SACF;IACH,CAAC;CACF"}

package/dist/src/core/text-rendering/renderers/CanvasTextRenderer.d.ts

@@ -1,6 +1,6 @@
 import type { Stage } from '../../Stage.js';
 import type { Matrix3d } from '../../lib/Matrix3d.js';
-import { type Bound, type Rect, type BoundWithValid } from '../../lib/utils.js';
+import { type Bound, type BoundWithValid, type RectWithValid } from '../../lib/utils.js';
 import type { ImageTexture } from '../../textures/ImageTexture.js';
 import type { TrFontFace } from '../font-face-types/TrFontFace.js';
 import { LightningTextTextureRenderer, type RenderInfo } from './LightningTextTextureRenderer.js';
@@ -40,7 +40,7 @@ export declare class CanvasTextRenderer extends TextRenderer<CanvasTextRendererS
     addFontFace(fontFace: TrFontFace): void;
     createState(props: TrProps): CanvasTextRendererState;
     updateState(state: CanvasTextRendererState): void;
-    renderQuads(state: CanvasTextRendererState, transform: Matrix3d, clippingRect: Rect | null, alpha: number): void;
+    renderQuads(state: CanvasTextRendererState, transform: Matrix3d, clippingRect: RectWithValid, alpha: number): void;
     /**
      * Invalidate the visible window stored in the state. This will cause a new
      * visible window to be calculated on the next update.

package/dist/src/core/text-rendering/renderers/CanvasTextRenderer.js

@@ -141,6 +141,26 @@ export class CanvasTextRenderer extends TextRenderer {
                 state.props.letterSpacing = value;
                 this.invalidateLayoutCache(state);
             },
+            lineHeight: (state, value) => {
+                state.props.lineHeight = value;
+                this.invalidateLayoutCache(state);
+            },
+            maxLines: (state, value) => {
+                state.props.maxLines = value;
+                this.invalidateLayoutCache(state);
+            },
+            textBaseline: (state, value) => {
+                state.props.textBaseline = value;
+                this.invalidateLayoutCache(state);
+            },
+            verticalAlign: (state, value) => {
+                state.props.verticalAlign = value;
+                this.invalidateLayoutCache(state);
+            },
+            overflowSuffix: (state, value) => {
+                state.props.overflowSuffix = value;
+                this.invalidateLayoutCache(state);
+            },
             // debug: (state, value) => {
             //   state.props.debug = value;
             // },
@@ -240,6 +260,11 @@ export class CanvasTextRenderer extends TextRenderer {
                 wordWrap: state.props.contain !== 'none',
                 wordWrapWidth: state.props.contain === 'none' ? undefined : state.props.width,
                 letterSpacing: state.props.letterSpacing,
+                lineHeight: state.props.lineHeight,
+                maxLines: state.props.maxLines,
+                textBaseline: state.props.textBaseline,
+                verticalAlign: state.props.verticalAlign,
+                overflowSuffix: state.props.overflowSuffix,
             };
             // const renderInfoCalculateTime = performance.now();
             state.renderInfo = state.lightning2TextRenderer.calculateRenderInfo();