@lightningjs/renderer 3.0.0-beta22 → 3.0.0-beta24

package/src/core/textures/SubTexture.ts

@@ -91,14 +91,14 @@ export class SubTexture extends Texture {
     super(txManager);
     this.props = props;
 
-    assertTruthy(this.props.texture, 'SubTexture requires a parent texture');
+    assertTruthy(props.texture, 'SubTexture requires a parent texture');
     assertTruthy(
-      this.props.texture instanceof ImageTexture,
+      props.texture instanceof ImageTexture,
       'SubTexture requires an ImageTexture parent',
     );
 
     // Resolve parent texture from cache or fallback to provided texture
-    this.parentTexture = txManager.resolveParentTexture(this.props.texture);
+    this.parentTexture = txManager.resolveParentTexture(props.texture);
 
     if (this.renderableOwners.length > 0) {
       this.parentTexture.setRenderableOwner(this.subtextureId, true);

package/src/core/textures/Texture.ts

@@ -60,7 +60,7 @@ export interface CompressedData {
   /**
    * Supported container types ('pvr' or 'ktx').
    */
-  type: 'pvr' | 'ktx' | 'astc';
+  type: 'PVR' | 'KTX' | 'ASTC';
 
   /**
    * The width of the compressed texture in pixels. Defaults to 0.
@@ -202,7 +202,7 @@ export abstract class Texture extends EventEmitter {
 
   constructor(protected txManager: CoreTextureManager) {
     super();
-    this.maxRetryCount = this.txManager.maxRetryCount;
+    this.maxRetryCount = txManager.maxRetryCount;
   }
 
   get dimensions(): Dimensions | null {

package/src/main-api/Renderer.ts

@@ -19,7 +19,7 @@
 
 import type { ExtractProps, TextureMap } from '../core/CoreTextureManager.js';
 import { EventEmitter } from '../common/EventEmitter.js';
-import { isProductionEnvironment } from '../utils.js';
+import { assertTruthy, isProductionEnvironment } from '../utils.js';
 import { Stage, type StageOptions } from '../core/Stage.js';
 import { CoreNode, type CoreNodeProps } from '../core/CoreNode.js';
 import { type CoreTextNodeProps } from '../core/CoreTextNode.js';
@@ -550,7 +550,7 @@ export class RendererMain extends EventEmitter {
       textureProcessingTimeLimit: settings.textureProcessingTimeLimit || 42,
       canvas: settings.canvas,
       createImageBitmapSupport: settings.createImageBitmapSupport || 'full',
-      platform: settings.platform || null,
+      platform: settings.platform || WebPlatform,
       maxRetryCount: settings.maxRetryCount ?? 5,
     };
 
@@ -562,29 +562,28 @@ export class RendererMain extends EventEmitter {
       inspector,
     } = settings as RendererMainSettings;
 
-    let platform;
-    if (
-      settings.platform !== undefined &&
-      settings.platform !== null &&
-      settings.platform.prototype instanceof Platform === true
-    ) {
-      // @ts-ignore - if Platform is a valid class, it will be used
-      platform = new settings.platform();
-    } else {
-      platform = new WebPlatform();
-    }
+    assertTruthy(
+      settings.platform,
+      'A platform implementation must be provided in settings.platform',
+    );
 
-    const canvas = settings.canvas || platform.createCanvas();
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
+    const platform = new (settings.platform as any)({
+      numImageWorkers: settings.numImageWorkers,
+      forceWebGL2: settings.forceWebGL2,
+      canvas: settings.canvas,
+    });
 
     const deviceLogicalWidth = appWidth * deviceLogicalPixelRatio;
     const deviceLogicalHeight = appHeight * deviceLogicalPixelRatio;
 
-    this.canvas = canvas;
-    canvas.width = deviceLogicalWidth * devicePhysicalPixelRatio;
-    canvas.height = deviceLogicalHeight * devicePhysicalPixelRatio;
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion, @typescript-eslint/no-unsafe-member-access
+    this.canvas = platform.canvas! as HTMLCanvasElement;
+    this.canvas.width = deviceLogicalWidth * devicePhysicalPixelRatio;
+    this.canvas.height = deviceLogicalHeight * devicePhysicalPixelRatio;
 
-    canvas.style.width = `${deviceLogicalWidth}px`;
-    canvas.style.height = `${deviceLogicalHeight}px`;
+    this.canvas.style.width = `${deviceLogicalWidth}px`;
+    this.canvas.style.height = `${deviceLogicalHeight}px`;
 
     // Initialize the stage
     this.stage = new Stage({
@@ -629,8 +628,8 @@ export class RendererMain extends EventEmitter {
         throw new Error('Could not find target element');
       }
 
-      targetEl.appendChild(canvas);
-    } else if (settings.canvas !== canvas) {
+      targetEl.appendChild(this.canvas);
+    } else if (settings.canvas !== this.canvas) {
       throw new Error(
         'New canvas element could not be appended to undefined target',
       );
@@ -638,7 +637,10 @@ export class RendererMain extends EventEmitter {
 
     // Initialize inspector (if enabled)
     if (inspector && isProductionEnvironment === false) {
-      this.inspector = new inspector(canvas, settings as RendererMainSettings);
+      this.inspector = new inspector(
+        this.canvas,
+        settings as RendererMainSettings,
+      );
     }
   }
 

package/src/utils.ts

@@ -17,53 +17,6 @@
  * limitations under the License.
  */
 
-import type { ContextSpy } from './core/lib/ContextSpy.js';
-
-export function createWebGLContext(
-  canvas: HTMLCanvasElement | OffscreenCanvas,
-  forceWebGL2 = false,
-  contextSpy: ContextSpy | null,
-): WebGLRenderingContext {
-  const config: WebGLContextAttributes = {
-    alpha: true,
-    antialias: false,
-    depth: false,
-    stencil: true,
-    desynchronized: false,
-    // Disabled because it prevents Visual Regression Tests from working
-    // failIfMajorPerformanceCaveat: true,
-    powerPreference: 'high-performance',
-    premultipliedAlpha: true,
-    preserveDrawingBuffer: false,
-  };
-  const gl =
-    // TODO: Remove this assertion once this issue is fixed in TypeScript
-    // https://github.com/microsoft/TypeScript/issues/53614
-    (canvas.getContext(forceWebGL2 ? 'webgl2' : 'webgl', config) ||
-      canvas.getContext(
-        'experimental-webgl' as 'webgl',
-        config,
-      )) as unknown as WebGLRenderingContext | null;
-  if (!gl) {
-    throw new Error('Unable to create WebGL context');
-  }
-  if (contextSpy) {
-    // Proxy the GL context to log all GL calls
-    return new Proxy(gl, {
-      get(target, prop) {
-        const value = target[prop as never] as unknown;
-        if (typeof value === 'function') {
-          contextSpy.increment(String(prop));
-          return value.bind(target);
-        }
-        return value;
-      },
-    });
-  }
-
-  return gl;
-}
-
 /**
  * Checks if we're in a development environment or not.
  *

package/src/core/lib/validateImageBitmap.ts

@@ -1,87 +0,0 @@
-import type { Platform } from '../platforms/Platform.js';
-
-export interface CreateImageBitmapSupport {
-  basic: boolean; // Supports createImageBitmap(image)
-  options: boolean; // Supports createImageBitmap(image, options)
-  full: boolean; // Supports createImageBitmap(image, sx, sy, sw, sh, options)
-}
-
-export async function validateCreateImageBitmap(
-  platform: Platform,
-): Promise<CreateImageBitmapSupport> {
-  // Test if createImageBitmap is supported using a simple 1x1 PNG image
-  // prettier-ignore
-  const pngBinaryData = new Uint8Array([
-      0x89, 0x50, 0x4e, 0x47,
-      0x0d, 0x0a, 0x1a, 0x0a, // PNG signature
-      0x00, 0x00, 0x00, 0x0d, // IHDR chunk length
-      0x49, 0x48, 0x44, 0x52, // "IHDR" chunk type
-      0x00, 0x00, 0x00, 0x01, // Width: 1
-      0x00, 0x00, 0x00, 0x01, // Height: 1
-      0x01,                   // Bit depth: 1
-      0x03,                   // Color type: Indexed
-      0x00,                   // Compression method: Deflate
-      0x00,                   // Filter method: None
-      0x00,                   // Interlace method: None
-      0x25, 0xdb, 0x56, 0xca, // CRC for IHDR
-      0x00, 0x00, 0x00, 0x03, // PLTE chunk length
-      0x50, 0x4c, 0x54, 0x45, // "PLTE" chunk type
-      0x00, 0x00, 0x00,       // Palette entry: Black
-      0xa7, 0x7a, 0x3d, 0xda, // CRC for PLTE
-      0x00, 0x00, 0x00, 0x01, // tRNS chunk length
-      0x74, 0x52, 0x4e, 0x53, // "tRNS" chunk type
-      0x00,                   // Transparency for black: Fully transparent
-      0x40, 0xe6, 0xd8, 0x66, // CRC for tRNS
-      0x00, 0x00, 0x00, 0x0a, // IDAT chunk length
-      0x49, 0x44, 0x41, 0x54, // "IDAT" chunk type
-      0x08, 0xd7,             // Deflate header
-      0x63, 0x60, 0x00, 0x00,
-      0x00, 0x02, 0x00, 0x01, // Zlib-compressed data
-      0xe2, 0x21, 0xbc, 0x33, // CRC for IDAT
-      0x00, 0x00, 0x00, 0x00, // IEND chunk length
-      0x49, 0x45, 0x4e, 0x44, // "IEND" chunk type
-      0xae, 0x42, 0x60, 0x82, // CRC for IEND
-    ]);
-
-  const support: CreateImageBitmapSupport = {
-    basic: false,
-    options: false,
-    full: false,
-  };
-
-  // Test basic createImageBitmap support
-  const blob = new Blob([pngBinaryData], { type: 'image/png' });
-  const bitmap = await platform.createImageBitmap(blob);
-  bitmap.close?.();
-  support.basic = true;
-
-  // Test createImageBitmap with options support
-  try {
-    const options = { premultiplyAlpha: 'none' as const };
-    const bitmapWithOptions = await platform.createImageBitmap(blob, options);
-    bitmapWithOptions.close?.();
-    support.options = true;
-  } catch (e) {
-    /* ignore */
-  }
-
-  // Test createImageBitmap with full options support
-  try {
-    const bitmapWithFullOptions = await platform.createImageBitmap(
-      blob,
-      0,
-      0,
-      1,
-      1,
-      {
-        premultiplyAlpha: 'none',
-      },
-    );
-    bitmapWithFullOptions.close?.();
-    support.full = true;
-  } catch (e) {
-    /* ignore */
-  }
-
-  return support;
-}