@lightningjs/renderer 2.18.3 → 2.19.0

package/src/core/renderers/webgl/shaders/effects/LinearGradientEffect.ts

@@ -121,20 +121,6 @@ export class LinearGradientEffect extends ShaderEffect {
   };
 
   static override methods: Record<string, string> = {
-    fromLinear: `
-      vec4 function(vec4 linearRGB) {
-        vec4 higher = vec4(1.055)*pow(linearRGB, vec4(1.0/2.4)) - vec4(0.055);
-        vec4 lower = linearRGB * vec4(12.92);
-        return mix(higher, lower, 1.0);
-      }
-    `,
-    toLinear: `
-      vec4 function(vec4 sRGB) {
-        vec4 higher = pow((sRGB + vec4(0.055))/vec4(1.055), vec4(2.4));
-        vec4 lower = sRGB/vec4(12.92);
-        return mix(higher, lower, 1.0);
-      }
-    `,
     calcPoint: `
       vec2 function(float d, float angle) {
         return d * vec2(cos(angle), sin(angle)) + (u_dimensions * 0.5);
@@ -162,10 +148,29 @@ export class LinearGradientEffect extends ShaderEffect {
       vec2 gradVec = t - f;
       float dist = dot(v_textureCoordinate.xy * u_dimensions - f, gradVec) / dot(gradVec, gradVec);
 
-      float stopCalc = (dist - stops[0]) / (stops[1] - stops[0]);
-      vec4 colorOut = $fromLinear(mix($toLinear(colors[0]), $toLinear(colors[1]), stopCalc));
-      ${this.ColorLoop(colors)}
-      return mix(maskColor, colorOut, clamp(colorOut.a, 0.0, 1.0));
+      //return early if dist is lower or equal to first stop
+      if(dist <= stops[0]) {
+        return mix(maskColor, colors[0], clamp(colors[0].a, 0.0, 1.0));
+      }
+      const int amount = ${colors};
+      const int last = amount - 1;
+
+      if(dist >= stops[last]) {
+        return mix(maskColor, colors[last], clamp(colors[last].a, 0.0, 1.0));
+      }
+
+      for(int i = 0; i < last; i++) {
+        float left = stops[i];
+        float right = stops[i + 1];
+        if(dist >= left && dist <= right) {
+          float localDist = smoothstep(left, right, dist);
+          vec4 colorOut = mix(colors[i], colors[i + 1], localDist);
+          return mix(maskColor, colorOut, clamp(colorOut.a, 0.0, 1.0));
+        }
+      }
+
+      //final fallback
+      return mix(maskColor, colors[last], clamp(colors[last].a, 0.0, 1.0));
     `;
   };
 }

package/src/core/renderers/webgl/shaders/effects/RadialGradientEffect.ts

@@ -141,6 +141,14 @@ export class RadialGradientEffect extends ShaderEffect {
     },
   };
 
+  static override methods: Record<string, string> = {
+    getGradientColor: `
+      float function(float dist) {
+        return clamp(-dist, 0.0, 1.0);
+      }
+    `,
+  };
+
   static ColorLoop = (amount: number): string => {
     let loop = '';
     for (let i = 2; i < amount; i++) {
@@ -159,10 +167,30 @@ export class RadialGradientEffect extends ShaderEffect {
 
       float dist = length((point - projection) / vec2(width, height));
 
-      float stopCalc = (dist - stops[0]) / (stops[1] - stops[0]);
-      vec4 colorOut = mix(colors[0], colors[1], stopCalc);
-      ${this.ColorLoop(colors)}
-      return mix(maskColor, colorOut, clamp(colorOut.a, 0.0, 1.0));
+      dist = clamp(dist, 0.0, 1.0);
+      //return early if dist is lower or equal to first stop
+      if(dist <= stops[0]) {
+        return mix(maskColor, colors[0], clamp(colors[0].a, 0.0, 1.0));
+      }
+      const int amount = ${colors};
+      const int last = amount - 1;
+
+      if(dist >= stops[last]) {
+        return mix(maskColor, colors[last], clamp(colors[last].a, 0.0, 1.0));
+      }
+
+      for(int i = 0; i < last; i++) {
+        float left = stops[i];
+        float right = stops[i + 1];
+        if(dist >= left && dist <= right) {
+          float localDist = smoothstep(left, right, dist);
+          vec4 colorOut = mix(colors[i], colors[i + 1], localDist);
+          return mix(maskColor, colorOut, clamp(colorOut.a, 0.0, 1.0));
+        }
+      }
+
+      //final fallback
+      return mix(maskColor, colors[last], clamp(colors[last].a, 0.0, 1.0));
     `;
   };
 }

package/src/core/textures/ImageTexture.ts

@@ -138,7 +138,8 @@ export class ImageTexture extends Texture {
     const resolvedProps = ImageTexture.resolveDefaults(props);
     super(txManager);
     this.props = resolvedProps;
-    this.maxRetryCount = resolvedProps.maxRetryCount ?? 5;
+    this.maxRetryCount =
+      resolvedProps.maxRetryCount ?? this.txManager.maxRetryCount;
   }
 
   hasAlphaChannel(mimeType: string) {
@@ -407,7 +408,7 @@ export class ImageTexture extends Texture {
       sy: props.sy ?? null,
       sw: props.sw ?? null,
       sh: props.sh ?? null,
-      maxRetryCount: props.maxRetryCount ?? 5,
+      maxRetryCount: props.maxRetryCount ?? null,
     };
   }
 

package/src/core/textures/Texture.ts

@@ -22,6 +22,7 @@ import type { SubTextureProps } from './SubTexture.js';
 import type { Dimensions } from '../../common/CommonTypes.js';
 import { EventEmitter } from '../../common/EventEmitter.js';
 import type { CoreContextTexture } from '../renderers/CoreContextTexture.js';
+import type { TextureError } from '../TextureError.js';
 
 /**
  * Event handler for when a Texture is freed
@@ -135,7 +136,7 @@ export abstract class Texture extends EventEmitter {
    * `null`.
    */
   private _dimensions: Dimensions | null = null;
-  private _error: Error | null = null;
+  private _error: TextureError | null = null;
 
   // aggregate state
   public state: TextureState = 'initial';
@@ -162,7 +163,7 @@ export abstract class Texture extends EventEmitter {
   public memUsed = 0;
 
   public retryCount = 0;
-  public maxRetryCount: number = 5;
+  public maxRetryCount: number;
 
   /**
    * Timestamp when texture was created (for startup grace period)
@@ -182,13 +183,14 @@ export abstract class Texture extends EventEmitter {
 
   constructor(protected txManager: CoreTextureManager) {
     super();
+    this.maxRetryCount = txManager.maxRetryCount;
   }
 
   get dimensions(): Dimensions | null {
     return this._dimensions;
   }
 
-  get error(): Error | null {
+  get error(): TextureError | null {
     return this._error;
   }
 

package/src/main-api/Inspector.ts

@@ -533,7 +533,10 @@ export class Inspector {
 
     // Update error information if present
     if (texture.error) {
-      div.setAttribute('data-texture-error', texture.error.message);
+      div.setAttribute(
+        'data-texture-error',
+        texture.error.code || texture.error.message,
+      );
     } else {
       div.removeAttribute('data-texture-error');
     }

package/src/main-api/Renderer.ts

@@ -329,6 +329,20 @@ export interface RendererMainSettings {
    * @defaultValue `full`
    */
   createImageBitmapSupport?: 'auto' | 'basic' | 'options' | 'full';
+
+  /**
+   * Number of times to retry loading a failed texture
+   *
+   * @remarks
+   * When a texture fails to load, Lightning will retry up to this many times
+   * before permanently giving up. Each retry will clear the texture ownership
+   * and then re-establish it to trigger a new load attempt.
+   *
+   * Set to null to disable retries. Set to 0 to always try once and never retry.
+   * This is typically only used on ImageTexture instances.
+   *
+   */
+  maxRetryCount?: number;
 }
 
 /**
@@ -432,6 +446,7 @@ export class RendererMain extends EventEmitter {
       textureProcessingTimeLimit: settings.textureProcessingTimeLimit || 42,
       canvas: settings.canvas || document.createElement('canvas'),
       createImageBitmapSupport: settings.createImageBitmapSupport || 'full',
+      maxRetryCount: settings.maxRetryCount ?? 5,
     };
     this.settings = resolvedSettings;
 
@@ -477,6 +492,7 @@ export class RendererMain extends EventEmitter {
       strictBounds: this.settings.strictBounds,
       textureProcessingTimeLimit: this.settings.textureProcessingTimeLimit,
       createImageBitmapSupport: this.settings.createImageBitmapSupport,
+      maxRetryCount: this.settings.maxRetryCount,
     });
 
     // Extract the root node