@luma.gl/engine 9.3.0-alpha.9 → 9.3.1

package/dist/shader-inputs.js

@@ -50,12 +50,11 @@ export class ShaderInputs {
         this.moduleBindings = {};
         // Initialize the modules
         for (const [name, module] of Object.entries(modules)) {
-            if (!module) {
-                continue;
-            }
-            this._addModule(module);
-            if (module.name && name !== module.name && !this.options.disableWarnings) {
-                log.warn(`Module name: ${name} vs ${module.name}`)();
+            if (module) {
+                this._addModule(module);
+                if (module.name && name !== module.name && !this.options.disableWarnings) {
+                    log.warn(`Module name: ${name} vs ${module.name}`)();
+                }
             }
         }
     }
@@ -74,15 +73,16 @@ export class ShaderInputs {
                 if (!this.options.disableWarnings) {
                     log.warn(`Module ${name} not found`)();
                 }
-                continue; // eslint-disable-line no-continue
             }
-            const oldUniforms = this.moduleUniforms[moduleName];
-            const oldBindings = this.moduleBindings[moduleName];
-            const uniformsAndBindings = module.getUniforms?.(moduleProps, oldUniforms) || moduleProps;
-            const { uniforms, bindings } = splitUniformsAndBindings(uniformsAndBindings, module.uniformTypes);
-            this.moduleUniforms[moduleName] = mergeModuleUniforms(oldUniforms, uniforms, module.uniformTypes);
-            this.moduleBindings[moduleName] = { ...oldBindings, ...bindings };
-            // this.moduleUniformsChanged ||= moduleName;
+            else {
+                const oldUniforms = this.moduleUniforms[moduleName];
+                const oldBindings = this.moduleBindings[moduleName];
+                const uniformsAndBindings = module.getUniforms?.(moduleProps, oldUniforms) || moduleProps;
+                const { uniforms, bindings } = splitUniformsAndBindings(uniformsAndBindings, module.uniformTypes);
+                this.moduleUniforms[moduleName] = mergeModuleUniforms(oldUniforms, uniforms, module.uniformTypes);
+                this.moduleBindings[moduleName] = { ...oldBindings, ...bindings };
+                // this.moduleUniformsChanged ||= moduleName;
+            }
             // console.log(`setProps(${String(moduleName)}`, moduleName, this.moduleUniforms[moduleName])
         }
     }
@@ -129,10 +129,9 @@ export class ShaderInputs {
 function mergeModuleUniforms(currentUniforms = {}, nextUniforms = {}, uniformTypes = {}) {
     const mergedUniforms = { ...currentUniforms };
     for (const [key, value] of Object.entries(nextUniforms)) {
-        if (value === undefined) {
-            continue;
+        if (value !== undefined) {
+            mergedUniforms[key] = mergeModuleUniformValue(currentUniforms[key], value, uniformTypes[key]);
         }
-        mergedUniforms[key] = mergeModuleUniformValue(currentUniforms[key], value, uniformTypes[key]);
     }
     return mergedUniforms;
 }
@@ -150,10 +149,9 @@ function mergeModuleUniformValue(currentValue, nextValue, uniformType) {
         const mergedArray = currentArray.slice();
         for (let index = 0; index < nextValue.length; index++) {
             const elementValue = nextValue[index];
-            if (elementValue === undefined) {
-                continue;
+            if (elementValue !== undefined) {
+                mergedArray[index] = mergeModuleUniformValue(currentArray[index], elementValue, uniformType[0]);
             }
-            mergedArray[index] = mergeModuleUniformValue(currentArray[index], elementValue, uniformType[0]);
         }
         return mergedArray;
     }
@@ -164,10 +162,9 @@ function mergeModuleUniformValue(currentValue, nextValue, uniformType) {
     const currentObject = isPlainUniformObject(currentValue) ? currentValue : {};
     const mergedObject = { ...currentObject };
     for (const [key, value] of Object.entries(nextValue)) {
-        if (value === undefined) {
-            continue;
+        if (value !== undefined) {
+            mergedObject[key] = mergeModuleUniformValue(currentObject[key], value, uniformStruct[key]);
         }
-        mergedObject[key] = mergeModuleUniformValue(currentObject[key], value, uniformStruct[key]);
     }
     return mergedObject;
 }

package/dist/shader-inputs.js.map

@@ -1 +1 @@
-{"version":3,"file":"shader-inputs.js","sourceRoot":"","sources":["../src/shader-inputs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shader-inputs.js","sourceRoot":"","sources":["../src/shader-inputs.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/engine",
-  "version": "9.3.0-alpha.9",
+  "version": "9.3.1",
   "description": "3D Engine Components for luma.gl",
   "type": "module",
   "license": "MIT",
@@ -40,8 +40,8 @@
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "peerDependencies": {
-    "@luma.gl/core": "9.3.0-alpha.6",
-    "@luma.gl/shadertools": "9.3.0-alpha.6"
+    "@luma.gl/core": "~9.3.0",
+    "@luma.gl/shadertools": "~9.3.0"
   },
   "dependencies": {
     "@math.gl/core": "^4.1.0",
@@ -49,5 +49,5 @@
     "@probe.gl/log": "^4.1.1",
     "@probe.gl/stats": "^4.1.1"
   },
-  "gitHead": "737b0f752b3f8a6ae920b394d5ca028427275b37"
+  "gitHead": "c13ab4389f5616e6f7f21bfa4e113ac600e6ecab"
 }

package/src/animation-loop/make-animation-loop.ts

@@ -43,6 +43,7 @@ export function makeAnimationLoop(
         // Any async loading can be handled here
         return await renderLoop?.onInitialize(animationProps);
       } catch (error) {
+        console.error(error);
         setError(animationProps.animationLoop.device, error as Error);
         return null;
       }

package/src/compute/computation.ts

@@ -240,11 +240,11 @@ export class Computation {
 
   setShaderInputs(shaderInputs: ShaderInputs): void {
     this.shaderInputs = shaderInputs;
-    this._uniformStore = new UniformStore(this.shaderInputs.modules);
+    this._uniformStore = new UniformStore(this.device, this.shaderInputs.modules);
     // Create uniform buffer bindings for all modules
     for (const [moduleName, module] of Object.entries(this.shaderInputs.modules)) {
       if (shaderModuleHasUniforms(module)) {
-        const uniformBuffer = this._uniformStore.getManagedUniformBuffer(this.device, moduleName);
+        const uniformBuffer = this._uniformStore.getManagedUniformBuffer(moduleName);
         this.bindings[`${moduleName}Uniforms`] = uniformBuffer;
       }
     }

package/src/debug/debug-framebuffer.ts

@@ -2,75 +2,153 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {Framebuffer, Texture} from '@luma.gl/core';
-// import {copyTextureToImage} from '../debug/copy-texture-to-image';
+import type {Device, Framebuffer, RenderPass, Texture} from '@luma.gl/core';
 
-/** Only works with 1st device? */
-let canvas: HTMLCanvasElement | null = null;
-let ctx: CanvasRenderingContext2D | null = null;
-// let targetImage: HTMLImageElement | null = null;
+const DEBUG_FRAMEBUFFER_STATE_KEY = '__debugFramebufferState';
+const DEFAULT_MARGIN_PX = 8;
 
-/** Debug utility to draw FBO contents onto screen */
-// eslint-disable-next-line
+type DebugFramebufferOptions = {
+  id: string;
+  minimap?: boolean;
+  opaque?: boolean;
+  top?: string;
+  left?: string;
+  rgbaScale?: number;
+};
+
+type DebugFramebufferState = {
+  flushing: boolean;
+  queuedFramebuffers: Framebuffer[];
+};
+
+/**
+ * Debug utility to blit queued offscreen framebuffers into the default framebuffer
+ * without CPU readback. Currently implemented for WebGL only.
+ */
 export function debugFramebuffer(
-  fbo: Framebuffer | Texture,
-  {
-    id,
-    minimap,
-    opaque,
-    top = '0',
-    left = '0',
-    rgbaScale = 1
-  }: {
-    id: string;
-    minimap?: boolean;
-    opaque?: boolean;
-    top?: string;
-    left?: string;
-    rgbaScale?: number;
+  renderPass: RenderPass,
+  source: Framebuffer | Texture | null,
+  options: DebugFramebufferOptions
+): void {
+  if (renderPass.device.type !== 'webgl') {
+    return;
+  }
+
+  const state = getDebugFramebufferState(renderPass.device);
+  if (state.flushing) {
+    return;
+  }
+
+  if (isDefaultRenderPass(renderPass)) {
+    flushDebugFramebuffers(renderPass, options, state);
+    return;
   }
-) {
-  if (!canvas) {
-    canvas = document.createElement('canvas');
-    canvas.id = id;
-    canvas.title = id;
-    canvas.style.zIndex = '100';
-    canvas.style.position = 'absolute';
-    canvas.style.top = top; // ⚠️
-    canvas.style.left = left; // ⚠️
-    canvas.style.border = 'blue 5px solid';
-    canvas.style.transform = 'scaleY(-1)';
-    document.body.appendChild(canvas);
-
-    ctx = canvas.getContext('2d');
-    // targetImage = new Image();
+
+  if (source && isFramebuffer(source) && source.handle !== null) {
+    if (!state.queuedFramebuffers.includes(source)) {
+      state.queuedFramebuffers.push(source);
+    }
   }
+}
 
-  // const canvasHeight = (minimap ? 2 : 1) * fbo.height;
-  if (canvas.width !== fbo.width || canvas.height !== fbo.height) {
-    canvas.width = fbo.width / 2;
-    canvas.height = fbo.height / 2;
-    canvas.style.width = '400px';
-    canvas.style.height = '400px';
+function flushDebugFramebuffers(
+  renderPass: RenderPass,
+  options: DebugFramebufferOptions,
+  state: DebugFramebufferState
+): void {
+  if (state.queuedFramebuffers.length === 0) {
+    return;
   }
 
-  // const image = copyTextureToImage(fbo, {targetMaxHeight: 100, targetImage});
-  // ctx.drawImage(image, 0, 0);
-
-  const color = fbo.device.readPixelsToArrayWebGL(fbo);
-  const imageData = ctx?.createImageData(fbo.width, fbo.height);
-  if (imageData) {
-    // Full map
-    const offset = 0;
-    // if (color.some((v) => v > 0)) {
-    //   console.error('THERE IS NON-ZERO DATA IN THE FBO!');
-    // }
-    for (let i = 0; i < color.length; i += 4) {
-      imageData.data[offset + i + 0] = color[i + 0] * rgbaScale;
-      imageData.data[offset + i + 1] = color[i + 1] * rgbaScale;
-      imageData.data[offset + i + 2] = color[i + 2] * rgbaScale;
-      imageData.data[offset + i + 3] = opaque ? 255 : color[i + 3] * rgbaScale;
+  const webglDevice = renderPass.device as Device & {gl: WebGL2RenderingContext};
+  const {gl} = webglDevice;
+  const previousReadFramebuffer = gl.getParameter(gl.READ_FRAMEBUFFER_BINDING);
+  const previousDrawFramebuffer = gl.getParameter(gl.DRAW_FRAMEBUFFER_BINDING);
+  const [targetWidth, targetHeight] = renderPass.device
+    .getDefaultCanvasContext()
+    .getDrawingBufferSize();
+
+  let topPx = parseCssPixel(options.top, DEFAULT_MARGIN_PX);
+  const leftPx = parseCssPixel(options.left, DEFAULT_MARGIN_PX);
+
+  state.flushing = true;
+  try {
+    for (const framebuffer of state.queuedFramebuffers) {
+      const [targetX0, targetY0, targetX1, targetY1, previewHeight] = getOverlayRect({
+        framebuffer,
+        targetWidth,
+        targetHeight,
+        topPx,
+        leftPx,
+        minimap: options.minimap
+      });
+
+      gl.bindFramebuffer(gl.READ_FRAMEBUFFER, framebuffer.handle as WebGLFramebuffer | null);
+      gl.bindFramebuffer(gl.DRAW_FRAMEBUFFER, null);
+      gl.blitFramebuffer(
+        0,
+        0,
+        framebuffer.width,
+        framebuffer.height,
+        targetX0,
+        targetY0,
+        targetX1,
+        targetY1,
+        gl.COLOR_BUFFER_BIT,
+        gl.NEAREST
+      );
+
+      topPx += previewHeight + DEFAULT_MARGIN_PX;
     }
-    ctx?.putImageData(imageData, 0, 0);
+  } finally {
+    gl.bindFramebuffer(gl.READ_FRAMEBUFFER, previousReadFramebuffer);
+    gl.bindFramebuffer(gl.DRAW_FRAMEBUFFER, previousDrawFramebuffer);
+    state.flushing = false;
+  }
+}
+
+function getOverlayRect(options: {
+  framebuffer: Framebuffer;
+  targetWidth: number;
+  targetHeight: number;
+  topPx: number;
+  leftPx: number;
+  minimap?: boolean;
+}): [number, number, number, number, number] {
+  const {framebuffer, targetWidth, targetHeight, topPx, leftPx, minimap} = options;
+  const maxWidth = minimap ? Math.max(Math.floor(targetWidth / 4), 1) : targetWidth;
+  const maxHeight = minimap ? Math.max(Math.floor(targetHeight / 4), 1) : targetHeight;
+  const scale = Math.min(maxWidth / framebuffer.width, maxHeight / framebuffer.height);
+  const previewWidth = Math.max(Math.floor(framebuffer.width * scale), 1);
+  const previewHeight = Math.max(Math.floor(framebuffer.height * scale), 1);
+  const targetX0 = leftPx;
+  const targetY0 = Math.max(targetHeight - topPx - previewHeight, 0);
+  const targetX1 = targetX0 + previewWidth;
+  const targetY1 = targetY0 + previewHeight;
+  return [targetX0, targetY0, targetX1, targetY1, previewHeight];
+}
+
+function getDebugFramebufferState(device: Device): DebugFramebufferState {
+  device.userData[DEBUG_FRAMEBUFFER_STATE_KEY] ||= {
+    flushing: false,
+    queuedFramebuffers: []
+  } satisfies DebugFramebufferState;
+  return device.userData[DEBUG_FRAMEBUFFER_STATE_KEY] as DebugFramebufferState;
+}
+
+function isFramebuffer(value: Framebuffer | Texture): value is Framebuffer {
+  return 'colorAttachments' in value;
+}
+
+function isDefaultRenderPass(renderPass: RenderPass): boolean {
+  const framebuffer = renderPass.props.framebuffer as {handle?: unknown} | null;
+  return !framebuffer || framebuffer.handle === null;
+}
+
+function parseCssPixel(value: string | undefined, defaultValue: number): number {
+  if (!value) {
+    return defaultValue;
   }
+  const parsedValue = Number.parseInt(value, 10);
+  return Number.isFinite(parsedValue) ? parsedValue : defaultValue;
 }

package/src/dynamic-texture/dynamic-texture.ts

@@ -18,14 +18,11 @@ import {
   // cube constants
   type TextureCubeFace,
   TEXTURE_CUBE_FACE_MAP,
-
   // texture slice/mip data types
   type TextureSubresource,
-
   // props (dimension + data)
   type TextureDataProps,
   type TextureDataAsyncProps,
-
   // combined data for different texture types
   type Texture1DData,
   type Texture2DData,
@@ -33,7 +30,6 @@ import {
   type TextureArrayData,
   type TextureCubeArrayData,
   type TextureCubeData,
-
   // Helpers
   getTextureSizeFromData,
   resolveTextureImageFormat,
@@ -116,7 +112,9 @@ export class DynamicTexture {
     return 'DynamicTexture';
   }
   toString(): string {
-    return `DynamicTexture:"${this.id}":${this.texture.width}x${this.texture.height}px:(${this.isReady ? 'ready' : 'loading...'})`;
+    const width = this._texture?.width ?? this.props.width ?? '?';
+    const height = this._texture?.height ?? this.props.height ?? '?';
+    return `DynamicTexture:"${this.id}":${width}x${height}px:(${this.isReady ? 'ready' : 'loading...'})`;
   }
 
   constructor(device: Device, props: DynamicTextureProps) {

package/src/dynamic-texture/texture-data.ts

@@ -40,11 +40,11 @@ export type TextureSliceData = TextureMipLevelData | TextureMipLevelData[];
 export type TextureCubeFace = '+X' | '-X' | '+Y' | '-Y' | '+Z' | '-Z';
 
 /** Array of cube texture faces. @note: index in array is the face index */
-// prettier-ignore
+// biome-ignore format: preserve layout
 export const TEXTURE_CUBE_FACES = ['+X', '-X', '+Y', '-Y', '+Z', '-Z'] as const satisfies readonly TextureCubeFace[];
 
 /** Map of cube texture face names to face indexes */
-// prettier-ignore
+// biome-ignore format: preserve layout
 export const TEXTURE_CUBE_FACE_MAP = {'+X': 0, '-X': 1, '+Y': 2, '-Y': 3, '+Z': 4, '-Z': 5} as const satisfies Record<TextureCubeFace, number>;
 
 /** @todo - Define what data type is supported for 1D textures. TextureImageData with height = 1 */

package/src/dynamic-texture/texture-data.ts.disabled

@@ -131,7 +131,7 @@ export function normalizeTextureData(
 
 /** Convert luma.gl cubemap face constants to depth index */
 export function getCubeFaceDepth(face: TextureCubeFace): number {
-  // prettier-ignore
+  // biome-ignore format: preserve layout
   switch (face) {
         case '+X': return  0;
         case '-X': return  1;

package/src/geometries/cube-geometry.ts

@@ -35,13 +35,13 @@ export class CubeGeometry extends Geometry {
   }
 }
 
-// prettier-ignore
+// biome-ignore format: preserve layout
 const CUBE_INDICES = new Uint16Array([
   0, 1, 2, 0, 2, 3, 4, 5, 6, 4, 6, 7, 8, 9, 10, 8, 10, 11, 12, 13,
   14, 12, 14, 15, 16, 17, 18, 16, 18, 19, 20, 21, 22, 20, 22, 23
 ]);
 
-// prettier-ignore
+// biome-ignore format: preserve layout
 const CUBE_POSITIONS = new Float32Array([
   -1,  -1,  1, 1,  -1,  1,  1,  1,  1,  -1,  1,  1,
   -1,  -1,  -1,  -1,  1,  -1,  1,  1,  -1,  1,  -1,  -1,
@@ -52,7 +52,7 @@ const CUBE_POSITIONS = new Float32Array([
 ]);
 
 // TODO - could be Uint8
-// prettier-ignore
+// biome-ignore format: preserve layout
 const CUBE_NORMALS = new Float32Array([
   // Front face
   0,  0,  1,  0,  0,  1,  0,  0,  1,  0,  0,  1,
@@ -68,7 +68,7 @@ const CUBE_NORMALS = new Float32Array([
   -1,  0,  0,  -1,  0,  0,  -1,  0,  0,  -1,  0,  0
 ]);
 
-// prettier-ignore
+// biome-ignore format: preserve layout
 const CUBE_TEX_COORDS = new Float32Array([
   // Front face
   0,  0,  1,  0,  1,  1,  0,  1,
@@ -85,7 +85,7 @@ const CUBE_TEX_COORDS = new Float32Array([
 ]);
 
 // float4 position
-// prettier-ignore
+// biome-ignore format: preserve layout
 export const CUBE_NON_INDEXED_POSITIONS = new Float32Array([
   1, -1, 1,
   -1, -1, 1,
@@ -131,7 +131,7 @@ export const CUBE_NON_INDEXED_POSITIONS = new Float32Array([
 ]);
 
 // float2 uv,
-// prettier-ignore
+// biome-ignore format: preserve layout
 export const CUBE_NON_INDEXED_TEX_COORDS = new Float32Array([
   1, 1,
   0, 1,
@@ -177,7 +177,7 @@ export const CUBE_NON_INDEXED_TEX_COORDS = new Float32Array([
 ]);
 
 // float4 color
-// prettier-ignore
+// biome-ignore format: preserve layout
 export const CUBE_NON_INDEXED_COLORS = new Float32Array([
   1, 0, 1, 1,
   0, 0, 1, 1,

package/src/geometries/ico-sphere-geometry.ts

@@ -75,7 +75,9 @@ function tesselateIcosaHedron(props: IcoSphereGeometryProps) {
 
       positions.push(xm, ym, zm);
 
-      return (pointMemo[key] = positions.length / 3 - 1);
+      const pointIndex = positions.length / 3 - 1;
+      pointMemo[key] = pointIndex;
+      return pointIndex;
     };
   })();
 

package/src/geometry/gpu-geometry.ts

@@ -117,6 +117,9 @@ export function getAttributeBuffersFromGeometry(
       case 'TEXCOORD_0':
         name = 'texCoords';
         break;
+      case 'TEXCOORD_1':
+        name = 'texCoords1';
+        break;
       case 'COLOR_0':
         name = 'colors';
         break;

package/src/material/material.ts

@@ -94,11 +94,11 @@ export class Material<
       ])
     ) as {[P in keyof TModuleProps]?: ShaderModule[] extends never ? never : any};
     this.shaderInputs = props.shaderInputs || new ShaderInputs<TModuleProps>(moduleMap);
-    this._uniformStore = new UniformStore(this.shaderInputs.modules);
+    this._uniformStore = new UniformStore(this.device, this.shaderInputs.modules);
 
     for (const [moduleName, module] of Object.entries(this.shaderInputs.modules)) {
       if (this.ownsModule(moduleName) && shaderModuleHasUniforms(module)) {
-        const uniformBuffer = this._uniformStore.getManagedUniformBuffer(this.device, moduleName);
+        const uniformBuffer = this._uniformStore.getManagedUniformBuffer(moduleName);
         this.bindings[`${moduleName}Uniforms`] = uniformBuffer;
       }
     }