@luma.gl/engine 8.6.0-alpha.4 → 9.0.0-alpha.4

package/src/geometries/cube-geometry.ts

@@ -1,19 +1,25 @@
+import {uid} from '@luma.gl/api';
 import Geometry from '../geometry/geometry';
-import {uid} from '@luma.gl/webgl';
+// import type {GeometryType} from '../geometry/geometry-type';
 
 export type CubeGeometryProps = {
   id?: string;
-  attributes?
+  indices?: boolean;
+  attributes?;
 };
 
 export class CubeGeometry extends Geometry {
   constructor(props: CubeGeometryProps = {}) {
-    const {id = uid('cube-geometry')} = props;
-    super({
+    const {id = uid('cube-geometry'), indices = true} = props;
+    super(indices ? {
       ...props,
       id,
-      indices: {size: 1, value: new Uint16Array(CUBE_INDICES)},
+      indices: {size: 1, value: CUBE_INDICES},
       attributes: {...ATTRIBUTES, ...props.attributes}
+    } : {
+      ...props,
+      id,
+      attributes: {...NON_INDEXED_ATTRIBUTES, ...props.attributes}
     });
   }
 }
@@ -67,8 +73,153 @@ const CUBE_TEX_COORDS = new Float32Array([
   0,  0,  1,  0,  1,  1,  0,  1
 ]);
 
+// 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,
+]);
+
+// float2 uv,
+// prettier-ignore
+export const CUBE_NON_INDEXED_TEX_COORDS = new Float32Array([
+  1, 1,
+  0, 1,
+  0, 0,
+  1, 0,
+  1, 1,
+  0, 0,
+
+  1, 1,
+  0, 1,
+  0, 0,
+  1, 0,
+  1, 1,
+  0, 0,
+
+  1, 1,
+  0, 1,
+  0, 0,
+  1, 0,
+  1, 1,
+  0, 0,
+
+  1, 1,
+  0, 1,
+  0, 0,
+  1, 0,
+  1, 1,
+  0, 0,
+
+  1, 1,
+  0, 1,
+  0, 0,
+  0, 0,
+  1, 0,
+  1, 1,
+
+  1, 1,
+  0, 1,
+  0, 0,
+  1, 0,
+  1, 1,
+  0, 0,
+]);
+
+// float4 color
+// prettier-ignore
+export const CUBE_NON_INDEXED_COLORS = new Float32Array([
+  1, 0, 1, 1,
+  0, 0, 1, 1,
+  0, 0, 0, 1,
+  1, 0, 0, 1,
+  1, 0, 1, 1,
+  0, 0, 0, 1,
+
+  1, 1, 1, 1,
+  1, 0, 1, 1,
+  1, 0, 0, 1,
+  1, 1, 0, 1,
+  1, 1, 1, 1,
+  1, 0, 0, 1,
+
+  0, 1, 1, 1,
+  1, 1, 1, 1,
+  1, 1, 0, 1,
+  0, 1, 0, 1,
+  0, 1, 1, 1,
+  1, 1, 0, 1,
+
+  0, 0, 1, 1,
+  0, 1, 1, 1,
+  0, 1, 0, 1,
+  0, 0, 0, 1,
+  0, 0, 1, 1,
+  0, 1, 0, 1,
+
+  1, 1, 1, 1,
+  0, 1, 1, 1,
+  0, 0, 1, 1,
+  0, 0, 1, 1,
+  1, 0, 1, 1,
+  1, 1, 1, 1,
+
+  1, 0, 0, 1,
+  0, 0, 0, 1,
+  0, 1, 0, 1,
+  1, 1, 0, 1,
+  1, 0, 0, 1,
+  0, 1, 0, 1,
+]);
+
 const ATTRIBUTES = {
-  POSITION: {size: 3, value: new Float32Array(CUBE_POSITIONS)},
-  NORMAL: {size: 3, value: new Float32Array(CUBE_NORMALS)},
-  TEXCOORD_0: {size: 2, value: new Float32Array(CUBE_TEX_COORDS)}
+  POSITION: {size: 3, value: CUBE_POSITIONS},
+  NORMAL: {size: 3, value: CUBE_NORMALS},
+  TEXCOORD_0: {size: 2, value: CUBE_TEX_COORDS}
+};
+
+const NON_INDEXED_ATTRIBUTES = {
+  POSITION: {size: 4, 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,5 +1,5 @@
+import {uid} from '@luma.gl/api';
 import {TruncatedConeGeometry} from './truncated-cone-geometry';
-import {uid} from '@luma.gl/webgl';
 
 export type CylinderGeometryProps = {
   id?: string;

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

@@ -1,6 +1,6 @@
+import {uid} from '@luma.gl/api';
 import {Vector3} from '@math.gl/core';
 import Geometry from '../geometry/geometry';
-import {uid} from '@luma.gl/webgl';
 
 /* eslint-disable comma-spacing, max-statements, complexity */
 

package/src/geometries/plane-geometry.ts

@@ -1,6 +1,6 @@
+import {uid} from '@luma.gl/api';
 import Geometry from '../geometry/geometry';
 import {unpackIndexedGeometry} from '../geometry/geometry-utils';
-import {uid} from '@luma.gl/webgl';
 
 export type PlaneGeometryProps = {
   id?: string;

package/src/geometries/sphere-geometry.ts

@@ -1,5 +1,5 @@
+import {uid} from '@luma.gl/api';
 import Geometry from '../geometry/geometry';
-import {uid} from '@luma.gl/webgl';
 
 export type SphereGeometryProps = {
   id?: string;
@@ -37,7 +37,7 @@ function tesselateSphere(props: SphereGeometryProps) {
   const longRange = endLong - startLong;
   const numVertices = (nlat + 1) * (nlong + 1);
 
-  const radius = (n1, n2, n3, u, v) => props.radius || 1;
+  const radius = (n1: number, n2: number, n3: number, u: number, v: number) => props.radius || 1;
 
   const positions = new Float32Array(numVertices * 3);
   const normals = new Float32Array(numVertices * 3);

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

@@ -1,5 +1,6 @@
+import {uid} from '@luma.gl/api';
 import Geometry from '../geometry/geometry';
-import {uid} from '@luma.gl/webgl';
+import {GeometryTable} from '../geometry/geometry-table';
 
 const INDEX_OFFSETS = {
   x: [2, 0, 1],
@@ -8,32 +9,49 @@ const INDEX_OFFSETS = {
 };
 
 export type TruncatedConeGeometryProps = {
-  id?: string;
   topRadius?: number;
   bottomRadius?: number;
   topCap?: boolean;
   bottomCap?: boolean;
-  attributes?
+  height?: number;
+  nradial?: number;
+  nvertical?: number;
+  verticalAxis?: 'x' | 'y' | 'z';
 };
 
-// Primitives inspired by TDL http://code.google.com/p/webglsamples/,
-// copyright 2011 Google Inc. new BSD License
-// (http://www.opensource.org/licenses/bsd-license.php).
+/**
+ * Primitives inspired by TDL http://code.google.com/p/webglsamples/,
+ * 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 = {}) {
+  constructor(props: TruncatedConeGeometryProps & {id?: string; attributes?} = {}) {
     const {id = uid('truncated-code-geometry')} = props;
     const {indices, attributes} = tesselateTruncatedCone(props);
     super({
       ...props,
       id,
       indices,
-      attributes: {...attributes, ...props.attributes}
+      attributes: {
+        POSITION: {size: 3, value: attributes.POSITION},
+        NORMAL: {size: 3, value: attributes.NORMAL},
+        TEXCOORD_0: {size: 2, value: attributes.TEXCOORD_0},
+        ...props.attributes}
     });
   }
 }
 
 /* eslint-disable max-statements, complexity */
-function tesselateTruncatedCone(props) {
+function tesselateTruncatedCone(props: TruncatedConeGeometryProps = {}) {
   const {
     bottomRadius = 0,
     topRadius = 0,
@@ -123,9 +141,9 @@ function tesselateTruncatedCone(props) {
   return {
     indices,
     attributes: {
-      POSITION: {size: 3, value: positions},
-      NORMAL: {size: 3, value: normals},
-      TEXCOORD_0: {size: 2, value: texCoords}
+      POSITION: positions,
+      NORMAL: normals,
+      TEXCOORD_0: texCoords
     }
   };
 }

package/src/geometry/geometry-table.ts

@@ -0,0 +1,16 @@
+// luma.gl, MIT license
+import type {TypedArray, VertexFormat} from '@luma.gl/api';
+
+/** Holds one geometry */
+export type GeometryTable = {
+  length: number;
+  schema?: Record<string, VertexFormat>;
+  attributes: {
+    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,4 +1,4 @@
-import type Geometry from './geometry';
+// import type Geometry from './geometry';
 
 export function unpackIndexedGeometry(geometry) {
   const {indices, attributes} = geometry;

package/src/geometry/geometry.ts

@@ -1,9 +1,10 @@
 // luma.gl, MIT license
+import type {TypedArray} from '@luma.gl/api';
+import {uid, assert} from '@luma.gl/api';
 import GL from '@luma.gl/constants';
-import {uid, assert} from '@luma.gl/webgl';
 
 /**
- * Rendering primitives - "opology" specifies how to extract primitives from vertices.
+ * Rendering primitives - "topology" specifies how to extract primitives from vertices.
  */
 export type Topology =
   GL.POINTS |  // draw single points.
@@ -17,10 +18,21 @@ export type Topology =
 
 export type GeometryProps = {
   id?: string;
-  drawMode?: Topology,
   attributes?: {},
   indices?;
-  vertexCount?: number
+  vertexCount?: number;
+  /** Determines how vertices are read from the 'vertex' attributes */
+  topology?: 'point-list' | 'line-list' | 'line-strip' | 'triangle-list' | 'triangle-strip';
+  /** @deprecated */
+  drawMode?: Topology;
+};
+
+type GeometryAttributes = {
+  POSITION: {size: number, value: TypedArray, [key: string]: any},
+  NORMAL: {size: number, value: TypedArray, [key: string]: any},
+  TEXCOORD_0: {size: number, value: TypedArray, [key: string]: any},
+  COLOR_0?: {size: number, value: TypedArray, [key: string]: any},
+  indices?: {size?: number, value: Uint32Array | Uint16Array};
 };
 
 export default class Geometry {
@@ -36,12 +48,21 @@ export default class Geometry {
   };
 
   readonly id: string;
+  userData: Record<string, any> = {};
+
+  /** Determines how vertices are read from the 'vertex' attributes */
+  topology?: 'point-list' | 'line-list' | 'line-strip' | 'triangle-list' | 'triangle-strip';
+  /** @deprecated */
   readonly drawMode: Topology = GL.TRIANGLES;
 
-  vertexCount: number;
-  attributes = {};
-  indices;
-  userData: Record<string, any> = {};
+  readonly vertexCount: number;
+  readonly attributes: {
+    POSITION: {size: number, value: TypedArray, [key: string]: any},
+    NORMAL: {size: number, value: TypedArray, [key: string]: any},
+    TEXCOORD_0: {size: number, value: TypedArray, [key: string]: any},
+    COLOR_0?: {size: number, value: TypedArray, [key: string]: any},
+  };
+  readonly indices?: Uint16Array | Uint32Array;
 
   constructor(props: GeometryProps = {}) {
     const {
@@ -54,6 +75,7 @@ export default class Geometry {
 
     this.id = id;
     this.drawMode = drawMode;
+    this.topology = props.topology || convertToTopology(drawMode);
 
     this._setAttributes(attributes, indices);
 
@@ -69,9 +91,9 @@ export default class Geometry {
   }
 
   // Return an object with all attributes plus indices added as a field.
-  getAttributes() {
-    return this.indices ? {indices: this.indices, ...this.attributes} : this.attributes;
-  }
+  // getAttributes(): GeometryAttributes {
+  //   return this.indices ? {indices: this.indices, ...this.attributes} : this.attributes;
+  // }
 
   // PRIVATE
 
@@ -86,9 +108,13 @@ export default class Geometry {
   // target: WebGL buffer type (string or constant)
   _setAttributes(attributes, indices): this {
     if (indices) {
+      // @ts-expect-error
       this.indices = ArrayBuffer.isView(indices) ? {value: indices, size: 1} : indices;
     }
 
+    // @ts-expect-error
+    this.attributes = {};
+
     for (const attributeName in attributes) {
       let attribute = attributes[attributeName];
 
@@ -107,14 +133,18 @@ export default class Geometry {
       // Move indices to separate field
       if (attributeName === 'indices') {
         assert(!this.indices);
-        this.indices = attribute;
+      // @ts-expect-error
+      this.indices = attribute;
       } else {
         this.attributes[attributeName] = attribute;
       }
     }
 
-    if (this.indices && this.indices.isIndexed !== undefined) {
+      // @ts-expect-error
+      if (this.indices && this.indices.isIndexed !== undefined) {
+      // @ts-expect-error
       this.indices = Object.assign({}, this.indices);
+      // @ts-expect-error
       delete this.indices.isIndexed;
     }
 
@@ -138,3 +168,18 @@ export default class Geometry {
     return vertexCount;
   }
 }
+
+function convertToTopology(drawMode: GL): 'point-list' | 'line-list' | 'line-strip' | 'triangle-list' | 'triangle-strip' {
+  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: // draw a connected group of triangles.
+    case GL.LINE_LOOP:  // draw lines. Each set of two vertices is treated as a separate line segment.
+    default:
+      throw new Error(String(drawMode));
+  }
+}

package/src/geometry/primitive-utils.ts

@@ -0,0 +1,30 @@
+/*
+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/index.ts

@@ -1,12 +1,13 @@
-// CORE
-export type {AnimationLoopProps, AnimationProps} from './lib/animation-loop';
-export {default as AnimationLoop} from './lib/animation-loop';
+// luma.gl Engine API
+export type {AnimationProps} from './lib/animation-props';
 export {RenderLoop} from './lib/render-loop';
-
 export type {ModelProps} from './lib/model';
 export {default as Model} from './lib/model';
-export {default as ProgramManager} from './lib/program-manager';
-export {default as Transform} from './transform/transform';
+export type {AnimationLoopProps} from './lib/animation-loop';
+export {default as AnimationLoop} from './lib/animation-loop';
+
+// Utils
+// export {default as ClipSpace} from './lib/clip-space';
 
 // Geometries
 export {default as Geometry} from './geometry/geometry';
@@ -31,5 +32,3 @@ export {TruncatedConeGeometry} from './geometries/truncated-cone-geometry';
 export {Timeline} from './animation/timeline';
 export {KeyFrames} from './animation/key-frames';
 
-// Utils
-export {default as ClipSpace} from './utils/clip-space';