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

package/src/geometries/cube-geometry.ts

@@ -1,27 +1,33 @@
-import {uid} from '@luma.gl/api';
-import Geometry from '../geometry/geometry';
+import {uid} from '@luma.gl/core';
+import {Geometry} from '../geometry/geometry';
 // import type {GeometryType} from '../geometry/geometry-type';
 
 export type CubeGeometryProps = {
   id?: string;
   indices?: boolean;
-  attributes?;
+  attributes?: any;
 };
 
 export class CubeGeometry extends Geometry {
   constructor(props: CubeGeometryProps = {}) {
     const {id = uid('cube-geometry'), indices = true} = props;
-    super(indices ? {
-      ...props,
-      id,
-      indices: {size: 1, value: CUBE_INDICES},
-      attributes: {...ATTRIBUTES, ...props.attributes}
-    } : {
-      ...props,
-      id,
-      indices: undefined,
-      attributes: {...NON_INDEXED_ATTRIBUTES, ...props.attributes}
-    });
+    super(
+      indices
+        ? {
+            ...props,
+            id,
+            topology: 'triangle-list',
+            indices: {size: 1, value: CUBE_INDICES},
+            attributes: {...ATTRIBUTES, ...props.attributes}
+          }
+        : {
+            ...props,
+            id,
+            topology: 'triangle-list',
+            indices: undefined,
+            attributes: {...NON_INDEXED_ATTRIBUTES, ...props.attributes}
+          }
+    );
   }
 }
 
@@ -77,47 +83,47 @@ const CUBE_TEX_COORDS = new Float32Array([
 // float4 position
 // prettier-ignore
 export const CUBE_NON_INDEXED_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,
-
-  1, 1, 1, 1,
-  1, -1, 1, 1,
-  1, -1, -1, 1,
-  1, 1, -1, 1,
-  1, 1, 1, 1,
-  1, -1, -1, 1,
-
-  -1, 1, 1, 1,
-  1, 1, 1, 1,
-  1, 1, -1, 1,
-  -1, 1, -1, 1,
-  -1, 1, 1, 1,
-  1, 1, -1, 1,
-
-  -1, -1, 1, 1,
-  -1, 1, 1, 1,
-  -1, 1, -1, 1,
-  -1, -1, -1, 1,
-  -1, -1, 1, 1,
-  -1, 1, -1, 1,
-
-  1, 1, 1, 1,
-  -1, 1, 1, 1,
-  -1, -1, 1, 1,
-  -1, -1, 1, 1,
-  1, -1, 1, 1,
-  1, 1, 1, 1,
-
-  1, -1, -1, 1,
-  -1, -1, -1, 1,
-  -1, 1, -1, 1,
-  1, 1, -1, 1,
-  1, -1, -1, 1,
-  -1, 1, -1, 1,
+  1, -1, 1,
+  -1, -1, 1,
+  -1, -1, -1,
+  1, -1, -1,
+  1, -1, 1,
+  -1, -1, -1,
+
+  1, 1, 1,
+  1, -1, 1,
+  1, -1, -1,
+  1, 1, -1,
+  1, 1, 1,
+  1, -1, -1,
+
+  -1, 1, 1,
+  1, 1, 1,
+  1, 1, -1,
+  -1, 1, -1,
+  -1, 1, 1,
+  1, 1, -1,
+
+  -1, -1, 1,
+  -1, 1, 1,
+  -1, 1, -1,
+  -1, -1, -1,
+  -1, -1, 1,
+  -1, 1, -1,
+
+  1, 1, 1,
+  -1, 1, 1,
+  -1, -1, 1,
+  -1, -1, 1,
+  1, -1, 1,
+  1, 1, 1,
+
+  1, -1, -1,
+  -1, -1, -1,
+  -1, 1, -1,
+  1, 1, -1,
+  1, -1, -1,
+  -1, 1, -1,
 ]);
 
 // float2 uv,
@@ -219,7 +225,7 @@ const ATTRIBUTES = {
 };
 
 const NON_INDEXED_ATTRIBUTES = {
-  POSITION: {size: 4, value: CUBE_NON_INDEXED_POSITIONS},
+  POSITION: {size: 3, value: CUBE_NON_INDEXED_POSITIONS},
   // NORMAL: {size: 3, value: CUBE_NON_INDEXED_NORMALS},
   TEXCOORD_0: {size: 2, value: CUBE_NON_INDEXED_TEX_COORDS},
   COLOR_0: {size: 3, value: CUBE_NON_INDEXED_COLORS}

package/src/geometries/cylinder-geometry.ts

@@ -1,10 +1,10 @@
-import {uid} from '@luma.gl/api';
+import {uid} from '@luma.gl/core';
 import {TruncatedConeGeometry} from './truncated-cone-geometry';
 
 export type CylinderGeometryProps = {
   id?: string;
   radius?: number;
-  attributes?
+  attributes?: any;
 };
 
 export class CylinderGeometry extends TruncatedConeGeometry {

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

@@ -1,6 +1,6 @@
-import {uid} from '@luma.gl/api';
+import {uid} from '@luma.gl/core';
 import {Vector3} from '@math.gl/core';
-import Geometry from '../geometry/geometry';
+import {Geometry} from '../geometry/geometry';
 
 /* eslint-disable comma-spacing, max-statements, complexity */
 
@@ -11,7 +11,7 @@ export type IcoSphereGeometryProps = {
   id?: string;
   radius?: number;
   iterations?: number;
-  attributes?
+  attributes?: any;
 };
 
 export class IcoSphereGeometry extends Geometry {
@@ -21,6 +21,7 @@ export class IcoSphereGeometry extends Geometry {
     super({
       ...props,
       id,
+      topology: 'triangle-list',
       indices,
       attributes: {...attributes, ...props.attributes}
     });
@@ -40,9 +41,9 @@ function tesselateIcosaHedron(props: IcoSphereGeometryProps) {
   indices.push();
 
   const getMiddlePoint = (() => {
-    const pointMemo = {};
+    const pointMemo: Record<string, number> = {};
 
-    return (i1, i2) => {
+    return (i1: number, i2: number) => {
       i1 *= 3;
       i2 *= 3;
       const mini = i1 < i2 ? i1 : i2;

package/src/geometries/plane-geometry.ts

@@ -1,11 +1,11 @@
-import {uid} from '@luma.gl/api';
-import Geometry from '../geometry/geometry';
+import {uid} from '@luma.gl/core';
+import {Geometry} from '../geometry/geometry';
 import {unpackIndexedGeometry} from '../geometry/geometry-utils';
 
 export type PlaneGeometryProps = {
   id?: string;
   radius?: number;
-  attributes?
+  attributes?: any;
 };
 
 // Primitives inspired by TDL http://code.google.com/p/webglsamples/,
@@ -19,6 +19,7 @@ export class PlaneGeometry extends Geometry {
     super({
       ...props,
       id,
+      topology: 'triangle-list',
       indices,
       attributes: {...attributes, ...props.attributes}
     });
@@ -26,7 +27,7 @@ export class PlaneGeometry extends Geometry {
 }
 
 /* eslint-disable complexity, max-statements */
-function tesselatePlane(props) {
+function tesselatePlane(props: any) {
   const {type = 'x,y', offset = 0, flipCull = false, unpack = false} = props;
 
   const coords = type.split(',');

package/src/geometries/sphere-geometry.ts

@@ -1,12 +1,12 @@
-import {uid} from '@luma.gl/api';
-import Geometry from '../geometry/geometry';
+import {uid} from '@luma.gl/core';
+import {Geometry} from '../geometry/geometry';
 
 export type SphereGeometryProps = {
   id?: string;
   radius?: number;
   nlat?: number;
   nlong?: number;
-  attributes?
+  attributes?: any;
 };
 
 // Primitives inspired by TDL http://code.google.com/p/webglsamples/,
@@ -19,6 +19,7 @@ export class SphereGeometry extends Geometry {
     super({
       ...props,
       id,
+      topology: 'triangle-list',
       indices,
       attributes: {...attributes, ...props.attributes}
     });

package/src/geometries/truncated-cone-geometry.ts

@@ -1,6 +1,5 @@
-import {uid} from '@luma.gl/api';
-import Geometry from '../geometry/geometry';
-import {GeometryTable} from '../geometry/geometry-table';
+import {uid} from '@luma.gl/core';
+import {Geometry} from '../geometry/geometry';
 
 const INDEX_OFFSETS = {
   x: [2, 0, 1],
@@ -24,28 +23,21 @@ export type TruncatedConeGeometryProps = {
  * copyright 2011 Google Inc. new BSD License
  * (http://www.opensource.org/licenses/bsd-license.php).
  */
-export function makeTruncatedConeGeometry(props?: TruncatedConeGeometryProps): GeometryTable {
-  const {indices, attributes} = tesselateTruncatedCone(props);
-  return {
-    length: indices.length,
-    indices,
-    attributes
-  };
-}
-
 export class TruncatedConeGeometry extends Geometry {
-  constructor(props: TruncatedConeGeometryProps & {id?: string; attributes?} = {}) {
+  constructor(props: TruncatedConeGeometryProps & {id?: string; attributes?: any} = {}) {
     const {id = uid('truncated-code-geometry')} = props;
     const {indices, attributes} = tesselateTruncatedCone(props);
     super({
       ...props,
       id,
+      topology: 'triangle-list',
       indices,
       attributes: {
         POSITION: {size: 3, value: attributes.POSITION},
         NORMAL: {size: 3, value: attributes.NORMAL},
         TEXCOORD_0: {size: 2, value: attributes.TEXCOORD_0},
-        ...props.attributes}
+        ...props.attributes
+      }
     });
   }
 }

package/src/geometry/geometry-table.ts

@@ -1,16 +1,19 @@
-// luma.gl, MIT license
-import type {TypedArray, VertexFormat} from '@luma.gl/api';
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+import type {TypedArray, VertexFormat} from '@luma.gl/core';
 
 /** Holds one geometry */
 export type GeometryTable = {
   length: number;
   schema?: Record<string, VertexFormat>;
   attributes: {
-    POSITION: TypedArray,
-    NORMAL: TypedArray,
-    TEXCOORD_0: TypedArray,
-    [key: string]: TypedArray,
+    POSITION: TypedArray;
+    NORMAL: TypedArray;
+    TEXCOORD_0: TypedArray;
+    [key: string]: TypedArray;
   };
   indices?: Uint16Array | Uint32Array;
   topology?: 'point-list' | 'line-list' | 'line-strip' | 'triangle-list' | 'triangle-strip';
-}
+};

package/src/geometry/geometry-utils.ts

@@ -1,13 +1,13 @@
-// import type Geometry from './geometry';
+// import type {Geometry} from './geometry';
 
-export function unpackIndexedGeometry(geometry) {
+export function unpackIndexedGeometry(geometry: any) {
   const {indices, attributes} = geometry;
   if (!indices) {
     return geometry;
   }
 
   const vertexCount = indices.value.length;
-  const unpackedAttributes = {};
+  const unpackedAttributes: Record<string, any> = {};
 
   for (const attributeName in attributes) {
     const attribute = attributes[attributeName];
@@ -29,3 +29,19 @@ export function unpackIndexedGeometry(geometry) {
     attributes: Object.assign({}, attributes, unpackedAttributes)
   };
 }
+
+// export function calculateVertexNormals(positions: Float32Array): Uint8Array {
+//   let normals = new Uint8Array(positions.length / 3);
+
+//   for (let i = 0; i < positions.length; i++) {
+//     const vec1 = new Vector3(positions.subarray(i * 3, i + 0, i + 3));
+//     const vec2 = new Vector3(positions.subarray(i + 3, i + 6));
+//     const vec3 = new Vector3(positions.subarray(i + 6, i + 9));
+
+//     const normal = new Vector3(vec1).cross(vec2).normalize();
+//     normals.set(normal[0], i + 4);
+//     normals.set(normal[1], i + 4 + 1);
+//     normals.set(normal[2], i + 2);
+//   }
+//   const normal = new Vector3(vec1).cross(vec2).normalize();
+// }

package/src/geometry/geometry.ts

@@ -1,91 +1,64 @@
-// luma.gl, MIT license
-import type {PrimitiveTopology, TypedArray} from '@luma.gl/api';
-import {uid, assert} from '@luma.gl/api';
-import GL from '@luma.gl/constants';
-
-/**
- * Rendering primitives - "topology" specifies how to extract primitives from vertices.
- * @deprecated - use string constants instead
- */
-export type GLTopology =
-  GL.POINTS |  // draw single points.
-  GL.LINES |  // draw lines. Each vertex connects to the one after it.
-  GL.LINE_LOOP |  // draw lines. Each set of two vertices is treated as a separate line segment.
-  GL.LINE_STRIP |  // draw a connected group of line segments from the first vertex to the last
-  GL.TRIANGLES |  // draw triangles. Each set of three vertices creates a separate triangle.
-  GL.TRIANGLE_STRIP |  // draw a connected group of triangles.
-  GL.TRIANGLE_FAN // draw a connected group of triangles.
-  ;
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 
-export type GeometryAttribute = {
-  size?: number;
-  value: TypedArray;
-  [key: string]: any
-}
+import type {PrimitiveTopology, TypedArray} from '@luma.gl/core';
+import {uid, assert} from '@luma.gl/core';
 
 export type GeometryProps = {
   id?: string;
-  attributes?: Record<string, GeometryAttribute | TypedArray>,
-  indices?: GeometryAttribute | TypedArray;
-  vertexCount?: number;
   /** Determines how vertices are read from the 'vertex' attributes */
-  topology?: 'point-list' | 'line-list' | 'line-strip' | 'triangle-list' | 'triangle-strip';
-  /** @deprecated */
-  drawMode?: GLTopology;
+  topology:
+    | 'point-list'
+    | 'line-list'
+    | 'line-strip'
+    | 'line-loop-webgl'
+    | 'triangle-list'
+    | 'triangle-strip'
+    | 'triangle-fan-webgl';
+  /** Auto calculated from attributes if not provided */
+  vertexCount?: number;
+  attributes?: Record<string, GeometryAttribute | TypedArray>;
+  indices?: GeometryAttribute | TypedArray;
 };
 
-type GeometryAttributes = {
-  POSITION: GeometryAttribute,
-  NORMAL: GeometryAttribute,
-  TEXCOORD_0: GeometryAttribute,
-  COLOR_0?: GeometryAttribute,
-  indices?: {size?: number, value: Uint32Array | Uint16Array};
+export type GeometryAttributes = {
+  POSITION: GeometryAttribute;
+  NORMAL: GeometryAttribute;
+  TEXCOORD_0: GeometryAttribute;
+  COLOR_0?: GeometryAttribute;
+  indices?: GeometryAttribute & {size: 1; value: Uint32Array | Uint16Array};
 };
 
-export default class Geometry {
-  /** @deprecated */
-  static DRAW_MODE = {
-    POINTS: GL.POINTS,  // draw single points.
-    LINES: GL.LINES,  // draw lines. Each vertex connects to the one after it.
-    LINE_LOOP: GL.LINE_LOOP,  // draw lines. Each set of two vertices is treated as a separate line segment.
-    LINE_STRIP: GL.LINE_STRIP,  // draw a connected group of line segments from the first vertex to the last
-    TRIANGLES: GL.TRIANGLES,  // draw triangles. Each set of three vertices creates a separate triangle.
-    TRIANGLE_STRIP: GL.TRIANGLE_STRIP,  // draw a connected group of triangles.
-    TRIANGLE_FAN: GL.TRIANGLE_FAN // draw a connected group of triangles.
-  };
+export type GeometryAttribute = {
+  size?: number;
+  value: TypedArray;
+  [key: string]: any;
+};
 
+export class Geometry {
   readonly id: string;
-  userData: Record<string, unknown> = {};
-
   /** Determines how vertices are read from the 'vertex' attributes */
-  topology?: PrimitiveTopology;
-  /** @deprecated */
-  readonly drawMode: GLTopology = GL.TRIANGLES;
-
+  readonly topology?: PrimitiveTopology;
   readonly vertexCount: number;
+  readonly indices?: GeometryAttribute;
   readonly attributes: {
-    POSITION: GeometryAttribute,
-    NORMAL: GeometryAttribute,
-    TEXCOORD_0: GeometryAttribute,
-    COLOR_0?: GeometryAttribute,
+    POSITION: GeometryAttribute;
+    NORMAL: GeometryAttribute;
+    TEXCOORD_0: GeometryAttribute;
+    COLOR_0?: GeometryAttribute;
+    [key: string]: GeometryAttribute | undefined;
   };
-  readonly indices?: Uint16Array | Uint32Array;
 
-  constructor(props: GeometryProps = {}) {
-    const {
-      id = uid('geometry'),
-      drawMode = GL.TRIANGLES,
-      attributes = {},
-      indices = null,
-      vertexCount = null
-    } = props;
+  userData: Record<string, unknown> = {};
 
-    this.id = id;
-    this.drawMode = drawMode;
-    this.topology = props.topology || convertToTopology(drawMode);
+  constructor(props: GeometryProps) {
+    const {attributes = {}, indices = null, vertexCount = null} = props;
+
+    this.id = props.id || uid('geometry');
+    this.topology = props.topology;
 
     if (indices) {
-      // @ts-expect-error
       this.indices = ArrayBuffer.isView(indices) ? {value: indices, size: 1} : indices;
     }
 
@@ -93,9 +66,10 @@ export default class Geometry {
     this.attributes = {};
 
     for (const [attributeName, attributeValue] of Object.entries(attributes)) {
-
       // Wrap "unwrapped" arrays and try to autodetect their type
-      const attribute: GeometryAttribute = ArrayBuffer.isView(attributeValue) ? {value: attributeValue} : attributeValue;
+      const attribute: GeometryAttribute = ArrayBuffer.isView(attributeValue)
+        ? {value: attributeValue}
+        : attributeValue;
 
       assert(
         ArrayBuffer.isView(attribute.value),
@@ -109,36 +83,31 @@ export default class Geometry {
       // Move indices to separate field
       if (attributeName === 'indices') {
         assert(!this.indices);
-      // @ts-expect-error
-      this.indices = attribute;
+        this.indices = attribute;
       } else {
         this.attributes[attributeName] = attribute;
       }
     }
 
-      // @ts-expect-error
-      if (this.indices && this.indices.isIndexed !== undefined) {
+    if (this.indices && this.indices.isIndexed !== undefined) {
       this.indices = Object.assign({}, this.indices);
-      // @ts-expect-error
       delete this.indices.isIndexed;
     }
 
     this.vertexCount = vertexCount || this._calculateVertexCount(this.attributes, this.indices);
   }
 
-  /** @deprecated Use string topology constants instead */
-  get mode() {
-    return this.drawMode;
-  }
-
   getVertexCount(): number {
     return this.vertexCount;
   }
 
-  // Return an object with all attributes plus indices added as a field.
-  // getAttributes(): GeometryAttributes {
-  //   return this.indices ? {indices: this.indices, ...this.attributes} : this.attributes;
-  // }
+  /**
+   * Return an object with all attributes plus indices added as a field.
+   * TODO Geometry types are a mess
+   */
+  getAttributes(): GeometryAttributes {
+    return this.indices ? {indices: this.indices, ...this.attributes} : this.attributes;
+  }
 
   // PRIVATE
 
@@ -146,23 +115,27 @@ export default class Geometry {
     return `Geometry ${this.id} attribute ${attributeName}`;
   }
 
-  // GeometryAttribute
-  // value: typed array
-  // type: indices, vertices, uvs
-  // size: elements per vertex
-  // target: WebGL buffer type (string or constant)
-  _setAttributes(attributes: Record<string, GeometryAttribute>, indices): this {
-
+  /**
+   * GeometryAttribute
+   * value: typed array
+   * type: indices, vertices, uvs
+   * size: elements per vertex
+   * target: WebGL buffer type (string or constant)
+   *
+   * @param attributes
+   * @param indices
+   * @returns
+   */
+  _setAttributes(attributes: Record<string, GeometryAttribute>, indices: any): this {
     return this;
   }
 
-  _calculateVertexCount(attributes, indices): number {
+  _calculateVertexCount(attributes: GeometryAttributes, indices: GeometryAttribute): number {
     if (indices) {
       return indices.value.length;
     }
     let vertexCount = Infinity;
-    for (const attributeName in attributes) {
-      const attribute = attributes[attributeName];
+    for (const attribute of Object.values(attributes)) {
       const {value, size, constant} = attribute;
       if (!constant && value && size >= 1) {
         vertexCount = Math.min(vertexCount, value.length / size);
@@ -173,18 +146,3 @@ export default class Geometry {
     return vertexCount;
   }
 }
-
-function convertToTopology(drawMode: GLTopology): PrimitiveTopology {
-  switch (drawMode) {
-    case GL.POINTS: return 'point-list'; // draw single points.
-    case GL.LINES: return 'line-list'; // draw lines. Each vertex connects to the one after it.
-    case GL.LINE_STRIP: return 'line-strip';  // draw a connected group of line segments from the first vertex to the last
-    case GL.TRIANGLES: return 'triangle-list'; // draw triangles. Each set of three vertices creates a separate triangle.
-    case GL.TRIANGLE_STRIP: return 'triangle-strip'; // draw a connected group of triangles.
-
-    case GL.TRIANGLE_FAN: return 'triangle-fan'; // draw a connected group of triangles.
-    case GL.LINE_LOOP: return 'line-loop'; // draw lines. Each set of two vertices is treated as a separate line segment.
-    default:
-      throw new Error(String(drawMode));
-  }
-}