@luma.gl/engine 9.0.0-alpha.16 → 9.0.0-alpha.19

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@luma.gl/engine",
-  "version": "9.0.0-alpha.16",
+  "version": "9.0.0-alpha.19",
   "description": "WebGL2 Components for High Performance Rendering and Computation",
+  "type": "module",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,27 +18,35 @@
     "3d"
   ],
   "types": "dist/index.d.ts",
-  "main": "dist/es5/index.js",
-  "module": "dist/esm/index.js",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "files": [
     "src",
     "dist",
+    "dist.min.js",
     "README.md"
   ],
   "sideEffects": false,
   "scripts": {
-    "pre-build": "npm run build-bundle",
-    "build-bundle": "webpack --display=minimal --config ../../scripts/bundle.config.js"
+    "build-bundle": "ocular-bundle ./src/index.ts",
+    "pre-build": "npm run build-bundle && npm run build-bundle -- --env=dev"
   },
   "dependencies": {
     "@babel/runtime": "^7.0.0",
-    "@luma.gl/api": "9.0.0-alpha.16",
-    "@luma.gl/constants": "9.0.0-alpha.16",
-    "@luma.gl/shadertools": "9.0.0-alpha.16",
-    "@luma.gl/webgl": "9.0.0-alpha.16",
-    "@math.gl/core": "4.0.0-alpha.1",
-    "@probe.gl/log": "^4.0.0",
-    "@probe.gl/stats": "^4.0.0"
+    "@luma.gl/api": "9.0.0-alpha.19",
+    "@luma.gl/constants": "9.0.0-alpha.19",
+    "@luma.gl/shadertools": "9.0.0-alpha.19",
+    "@luma.gl/webgl": "9.0.0-alpha.19",
+    "@math.gl/core": "4.0.0-alpha.4",
+    "@probe.gl/log": "^4.0.2",
+    "@probe.gl/stats": "^4.0.2"
   },
-  "gitHead": "697bc4ef1deff8438e2f3be51bf0bd245882106a"
+  "gitHead": "d57e5fd81825ae4c7c23040ba63f54ad4ea7e972"
 }

package/src/animation/timeline.ts

@@ -7,7 +7,7 @@
  * @param rate = 1
  * @param repeat = 1
  */
- export type ChannelOptions = {
+export type ChannelOptions = {
   delay?: number
   duration?: number
   rate?: number

package/src/animation-loop/animation-loop.ts

@@ -88,7 +88,7 @@ export class AnimationLoop {
       throw new Error('No device provided');
     }
 
-    let {useDevicePixels = true} = this.props;
+    const {useDevicePixels = true} = this.props;
 
     // state
     this.stats = props.stats || new Stats({id: 'animation-loop-stats'});
@@ -313,7 +313,7 @@ export class AnimationLoop {
     // if (this.display && this.display.cancelAnimationFrame) {
     //   this.display.cancelAnimationFrame(this._animationFrameId);
     // }
-  cancelAnimationFrame(this._animationFrameId);
+    cancelAnimationFrame(this._animationFrameId);
     this._animationFrameId = null;
   }
 
@@ -356,7 +356,7 @@ export class AnimationLoop {
     this.animationProps = {
       animationLoop: this,
       device: this.device,
-      canvas: this.device?.canvasContext?.canvas!,
+      canvas: this.device?.canvasContext?.canvas,
       timeline: this.timeline,
 
       // Initial values
@@ -532,8 +532,8 @@ export class AnimationLoop {
 
   _startEventHandling() {
     if (this.canvas) {
-      this.canvas.addEventListener('mousemove', this._onMousemove);
-      this.canvas.addEventListener('mouseleave', this._onMouseleave);
+      this.canvas.addEventListener('mousemove', this._onMousemove.bind(this));
+      this.canvas.addEventListener('mouseleave', this._onMouseleave.bind(this));
     }
   }
 

package/src/animation-loop/make-animation-loop.ts

@@ -19,7 +19,7 @@ export function makeAnimationLoop(AnimationLoopTemplateCtor: typeof AnimationLoo
     device,
 
     async onInitialize(animationProps: AnimationProps): Promise<unknown> {
-        // @ts-expect-error abstract to prevent instantiation
+      // @ts-expect-error abstract to prevent instantiation
       renderLoop = new AnimationLoopTemplateCtor(animationProps);
       // Any async loading can be handled here
       return await renderLoop?.onInitialize(animationProps);
@@ -33,6 +33,7 @@ export function makeAnimationLoop(AnimationLoopTemplateCtor: typeof AnimationLoo
   // @ts-expect-error Hack: adds info for the website to find
   animationLoop.getInfo = () => {
     // @ts-ignore
+    // eslint-disable-next-line no-invalid-this
     return this.AnimationLoopTemplateCtor.info;
   }
 

package/src/geometry/geometry.ts

@@ -117,8 +117,8 @@ export default class Geometry {
       }
     }
 
-      // @ts-expect-error
-      if (this.indices && this.indices.isIndexed !== undefined) {
+    // @ts-expect-error
+    if (this.indices && this.indices.isIndexed !== undefined) {
       this.indices = Object.assign({}, this.indices);
       // @ts-expect-error
       delete this.indices.isIndexed;

package/src/index.ts

@@ -19,7 +19,7 @@ export {Model} from './lib/model';
 export {PipelineFactory} from './lib/pipeline-factory';
 
 // Utils
-// export {default as ClipSpace} from './lib/clip-space';
+export {ClipSpace} from './lib/clip-space';
 
 // Geometries
 export {default as Geometry} from './geometry/geometry';

package/src/lib/clip-space.ts

@@ -1,9 +1,10 @@
 
 // ClipSpace
-/*
 import GL from '@luma.gl/constants';
-import Model, {ModelProps} from './model';
+import {Device, glsl} from '@luma.gl/api';
+import {Model, ModelProps} from './model';
 import Geometry from '../geometry/geometry';
+import {WebGLDevice} from '@luma.gl/webgl/index';
 
 const CLIPSPACE_VERTEX_SHADER = glsl`\
 attribute vec2 aClipSpacePosition;
@@ -22,18 +23,22 @@ void main(void) {
 }
 `;
 
-/* eslint-disable indent, no-multi-spaces *
+/* eslint-disable indent, no-multi-spaces */
 const POSITIONS = [-1, -1, 1, -1, -1, 1, 1, 1];
 
-
-export default class ClipSpace extends Model {
-  constructor(gl: WebGLRenderingContext, opts?: ModelProps) {
+/**
+ * A flat geometry that covers the "visible area" that the GPU renders.
+ */
+export class ClipSpace extends Model {
+  constructor(device: Device | WebGLRenderingContext, opts?: ModelProps) {
     const TEX_COORDS = POSITIONS.map((coord) => (coord === -1 ? 0 : coord));
 
     super(
-      gl,
-      Object.assign({}, opts, {
+      WebGLDevice.attach(device),
+      {
+        ...opts,
         vs: CLIPSPACE_VERTEX_SHADER,
+        vertexCount: 4,
         geometry: new Geometry({
           drawMode: GL.TRIANGLE_STRIP,
           vertexCount: 4,
@@ -43,9 +48,7 @@ export default class ClipSpace extends Model {
             aCoordinate: {size: 2, value: new Float32Array(TEX_COORDS)}
           }
         })
-      })
+      }
     );
-    this.setVertexCount(4);
   }
 }
-*/

package/src/lib/pipeline-factory.ts

@@ -167,7 +167,7 @@ export class PipelineFactory {
   /** Calculate a hash based on all the inputs for a render pipeline */
   _hashRenderPipeline(props: GetRenderPipelineOptions): string {
     const {modules = [], varyings = [], defines = {}, inject = {}, parameters = {}} = props;
-     const vsHash = this._getHash(props.vs);
+    const vsHash = this._getHash(props.vs);
     const fsHash = props.fs ? this._getHash(props.fs) : 0;
 
     const moduleHashes = modules.map((m) => this._getHash(typeof m === 'string' ? m : m.name)).sort();

package/dist/bundle.d.ts

@@ -1,2 +0,0 @@
-declare const moduleExports: any;
-//# sourceMappingURL=bundle.d.ts.map

package/dist/bundle.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../src/bundle.ts"],"names":[],"mappings":"AACA,QAAA,MAAM,aAAa,KAAqB,CAAC"}

package/dist/bundle.js

@@ -1,5 +0,0 @@
-"use strict";
-// @ts-nocheck
-const moduleExports = require('./index');
-globalThis.luma = globalThis.luma || {};
-module.exports = Object.assign(globalThis.luma, moduleExports);