@luma.gl/engine 9.2.0-alpha.1 → 9.2.0-alpha.2

package/dist/index.cjs

@@ -301,21 +301,9 @@ var _AnimationLoop = class {
   delete() {
     this.destroy();
   }
-  setError(error) {
-    var _a;
+  reportError(error) {
     this.props.onError(error);
-    this._error = Error();
-    const canvas2 = (_a = this.device) == null ? void 0 : _a.getDefaultCanvasContext().canvas;
-    if (canvas2 instanceof HTMLCanvasElement) {
-      const errorDiv = document.createElement("h1");
-      errorDiv.innerHTML = error.message;
-      errorDiv.style.position = "absolute";
-      errorDiv.style.top = "20%";
-      errorDiv.style.left = "10px";
-      errorDiv.style.color = "black";
-      errorDiv.style.backgroundColor = "red";
-      document.body.appendChild(errorDiv);
-    }
+    this._error = error;
   }
   /** Flags this animation loop as needing redraw */
   setNeedsRedraw(reason) {
@@ -639,8 +627,14 @@ function makeAnimationLoop(AnimationLoopTemplateCtor, props) {
     ...props,
     device,
     async onInitialize(animationProps) {
-      renderLoop = new AnimationLoopTemplateCtor(animationProps);
-      return await (renderLoop == null ? void 0 : renderLoop.onInitialize(animationProps));
+      clearError(animationProps.animationLoop.device);
+      try {
+        renderLoop = new AnimationLoopTemplateCtor(animationProps);
+        return await (renderLoop == null ? void 0 : renderLoop.onInitialize(animationProps));
+      } catch (error) {
+        setError(animationProps.animationLoop.device, error);
+        return null;
+      }
     },
     onRender: (animationProps) => renderLoop == null ? void 0 : renderLoop.onRender(animationProps),
     onFinalize: (animationProps) => renderLoop == null ? void 0 : renderLoop.onFinalize(animationProps)
@@ -650,9 +644,33 @@ function makeAnimationLoop(AnimationLoopTemplateCtor, props) {
   };
   return animationLoop;
 }
+function setError(device, error) {
+  var _a;
+  const canvas2 = device == null ? void 0 : device.getDefaultCanvasContext().canvas;
+  if (canvas2 instanceof HTMLCanvasElement) {
+    canvas2.style.overflow = "visible";
+    let errorDiv = document.getElementById("animation-loop-error");
+    errorDiv == null ? void 0 : errorDiv.remove();
+    errorDiv = document.createElement("h1");
+    errorDiv.id = "animation-loop-error";
+    errorDiv.innerHTML = error.message;
+    errorDiv.style.position = "absolute";
+    errorDiv.style.top = "10px";
+    errorDiv.style.left = "10px";
+    errorDiv.style.color = "black";
+    errorDiv.style.backgroundColor = "red";
+    (_a = canvas2.parentElement) == null ? void 0 : _a.appendChild(errorDiv);
+  }
+}
+function clearError(device) {
+  const errorDiv = document.getElementById("animation-loop-error");
+  if (errorDiv) {
+    errorDiv.remove();
+  }
+}
 
 // dist/model/model.js
-var import_core8 = require("@luma.gl/core");
+var import_core9 = require("@luma.gl/core");
 var import_shadertools2 = require("@luma.gl/shadertools");
 
 // dist/geometry/gpu-geometry.js
@@ -768,8 +786,8 @@ var import_core4 = require("@luma.gl/core");
 var _PipelineFactory = class {
   /** Get the singleton default pipeline factory for the specified device */
   static getDefaultPipelineFactory(device) {
-    device._lumaData.defaultPipelineFactory = device._lumaData.defaultPipelineFactory || new _PipelineFactory(device);
-    return device._lumaData.defaultPipelineFactory;
+    device._lumaData["defaultPipelineFactory"] = device._lumaData["defaultPipelineFactory"] || new _PipelineFactory(device);
+    return device._lumaData["defaultPipelineFactory"];
   }
   device;
   cachingEnabled;
@@ -934,8 +952,8 @@ var import_core5 = require("@luma.gl/core");
 var _ShaderFactory = class {
   /** Returns the default ShaderFactory for the given {@link Device}, creating one if necessary. */
   static getDefaultShaderFactory(device) {
-    device._lumaData.defaultShaderFactory ||= new _ShaderFactory(device);
-    return device._lumaData.defaultShaderFactory;
+    device._lumaData["defaultShaderFactory"] ||= new _ShaderFactory(device);
+    return device._lumaData["defaultShaderFactory"];
   }
   device;
   cachingEnabled;
@@ -1111,8 +1129,58 @@ function deepEqual(a, b, depth) {
   return false;
 }
 
-// dist/shader-inputs.js
+// dist/utils/buffer-layout-helper.js
 var import_core6 = require("@luma.gl/core");
+var BufferLayoutHelper = class {
+  bufferLayouts;
+  constructor(bufferLayouts) {
+    this.bufferLayouts = bufferLayouts;
+  }
+  getBufferLayout(name) {
+    return this.bufferLayouts.find((layout) => layout.name === name) || null;
+  }
+  /** Get attribute names from a BufferLayout */
+  getAttributeNamesForBuffer(bufferLayout) {
+    var _a;
+    return bufferLayout.attributes ? (_a = bufferLayout.attributes) == null ? void 0 : _a.map((layout) => layout.attribute) : [bufferLayout.name];
+  }
+  mergeBufferLayouts(bufferLayouts1, bufferLayouts2) {
+    const mergedLayouts = [...bufferLayouts1];
+    for (const attribute of bufferLayouts2) {
+      const index = mergedLayouts.findIndex((attribute2) => attribute2.name === attribute.name);
+      if (index < 0) {
+        mergedLayouts.push(attribute);
+      } else {
+        mergedLayouts[index] = attribute;
+      }
+    }
+    return mergedLayouts;
+  }
+  getBufferIndex(bufferName) {
+    const bufferIndex = this.bufferLayouts.findIndex((layout) => layout.name === bufferName);
+    if (bufferIndex === -1) {
+      import_core6.log.warn(`BufferLayout: Missing buffer for "${bufferName}".`)();
+    }
+    return bufferIndex;
+  }
+};
+
+// dist/utils/buffer-layout-order.js
+function sortedBufferLayoutByShaderSourceLocations(shaderLayout, bufferLayout) {
+  const shaderLayoutMap = Object.fromEntries(shaderLayout.attributes.map((attr) => [attr.name, attr.location]));
+  const sortedLayout = bufferLayout.slice();
+  sortedLayout.sort((a, b) => {
+    const attributeNamesA = a.attributes ? a.attributes.map((attr) => attr.attribute) : [a.name];
+    const attributeNamesB = b.attributes ? b.attributes.map((attr) => attr.attribute) : [b.name];
+    const minLocationA = Math.min(...attributeNamesA.map((name) => shaderLayoutMap[name]));
+    const minLocationB = Math.min(...attributeNamesB.map((name) => shaderLayoutMap[name]));
+    return minLocationA - minLocationB;
+  });
+  return sortedLayout;
+}
+
+// dist/shader-inputs.js
+var import_core7 = require("@luma.gl/core");
 var import_shadertools = require("@luma.gl/shadertools");
 
 // dist/model/split-uniforms-and-bindings.js
@@ -1135,11 +1203,14 @@ function splitUniformsAndBindings(uniforms) {
 
 // dist/shader-inputs.js
 var ShaderInputs = class {
+  options = {
+    disableWarnings: false
+  };
   /**
    * The map of modules
    * @todo should should this include the resolved dependencies?
    */
-  // @ts-expect-error Fix typings
+  // @ts-ignore Fix typings
   modules;
   /** Stores the uniform values for each module */
   moduleUniforms;
@@ -1151,20 +1222,20 @@ var ShaderInputs = class {
    * Create a new UniformStore instance
    * @param modules
    */
-  // @ts-expect-error Fix typings
-  constructor(modules) {
+  constructor(modules, options) {
+    Object.assign(this.options, options);
     const resolvedModules = (0, import_shadertools.getShaderModuleDependencies)(Object.values(modules).filter((module2) => module2.dependencies));
     for (const resolvedModule of resolvedModules) {
       modules[resolvedModule.name] = resolvedModule;
     }
-    import_core6.log.log(1, "Creating ShaderInputs with modules", Object.keys(modules))();
+    import_core7.log.log(1, "Creating ShaderInputs with modules", Object.keys(modules))();
     this.modules = modules;
     this.moduleUniforms = {};
     this.moduleBindings = {};
     for (const [name, module2] of Object.entries(modules)) {
       this._addModule(module2);
-      if (module2.name && name !== module2.name) {
-        import_core6.log.warn(`Module name: ${name} vs ${module2.name}`)();
+      if (module2.name && name !== module2.name && !this.options.disableWarnings) {
+        import_core7.log.warn(`Module name: ${name} vs ${module2.name}`)();
       }
     }
   }
@@ -1181,7 +1252,9 @@ var ShaderInputs = class {
       const moduleProps = props[moduleName] || {};
       const module2 = this.modules[moduleName];
       if (!module2) {
-        import_core6.log.warn(`Module ${name} not found`)();
+        if (!this.options.disableWarnings) {
+          import_core7.log.warn(`Module ${name} not found`)();
+        }
         continue;
       }
       const oldUniforms = this.moduleUniforms[moduleName];
@@ -1234,7 +1307,7 @@ var ShaderInputs = class {
 };
 
 // dist/async-texture/async-texture.js
-var import_core7 = require("@luma.gl/core");
+var import_core8 = require("@luma.gl/core");
 
 // dist/application-utils/load-file.js
 var pathPrefix = "";
@@ -1354,7 +1427,7 @@ var _AsyncTexture = class {
     if (this.props.mipmaps) {
       this.generateMipmaps();
     }
-    import_core7.log.info(1, `${this} loaded`);
+    import_core8.log.info(1, `${this} loaded`);
   }
   destroy() {
     if (this.texture) {
@@ -1368,7 +1441,7 @@ var _AsyncTexture = class {
   }
   /** Set sampler or create and set new Sampler from SamplerProps */
   setSampler(sampler = {}) {
-    this.texture.setSampler(sampler instanceof import_core7.Sampler ? sampler : this.device.createSampler(sampler));
+    this.texture.setSampler(sampler instanceof import_core8.Sampler ? sampler : this.device.createSampler(sampler));
   }
   /**
    * Textures are immutable and cannot be resized after creation,
@@ -1450,7 +1523,7 @@ var _AsyncTexture = class {
     }
     const lodArray = this._normalizeTextureData(lodData);
     if (lodArray.length > 1 && this.props.mipmaps !== false) {
-      import_core7.log.warn(`Texture ${this.id} mipmap and multiple LODs.`)();
+      import_core8.log.warn(`Texture ${this.id} mipmap and multiple LODs.`)();
     }
     for (let mipLevel = 0; mipLevel < lodArray.length; mipLevel++) {
       const imageData = lodArray[mipLevel];
@@ -1513,7 +1586,7 @@ var _AsyncTexture = class {
   /** Experimental */
   _setTextureCubeFaceData(texture, lodData, face, depth = 0) {
     if (Array.isArray(lodData) && lodData.length > 1 && this.props.mipmaps !== false) {
-      import_core7.log.warn(`${this.id} has mipmap and multiple LODs.`)();
+      import_core8.log.warn(`${this.id} has mipmap and multiple LODs.`)();
     }
     const faceDepth = TextureCubeFaces.indexOf(face);
     this._setTexture2DData(lodData, faceDepth);
@@ -1547,7 +1620,7 @@ var _AsyncTexture = class {
 };
 var AsyncTexture = _AsyncTexture;
 __publicField(AsyncTexture, "defaultProps", {
-  ...import_core7.Texture.defaultProps,
+  ...import_core8.Texture.defaultProps,
   data: null,
   mipmaps: false
 });
@@ -1643,15 +1716,15 @@ var _Model = class {
     this.device = device;
     Object.assign(this.userData, props.userData);
     const moduleMap = Object.fromEntries(((_a = this.props.modules) == null ? void 0 : _a.map((module2) => [module2.name, module2])) || []);
-    this.setShaderInputs(props.shaderInputs || new ShaderInputs(moduleMap));
+    const shaderInputs = props.shaderInputs || new ShaderInputs(moduleMap, { disableWarnings: this.props.disableWarnings });
+    this.setShaderInputs(shaderInputs);
     const platformInfo = getPlatformInfo(device);
     const modules = (
-      // @ts-expect-error shaderInputs is assigned in setShaderInputs above.
+      // @ts-ignore shaderInputs is assigned in setShaderInputs above.
       (((_b = this.props.modules) == null ? void 0 : _b.length) > 0 ? this.props.modules : (_c = this.shaderInputs) == null ? void 0 : _c.getModules()) || []
     );
     const isWebGPU = this.device.type === "webgpu";
     if (isWebGPU && this.props.source) {
-      this.props.shaderLayout ||= (0, import_shadertools2.getShaderLayoutFromWGSL)(this.props.source);
       const { source: source3, getUniforms: getUniforms2 } = this.props.shaderAssembler.assembleWGSLShader({
         platformInfo,
         ...this.props,
@@ -1659,6 +1732,7 @@ var _Model = class {
       });
       this.source = source3;
       this._getModuleUniforms = getUniforms2;
+      this.props.shaderLayout ||= (0, import_shadertools2.getShaderLayoutFromWGSL)(this.source);
     } else {
       const { vs: vs3, fs: fs3, getUniforms: getUniforms2 } = this.props.shaderAssembler.assembleGLSLShaderPair({
         platformInfo,
@@ -1747,7 +1821,7 @@ var _Model = class {
   draw(renderPass) {
     const loadingBinding = this._areBindingsLoading();
     if (loadingBinding) {
-      import_core8.log.info(LOG_DRAW_PRIORITY, `>>> DRAWING ABORTED ${this.id}: ${loadingBinding} not loaded`)();
+      import_core9.log.info(LOG_DRAW_PRIORITY, `>>> DRAWING ABORTED ${this.id}: ${loadingBinding} not loaded`)();
       return false;
     }
     try {
@@ -1806,7 +1880,7 @@ var _Model = class {
     const gpuGeometry = geometry && makeGPUGeometry(this.device, geometry);
     if (gpuGeometry) {
       this.setTopology(gpuGeometry.topology || "triangle-list");
-      const bufferLayoutHelper = new import_core8._BufferLayoutHelper(this.bufferLayout);
+      const bufferLayoutHelper = new BufferLayoutHelper(this.bufferLayout);
       this.bufferLayout = bufferLayoutHelper.mergeBufferLayouts(gpuGeometry.bufferLayout, this.bufferLayout);
       if (this.vertexArray) {
         this._setGeometryAttributes(gpuGeometry);
@@ -1829,7 +1903,7 @@ var _Model = class {
    * @note Triggers a pipeline rebuild / pipeline cache fetch
    */
   setBufferLayout(bufferLayout) {
-    const bufferLayoutHelper = new import_core8._BufferLayoutHelper(this.bufferLayout);
+    const bufferLayoutHelper = new BufferLayoutHelper(this.bufferLayout);
     this.bufferLayout = this._gpuGeometry ? bufferLayoutHelper.mergeBufferLayouts(bufferLayout, this._gpuGeometry.bufferLayout) : bufferLayout;
     this._setPipelineNeedsUpdate("bufferLayout");
     this.pipeline = this._updatePipeline();
@@ -1875,7 +1949,7 @@ var _Model = class {
   /** Set the shader inputs */
   setShaderInputs(shaderInputs) {
     this.shaderInputs = shaderInputs;
-    this._uniformStore = new import_core8.UniformStore(this.shaderInputs.modules);
+    this._uniformStore = new import_core9.UniformStore(this.shaderInputs.modules);
     for (const [moduleName, module2] of Object.entries(this.shaderInputs.modules)) {
       if (shaderModuleHasUniforms(module2)) {
         const uniformBuffer = this._uniformStore.getManagedUniformBuffer(this.device, moduleName);
@@ -1918,15 +1992,16 @@ var _Model = class {
    */
   setAttributes(buffers, options) {
     const disableWarnings = (options == null ? void 0 : options.disableWarnings) ?? this.props.disableWarnings;
-    if (buffers.indices) {
-      import_core8.log.warn(`Model:${this.id} setAttributes() - indexBuffer should be set using setIndexBuffer()`)();
+    if (buffers["indices"]) {
+      import_core9.log.warn(`Model:${this.id} setAttributes() - indexBuffer should be set using setIndexBuffer()`)();
     }
-    const bufferLayoutHelper = new import_core8._BufferLayoutHelper(this.bufferLayout);
+    this.bufferLayout = sortedBufferLayoutByShaderSourceLocations(this.pipeline.shaderLayout, this.bufferLayout);
+    const bufferLayoutHelper = new BufferLayoutHelper(this.bufferLayout);
     for (const [bufferName, buffer] of Object.entries(buffers)) {
       const bufferLayout = bufferLayoutHelper.getBufferLayout(bufferName);
       if (!bufferLayout) {
         if (!disableWarnings) {
-          import_core8.log.warn(`Model(${this.id}): Missing layout for buffer "${bufferName}".`)();
+          import_core9.log.warn(`Model(${this.id}): Missing layout for buffer "${bufferName}".`)();
         }
         continue;
       }
@@ -1935,12 +2010,13 @@ var _Model = class {
       for (const attributeName of attributeNames) {
         const attributeInfo = this._attributeInfos[attributeName];
         if (attributeInfo) {
-          this.vertexArray.setBuffer(attributeInfo.location, buffer);
+          const location = this.device.type === "webgpu" ? bufferLayoutHelper.getBufferIndex(attributeInfo.bufferName) : attributeInfo.location;
+          this.vertexArray.setBuffer(location, buffer);
           set = true;
         }
       }
       if (!set && !disableWarnings) {
-        import_core8.log.warn(`Model(${this.id}): Ignoring buffer "${buffer.id}" for unknown attribute "${bufferName}"`)();
+        import_core9.log.warn(`Model(${this.id}): Ignoring buffer "${buffer.id}" for unknown attribute "${bufferName}"`)();
       }
     }
     this.setNeedsRedraw("attributes");
@@ -1959,7 +2035,7 @@ var _Model = class {
       if (attributeInfo) {
         this.vertexArray.setConstantWebGL(attributeInfo.location, value);
       } else if (!((options == null ? void 0 : options.disableWarnings) ?? this.props.disableWarnings)) {
-        import_core8.log.warn(`Model "${this.id}: Ignoring constant supplied for unknown attribute "${attributeName}"`)();
+        import_core9.log.warn(`Model "${this.id}: Ignoring constant supplied for unknown attribute "${attributeName}"`)();
       }
     }
     this.setNeedsRedraw("constants");
@@ -1992,16 +2068,16 @@ var _Model = class {
   _getBindingsUpdateTimestamp() {
     let timestamp = 0;
     for (const binding of Object.values(this.bindings)) {
-      if (binding instanceof import_core8.TextureView) {
+      if (binding instanceof import_core9.TextureView) {
         timestamp = Math.max(timestamp, binding.texture.updateTimestamp);
-      } else if (binding instanceof import_core8.Buffer || binding instanceof import_core8.Texture) {
+      } else if (binding instanceof import_core9.Buffer || binding instanceof import_core9.Texture) {
         timestamp = Math.max(timestamp, binding.updateTimestamp);
       } else if (binding instanceof AsyncTexture) {
         timestamp = binding.texture ? Math.max(timestamp, binding.texture.updateTimestamp) : (
           // The texture will become available in the future
           Infinity
         );
-      } else if (!(binding instanceof import_core8.Sampler)) {
+      } else if (!(binding instanceof import_core9.Sampler)) {
         timestamp = Math.max(timestamp, binding.buffer.updateTimestamp);
       }
     }
@@ -2036,7 +2112,7 @@ var _Model = class {
       let prevShaderVs = null;
       let prevShaderFs = null;
       if (this.pipeline) {
-        import_core8.log.log(1, `Model ${this.id}: Recreating pipeline because "${this._pipelineNeedsUpdate}".`)();
+        import_core9.log.log(1, `Model ${this.id}: Recreating pipeline because "${this._pipelineNeedsUpdate}".`)();
         prevShaderVs = this.pipeline.vs;
         prevShaderFs = this.pipeline.fs;
       }
@@ -2069,7 +2145,7 @@ var _Model = class {
         vs: vs3,
         fs: fs3
       });
-      this._attributeInfos = (0, import_core8.getAttributeInfosFromLayouts)(this.pipeline.shaderLayout, this.bufferLayout);
+      this._attributeInfos = (0, import_core9.getAttributeInfosFromLayouts)(this.pipeline.shaderLayout, this.bufferLayout);
       if (prevShaderVs)
         this.shaderFactory.release(prevShaderVs);
       if (prevShaderFs)
@@ -2081,24 +2157,24 @@ var _Model = class {
   _lastLogTime = 0;
   _logOpen = false;
   _logDrawCallStart() {
-    const logDrawTimeout = import_core8.log.level > 3 ? 0 : LOG_DRAW_TIMEOUT;
-    if (import_core8.log.level < 2 || Date.now() - this._lastLogTime < logDrawTimeout) {
+    const logDrawTimeout = import_core9.log.level > 3 ? 0 : LOG_DRAW_TIMEOUT;
+    if (import_core9.log.level < 2 || Date.now() - this._lastLogTime < logDrawTimeout) {
       return;
     }
     this._lastLogTime = Date.now();
     this._logOpen = true;
-    import_core8.log.group(LOG_DRAW_PRIORITY, `>>> DRAWING MODEL ${this.id}`, { collapsed: import_core8.log.level <= 2 })();
+    import_core9.log.group(LOG_DRAW_PRIORITY, `>>> DRAWING MODEL ${this.id}`, { collapsed: import_core9.log.level <= 2 })();
   }
   _logDrawCallEnd() {
     if (this._logOpen) {
       const shaderLayoutTable = getDebugTableForShaderLayout(this.pipeline.shaderLayout, this.id);
-      import_core8.log.table(LOG_DRAW_PRIORITY, shaderLayoutTable)();
+      import_core9.log.table(LOG_DRAW_PRIORITY, shaderLayoutTable)();
       const uniformTable = this.shaderInputs.getDebugTable();
-      import_core8.log.table(LOG_DRAW_PRIORITY, uniformTable)();
+      import_core9.log.table(LOG_DRAW_PRIORITY, uniformTable)();
       const attributeTable = this._getAttributeDebugTable();
-      import_core8.log.table(LOG_DRAW_PRIORITY, this._attributeInfos)();
-      import_core8.log.table(LOG_DRAW_PRIORITY, attributeTable)();
-      import_core8.log.groupEnd(LOG_DRAW_PRIORITY)();
+      import_core9.log.table(LOG_DRAW_PRIORITY, this._attributeInfos)();
+      import_core9.log.table(LOG_DRAW_PRIORITY, attributeTable)();
+      import_core9.log.groupEnd(LOG_DRAW_PRIORITY)();
       this._logOpen = false;
     }
   }
@@ -2127,7 +2203,7 @@ var _Model = class {
     if (this.vertexArray.indexBuffer) {
       const { indexBuffer } = this.vertexArray;
       const values = indexBuffer.indexType === "uint32" ? new Uint32Array(indexBuffer.debugData) : new Uint16Array(indexBuffer.debugData);
-      table.indices = {
+      table["indices"] = {
         name: "indices",
         type: indexBuffer.indexType,
         values: values.toString()
@@ -2137,14 +2213,14 @@ var _Model = class {
   }
   // TODO - fix typing of luma data types
   _getBufferOrConstantValues(attribute, dataType) {
-    const TypedArrayConstructor = (0, import_core8.getTypedArrayFromDataType)(dataType);
-    const typedArray = attribute instanceof import_core8.Buffer ? new TypedArrayConstructor(attribute.debugData) : attribute;
+    const TypedArrayConstructor = (0, import_core9.getTypedArrayConstructor)(dataType);
+    const typedArray = attribute instanceof import_core9.Buffer ? new TypedArrayConstructor(attribute.debugData) : attribute;
     return typedArray.toString();
   }
 };
 var Model = _Model;
 __publicField(Model, "defaultProps", {
-  ...import_core8.RenderPipeline.defaultProps,
+  ...import_core9.RenderPipeline.defaultProps,
   source: void 0,
   vs: null,
   fs: null,
@@ -2190,7 +2266,7 @@ function isObjectEmpty(obj) {
 }
 
 // dist/compute/buffer-transform.js
-var import_core9 = require("@luma.gl/core");
+var import_core10 = require("@luma.gl/core");
 var import_shadertools3 = require("@luma.gl/shadertools");
 var _BufferTransform = class {
   device;
@@ -2253,7 +2329,7 @@ var _BufferTransform = class {
     if (!result) {
       throw new Error("BufferTransform#getBuffer");
     }
-    if (result instanceof import_core9.Buffer) {
+    if (result instanceof import_core10.Buffer) {
       return result.readAsync();
     }
     const { buffer, byteOffset = 0, byteLength = buffer.byteLength } = result;
@@ -2408,9 +2484,9 @@ var Geometry = class {
         this.attributes[attributeName] = attribute;
       }
     }
-    if (this.indices && this.indices.isIndexed !== void 0) {
+    if (this.indices && this.indices["isIndexed"] !== void 0) {
       this.indices = Object.assign({}, this.indices);
-      delete this.indices.isIndexed;
+      delete this.indices["isIndexed"];
     }
     this.vertexCount = vertexCount || this._calculateVertexCount(this.attributes, this.indices);
   }
@@ -2606,14 +2682,14 @@ var BackgroundTextureModel = class extends ClipSpace {
 };
 
 // dist/scenegraph/scenegraph-node.js
-var import_core10 = require("@math.gl/core");
+var import_core11 = require("@math.gl/core");
 var ScenegraphNode = class {
   id;
-  matrix = new import_core10.Matrix4();
+  matrix = new import_core11.Matrix4();
   display = true;
-  position = new import_core10.Vector3();
-  rotation = new import_core10.Vector3();
-  scale = new import_core10.Vector3(1, 1, 1);
+  position = new import_core11.Vector3();
+  rotation = new import_core11.Vector3();
+  scale = new import_core11.Vector3(1, 1, 1);
   userData = {};
   props = {};
   constructor(props = {}) {
@@ -2698,7 +2774,7 @@ var ScenegraphNode = class {
   }
   getCoordinateUniforms(viewMatrix, modelMatrix) {
     modelMatrix = modelMatrix || this.matrix;
-    const worldMatrix = new import_core10.Matrix4(viewMatrix).multiplyRight(modelMatrix);
+    const worldMatrix = new import_core11.Matrix4(viewMatrix).multiplyRight(modelMatrix);
     const worldInverse = worldMatrix.invert();
     const worldInverseTranspose = worldInverse.transpose();
     return {
@@ -2750,14 +2826,14 @@ var ScenegraphNode = class {
 };
 
 // dist/scenegraph/group-node.js
-var import_core11 = require("@math.gl/core");
-var import_core12 = require("@luma.gl/core");
+var import_core12 = require("@math.gl/core");
+var import_core13 = require("@luma.gl/core");
 var GroupNode = class extends ScenegraphNode {
   children;
   constructor(props = {}) {
     props = Array.isArray(props) ? { children: props } : props;
     const { children = [] } = props;
-    import_core12.log.assert(children.every((child) => child instanceof ScenegraphNode), "every child must an instance of ScenegraphNode");
+    import_core13.log.assert(children.every((child) => child instanceof ScenegraphNode), "every child must an instance of ScenegraphNode");
     super(props);
     this.children = children;
   }
@@ -2772,12 +2848,12 @@ var GroupNode = class extends ScenegraphNode {
         return;
       }
       const [min, max] = bounds;
-      const center = new import_core11.Vector3(min).add(max).divide([2, 2, 2]);
+      const center = new import_core12.Vector3(min).add(max).divide([2, 2, 2]);
       worldMatrix.transformAsPoint(center, center);
-      const halfSize = new import_core11.Vector3(max).subtract(min).divide([2, 2, 2]);
+      const halfSize = new import_core12.Vector3(max).subtract(min).divide([2, 2, 2]);
       worldMatrix.transformAsVector(halfSize, halfSize);
       for (let v = 0; v < 8; v++) {
-        const position = new import_core11.Vector3(v & 1 ? -1 : 1, v & 2 ? -1 : 1, v & 4 ? -1 : 1).multiply(halfSize).add(center);
+        const position = new import_core12.Vector3(v & 1 ? -1 : 1, v & 2 ? -1 : 1, v & 4 ? -1 : 1).multiply(halfSize).add(center);
         for (let i = 0; i < 3; i++) {
           result[0][i] = Math.min(result[0][i], position[i]);
           result[1][i] = Math.max(result[1][i], position[i]);
@@ -2817,8 +2893,8 @@ var GroupNode = class extends ScenegraphNode {
     this.children = [];
     return this;
   }
-  traverse(visitor, { worldMatrix = new import_core11.Matrix4() } = {}) {
-    const modelMatrix = new import_core11.Matrix4(worldMatrix).multiplyRight(this.matrix);
+  traverse(visitor, { worldMatrix = new import_core12.Matrix4() } = {}) {
+    const modelMatrix = new import_core12.Matrix4(worldMatrix).multiplyRight(this.matrix);
     for (const child of this.children) {
       if (child instanceof GroupNode) {
         child.traverse(visitor, { worldMatrix: modelMatrix });
@@ -3600,7 +3676,7 @@ var CylinderGeometry = class extends TruncatedConeGeometry {
 };
 
 // dist/geometries/ico-sphere-geometry.js
-var import_core13 = require("@math.gl/core");
+var import_core14 = require("@math.gl/core");
 var ICO_POSITIONS = [-1, 0, 0, 0, 1, 0, 0, 0, -1, 0, 0, 1, 0, -1, 0, 1, 0, 0];
 var ICO_INDICES = [3, 4, 5, 3, 5, 1, 3, 1, 0, 3, 0, 4, 4, 0, 2, 4, 2, 5, 2, 0, 1, 5, 2, 1];
 var IcoSphereGeometry = class extends Geometry {
@@ -3698,7 +3774,7 @@ function tesselateIcosaHedron(props) {
     const u3 = 1 - phi3 / PI2;
     const vec1 = [x3 - x2, y3 - y2, z3 - z2];
     const vec2 = [x1 - x2, y1 - y2, z1 - z2];
-    const normal = new import_core13.Vector3(vec1).cross(vec2).normalize();
+    const normal = new import_core14.Vector3(vec1).cross(vec2).normalize();
     let newIndex;
     if ((u1 === 0 || u2 === 0 || u3 === 0) && (u1 === 0 || u1 > 0.5) && (u2 === 0 || u2 > 0.5) && (u3 === 0 || u3 > 0.5)) {
       positions.push(positions[in1 + 0], positions[in1 + 1], positions[in1 + 2]);
@@ -3962,7 +4038,7 @@ function fract(n) {
 var import_shadertools5 = require("@luma.gl/shadertools");
 
 // dist/compute/swap.js
-var import_core14 = require("@luma.gl/core");
+var import_core15 = require("@luma.gl/core");
 var Swap = class {
   /** The current resource - usually the source for renders or computations */
   current;
@@ -3991,14 +4067,14 @@ var SwapFramebuffers = class extends Swap {
     props = { ...props };
     let colorAttachments = (_a = props.colorAttachments) == null ? void 0 : _a.map((colorAttachment) => typeof colorAttachment !== "string" ? colorAttachment : device.createTexture({
       format: colorAttachment,
-      usage: import_core14.Texture.SAMPLE | import_core14.Texture.RENDER | import_core14.Texture.COPY_SRC | import_core14.Texture.COPY_DST,
+      usage: import_core15.Texture.SAMPLE | import_core15.Texture.RENDER | import_core15.Texture.COPY_SRC | import_core15.Texture.COPY_DST,
       width: 1,
       height: 1
     }));
     const current = device.createFramebuffer({ ...props, colorAttachments });
     colorAttachments = (_b = props.colorAttachments) == null ? void 0 : _b.map((colorAttachment) => typeof colorAttachment !== "string" ? colorAttachment : device.createTexture({
       format: colorAttachment,
-      usage: import_core14.Texture.TEXTURE | import_core14.Texture.COPY_SRC | import_core14.Texture.COPY_DST | import_core14.Texture.RENDER_ATTACHMENT,
+      usage: import_core15.Texture.TEXTURE | import_core15.Texture.COPY_SRC | import_core15.Texture.COPY_DST | import_core15.Texture.RENDER_ATTACHMENT,
       width: 1,
       height: 1
     }));
@@ -4338,7 +4414,7 @@ var SubPassRenderer = class {
 };
 
 // dist/compute/computation.js
-var import_core15 = require("@luma.gl/core");
+var import_core16 = require("@luma.gl/core");
 var import_shadertools6 = require("@luma.gl/shadertools");
 var import_types2 = require("@math.gl/types");
 var LOG_DRAW_PRIORITY2 = 2;
@@ -4437,7 +4513,7 @@ var _Computation = class {
   }
   setShaderInputs(shaderInputs) {
     this.shaderInputs = shaderInputs;
-    this._uniformStore = new import_core15.UniformStore(this.shaderInputs.modules);
+    this._uniformStore = new import_core16.UniformStore(this.shaderInputs.modules);
     for (const moduleName of Object.keys(this.shaderInputs.modules)) {
       const uniformBuffer = this._uniformStore.getManagedUniformBuffer(this.device, moduleName);
       this.bindings[`${moduleName}Uniforms`] = uniformBuffer;
@@ -4474,7 +4550,7 @@ var _Computation = class {
     if (this._pipelineNeedsUpdate) {
       let prevShader = null;
       if (this.pipeline) {
-        import_core15.log.log(1, `Model ${this.id}: Recreating pipeline because "${this._pipelineNeedsUpdate}".`)();
+        import_core16.log.log(1, `Model ${this.id}: Recreating pipeline because "${this._pipelineNeedsUpdate}".`)();
         prevShader = this.shader;
       }
       this._pipelineNeedsUpdate = false;
@@ -4498,33 +4574,33 @@ var _Computation = class {
   _lastLogTime = 0;
   _logOpen = false;
   _logDrawCallStart() {
-    const logDrawTimeout = import_core15.log.level > 3 ? 0 : LOG_DRAW_TIMEOUT2;
-    if (import_core15.log.level < 2 || Date.now() - this._lastLogTime < logDrawTimeout) {
+    const logDrawTimeout = import_core16.log.level > 3 ? 0 : LOG_DRAW_TIMEOUT2;
+    if (import_core16.log.level < 2 || Date.now() - this._lastLogTime < logDrawTimeout) {
       return;
     }
     this._lastLogTime = Date.now();
     this._logOpen = true;
-    import_core15.log.group(LOG_DRAW_PRIORITY2, `>>> DRAWING MODEL ${this.id}`, { collapsed: import_core15.log.level <= 2 })();
+    import_core16.log.group(LOG_DRAW_PRIORITY2, `>>> DRAWING MODEL ${this.id}`, { collapsed: import_core16.log.level <= 2 })();
   }
   _logDrawCallEnd() {
     if (this._logOpen) {
       const uniformTable = this.shaderInputs.getDebugTable();
-      import_core15.log.table(LOG_DRAW_PRIORITY2, uniformTable)();
-      import_core15.log.groupEnd(LOG_DRAW_PRIORITY2)();
+      import_core16.log.table(LOG_DRAW_PRIORITY2, uniformTable)();
+      import_core16.log.groupEnd(LOG_DRAW_PRIORITY2)();
       this._logOpen = false;
     }
   }
   _drawCount = 0;
   // TODO - fix typing of luma data types
   _getBufferOrConstantValues(attribute, dataType) {
-    const TypedArrayConstructor = (0, import_core15.getTypedArrayFromDataType)(dataType);
-    const typedArray = attribute instanceof import_core15.Buffer ? new TypedArrayConstructor(attribute.debugData) : attribute;
+    const TypedArrayConstructor = (0, import_core16.getTypedArrayConstructor)(dataType);
+    const typedArray = attribute instanceof import_core16.Buffer ? new TypedArrayConstructor(attribute.debugData) : attribute;
     return typedArray.toString();
   }
 };
 var Computation = _Computation;
 __publicField(Computation, "defaultProps", {
-  ...import_core15.ComputePipeline.defaultProps,
+  ...import_core16.ComputePipeline.defaultProps,
   id: "unnamed",
   handle: void 0,
   userData: {},
@@ -4686,7 +4762,7 @@ var _PickingManager = class {
     });
     return pickingPass;
   }
-  getPickInfo(mousePosition) {
+  async updatePickInfo(mousePosition) {
     var _a;
     const framebuffer = this.getFramebuffer();
     const [pickX, pickY] = this.getPickPosition(mousePosition);