@luma.gl/webgl 8.5.10 → 8.6.0-alpha.4

package/dist/es5/classes/accessor.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/classes/accessor.js"],"names":["DEFAULT_ACCESSOR_VALUES","offset","stride","type","size","divisor","normalized","integer","PROP_CHECKS","deprecatedProps","instanced","isInstanced","Accessor","accessor","ArrayType","BYTES_PER_ELEMENT","accessors","forEach","_assign","Object","freeze","JSON","stringify","props","undefined","buffer","index","getBytesPerElement","getBytesPerVertex"],"mappings":"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","sourcesContent":["import GL from '@luma.gl/constants';\nimport {getTypedArrayFromGLType} from '../webgl-utils/typed-array-utils';\nimport {assert} from '../utils/assert';\nimport {checkProps} from '../utils/check-props';\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 {\n  static getBytesPerElement(accessor) {\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) {\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) {\n    return new Accessor(...[DEFAULT_ACCESSOR_VALUES, ...accessors]); // Default values\n  }\n\n  constructor(...accessors) {\n    accessors.forEach(accessor => this._assign(accessor)); // Merge in sequence\n    Object.freeze(this);\n  }\n\n  toString() {\n    return JSON.stringify(this);\n  }\n\n  // ACCESSORS\n\n  // TODO - remove>\n  get BYTES_PER_ELEMENT() {\n    return Accessor.getBytesPerElement(this);\n  }\n\n  get BYTES_PER_VERTEX() {\n    return Accessor.getBytesPerVertex(this);\n  }\n\n  // PRIVATE\n\n  // eslint-disable-next-line complexity, max-statements\n  _assign(props = {}) {\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    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    if (props.instanced !== undefined) {\n      this.divisor = props.instanced ? 1 : 0;\n    }\n    if (props.isInstanced !== undefined) {\n      this.divisor = props.isInstanced ? 1 : 0;\n    }\n\n    return this;\n  }\n}\n\n// TEST EXPORTS\nexport {DEFAULT_ACCESSOR_VALUES};\n"],"file":"accessor.js"}
+{"version":3,"sources":["../../../src/classes/accessor.js"],"names":["DEFAULT_ACCESSOR_VALUES","offset","stride","type","GL","FLOAT","size","divisor","normalized","integer","PROP_CHECKS","deprecatedProps","instanced","isInstanced","Accessor","accessors","forEach","accessor","_assign","Object","freeze","JSON","stringify","getBytesPerElement","getBytesPerVertex","props","undefined","INT","UNSIGNED_INT","buffer","index","ArrayType","BYTES_PER_ELEMENT"],"mappings":"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","sourcesContent":["import {assert, checkProps} from '@luma.gl/api';\nimport GL from '@luma.gl/constants';\nimport {getTypedArrayFromGLType} from '../webgl-utils/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 default class Accessor {\n  static getBytesPerElement(accessor) {\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) {\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) {\n    return new Accessor(...[DEFAULT_ACCESSOR_VALUES, ...accessors]); // Default values\n  }\n\n  constructor(...accessors) {\n    accessors.forEach((accessor) => this._assign(accessor)); // Merge in sequence\n    Object.freeze(this);\n  }\n\n  toString() {\n    return JSON.stringify(this);\n  }\n\n  // ACCESSORS\n\n  // TODO - remove>\n  get BYTES_PER_ELEMENT() {\n    return Accessor.getBytesPerElement(this);\n  }\n\n  get BYTES_PER_VERTEX() {\n    return Accessor.getBytesPerVertex(this);\n  }\n\n  // PRIVATE\n\n  // eslint-disable-next-line complexity, max-statements\n  _assign(props = {}) {\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    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    if (props.instanced !== undefined) {\n      this.divisor = props.instanced ? 1 : 0;\n    }\n    if (props.isInstanced !== undefined) {\n      this.divisor = props.isInstanced ? 1 : 0;\n    }\n\n    return this;\n  }\n}\n\n// TEST EXPORTS\nexport {DEFAULT_ACCESSOR_VALUES};\n"],"file":"accessor.js"}

package/dist/es5/classes/accessor.ts.disabled

@@ -0,0 +1,159 @@
+import GL from '@luma.gl/constants';
+import {getTypedArrayFromGLType} from '../webgl-utils';
+import {checkProps, assert} from '../utils/index';
+import {Buffer} from '@luma.gl/core/';
+
+export interface AccessorObject {
+  buffer?: Buffer;
+  offset?: number;
+  stride?: number;
+  type?: number;
+  size?: number;
+  divisor?: number;
+  normalized?: boolean;
+  integer?: boolean;
+  index?: number;
+  /** @deprecated Use .divisor */
+  instanced?: boolean;
+  /** @deprecated Use .divisor */
+  isInstanced?: boolean;
+}
+
+const DEFAULT_ACCESSOR_VALUES = {
+  offset: 0,
+  stride: 0,
+  type: GL.FLOAT,
+  size: 1,
+  divisor: 0,
+  normalized: false,
+  integer: false
+};
+
+const PROP_CHECKS = {
+  deprecatedProps: {
+    instanced: 'divisor',
+    isInstanced: 'divisor'
+  }
+};
+
+
+// @ts-nocheck members are added dynamically
+export default class Accessor {
+  // buffer: Buffer | undefined = undefined;
+  // index: number;
+
+  // offset: number;
+  // stride: number;
+  // type: number;
+  // size: number;
+  // divisor: number;
+  // normalized: boolean;
+  // integer: boolean;
+
+  static getBytesPerElement(accessor): number {
+    // 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;
+  }
+
+  static getBytesPerVertex(accessor): number {
+    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;
+  }
+
+  // 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): Accessor {
+    return new Accessor(...[DEFAULT_ACCESSOR_VALUES, ...accessors]); // Default values
+  }
+
+  constructor(...accessors: any[]) {
+    accessors.forEach((accessor) => this._assign(accessor)); // Merge in sequence
+    Object.freeze(this);
+  }
+
+  toString(): string {
+    return JSON.stringify(this);
+  }
+
+  // ACCESSORS
+
+  // TODO - remove>
+  get BYTES_PER_ELEMENT(): number {
+    return Accessor.getBytesPerElement(this);
+  }
+
+  get BYTES_PER_VERTEX(): number {
+    return Accessor.getBytesPerVertex(this);
+  }
+
+  // PRIVATE
+
+  // eslint-disable-next-line complexity, max-statements
+  _assign(props: AccessorObject = {}) {
+    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;
+    }
+    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
+    if (props.instanced !== undefined) {
+      this.divisor = props.instanced ? 1 : 0;
+    }
+    if (props.isInstanced !== undefined) {
+      this.divisor = props.isInstanced ? 1 : 0;
+    }
+
+    return this;
+  }
+}
+
+// TEST EXPORTS
+export {DEFAULT_ACCESSOR_VALUES};

package/dist/es5/classes/clear.js

@@ -10,9 +10,11 @@ exports.clearBuffer = clearBuffer;
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-var _gltools = require("@luma.gl/gltools");
+var _api = require("@luma.gl/api");
 
-var _assert = require("../utils/assert");
+var _webglChecks = require("../context/context/webgl-checks");
+
+var _withParameters = require("../context/state-tracker/with-parameters");
 
 var GL_DEPTH_BUFFER_BIT = 0x00000100;
 var GL_STENCIL_BUFFER_BIT = 0x00000400;
@@ -23,8 +25,10 @@ var GL_STENCIL = 0x1802;
 var GL_DEPTH_STENCIL = 0x84f9;
 var ERR_ARGUMENTS = 'clear: bad arguments';
 
-function clear(gl) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+function clear(device, options) {
+  var gl = device.gl || device;
+
+  var _ref = options || {},
       _ref$framebuffer = _ref.framebuffer,
       framebuffer = _ref$framebuffer === void 0 ? null : _ref$framebuffer,
       _ref$color = _ref.color,
@@ -66,14 +70,17 @@ function clear(gl) {
     }
   }
 
-  (0, _assert.assert)(clearFlags !== 0, ERR_ARGUMENTS);
-  (0, _gltools.withParameters)(gl, parameters, function () {
+  (0, _api.assert)(clearFlags !== 0, ERR_ARGUMENTS);
+  (0, _withParameters.withParameters)(gl, parameters, function () {
     gl.clear(clearFlags);
   });
 }
 
-function clearBuffer(gl) {
-  var _ref2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+function clearBuffer(device, options) {
+  var gl = device.gl || device;
+  (0, _webglChecks.assertWebGL2Context)(gl);
+
+  var _ref2 = options || {},
       _ref2$framebuffer = _ref2.framebuffer,
       framebuffer = _ref2$framebuffer === void 0 ? null : _ref2$framebuffer,
       _ref2$buffer = _ref2.buffer,
@@ -83,8 +90,7 @@ function clearBuffer(gl) {
       _ref2$value = _ref2.value,
       value = _ref2$value === void 0 ? [0, 0, 0, 0] : _ref2$value;
 
-  (0, _gltools.assertWebGL2Context)(gl);
-  (0, _gltools.withParameters)(gl, {
+  (0, _withParameters.withParameters)(gl, {
     framebuffer: framebuffer
   }, function () {
     switch (buffer) {
@@ -122,7 +128,7 @@ function clearBuffer(gl) {
         break;
 
       default:
-        (0, _assert.assert)(false, ERR_ARGUMENTS);
+        (0, _api.assert)(false, ERR_ARGUMENTS);
     }
   });
 }

package/dist/es5/classes/clear.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/classes/clear.js"],"names":["GL_DEPTH_BUFFER_BIT","GL_STENCIL_BUFFER_BIT","GL_COLOR_BUFFER_BIT","GL_COLOR","GL_DEPTH","GL_STENCIL","GL_DEPTH_STENCIL","ERR_ARGUMENTS","clear","gl","framebuffer","color","depth","stencil","parameters","clearFlags","clearColor","clearDepth","clearStencil","clearBuffer","buffer","drawBuffer","value","constructor","Int32Array","clearBufferiv","Uint32Array","clearBufferuiv","Float32Array","clearBufferfv","clearBufferfi"],"mappings":";;;;;;;;;;;;AAAA;;AACA;;AAGA,IAAMA,mBAAmB,GAAG,UAA5B;AACA,IAAMC,qBAAqB,GAAG,UAA9B;AACA,IAAMC,mBAAmB,GAAG,UAA5B;AAEA,IAAMC,QAAQ,GAAG,MAAjB;AACA,IAAMC,QAAQ,GAAG,MAAjB;AACA,IAAMC,UAAU,GAAG,MAAnB;AACA,IAAMC,gBAAgB,GAAG,MAAzB;AAGA,IAAMC,aAAa,GAAG,sBAAtB;;AAIO,SAASC,KAAT,CAAeC,EAAf,EAA0F;AAAA,iFAAJ,EAAI;AAAA,8BAAtEC,WAAsE;AAAA,MAAtEA,WAAsE,iCAAxD,IAAwD;AAAA,wBAAlDC,KAAkD;AAAA,MAAlDA,KAAkD,2BAA1C,IAA0C;AAAA,wBAApCC,KAAoC;AAAA,MAApCA,KAAoC,2BAA5B,IAA4B;AAAA,0BAAtBC,OAAsB;AAAA,MAAtBA,OAAsB,6BAAZ,IAAY;;AAC/F,MAAMC,UAAU,GAAG,EAAnB;;AAEA,MAAIJ,WAAJ,EAAiB;AACfI,IAAAA,UAAU,CAACJ,WAAX,GAAyBA,WAAzB;AACD;;AAED,MAAIK,UAAU,GAAG,CAAjB;;AAEA,MAAIJ,KAAJ,EAAW;AACTI,IAAAA,UAAU,IAAIb,mBAAd;;AACA,QAAIS,KAAK,KAAK,IAAd,EAAoB;AAClBG,MAAAA,UAAU,CAACE,UAAX,GAAwBL,KAAxB;AACD;AACF;;AAED,MAAIC,KAAJ,EAAW;AACTG,IAAAA,UAAU,IAAIf,mBAAd;;AACA,QAAIY,KAAK,KAAK,IAAd,EAAoB;AAClBE,MAAAA,UAAU,CAACG,UAAX,GAAwBL,KAAxB;AACD;AACF;;AAED,MAAIC,OAAJ,EAAa;AACXE,IAAAA,UAAU,IAAId,qBAAd;;AACA,QAAIW,KAAK,KAAK,IAAd,EAAoB;AAClBE,MAAAA,UAAU,CAACI,YAAX,GAA0BN,KAA1B;AACD;AACF;;AAED,sBAAOG,UAAU,KAAK,CAAtB,EAAyBR,aAAzB;AAGA,+BAAeE,EAAf,EAAmBK,UAAnB,EAA+B,YAAM;AACnCL,IAAAA,EAAE,CAACD,KAAH,CAASO,UAAT;AACD,GAFD;AAGD;;AAIM,SAASI,WAAT,CACLV,EADK,EAGL;AAAA,kFADgF,EAChF;AAAA,gCADCC,WACD;AAAA,MADCA,WACD,kCADe,IACf;AAAA,2BADqBU,MACrB;AAAA,MADqBA,MACrB,6BAD8BjB,QAC9B;AAAA,+BADwCkB,UACxC;AAAA,MADwCA,UACxC,iCADqD,CACrD;AAAA,0BADwDC,KACxD;AAAA,MADwDA,KACxD,4BADgE,CAAC,CAAD,EAAI,CAAJ,EAAO,CAAP,EAAU,CAAV,CAChE;;AACA,oCAAoBb,EAApB;AAEA,+BAAeA,EAAf,EAAmB;AAACC,IAAAA,WAAW,EAAXA;AAAD,GAAnB,EAAkC,YAAM;AAEtC,YAAQU,MAAR;AACE,WAAKjB,QAAL;AACE,gBAAQmB,KAAK,CAACC,WAAd;AACE,eAAKC,UAAL;AACEf,YAAAA,EAAE,CAACgB,aAAH,CAAiBL,MAAjB,EAAyBC,UAAzB,EAAqCC,KAArC;AACA;;AACF,eAAKI,WAAL;AACEjB,YAAAA,EAAE,CAACkB,cAAH,CAAkBP,MAAlB,EAA0BC,UAA1B,EAAsCC,KAAtC;AACA;;AACF,eAAKM,YAAL;AACA;AACEnB,YAAAA,EAAE,CAACoB,aAAH,CAAiBT,MAAjB,EAAyBC,UAAzB,EAAqCC,KAArC;AATJ;;AAWA;;AAEF,WAAKlB,QAAL;AACEK,QAAAA,EAAE,CAACoB,aAAH,CAAiBzB,QAAjB,EAA2B,CAA3B,EAA8B,CAACkB,KAAD,CAA9B;AACA;;AAEF,WAAKjB,UAAL;AACEI,QAAAA,EAAE,CAACgB,aAAH,CAAiBpB,UAAjB,EAA6B,CAA7B,EAAgC,CAACiB,KAAD,CAAhC;AACA;;AAEF,WAAKhB,gBAAL;AAAA,kDAC2BgB,KAD3B;AAAA,YACSV,KADT;AAAA,YACgBC,OADhB;;AAEEJ,QAAAA,EAAE,CAACqB,aAAH,CAAiBxB,gBAAjB,EAAmC,CAAnC,EAAsCM,KAAtC,EAA6CC,OAA7C;AACA;;AAEF;AACE,4BAAO,KAAP,EAAcN,aAAd;AA7BJ;AA+BD,GAjCD;AAkCD","sourcesContent":["import {assertWebGL2Context, withParameters} from '@luma.gl/gltools';\nimport {assert} from '../utils/assert';\n\n// Should collapse during minification\nconst GL_DEPTH_BUFFER_BIT = 0x00000100;\nconst GL_STENCIL_BUFFER_BIT = 0x00000400;\nconst GL_COLOR_BUFFER_BIT = 0x00004000;\n\nconst GL_COLOR = 0x1800;\nconst GL_DEPTH = 0x1801;\nconst GL_STENCIL = 0x1802;\nconst GL_DEPTH_STENCIL = 0x84f9;\n\n// Should disappear if asserts are removed\nconst ERR_ARGUMENTS = 'clear: bad arguments';\n\n// Optionally clears depth, color and stencil buffers\n/** @type {import('./clear').clear} */\nexport function clear(gl, {framebuffer = null, color = null, depth = null, stencil = null} = {}) {\n  const parameters = {};\n\n  if (framebuffer) {\n    parameters.framebuffer = framebuffer;\n  }\n\n  let clearFlags = 0;\n\n  if (color) {\n    clearFlags |= GL_COLOR_BUFFER_BIT;\n    if (color !== true) {\n      parameters.clearColor = color;\n    }\n  }\n\n  if (depth) {\n    clearFlags |= GL_DEPTH_BUFFER_BIT;\n    if (depth !== true) {\n      parameters.clearDepth = depth;\n    }\n  }\n\n  if (stencil) {\n    clearFlags |= GL_STENCIL_BUFFER_BIT;\n    if (depth !== true) {\n      parameters.clearStencil = depth;\n    }\n  }\n\n  assert(clearFlags !== 0, ERR_ARGUMENTS);\n\n  // Temporarily set any clear \"colors\" and call clear\n  withParameters(gl, parameters, () => {\n    gl.clear(clearFlags);\n  });\n}\n\n// WebGL2 - clear a specific drawing buffer\n/** @type {import('./clear').clearBuffer} */\nexport function clearBuffer(\n  gl,\n  {framebuffer = null, buffer = GL_COLOR, drawBuffer = 0, value = [0, 0, 0, 0]} = {}\n) {\n  assertWebGL2Context(gl);\n\n  withParameters(gl, {framebuffer}, () => {\n    // Method selection per OpenGL ES 3 docs\n    switch (buffer) {\n      case GL_COLOR:\n        switch (value.constructor) {\n          case Int32Array:\n            gl.clearBufferiv(buffer, drawBuffer, value);\n            break;\n          case Uint32Array:\n            gl.clearBufferuiv(buffer, drawBuffer, value);\n            break;\n          case Float32Array:\n          default:\n            gl.clearBufferfv(buffer, drawBuffer, value);\n        }\n        break;\n\n      case GL_DEPTH:\n        gl.clearBufferfv(GL_DEPTH, 0, [value]);\n        break;\n\n      case GL_STENCIL:\n        gl.clearBufferiv(GL_STENCIL, 0, [value]);\n        break;\n\n      case GL_DEPTH_STENCIL:\n        const [depth, stencil] = value;\n        gl.clearBufferfi(GL_DEPTH_STENCIL, 0, depth, stencil);\n        break;\n\n      default:\n        assert(false, ERR_ARGUMENTS);\n    }\n  });\n}\n"],"file":"clear.js"}
+{"version":3,"sources":["../../../src/classes/clear.ts"],"names":["GL_DEPTH_BUFFER_BIT","GL_STENCIL_BUFFER_BIT","GL_COLOR_BUFFER_BIT","GL_COLOR","GL_DEPTH","GL_STENCIL","GL_DEPTH_STENCIL","ERR_ARGUMENTS","clear","device","options","gl","framebuffer","color","depth","stencil","parameters","clearFlags","clearColor","clearDepth","clearStencil","clearBuffer","buffer","drawBuffer","value","constructor","Int32Array","clearBufferiv","Uint32Array","clearBufferuiv","Float32Array","clearBufferfv","clearBufferfi"],"mappings":"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","sourcesContent":["import {Device, assert} from '@luma.gl/api';\nimport {assertWebGL2Context} from '../context/context/webgl-checks';\nimport {withParameters} from '../context/state-tracker/with-parameters';\nimport Framebuffer from './framebuffer';\n\n// Should collapse during minification\nconst GL_DEPTH_BUFFER_BIT = 0x00000100;\nconst GL_STENCIL_BUFFER_BIT = 0x00000400;\nconst GL_COLOR_BUFFER_BIT = 0x00004000;\n\nconst GL_COLOR = 0x1800;\nconst GL_DEPTH = 0x1801;\nconst GL_STENCIL = 0x1802;\nconst GL_DEPTH_STENCIL = 0x84f9;\n\n// Should disappear if asserts are removed\nconst ERR_ARGUMENTS = 'clear: bad arguments';\n\n/** Optionally clears depth, color and stencil buffers */\nexport function clear(\n  device: Device | WebGLRenderingContext,\n  options?: {framebuffer?: Framebuffer; color?: any; depth?: any; stencil?: any}\n): void {\n  // @ts-expect-error Extract context\n  const gl = device.gl || device;\n  const {framebuffer = null, color = null, depth = null, stencil = null} = options || {};\n  const parameters: any = {};\n\n  if (framebuffer) {\n    parameters.framebuffer = framebuffer;\n  }\n\n  let clearFlags = 0;\n\n  if (color) {\n    clearFlags |= GL_COLOR_BUFFER_BIT;\n    if (color !== true) {\n      parameters.clearColor = color;\n    }\n  }\n\n  if (depth) {\n    clearFlags |= GL_DEPTH_BUFFER_BIT;\n    if (depth !== true) {\n      parameters.clearDepth = depth;\n    }\n  }\n\n  if (stencil) {\n    clearFlags |= GL_STENCIL_BUFFER_BIT;\n    if (depth !== true) {\n      parameters.clearStencil = depth;\n    }\n  }\n\n  assert(clearFlags !== 0, ERR_ARGUMENTS);\n\n  // Temporarily set any clear \"colors\" and call clear\n  withParameters(gl, parameters, () => {\n    gl.clear(clearFlags);\n  });\n}\n\n/** WebGL2 - clear a specific drawing buffer */\nexport function clearBuffer(\n  device: Device | WebGLRenderingContext,\n  options?: {framebuffer?: Framebuffer; buffer?: any; drawBuffer?: any; value?: any}\n) {\n  // @ts-expect-error Extract context\n  const gl = device.gl || device;\n  assertWebGL2Context(gl);\n\n  const {framebuffer = null, buffer = GL_COLOR, drawBuffer = 0, value = [0, 0, 0, 0]} = options || {};\n  withParameters(gl, {framebuffer}, () => {\n    // Method selection per OpenGL ES 3 docs\n    switch (buffer) {\n      case GL_COLOR:\n        switch (value.constructor) {\n          case Int32Array:\n            gl.clearBufferiv(buffer, drawBuffer, value);\n            break;\n          case Uint32Array:\n            gl.clearBufferuiv(buffer, drawBuffer, value);\n            break;\n          case Float32Array:\n          default:\n            gl.clearBufferfv(buffer, drawBuffer, value);\n        }\n        break;\n\n      case GL_DEPTH:\n        gl.clearBufferfv(GL_DEPTH, 0, [value]);\n        break;\n\n      case GL_STENCIL:\n        gl.clearBufferiv(GL_STENCIL, 0, [value]);\n        break;\n\n      case GL_DEPTH_STENCIL:\n        const [depth, stencil] = value;\n        gl.clearBufferfi(GL_DEPTH_STENCIL, 0, depth, stencil);\n        break;\n\n      default:\n        assert(false, ERR_ARGUMENTS);\n    }\n  });\n}\n"],"file":"clear.js"}