@luma.gl/webgl 9.0.0-alpha.14 → 9.0.0-alpha.16

package/dist/classic/accessor.js

@@ -1,144 +1,137 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { assert, checkProps } from '@luma.gl/api';
 import GL from '@luma.gl/constants';
-import { getTypedArrayFromGLType } from './typed-array-utils';
+import { getTypedArrayFromGLType } from './typed-array-utils.js';
 const DEFAULT_ACCESSOR_VALUES = {
-  offset: 0,
-  stride: 0,
-  type: GL.FLOAT,
-  size: 1,
-  divisor: 0,
-  normalized: false,
-  integer: false
+    offset: 0,
+    stride: 0,
+    type: GL.FLOAT,
+    size: 1,
+    divisor: 0,
+    normalized: false,
+    integer: false
 };
 const PROP_CHECKS = {
-  deprecatedProps: {
-    instanced: 'divisor',
-    isInstanced: 'divisor'
-  }
+    deprecatedProps: {
+        instanced: 'divisor',
+        isInstanced: 'divisor'
+    }
 };
 export default class Accessor {
-  static getBytesPerElement(accessor) {
-    const ArrayType = getTypedArrayFromGLType(accessor.type || GL.FLOAT);
-    return ArrayType.BYTES_PER_ELEMENT;
-  }
-
-  static getBytesPerVertex(accessor) {
-    assert(accessor.size);
-    const ArrayType = getTypedArrayFromGLType(accessor.type || GL.FLOAT);
-    return ArrayType.BYTES_PER_ELEMENT * accessor.size;
-  }
-
-  static resolve(...accessors) {
-    return new Accessor(...[DEFAULT_ACCESSOR_VALUES, ...accessors]);
-  }
-
-  constructor(...accessors) {
-    _defineProperty(this, "offset", void 0);
-
-    _defineProperty(this, "stride", void 0);
-
-    _defineProperty(this, "type", void 0);
-
-    _defineProperty(this, "size", void 0);
-
-    _defineProperty(this, "divisor", void 0);
-
-    _defineProperty(this, "normalized", void 0);
-
-    _defineProperty(this, "integer", void 0);
-
-    _defineProperty(this, "buffer", void 0);
-
-    _defineProperty(this, "index", void 0);
-
-    accessors.forEach(accessor => this._assign(accessor));
-    Object.freeze(this);
-  }
-
-  toString() {
-    return JSON.stringify(this);
-  }
-
-  get BYTES_PER_ELEMENT() {
-    return Accessor.getBytesPerElement(this);
-  }
-
-  get BYTES_PER_VERTEX() {
-    return Accessor.getBytesPerVertex(this);
-  }
-
-  _assign(props = {}) {
-    props = checkProps('Accessor', props, PROP_CHECKS);
-
-    if (props.type !== undefined) {
-      this.type = props.type;
-
-      if (props.type === GL.INT || props.type === GL.UNSIGNED_INT) {
-        this.integer = true;
-      }
-    }
-
-    if (props.size !== undefined) {
-      this.size = props.size;
-    }
-
-    if (props.offset !== undefined) {
-      this.offset = props.offset;
-    }
-
-    if (props.stride !== undefined) {
-      this.stride = props.stride;
-    }
-
-    if (props.normalize !== undefined) {
-      this.normalized = props.normalize;
+    static getBytesPerElement(accessor) {
+        // TODO: using `FLOAT` when type is not specified,
+        // ensure this assumption is valid or force API to specify type.
+        const ArrayType = getTypedArrayFromGLType(accessor.type || GL.FLOAT);
+        return ArrayType.BYTES_PER_ELEMENT;
     }
-
-    if (props.normalized !== undefined) {
-      this.normalized = props.normalized;
+    static getBytesPerVertex(accessor) {
+        assert(accessor.size);
+        // TODO: using `FLOAT` when type is not specified,
+        // ensure this assumption is valid or force API to specify type.
+        const ArrayType = getTypedArrayFromGLType(accessor.type || GL.FLOAT);
+        return ArrayType.BYTES_PER_ELEMENT * accessor.size;
     }
-
-    if (props.integer !== undefined) {
-      this.integer = props.integer;
+    // Combines (merges) a list of accessors. On top of default values
+    // Usually [programAccessor, bufferAccessor, appAccessor]
+    // All props will be set in the returned object.
+    // TODO check for conflicts between values in the supplied accessors
+    static resolve(...accessors) {
+        return new Accessor(...[DEFAULT_ACCESSOR_VALUES, ...accessors]); // Default values
     }
-
-    if (props.divisor !== undefined) {
-      this.divisor = props.divisor;
+    constructor(...accessors) {
+        accessors.forEach((accessor) => this._assign(accessor)); // Merge in sequence
+        Object.freeze(this);
     }
-
-    if (props.buffer !== undefined) {
-      this.buffer = props.buffer;
+    toString() {
+        return JSON.stringify(this);
     }
-
-    if (props.index !== undefined) {
-      if (typeof props.index === 'boolean') {
-        this.index = props.index ? 1 : 0;
-      } else {
-        this.index = props.index;
-      }
+    // ACCESSORS
+    // TODO - remove>
+    get BYTES_PER_ELEMENT() {
+        return Accessor.getBytesPerElement(this);
     }
-
-    if (props.instanced !== undefined) {
-      this.divisor = props.instanced ? 1 : 0;
+    get BYTES_PER_VERTEX() {
+        return Accessor.getBytesPerVertex(this);
     }
-
-    if (props.isInstanced !== undefined) {
-      this.divisor = props.isInstanced ? 1 : 0;
+    // PRIVATE
+    // eslint-disable-next-line complexity, max-statements
+    _assign(props = {}) {
+        props = checkProps('Accessor', props, PROP_CHECKS);
+        if (props.type !== undefined) {
+            this.type = props.type;
+            // Auto-deduce integer type?
+            if (props.type === GL.INT || props.type === GL.UNSIGNED_INT) {
+                this.integer = true;
+            }
+        }
+        if (props.size !== undefined) {
+            this.size = props.size;
+        }
+        if (props.offset !== undefined) {
+            this.offset = props.offset;
+        }
+        if (props.stride !== undefined) {
+            this.stride = props.stride;
+        }
+        // @ts-expect-error
+        if (props.normalize !== undefined) {
+            // @ts-expect-error
+            this.normalized = props.normalize;
+        }
+        if (props.normalized !== undefined) {
+            this.normalized = props.normalized;
+        }
+        if (props.integer !== undefined) {
+            this.integer = props.integer;
+        }
+        // INSTANCE DIVISOR
+        if (props.divisor !== undefined) {
+            this.divisor = props.divisor;
+        }
+        // Buffer is optional
+        if (props.buffer !== undefined) {
+            this.buffer = props.buffer;
+        }
+        // The binding index (for binding e.g. Transform feedbacks and Uniform buffers)
+        // TODO - should this be part of accessor?
+        if (props.index !== undefined) {
+            if (typeof props.index === 'boolean') {
+                this.index = props.index ? 1 : 0;
+            }
+            else {
+                this.index = props.index;
+            }
+        }
+        // DEPRECATED
+        // @ts-expect-error
+        if (props.instanced !== undefined) {
+            // @ts-expect-error
+            this.divisor = props.instanced ? 1 : 0;
+        }
+        // @ts-expect-error
+        if (props.isInstanced !== undefined) {
+            // @ts-expect-error
+            this.divisor = props.isInstanced ? 1 : 0;
+        }
+        if (this.offset === undefined)
+            delete this.offset;
+        if (this.stride === undefined)
+            delete this.stride;
+        if (this.type === undefined)
+            delete this.type;
+        if (this.size === undefined)
+            delete this.size;
+        if (this.divisor === undefined)
+            delete this.divisor;
+        if (this.normalized === undefined)
+            delete this.normalized;
+        if (this.integer === undefined)
+            delete this.integer;
+        if (this.buffer === undefined)
+            delete this.buffer;
+        if (this.index === undefined)
+            delete this.index;
+        return this;
     }
-
-    if (this.offset === undefined) delete this.offset;
-    if (this.stride === undefined) delete this.stride;
-    if (this.type === undefined) delete this.type;
-    if (this.size === undefined) delete this.size;
-    if (this.divisor === undefined) delete this.divisor;
-    if (this.normalized === undefined) delete this.normalized;
-    if (this.integer === undefined) delete this.integer;
-    if (this.buffer === undefined) delete this.buffer;
-    if (this.index === undefined) delete this.index;
-    return this;
-  }
-
 }
+// TEST EXPORTS
 export { DEFAULT_ACCESSOR_VALUES };
-//# sourceMappingURL=accessor.js.map

package/dist/classic/buffer.d.ts

@@ -4,7 +4,7 @@ import { AccessorObject } from '../types';
 import Accessor from './accessor';
 import WEBGLBuffer from '../adapter/resources/webgl-buffer';
 /** WebGL Buffer interface */
-export declare type ClassicBufferProps = BufferProps & {
+export type ClassicBufferProps = BufferProps & {
     handle?: WebGLBuffer;
     target?: number;
     webglUsage?: number;

package/dist/classic/buffer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buffer.d.ts","sourceRoot":"","sources":["../../src/classic/buffer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AAElE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAEpC,OAAO,EAAC,cAAc,EAAC,MAAM,UAAU,CAAC;AACxC,OAAO,QAAQ,MAAM,YAAY,CAAC;AAIlC,OAAO,WAAW,MAAM,mCAAmC,CAAC;AAoD5D,6BAA6B;AAC7B,oBAAY,kBAAkB,GAAG,WAAW,GAAG;IAC7C,MAAM,CAAC,EAAE,WAAW,CAAC;IAErB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAE1B,kBAAkB;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,kBAAkB;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,kBAAkB;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,6BAA6B;AAC7B,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,WAAW;IACpD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,QAAQ,CAAC;gBAEP,MAAM,EAAE,MAAM,GAAG,qBAAqB,EAAE,KAAK,CAAC,EAAE,kBAAkB;gBAClE,MAAM,EAAE,MAAM,GAAG,qBAAqB,EAAE,IAAI,EAAE,eAAe,GAAG,MAAM,EAAE;gBACxE,MAAM,EAAE,MAAM,GAAG,qBAAqB,EAAE,UAAU,EAAE,MAAM;IAqB7D,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;IAK3D,eAAe,CAAC,QAAQ,GAAE,cAA8B,GAAG,MAAM;IAKjE,cAAc,CAAC,QAAQ,GAAE,cAA8B,GAAG,MAAM;IAQhE,UAAU,CAAC,KAAK,GAAE,kBAAuB,GAAG,IAAI;IA+BhD,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAYzC,WAAW,CAAC,QAAQ,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IAkBtD,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAUvC,OAAO,CAAC,KAAK,EAAE,kBAAkB;IASjC,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG;QAAC,IAAI,EAAE,UAAU,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAC;IAkC3H;;;OAGG;IACH,QAAQ,CAAC,OAAO,EAAE;QAChB,YAAY,EAAE,GAAG,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,IAAI,EAAE,GAAG,CAAC;KACX,GAAG,IAAI;IAkBR;;;OAGG;IACM,OAAO,CAAC,OAAO,CAAC,EAAE;QACzB,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,GAAG,GAAG;IAsCP;;;;;;OAMG;IACH,IAAI,CAAC,OAAO,CAAC,EAAE;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,GAAG,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAC,GAAG,IAAI;IAwBhF,MAAM,CAAC,OAAO,CAAC,EAAE;QAAC,MAAM,CAAC,EAAE,GAAG,CAAC;QAAC,KAAK,CAAC,EAAE,GAAG,CAAA;KAAC,GAAG,IAAI;IAcnD,YAAY,IAAI;QACd,IAAI,EAAE,GAAG,CAAC;QACV,OAAO,EAAE,OAAO,CAAC;KAClB;IAQD,mBAAmB;IAOnB,QAAQ,CAAC,IAAI,KAAA,EAAE,MAAM,GAAE,MAAU,EAAE,UAAU,GAAE,MAAiC,GAAG,IAAI;IAwBvF,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,SAAkB,GAAG,IAAI;IA8BtE,UAAU;IAKV,yBAAyB,CAAC,aAAa,EAAE,MAAM;IAQ/C,UAAU,CAAC,IAAI,KAAA;IAQf,YAAY,CAAC,KAAK,EAAE,EAAE,GAAG,GAAG;IAQ5B,2CAA2C;IAC3C,IAAI,IAAI,WAEP;CACF"}
+{"version":3,"file":"buffer.d.ts","sourceRoot":"","sources":["../../src/classic/buffer.ts"],"names":[],"mappings":"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"}