@luma.gl/engine 9.0.0-alpha.53 → 9.0.0-alpha.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/engine",
-  "version": "9.0.0-alpha.53",
+  "version": "9.0.0-alpha.54",
   "description": "WebGL2 Components for High Performance Rendering and Computation",
   "type": "module",
   "license": "MIT",
@@ -40,12 +40,12 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.0.0",
-    "@luma.gl/constants": "9.0.0-alpha.53",
-    "@luma.gl/core": "9.0.0-alpha.53",
-    "@luma.gl/shadertools": "9.0.0-alpha.53",
+    "@luma.gl/constants": "9.0.0-alpha.54",
+    "@luma.gl/core": "9.0.0-alpha.54",
+    "@luma.gl/shadertools": "9.0.0-alpha.54",
     "@math.gl/core": "^4.0.0",
     "@probe.gl/log": "^4.0.2",
     "@probe.gl/stats": "^4.0.2"
   },
-  "gitHead": "f8939f1cf52a15f11ec053d4906e40f0b2a86836"
+  "gitHead": "6028eb651303eadbc8f25e86d135d28f118fa3cf"
 }

package/src/model/model.ts

@@ -1,10 +1,21 @@
 // luma.gl, MIT license
 // Copyright (c) vis.gl contributors
 
-import type {TypedArray, RenderPipelineProps, RenderPipelineParameters} from '@luma.gl/core';
+import type {
+  TypedArray,
+  RenderPipelineProps,
+  RenderPipelineParameters
+} from '@luma.gl/core';
 import type {BufferLayout, VertexArray, TransformFeedback} from '@luma.gl/core';
 import type {AttributeInfo, Binding, UniformValue, PrimitiveTopology} from '@luma.gl/core';
-import {Device, Buffer, RenderPipeline, RenderPass, UniformStore} from '@luma.gl/core';
+import {
+  Device,
+  Buffer,
+  RenderPipeline,
+  RenderPass,
+  UniformStore,
+  getTypedArrayFromDataType
+} from '@luma.gl/core';
 import {log, uid, deepEqual, splitUniformsAndBindings} from '@luma.gl/core';
 import {getAttributeInfosFromLayouts} from '@luma.gl/core';
 import type {ShaderModule, PlatformInfo} from '@luma.gl/shadertools';
@@ -160,13 +171,20 @@ export class Model {
     Object.assign(this.userData, props.userData);
 
     // Setup shader module inputs
-    const moduleMap = Object.fromEntries(this.props.modules?.map(module => [module.name, module]) || []);
+    const moduleMap = Object.fromEntries(
+      this.props.modules?.map(module => [module.name, module]) || []
+    );
     this.setShaderInputs(props.shaderInputs || new ShaderInputs(moduleMap));
 
     // Setup shader assembler
     const platformInfo = getPlatformInfo(device);
-    const modules = (this.props.modules?.length > 0 ? this.props.modules : this.shaderInputs?.getModules()) || [];
-    const {vs, fs, getUniforms} = this.props.shaderAssembler.assembleShaders({platformInfo, ...this.props, modules});
+    const modules =
+      (this.props.modules?.length > 0 ? this.props.modules : this.shaderInputs?.getModules()) || [];
+    const {vs, fs, getUniforms} = this.props.shaderAssembler.assembleShaders({
+      platformInfo,
+      ...this.props,
+      modules
+    });
 
     this.vs = vs;
     this.fs = fs;
@@ -380,10 +398,7 @@ export class Model {
     this._uniformStore = new UniformStore(this.shaderInputs.modules);
     // Create uniform buffer bindings for all modules
     for (const moduleName of Object.keys(this.shaderInputs.modules)) {
-      const uniformBuffer = this._uniformStore.getManagedUniformBuffer(
-        this.device,
-        moduleName
-      );
+      const uniformBuffer = this._uniformStore.getManagedUniformBuffer(this.device, moduleName);
       this.bindings[`${moduleName}Uniforms`] = uniformBuffer;
     }
   }
@@ -401,7 +416,7 @@ export class Model {
     Object.assign(this.bindings, bindings);
     Object.assign(this.uniforms, uniforms);
   }
- 
+
   /**
    * Sets bindings (textures, samplers, uniform buffers)
    */
@@ -446,16 +461,14 @@ export class Model {
       )();
     }
     for (const [bufferName, buffer] of Object.entries(buffers)) {
-      const bufferLayout = this.bufferLayout.find(layout => layout.name === bufferName);
+      const bufferLayout = this.bufferLayout.find(layout => getAttributeNames(layout).includes(bufferName));
       if (!bufferLayout) {
         log.warn(`Model(${this.id}): Missing layout for buffer "${bufferName}".`)();
         continue; // eslint-disable-line no-continue
       }
 
       // For an interleaved attribute we may need to set multiple attributes
-      const attributeNames = bufferLayout.attributes
-        ? bufferLayout.attributes?.map(layout => layout.attribute)
-        : [bufferLayout.name];
+      const attributeNames = getAttributeNames(bufferLayout);
       let set = false;
       for (const attributeName of attributeNames) {
         const attributeInfo = this._attributeInfos[attributeName];
@@ -560,10 +573,49 @@ export class Model {
       }
       log.table(LOG_DRAW_PRIORITY, uniformTable)();
 
+      const attributeTable = this._getAttributeDebugTable();
+      log.table(LOG_DRAW_PRIORITY, this._attributeInfos)();
+      log.table(LOG_DRAW_PRIORITY, attributeTable)();
+
       log.groupEnd(LOG_DRAW_PRIORITY)();
       this._logOpen = false;
     }
   }
+
+  _getAttributeDebugTable(): Record<string, Record<string, unknown>> {
+    const table: Record<string, Record<string, unknown>> = {};
+    for (const [name, attributeInfo] of Object.entries(this._attributeInfos)) {
+      table[attributeInfo.location] = {
+        name,
+        type: attributeInfo.shaderType,
+        values: this._getBufferOrConstantValues(
+          this.vertexArray.attributes[attributeInfo.location],
+          attributeInfo.bufferDataType
+        )
+      };
+    }
+    if (this.vertexArray.indexBuffer) {
+      const {indexBuffer} = this.vertexArray;
+      const values =
+        indexBuffer.indexType === 'uint32'
+          ? new Uint32Array(indexBuffer.debugData)
+          : new Uint16Array(indexBuffer.debugData);
+      table.indices = {
+        name: 'indices',
+        type: indexBuffer.indexType,
+        values: values.toString()
+      };
+    }
+    return table;
+  }
+
+  // TODO - fix typing of luma data types
+  _getBufferOrConstantValues(attribute: Buffer | TypedArray, dataType: any): string {
+    const TypedArrayConstructor = getTypedArrayFromDataType(dataType);
+    const typedArray =
+      attribute instanceof Buffer ? new TypedArrayConstructor(attribute.debugData) : attribute;
+    return typedArray.toString();
+  }
 }
 
 // HELPERS
@@ -592,3 +644,10 @@ export function getPlatformInfo(device: Device): PlatformInfo {
     features: device.features
   };
 }
+
+/** Get attribute names from a BufferLayout */
+function getAttributeNames(bufferLayout: BufferLayout): string[] {
+  return bufferLayout.attributes
+  ? bufferLayout.attributes?.map(layout => layout.attribute)
+  : [bufferLayout.name];
+}