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

package/dist/geometries/plane-geometry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plane-geometry.d.ts","sourceRoot":"","sources":["../../src/geometries/plane-geometry.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAG5C,oBAAY,kBAAkB,GAAG;IAC/B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,MAAA;CACZ,CAAC;AAKF,qBAAa,aAAc,SAAQ,QAAQ;gBAC7B,KAAK,GAAE,kBAAuB;CAW3C"}
+{"version":3,"file":"plane-geometry.d.ts","sourceRoot":"","sources":["../../src/geometries/plane-geometry.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAC,gCAA6B;AAG9C,MAAM,MAAM,kBAAkB,GAAG;IAC/B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB,CAAC;AAKF,qBAAa,aAAc,SAAQ,QAAQ;gBAC7B,KAAK,GAAE,kBAAuB;CAY3C"}

package/dist/geometries/plane-geometry.js

@@ -1,129 +1,102 @@
-import { uid } from '@luma.gl/api';
-import Geometry from '../geometry/geometry';
-import { unpackIndexedGeometry } from '../geometry/geometry-utils';
+import { uid } from '@luma.gl/core';
+import { Geometry } from "../geometry/geometry.js";
+import { unpackIndexedGeometry } from "../geometry/geometry-utils.js";
+// 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 class PlaneGeometry extends Geometry {
-  constructor(props = {}) {
-    const {
-      id = uid('plane-geometry')
-    } = props;
-    const {
-      indices,
-      attributes
-    } = tesselatePlane(props);
-    super({ ...props,
-      id,
-      indices,
-      attributes: { ...attributes,
-        ...props.attributes
-      }
-    });
-  }
-
+    constructor(props = {}) {
+        const { id = uid('plane-geometry') } = props;
+        const { indices, attributes } = tesselatePlane(props);
+        super({
+            ...props,
+            id,
+            topology: 'triangle-list',
+            indices,
+            attributes: { ...attributes, ...props.attributes }
+        });
+    }
 }
-
+/* eslint-disable complexity, max-statements */
 function tesselatePlane(props) {
-  const {
-    type = 'x,y',
-    offset = 0,
-    flipCull = false,
-    unpack = false
-  } = props;
-  const coords = type.split(',');
-  let c1len = props["".concat(coords[0], "len")] || 1;
-  const c2len = props["".concat(coords[1], "len")] || 1;
-  const subdivisions1 = props["n".concat(coords[0])] || 1;
-  const subdivisions2 = props["n".concat(coords[1])] || 1;
-  const numVertices = (subdivisions1 + 1) * (subdivisions2 + 1);
-  const positions = new Float32Array(numVertices * 3);
-  const normals = new Float32Array(numVertices * 3);
-  const texCoords = new Float32Array(numVertices * 2);
-
-  if (flipCull) {
-    c1len = -c1len;
-  }
-
-  let i2 = 0;
-  let i3 = 0;
-
-  for (let z = 0; z <= subdivisions2; z++) {
-    for (let x = 0; x <= subdivisions1; x++) {
-      const u = x / subdivisions1;
-      const v = z / subdivisions2;
-      texCoords[i2 + 0] = flipCull ? 1 - u : u;
-      texCoords[i2 + 1] = v;
-
-      switch (type) {
-        case 'x,y':
-          positions[i3 + 0] = c1len * u - c1len * 0.5;
-          positions[i3 + 1] = c2len * v - c2len * 0.5;
-          positions[i3 + 2] = offset;
-          normals[i3 + 0] = 0;
-          normals[i3 + 1] = 0;
-          normals[i3 + 2] = flipCull ? 1 : -1;
-          break;
-
-        case 'x,z':
-          positions[i3 + 0] = c1len * u - c1len * 0.5;
-          positions[i3 + 1] = offset;
-          positions[i3 + 2] = c2len * v - c2len * 0.5;
-          normals[i3 + 0] = 0;
-          normals[i3 + 1] = flipCull ? 1 : -1;
-          normals[i3 + 2] = 0;
-          break;
-
-        case 'y,z':
-          positions[i3 + 0] = offset;
-          positions[i3 + 1] = c1len * u - c1len * 0.5;
-          positions[i3 + 2] = c2len * v - c2len * 0.5;
-          normals[i3 + 0] = flipCull ? 1 : -1;
-          normals[i3 + 1] = 0;
-          normals[i3 + 2] = 0;
-          break;
-
-        default:
-          throw new Error('PlaneGeometry: unknown type');
-      }
-
-      i2 += 2;
-      i3 += 3;
+    const { type = 'x,y', offset = 0, flipCull = false, unpack = false } = props;
+    const coords = type.split(',');
+    // width, height
+    let c1len = props[`${coords[0]}len`] || 1;
+    const c2len = props[`${coords[1]}len`] || 1;
+    // subdivisionsWidth, subdivisionsDepth
+    const subdivisions1 = props[`n${coords[0]}`] || 1;
+    const subdivisions2 = props[`n${coords[1]}`] || 1;
+    const numVertices = (subdivisions1 + 1) * (subdivisions2 + 1);
+    const positions = new Float32Array(numVertices * 3);
+    const normals = new Float32Array(numVertices * 3);
+    const texCoords = new Float32Array(numVertices * 2);
+    if (flipCull) {
+        c1len = -c1len;
     }
-  }
-
-  const numVertsAcross = subdivisions1 + 1;
-  const indices = new Uint16Array(subdivisions1 * subdivisions2 * 6);
-
-  for (let z = 0; z < subdivisions2; z++) {
-    for (let x = 0; x < subdivisions1; x++) {
-      const index = (z * subdivisions1 + x) * 6;
-      indices[index + 0] = (z + 0) * numVertsAcross + x;
-      indices[index + 1] = (z + 1) * numVertsAcross + x;
-      indices[index + 2] = (z + 0) * numVertsAcross + x + 1;
-      indices[index + 3] = (z + 1) * numVertsAcross + x;
-      indices[index + 4] = (z + 1) * numVertsAcross + x + 1;
-      indices[index + 5] = (z + 0) * numVertsAcross + x + 1;
+    let i2 = 0;
+    let i3 = 0;
+    for (let z = 0; z <= subdivisions2; z++) {
+        for (let x = 0; x <= subdivisions1; x++) {
+            const u = x / subdivisions1;
+            const v = z / subdivisions2;
+            texCoords[i2 + 0] = flipCull ? 1 - u : u;
+            texCoords[i2 + 1] = v;
+            switch (type) {
+                case 'x,y':
+                    positions[i3 + 0] = c1len * u - c1len * 0.5;
+                    positions[i3 + 1] = c2len * v - c2len * 0.5;
+                    positions[i3 + 2] = offset;
+                    normals[i3 + 0] = 0;
+                    normals[i3 + 1] = 0;
+                    normals[i3 + 2] = flipCull ? 1 : -1;
+                    break;
+                case 'x,z':
+                    positions[i3 + 0] = c1len * u - c1len * 0.5;
+                    positions[i3 + 1] = offset;
+                    positions[i3 + 2] = c2len * v - c2len * 0.5;
+                    normals[i3 + 0] = 0;
+                    normals[i3 + 1] = flipCull ? 1 : -1;
+                    normals[i3 + 2] = 0;
+                    break;
+                case 'y,z':
+                    positions[i3 + 0] = offset;
+                    positions[i3 + 1] = c1len * u - c1len * 0.5;
+                    positions[i3 + 2] = c2len * v - c2len * 0.5;
+                    normals[i3 + 0] = flipCull ? 1 : -1;
+                    normals[i3 + 1] = 0;
+                    normals[i3 + 2] = 0;
+                    break;
+                default:
+                    throw new Error('PlaneGeometry: unknown type');
+            }
+            i2 += 2;
+            i3 += 3;
+        }
     }
-  }
-
-  const geometry = {
-    indices: {
-      size: 1,
-      value: indices
-    },
-    attributes: {
-      POSITION: {
-        size: 3,
-        value: positions
-      },
-      NORMAL: {
-        size: 3,
-        value: normals
-      },
-      TEXCOORD_0: {
-        size: 2,
-        value: texCoords
-      }
+    const numVertsAcross = subdivisions1 + 1;
+    const indices = new Uint16Array(subdivisions1 * subdivisions2 * 6);
+    for (let z = 0; z < subdivisions2; z++) {
+        for (let x = 0; x < subdivisions1; x++) {
+            const index = (z * subdivisions1 + x) * 6;
+            // Make triangle 1 of quad.
+            indices[index + 0] = (z + 0) * numVertsAcross + x;
+            indices[index + 1] = (z + 1) * numVertsAcross + x;
+            indices[index + 2] = (z + 0) * numVertsAcross + x + 1;
+            // Make triangle 2 of quad.
+            indices[index + 3] = (z + 1) * numVertsAcross + x;
+            indices[index + 4] = (z + 1) * numVertsAcross + x + 1;
+            indices[index + 5] = (z + 0) * numVertsAcross + x + 1;
+        }
     }
-  };
-  return unpack ? unpackIndexedGeometry(geometry) : geometry;
+    const geometry = {
+        indices: { size: 1, value: indices },
+        attributes: {
+            POSITION: { size: 3, value: positions },
+            NORMAL: { size: 3, value: normals },
+            TEXCOORD_0: { size: 2, value: texCoords }
+        }
+    };
+    // Optionally, unpack indexed geometry
+    return unpack ? unpackIndexedGeometry(geometry) : geometry;
 }
-//# sourceMappingURL=plane-geometry.js.map

package/dist/geometries/sphere-geometry.d.ts

@@ -1,5 +1,5 @@
-import Geometry from '../geometry/geometry';
-export declare type SphereGeometryProps = {
+import { Geometry } from "../geometry/geometry.js";
+export type SphereGeometryProps = {
     id?: string;
     radius?: number;
     nlat?: number;

package/dist/geometries/sphere-geometry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sphere-geometry.d.ts","sourceRoot":"","sources":["../../src/geometries/sphere-geometry.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAE5C,oBAAY,mBAAmB,GAAG;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,MAAA;CACZ,CAAC;AAKF,qBAAa,cAAe,SAAQ,QAAQ;gBAC9B,KAAK,GAAE,mBAAwB;CAU5C"}
+{"version":3,"file":"sphere-geometry.d.ts","sourceRoot":"","sources":["../../src/geometries/sphere-geometry.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAC,gCAA6B;AAE9C,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB,CAAC;AAKF,qBAAa,cAAe,SAAQ,QAAQ;gBAC9B,KAAK,GAAE,mBAAwB;CAW5C"}

package/dist/geometries/sphere-geometry.js

@@ -1,107 +1,84 @@
-import { uid } from '@luma.gl/api';
-import Geometry from '../geometry/geometry';
+import { uid } from '@luma.gl/core';
+import { Geometry } from "../geometry/geometry.js";
+// 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 class SphereGeometry extends Geometry {
-  constructor(props = {}) {
-    const {
-      id = uid('sphere-geometry')
-    } = props;
-    const {
-      indices,
-      attributes
-    } = tesselateSphere(props);
-    super({ ...props,
-      id,
-      indices,
-      attributes: { ...attributes,
-        ...props.attributes
-      }
-    });
-  }
-
+    constructor(props = {}) {
+        const { id = uid('sphere-geometry') } = props;
+        const { indices, attributes } = tesselateSphere(props);
+        super({
+            ...props,
+            id,
+            topology: 'triangle-list',
+            indices,
+            attributes: { ...attributes, ...props.attributes }
+        });
+    }
 }
-
+/* eslint-disable max-statements, complexity */
 function tesselateSphere(props) {
-  const {
-    nlat = 10,
-    nlong = 10
-  } = props;
-  const startLat = 0;
-  const endLat = Math.PI;
-  const latRange = endLat - startLat;
-  const startLong = 0;
-  const endLong = 2 * Math.PI;
-  const longRange = endLong - startLong;
-  const numVertices = (nlat + 1) * (nlong + 1);
-
-  const radius = (n1, n2, n3, u, v) => props.radius || 1;
-
-  const positions = new Float32Array(numVertices * 3);
-  const normals = new Float32Array(numVertices * 3);
-  const texCoords = new Float32Array(numVertices * 2);
-  const IndexType = numVertices > 0xffff ? Uint32Array : Uint16Array;
-  const indices = new IndexType(nlat * nlong * 6);
-
-  for (let y = 0; y <= nlat; y++) {
-    for (let x = 0; x <= nlong; x++) {
-      const u = x / nlong;
-      const v = y / nlat;
-      const index = x + y * (nlong + 1);
-      const i2 = index * 2;
-      const i3 = index * 3;
-      const theta = longRange * u;
-      const phi = latRange * v;
-      const sinTheta = Math.sin(theta);
-      const cosTheta = Math.cos(theta);
-      const sinPhi = Math.sin(phi);
-      const cosPhi = Math.cos(phi);
-      const ux = cosTheta * sinPhi;
-      const uy = cosPhi;
-      const uz = sinTheta * sinPhi;
-      const r = radius(ux, uy, uz, u, v);
-      positions[i3 + 0] = r * ux;
-      positions[i3 + 1] = r * uy;
-      positions[i3 + 2] = r * uz;
-      normals[i3 + 0] = ux;
-      normals[i3 + 1] = uy;
-      normals[i3 + 2] = uz;
-      texCoords[i2 + 0] = u;
-      texCoords[i2 + 1] = 1 - v;
-    }
-  }
-
-  const numVertsAround = nlong + 1;
-
-  for (let x = 0; x < nlong; x++) {
-    for (let y = 0; y < nlat; y++) {
-      const index = (x * nlat + y) * 6;
-      indices[index + 0] = y * numVertsAround + x;
-      indices[index + 1] = y * numVertsAround + x + 1;
-      indices[index + 2] = (y + 1) * numVertsAround + x;
-      indices[index + 3] = (y + 1) * numVertsAround + x;
-      indices[index + 4] = y * numVertsAround + x + 1;
-      indices[index + 5] = (y + 1) * numVertsAround + x + 1;
+    const { nlat = 10, nlong = 10 } = props;
+    const startLat = 0;
+    const endLat = Math.PI;
+    const latRange = endLat - startLat;
+    const startLong = 0;
+    const endLong = 2 * Math.PI;
+    const longRange = endLong - startLong;
+    const numVertices = (nlat + 1) * (nlong + 1);
+    const radius = (n1, n2, n3, u, v) => props.radius || 1;
+    const positions = new Float32Array(numVertices * 3);
+    const normals = new Float32Array(numVertices * 3);
+    const texCoords = new Float32Array(numVertices * 2);
+    const IndexType = numVertices > 0xffff ? Uint32Array : Uint16Array;
+    const indices = new IndexType(nlat * nlong * 6);
+    // Create positions, normals and texCoords
+    for (let y = 0; y <= nlat; y++) {
+        for (let x = 0; x <= nlong; x++) {
+            const u = x / nlong;
+            const v = y / nlat;
+            const index = x + y * (nlong + 1);
+            const i2 = index * 2;
+            const i3 = index * 3;
+            const theta = longRange * u;
+            const phi = latRange * v;
+            const sinTheta = Math.sin(theta);
+            const cosTheta = Math.cos(theta);
+            const sinPhi = Math.sin(phi);
+            const cosPhi = Math.cos(phi);
+            const ux = cosTheta * sinPhi;
+            const uy = cosPhi;
+            const uz = sinTheta * sinPhi;
+            const r = radius(ux, uy, uz, u, v);
+            positions[i3 + 0] = r * ux;
+            positions[i3 + 1] = r * uy;
+            positions[i3 + 2] = r * uz;
+            normals[i3 + 0] = ux;
+            normals[i3 + 1] = uy;
+            normals[i3 + 2] = uz;
+            texCoords[i2 + 0] = u;
+            texCoords[i2 + 1] = 1 - v;
+        }
     }
-  }
-
-  return {
-    indices: {
-      size: 1,
-      value: indices
-    },
-    attributes: {
-      POSITION: {
-        size: 3,
-        value: positions
-      },
-      NORMAL: {
-        size: 3,
-        value: normals
-      },
-      TEXCOORD_0: {
-        size: 2,
-        value: texCoords
-      }
+    // Create indices
+    const numVertsAround = nlong + 1;
+    for (let x = 0; x < nlong; x++) {
+        for (let y = 0; y < nlat; y++) {
+            const index = (x * nlat + y) * 6;
+            indices[index + 0] = y * numVertsAround + x;
+            indices[index + 1] = y * numVertsAround + x + 1;
+            indices[index + 2] = (y + 1) * numVertsAround + x;
+            indices[index + 3] = (y + 1) * numVertsAround + x;
+            indices[index + 4] = y * numVertsAround + x + 1;
+            indices[index + 5] = (y + 1) * numVertsAround + x + 1;
+        }
     }
-  };
+    return {
+        indices: { size: 1, value: indices },
+        attributes: {
+            POSITION: { size: 3, value: positions },
+            NORMAL: { size: 3, value: normals },
+            TEXCOORD_0: { size: 2, value: texCoords }
+        }
+    };
 }
-//# sourceMappingURL=sphere-geometry.js.map

package/dist/geometries/truncated-cone-geometry.d.ts

@@ -1,6 +1,5 @@
-import Geometry from '../geometry/geometry';
-import { GeometryTable } from '../geometry/geometry-table';
-export declare type TruncatedConeGeometryProps = {
+import { Geometry } from "../geometry/geometry.js";
+export type TruncatedConeGeometryProps = {
     topRadius?: number;
     bottomRadius?: number;
     topCap?: boolean;
@@ -15,7 +14,6 @@ export declare type TruncatedConeGeometryProps = {
  * copyright 2011 Google Inc. new BSD License
  * (http://www.opensource.org/licenses/bsd-license.php).
  */
-export declare function makeTruncatedConeGeometry(props?: TruncatedConeGeometryProps): GeometryTable;
 export declare class TruncatedConeGeometry extends Geometry {
     constructor(props?: TruncatedConeGeometryProps & {
         id?: string;

package/dist/geometries/truncated-cone-geometry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"truncated-cone-geometry.d.ts","sourceRoot":"","sources":["../../src/geometries/truncated-cone-geometry.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAC,aAAa,EAAC,MAAM,4BAA4B,CAAC;AAQzD,oBAAY,0BAA0B,GAAG;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;CAChC,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,CAAC,EAAE,0BAA0B,GAAG,aAAa,CAO3F;AAED,qBAAa,qBAAsB,SAAQ,QAAQ;gBACrC,KAAK,GAAE,0BAA0B,GAAG;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,MAAA;KAAM;CAchF"}
+{"version":3,"file":"truncated-cone-geometry.d.ts","sourceRoot":"","sources":["../../src/geometries/truncated-cone-geometry.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAC,gCAA6B;AAQ9C,MAAM,MAAM,0BAA0B,GAAG;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;CAChC,CAAC;AAEF;;;;GAIG;AACH,qBAAa,qBAAsB,SAAQ,QAAQ;gBACrC,KAAK,GAAE,0BAA0B,GAAG;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,GAAG,CAAA;KAAM;CAgBrF"}