@luma.gl/webgl 9.0.0-alpha.3 → 9.0.0-alpha.31

package/dist/classic/accessor.js

@@ -1,7 +1,7 @@
 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 { assert, checkProps } from '@luma.gl/core';
+import { GL } from '@luma.gl/constants';
+import { getTypedArrayFromGLType } from "./typed-array-utils.js";
 const DEFAULT_ACCESSOR_VALUES = {
   offset: 0,
   stride: 0,
@@ -17,100 +17,80 @@ const PROP_CHECKS = {
     isInstanced: 'divisor'
   }
 };
-export default class Accessor {
+export 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) {
+  static resolve() {
+    for (var _len = arguments.length, accessors = new Array(_len), _key = 0; _key < _len; _key++) {
+      accessors[_key] = arguments[_key];
+    }
     return new Accessor(...[DEFAULT_ACCESSOR_VALUES, ...accessors]);
   }
-
-  constructor(...accessors) {
+  constructor() {
     _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);
-
+    for (var _len2 = arguments.length, accessors = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+      accessors[_key2] = arguments[_key2];
+    }
     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 = {}) {
+  _assign() {
+    let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     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;
     }
-
     if (props.normalized !== undefined) {
       this.normalized = props.normalized;
     }
-
     if (props.integer !== undefined) {
       this.integer = props.integer;
     }
-
     if (props.divisor !== undefined) {
       this.divisor = props.divisor;
     }
-
     if (props.buffer !== undefined) {
       this.buffer = props.buffer;
     }
-
     if (props.index !== undefined) {
       if (typeof props.index === 'boolean') {
         this.index = props.index ? 1 : 0;
@@ -118,15 +98,12 @@ export default class Accessor {
         this.index = props.index;
       }
     }
-
     if (props.instanced !== undefined) {
       this.divisor = props.instanced ? 1 : 0;
     }
-
     if (props.isInstanced !== undefined) {
       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;
@@ -138,7 +115,6 @@ export default class Accessor {
     if (this.index === undefined) delete this.index;
     return this;
   }
-
 }
 export { DEFAULT_ACCESSOR_VALUES };
 //# sourceMappingURL=accessor.js.map

package/dist/classic/accessor.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/classic/accessor.ts"],"names":["assert","checkProps","GL","getTypedArrayFromGLType","DEFAULT_ACCESSOR_VALUES","offset","stride","type","FLOAT","size","divisor","normalized","integer","PROP_CHECKS","deprecatedProps","instanced","isInstanced","Accessor","getBytesPerElement","accessor","ArrayType","BYTES_PER_ELEMENT","getBytesPerVertex","resolve","accessors","constructor","forEach","_assign","Object","freeze","toString","JSON","stringify","BYTES_PER_VERTEX","props","undefined","INT","UNSIGNED_INT","normalize","buffer","index"],"mappings":";AAAA,SAAQA,MAAR,EAAgBC,UAAhB,QAAyD,cAAzD;AACA,OAAOC,EAAP,MAAe,oBAAf;AACA,SAAQC,uBAAR,QAAsC,qBAAtC;AAeA,MAAMC,uBAAuB,GAAG;AAC9BC,EAAAA,MAAM,EAAE,CADsB;AAE9BC,EAAAA,MAAM,EAAE,CAFsB;AAG9BC,EAAAA,IAAI,EAAEL,EAAE,CAACM,KAHqB;AAI9BC,EAAAA,IAAI,EAAE,CAJwB;AAK9BC,EAAAA,OAAO,EAAE,CALqB;AAM9BC,EAAAA,UAAU,EAAE,KANkB;AAO9BC,EAAAA,OAAO,EAAE;AAPqB,CAAhC;AAUA,MAAMC,WAAW,GAAG;AAClBC,EAAAA,eAAe,EAAE;AACfC,IAAAA,SAAS,EAAE,SADI;AAEfC,IAAAA,WAAW,EAAE;AAFE;AADC,CAApB;AAOA,eAAe,MAAMC,QAAN,CAAyC;AAY7B,SAAlBC,kBAAkB,CAACC,QAAD,EAA8C;AAGrE,UAAMC,SAAS,GAAGjB,uBAAuB,CAACgB,QAAQ,CAACZ,IAAT,IAAiBL,EAAE,CAACM,KAArB,CAAzC;AACA,WAAOY,SAAS,CAACC,iBAAjB;AACD;;AAEuB,SAAjBC,iBAAiB,CAACH,QAAD,EAAmC;AACzDnB,IAAAA,MAAM,CAACmB,QAAQ,CAACV,IAAV,CAAN;AAGA,UAAMW,SAAS,GAAGjB,uBAAuB,CAACgB,QAAQ,CAACZ,IAAT,IAAiBL,EAAE,CAACM,KAArB,CAAzC;AACA,WAAOY,SAAS,CAACC,iBAAV,GAA8BF,QAAQ,CAACV,IAA9C;AACD;;AAMa,SAAPc,OAAO,CAAC,GAAGC,SAAJ,EAA2C;AACvD,WAAO,IAAIP,QAAJ,CAAa,GAAG,CAACb,uBAAD,EAA0B,GAAGoB,SAA7B,CAAhB,CAAP;AACD;;AAEDC,EAAAA,WAAW,CAAC,GAAGD,SAAJ,EAAiC;AAAA;;AAAA;;AAAA;;AAAA;;AAAA;;AAAA;;AAAA;;AAAA;;AAAA;;AAC1CA,IAAAA,SAAS,CAACE,OAAV,CAAmBP,QAAD,IAAc,KAAKQ,OAAL,CAAaR,QAAb,CAAhC;AACAS,IAAAA,MAAM,CAACC,MAAP,CAAc,IAAd;AACD;;AAEDC,EAAAA,QAAQ,GAAW;AACjB,WAAOC,IAAI,CAACC,SAAL,CAAe,IAAf,CAAP;AACD;;AAKoB,MAAjBX,iBAAiB,GAAW;AAC9B,WAAOJ,QAAQ,CAACC,kBAAT,CAA4B,IAA5B,CAAP;AACD;;AAEmB,MAAhBe,gBAAgB,GAAW;AAC7B,WAAOhB,QAAQ,CAACK,iBAAT,CAA2B,IAA3B,CAAP;AACD;;AAKDK,EAAAA,OAAO,CAACO,KAAqB,GAAG,EAAzB,EAAmC;AACxCA,IAAAA,KAAK,GAAGjC,UAAU,CAAC,UAAD,EAAaiC,KAAb,EAAoBrB,WAApB,CAAlB;;AAEA,QAAIqB,KAAK,CAAC3B,IAAN,KAAe4B,SAAnB,EAA8B;AAC5B,WAAK5B,IAAL,GAAY2B,KAAK,CAAC3B,IAAlB;;AAGA,UAAI2B,KAAK,CAAC3B,IAAN,KAAeL,EAAE,CAACkC,GAAlB,IAAyBF,KAAK,CAAC3B,IAAN,KAAeL,EAAE,CAACmC,YAA/C,EAA6D;AAC7D,aAAKzB,OAAL,GAAe,IAAf;AACC;AACF;;AACD,QAAIsB,KAAK,CAACzB,IAAN,KAAe0B,SAAnB,EAA8B;AAC5B,WAAK1B,IAAL,GAAYyB,KAAK,CAACzB,IAAlB;AACD;;AACD,QAAIyB,KAAK,CAAC7B,MAAN,KAAiB8B,SAArB,EAAgC;AAC9B,WAAK9B,MAAL,GAAc6B,KAAK,CAAC7B,MAApB;AACD;;AACD,QAAI6B,KAAK,CAAC5B,MAAN,KAAiB6B,SAArB,EAAgC;AAC9B,WAAK7B,MAAL,GAAc4B,KAAK,CAAC5B,MAApB;AACD;;AAED,QAAI4B,KAAK,CAACI,SAAN,KAAoBH,SAAxB,EAAmC;AAEjC,WAAKxB,UAAL,GAAkBuB,KAAK,CAACI,SAAxB;AACD;;AACD,QAAIJ,KAAK,CAACvB,UAAN,KAAqBwB,SAAzB,EAAoC;AAClC,WAAKxB,UAAL,GAAkBuB,KAAK,CAACvB,UAAxB;AACD;;AACD,QAAIuB,KAAK,CAACtB,OAAN,KAAkBuB,SAAtB,EAAiC;AAC/B,WAAKvB,OAAL,GAAesB,KAAK,CAACtB,OAArB;AACD;;AAGD,QAAIsB,KAAK,CAACxB,OAAN,KAAkByB,SAAtB,EAAiC;AAC/B,WAAKzB,OAAL,GAAewB,KAAK,CAACxB,OAArB;AACD;;AAGD,QAAIwB,KAAK,CAACK,MAAN,KAAiBJ,SAArB,EAAgC;AAC9B,WAAKI,MAAL,GAAcL,KAAK,CAACK,MAApB;AACD;;AAID,QAAIL,KAAK,CAACM,KAAN,KAAgBL,SAApB,EAA+B;AAC7B,UAAI,OAAOD,KAAK,CAACM,KAAb,KAAuB,SAA3B,EAAsC;AACpC,aAAKA,KAAL,GAAaN,KAAK,CAACM,KAAN,GAAc,CAAd,GAAkB,CAA/B;AACD,OAFD,MAEO;AACL,aAAKA,KAAL,GAAaN,KAAK,CAACM,KAAnB;AACD;AACF;;AAID,QAAIN,KAAK,CAACnB,SAAN,KAAoBoB,SAAxB,EAAmC;AAEjC,WAAKzB,OAAL,GAAewB,KAAK,CAACnB,SAAN,GAAkB,CAAlB,GAAsB,CAArC;AACD;;AAED,QAAImB,KAAK,CAAClB,WAAN,KAAsBmB,SAA1B,EAAqC;AAEnC,WAAKzB,OAAL,GAAewB,KAAK,CAAClB,WAAN,GAAoB,CAApB,GAAwB,CAAvC;AACD;;AAED,QAAI,KAAKX,MAAL,KAAgB8B,SAApB,EAA+B,OAAO,KAAK9B,MAAZ;AAC/B,QAAI,KAAKC,MAAL,KAAgB6B,SAApB,EAA+B,OAAO,KAAK7B,MAAZ;AAC/B,QAAI,KAAKC,IAAL,KAAc4B,SAAlB,EAA6B,OAAO,KAAK5B,IAAZ;AAC7B,QAAI,KAAKE,IAAL,KAAc0B,SAAlB,EAA6B,OAAO,KAAK1B,IAAZ;AAC7B,QAAI,KAAKC,OAAL,KAAiByB,SAArB,EAAgC,OAAO,KAAKzB,OAAZ;AAChC,QAAI,KAAKC,UAAL,KAAoBwB,SAAxB,EAAmC,OAAO,KAAKxB,UAAZ;AACnC,QAAI,KAAKC,OAAL,KAAiBuB,SAArB,EAAgC,OAAO,KAAKvB,OAAZ;AAEhC,QAAI,KAAK2B,MAAL,KAAgBJ,SAApB,EAA+B,OAAO,KAAKI,MAAZ;AAC/B,QAAI,KAAKC,KAAL,KAAeL,SAAnB,EAA8B,OAAO,KAAKK,KAAZ;AAE9B,WAAO,IAAP;AACD;;AAtIqD;AA0IxD,SAAQpC,uBAAR","sourcesContent":["import {assert, checkProps, Buffer, AccessorObject} from '@luma.gl/api';\nimport GL from '@luma.gl/constants';\nimport {getTypedArrayFromGLType} from './typed-array-utils';\n\n// export interface AccessorObject {\n//   offset?: number;\n//   stride?: number;\n//   type?: number;\n//   size?: number;\n//   divisor?: number;\n//   normalized?: boolean;\n//   integer?: boolean;\n\n//   buffer?: Buffer;\n//   index?: number;\n// }\n\nconst DEFAULT_ACCESSOR_VALUES = {\n  offset: 0,\n  stride: 0,\n  type: GL.FLOAT,\n  size: 1,\n  divisor: 0,\n  normalized: false,\n  integer: false\n};\n\nconst PROP_CHECKS = {\n  deprecatedProps: {\n    instanced: 'divisor',\n    isInstanced: 'divisor'\n  }\n};\n\nexport default class Accessor implements AccessorObject {\n  offset?: number;\n  stride?: number;\n  type?: number;\n  size?: number;\n  divisor?: number;\n  normalized?: boolean;\n  integer?: boolean;\n\n  buffer?: Buffer;\n  index?: number;\n\n  static getBytesPerElement(accessor: Accessor | AccessorObject): number {\n    // TODO: using `FLOAT` when type is not specified,\n    // ensure this assumption is valid or force API to specify type.\n    const ArrayType = getTypedArrayFromGLType(accessor.type || GL.FLOAT);\n    return ArrayType.BYTES_PER_ELEMENT;\n  }\n\n  static getBytesPerVertex(accessor: AccessorObject): number {\n    assert(accessor.size);\n    // TODO: using `FLOAT` when type is not specified,\n    // ensure this assumption is valid or force API to specify type.\n    const ArrayType = getTypedArrayFromGLType(accessor.type || GL.FLOAT);\n    return ArrayType.BYTES_PER_ELEMENT * accessor.size;\n  }\n\n  // Combines (merges) a list of accessors. On top of default values\n  // Usually [programAccessor, bufferAccessor, appAccessor]\n  // All props will be set in the returned object.\n  // TODO check for conflicts between values in the supplied accessors\n  static resolve(...accessors: AccessorObject[]): Accessor {\n    return new Accessor(...[DEFAULT_ACCESSOR_VALUES, ...accessors]); // Default values\n  }\n\n  constructor(...accessors: AccessorObject[]) {\n    accessors.forEach((accessor) => this._assign(accessor)); // Merge in sequence\n    Object.freeze(this);\n  }\n\n  toString(): string {\n    return JSON.stringify(this);\n  }\n\n  // ACCESSORS\n\n  // TODO - remove>\n  get BYTES_PER_ELEMENT(): number {\n    return Accessor.getBytesPerElement(this);\n  }\n\n  get BYTES_PER_VERTEX(): number {\n    return Accessor.getBytesPerVertex(this);\n  }\n\n  // PRIVATE\n\n  // eslint-disable-next-line complexity, max-statements\n  _assign(props: AccessorObject = {}): this {\n    props = checkProps('Accessor', props, PROP_CHECKS);\n\n    if (props.type !== undefined) {\n      this.type = props.type;\n\n      // Auto-deduce integer type?\n      if (props.type === GL.INT || props.type === GL.UNSIGNED_INT) {\n      this.integer = true;\n      }\n    }\n    if (props.size !== undefined) {\n      this.size = props.size;\n    }\n    if (props.offset !== undefined) {\n      this.offset = props.offset;\n    }\n    if (props.stride !== undefined) {\n      this.stride = props.stride;\n    }\n    // @ts-expect-error\n    if (props.normalize !== undefined) {\n      // @ts-expect-error\n      this.normalized = props.normalize;\n    }\n    if (props.normalized !== undefined) {\n      this.normalized = props.normalized;\n    }\n    if (props.integer !== undefined) {\n      this.integer = props.integer;\n    }\n\n    // INSTANCE DIVISOR\n    if (props.divisor !== undefined) {\n      this.divisor = props.divisor;\n    }\n\n    // Buffer is optional\n    if (props.buffer !== undefined) {\n      this.buffer = props.buffer;\n    }\n\n    // The binding index (for binding e.g. Transform feedbacks and Uniform buffers)\n    // TODO - should this be part of accessor?\n    if (props.index !== undefined) {\n      if (typeof props.index === 'boolean') {\n        this.index = props.index ? 1 : 0;\n      } else {\n        this.index = props.index;\n      }\n    }\n\n    // DEPRECATED\n    // @ts-expect-error\n    if (props.instanced !== undefined) {\n      // @ts-expect-error\n      this.divisor = props.instanced ? 1 : 0;\n    }\n    // @ts-expect-error\n    if (props.isInstanced !== undefined) {\n      // @ts-expect-error\n      this.divisor = props.isInstanced ? 1 : 0;\n    }\n\n    if (this.offset === undefined) delete this.offset;\n    if (this.stride === undefined) delete this.stride;\n    if (this.type === undefined) delete this.type;\n    if (this.size === undefined) delete this.size;\n    if (this.divisor === undefined) delete this.divisor;\n    if (this.normalized === undefined) delete this.normalized;\n    if (this.integer === undefined) delete this.integer;\n  \n    if (this.buffer === undefined) delete this.buffer;\n    if (this.index === undefined) delete this.index;\n  \n    return this;\n  }\n}\n\n// TEST EXPORTS\nexport {DEFAULT_ACCESSOR_VALUES};\n"],"file":"accessor.js"}
+{"version":3,"file":"accessor.js","names":["assert","checkProps","GL","getTypedArrayFromGLType","DEFAULT_ACCESSOR_VALUES","offset","stride","type","FLOAT","size","divisor","normalized","integer","PROP_CHECKS","deprecatedProps","instanced","isInstanced","Accessor","getBytesPerElement","accessor","ArrayType","BYTES_PER_ELEMENT","getBytesPerVertex","resolve","_len","arguments","length","accessors","Array","_key","constructor","_defineProperty","_len2","_key2","forEach","_assign","Object","freeze","toString","JSON","stringify","BYTES_PER_VERTEX","props","undefined","INT","UNSIGNED_INT","normalize","buffer","index"],"sources":["../../src/classic/accessor.ts"],"sourcesContent":["import {assert, checkProps, Buffer, AccessorObject} from '@luma.gl/core';\nimport {GL} from '@luma.gl/constants';\nimport {getTypedArrayFromGLType} from './typed-array-utils';\n\nconst DEFAULT_ACCESSOR_VALUES = {\n  offset: 0,\n  stride: 0,\n  type: GL.FLOAT,\n  size: 1,\n  divisor: 0,\n  normalized: false,\n  integer: false\n};\n\nconst PROP_CHECKS = {\n  deprecatedProps: {\n    instanced: 'divisor',\n    isInstanced: 'divisor'\n  }\n};\n\nexport class Accessor implements AccessorObject {\n  offset?: number;\n  stride?: number;\n  type?: number;\n  size?: number;\n  divisor?: number;\n  normalized?: boolean;\n  integer?: boolean;\n\n  buffer?: Buffer;\n  index?: number;\n\n  static getBytesPerElement(accessor: Accessor | AccessorObject): number {\n    // TODO: using `FLOAT` when type is not specified,\n    // ensure this assumption is valid or force API to specify type.\n    const ArrayType = getTypedArrayFromGLType(accessor.type || GL.FLOAT);\n    return ArrayType.BYTES_PER_ELEMENT;\n  }\n\n  static getBytesPerVertex(accessor: AccessorObject): number {\n    assert(accessor.size);\n    // TODO: using `FLOAT` when type is not specified,\n    // ensure this assumption is valid or force API to specify type.\n    const ArrayType = getTypedArrayFromGLType(accessor.type || GL.FLOAT);\n    return ArrayType.BYTES_PER_ELEMENT * accessor.size;\n  }\n\n  // Combines (merges) a list of accessors. On top of default values\n  // Usually [programAccessor, bufferAccessor, appAccessor]\n  // All props will be set in the returned object.\n  // TODO check for conflicts between values in the supplied accessors\n  static resolve(...accessors: AccessorObject[]): Accessor {\n    return new Accessor(...[DEFAULT_ACCESSOR_VALUES, ...accessors]); // Default values\n  }\n\n  constructor(...accessors: AccessorObject[]) {\n    accessors.forEach((accessor) => this._assign(accessor)); // Merge in sequence\n    Object.freeze(this);\n  }\n\n  toString(): string {\n    return JSON.stringify(this);\n  }\n\n  // ACCESSORS\n\n  // TODO - remove>\n  get BYTES_PER_ELEMENT(): number {\n    return Accessor.getBytesPerElement(this);\n  }\n\n  get BYTES_PER_VERTEX(): number {\n    return Accessor.getBytesPerVertex(this);\n  }\n\n  // PRIVATE\n\n  // eslint-disable-next-line complexity, max-statements\n  _assign(props: AccessorObject = {}): this {\n    props = checkProps('Accessor', props, PROP_CHECKS);\n\n    if (props.type !== undefined) {\n      this.type = props.type;\n\n      // Auto-deduce integer type?\n      if (props.type === GL.INT || props.type === GL.UNSIGNED_INT) {\n        this.integer = true;\n      }\n    }\n    if (props.size !== undefined) {\n      this.size = props.size;\n    }\n    if (props.offset !== undefined) {\n      this.offset = props.offset;\n    }\n    if (props.stride !== undefined) {\n      this.stride = props.stride;\n    }\n    // @ts-expect-error\n    if (props.normalize !== undefined) {\n      // @ts-expect-error\n      this.normalized = props.normalize;\n    }\n    if (props.normalized !== undefined) {\n      this.normalized = props.normalized;\n    }\n    if (props.integer !== undefined) {\n      this.integer = props.integer;\n    }\n\n    // INSTANCE DIVISOR\n    if (props.divisor !== undefined) {\n      this.divisor = props.divisor;\n    }\n\n    // Buffer is optional\n    if (props.buffer !== undefined) {\n      this.buffer = props.buffer;\n    }\n\n    // The binding index (for binding e.g. Transform feedbacks and Uniform buffers)\n    // TODO - should this be part of accessor?\n    if (props.index !== undefined) {\n      if (typeof props.index === 'boolean') {\n        this.index = props.index ? 1 : 0;\n      } else {\n        this.index = props.index;\n      }\n    }\n\n    // DEPRECATED\n    // @ts-expect-error\n    if (props.instanced !== undefined) {\n      // @ts-expect-error\n      this.divisor = props.instanced ? 1 : 0;\n    }\n    // @ts-expect-error\n    if (props.isInstanced !== undefined) {\n      // @ts-expect-error\n      this.divisor = props.isInstanced ? 1 : 0;\n    }\n\n    if (this.offset === undefined) delete this.offset;\n    if (this.stride === undefined) delete this.stride;\n    if (this.type === undefined) delete this.type;\n    if (this.size === undefined) delete this.size;\n    if (this.divisor === undefined) delete this.divisor;\n    if (this.normalized === undefined) delete this.normalized;\n    if (this.integer === undefined) delete this.integer;\n  \n    if (this.buffer === undefined) delete this.buffer;\n    if (this.index === undefined) delete this.index;\n  \n    return this;\n  }\n}\n\n// TEST EXPORTS\nexport {DEFAULT_ACCESSOR_VALUES};\n"],"mappings":"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"}

package/dist/classic/{buffer.d.ts → buffer-with-accessor.d.ts}

@@ -1,39 +1,27 @@
-import type { Device, BufferProps, TypedArray } from '@luma.gl/api';
-import GL from '@luma.gl/constants';
+import type { Device, BufferProps, TypedArray } from '@luma.gl/core';
+import { GL } from '@luma.gl/constants';
 import { AccessorObject } from '../types';
-import Accessor from './accessor';
-import WEBGLBuffer from '../adapter/resources/webgl-buffer';
+import { Accessor } from './accessor';
+import { WEBGLBuffer } from '../adapter/resources/webgl-buffer';
 /** WebGL Buffer interface */
-export declare type ClassicBufferProps = BufferProps & {
+export type BufferWithAccessorProps = BufferProps & {
     handle?: WebGLBuffer;
-    target?: number;
-    webglUsage?: number;
     accessor?: AccessorObject;
-    /** @deprecated */
-    index?: number;
-    /** @deprecated */
-    offset?: number;
-    /** @deprecated */
-    size?: number;
-    /** @deprecated */
-    type?: number;
 };
 /** WebGL Buffer interface */
-export default class ClassicBuffer extends WEBGLBuffer {
+export declare class BufferWithAccessor extends WEBGLBuffer {
     usage: number;
     accessor: Accessor;
-    constructor(device: Device | WebGLRenderingContext, props?: ClassicBufferProps);
+    constructor(device: Device | WebGLRenderingContext, props?: BufferWithAccessorProps);
     constructor(device: Device | WebGLRenderingContext, data: ArrayBufferView | number[]);
     constructor(device: Device | WebGLRenderingContext, byteLength: number);
-    destroy(): void;
-    write(data: TypedArray, byteOffset?: number): void;
     getElementCount(accessor?: AccessorObject): number;
     getVertexCount(accessor?: AccessorObject): number;
-    initialize(props?: ClassicBufferProps): this;
-    setProps(props: ClassicBufferProps): this;
+    initialize(props?: BufferWithAccessorProps): this;
+    setProps(props: BufferWithAccessorProps): this;
     setAccessor(accessor: AccessorObject | Accessor): this;
     reallocate(byteLength: number): boolean;
-    setData(props: ClassicBufferProps): this;
+    setData(props: BufferWithAccessorProps): this;
     subData(options: TypedArray | {
         data: TypedArray;
         offset?: number;
@@ -69,13 +57,13 @@ export default class ClassicBuffer extends WEBGLBuffer {
      *   - GL.UNIFORM_BUFFER: `size` must be a minimum of GL.UNIFORM_BLOCK_SIZE_DATA.
      */
     bind(options?: {
-        target?: number;
+        glTarget?: number;
         index?: any;
         offset?: number;
-        size: any;
+        size?: any;
     }): this;
     unbind(options?: {
-        target?: any;
+        glTarget?: any;
         index?: any;
     }): this;
     getDebugData(): {
@@ -84,12 +72,12 @@ export default class ClassicBuffer extends WEBGLBuffer {
     };
     invalidateDebugData(): void;
     _setData(data: any, offset?: number, byteLength?: number): this;
-    _setByteLength(byteLength: number, webglUsage?: number): this;
-    _getTarget(): number;
+    _setByteLength(byteLength: number): this;
+    _getTarget(): GL.ARRAY_BUFFER | GL.ELEMENT_ARRAY_BUFFER | GL.COPY_WRITE_BUFFER | GL.UNIFORM_BUFFER;
     _getAvailableElementCount(srcByteOffset: number): number;
     _inferType(data: any): void;
     getParameter(pname: GL): any;
     /** @deprecated Use Buffer.accessor.type */
     get type(): number;
 }
-//# sourceMappingURL=buffer.d.ts.map
+//# sourceMappingURL=buffer-with-accessor.d.ts.map

package/dist/classic/buffer-with-accessor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buffer-with-accessor.d.ts","sourceRoot":"","sources":["../../src/classic/buffer-with-accessor.ts"],"names":[],"mappings":"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"}

package/dist/classic/{buffer.js → buffer-with-accessor.js}

@@ -1,11 +1,11 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { assert, checkProps } from '@luma.gl/api';
-import GL from '@luma.gl/constants';
-import { assertWebGL2Context } from '../context/context/webgl-checks';
-import Accessor from './accessor';
-import { getGLTypeFromTypedArray, getTypedArrayFromGLType } from './typed-array-utils';
-import WebGLDevice from '../adapter/webgl-device';
-import WEBGLBuffer from '../adapter/resources/webgl-buffer';
+import { assert, checkProps } from '@luma.gl/core';
+import { GL } from '@luma.gl/constants';
+import { assertWebGL2Context } from "../context/context/webgl-checks.js";
+import { Accessor } from "./accessor.js";
+import { getGLTypeFromTypedArray, getTypedArrayFromGLType } from "./typed-array-utils.js";
+import { WebGLDevice } from "../adapter/webgl-device.js";
+import { WEBGLBuffer } from "../adapter/resources/webgl-buffer.js";
 const DEBUG_DATA_LENGTH = 10;
 const DEPRECATED_PROPS = {
   offset: 'accessor.offset',
@@ -28,7 +28,6 @@ const PROP_CHECKS_INITIALIZE = {
 const PROP_CHECKS_SET_PROPS = {
   removedProps: DEPRECATED_PROPS
 };
-
 function getWEBGLBufferProps(props) {
   if (ArrayBuffer.isView(props)) {
     return {
@@ -39,28 +38,19 @@ function getWEBGLBufferProps(props) {
       byteLength: props
     };
   }
-
   props = checkProps('Buffer', props, PROP_CHECKS_INITIALIZE);
-  const bufferProps = { ...props
+  const bufferProps = {
+    ...props
   };
-
-  if (bufferProps.offset) {
-    bufferProps.byteOffset = bufferProps.offset;
-  }
-
   return bufferProps;
 }
-
-export default class ClassicBuffer extends WEBGLBuffer {
-  constructor(device, props = {}) {
+export class BufferWithAccessor extends WEBGLBuffer {
+  constructor(device) {
+    let props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     super(WebGLDevice.attach(device), getWEBGLBufferProps(props));
-
     _defineProperty(this, "usage", void 0);
-
     _defineProperty(this, "accessor", void 0);
-
     this.setAccessor(Object.assign({}, props, props.accessor));
-
     if (this.props.data) {
       const type = getGLTypeFromTypedArray(this.props.data);
       assert(type);
@@ -68,100 +58,69 @@ export default class ClassicBuffer extends WEBGLBuffer {
         type
       }));
     }
-
     Object.seal(this);
   }
-
-  destroy() {
-    if (this.handle) {
-      this.removeStats();
-      this.trackDeallocatedMemory();
-      this.gl.deleteBuffer(this.handle);
-      this.handle = null;
-    }
-  }
-
-  write(data, byteOffset) {
-    this.subData({
-      data,
-      offset: byteOffset
-    });
-  }
-
-  getElementCount(accessor = this.accessor) {
+  getElementCount() {
+    let accessor = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.accessor;
     return Math.round(this.byteLength / Accessor.getBytesPerElement(accessor));
   }
-
-  getVertexCount(accessor = this.accessor) {
+  getVertexCount() {
+    let accessor = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.accessor;
     return Math.round(this.byteLength / Accessor.getBytesPerVertex(accessor));
   }
-
-  initialize(props = {}) {
+  initialize() {
+    let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     if (ArrayBuffer.isView(props)) {
       props = {
         data: props
       };
     }
-
     if (Number.isFinite(props)) {
       props = {
         byteLength: props
       };
     }
-
     props = checkProps('Buffer', props, PROP_CHECKS_INITIALIZE);
-    this.webglUsage = props.webglUsage || GL.STATIC_DRAW;
+    this.glUsage = props.glUsage || GL.STATIC_DRAW;
     this.debugData = null;
     this.setAccessor(Object.assign({}, props, props.accessor));
-
     if (props.data) {
-      this._setData(props.data, props.offset, props.byteLength);
+      this._setData(props.data, props.byteOffset, props.byteLength);
     } else {
       this._setByteLength(props.byteLength || 0);
     }
-
     return this;
   }
-
   setProps(props) {
     props = checkProps('Buffer', props, PROP_CHECKS_SET_PROPS);
-
     if ('accessor' in props) {
       this.setAccessor(props.accessor);
     }
-
     return this;
   }
-
   setAccessor(accessor) {
     accessor = Object.assign({}, accessor);
     delete accessor.buffer;
     this.accessor = new Accessor(accessor);
     return this;
   }
-
   reallocate(byteLength) {
     if (byteLength > this.byteLength) {
       this._setByteLength(byteLength);
-
       return true;
     }
-
     this.bytesUsed = byteLength;
     return false;
   }
-
   setData(props) {
     return this.initialize(props);
   }
-
   subData(options) {
     if (ArrayBuffer.isView(options)) {
       options = {
         data: options
       };
     }
-
     const {
       data,
       offset = 0,
@@ -169,24 +128,19 @@ export default class ClassicBuffer extends WEBGLBuffer {
     } = options;
     const byteLength = options.byteLength || options.length;
     assert(data);
-    const target = this.gl.webgl2 ? GL.COPY_WRITE_BUFFER : this.target;
-    this.gl.bindBuffer(target, this.handle);
-
+    const glTarget = this.gl.webgl2 ? GL.COPY_WRITE_BUFFER : this.glTarget;
+    this.gl.bindBuffer(glTarget, this.handle);
     if (srcOffset !== 0 || byteLength !== undefined) {
       assertWebGL2Context(this.gl);
-      this.gl.bufferSubData(this.target, offset, data, srcOffset, byteLength);
+      this.gl.bufferSubData(this.glTarget, offset, data, srcOffset, byteLength);
     } else {
-      this.gl.bufferSubData(target, offset, data);
+      this.gl.bufferSubData(glTarget, offset, data);
     }
-
-    this.gl.bindBuffer(target, null);
+    this.gl.bindBuffer(glTarget, null);
     this.debugData = null;
-
     this._inferType(data);
-
     return this;
   }
-
   copyData(options) {
     const {
       sourceBuffer,
@@ -201,14 +155,14 @@ export default class ClassicBuffer extends WEBGLBuffer {
     assertWebGL2Context(gl);
     gl.bindBuffer(GL.COPY_READ_BUFFER, sourceBuffer.handle);
     gl.bindBuffer(GL.COPY_WRITE_BUFFER, this.handle);
-    gl2.copyBufferSubData(GL.COPY_READ_BUFFER, GL.COPY_WRITE_BUFFER, readOffset, writeOffset, size);
+    gl2 === null || gl2 === void 0 ? void 0 : gl2.copyBufferSubData(GL.COPY_READ_BUFFER, GL.COPY_WRITE_BUFFER, readOffset, writeOffset, size);
     gl.bindBuffer(GL.COPY_READ_BUFFER, null);
     gl.bindBuffer(GL.COPY_WRITE_BUFFER, null);
     this.debugData = null;
     return this;
   }
-
   getData(options) {
+    var _this$gl;
     let {
       dstData = null,
       length = 0
@@ -221,13 +175,10 @@ export default class ClassicBuffer extends WEBGLBuffer {
     const ArrayType = getTypedArrayFromGLType(this.accessor.type || GL.FLOAT, {
       clamped: false
     });
-
     const sourceAvailableElementCount = this._getAvailableElementCount(srcByteOffset);
-
     const dstElementOffset = dstOffset;
     let dstAvailableElementCount;
     let dstElementCount;
-
     if (dstData) {
       dstElementCount = dstData.length;
       dstAvailableElementCount = dstElementCount - dstElementOffset;
@@ -235,55 +186,50 @@ export default class ClassicBuffer extends WEBGLBuffer {
       dstAvailableElementCount = Math.min(sourceAvailableElementCount, length || sourceAvailableElementCount);
       dstElementCount = dstElementOffset + dstAvailableElementCount;
     }
-
     const copyElementCount = Math.min(sourceAvailableElementCount, dstAvailableElementCount);
     length = length || copyElementCount;
     assert(length <= copyElementCount);
     dstData = dstData || new ArrayType(dstElementCount);
     this.gl.bindBuffer(GL.COPY_READ_BUFFER, this.handle);
-    this.gl2.getBufferSubData(GL.COPY_READ_BUFFER, srcByteOffset, dstData, dstOffset, length);
+    (_this$gl = this.gl2) === null || _this$gl === void 0 ? void 0 : _this$gl.getBufferSubData(GL.COPY_READ_BUFFER, srcByteOffset, dstData, dstOffset, length);
     this.gl.bindBuffer(GL.COPY_READ_BUFFER, null);
     return dstData;
   }
-
   bind(options) {
     const {
-      target = this.target,
+      glTarget = this.glTarget,
       index = this.accessor && this.accessor.index,
       offset = 0,
       size
     } = options || {};
-
-    if (target === GL.UNIFORM_BUFFER || target === GL.TRANSFORM_FEEDBACK_BUFFER) {
+    if (glTarget === GL.UNIFORM_BUFFER || glTarget === GL.TRANSFORM_FEEDBACK_BUFFER) {
       if (size !== undefined) {
-        this.gl2.bindBufferRange(target, index, this.handle, offset, size);
+        var _this$gl2;
+        (_this$gl2 = this.gl2) === null || _this$gl2 === void 0 ? void 0 : _this$gl2.bindBufferRange(glTarget, index, this.handle, offset, size);
       } else {
+        var _this$gl3;
         assert(offset === 0);
-        this.gl2.bindBufferBase(target, index, this.handle);
+        (_this$gl3 = this.gl2) === null || _this$gl3 === void 0 ? void 0 : _this$gl3.bindBufferBase(glTarget, index, this.handle);
       }
     } else {
-      this.gl.bindBuffer(target, this.handle);
+      this.gl.bindBuffer(glTarget, this.handle);
     }
-
     return this;
   }
-
   unbind(options) {
     const {
-      target = this.target,
+      glTarget = this.glTarget,
       index = this.accessor && this.accessor.index
     } = options || {};
-    const isIndexedBuffer = target === GL.UNIFORM_BUFFER || target === GL.TRANSFORM_FEEDBACK_BUFFER;
-
+    const isIndexedBuffer = glTarget === GL.UNIFORM_BUFFER || glTarget === GL.TRANSFORM_FEEDBACK_BUFFER;
     if (isIndexedBuffer) {
-      this.gl2.bindBufferBase(target, index, null);
+      var _this$gl4;
+      (_this$gl4 = this.gl2) === null || _this$gl4 === void 0 ? void 0 : _this$gl4.bindBufferBase(glTarget, index, null);
     } else {
-      this.gl.bindBuffer(target, null);
+      this.gl.bindBuffer(glTarget, null);
     }
-
     return this;
   }
-
   getDebugData() {
     if (!this.debugData) {
       this.debugData = this.getData({
@@ -294,25 +240,22 @@ export default class ClassicBuffer extends WEBGLBuffer {
         changed: true
       };
     }
-
     return {
       data: this.debugData,
       changed: false
     };
   }
-
   invalidateDebugData() {
     this.debugData = null;
   }
-
-  _setData(data, offset = 0, byteLength = data.byteLength + offset) {
+  _setData(data) {
+    let offset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+    let byteLength = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : data.byteLength + offset;
     assert(ArrayBuffer.isView(data));
     this.trackDeallocatedMemory();
-
     const target = this._getTarget();
-
     this.gl.bindBuffer(target, this.handle);
-    this.gl.bufferData(target, byteLength, this.webglUsage);
+    this.gl.bufferData(target, byteLength, this.glUsage);
     this.gl.bufferSubData(target, offset, data);
     this.gl.bindBuffer(target, null);
     this.debugData = data.slice(0, DEBUG_DATA_LENGTH);
@@ -326,33 +269,26 @@ export default class ClassicBuffer extends WEBGLBuffer {
     }));
     return this;
   }
-
-  _setByteLength(byteLength, webglUsage = this.webglUsage) {
+  _setByteLength(byteLength) {
     assert(byteLength >= 0);
     this.trackDeallocatedMemory();
     let data = byteLength;
-
     if (byteLength === 0) {
       data = new Float32Array(0);
     }
-
-    const target = this._getTarget();
-
-    this.gl.bindBuffer(target, this.handle);
-    this.gl.bufferData(target, data, webglUsage);
-    this.gl.bindBuffer(target, null);
-    this.webglUsage = webglUsage;
+    const glTarget = this._getTarget();
+    this.gl.bindBuffer(glTarget, this.handle);
+    this.gl.bufferData(glTarget, data, this.glUsage);
+    this.gl.bindBuffer(glTarget, null);
     this.debugData = null;
     this.bytesUsed = byteLength;
     this.byteLength = byteLength;
     this.trackAllocatedMemory(byteLength);
     return this;
   }
-
   _getTarget() {
-    return this.gl.webgl2 ? GL.COPY_WRITE_BUFFER : this.target;
+    return this.gl.webgl2 ? GL.COPY_WRITE_BUFFER : this.glTarget;
   }
-
   _getAvailableElementCount(srcByteOffset) {
     const ArrayType = getTypedArrayFromGLType(this.accessor.type || GL.FLOAT, {
       clamped: false
@@ -360,7 +296,6 @@ export default class ClassicBuffer extends WEBGLBuffer {
     const sourceElementOffset = srcByteOffset / ArrayType.BYTES_PER_ELEMENT;
     return this.getElementCount() - sourceElementOffset;
   }
-
   _inferType(data) {
     if (!this.accessor.type) {
       this.setAccessor(new Accessor(this.accessor, {
@@ -368,17 +303,14 @@ export default class ClassicBuffer extends WEBGLBuffer {
       }));
     }
   }
-
   getParameter(pname) {
-    this.gl.bindBuffer(this.target, this.handle);
-    const value = this.gl.getBufferParameter(this.target, pname);
-    this.gl.bindBuffer(this.target, null);
+    this.gl.bindBuffer(this.glTarget, this.handle);
+    const value = this.gl.getBufferParameter(this.glTarget, pname);
+    this.gl.bindBuffer(this.glTarget, null);
     return value;
   }
-
   get type() {
     return this.accessor.type;
   }
-
 }
-//# sourceMappingURL=buffer.js.map
+//# sourceMappingURL=buffer-with-accessor.js.map