@lightningtv/renderer 3.2.3 → 3.2.5

package/src/core/CoreTextNode.ts

@@ -95,6 +95,7 @@ export class CoreTextNode extends CoreNode implements CoreTextNodeProps {
         dimensions,
       } satisfies NodeTextureLoadedPayload);
     }
+    this.textureLoaded = true;
     this.setUpdateType(UpdateType.IsRenderable);
   };
 
@@ -208,7 +209,7 @@ export class CoreTextNode extends CoreNode implements CoreTextNodeProps {
    * Override is renderable check for SDF text nodes
    */
   override updateIsRenderable(): void {
-    // SDF text nodes are always renderable if they have a valid layout
+    // Canvas text relies on CoreNode's standard textureLoaded logic.
     if (this._type === 'canvas') {
       super.updateIsRenderable();
       return;

package/src/core/CoreTextureManager.ts

@@ -311,7 +311,10 @@ export class CoreTextureManager extends EventEmitter {
     let texture: Texture | undefined;
     const TextureClass = this.txConstructors[textureType];
     if (!TextureClass) {
-      throw new Error(`Texture type "${textureType}" is not registered`);
+      throw new TextureError(
+        TextureErrorCode.TEXTURE_TYPE_NOT_REGISTERED,
+        `Texture type "${textureType}" is not registered`,
+      );
     }
     const resolvedProps = TextureClass.resolveDefaults(props as any);
     const cacheKey = TextureClass.makeCacheKey(resolvedProps as any);
@@ -360,7 +363,10 @@ export class CoreTextureManager extends EventEmitter {
     // Get texture data - early return on failure
     const textureDataResult = await texture.getTextureData().catch((err) => {
       console.error(err);
-      texture.setState('failed');
+      texture.setState(
+        'failed',
+        new TextureError(TextureErrorCode.TEXTURE_DATA_NULL),
+      );
       return null;
     });
 
@@ -375,7 +381,10 @@ export class CoreTextureManager extends EventEmitter {
     if (shouldUploadImmediately === true) {
       await this.uploadTexture(texture).catch((err) => {
         console.error(`Failed to upload texture:`, err);
-        texture.setState('failed');
+        texture.setState(
+          'failed',
+          new TextureError(TextureErrorCode.TEXTURE_DATA_NULL),
+        );
       });
       return;
     }
@@ -396,7 +405,10 @@ export class CoreTextureManager extends EventEmitter {
       this.stage.txMemManager.criticalCleanupRequested === true
     ) {
       // we're at a critical memory threshold, don't upload textures
-      texture.setState('failed');
+      texture.setState(
+        'failed',
+        new TextureError(TextureErrorCode.MEMORY_THRESHOLD_EXCEEDED),
+      );
       return;
     }
 

package/src/core/animations/CoreAnimation.ts

@@ -1,4 +1,8 @@
-import { type CoreNode, type CoreNodeAnimateProps } from '../CoreNode.js';
+import {
+  type CoreNode,
+  type CoreNodeAnimateProps,
+  UpdateType,
+} from '../CoreNode.js';
 import { getTimingFunction, type TimingFunction } from '../utils.js';
 import { mergeColorProgress } from '../../utils.js';
 import { EventEmitter } from '../../common/EventEmitter.js';
@@ -258,6 +262,7 @@ export class CoreAnimation extends EventEmitter {
         this.propValuesMap['shaderProps'],
         easing,
       );
+      this.node.setUpdateType(UpdateType.RecalcUniforms);
     }
 
     if (this.progress === 1) {

package/src/core/shaders/webgl/Border.ts

@@ -29,7 +29,6 @@ export const Border: WebGlShaderType<BorderProps> = {
     uniform float u_pixelRatio;
     uniform vec2 u_dimensions;
 
-    uniform vec4 u_radius;
     uniform vec4 u_borderWidth;
     uniform float u_borderGap;
     uniform float u_borderAlign;

package/src/core/shaders/webgl/RoundedWithBorderAndShadow.ts

@@ -154,6 +154,7 @@ export const RoundedWithBorderAndShadow: WebGlShaderType<RoundedWithBorderAndSha
     uniform vec4 u_borderColor;
     uniform vec4 u_shadowColor;
     uniform vec4 u_shadow;
+    uniform float u_borderGap;
 
     varying vec4 v_color;
     varying vec2 v_textureCoords;

package/src/core/text-rendering/SdfFontHandler.ts

@@ -520,7 +520,7 @@ export const measureText = (
   }
 
   let width = 0;
-  let prevCodepoint = 0;
+  let prevGlyphId = 0;
   for (let i = 0; i < textLength; i++) {
     const codepoint = text.codePointAt(i) as number;
     if (codepoint > 0xffff) {
@@ -548,10 +548,10 @@ export const measureText = (
     let advance = glyph.xadvance;
 
     // Add kerning if there's a previous character
-    if (prevCodepoint !== 0) {
-      const seconds = kernings[codepoint];
+    if (prevGlyphId !== 0) {
+      const seconds = kernings[glyph.id];
       if (seconds !== undefined) {
-        const amount = seconds[prevCodepoint];
+        const amount = seconds[prevGlyphId];
         if (amount !== undefined) {
           advance += amount;
         }
@@ -559,7 +559,7 @@ export const measureText = (
     }
 
     width += advance + letterSpacing;
-    prevCodepoint = codepoint;
+    prevGlyphId = glyph.id;
   }
 
   return width;

package/src/core/text-rendering/SdfTextRenderer.ts

@@ -311,7 +311,7 @@ const generateTextLayout = (
     const line = lines[i] as TextLineStruct;
     const textLine = line[0];
     const textLineLength = textLine.length;
-    let prevCodepoint = 0;
+    let prevGlyphId = 0;
     currentX = line[3];
     //convert Y coord to vertex value
     currentY = line[4] / fontScale;
@@ -340,20 +340,23 @@ const generateTextLayout = (
         }
       }
 
-      // Calculate advance with kerning (in design units)
-      let advance = glyph.xadvance;
+      // Kerning offsets the current glyph relative to the previous glyph.
+      let kerning = 0;
 
       // Add kerning if there's a previous character
-      if (prevCodepoint !== 0) {
-        const seconds = kernings[codepoint];
+      if (prevGlyphId !== 0) {
+        const seconds = kernings[glyph.id];
         if (seconds !== undefined) {
-          const amount = seconds[prevCodepoint];
+          const amount = seconds[prevGlyphId];
           if (amount !== undefined) {
-            advance += amount;
+            kerning = amount;
           }
         }
       }
 
+      // Apply pair kerning before placing this glyph.
+      currentX += kerning;
+
       // Calculate glyph position and atlas coordinates (in design units)
       const glyphLayout: GlyphLayout = {
         codepoint,
@@ -373,8 +376,8 @@ const generateTextLayout = (
       glyphs.push(glyphLayout);
 
       // Advance position with letter spacing (in design units)
-      currentX += advance + letterSpacing;
-      prevCodepoint = codepoint;
+      currentX += glyph.xadvance + letterSpacing;
+      prevGlyphId = glyph.id;
     }
     currentY += lineHeightPx;
   }

package/dist/src/core/shaders/webgl/DefaultBatched.d.ts

@@ -1,2 +0,0 @@
-import type { WebGlShaderType } from '../../renderers/webgl/WebGlShaderNode.js';
-export declare const DefaultBatched: WebGlShaderType;

package/dist/src/core/shaders/webgl/DefaultBatched.js

@@ -1,104 +0,0 @@
-/*
- * Copyright 2023 Comcast Cable Communications Management, LLC
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-export const DefaultBatched = {
-    supportsIndexedTextures: true,
-    // override bindTextures(texture: WebGlCoreCtxTexture[]) {
-    //   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) => {
-    //     glw.activeTexture(i);
-    //     glw.bindTexture(t.ctxTexture);
-    //   });
-    //   const samplers = Array.from(Array(texture.length).keys());
-    //   this.glw.uniform1iv('u_textures[0]', samplers);
-    // }
-    vertex: `
-    # ifdef GL_FRAGMENT_PRECISION_HIGH
-    precision highp float;
-    # else
-    precision mediump float;
-    # endif
-
-    attribute vec2 a_textureCoords;
-    attribute vec2 a_position;
-    attribute vec4 a_color;
-    attribute float a_textureIndex;
-    attribute float a_depth;
-
-    uniform vec2 u_resolution;
-    uniform float u_pixelRatio;
-
-    varying vec4 v_color;
-    varying vec2 v_textureCoords;
-    varying float v_textureIndex;
-
-    void main(){
-      vec2 normalized = a_position * u_pixelRatio / u_resolution;
-      vec2 zero_two = normalized * 2.0;
-      vec2 clip_space = zero_two - 1.0;
-
-      // pass to fragment
-      v_color = a_color;
-      v_textureCoords = a_textureCoords;
-      v_textureIndex = a_textureIndex;
-
-      // flip y
-      gl_Position = vec4(clip_space * vec2(1.0, -1.0), 0, 1);
-    }
-  `,
-    fragment(renderer) {
-        const textureUnits = renderer.system.parameters.MAX_VERTEX_TEXTURE_IMAGE_UNITS;
-        return `
-    #define txUnits ${textureUnits}
-      # ifdef GL_FRAGMENT_PRECISION_HIGH
-      precision highp float;
-      # else
-      precision mediump float;
-      # endif
-
-      uniform vec2 u_resolution;
-      uniform sampler2D u_image;
-      uniform sampler2D u_textures[txUnits];
-
-      varying vec4 v_color;
-      varying vec2 v_textureCoords;
-      varying float v_textureIndex;
-
-      vec4 sampleFromTexture(sampler2D textures[${textureUnits}], int idx, vec2 uv) {
-        ${Array.from(Array(textureUnits).keys())
-            .map((idx) => `
-          ${idx !== 0 ? 'else ' : ''}if (idx == ${idx}) {
-            return texture2D(textures[${idx}], uv);
-          }
-        `)
-            .join('')}
-        return texture2D(textures[0], uv);
-      }
-
-      void main(){
-        gl_FragColor = vec4(v_color) * sampleFromTexture(u_textures, int(v_textureIndex), v_textureCoords);
-      }
-    `;
-    },
-};
-//# sourceMappingURL=DefaultBatched.js.map

package/dist/src/core/shaders/webgl/DefaultBatched.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DefaultBatched.js","sourceRoot":"","sources":["../../../../../src/core/shaders/webgl/DefaultBatched.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAsBH,MAAM,CAAC,MAAM,cAAc,GAAoB;IAC7C,uBAAuB,EAAE,IAAI;IAE7B,0DAA0D;IAC1D,oCAAoC;IACpC,SAAS;IACT,iFAAiF;IACjF,QAAQ;IACR,uBAAuB;IACvB,6HAA6H;IAC7H,SAAS;IACT,MAAM;IACN,gCAAgC;IAChC,4BAA4B;IAC5B,qCAAqC;IACrC,QAAQ;IACR,+DAA+D;IAC/D,oDAAoD;IACpD,IAAI;IAEJ,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCP;IACD,QAAQ,CAAC,QAAQ;QACf,MAAM,YAAY,GAChB,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,8BAA8B,CAAC;QAC5D,OAAO;sBACW,YAAY;;;;;;;;;;;;;;;kDAegB,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,CAAC;IACJ,CAAC;CACF,CAAC"}