@luma.gl/engine 9.0.0-alpha.3 → 9.0.0-alpha.30

package/dist/index.d.ts

@@ -1,10 +1,21 @@
-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 type { AnimationLoopProps } from './lib/animation-loop';
-export { default as AnimationLoop } from './lib/animation-loop';
-export { default as Geometry } from './geometry/geometry';
+export { Timeline } from './animation/timeline';
+export { KeyFrames } from './animation/key-frames';
+export type { AnimationProps } from './animation-loop/animation-props';
+export { AnimationLoopTemplate } from './animation-loop/render-loop';
+export type { AnimationLoopProps } from './animation-loop/animation-loop';
+export { AnimationLoop } from './animation-loop/animation-loop';
+export type { MakeAnimationLoopProps } from './animation-loop/make-animation-loop';
+export { makeAnimationLoop } from './animation-loop/make-animation-loop';
+export type { ModelProps } from './model/model';
+export { Model } from './model/model';
+export { Transform } from './transform/transform';
+export { PipelineFactory } from './lib/pipeline-factory';
+export { ClipSpace } from './lib/clip-space';
+export { ScenegraphNode } from './scenegraph/scenegraph-node';
+export { GroupNode } from './scenegraph/group-node';
+export { ModelNode } from './scenegraph/model-node';
+export type { GeometryProps } from './geometry/geometry';
+export { Geometry } from './geometry/geometry';
 export type { ConeGeometryProps } from './geometries/cone-geometry';
 export { ConeGeometry } from './geometries/cone-geometry';
 export type { CubeGeometryProps } from './geometries/cube-geometry';
@@ -19,6 +30,4 @@ export type { SphereGeometryProps } from './geometries/sphere-geometry';
 export { SphereGeometry } from './geometries/sphere-geometry';
 export type { TruncatedConeGeometryProps } from './geometries/truncated-cone-geometry';
 export { TruncatedConeGeometry } from './geometries/truncated-cone-geometry';
-export { Timeline } from './animation/timeline';
-export { KeyFrames } from './animation/key-frames';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,YAAY,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAC7C,YAAY,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAC,OAAO,IAAI,KAAK,EAAC,MAAM,aAAa,CAAC;AAC7C,YAAY,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,sBAAsB,CAAC;AAM9D,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AAGxD,YAAY,EAAC,iBAAiB,EAAC,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACxD,YAAY,EAAC,iBAAiB,EAAC,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACxD,YAAY,EAAC,qBAAqB,EAAC,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAC,gBAAgB,EAAC,MAAM,gCAAgC,CAAC;AAChE,YAAY,EAAC,sBAAsB,EAAC,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAC;AACnE,YAAY,EAAC,kBAAkB,EAAC,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAC1D,YAAY,EAAC,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAC,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAC5D,YAAY,EAAC,0BAA0B,EAAC,MAAM,sCAAsC,CAAC;AACrF,OAAO,EAAC,qBAAqB,EAAC,MAAM,sCAAsC,CAAC;AAG3E,OAAO,EAAC,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAC;AACjD,YAAY,EAAC,cAAc,EAAC,MAAM,kCAAkC,CAAC;AAErE,OAAO,EAAC,qBAAqB,EAAC,MAAM,8BAA8B,CAAC;AAEnE,YAAY,EAAC,kBAAkB,EAAC,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAC,aAAa,EAAC,MAAM,iCAAiC,CAAC;AAE9D,YAAY,EAAC,sBAAsB,EAAC,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAC,iBAAiB,EAAC,MAAM,sCAAsC,CAAC;AAEvE,YAAY,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AAEpC,OAAO,EAAC,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAEhD,OAAO,EAAC,eAAe,EAAC,MAAM,wBAAwB,CAAC;AAGvD,OAAO,EAAC,SAAS,EAAC,MAAM,kBAAkB,CAAC;AAG3C,OAAO,EAAC,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAGlD,YAAY,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AAG7C,YAAY,EAAC,iBAAiB,EAAC,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACxD,YAAY,EAAC,iBAAiB,EAAC,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACxD,YAAY,EAAC,qBAAqB,EAAC,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAC,gBAAgB,EAAC,MAAM,gCAAgC,CAAC;AAChE,YAAY,EAAC,sBAAsB,EAAC,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAC;AACnE,YAAY,EAAC,kBAAkB,EAAC,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAC1D,YAAY,EAAC,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAC,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAC5D,YAAY,EAAC,0BAA0B,EAAC,MAAM,sCAAsC,CAAC;AACrF,OAAO,EAAC,qBAAqB,EAAC,MAAM,sCAAsC,CAAC"}

package/dist/index.js

@@ -1,14 +1,21 @@
-export { RenderLoop } from './lib/render-loop';
-export { default as Model } from './lib/model';
-export { default as AnimationLoop } from './lib/animation-loop';
-export { default as Geometry } from './geometry/geometry';
-export { ConeGeometry } from './geometries/cone-geometry';
-export { CubeGeometry } from './geometries/cube-geometry';
-export { CylinderGeometry } from './geometries/cylinder-geometry';
-export { IcoSphereGeometry } from './geometries/ico-sphere-geometry';
-export { PlaneGeometry } from './geometries/plane-geometry';
-export { SphereGeometry } from './geometries/sphere-geometry';
-export { TruncatedConeGeometry } from './geometries/truncated-cone-geometry';
-export { Timeline } from './animation/timeline';
-export { KeyFrames } from './animation/key-frames';
+export { Timeline } from "./animation/timeline.js";
+export { KeyFrames } from "./animation/key-frames.js";
+export { AnimationLoopTemplate } from "./animation-loop/render-loop.js";
+export { AnimationLoop } from "./animation-loop/animation-loop.js";
+export { makeAnimationLoop } from "./animation-loop/make-animation-loop.js";
+export { Model } from "./model/model.js";
+export { Transform } from "./transform/transform.js";
+export { PipelineFactory } from "./lib/pipeline-factory.js";
+export { ClipSpace } from "./lib/clip-space.js";
+export { ScenegraphNode } from "./scenegraph/scenegraph-node.js";
+export { GroupNode } from "./scenegraph/group-node.js";
+export { ModelNode } from "./scenegraph/model-node.js";
+export { Geometry } from "./geometry/geometry.js";
+export { ConeGeometry } from "./geometries/cone-geometry.js";
+export { CubeGeometry } from "./geometries/cube-geometry.js";
+export { CylinderGeometry } from "./geometries/cylinder-geometry.js";
+export { IcoSphereGeometry } from "./geometries/ico-sphere-geometry.js";
+export { PlaneGeometry } from "./geometries/plane-geometry.js";
+export { SphereGeometry } from "./geometries/sphere-geometry.js";
+export { TruncatedConeGeometry } from "./geometries/truncated-cone-geometry.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":["RenderLoop","default","Model","AnimationLoop","Geometry","ConeGeometry","CubeGeometry","CylinderGeometry","IcoSphereGeometry","PlaneGeometry","SphereGeometry","TruncatedConeGeometry","Timeline","KeyFrames"],"mappings":"AAEA,SAAQA,UAAR,QAAyB,mBAAzB;AAEA,SAAQC,OAAO,IAAIC,KAAnB,QAA+B,aAA/B;AAEA,SAAQD,OAAO,IAAIE,aAAnB,QAAuC,sBAAvC;AAMA,SAAQF,OAAO,IAAIG,QAAnB,QAAkC,qBAAlC;AAIA,SAAQC,YAAR,QAA2B,4BAA3B;AAEA,SAAQC,YAAR,QAA2B,4BAA3B;AAEA,SAAQC,gBAAR,QAA+B,gCAA/B;AAEA,SAAQC,iBAAR,QAAgC,kCAAhC;AAEA,SAAQC,aAAR,QAA4B,6BAA5B;AAEA,SAAQC,cAAR,QAA6B,8BAA7B;AAEA,SAAQC,qBAAR,QAAoC,sCAApC;AAGA,SAAQC,QAAR,QAAuB,sBAAvB;AACA,SAAQC,SAAR,QAAwB,wBAAxB","sourcesContent":["// luma.gl Engine API\nexport type {AnimationProps} from './lib/animation-props';\nexport {RenderLoop} from './lib/render-loop';\nexport type {ModelProps} from './lib/model';\nexport {default as Model} from './lib/model';\nexport type {AnimationLoopProps} from './lib/animation-loop';\nexport {default as AnimationLoop} from './lib/animation-loop';\n\n// Utils\n// export {default as ClipSpace} from './lib/clip-space';\n\n// Geometries\nexport {default as Geometry} from './geometry/geometry';\n\n// Primitives\nexport type {ConeGeometryProps} from './geometries/cone-geometry';\nexport {ConeGeometry} from './geometries/cone-geometry';\nexport type {CubeGeometryProps} from './geometries/cube-geometry';\nexport {CubeGeometry} from './geometries/cube-geometry';\nexport type {CylinderGeometryProps} from './geometries/cylinder-geometry';\nexport {CylinderGeometry} from './geometries/cylinder-geometry';\nexport type {IcoSphereGeometryProps} from './geometries/ico-sphere-geometry';\nexport {IcoSphereGeometry} from './geometries/ico-sphere-geometry';\nexport type {PlaneGeometryProps} from './geometries/plane-geometry';\nexport {PlaneGeometry} from './geometries/plane-geometry';\nexport type {SphereGeometryProps} from './geometries/sphere-geometry';\nexport {SphereGeometry} from './geometries/sphere-geometry';\nexport type {TruncatedConeGeometryProps} from './geometries/truncated-cone-geometry';\nexport {TruncatedConeGeometry} from './geometries/truncated-cone-geometry';\n\n// Animation\nexport {Timeline} from './animation/timeline';\nexport {KeyFrames} from './animation/key-frames';\n\n"],"file":"index.js"}
+{"version":3,"file":"index.js","names":["Timeline","KeyFrames","AnimationLoopTemplate","AnimationLoop","makeAnimationLoop","Model","Transform","PipelineFactory","ClipSpace","ScenegraphNode","GroupNode","ModelNode","Geometry","ConeGeometry","CubeGeometry","CylinderGeometry","IcoSphereGeometry","PlaneGeometry","SphereGeometry","TruncatedConeGeometry"],"sources":["../src/index.ts"],"sourcesContent":["// luma.gl Engine API\n\n// Animation\nexport {Timeline} from './animation/timeline';\nexport {KeyFrames} from './animation/key-frames';\nexport type {AnimationProps} from './animation-loop/animation-props';\n\nexport {AnimationLoopTemplate} from './animation-loop/render-loop';\n\nexport type {AnimationLoopProps} from './animation-loop/animation-loop';\nexport {AnimationLoop} from './animation-loop/animation-loop';\n\nexport type {MakeAnimationLoopProps} from './animation-loop/make-animation-loop';\nexport {makeAnimationLoop} from './animation-loop/make-animation-loop';\n\nexport type {ModelProps} from './model/model';\nexport {Model} from './model/model';\n\nexport {Transform} from './transform/transform';\n\nexport {PipelineFactory} from './lib/pipeline-factory';\n\n// Utils\nexport {ClipSpace} from './lib/clip-space';\n\n// Scenegraph Core nodes\nexport {ScenegraphNode} from './scenegraph/scenegraph-node';\nexport {GroupNode} from './scenegraph/group-node';\nexport {ModelNode} from './scenegraph/model-node';\n\n// Geometries\nexport type {GeometryProps} from './geometry/geometry';\nexport {Geometry} from './geometry/geometry';\n\n// Primitives\nexport type {ConeGeometryProps} from './geometries/cone-geometry';\nexport {ConeGeometry} from './geometries/cone-geometry';\nexport type {CubeGeometryProps} from './geometries/cube-geometry';\nexport {CubeGeometry} from './geometries/cube-geometry';\nexport type {CylinderGeometryProps} from './geometries/cylinder-geometry';\nexport {CylinderGeometry} from './geometries/cylinder-geometry';\nexport type {IcoSphereGeometryProps} from './geometries/ico-sphere-geometry';\nexport {IcoSphereGeometry} from './geometries/ico-sphere-geometry';\nexport type {PlaneGeometryProps} from './geometries/plane-geometry';\nexport {PlaneGeometry} from './geometries/plane-geometry';\nexport type {SphereGeometryProps} from './geometries/sphere-geometry';\nexport {SphereGeometry} from './geometries/sphere-geometry';\nexport type {TruncatedConeGeometryProps} from './geometries/truncated-cone-geometry';\nexport {TruncatedConeGeometry} from './geometries/truncated-cone-geometry';\n\n"],"mappings":"SAGQA,QAAQ;AAAA,SACRC,SAAS;AAAA,SAGTC,qBAAqB;AAAA,SAGrBC,aAAa;AAAA,SAGbC,iBAAiB;AAAA,SAGjBC,KAAK;AAAA,SAELC,SAAS;AAAA,SAETC,eAAe;AAAA,SAGfC,SAAS;AAAA,SAGTC,cAAc;AAAA,SACdC,SAAS;AAAA,SACTC,SAAS;AAAA,SAITC,QAAQ;AAAA,SAIRC,YAAY;AAAA,SAEZC,YAAY;AAAA,SAEZC,gBAAgB;AAAA,SAEhBC,iBAAiB;AAAA,SAEjBC,aAAa;AAAA,SAEbC,cAAc;AAAA,SAEdC,qBAAqB"}

package/dist/lib/clip-space.d.ts

@@ -1 +1,9 @@
+import { Device } from '@luma.gl/core';
+import { Model, ModelProps } from '../model/model';
+/**
+ * A flat geometry that covers the "visible area" that the GPU renders.
+ */
+export declare class ClipSpace extends Model {
+    constructor(device: Device | WebGLRenderingContext, opts?: ModelProps);
+}
 //# sourceMappingURL=clip-space.d.ts.map

package/dist/lib/clip-space.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clip-space.d.ts","sourceRoot":"","sources":["../../src/lib/clip-space.ts"],"names":[],"mappings":""}
+{"version":3,"file":"clip-space.d.ts","sourceRoot":"","sources":["../../src/lib/clip-space.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAO,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAC,KAAK,EAAE,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAuBjD;;GAEG;AACH,qBAAa,SAAU,SAAQ,KAAK;gBACtB,MAAM,EAAE,MAAM,GAAG,qBAAqB,EAAE,IAAI,CAAC,EAAE,UAAU;CAqBtE"}

package/dist/lib/clip-space.js

@@ -1,2 +1,37 @@
-
+import _taggedTemplateLiteral from "@babel/runtime/helpers/esm/taggedTemplateLiteral";
+var _templateObject;
+import { glsl } from '@luma.gl/core';
+import { WebGLDevice } from '@luma.gl/webgl';
+import { Model } from "../model/model.js";
+import { Geometry } from "../geometry/geometry.js";
+const CLIPSPACE_VERTEX_SHADER = glsl(_templateObject || (_templateObject = _taggedTemplateLiteral(["attribute vec2 aClipSpacePosition;\nattribute vec2 aTexCoord;\nattribute vec2 aCoordinate;\n\nvarying vec2 position;\nvarying vec2 coordinate;\nvarying vec2 uv;\n\nvoid main(void) {\n  gl_Position = vec4(aClipSpacePosition, 0., 1.);\n  position = aClipSpacePosition;\n  coordinate = aCoordinate;\n  uv = aTexCoord;\n}\n"], ["\\\nattribute vec2 aClipSpacePosition;\nattribute vec2 aTexCoord;\nattribute vec2 aCoordinate;\n\nvarying vec2 position;\nvarying vec2 coordinate;\nvarying vec2 uv;\n\nvoid main(void) {\n  gl_Position = vec4(aClipSpacePosition, 0., 1.);\n  position = aClipSpacePosition;\n  coordinate = aCoordinate;\n  uv = aTexCoord;\n}\n"])));
+const POSITIONS = [-1, -1, 1, -1, -1, 1, 1, 1];
+export class ClipSpace extends Model {
+  constructor(device, opts) {
+    const TEX_COORDS = POSITIONS.map(coord => coord === -1 ? 0 : coord);
+    super(WebGLDevice.attach(device), {
+      ...opts,
+      vs: CLIPSPACE_VERTEX_SHADER,
+      vertexCount: 4,
+      geometry: new Geometry({
+        topology: 'triangle-strip',
+        vertexCount: 4,
+        attributes: {
+          aClipSpacePosition: {
+            size: 2,
+            value: new Float32Array(POSITIONS)
+          },
+          aTexCoord: {
+            size: 2,
+            value: new Float32Array(TEX_COORDS)
+          },
+          aCoordinate: {
+            size: 2,
+            value: new Float32Array(TEX_COORDS)
+          }
+        }
+      })
+    });
+  }
+}
 //# sourceMappingURL=clip-space.js.map

package/dist/lib/clip-space.js.map

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","sourcesContent":[],"file":"clip-space.js"}
+{"version":3,"file":"clip-space.js","names":["glsl","WebGLDevice","Model","Geometry","CLIPSPACE_VERTEX_SHADER","_templateObject","_taggedTemplateLiteral","POSITIONS","ClipSpace","constructor","device","opts","TEX_COORDS","map","coord","attach","vs","vertexCount","geometry","topology","attributes","aClipSpacePosition","size","value","Float32Array","aTexCoord","aCoordinate"],"sources":["../../src/lib/clip-space.ts"],"sourcesContent":["\n// ClipSpace\nimport {Device, glsl} from '@luma.gl/core';\nimport {WebGLDevice} from '@luma.gl/webgl';\nimport {Model, ModelProps} from '../model/model';\nimport {Geometry} from '../geometry/geometry';\n\nconst CLIPSPACE_VERTEX_SHADER = glsl`\\\nattribute vec2 aClipSpacePosition;\nattribute vec2 aTexCoord;\nattribute vec2 aCoordinate;\n\nvarying vec2 position;\nvarying vec2 coordinate;\nvarying vec2 uv;\n\nvoid main(void) {\n  gl_Position = vec4(aClipSpacePosition, 0., 1.);\n  position = aClipSpacePosition;\n  coordinate = aCoordinate;\n  uv = aTexCoord;\n}\n`;\n\n/* eslint-disable indent, no-multi-spaces */\nconst POSITIONS = [-1, -1, 1, -1, -1, 1, 1, 1];\n\n/**\n * A flat geometry that covers the \"visible area\" that the GPU renders.\n */\nexport class ClipSpace extends Model {\n  constructor(device: Device | WebGLRenderingContext, opts?: ModelProps) {\n    const TEX_COORDS = POSITIONS.map((coord) => (coord === -1 ? 0 : coord));\n\n    super(\n      WebGLDevice.attach(device),\n      {\n        ...opts,\n        vs: CLIPSPACE_VERTEX_SHADER,\n        vertexCount: 4,\n        geometry: new Geometry({\n          topology: 'triangle-strip',\n          vertexCount: 4,\n          attributes: {\n            aClipSpacePosition: {size: 2, value: new Float32Array(POSITIONS)},\n            aTexCoord: {size: 2, value: new Float32Array(TEX_COORDS)},\n            aCoordinate: {size: 2, value: new Float32Array(TEX_COORDS)}\n          }\n        })\n      }\n    );\n  }\n}\n"],"mappings":";;AAEA,SAAgBA,IAAI,QAAO,eAAe;AAC1C,SAAQC,WAAW,QAAO,gBAAgB;AAAC,SACnCC,KAAK;AAAA,SACLC,QAAQ;AAEhB,MAAMC,uBAAuB,GAAGJ,IAAI,CAAAK,eAAA,KAAAA,eAAA,GAAAC,sBAAA,gpBAenC;AAGD,MAAMC,SAAS,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;AAK9C,OAAO,MAAMC,SAAS,SAASN,KAAK,CAAC;EACnCO,WAAWA,CAACC,MAAsC,EAAEC,IAAiB,EAAE;IACrE,MAAMC,UAAU,GAAGL,SAAS,CAACM,GAAG,CAAEC,KAAK,IAAMA,KAAK,KAAK,CAAC,CAAC,GAAG,CAAC,GAAGA,KAAM,CAAC;IAEvE,KAAK,CACHb,WAAW,CAACc,MAAM,CAACL,MAAM,CAAC,EAC1B;MACE,GAAGC,IAAI;MACPK,EAAE,EAAEZ,uBAAuB;MAC3Ba,WAAW,EAAE,CAAC;MACdC,QAAQ,EAAE,IAAIf,QAAQ,CAAC;QACrBgB,QAAQ,EAAE,gBAAgB;QAC1BF,WAAW,EAAE,CAAC;QACdG,UAAU,EAAE;UACVC,kBAAkB,EAAE;YAACC,IAAI,EAAE,CAAC;YAAEC,KAAK,EAAE,IAAIC,YAAY,CAACjB,SAAS;UAAC,CAAC;UACjEkB,SAAS,EAAE;YAACH,IAAI,EAAE,CAAC;YAAEC,KAAK,EAAE,IAAIC,YAAY,CAACZ,UAAU;UAAC,CAAC;UACzDc,WAAW,EAAE;YAACJ,IAAI,EAAE,CAAC;YAAEC,KAAK,EAAE,IAAIC,YAAY,CAACZ,UAAU;UAAC;QAC5D;MACF,CAAC;IACH,CACF,CAAC;EACH;AACF"}

package/dist/lib/pipeline-factory.d.ts

@@ -1,19 +1,20 @@
-import type { RenderPipelineParameters } from '@luma.gl/api';
-import { Device, RenderPipeline } from '@luma.gl/api/';
+import type { RenderPipelineParameters, PrimitiveTopology, ShaderLayout } from '@luma.gl/core';
+import { Device, RenderPipeline } from '@luma.gl/core';
 import type { ShaderModule } from '@luma.gl/shadertools';
-export declare type GetRenderPipelineOptions = {
+export type GetRenderPipelineOptions = {
     vs: string;
-    fs: string;
-    topology: any;
+    fs: string | null;
+    topology: PrimitiveTopology;
+    layout?: ShaderLayout | null;
     parameters?: RenderPipelineParameters;
     modules?: ShaderModule[];
-    defines?: Record<string, string>;
+    defines?: Record<string, string | number | boolean>;
     inject?: Record<string, string>;
     transpileToGLSL100?: boolean;
     varyings?: string[];
     bufferMode?: number;
 };
-export declare type GetComputePipelineOptions = {
+export type GetComputePipelineOptions = {
     cs: string;
     parameters?: RenderPipelineParameters;
     modules?: ShaderModule[];
@@ -23,8 +24,9 @@ export declare type GetComputePipelineOptions = {
     varyings?: string[];
     bufferMode?: number;
 };
+type GetUniformsFunc = (props?: Record<string, any>) => Record<string, any>;
 /** Efficiently create shared pipelines with varying parameters */
-export default class PipelineFactory {
+export declare class PipelineFactory {
     readonly device: Device;
     stateHash: number;
     private _hashCounter;
@@ -36,20 +38,23 @@ export default class PipelineFactory {
     private _defaultModules;
     static getDefaultPipelineFactory(device: Device): PipelineFactory;
     constructor(device: Device);
-    addShaderHook(hook: any, opts?: any): void;
+    addDefaultModule(module: ShaderModule): void;
+    removeDefaultModule(module: ShaderModule): void;
+    addShaderHook(hook: string, opts?: any): void;
     createRenderPipeline(options: GetRenderPipelineOptions): {
-        renderPipeline: RenderPipeline;
-        getUniforms: (props: Record<string, Record<string, any>>) => Record<string, any>;
+        pipeline: RenderPipeline;
+        getUniforms: GetUniformsFunc;
     };
     release(pipeline: RenderPipeline): void;
-    getUniforms(pipeline: RenderPipeline): any;
+    getUniforms(pipeline: RenderPipeline): GetUniformsFunc;
     _createRenderPipeline(props: GetRenderPipelineOptions): {
-        renderPipeline: RenderPipeline;
-        getUniforms: (props: Record<string, Record<string, any>>) => Record<string, any>;
+        pipeline: RenderPipeline;
+        getUniforms: GetUniformsFunc;
     };
     /** Calculate a hash based on all the inputs for a render pipeline */
     _hashRenderPipeline(props: GetRenderPipelineOptions): string;
     _getHash(key: string): number;
     _getModuleList(appModules?: ShaderModule[]): ShaderModule[];
 }
+export {};
 //# sourceMappingURL=pipeline-factory.d.ts.map

package/dist/lib/pipeline-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline-factory.d.ts","sourceRoot":"","sources":["../../src/lib/pipeline-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAsB,wBAAwB,EAAC,MAAM,cAAc,CAAC;AAChF,OAAO,EAAC,MAAM,EAAE,cAAc,EAAkB,MAAM,eAAe,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGzD,oBAAY,wBAAwB,GAAG;IACrC,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,MAAC;IACT,UAAU,CAAC,EAAE,wBAAwB,CAAC;IAEtC,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,oBAAY,yBAAyB,GAAG;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,CAAC,EAAE,wBAAwB,CAAC;IAEtC,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAgBF,kEAAkE;AAClE,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,SAAS,EAAE,MAAM,CAAK;IACtB,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IACtD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA8B;IAEzD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAsC;IAErE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA2B;IACxD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAa;IAC5C,OAAO,CAAC,eAAe,CAAa;IAGpC,MAAM,CAAC,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe;gBAOrD,MAAM,EAAE,MAAM;IAiB1B,aAAa,CAAC,IAAI,KAAA,EAAE,IAAI,CAAC,KAAA,GAAG,IAAI;IAQhC,oBAAoB,CAAC,OAAO,EAAE,wBAAwB,GAAG;QACvD,cAAc,EAAE,cAAc,CAAC;QAC/B,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KAClF;IAuBD,OAAO,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAWvC,WAAW,CAAC,QAAQ,EAAE,cAAc;IAMpC,qBAAqB,CAAC,KAAK,EAAE,wBAAwB,GAAG;QACtD,cAAc,EAAE,cAAc,CAAC;QAC/B,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KACjF;IAiBD,qEAAqE;IACrE,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,GAAG,MAAM;IAgC5D,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAQ7B,cAAc,CAAC,UAAU,GAAE,YAAY,EAAO,GAAG,YAAY,EAAE;CAyBhE"}
+{"version":3,"file":"pipeline-factory.d.ts","sourceRoot":"","sources":["../../src/lib/pipeline-factory.ts"],"names":[],"mappings":"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"}

package/dist/lib/pipeline-factory.js

@@ -7,185 +7,174 @@ const DEFAULT_RENDER_PIPELINE_OPTIONS = {
   defines: {},
   inject: {},
   transpileToGLSL100: false,
+  layout: null,
   varyings: [],
   bufferMode: 0x8c8d,
   topology: 'triangle-list',
   parameters: {}
 };
-export default class PipelineFactory {
+export class PipelineFactory {
   static getDefaultPipelineFactory(device) {
     device.defaultPipelineFactory = device.defaultPipelineFactory || new PipelineFactory(device);
     return device.defaultPipelineFactory;
   }
-
   constructor(device) {
     _defineProperty(this, "device", void 0);
-
     _defineProperty(this, "stateHash", 0);
-
     _defineProperty(this, "_hashCounter", 0);
-
     _defineProperty(this, "_hashes", {});
-
     _defineProperty(this, "_useCounts", {});
-
     _defineProperty(this, "_pipelineCache", {});
-
     _defineProperty(this, "_getUniforms", {});
-
     _defineProperty(this, "_hookFunctions", []);
-
     _defineProperty(this, "_defaultModules", []);
-
     this.device = device;
   }
-
+  addDefaultModule(module) {
+    if (!this._defaultModules.find(m => m.name === (typeof module === 'string' ? module : module.name))) {
+      this._defaultModules.push(module);
+    }
+    this.stateHash++;
+  }
+  removeDefaultModule(module) {
+    const moduleName = typeof module === 'string' ? module : module.name;
+    this._defaultModules = this._defaultModules.filter(m => m.name !== moduleName);
+    this.stateHash++;
+  }
   addShaderHook(hook, opts) {
     if (opts) {
       hook = Object.assign(opts, {
         hook
       });
     }
-
     this._hookFunctions.push(hook);
-
     this.stateHash++;
   }
-
   createRenderPipeline(options) {
-    const props = { ...DEFAULT_RENDER_PIPELINE_OPTIONS,
+    const props = {
+      ...DEFAULT_RENDER_PIPELINE_OPTIONS,
       ...options
     };
-
     const modules = this._getModuleList(props.modules);
-
-    const hash = this._hashRenderPipeline({ ...props,
+    const hash = this._hashRenderPipeline({
+      ...props,
       modules
     });
-
     if (!this._pipelineCache[hash]) {
       const {
-        renderPipeline,
+        pipeline,
         getUniforms
-      } = this._createRenderPipeline({ ...props,
+      } = this._createRenderPipeline({
+        ...props,
         modules
       });
-
-      renderPipeline.hash = hash;
-      this._pipelineCache[hash] = renderPipeline;
-
-      this._getUniforms[hash] = getUniforms || (x => {});
-
+      pipeline.hash = hash;
+      this._pipelineCache[hash] = pipeline;
+      this._getUniforms[hash] = getUniforms || (x => ({}));
       this._useCounts[hash] = 0;
     }
-
     this._useCounts[hash]++;
     return {
-      renderPipeline: this._pipelineCache[hash],
+      pipeline: this._pipelineCache[hash],
       getUniforms: this._getUniforms[hash]
     };
   }
-
   release(pipeline) {
     const hash = pipeline.hash;
     this._useCounts[hash]--;
-
     if (this._useCounts[hash] === 0) {
       this._pipelineCache[hash].destroy();
-
       delete this._pipelineCache[hash];
       delete this._getUniforms[hash];
       delete this._useCounts[hash];
     }
   }
-
   getUniforms(pipeline) {
     return this._getUniforms[pipeline.hash] || null;
   }
-
   _createRenderPipeline(props) {
     const platformInfo = {
       gpu: this.device.info.gpu,
       features: this.device.features
     };
-    const assembled = assembleShaders(platformInfo, { ...props,
+    if (!props.fs) {
+      throw new Error('fs');
+    }
+    const assembled = assembleShaders(platformInfo, {
+      ...props,
+      fs: props.fs,
       hookFunctions: this._hookFunctions
     });
-    const renderPipeline = this.device.createRenderPipeline({ ...props,
+    const pipeline = this.device.createRenderPipeline({
+      ...props,
       vs: this.device.createShader({
         stage: 'vertex',
         source: assembled.vs
       }),
-      fs: assembled.fs && this.device.createShader({
+      fs: assembled.fs ? this.device.createShader({
         stage: 'fragment',
         source: assembled.fs
-      })
+      }) : null
     });
     return {
-      renderPipeline,
+      pipeline,
       getUniforms: assembled.getUniforms
     };
   }
-
   _hashRenderPipeline(props) {
+    const {
+      modules = [],
+      varyings = [],
+      defines = {},
+      inject = {},
+      parameters = {}
+    } = props;
     const vsHash = this._getHash(props.vs);
-
-    const fsHash = this._getHash(props.fs);
-
-    const moduleHashes = props.modules.map(m => this._getHash(typeof m === 'string' ? m : m.name)).sort();
-    const varyingHashes = props.varyings.map(v => this._getHash(v));
-    const defineKeys = Object.keys(props.defines).sort();
-    const injectKeys = Object.keys(props.inject).sort();
+    const fsHash = props.fs ? this._getHash(props.fs) : 0;
+    const moduleHashes = modules.map(m => this._getHash(typeof m === 'string' ? m : m.name)).sort();
+    const varyingHashes = varyings.map(v => this._getHash(v));
+    const defineKeys = Object.keys(defines).sort();
+    const injectKeys = Object.keys(inject).sort();
     const defineHashes = [];
     const injectHashes = [];
-
     for (const key of defineKeys) {
       defineHashes.push(this._getHash(key));
-      defineHashes.push(this._getHash(props.defines[key]));
+      defineHashes.push(this._getHash(String(defines[key])));
     }
-
     for (const key of injectKeys) {
       injectHashes.push(this._getHash(key));
-      injectHashes.push(this._getHash(props.inject[key]));
+      injectHashes.push(this._getHash(inject[key]));
     }
-
-    const parameterHash = JSON.stringify(props.parameters);
+    const parameterHash = JSON.stringify(parameters);
     return "".concat(vsHash, "/").concat(fsHash, "D").concat(defineHashes.join('/'), "M").concat(moduleHashes.join('/'), "I").concat(injectHashes.join('/'), "V").concat(varyingHashes.join('/'), "H").concat(this.stateHash, "B").concat(props.bufferMode).concat(props.transpileToGLSL100 ? 'T' : '', "P").concat(parameterHash);
   }
-
   _getHash(key) {
     if (this._hashes[key] === undefined) {
       this._hashes[key] = this._hashCounter++;
     }
-
     return this._hashes[key];
   }
-
-  _getModuleList(appModules = []) {
+  _getModuleList() {
+    let appModules = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     const modules = new Array(this._defaultModules.length + appModules.length);
     const seen = {};
     let count = 0;
-
     for (let i = 0, len = this._defaultModules.length; i < len; ++i) {
       const module = this._defaultModules[i];
       const name = module.name;
       modules[count++] = module;
       seen[name] = true;
     }
-
     for (let i = 0, len = appModules.length; i < len; ++i) {
       const module = appModules[i];
       const name = module.name;
-
       if (!seen[name]) {
         modules[count++] = module;
         seen[name] = true;
       }
     }
-
     modules.length = count;
     return modules;
   }
-
 }
 //# sourceMappingURL=pipeline-factory.js.map

package/dist/lib/pipeline-factory.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/pipeline-factory.ts"],"names":["assembleShaders","DEFAULT_RENDER_PIPELINE_OPTIONS","vs","fs","modules","defines","inject","transpileToGLSL100","varyings","bufferMode","topology","parameters","PipelineFactory","getDefaultPipelineFactory","device","defaultPipelineFactory","constructor","addShaderHook","hook","opts","Object","assign","_hookFunctions","push","stateHash","createRenderPipeline","options","props","_getModuleList","hash","_hashRenderPipeline","_pipelineCache","renderPipeline","getUniforms","_createRenderPipeline","_getUniforms","x","_useCounts","release","pipeline","destroy","platformInfo","gpu","info","features","assembled","hookFunctions","createShader","stage","source","vsHash","_getHash","fsHash","moduleHashes","map","m","name","sort","varyingHashes","v","defineKeys","keys","injectKeys","defineHashes","injectHashes","key","parameterHash","JSON","stringify","join","_hashes","undefined","_hashCounter","appModules","Array","_defaultModules","length","seen","count","i","len","module"],"mappings":"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","sourcesContent":["import type {RenderPipelineProps, RenderPipelineParameters} from '@luma.gl/api';\nimport {Device, RenderPipeline, ComputePipeline} from '@luma.gl/api/';\nimport type { ShaderModule } from '@luma.gl/shadertools';\nimport {assembleShaders} from '@luma.gl/shadertools';\n\nexport type GetRenderPipelineOptions = {\n  vs: string,\n  fs: string,\n  topology;\n  parameters?: RenderPipelineParameters;\n\n  modules?: ShaderModule[];\n  defines?: Record<string, string>,\n  inject?: Record<string, string>,\n  transpileToGLSL100?: boolean;\n\n  varyings?: string[],\n  bufferMode?: number,  \n};\n\nexport type GetComputePipelineOptions = {\n  cs: string,\n  parameters?: RenderPipelineParameters;\n\n  modules?: ShaderModule[];\n  defines?: Record<string, string>,\n  inject?: Record<string, string>,\n  transpileToGLSL100?: boolean;\n\n  varyings?: string[],\n  bufferMode?: number,\n};\n\nconst DEFAULT_RENDER_PIPELINE_OPTIONS: Required<GetRenderPipelineOptions> = {\n  vs: '',\n  fs: '',\n  modules: [],\n  defines: {},\n  inject: {},\n  transpileToGLSL100: false,\n\n  varyings: [],\n  bufferMode: 0x8c8d, // // varyings/bufferMode for xform feedback, 0x8c8d: SEPARATE_ATTRIBS\n  topology: 'triangle-list',\n  parameters: {} \n};\n\n/** Efficiently create shared pipelines with varying parameters */\nexport default class PipelineFactory {\n  readonly device: Device;\n\n  stateHash: number = 0; // Used to change hashing if hooks are modified\n  private _hashCounter: number = 0;\n  private readonly _hashes: Record<string, number> = {};\n  private readonly _useCounts: Record<string, number> = {};\n\n  private readonly _pipelineCache: Record<string, RenderPipeline> = {};\n\n  private readonly _getUniforms: Record<string, any> = {};\n  private readonly _hookFunctions: any[] = [];\n  private _defaultModules: any[] = [];\n  // private readonly _registeredModules = {}; // TODO: Remove? This isn't used anywhere in luma.gl\n\n  static getDefaultPipelineFactory(device: Device): PipelineFactory {\n    // @ts-expect-error Add to device\n    device.defaultPipelineFactory = device.defaultPipelineFactory || new PipelineFactory(device);\n    // @ts-expect-error Add to device\n    return device.defaultPipelineFactory;\n  }\n\n  constructor(device: Device) {\n    this.device = device;\n  }\n\n  // addDefaultModule(module: ShaderModule): void {\n  //   if (!this._defaultModules.find((m) => m.name === (typeof module === 'string' ? module : module.name))) {\n  //     this._defaultModules.push(module);\n  //   }\n  //   this.stateHash++;\n  // }\n\n  // removeDefaultModule(module: ShaderModule): void {\n  //   const moduleName = typeof module === 'string' ? module : module.name;\n  //   this._defaultModules = this._defaultModules.filter((m) => m.name !== moduleName);\n  //   this.stateHash++;\n  // }\n\n  addShaderHook(hook, opts?): void {\n    if (opts) {\n      hook = Object.assign(opts, {hook});\n    }\n    this._hookFunctions.push(hook);\n    this.stateHash++;\n  }\n\n  createRenderPipeline(options: GetRenderPipelineOptions): {\n    renderPipeline: RenderPipeline;\n    getUniforms: (props: Record<string, Record<string, any>>) => Record<string, any>;\n  } {\n    const props: Required<GetRenderPipelineOptions> = {...DEFAULT_RENDER_PIPELINE_OPTIONS, ...options};\n\n    const modules = this._getModuleList(props.modules); // Combine with default modules\n\n    const hash = this._hashRenderPipeline({...props, modules});\n\n    if (!this._pipelineCache[hash]) {\n      const {renderPipeline, getUniforms} = this._createRenderPipeline({...props, modules});\n      renderPipeline.hash = hash;\n      this._pipelineCache[hash] = renderPipeline;\n      this._getUniforms[hash] = getUniforms || ((x: Record<string, Record<string, any>>) => {});\n      this._useCounts[hash] = 0;\n    }\n\n    this._useCounts[hash]++;\n\n    return {\n      renderPipeline: this._pipelineCache[hash],\n      getUniforms: this._getUniforms[hash]\n    };\n  }\n\n  release(pipeline: RenderPipeline): void {\n    const hash = pipeline.hash;\n    this._useCounts[hash]--;\n    if (this._useCounts[hash] === 0) {\n      this._pipelineCache[hash].destroy();\n      delete this._pipelineCache[hash];\n      delete this._getUniforms[hash];\n      delete this._useCounts[hash];\n    }\n  }\n\n  getUniforms(pipeline: RenderPipeline) {\n    return this._getUniforms[pipeline.hash] || null;\n  }\n\n  // PRIVATE\n\n  _createRenderPipeline(props: GetRenderPipelineOptions): {\n    renderPipeline: RenderPipeline,\n    getUniforms: (props: Record<string, Record<string, any>>) => Record<string, any>\n  } {\n    const platformInfo = {\n      gpu: this.device.info.gpu,\n      features: this.device.features\n    };\n\n    const assembled = assembleShaders(platformInfo, {...props, hookFunctions: this._hookFunctions});\n\n    const renderPipeline = this.device.createRenderPipeline({\n      ...props,\n      vs: this.device.createShader({stage: 'vertex', source: assembled.vs}),\n      fs: assembled.fs && this.device.createShader({stage: 'fragment', source: assembled.fs}),\n    });\n\n    return {renderPipeline, getUniforms: assembled.getUniforms};\n  }\n\n  /** Calculate a hash based on all the inputs for a render pipeline */\n  _hashRenderPipeline(props: GetRenderPipelineOptions): string {\n    const vsHash = this._getHash(props.vs);\n    const fsHash = this._getHash(props.fs);\n\n    const moduleHashes = props.modules.map((m) => this._getHash(typeof m === 'string' ? m : m.name)).sort();\n    const varyingHashes = props.varyings.map((v) => this._getHash(v));\n\n    const defineKeys = Object.keys(props.defines).sort();\n    const injectKeys = Object.keys(props.inject).sort();\n    const defineHashes = [];\n    const injectHashes = [];\n\n    for (const key of defineKeys) {\n      defineHashes.push(this._getHash(key));\n      defineHashes.push(this._getHash(props.defines[key]));\n    }\n\n    for (const key of injectKeys) {\n      injectHashes.push(this._getHash(key));\n      injectHashes.push(this._getHash(props.inject[key]));\n    }\n\n    // TODO - hash parameters!\n    const parameterHash = JSON.stringify(props.parameters);\n\n    return `${vsHash}/${fsHash}D${defineHashes.join('/')}M${moduleHashes.join(\n      '/'\n    )}I${injectHashes.join('/')}V${varyingHashes.join('/')}H${this.stateHash}B${props.bufferMode}${\n      props.transpileToGLSL100 ? 'T' : ''\n    }P${parameterHash}`;\n  }\n\n  _getHash(key: string): number {\n    if (this._hashes[key] === undefined) {\n      this._hashes[key] = this._hashCounter++;\n    }\n    return this._hashes[key];\n  }\n\n  // Dedupe and combine with default modules\n  _getModuleList(appModules: ShaderModule[] = []): ShaderModule[] {\n    const modules = new Array(this._defaultModules.length + appModules.length);\n    const seen: Record<string, boolean> = {};\n    let count = 0;\n\n    for (let i = 0, len = this._defaultModules.length; i < len; ++i) {\n      const module = this._defaultModules[i];\n      const name = module.name;\n      modules[count++] = module;\n      seen[name] = true;\n    }\n\n    for (let i = 0, len = appModules.length; i < len; ++i) {\n      const module = appModules[i];\n      const name = module.name;\n      if (!seen[name]) {\n        modules[count++] = module;\n        seen[name] = true;\n      }\n    }\n\n    modules.length = count;\n\n    return modules;\n  }\n}\n"],"file":"pipeline-factory.js"}
+{"version":3,"file":"pipeline-factory.js","names":["assembleShaders","DEFAULT_RENDER_PIPELINE_OPTIONS","vs","fs","modules","defines","inject","transpileToGLSL100","layout","varyings","bufferMode","topology","parameters","PipelineFactory","getDefaultPipelineFactory","device","defaultPipelineFactory","constructor","_defineProperty","addDefaultModule","module","_defaultModules","find","m","name","push","stateHash","removeDefaultModule","moduleName","filter","addShaderHook","hook","opts","Object","assign","_hookFunctions","createRenderPipeline","options","props","_getModuleList","hash","_hashRenderPipeline","_pipelineCache","pipeline","getUniforms","_createRenderPipeline","_getUniforms","x","_useCounts","release","destroy","platformInfo","gpu","info","features","Error","assembled","hookFunctions","createShader","stage","source","vsHash","_getHash","fsHash","moduleHashes","map","sort","varyingHashes","v","defineKeys","keys","injectKeys","defineHashes","injectHashes","key","String","parameterHash","JSON","stringify","concat","join","_hashes","undefined","_hashCounter","appModules","arguments","length","Array","seen","count","i","len"],"sources":["../../src/lib/pipeline-factory.ts"],"sourcesContent":["import type {RenderPipelineParameters, PrimitiveTopology, ShaderLayout} from '@luma.gl/core';\nimport {Device, RenderPipeline} from '@luma.gl/core';\nimport type { ShaderModule } from '@luma.gl/shadertools';\nimport {assembleShaders} from '@luma.gl/shadertools';\n\nexport type GetRenderPipelineOptions = {\n  vs: string;\n  fs: string | null;\n  topology: PrimitiveTopology;\n  layout?: ShaderLayout | null;\n  parameters?: RenderPipelineParameters;\n\n  modules?: ShaderModule[];\n  defines?: Record<string, string | number | boolean>;\n  inject?: Record<string, string>;\n  transpileToGLSL100?: boolean;\n\n  varyings?: string[];\n  bufferMode?: number,  \n};\n\nexport type GetComputePipelineOptions = {\n  cs: string;\n    parameters?: RenderPipelineParameters;\n\n  modules?: ShaderModule[];\n  defines?: Record<string, string>;\n  inject?: Record<string, string>;\n  transpileToGLSL100?: boolean;\n\n  varyings?: string[];\n  bufferMode?: number;\n};\n\nconst DEFAULT_RENDER_PIPELINE_OPTIONS: Required<GetRenderPipelineOptions> = {\n  vs: '',\n  fs: '',\n  modules: [],\n  defines: {},\n  inject: {},\n  transpileToGLSL100: false,\n  layout: null,\n\n  varyings: [],\n  bufferMode: 0x8c8d, // // varyings/bufferMode for xform feedback, 0x8c8d: SEPARATE_ATTRIBS\n  topology: 'triangle-list',\n  parameters: {} \n};\n\ntype GetUniformsFunc = (props?: Record<string, any>) => Record<string, any>;\n\n/** Efficiently create shared pipelines with varying parameters */\nexport class PipelineFactory {\n  readonly device: Device;\n\n  stateHash: number = 0; // Used to change hashing if hooks are modified\n  private _hashCounter: number = 0;\n  private readonly _hashes: Record<string, number> = {};\n  private readonly _useCounts: Record<string, number> = {};\n\n  private readonly _pipelineCache: Record<string, RenderPipeline> = {};\n\n  private readonly _getUniforms: Record<string, GetUniformsFunc> = {};\n  private readonly _hookFunctions: any[] = [];\n  private _defaultModules: any[] = [];\n  // private readonly _registeredModules = {}; // TODO: Remove? This isn't used anywhere in luma.gl\n\n  static getDefaultPipelineFactory(device: Device): PipelineFactory {\n    // @ts-expect-error Add to device\n    device.defaultPipelineFactory = device.defaultPipelineFactory || new PipelineFactory(device);\n    // @ts-expect-error Add to device\n    return device.defaultPipelineFactory;\n  }\n\n  constructor(device: Device) {\n    this.device = device;\n  }\n\n  addDefaultModule(module: ShaderModule): void {\n    if (!this._defaultModules.find((m) => m.name === (typeof module === 'string' ? module : module.name))) {\n      this._defaultModules.push(module);\n    }\n    this.stateHash++;\n  }\n\n  removeDefaultModule(module: ShaderModule): void {\n    const moduleName = typeof module === 'string' ? module : module.name;\n    this._defaultModules = this._defaultModules.filter((m) => m.name !== moduleName);\n    this.stateHash++;\n  }\n\n  addShaderHook(hook: string, opts?: any): void {\n    if (opts) {\n      hook = Object.assign(opts, {hook});\n    }\n    this._hookFunctions.push(hook);\n    this.stateHash++;\n  }\n\n  createRenderPipeline(options: GetRenderPipelineOptions): {\n    pipeline: RenderPipeline;\n    getUniforms: GetUniformsFunc;\n  } {\n    const props: Required<GetRenderPipelineOptions> = {...DEFAULT_RENDER_PIPELINE_OPTIONS, ...options};\n\n    const modules = this._getModuleList(props.modules); // Combine with default modules\n\n    const hash = this._hashRenderPipeline({...props, modules});\n\n    if (!this._pipelineCache[hash]) {\n      const {pipeline, getUniforms} = this._createRenderPipeline({...props, modules});\n      pipeline.hash = hash;\n      this._pipelineCache[hash] = pipeline;\n      this._getUniforms[hash] = getUniforms || ((x?: unknown) => ({}));\n      this._useCounts[hash] = 0;\n    }\n\n    this._useCounts[hash]++;\n\n    return {\n      pipeline: this._pipelineCache[hash],\n      getUniforms: this._getUniforms[hash]\n    };\n  }\n\n  release(pipeline: RenderPipeline): void {\n    const hash = pipeline.hash;\n    this._useCounts[hash]--;\n    if (this._useCounts[hash] === 0) {\n      this._pipelineCache[hash].destroy();\n      delete this._pipelineCache[hash];\n      delete this._getUniforms[hash];\n      delete this._useCounts[hash];\n    }\n  }\n\n  getUniforms(pipeline: RenderPipeline) {\n    return this._getUniforms[pipeline.hash] || null;\n  }\n\n  // PRIVATE\n\n  _createRenderPipeline(props: GetRenderPipelineOptions): {\n    pipeline: RenderPipeline,\n    getUniforms: GetUniformsFunc\n  } {\n    const platformInfo = {\n      gpu: this.device.info.gpu,\n      features: this.device.features\n    };\n\n    if (!props.fs) {\n      throw new Error('fs');\n    }\n\n    const assembled = assembleShaders(platformInfo, {...props, fs: props.fs, hookFunctions: this._hookFunctions});\n\n    const pipeline = this.device.createRenderPipeline({\n      ...props,\n      vs: this.device.createShader({stage: 'vertex', source: assembled.vs}),\n      fs: assembled.fs ? this.device.createShader({stage: 'fragment', source: assembled.fs}) : null,\n    });\n\n    return {pipeline, getUniforms: assembled.getUniforms};\n  }\n\n  /** Calculate a hash based on all the inputs for a render pipeline */\n  _hashRenderPipeline(props: GetRenderPipelineOptions): string {\n    const {modules = [], varyings = [], defines = {}, inject = {}, parameters = {}} = props;\n    const vsHash = this._getHash(props.vs);\n    const fsHash = props.fs ? this._getHash(props.fs) : 0;\n\n    const moduleHashes = modules.map((m) => this._getHash(typeof m === 'string' ? m : m.name)).sort();\n    const varyingHashes = varyings.map((v) => this._getHash(v));\n\n    const defineKeys = Object.keys(defines).sort();\n    const injectKeys = Object.keys(inject).sort();\n    const defineHashes: number[] = [];\n    const injectHashes: number[] = [];\n\n    for (const key of defineKeys) {\n      defineHashes.push(this._getHash(key));\n      defineHashes.push(this._getHash(String(defines[key])));\n    }\n\n    for (const key of injectKeys) {\n      injectHashes.push(this._getHash(key));\n      injectHashes.push(this._getHash(inject[key]));\n    }\n\n    // TODO - hash parameters!\n    const parameterHash = JSON.stringify(parameters);\n\n    return `${vsHash}/${fsHash}D${defineHashes.join('/')}M${moduleHashes.join(\n      '/'\n    )}I${injectHashes.join('/')}V${varyingHashes.join('/')}H${this.stateHash}B${props.bufferMode}${\n      props.transpileToGLSL100 ? 'T' : ''\n    }P${parameterHash}`;\n  }\n\n  _getHash(key: string): number {\n    if (this._hashes[key] === undefined) {\n      this._hashes[key] = this._hashCounter++;\n    }\n    return this._hashes[key];\n  }\n\n  // Dedupe and combine with default modules\n  _getModuleList(appModules: ShaderModule[] = []): ShaderModule[] {\n    const modules = new Array(this._defaultModules.length + appModules.length);\n    const seen: Record<string, boolean> = {};\n    let count = 0;\n\n    for (let i = 0, len = this._defaultModules.length; i < len; ++i) {\n      const module = this._defaultModules[i];\n      const name = module.name;\n      modules[count++] = module;\n      seen[name] = true;\n    }\n\n    for (let i = 0, len = appModules.length; i < len; ++i) {\n      const module = appModules[i];\n      const name = module.name;\n      if (!seen[name]) {\n        modules[count++] = module;\n        seen[name] = true;\n      }\n    }\n\n    modules.length = count;\n\n    return modules;\n  }\n}\n"],"mappings":"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"}

package/dist/{lib → model}/model-utils.d.ts

@@ -1,5 +1,5 @@
-import { Device, Buffer } from '@luma.gl/api';
-import type Geometry from '../geometry/geometry';
+import { Device, Buffer } from '@luma.gl/core';
+import type { Geometry } from '../geometry/geometry';
 export declare function getIndexBufferFromGeometry(device: Device, geometry: Geometry): Buffer | undefined;
 export declare function getAttributeBuffersFromGeometry(device: Device, geometry: Geometry): Record<string, Buffer>;
 //# sourceMappingURL=model-utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"model-utils.d.ts","sourceRoot":"","sources":["../../src/model/model-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,MAAM,EAAS,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AAsDnD,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS,CAYjG;AAED,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAc1G"}

package/dist/{lib → model}/model-utils.js

@@ -1,4 +1,4 @@
-import { Buffer, assert } from '@luma.gl/api';
+import { Buffer, assert } from '@luma.gl/core';
 const GLTF_TO_LUMA_ATTRIBUTE_MAP = {
   POSITION: 'positions',
   NORMAL: 'normals',
@@ -11,7 +11,6 @@ export function getIndexBufferFromGeometry(device, geometry) {
   if (!geometry.indices) {
     return undefined;
   }
-
   const data = geometry.indices.value || geometry.indices;
   assert(data instanceof Uint16Array || data instanceof Uint32Array, 'attribute array for "indices" must be of integer type');
   return device.createBuffer({
@@ -21,24 +20,20 @@ export function getIndexBufferFromGeometry(device, geometry) {
 }
 export function getAttributeBuffersFromGeometry(device, geometry) {
   const buffers = {};
-
   for (const [name, attribute] of Object.entries(geometry.attributes)) {
     const remappedName = mapAttributeName(name);
-
-    if (attribute.constant) {
+    if (attribute !== null && attribute !== void 0 && attribute.constant) {
       throw new Error('constant attributes not supported');
     } else {
-      const typedArray = attribute.value;
+      const typedArray = attribute === null || attribute === void 0 ? void 0 : attribute.value;
       buffers[remappedName] = device.createBuffer({
         data: typedArray,
         id: "".concat(remappedName, "-buffer")
       });
     }
   }
-
   return buffers;
 }
-
 function mapAttributeName(name) {
   return GLTF_TO_LUMA_ATTRIBUTE_MAP[name] || name;
 }