@lightningjs/renderer 3.0.0-beta10 → 3.0.0-beta12

package/src/core/renderers/webgl/WebGlCtxRenderTexture.ts

@@ -1,91 +1,81 @@
-/*
- * If not stated otherwise in this file or this component's LICENSE file the
- * following copyright and licenses apply:
- *
- * Copyright 2024 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.
- */
-
-import type { Dimensions } from '../../../common/CommonTypes.js';
-import { assertTruthy } from '../../../utils.js';
-import type { TextureMemoryManager } from '../../TextureMemoryManager.js';
-import type { WebGlContextWrapper } from '../../lib/WebGlContextWrapper.js';
-import type { RenderTexture } from '../../textures/RenderTexture.js';
-import { WebGlCtxTexture } from './WebGlCtxTexture.js';
-
-export class WebGlCtxRenderTexture extends WebGlCtxTexture {
-  declare textureSource: RenderTexture;
-
-  public framebuffer: WebGLFramebuffer | null = null;
-
-  constructor(
-    glw: WebGlContextWrapper,
-    memManager: TextureMemoryManager,
-    textureSource: RenderTexture,
-  ) {
-    super(glw, memManager, textureSource);
-  }
-
-  override async onLoadRequest(): Promise<Dimensions> {
-    const { glw } = this;
-    const nativeTexture = (this._nativeCtxTexture =
-      this.createNativeCtxTexture());
-
-    if (!nativeTexture) {
-      throw new Error('Failed to create native texture for RenderTexture');
-    }
-
-    const { width, height } = this.textureSource;
-
-    // Create Framebuffer object
-    this.framebuffer = glw.createFramebuffer();
-
-    // Set the dimensions of the render texture
-    glw.texImage2D(
-      0,
-      glw.RGBA,
-      width,
-      height,
-      0,
-      glw.RGBA,
-      glw.UNSIGNED_BYTE,
-      null,
-    );
-
-    // Update the texture memory manager
-    this.setTextureMemUse(width * height * 4);
-
-    // Bind the framebuffer
-    glw.bindFramebuffer(this.framebuffer);
-
-    // Attach the texture to the framebuffer
-    glw.framebufferTexture2D(glw.COLOR_ATTACHMENT0, nativeTexture, 0);
-
-    // Unbind the framebuffer
-    glw.bindFramebuffer(null);
-
-    return {
-      width,
-      height,
-    };
-  }
-
-  override free(): void {
-    super.free();
-
-    // Delete the framebuffer
-    this.glw.deleteFramebuffer(this.framebuffer);
-    this.framebuffer = null;
-  }
-}
+/*
+ * If not stated otherwise in this file or this component's LICENSE file the
+ * following copyright and licenses apply:
+ *
+ * Copyright 2024 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.
+ */
+
+import type { Dimensions } from '../../../common/CommonTypes.js';
+import type { TextureMemoryManager } from '../../TextureMemoryManager.js';
+import type { WebGlContextWrapper } from '../../lib/WebGlContextWrapper.js';
+import type { RenderTexture } from '../../textures/RenderTexture.js';
+import { WebGlCtxTexture } from './WebGlCtxTexture.js';
+
+export class WebGlCtxRenderTexture extends WebGlCtxTexture {
+  declare textureSource: RenderTexture;
+
+  public framebuffer: WebGLFramebuffer | null = null;
+
+  constructor(
+    glw: WebGlContextWrapper,
+    memManager: TextureMemoryManager,
+    textureSource: RenderTexture,
+  ) {
+    super(glw, memManager, textureSource);
+  }
+
+  override async onLoadRequest(): Promise<Dimensions> {
+    const { glw } = this;
+    const nativeTexture = (this._nativeCtxTexture =
+      this.createNativeCtxTexture());
+
+    if (!nativeTexture) {
+      throw new Error('Failed to create native texture for RenderTexture');
+    }
+
+    const { w, h } = this.textureSource;
+
+    // Create Framebuffer object
+    this.framebuffer = glw.createFramebuffer();
+
+    // Set the dimensions of the render texture
+    glw.texImage2D(0, glw.RGBA, w, h, 0, glw.RGBA, glw.UNSIGNED_BYTE, null);
+
+    // Update the texture memory manager
+    this.setTextureMemUse(w * h * 4);
+
+    // Bind the framebuffer
+    glw.bindFramebuffer(this.framebuffer);
+
+    // Attach the texture to the framebuffer
+    glw.framebufferTexture2D(glw.COLOR_ATTACHMENT0, nativeTexture, 0);
+
+    // Unbind the framebuffer
+    glw.bindFramebuffer(null);
+
+    return {
+      w,
+      h,
+    };
+  }
+
+  override free(): void {
+    super.free();
+
+    // Delete the framebuffer
+    this.glw.deleteFramebuffer(this.framebuffer);
+    this.framebuffer = null;
+  }
+}

package/src/core/renderers/webgl/WebGlCtxSubTexture.ts

@@ -1,50 +1,95 @@
-/*
- * If not stated otherwise in this file or this component's LICENSE file the
- * following copyright and licenses apply:
- *
- * 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.
- */
-
-import type { Dimensions } from '../../../common/CommonTypes.js';
-import { assertTruthy } from '../../../utils.js';
-import type { TextureMemoryManager } from '../../TextureMemoryManager.js';
-import type { WebGlContextWrapper } from '../../lib/WebGlContextWrapper.js';
-import type { SubTexture } from '../../textures/SubTexture.js';
-import { WebGlCtxTexture } from './WebGlCtxTexture.js';
-
-export class WebGlCtxSubTexture extends WebGlCtxTexture {
-  constructor(
-    glw: WebGlContextWrapper,
-    memManager: TextureMemoryManager,
-    textureSource: SubTexture,
-  ) {
-    super(glw, memManager, textureSource);
-  }
-
-  override async onLoadRequest(): Promise<Dimensions> {
-    const props = (this.textureSource as SubTexture).textureData;
-    assertTruthy(props, 'SubTexture must have texture data');
-
-    if (props.data instanceof Uint8Array) {
-      // its a 1x1 Color Texture
-      return { width: 1, height: 1 };
-    }
-
-    return {
-      width: props.data?.width || 0,
-      height: props.data?.height || 0,
-    };
-  }
-}
+/*
+ * If not stated otherwise in this file or this component's LICENSE file the
+ * following copyright and licenses apply:
+ *
+ * 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.
+ */
+
+import type { Dimensions } from '../../../common/CommonTypes.js';
+import { assertTruthy } from '../../../utils.js';
+import type { TextureMemoryManager } from '../../TextureMemoryManager.js';
+import type { WebGlContextWrapper } from '../../lib/WebGlContextWrapper.js';
+import type { SubTexture } from '../../textures/SubTexture.js';
+import type { SubTextureProps } from '../../textures/SubTexture.js';
+import type { CompressedData } from '../../textures/Texture.js';
+import { WebGlCtxTexture } from './WebGlCtxTexture.js';
+
+export class WebGlCtxSubTexture extends WebGlCtxTexture {
+  constructor(
+    glw: WebGlContextWrapper,
+    memManager: TextureMemoryManager,
+    textureSource: SubTexture,
+  ) {
+    super(glw, memManager, textureSource);
+  }
+
+  override async onLoadRequest(): Promise<Dimensions> {
+    const props = (this.textureSource as SubTexture).textureData;
+    assertTruthy(props, 'SubTexture must have texture data');
+
+    if (props.data instanceof Uint8Array) {
+      // its a 1x1 Color Texture
+      return { w: 1, h: 1 };
+    }
+
+    return this.extractDimensions(props.data);
+  }
+
+  /**
+   * Efficiently extracts width/height from polymorphic texture data
+   * Optimized for performance by using type guards and avoiding unnecessary property access
+   */
+  private extractDimensions(
+    data:
+      | ImageBitmap
+      | ImageData
+      | SubTextureProps
+      | CompressedData
+      | HTMLImageElement
+      | null,
+  ): Dimensions {
+    if (data === null) {
+      return { w: 0, h: 0 };
+    }
+
+    // Check for standard web API objects first (most common case)
+    // These use width/height properties: ImageBitmap, ImageData, HTMLImageElement
+    if (this.hasWidthHeight(data) === true) {
+      return { w: data.width, h: data.height };
+    }
+
+    // Check for internal objects that use w/h properties: SubTextureProps, CompressedData
+    if (this.hasWH(data) === true) {
+      return { w: data.w, h: data.h };
+    }
+
+    // Fallback
+    return { w: 0, h: 0 };
+  }
+
+  /**
+   * Type guard for objects with width/height properties
+   */
+  private hasWidthHeight(data: any): data is { width: number; height: number } {
+    return typeof data.width === 'number' && typeof data.height === 'number';
+  }
+
+  /**
+   * Type guard for objects with w/h properties
+   */
+  private hasWH(data: any): data is { w: number; h: number } {
+    return typeof data.w === 'number' && typeof data.h === 'number';
+  }
+}