@luma.gl/engine 9.0.0-alpha.5 → 9.0.0-alpha.51

package/dist/geometries/sphere-geometry.js

@@ -1,7 +1,8 @@
-import { uid } from '@luma.gl/api';
-import Geometry from '../geometry/geometry';
+import { uid } from '@luma.gl/core';
+import { Geometry } from "../geometry/geometry.js";
 export class SphereGeometry extends Geometry {
-  constructor(props = {}) {
+  constructor() {
+    let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     const {
       id = uid('sphere-geometry')
     } = props;
@@ -9,17 +10,18 @@ export class SphereGeometry extends Geometry {
       indices,
       attributes
     } = tesselateSphere(props);
-    super({ ...props,
+    super({
+      ...props,
       id,
+      topology: 'triangle-list',
       indices,
-      attributes: { ...attributes,
+      attributes: {
+        ...attributes,
         ...props.attributes
       }
     });
   }
-
 }
-
 function tesselateSphere(props) {
   const {
     nlat = 10,
@@ -32,15 +34,12 @@ function tesselateSphere(props) {
   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;
@@ -68,9 +67,7 @@ function tesselateSphere(props) {
       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;
@@ -82,7 +79,6 @@ function tesselateSphere(props) {
       indices[index + 5] = (y + 1) * numVertsAround + x + 1;
     }
   }
-
   return {
     indices: {
       size: 1,

package/dist/geometries/sphere-geometry.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/geometries/sphere-geometry.ts"],"names":["uid","Geometry","SphereGeometry","constructor","props","id","indices","attributes","tesselateSphere","nlat","nlong","startLat","endLat","Math","PI","latRange","startLong","endLong","longRange","numVertices","radius","n1","n2","n3","u","v","positions","Float32Array","normals","texCoords","IndexType","Uint32Array","Uint16Array","y","x","index","i2","i3","theta","phi","sinTheta","sin","cosTheta","cos","sinPhi","cosPhi","ux","uy","uz","r","numVertsAround","size","value","POSITION","NORMAL","TEXCOORD_0"],"mappings":"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","sourcesContent":["import {uid} from '@luma.gl/api';\nimport Geometry from '../geometry/geometry';\n\nexport type SphereGeometryProps = {\n  id?: string;\n  radius?: number;\n  nlat?: number;\n  nlong?: number;\n  attributes?\n};\n\n// Primitives inspired by TDL http://code.google.com/p/webglsamples/,\n// copyright 2011 Google Inc. new BSD License\n// (http://www.opensource.org/licenses/bsd-license.php).\nexport class SphereGeometry extends Geometry {\n  constructor(props: SphereGeometryProps = {}) {\n    const {id = uid('sphere-geometry')} = props;\n    const {indices, attributes} = tesselateSphere(props);\n    super({\n      ...props,\n      id,\n      indices,\n      attributes: {...attributes, ...props.attributes}\n    });\n  }\n}\n\n/* eslint-disable max-statements, complexity */\nfunction tesselateSphere(props: SphereGeometryProps) {\n  const {nlat = 10, nlong = 10} = props;\n\n  const startLat = 0;\n  const endLat = Math.PI;\n  const latRange = endLat - startLat;\n  const startLong = 0;\n  const endLong = 2 * Math.PI;\n  const longRange = endLong - startLong;\n  const numVertices = (nlat + 1) * (nlong + 1);\n\n  const radius = (n1: number, n2: number, n3: number, u: number, v: number) => props.radius || 1;\n\n  const positions = new Float32Array(numVertices * 3);\n  const normals = new Float32Array(numVertices * 3);\n  const texCoords = new Float32Array(numVertices * 2);\n\n  const IndexType = numVertices > 0xffff ? Uint32Array : Uint16Array;\n  const indices = new IndexType(nlat * nlong * 6);\n\n  // Create positions, normals and texCoords\n  for (let y = 0; y <= nlat; y++) {\n    for (let x = 0; x <= nlong; x++) {\n      const u = x / nlong;\n      const v = y / nlat;\n\n      const index = x + y * (nlong + 1);\n      const i2 = index * 2;\n      const i3 = index * 3;\n\n      const theta = longRange * u;\n      const phi = latRange * v;\n      const sinTheta = Math.sin(theta);\n      const cosTheta = Math.cos(theta);\n      const sinPhi = Math.sin(phi);\n      const cosPhi = Math.cos(phi);\n      const ux = cosTheta * sinPhi;\n      const uy = cosPhi;\n      const uz = sinTheta * sinPhi;\n\n      const r = radius(ux, uy, uz, u, v);\n\n      positions[i3 + 0] = r * ux;\n      positions[i3 + 1] = r * uy;\n      positions[i3 + 2] = r * uz;\n\n      normals[i3 + 0] = ux;\n      normals[i3 + 1] = uy;\n      normals[i3 + 2] = uz;\n\n      texCoords[i2 + 0] = u;\n      texCoords[i2 + 1] = 1 - v;\n    }\n  }\n\n  // Create indices\n  const numVertsAround = nlong + 1;\n  for (let x = 0; x < nlong; x++) {\n    for (let y = 0; y < nlat; y++) {\n      const index = (x * nlat + y) * 6;\n\n      indices[index + 0] = y * numVertsAround + x;\n      indices[index + 1] = y * numVertsAround + x + 1;\n      indices[index + 2] = (y + 1) * numVertsAround + x;\n\n      indices[index + 3] = (y + 1) * numVertsAround + x;\n      indices[index + 4] = y * numVertsAround + x + 1;\n      indices[index + 5] = (y + 1) * numVertsAround + x + 1;\n    }\n  }\n\n  return {\n    indices: {size: 1, value: indices},\n    attributes: {\n      POSITION: {size: 3, value: positions},\n      NORMAL: {size: 3, value: normals},\n      TEXCOORD_0: {size: 2, value: texCoords}\n    }\n  };\n}\n"],"file":"sphere-geometry.js"}
+{"version":3,"file":"sphere-geometry.js","names":["uid","Geometry","SphereGeometry","constructor","props","arguments","length","undefined","id","indices","attributes","tesselateSphere","topology","nlat","nlong","startLat","endLat","Math","PI","latRange","startLong","endLong","longRange","numVertices","radius","n1","n2","n3","u","v","positions","Float32Array","normals","texCoords","IndexType","Uint32Array","Uint16Array","y","x","index","i2","i3","theta","phi","sinTheta","sin","cosTheta","cos","sinPhi","cosPhi","ux","uy","uz","r","numVertsAround","size","value","POSITION","NORMAL","TEXCOORD_0"],"sources":["../../src/geometries/sphere-geometry.ts"],"sourcesContent":["import {uid} from '@luma.gl/core';\nimport {Geometry} from '../geometry/geometry';\n\nexport type SphereGeometryProps = {\n  id?: string;\n  radius?: number;\n  nlat?: number;\n  nlong?: number;\n  attributes?: any\n};\n\n// Primitives inspired by TDL http://code.google.com/p/webglsamples/,\n// copyright 2011 Google Inc. new BSD License\n// (http://www.opensource.org/licenses/bsd-license.php).\nexport class SphereGeometry extends Geometry {\n  constructor(props: SphereGeometryProps = {}) {\n    const {id = uid('sphere-geometry')} = props;\n    const {indices, attributes} = tesselateSphere(props);\n    super({\n      ...props,\n      id,\n      topology: 'triangle-list',\n      indices,\n      attributes: {...attributes, ...props.attributes}\n    });\n  }\n}\n\n/* eslint-disable max-statements, complexity */\nfunction tesselateSphere(props: SphereGeometryProps) {\n  const {nlat = 10, nlong = 10} = props;\n\n  const startLat = 0;\n  const endLat = Math.PI;\n  const latRange = endLat - startLat;\n  const startLong = 0;\n  const endLong = 2 * Math.PI;\n  const longRange = endLong - startLong;\n  const numVertices = (nlat + 1) * (nlong + 1);\n\n  const radius = (n1: number, n2: number, n3: number, u: number, v: number) => props.radius || 1;\n\n  const positions = new Float32Array(numVertices * 3);\n  const normals = new Float32Array(numVertices * 3);\n  const texCoords = new Float32Array(numVertices * 2);\n\n  const IndexType = numVertices > 0xffff ? Uint32Array : Uint16Array;\n  const indices = new IndexType(nlat * nlong * 6);\n\n  // Create positions, normals and texCoords\n  for (let y = 0; y <= nlat; y++) {\n    for (let x = 0; x <= nlong; x++) {\n      const u = x / nlong;\n      const v = y / nlat;\n\n      const index = x + y * (nlong + 1);\n      const i2 = index * 2;\n      const i3 = index * 3;\n\n      const theta = longRange * u;\n      const phi = latRange * v;\n      const sinTheta = Math.sin(theta);\n      const cosTheta = Math.cos(theta);\n      const sinPhi = Math.sin(phi);\n      const cosPhi = Math.cos(phi);\n      const ux = cosTheta * sinPhi;\n      const uy = cosPhi;\n      const uz = sinTheta * sinPhi;\n\n      const r = radius(ux, uy, uz, u, v);\n\n      positions[i3 + 0] = r * ux;\n      positions[i3 + 1] = r * uy;\n      positions[i3 + 2] = r * uz;\n\n      normals[i3 + 0] = ux;\n      normals[i3 + 1] = uy;\n      normals[i3 + 2] = uz;\n\n      texCoords[i2 + 0] = u;\n      texCoords[i2 + 1] = 1 - v;\n    }\n  }\n\n  // Create indices\n  const numVertsAround = nlong + 1;\n  for (let x = 0; x < nlong; x++) {\n    for (let y = 0; y < nlat; y++) {\n      const index = (x * nlat + y) * 6;\n\n      indices[index + 0] = y * numVertsAround + x;\n      indices[index + 1] = y * numVertsAround + x + 1;\n      indices[index + 2] = (y + 1) * numVertsAround + x;\n\n      indices[index + 3] = (y + 1) * numVertsAround + x;\n      indices[index + 4] = y * numVertsAround + x + 1;\n      indices[index + 5] = (y + 1) * numVertsAround + x + 1;\n    }\n  }\n\n  return {\n    indices: {size: 1, value: indices},\n    attributes: {\n      POSITION: {size: 3, value: positions},\n      NORMAL: {size: 3, value: normals},\n      TEXCOORD_0: {size: 2, value: texCoords}\n    }\n  };\n}\n"],"mappings":"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"}

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';
+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,MAAM,sBAAsB,CAAC;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;CAerF"}

package/dist/geometries/truncated-cone-geometry.js

@@ -1,23 +1,13 @@
-import { uid } from '@luma.gl/api';
-import Geometry from '../geometry/geometry';
+import { uid } from '@luma.gl/core';
+import { Geometry } from "../geometry/geometry.js";
 const INDEX_OFFSETS = {
   x: [2, 0, 1],
   y: [0, 1, 2],
   z: [1, 2, 0]
 };
-export function makeTruncatedConeGeometry(props) {
-  const {
-    indices,
-    attributes
-  } = tesselateTruncatedCone(props);
-  return {
-    length: indices.length,
-    indices,
-    attributes
-  };
-}
 export class TruncatedConeGeometry extends Geometry {
-  constructor(props = {}) {
+  constructor() {
+    let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     const {
       id = uid('truncated-code-geometry')
     } = props;
@@ -25,8 +15,10 @@ export class TruncatedConeGeometry extends Geometry {
       indices,
       attributes
     } = tesselateTruncatedCone(props);
-    super({ ...props,
+    super({
+      ...props,
       id,
+      topology: 'triangle-list',
       indices,
       attributes: {
         POSITION: {
@@ -45,10 +37,9 @@ export class TruncatedConeGeometry extends Geometry {
       }
     });
   }
-
 }
-
-function tesselateTruncatedCone(props = {}) {
+function tesselateTruncatedCone() {
+  let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   const {
     bottomRadius = 0,
     topRadius = 0,
@@ -77,12 +68,10 @@ function tesselateTruncatedCone(props = {}) {
   const texCoords = new Float32Array(numVertices * 2);
   let i3 = 0;
   let i2 = 0;
-
   for (let i = start; i <= end; i++) {
     let v = i / nvertical;
     let y = height * v;
     let ringRadius;
-
     if (i < 0) {
       y = 0;
       v = 1;
@@ -94,14 +83,11 @@ function tesselateTruncatedCone(props = {}) {
     } else {
       ringRadius = bottomRadius + (topRadius - bottomRadius) * (i / nvertical);
     }
-
     if (i === -2 || i === nvertical + 2) {
       ringRadius = 0;
       v = 0;
     }
-
     y -= height / 2;
-
     for (let j = 0; j < vertsAroundEdge; j++) {
       const sin = msin(j * mpi * 2 / nradial);
       const cos = mcos(j * mpi * 2 / nradial);
@@ -117,7 +103,6 @@ function tesselateTruncatedCone(props = {}) {
       i3 += 3;
     }
   }
-
   for (let i = 0; i < nvertical + extra; i++) {
     for (let j = 0; j < nradial; j++) {
       const index = (i * nradial + j) * 6;
@@ -129,7 +114,6 @@ function tesselateTruncatedCone(props = {}) {
       indices[index + 5] = vertsAroundEdge * (i + 1) + 0 + j;
     }
   }
-
   return {
     indices,
     attributes: {

package/dist/geometries/truncated-cone-geometry.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/geometries/truncated-cone-geometry.ts"],"names":["uid","Geometry","INDEX_OFFSETS","x","y","z","makeTruncatedConeGeometry","props","indices","attributes","tesselateTruncatedCone","length","TruncatedConeGeometry","constructor","id","POSITION","size","value","NORMAL","TEXCOORD_0","bottomRadius","topRadius","height","nradial","nvertical","verticalAxis","topCap","bottomCap","extra","numVertices","slant","Math","atan2","msin","sin","mcos","cos","mpi","PI","cosSlant","sinSlant","start","end","vertsAroundEdge","Uint16Array","indexOffset","positions","Float32Array","normals","texCoords","i3","i2","i","v","ringRadius","j","index"],"mappings":"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","sourcesContent":["import {uid} from '@luma.gl/api';\nimport Geometry from '../geometry/geometry';\nimport {GeometryTable} from '../geometry/geometry-table';\n\nconst INDEX_OFFSETS = {\n  x: [2, 0, 1],\n  y: [0, 1, 2],\n  z: [1, 2, 0]\n};\n\nexport type TruncatedConeGeometryProps = {\n  topRadius?: number;\n  bottomRadius?: number;\n  topCap?: boolean;\n  bottomCap?: boolean;\n  height?: number;\n  nradial?: number;\n  nvertical?: number;\n  verticalAxis?: 'x' | 'y' | 'z';\n};\n\n/**\n * Primitives inspired by TDL http://code.google.com/p/webglsamples/,\n * copyright 2011 Google Inc. new BSD License\n * (http://www.opensource.org/licenses/bsd-license.php).\n */\nexport function makeTruncatedConeGeometry(props?: TruncatedConeGeometryProps): GeometryTable {\n  const {indices, attributes} = tesselateTruncatedCone(props);\n  return {\n    length: indices.length,\n    indices,\n    attributes\n  };\n}\n\nexport class TruncatedConeGeometry extends Geometry {\n  constructor(props: TruncatedConeGeometryProps & {id?: string; attributes?} = {}) {\n    const {id = uid('truncated-code-geometry')} = props;\n    const {indices, attributes} = tesselateTruncatedCone(props);\n    super({\n      ...props,\n      id,\n      indices,\n      attributes: {\n        POSITION: {size: 3, value: attributes.POSITION},\n        NORMAL: {size: 3, value: attributes.NORMAL},\n        TEXCOORD_0: {size: 2, value: attributes.TEXCOORD_0},\n        ...props.attributes}\n    });\n  }\n}\n\n/* eslint-disable max-statements, complexity */\nfunction tesselateTruncatedCone(props: TruncatedConeGeometryProps = {}) {\n  const {\n    bottomRadius = 0,\n    topRadius = 0,\n    height = 1,\n    nradial = 10,\n    nvertical = 10,\n    verticalAxis = 'y',\n    topCap = false,\n    bottomCap = false\n  } = props;\n\n  const extra = (topCap ? 2 : 0) + (bottomCap ? 2 : 0);\n  const numVertices = (nradial + 1) * (nvertical + 1 + extra);\n\n  const slant = Math.atan2(bottomRadius - topRadius, height);\n  const msin = Math.sin;\n  const mcos = Math.cos;\n  const mpi = Math.PI;\n  const cosSlant = mcos(slant);\n  const sinSlant = msin(slant);\n  const start = topCap ? -2 : 0;\n  const end = nvertical + (bottomCap ? 2 : 0);\n  const vertsAroundEdge = nradial + 1;\n\n  const indices = new Uint16Array(nradial * (nvertical + extra) * 6);\n  const indexOffset = INDEX_OFFSETS[verticalAxis];\n\n  const positions = new Float32Array(numVertices * 3);\n  const normals = new Float32Array(numVertices * 3);\n  const texCoords = new Float32Array(numVertices * 2);\n\n  let i3 = 0;\n  let i2 = 0;\n  for (let i = start; i <= end; i++) {\n    let v = i / nvertical;\n    let y = height * v;\n    let ringRadius;\n\n    if (i < 0) {\n      y = 0;\n      v = 1;\n      ringRadius = bottomRadius;\n    } else if (i > nvertical) {\n      y = height;\n      v = 1;\n      ringRadius = topRadius;\n    } else {\n      ringRadius = bottomRadius + (topRadius - bottomRadius) * (i / nvertical);\n    }\n    if (i === -2 || i === nvertical + 2) {\n      ringRadius = 0;\n      v = 0;\n    }\n    y -= height / 2;\n    for (let j = 0; j < vertsAroundEdge; j++) {\n      const sin = msin((j * mpi * 2) / nradial);\n      const cos = mcos((j * mpi * 2) / nradial);\n\n      positions[i3 + indexOffset[0]] = sin * ringRadius;\n      positions[i3 + indexOffset[1]] = y;\n      positions[i3 + indexOffset[2]] = cos * ringRadius;\n\n      normals[i3 + indexOffset[0]] = i < 0 || i > nvertical ? 0 : sin * cosSlant;\n      normals[i3 + indexOffset[1]] = i < 0 ? -1 : i > nvertical ? 1 : sinSlant;\n      normals[i3 + indexOffset[2]] = i < 0 || i > nvertical ? 0 : cos * cosSlant;\n\n      texCoords[i2 + 0] = j / nradial;\n      texCoords[i2 + 1] = v;\n\n      i2 += 2;\n      i3 += 3;\n    }\n  }\n\n  for (let i = 0; i < nvertical + extra; i++) {\n    for (let j = 0; j < nradial; j++) {\n      const index = (i * nradial + j) * 6;\n      indices[index + 0] = vertsAroundEdge * (i + 0) + 0 + j;\n      indices[index + 1] = vertsAroundEdge * (i + 0) + 1 + j;\n      indices[index + 2] = vertsAroundEdge * (i + 1) + 1 + j;\n      indices[index + 3] = vertsAroundEdge * (i + 0) + 0 + j;\n      indices[index + 4] = vertsAroundEdge * (i + 1) + 1 + j;\n      indices[index + 5] = vertsAroundEdge * (i + 1) + 0 + j;\n    }\n  }\n\n  return {\n    indices,\n    attributes: {\n      POSITION: positions,\n      NORMAL: normals,\n      TEXCOORD_0: texCoords\n    }\n  };\n}\n"],"file":"truncated-cone-geometry.js"}
+{"version":3,"file":"truncated-cone-geometry.js","names":["uid","Geometry","INDEX_OFFSETS","x","y","z","TruncatedConeGeometry","constructor","props","arguments","length","undefined","id","indices","attributes","tesselateTruncatedCone","topology","POSITION","size","value","NORMAL","TEXCOORD_0","bottomRadius","topRadius","height","nradial","nvertical","verticalAxis","topCap","bottomCap","extra","numVertices","slant","Math","atan2","msin","sin","mcos","cos","mpi","PI","cosSlant","sinSlant","start","end","vertsAroundEdge","Uint16Array","indexOffset","positions","Float32Array","normals","texCoords","i3","i2","i","v","ringRadius","j","index"],"sources":["../../src/geometries/truncated-cone-geometry.ts"],"sourcesContent":["import {uid} from '@luma.gl/core';\nimport {Geometry} from '../geometry/geometry';\n\nconst INDEX_OFFSETS = {\n  x: [2, 0, 1],\n  y: [0, 1, 2],\n  z: [1, 2, 0]\n};\n\nexport type TruncatedConeGeometryProps = {\n  topRadius?: number;\n  bottomRadius?: number;\n  topCap?: boolean;\n  bottomCap?: boolean;\n  height?: number;\n  nradial?: number;\n  nvertical?: number;\n  verticalAxis?: 'x' | 'y' | 'z';\n};\n\n/**\n * Primitives inspired by TDL http://code.google.com/p/webglsamples/,\n * copyright 2011 Google Inc. new BSD License\n * (http://www.opensource.org/licenses/bsd-license.php).\n */\nexport class TruncatedConeGeometry extends Geometry {\n  constructor(props: TruncatedConeGeometryProps & {id?: string; attributes?: any} = {}) {\n    const {id = uid('truncated-code-geometry')} = props;\n    const {indices, attributes} = tesselateTruncatedCone(props);\n    super({\n      ...props,\n      id,\n      topology: 'triangle-list',\n      indices,\n      attributes: {\n        POSITION: {size: 3, value: attributes.POSITION},\n        NORMAL: {size: 3, value: attributes.NORMAL},\n        TEXCOORD_0: {size: 2, value: attributes.TEXCOORD_0},\n        ...props.attributes}\n    });\n  }\n}\n\n/* eslint-disable max-statements, complexity */\nfunction tesselateTruncatedCone(props: TruncatedConeGeometryProps = {}) {\n  const {\n    bottomRadius = 0,\n    topRadius = 0,\n    height = 1,\n    nradial = 10,\n    nvertical = 10,\n    verticalAxis = 'y',\n    topCap = false,\n    bottomCap = false\n  } = props;\n\n  const extra = (topCap ? 2 : 0) + (bottomCap ? 2 : 0);\n  const numVertices = (nradial + 1) * (nvertical + 1 + extra);\n\n  const slant = Math.atan2(bottomRadius - topRadius, height);\n  const msin = Math.sin;\n  const mcos = Math.cos;\n  const mpi = Math.PI;\n  const cosSlant = mcos(slant);\n  const sinSlant = msin(slant);\n  const start = topCap ? -2 : 0;\n  const end = nvertical + (bottomCap ? 2 : 0);\n  const vertsAroundEdge = nradial + 1;\n\n  const indices = new Uint16Array(nradial * (nvertical + extra) * 6);\n  const indexOffset = INDEX_OFFSETS[verticalAxis];\n\n  const positions = new Float32Array(numVertices * 3);\n  const normals = new Float32Array(numVertices * 3);\n  const texCoords = new Float32Array(numVertices * 2);\n\n  let i3 = 0;\n  let i2 = 0;\n  for (let i = start; i <= end; i++) {\n    let v = i / nvertical;\n    let y = height * v;\n    let ringRadius;\n\n    if (i < 0) {\n      y = 0;\n      v = 1;\n      ringRadius = bottomRadius;\n    } else if (i > nvertical) {\n      y = height;\n      v = 1;\n      ringRadius = topRadius;\n    } else {\n      ringRadius = bottomRadius + (topRadius - bottomRadius) * (i / nvertical);\n    }\n    if (i === -2 || i === nvertical + 2) {\n      ringRadius = 0;\n      v = 0;\n    }\n    y -= height / 2;\n    for (let j = 0; j < vertsAroundEdge; j++) {\n      const sin = msin((j * mpi * 2) / nradial);\n      const cos = mcos((j * mpi * 2) / nradial);\n\n      positions[i3 + indexOffset[0]] = sin * ringRadius;\n      positions[i3 + indexOffset[1]] = y;\n      positions[i3 + indexOffset[2]] = cos * ringRadius;\n\n      normals[i3 + indexOffset[0]] = i < 0 || i > nvertical ? 0 : sin * cosSlant;\n      normals[i3 + indexOffset[1]] = i < 0 ? -1 : i > nvertical ? 1 : sinSlant;\n      normals[i3 + indexOffset[2]] = i < 0 || i > nvertical ? 0 : cos * cosSlant;\n\n      texCoords[i2 + 0] = j / nradial;\n      texCoords[i2 + 1] = v;\n\n      i2 += 2;\n      i3 += 3;\n    }\n  }\n\n  for (let i = 0; i < nvertical + extra; i++) {\n    for (let j = 0; j < nradial; j++) {\n      const index = (i * nradial + j) * 6;\n      indices[index + 0] = vertsAroundEdge * (i + 0) + 0 + j;\n      indices[index + 1] = vertsAroundEdge * (i + 0) + 1 + j;\n      indices[index + 2] = vertsAroundEdge * (i + 1) + 1 + j;\n      indices[index + 3] = vertsAroundEdge * (i + 0) + 0 + j;\n      indices[index + 4] = vertsAroundEdge * (i + 1) + 1 + j;\n      indices[index + 5] = vertsAroundEdge * (i + 1) + 0 + j;\n    }\n  }\n\n  return {\n    indices,\n    attributes: {\n      POSITION: positions,\n      NORMAL: normals,\n      TEXCOORD_0: texCoords\n    }\n  };\n}\n"],"mappings":"AAAA,SAAQA,GAAG,QAAO,eAAe;AAAC,SAC1BC,QAAQ;AAEhB,MAAMC,aAAa,GAAG;EACpBC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;EACZC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;EACZC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;AACb,CAAC;AAkBD,OAAO,MAAMC,qBAAqB,SAASL,QAAQ,CAAC;EAClDM,WAAWA,CAAA,EAA2E;IAAA,IAA1EC,KAAmE,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;IAClF,MAAM;MAACG,EAAE,GAAGZ,GAAG,CAAC,yBAAyB;IAAC,CAAC,GAAGQ,KAAK;IACnD,MAAM;MAACK,OAAO;MAAEC;IAAU,CAAC,GAAGC,sBAAsB,CAACP,KAAK,CAAC;IAC3D,KAAK,CAAC;MACJ,GAAGA,KAAK;MACRI,EAAE;MACFI,QAAQ,EAAE,eAAe;MACzBH,OAAO;MACPC,UAAU,EAAE;QACVG,QAAQ,EAAE;UAACC,IAAI,EAAE,CAAC;UAAEC,KAAK,EAAEL,UAAU,CAACG;QAAQ,CAAC;QAC/CG,MAAM,EAAE;UAACF,IAAI,EAAE,CAAC;UAAEC,KAAK,EAAEL,UAAU,CAACM;QAAM,CAAC;QAC3CC,UAAU,EAAE;UAACH,IAAI,EAAE,CAAC;UAAEC,KAAK,EAAEL,UAAU,CAACO;QAAU,CAAC;QACnD,GAAGb,KAAK,CAACM;MAAU;IACvB,CAAC,CAAC;EACJ;AACF;AAGA,SAASC,sBAAsBA,CAAA,EAAyC;EAAA,IAAxCP,KAAiC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EACpE,MAAM;IACJa,YAAY,GAAG,CAAC;IAChBC,SAAS,GAAG,CAAC;IACbC,MAAM,GAAG,CAAC;IACVC,OAAO,GAAG,EAAE;IACZC,SAAS,GAAG,EAAE;IACdC,YAAY,GAAG,GAAG;IAClBC,MAAM,GAAG,KAAK;IACdC,SAAS,GAAG;EACd,CAAC,GAAGrB,KAAK;EAET,MAAMsB,KAAK,GAAG,CAACF,MAAM,GAAG,CAAC,GAAG,CAAC,KAAKC,SAAS,GAAG,CAAC,GAAG,CAAC,CAAC;EACpD,MAAME,WAAW,GAAG,CAACN,OAAO,GAAG,CAAC,KAAKC,SAAS,GAAG,CAAC,GAAGI,KAAK,CAAC;EAE3D,MAAME,KAAK,GAAGC,IAAI,CAACC,KAAK,CAACZ,YAAY,GAAGC,SAAS,EAAEC,MAAM,CAAC;EAC1D,MAAMW,IAAI,GAAGF,IAAI,CAACG,GAAG;EACrB,MAAMC,IAAI,GAAGJ,IAAI,CAACK,GAAG;EACrB,MAAMC,GAAG,GAAGN,IAAI,CAACO,EAAE;EACnB,MAAMC,QAAQ,GAAGJ,IAAI,CAACL,KAAK,CAAC;EAC5B,MAAMU,QAAQ,GAAGP,IAAI,CAACH,KAAK,CAAC;EAC5B,MAAMW,KAAK,GAAGf,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC;EAC7B,MAAMgB,GAAG,GAAGlB,SAAS,IAAIG,SAAS,GAAG,CAAC,GAAG,CAAC,CAAC;EAC3C,MAAMgB,eAAe,GAAGpB,OAAO,GAAG,CAAC;EAEnC,MAAMZ,OAAO,GAAG,IAAIiC,WAAW,CAACrB,OAAO,IAAIC,SAAS,GAAGI,KAAK,CAAC,GAAG,CAAC,CAAC;EAClE,MAAMiB,WAAW,GAAG7C,aAAa,CAACyB,YAAY,CAAC;EAE/C,MAAMqB,SAAS,GAAG,IAAIC,YAAY,CAAClB,WAAW,GAAG,CAAC,CAAC;EACnD,MAAMmB,OAAO,GAAG,IAAID,YAAY,CAAClB,WAAW,GAAG,CAAC,CAAC;EACjD,MAAMoB,SAAS,GAAG,IAAIF,YAAY,CAAClB,WAAW,GAAG,CAAC,CAAC;EAEnD,IAAIqB,EAAE,GAAG,CAAC;EACV,IAAIC,EAAE,GAAG,CAAC;EACV,KAAK,IAAIC,CAAC,GAAGX,KAAK,EAAEW,CAAC,IAAIV,GAAG,EAAEU,CAAC,EAAE,EAAE;IACjC,IAAIC,CAAC,GAAGD,CAAC,GAAG5B,SAAS;IACrB,IAAItB,CAAC,GAAGoB,MAAM,GAAG+B,CAAC;IAClB,IAAIC,UAAU;IAEd,IAAIF,CAAC,GAAG,CAAC,EAAE;MACTlD,CAAC,GAAG,CAAC;MACLmD,CAAC,GAAG,CAAC;MACLC,UAAU,GAAGlC,YAAY;IAC3B,CAAC,MAAM,IAAIgC,CAAC,GAAG5B,SAAS,EAAE;MACxBtB,CAAC,GAAGoB,MAAM;MACV+B,CAAC,GAAG,CAAC;MACLC,UAAU,GAAGjC,SAAS;IACxB,CAAC,MAAM;MACLiC,UAAU,GAAGlC,YAAY,GAAG,CAACC,SAAS,GAAGD,YAAY,KAAKgC,CAAC,GAAG5B,SAAS,CAAC;IAC1E;IACA,IAAI4B,CAAC,KAAK,CAAC,CAAC,IAAIA,CAAC,KAAK5B,SAAS,GAAG,CAAC,EAAE;MACnC8B,UAAU,GAAG,CAAC;MACdD,CAAC,GAAG,CAAC;IACP;IACAnD,CAAC,IAAIoB,MAAM,GAAG,CAAC;IACf,KAAK,IAAIiC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGZ,eAAe,EAAEY,CAAC,EAAE,EAAE;MACxC,MAAMrB,GAAG,GAAGD,IAAI,CAAEsB,CAAC,GAAGlB,GAAG,GAAG,CAAC,GAAId,OAAO,CAAC;MACzC,MAAMa,GAAG,GAAGD,IAAI,CAAEoB,CAAC,GAAGlB,GAAG,GAAG,CAAC,GAAId,OAAO,CAAC;MAEzCuB,SAAS,CAACI,EAAE,GAAGL,WAAW,CAAC,CAAC,CAAC,CAAC,GAAGX,GAAG,GAAGoB,UAAU;MACjDR,SAAS,CAACI,EAAE,GAAGL,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG3C,CAAC;MAClC4C,SAAS,CAACI,EAAE,GAAGL,WAAW,CAAC,CAAC,CAAC,CAAC,GAAGT,GAAG,GAAGkB,UAAU;MAEjDN,OAAO,CAACE,EAAE,GAAGL,WAAW,CAAC,CAAC,CAAC,CAAC,GAAGO,CAAC,GAAG,CAAC,IAAIA,CAAC,GAAG5B,SAAS,GAAG,CAAC,GAAGU,GAAG,GAAGK,QAAQ;MAC1ES,OAAO,CAACE,EAAE,GAAGL,WAAW,CAAC,CAAC,CAAC,CAAC,GAAGO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAGA,CAAC,GAAG5B,SAAS,GAAG,CAAC,GAAGgB,QAAQ;MACxEQ,OAAO,CAACE,EAAE,GAAGL,WAAW,CAAC,CAAC,CAAC,CAAC,GAAGO,CAAC,GAAG,CAAC,IAAIA,CAAC,GAAG5B,SAAS,GAAG,CAAC,GAAGY,GAAG,GAAGG,QAAQ;MAE1EU,SAAS,CAACE,EAAE,GAAG,CAAC,CAAC,GAAGI,CAAC,GAAGhC,OAAO;MAC/B0B,SAAS,CAACE,EAAE,GAAG,CAAC,CAAC,GAAGE,CAAC;MAErBF,EAAE,IAAI,CAAC;MACPD,EAAE,IAAI,CAAC;IACT;EACF;EAEA,KAAK,IAAIE,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAG5B,SAAS,GAAGI,KAAK,EAAEwB,CAAC,EAAE,EAAE;IAC1C,KAAK,IAAIG,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGhC,OAAO,EAAEgC,CAAC,EAAE,EAAE;MAChC,MAAMC,KAAK,GAAG,CAACJ,CAAC,GAAG7B,OAAO,GAAGgC,CAAC,IAAI,CAAC;MACnC5C,OAAO,CAAC6C,KAAK,GAAG,CAAC,CAAC,GAAGb,eAAe,IAAIS,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAGG,CAAC;MACtD5C,OAAO,CAAC6C,KAAK,GAAG,CAAC,CAAC,GAAGb,eAAe,IAAIS,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAGG,CAAC;MACtD5C,OAAO,CAAC6C,KAAK,GAAG,CAAC,CAAC,GAAGb,eAAe,IAAIS,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAGG,CAAC;MACtD5C,OAAO,CAAC6C,KAAK,GAAG,CAAC,CAAC,GAAGb,eAAe,IAAIS,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAGG,CAAC;MACtD5C,OAAO,CAAC6C,KAAK,GAAG,CAAC,CAAC,GAAGb,eAAe,IAAIS,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAGG,CAAC;MACtD5C,OAAO,CAAC6C,KAAK,GAAG,CAAC,CAAC,GAAGb,eAAe,IAAIS,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAGG,CAAC;IACxD;EACF;EAEA,OAAO;IACL5C,OAAO;IACPC,UAAU,EAAE;MACVG,QAAQ,EAAE+B,SAAS;MACnB5B,MAAM,EAAE8B,OAAO;MACf7B,UAAU,EAAE8B;IACd;EACF,CAAC;AACH"}

package/dist/geometry/geometry-table.d.ts

@@ -1,6 +1,6 @@
-import type { TypedArray, VertexFormat } from '@luma.gl/api';
+import type { TypedArray, VertexFormat } from '@luma.gl/core';
 /** Holds one geometry */
-export declare type GeometryTable = {
+export type GeometryTable = {
     length: number;
     schema?: Record<string, VertexFormat>;
     attributes: {

package/dist/geometry/geometry-table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometry-table.d.ts","sourceRoot":"","sources":["../../src/geometry/geometry-table.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,UAAU,EAAE,YAAY,EAAC,MAAM,cAAc,CAAC;AAE3D,yBAAyB;AACzB,oBAAY,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACtC,UAAU,EAAE;QACV,QAAQ,EAAE,UAAU,CAAC;QACrB,MAAM,EAAE,UAAU,CAAC;QACnB,UAAU,EAAE,UAAU,CAAC;QACvB,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAC;KAC3B,CAAC;IACF,OAAO,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC;IACpC,QAAQ,CAAC,EAAE,YAAY,GAAG,WAAW,GAAG,YAAY,GAAG,eAAe,GAAG,gBAAgB,CAAC;CAC3F,CAAA"}
+{"version":3,"file":"geometry-table.d.ts","sourceRoot":"","sources":["../../src/geometry/geometry-table.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,UAAU,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAE5D,yBAAyB;AACzB,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACtC,UAAU,EAAE;QACV,QAAQ,EAAE,UAAU,CAAC;QACrB,MAAM,EAAE,UAAU,CAAC;QACnB,UAAU,EAAE,UAAU,CAAC;QACvB,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAC;KAC3B,CAAC;IACF,OAAO,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC;IACpC,QAAQ,CAAC,EAAE,YAAY,GAAG,WAAW,GAAG,YAAY,GAAG,eAAe,GAAG,gBAAgB,CAAC;CAC3F,CAAA"}

package/dist/geometry/geometry-table.js.map

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","sourcesContent":[],"file":"geometry-table.js"}
+{"version":3,"file":"geometry-table.js","names":[],"sources":["../../src/geometry/geometry-table.ts"],"sourcesContent":["// luma.gl, MIT license\nimport type {TypedArray, VertexFormat} from '@luma.gl/core';\n\n/** Holds one geometry */\nexport type GeometryTable = {\n  length: number;\n  schema?: Record<string, VertexFormat>;\n  attributes: {\n    POSITION: TypedArray,\n    NORMAL: TypedArray,\n    TEXCOORD_0: TypedArray,\n    [key: string]: TypedArray,\n  };\n  indices?: Uint16Array | Uint32Array;\n  topology?: 'point-list' | 'line-list' | 'line-strip' | 'triangle-list' | 'triangle-strip';\n}\n"],"mappings":""}

package/dist/geometry/geometry-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometry-utils.d.ts","sourceRoot":"","sources":["../../src/geometry/geometry-utils.ts"],"names":[],"mappings":"AAEA,wBAAgB,qBAAqB,CAAC,QAAQ,KAAA,OA4B7C"}
+{"version":3,"file":"geometry-utils.d.ts","sourceRoot":"","sources":["../../src/geometry/geometry-utils.ts"],"names":[],"mappings":"AAEA,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,GAAG,OA4BlD"}

package/dist/geometry/geometry-utils.js

@@ -3,14 +3,11 @@ export function unpackIndexedGeometry(geometry) {
     indices,
     attributes
   } = geometry;
-
   if (!indices) {
     return geometry;
   }
-
   const vertexCount = indices.value.length;
   const unpackedAttributes = {};
-
   for (const attributeName in attributes) {
     const attribute = attributes[attributeName];
     const {
@@ -18,27 +15,21 @@ export function unpackIndexedGeometry(geometry) {
       value,
       size
     } = attribute;
-
     if (constant || !size) {
       continue;
     }
-
     const unpackedValue = new value.constructor(vertexCount * size);
-
     for (let x = 0; x < vertexCount; ++x) {
       const index = indices.value[x];
-
       for (let i = 0; i < size; i++) {
         unpackedValue[x * size + i] = value[index * size + i];
       }
     }
-
     unpackedAttributes[attributeName] = {
       size,
       value: unpackedValue
     };
   }
-
   return {
     attributes: Object.assign({}, attributes, unpackedAttributes)
   };

package/dist/geometry/geometry-utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/geometry/geometry-utils.ts"],"names":["unpackIndexedGeometry","geometry","indices","attributes","vertexCount","value","length","unpackedAttributes","attributeName","attribute","constant","size","unpackedValue","constructor","x","index","i","Object","assign"],"mappings":"AAEA,OAAO,SAASA,qBAAT,CAA+BC,QAA/B,EAAyC;AAC9C,QAAM;AAACC,IAAAA,OAAD;AAAUC,IAAAA;AAAV,MAAwBF,QAA9B;;AACA,MAAI,CAACC,OAAL,EAAc;AACZ,WAAOD,QAAP;AACD;;AAED,QAAMG,WAAW,GAAGF,OAAO,CAACG,KAAR,CAAcC,MAAlC;AACA,QAAMC,kBAAkB,GAAG,EAA3B;;AAEA,OAAK,MAAMC,aAAX,IAA4BL,UAA5B,EAAwC;AACtC,UAAMM,SAAS,GAAGN,UAAU,CAACK,aAAD,CAA5B;AACA,UAAM;AAACE,MAAAA,QAAD;AAAWL,MAAAA,KAAX;AAAkBM,MAAAA;AAAlB,QAA0BF,SAAhC;;AACA,QAAIC,QAAQ,IAAI,CAACC,IAAjB,EAAuB;AACrB;AACD;;AACD,UAAMC,aAAa,GAAG,IAAIP,KAAK,CAACQ,WAAV,CAAsBT,WAAW,GAAGO,IAApC,CAAtB;;AACA,SAAK,IAAIG,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGV,WAApB,EAAiC,EAAEU,CAAnC,EAAsC;AACpC,YAAMC,KAAK,GAAGb,OAAO,CAACG,KAAR,CAAcS,CAAd,CAAd;;AACA,WAAK,IAAIE,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGL,IAApB,EAA0BK,CAAC,EAA3B,EAA+B;AAC7BJ,QAAAA,aAAa,CAACE,CAAC,GAAGH,IAAJ,GAAWK,CAAZ,CAAb,GAA8BX,KAAK,CAACU,KAAK,GAAGJ,IAAR,GAAeK,CAAhB,CAAnC;AACD;AACF;;AACDT,IAAAA,kBAAkB,CAACC,aAAD,CAAlB,GAAoC;AAACG,MAAAA,IAAD;AAAON,MAAAA,KAAK,EAAEO;AAAd,KAApC;AACD;;AAED,SAAO;AACLT,IAAAA,UAAU,EAAEc,MAAM,CAACC,MAAP,CAAc,EAAd,EAAkBf,UAAlB,EAA8BI,kBAA9B;AADP,GAAP;AAGD","sourcesContent":["// import type Geometry from './geometry';\n\nexport function unpackIndexedGeometry(geometry) {\n  const {indices, attributes} = geometry;\n  if (!indices) {\n    return geometry;\n  }\n\n  const vertexCount = indices.value.length;\n  const unpackedAttributes = {};\n\n  for (const attributeName in attributes) {\n    const attribute = attributes[attributeName];\n    const {constant, value, size} = attribute;\n    if (constant || !size) {\n      continue; // eslint-disable-line\n    }\n    const unpackedValue = new value.constructor(vertexCount * size);\n    for (let x = 0; x < vertexCount; ++x) {\n      const index = indices.value[x];\n      for (let i = 0; i < size; i++) {\n        unpackedValue[x * size + i] = value[index * size + i];\n      }\n    }\n    unpackedAttributes[attributeName] = {size, value: unpackedValue};\n  }\n\n  return {\n    attributes: Object.assign({}, attributes, unpackedAttributes)\n  };\n}\n"],"file":"geometry-utils.js"}
+{"version":3,"file":"geometry-utils.js","names":["unpackIndexedGeometry","geometry","indices","attributes","vertexCount","value","length","unpackedAttributes","attributeName","attribute","constant","size","unpackedValue","constructor","x","index","i","Object","assign"],"sources":["../../src/geometry/geometry-utils.ts"],"sourcesContent":["// import type {Geometry} from './geometry';\n\nexport function unpackIndexedGeometry(geometry: any) {\n  const {indices, attributes} = geometry;\n  if (!indices) {\n    return geometry;\n  }\n\n  const vertexCount = indices.value.length;\n  const unpackedAttributes: Record<string, any> = {};\n\n  for (const attributeName in attributes) {\n    const attribute = attributes[attributeName];\n    const {constant, value, size} = attribute;\n    if (constant || !size) {\n      continue; // eslint-disable-line\n    }\n    const unpackedValue = new value.constructor(vertexCount * size);\n    for (let x = 0; x < vertexCount; ++x) {\n      const index = indices.value[x];\n      for (let i = 0; i < size; i++) {\n        unpackedValue[x * size + i] = value[index * size + i];\n      }\n    }\n    unpackedAttributes[attributeName] = {size, value: unpackedValue};\n  }\n\n  return {\n    attributes: Object.assign({}, attributes, unpackedAttributes)\n  };\n}\n"],"mappings":"AAEA,OAAO,SAASA,qBAAqBA,CAACC,QAAa,EAAE;EACnD,MAAM;IAACC,OAAO;IAAEC;EAAU,CAAC,GAAGF,QAAQ;EACtC,IAAI,CAACC,OAAO,EAAE;IACZ,OAAOD,QAAQ;EACjB;EAEA,MAAMG,WAAW,GAAGF,OAAO,CAACG,KAAK,CAACC,MAAM;EACxC,MAAMC,kBAAuC,GAAG,CAAC,CAAC;EAElD,KAAK,MAAMC,aAAa,IAAIL,UAAU,EAAE;IACtC,MAAMM,SAAS,GAAGN,UAAU,CAACK,aAAa,CAAC;IAC3C,MAAM;MAACE,QAAQ;MAAEL,KAAK;MAAEM;IAAI,CAAC,GAAGF,SAAS;IACzC,IAAIC,QAAQ,IAAI,CAACC,IAAI,EAAE;MACrB;IACF;IACA,MAAMC,aAAa,GAAG,IAAIP,KAAK,CAACQ,WAAW,CAACT,WAAW,GAAGO,IAAI,CAAC;IAC/D,KAAK,IAAIG,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGV,WAAW,EAAE,EAAEU,CAAC,EAAE;MACpC,MAAMC,KAAK,GAAGb,OAAO,CAACG,KAAK,CAACS,CAAC,CAAC;MAC9B,KAAK,IAAIE,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGL,IAAI,EAAEK,CAAC,EAAE,EAAE;QAC7BJ,aAAa,CAACE,CAAC,GAAGH,IAAI,GAAGK,CAAC,CAAC,GAAGX,KAAK,CAACU,KAAK,GAAGJ,IAAI,GAAGK,CAAC,CAAC;MACvD;IACF;IACAT,kBAAkB,CAACC,aAAa,CAAC,GAAG;MAACG,IAAI;MAAEN,KAAK,EAAEO;IAAa,CAAC;EAClE;EAEA,OAAO;IACLT,UAAU,EAAEc,MAAM,CAACC,MAAM,CAAC,CAAC,CAAC,EAAEf,UAAU,EAAEI,kBAAkB;EAC9D,CAAC;AACH"}

package/dist/geometry/geometry.d.ts

@@ -1,71 +1,62 @@
-import type { TypedArray } from '@luma.gl/api';
-import GL from '@luma.gl/constants';
-/**
- * Rendering primitives - "topology" specifies how to extract primitives from vertices.
- */
-export declare type Topology = 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;
-export declare type GeometryProps = {
+import type { PrimitiveTopology, TypedArray } from '@luma.gl/core';
+export type GeometryProps = {
     id?: string;
-    attributes?: {};
-    indices?: any;
-    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;
+    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;
 };
-export default class Geometry {
-    /** @deprecated */
-    static DRAW_MODE: {
-        POINTS: GL;
-        LINES: GL;
-        LINE_LOOP: GL;
-        LINE_STRIP: GL;
-        TRIANGLES: GL;
-        TRIANGLE_STRIP: GL;
-        TRIANGLE_FAN: GL;
+export type GeometryAttributes = {
+    POSITION: GeometryAttribute;
+    NORMAL: GeometryAttribute;
+    TEXCOORD_0: GeometryAttribute;
+    COLOR_0?: GeometryAttribute;
+    indices?: GeometryAttribute & {
+        size: 1;
+        value: Uint32Array | Uint16Array;
     };
+};
+export type GeometryAttribute = {
+    size?: number;
+    value: TypedArray;
+    [key: string]: any;
+};
+export declare 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;
+    readonly topology?: PrimitiveTopology;
     readonly vertexCount: number;
+    readonly indices?: GeometryAttribute;
     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;
-        };
+        POSITION: GeometryAttribute;
+        NORMAL: GeometryAttribute;
+        TEXCOORD_0: GeometryAttribute;
+        COLOR_0?: GeometryAttribute;
+        [key: string]: GeometryAttribute | undefined;
     };
-    readonly indices?: Uint16Array | Uint32Array;
-    constructor(props?: GeometryProps);
-    get mode(): Topology;
+    userData: Record<string, unknown>;
+    constructor(props: GeometryProps);
     getVertexCount(): number;
-    _print(attributeName: any): string;
-    _setAttributes(attributes: any, indices: any): this;
-    _calculateVertexCount(attributes: any, indices: any): number;
+    /**
+     * Return an object with all attributes plus indices added as a field.
+     * TODO Geometry types are a mess
+     */
+    getAttributes(): GeometryAttributes;
+    _print(attributeName: string): string;
+    /**
+     * 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;
+    _calculateVertexCount(attributes: GeometryAttributes, indices: GeometryAttribute): number;
 }
 //# sourceMappingURL=geometry.d.ts.map

package/dist/geometry/geometry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometry.d.ts","sourceRoot":"","sources":["../../src/geometry/geometry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAEpC;;GAEG;AACH,oBAAY,QAAQ,GAClB,EAAE,CAAC,MAAM,GAAI,sBAAsB;AACnC,EAAE,CAAC,KAAK,GAAI,wDAAwD;AACpE,EAAE,CAAC,SAAS,GAAI,8EAA8E;AAC9F,EAAE,CAAC,UAAU,GAAI,4EAA4E;AAC7F,EAAE,CAAC,SAAS,GAAI,0EAA0E;AAC1F,EAAE,CAAC,cAAc,GAAI,uCAAuC;AAC5D,EAAE,CAAC,YAAY,CACd;AAEH,oBAAY,aAAa,GAAG;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,EAAE,CAAC;IAChB,OAAO,CAAC,MAAC;IACT,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oEAAoE;IACpE,QAAQ,CAAC,EAAE,YAAY,GAAG,WAAW,GAAG,YAAY,GAAG,eAAe,GAAG,gBAAgB,CAAC;IAC1F,kBAAkB;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AAUF,MAAM,CAAC,OAAO,OAAO,QAAQ;IAC3B,kBAAkB;IAClB,MAAM,CAAC,SAAS;;;;;;;;MAQd;IAEF,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEnC,oEAAoE;IACpE,QAAQ,CAAC,EAAE,YAAY,GAAG,WAAW,GAAG,YAAY,GAAG,eAAe,GAAG,gBAAgB,CAAC;IAC1F,kBAAkB;IAClB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAgB;IAE3C,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE;QACnB,QAAQ,EAAE;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,UAAU,CAAC;YAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SAAC,CAAC;QAChE,MAAM,EAAE;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,UAAU,CAAC;YAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SAAC,CAAC;QAC9D,UAAU,EAAE;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,UAAU,CAAC;YAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SAAC,CAAC;QAClE,OAAO,CAAC,EAAE;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,UAAU,CAAC;YAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SAAC,CAAC;KACjE,CAAC;IACF,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC;gBAEjC,KAAK,GAAE,aAAkB;IAkBrC,IAAI,IAAI,aAEP;IAED,cAAc,IAAI,MAAM;IAWxB,MAAM,CAAC,aAAa,KAAA,GAAG,MAAM;IAS7B,cAAc,CAAC,UAAU,KAAA,EAAE,OAAO,KAAA,GAAG,IAAI;IA6CzC,qBAAqB,CAAC,UAAU,KAAA,EAAE,OAAO,KAAA,GAAG,MAAM;CAgBnD"}
+{"version":3,"file":"geometry.d.ts","sourceRoot":"","sources":["../../src/geometry/geometry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,iBAAiB,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AAGjE,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,oEAAoE;IACpE,QAAQ,EACJ,YAAY,GACZ,WAAW,GACX,YAAY,GACZ,iBAAiB,GACjB,eAAe,GACf,gBAAgB,GAChB,oBAAoB,CAAC;IACzB,sDAAsD;IACtD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG,UAAU,CAAC,CAAC;IAC5D,OAAO,CAAC,EAAE,iBAAiB,GAAG,UAAU,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,MAAM,EAAE,iBAAiB,CAAC;IAC1B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B,OAAO,CAAC,EAAE,iBAAiB,GAAG;QAAC,IAAI,EAAE,CAAC,CAAC;QAAC,KAAK,EAAE,WAAW,GAAG,WAAW,CAAA;KAAC,CAAC;CAC3E,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,UAAU,CAAC;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAEF,qBAAa,QAAQ;IACnB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,oEAAoE;IACpE,QAAQ,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC;IACtC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,iBAAiB,CAAC;IACrC,QAAQ,CAAC,UAAU,EAAE;QACnB,QAAQ,EAAE,iBAAiB,CAAC;QAC5B,MAAM,EAAE,iBAAiB,CAAC;QAC1B,UAAU,EAAE,iBAAiB,CAAC;QAC9B,OAAO,CAAC,EAAE,iBAAiB,CAAC;QAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAAC;KAC9C,CAAC;IAEF,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;gBAE3B,KAAK,EAAE,aAAa;IA6ChC,cAAc,IAAI,MAAM;IAIxB;;;OAGG;IACH,aAAa,IAAI,kBAAkB;IAMnC,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;IAIrC;;;;;;;;;;OAUG;IACH,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI;IAIjF,qBAAqB,CAAC,UAAU,EAAE,kBAAkB,EAAE,OAAO,EAAE,iBAAiB,GAAG,MAAM;CAe1F"}