@luma.gl/engine 9.0.0-alpha.9 → 9.0.0-beta.1

package/dist/lib/render-loop.js

@@ -1,49 +0,0 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { AnimationLoop } from './animation-loop';
-export class RenderLoop {
-  constructor(animationProps) {}
-
-  static run(RenderLoopConstructor, deviceProps) {
-    const animationLoop = new SyncInitAnimationLoop(RenderLoopConstructor, deviceProps);
-    return animationLoop;
-  }
-
-}
-
-class SyncInitAnimationLoop extends AnimationLoop {
-  getInfo() {
-    return this.RenderLoopConstructor.info;
-  }
-
-  constructor(RenderLoopConstructor, deviceProps) {
-    super({
-      deviceProps
-    });
-
-    _defineProperty(this, "RenderLoopConstructor", void 0);
-
-    _defineProperty(this, "renderLoop", null);
-
-    this.RenderLoopConstructor = RenderLoopConstructor;
-  }
-
-  onInitialize(animationProps) {
-    this.renderLoop = new this.RenderLoopConstructor(animationProps);
-  }
-
-  onRender(animationProps) {
-    var _this$renderLoop, _this$renderLoop$onRe, _this$renderLoop2, _this$renderLoop2$fra;
-
-    (_this$renderLoop = this.renderLoop) === null || _this$renderLoop === void 0 ? void 0 : (_this$renderLoop$onRe = _this$renderLoop.onRender) === null || _this$renderLoop$onRe === void 0 ? void 0 : _this$renderLoop$onRe.call(_this$renderLoop, animationProps);
-    (_this$renderLoop2 = this.renderLoop) === null || _this$renderLoop2 === void 0 ? void 0 : (_this$renderLoop2$fra = _this$renderLoop2.frame) === null || _this$renderLoop2$fra === void 0 ? void 0 : _this$renderLoop2$fra.call(_this$renderLoop2, animationProps);
-  }
-
-  onFinalize(animationProps) {
-    var _this$renderLoop3, _this$renderLoop3$onF, _this$renderLoop4, _this$renderLoop4$des;
-
-    (_this$renderLoop3 = this.renderLoop) === null || _this$renderLoop3 === void 0 ? void 0 : (_this$renderLoop3$onF = _this$renderLoop3.onFinalize) === null || _this$renderLoop3$onF === void 0 ? void 0 : _this$renderLoop3$onF.call(_this$renderLoop3, animationProps);
-    (_this$renderLoop4 = this.renderLoop) === null || _this$renderLoop4 === void 0 ? void 0 : (_this$renderLoop4$des = _this$renderLoop4.destroy) === null || _this$renderLoop4$des === void 0 ? void 0 : _this$renderLoop4$des.call(_this$renderLoop4, animationProps);
-  }
-
-}
-//# sourceMappingURL=render-loop.js.map

package/dist/lib/render-loop.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/lib/render-loop.ts"],"names":["AnimationLoop","RenderLoop","constructor","animationProps","run","RenderLoopConstructor","deviceProps","animationLoop","SyncInitAnimationLoop","getInfo","info","onInitialize","renderLoop","onRender","frame","onFinalize","destroy"],"mappings":";AAEA,SAAQA,aAAR,QAA4B,kBAA5B;AAOA,OAAO,MAAeC,UAAf,CAA0B;AAC/BC,EAAAA,WAAW,CAACC,cAAD,EAAkC,CAAE;;AAGrC,SAAHC,GAAG,CAACC,qBAAD,EAA2CC,WAA3C,EAAqF;AAE7F,UAAMC,aAAa,GAAG,IAAIC,qBAAJ,CAA0BH,qBAA1B,EAAiDC,WAAjD,CAAtB;AAKA,WAAOC,aAAP;AACD;;AAZ8B;;AAgBjC,MAAMC,qBAAN,SAAoCR,aAApC,CAAkD;AAIhDS,EAAAA,OAAO,GAAG;AAER,WAAO,KAAKJ,qBAAL,CAA2BK,IAAlC;AACD;;AAEDR,EAAAA,WAAW,CAACG,qBAAD,EAA2CC,WAA3C,EAAsE;AAC/E,UAAM;AAACA,MAAAA;AAAD,KAAN;;AAD+E;;AAAA,wCAPjD,IAOiD;;AAE/E,SAAKD,qBAAL,GAA6BA,qBAA7B;AACD;;AAEDM,EAAAA,YAAY,CAACR,cAAD,EAAiC;AAE3C,SAAKS,UAAL,GAAkB,IAAI,KAAKP,qBAAT,CAA+BF,cAA/B,CAAlB;AACD;;AAEDU,EAAAA,QAAQ,CAACV,cAAD,EAAiC;AAAA;;AAEvC,6BAAKS,UAAL,+FAAiBC,QAAjB,uGAA4BV,cAA5B;AAEA,8BAAKS,UAAL,iGAAiBE,KAAjB,wGAAyBX,cAAzB;AACD;;AAEDY,EAAAA,UAAU,CAACZ,cAAD,EAAiC;AAAA;;AAEzC,8BAAKS,UAAL,iGAAiBG,UAAjB,wGAA8BZ,cAA9B;AAEA,8BAAKS,UAAL,iGAAiBI,OAAjB,wGAA2Bb,cAA3B;AACD;;AA/B+C","sourcesContent":["import type {DeviceProps} from '@luma.gl/api';\nimport type {AnimationProps} from '../lib/animation-props';\nimport {AnimationLoop} from './animation-loop';\n\n/**\n * Minimal animation loop that initializes models in constructor\n * Simplifying type management\n * v9 API\n */\nexport abstract class RenderLoop {\n  constructor(animationProps?: AnimationProps) {}\n\n  /** Instantiates and runs the render loop */\n  static run(RenderLoopConstructor: typeof RenderLoop, deviceProps?: DeviceProps): AnimationLoop {\n    // Create an animation loop;\n    const animationLoop = new SyncInitAnimationLoop(RenderLoopConstructor, deviceProps);\n\n    // Start the loop automatically\n    // animationLoop.start();\n\n    return animationLoop;\n  }\n}\n\n/** Instantiates the RenderLoop once the device is created */\nclass SyncInitAnimationLoop extends AnimationLoop {\n  RenderLoopConstructor: typeof RenderLoop;\n  renderLoop: RenderLoop | null = null;\n\n  getInfo() {\n    // @ts-ignore\n    return this.RenderLoopConstructor.info;\n  }\n\n  constructor(RenderLoopConstructor: typeof RenderLoop, deviceProps?: DeviceProps) {\n    super({deviceProps});\n    this.RenderLoopConstructor = RenderLoopConstructor;\n  }\n\n  onInitialize(animationProps: AnimationProps) {\n    // @ts-expect-error abstract to prevent instantiation\n    this.renderLoop = new this.RenderLoopConstructor(animationProps);\n  }\n\n  onRender(animationProps: AnimationProps) {\n    // @ts-expect-error API still TBD\n    this.renderLoop?.onRender?.(animationProps);\n    // @ts-expect-error API still TBD\n    this.renderLoop?.frame?.(animationProps);\n  }\n\n  onFinalize(animationProps: AnimationProps) {\n    // @ts-expect-error API still TBD\n    this.renderLoop?.onFinalize?.(animationProps);\n    // @ts-expect-error API still TBD\n    this.renderLoop?.destroy?.(animationProps);\n  }\n}\n"],"file":"render-loop.js"}

package/src/bundle.ts

@@ -1,4 +0,0 @@
-// @ts-nocheck
-const moduleExports = require('./index');
-globalThis.luma = globalThis.luma || {};
-module.exports = Object.assign(globalThis.luma, moduleExports);

package/src/geometry/primitive-utils.ts

@@ -1,30 +0,0 @@
-/*
-import type {GeometryTable} from './geometry-table';
-
-export function unpackIndexedGeometry(geometry: GeometryTable): GeometryTable {
-  const {indices, attributes} = geometry;
-  if (!indices) {
-    return geometry;
-  }
-
-  const vertexCount = indices.length;
-  const unpackedAttributes = {};
-
-  for (const [name, values] of Object.entries(attributes)) {
-    const size = {POSITION: 3, NORMAL: 3, TEX_COORD0: 2}[name];
-    const unpackedValues = new values.constructor(length * size);
-    for (let x = 0; x < vertexCount; ++x) {
-      const index = indices[x];
-      for (let i = 0; i < size; i++) {
-        unpackedValues[x * size + i] = values[index * size + i];
-      }
-    }
-    unpackedAttributes[name] = unpackedValues;
-  }
-
-  return {
-    length,
-    attributes: unpackedAttributes
-  };
-}
-*/

package/src/lib/model-utils.ts

@@ -1,124 +0,0 @@
-import {Device, Buffer, assert} from '@luma.gl/api';
-import type Geometry from '../geometry/geometry';
-
-// Support for mapping new geometries with glTF attribute names to "classic" luma.gl shader names
-const GLTF_TO_LUMA_ATTRIBUTE_MAP = {
-  POSITION: 'positions',
-  NORMAL: 'normals',
-  COLOR_0: 'colors',
-  TEXCOORD_0: 'texCoords',
-  TEXCOORD_1: 'texCoords1',
-  TEXCOORD_2: 'texCoords2'
-};
-
-/*
-export function getAttributeLayoutsFromGeometry(geometry: Geometry) {
-  const layouts: Record<string, {}> = {};
-  let indices = geometry.indices;
-
-  for (const [name, attribute] of Object.entries(geometry.attributes)) {
-    const remappedName = mapAttributeName(name);
-
-    if (attribute.constant) {
-      throw new Error('constant attributes not supported');
-    } else {
-      const typedArray = attribute.value;
-      // Create accessor by copying the attribute and removing `value``
-      const accessor = {...attribute};
-      delete accessor.value;
-      buffers[remappedName] = [device.createBuffer(typedArray), accessor];
-
-      inferAttributeAccessor(name, accessor);
-    }
-  }
-}
-
-export class Table {
-  length: number;
-  // columns: Record<string, TypedArray> = {};
-}
-
-export class GPUTable {
-  length: number;
-  columns: Record<string, Buffer> = {};
-}
-
-export function convertTableToGPUTable(table: Table) {
-  // for (const ) {}
-}
-
-export function renameTableColumns(table: Table, map: (name: string) => string) {
-  const newColumns = table.columns.reduce()
-  table.clone();
-}
-*/
-
-export function getIndexBufferFromGeometry(device: Device, geometry: Geometry): Buffer | undefined {
-  if (!geometry.indices) {
-    return undefined;
-  }
-
-  // @ts-expect-error
-  const data = geometry.indices.value || geometry.indices;
-  assert(
-    data instanceof Uint16Array || data instanceof Uint32Array,
-    'attribute array for "indices" must be of integer type'
-  );
-  return device.createBuffer({usage: Buffer.INDEX, data});
-}
-
-export function getAttributeBuffersFromGeometry(device: Device, geometry: Geometry): Record<string, Buffer> {
-  const buffers: Record<string, Buffer> = {};
-
-  for (const [name, attribute] of Object.entries(geometry.attributes)) {
-    const remappedName = mapAttributeName(name);
-    if (attribute.constant) {
-      throw new Error('constant attributes not supported');
-    } else {
-      const typedArray = attribute.value;
-      buffers[remappedName] = device.createBuffer({data: typedArray, id: `${remappedName}-buffer`});
-    }
-  }
-
-  return buffers;
-}
-
-function mapAttributeName(name: string): string {
-  return GLTF_TO_LUMA_ATTRIBUTE_MAP[name] || name;
-}
-
-/*
-// Check for well known attribute names
-// eslint-disable-next-line complexity
-export function inferAttributeAccessor(attributeName, attribute) {
-  let category;
-  switch (attributeName) {
-    case 'texCoords':
-    case 'texCoord1':
-    case 'texCoord2':
-    case 'texCoord3':
-      category = 'uvs';
-      break;
-    case 'vertices':
-    case 'positions':
-    case 'normals':
-    case 'pickingColors':
-      category = 'vectors';
-      break;
-    default:
-  }
-
-  // Check for categorys
-  switch (category) {
-    case 'vectors':
-      attribute.size = attribute.size || 3;
-      break;
-    case 'uvs':
-      attribute.size = attribute.size || 2;
-      break;
-    default:
-  }
-
-  assert(Number.isFinite(attribute.size), `attribute ${attributeName} needs size`);
-}
-*/

package/src/lib/model.ts

@@ -1,183 +0,0 @@
-// luma.gl, MIT license
-
-import type {Device, Buffer, RenderPipelineProps, RenderPass, Binding, PrimitiveTopology} from '@luma.gl/api';
-import {RenderPipeline, Shader, cast} from '@luma.gl/api';
-import type { ShaderModule } from '@luma.gl/shadertools';
-import type Geometry from '../geometry/geometry';
-import {getAttributeBuffersFromGeometry, getIndexBufferFromGeometry} from './model-utils';
-import {PipelineFactory} from './pipeline-factory';
-
-export type ModelProps = Omit<RenderPipelineProps, 'vs' | 'fs'> & {
-  // Model also accepts a string
-  vs?: {glsl?: string; wgsl?: string} | string | null;
-  fs?: {glsl?: string; wgsl?: string} | string | null;
-  modules?: ShaderModule[];
-  moduleSettings?: Record<string, Record<string, any>>;
-  geometry?: Geometry | null;
-};
-
-const DEFAULT_MODEL_PROPS: Required<ModelProps> = {
-  ...RenderPipeline._DEFAULT_PROPS,
-  vs: null,
-  fs: null,
-  id: 'unnamed',
-  handle: undefined,
-  userData: {},
-  modules: [],
-  moduleSettings: {},
-  geometry: null
-};
-
-/** v9 API */
-export default class Model {
-  readonly device: Device;
-  readonly pipeline: RenderPipeline;
-  readonly id: string;
-  readonly vs: string;
-  readonly fs: string | null = null;
-  readonly topology: PrimitiveTopology;
-  readonly vertexCount;
-  props: Required<ModelProps>;
-
-  private _getModuleUniforms: (props?: Record<string, Record<string, any>>) => Record<string, any>;
-
-  constructor(device: Device, props: ModelProps) {
-    this.props = {...DEFAULT_MODEL_PROPS, ...props};
-    props = this.props;
-    this.id = this.props.id;
-    this.device = device;
-
-    // Create the pipeline
-    if (!props.vs) {
-      throw new Error('no vertex shader');
-    }
-    this.vs = getShaderSource(this.device, props.vs);
-    if (props.fs) {
-      this.fs = getShaderSource(this.device, props.fs);
-    }
-
-    this.vertexCount = this.props.vertexCount;
-    this.topology = this.props.topology;
-
-    if (this.props.geometry) {
-      this.vertexCount = this.props.geometry.vertexCount;
-      this.topology = this.props.geometry.topology || 'triangle-list';
-    }
-
-    const pipelineFactory = PipelineFactory.getDefaultPipelineFactory(this.device);
-    const {pipeline, getUniforms} = pipelineFactory.createRenderPipeline({
-      ...this.props,
-      vs: this.vs,
-      fs: this.fs,
-      topology: this.topology,
-      parameters: props.parameters,
-      layout: props.layout
-    });
-
-    this.pipeline = pipeline;
-    this._getModuleUniforms = getUniforms;
-
-    if (this.props.geometry) {
-      this._setGeometry(this.props.geometry);
-    }
-    this.setUniforms(this._getModuleUniforms()) // Get all default module uniforms
-    this.setProps(this.props);
-  }
-
-  destroy(): void {
-    this.pipeline.destroy();
-  }
-
-  draw(renderPass?: RenderPass): this {
-    this.pipeline.draw({
-      renderPass,
-      vertexCount: this.vertexCount,
-      instanceCount: this.props.instanceCount
-    });
-    return this;
-  }
-
-  setProps(props: ModelProps): this {
-    if (props.indices) {
-      this.setIndexBuffer(props.indices);
-    }
-    if (props.attributes) {
-      this.setAttributes(props.attributes);
-    }
-    if (props.bindings) {
-      this.setBindings(props.bindings);
-    }
-    if (props.uniforms) {
-      this.setUniforms(props.uniforms);
-    }
-    if (props.moduleSettings) {
-      this.updateModuleSettings(props.moduleSettings);
-    }
-    return this;
-  }
-
-  updateModuleSettings(props: Record<string, any>): this {
-    const uniforms = this._getModuleUniforms(props);
-    this.setUniforms(uniforms);
-    return this;
-  }
-
-  setIndexBuffer(indices: Buffer): this {
-    this.pipeline.setIndexBuffer(indices);
-    // this._indices = indices;
-    return this;
-  }
-
-  setAttributes(attributes: Record<string, Buffer>): this {
-    this.pipeline.setAttributes(attributes);
-    Object.assign(this.props.attributes, attributes);
-    return this;
-  }
-
-  /** Set the bindings */
-  setBindings(bindings: Record<string, Binding>): this {
-    this.pipeline.setBindings(bindings);
-    Object.assign(this.props.bindings, bindings);
-    return this;
-  }
-
-  setUniforms(uniforms: Record<string, any>): this {
-    this.pipeline.setUniforms(uniforms);
-    Object.assign(this.props.uniforms, uniforms);
-    return this;
-  }
-
-  _setGeometry(geometry: Geometry): void {
-    // this._deleteGeometryBuffers();
-
-    const geometryBuffers = getAttributeBuffersFromGeometry(this.device, geometry);
-    this.setAttributes(geometryBuffers);
-
-    const indexBuffer = getIndexBufferFromGeometry(this.device, geometry);
-    if (indexBuffer) {
-      this.setIndexBuffer(indexBuffer);
-    }
-  }
-}
-
-/** Create a shader from the different overloads */
-function getShaderSource(device: Device, shader: string | {glsl?: string; wgsl?: string}): string {
-  // TODO - detect WGSL/GLSL and throw an error if not supported
-  if (typeof shader === 'string') {
-    return shader;
-  }
-
-  switch (device.info.type) {
-    case 'webgpu':
-      if (shader?.wgsl) {
-        return shader.wgsl;
-      }
-      throw new Error('WebGPU does not support GLSL shaders');
-
-    default:
-      if (shader?.glsl) {
-        return shader.glsl;
-      }
-      throw new Error('WebGL does not support WGSL shaders');
-  }
-}

package/src/lib/render-loop.ts

@@ -1,58 +0,0 @@
-import type {DeviceProps} from '@luma.gl/api';
-import type {AnimationProps} from '../lib/animation-props';
-import {AnimationLoop} from './animation-loop';
-
-/**
- * Minimal animation loop that initializes models in constructor
- * Simplifying type management
- * v9 API
- */
-export abstract class RenderLoop {
-  constructor(animationProps?: AnimationProps) {}
-
-  /** Instantiates and runs the render loop */
-  static run(RenderLoopConstructor: typeof RenderLoop, deviceProps?: DeviceProps): AnimationLoop {
-    // Create an animation loop;
-    const animationLoop = new SyncInitAnimationLoop(RenderLoopConstructor, deviceProps);
-
-    // Start the loop automatically
-    // animationLoop.start();
-
-    return animationLoop;
-  }
-}
-
-/** Instantiates the RenderLoop once the device is created */
-class SyncInitAnimationLoop extends AnimationLoop {
-  RenderLoopConstructor: typeof RenderLoop;
-  renderLoop: RenderLoop | null = null;
-
-  getInfo() {
-    // @ts-ignore
-    return this.RenderLoopConstructor.info;
-  }
-
-  constructor(RenderLoopConstructor: typeof RenderLoop, deviceProps?: DeviceProps) {
-    super({deviceProps});
-    this.RenderLoopConstructor = RenderLoopConstructor;
-  }
-
-  onInitialize(animationProps: AnimationProps) {
-    // @ts-expect-error abstract to prevent instantiation
-    this.renderLoop = new this.RenderLoopConstructor(animationProps);
-  }
-
-  onRender(animationProps: AnimationProps) {
-    // @ts-expect-error API still TBD
-    this.renderLoop?.onRender?.(animationProps);
-    // @ts-expect-error API still TBD
-    this.renderLoop?.frame?.(animationProps);
-  }
-
-  onFinalize(animationProps: AnimationProps) {
-    // @ts-expect-error API still TBD
-    this.renderLoop?.onFinalize?.(animationProps);
-    // @ts-expect-error API still TBD
-    this.renderLoop?.destroy?.(animationProps);
-  }
-}