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

package/dist/es5/classes/uniform-buffer-layout.js

@@ -1,130 +1,116 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 var _attributeUtils = require("../webgl-utils/attribute-utils");
 
-var _assert = require("../utils/assert");
+var _utils = require("../utils");
 
-var ERR_ARGUMENT = 'UniformBufferLayout illegal argument';
-var GL_FLOAT = 0x1406;
-var GL_INT = 0x1404;
-var GL_UNSIGNED_INT = 0x1405;
+const ERR_ARGUMENT = 'UniformBufferLayout illegal argument';
+const GL_FLOAT = 0x1406;
+const GL_INT = 0x1404;
+const GL_UNSIGNED_INT = 0x1405;
 
-var UniformBufferLayout = function () {
-  function UniformBufferLayout(layout) {
-    var _this$typedArray;
-
-    (0, _classCallCheck2.default)(this, UniformBufferLayout);
+class UniformBufferLayout {
+  constructor(layout) {
     this.layout = {};
     this.size = 0;
 
-    for (var key in layout) {
+    for (const key in layout) {
       this._addUniform(key, layout[key]);
     }
 
     this.size += (4 - this.size % 4) % 4;
-    var data = new Float32Array(this.size);
-    this.typedArray = (_this$typedArray = {}, (0, _defineProperty2.default)(_this$typedArray, GL_FLOAT, data), (0, _defineProperty2.default)(_this$typedArray, GL_INT, new Int32Array(data.buffer)), (0, _defineProperty2.default)(_this$typedArray, GL_UNSIGNED_INT, new Uint32Array(data.buffer)), _this$typedArray);
+    const data = new Float32Array(this.size);
+    this.typedArray = {
+      [GL_FLOAT]: data,
+      [GL_INT]: new Int32Array(data.buffer),
+      [GL_UNSIGNED_INT]: new Uint32Array(data.buffer)
+    };
   }
 
-  (0, _createClass2.default)(UniformBufferLayout, [{
-    key: "getBytes",
-    value: function getBytes() {
-      return this.size * 4;
-    }
-  }, {
-    key: "getData",
-    value: function getData() {
-      return this.typedArray[GL_FLOAT];
-    }
-  }, {
-    key: "getSubData",
-    value: function getSubData(index) {
-      var data;
-      var offset;
-
-      if (index === undefined) {
-        data = this.data;
-        offset = 0;
-      } else {
-        var begin = this.offsets[index];
-        var end = begin + this.sizes[index];
-        data = this.data.subarray(begin, end);
-        offset = begin * 4;
-      }
-
-      return {
-        data: data,
-        offset: offset
-      };
-    }
-  }, {
-    key: "setUniforms",
-    value: function setUniforms(values) {
-      for (var key in values) {
-        this._setValue(key, values[key]);
-      }
-
-      return this;
+  getBytes() {
+    return this.size * 4;
+  }
+
+  getData() {
+    return this.typedArray[GL_FLOAT];
+  }
+
+  getSubData(index) {
+    let data;
+    let offset;
+
+    if (index === undefined) {
+      data = this.data;
+      offset = 0;
+    } else {
+      const begin = this.offsets[index];
+      const end = begin + this.sizes[index];
+      data = this.data.subarray(begin, end);
+      offset = begin * 4;
     }
-  }, {
-    key: "_setValue",
-    value: function _setValue(key, value) {
-      var layout = this.layout[key];
-      (0, _assert.assert)(layout, 'UniformLayoutStd140 illegal argument');
-      var typedArray = this.typedArray[layout.type];
-
-      if (layout.size === 1) {
-        typedArray[layout.offset] = value;
-      } else {
-        typedArray.set(value, layout.offset);
-      }
+
+    return {
+      data,
+      offset
+    };
+  }
+
+  setUniforms(values) {
+    for (const key in values) {
+      this._setValue(key, values[key]);
     }
-  }, {
-    key: "_addUniform",
-    value: function _addUniform(key, uniformType) {
-      var typeAndComponents = (0, _attributeUtils.decomposeCompositeGLType)(uniformType);
-      (0, _assert.assert)(typeAndComponents, ERR_ARGUMENT);
-      var type = typeAndComponents.type,
-          count = typeAndComponents.components;
-      this.size = this._alignTo(this.size, count);
-      var offset = this.size;
-      this.size += count;
-      this.layout[key] = {
-        type: type,
-        size: count,
-        offset: offset
-      };
+
+    return this;
+  }
+
+  _setValue(key, value) {
+    const layout = this.layout[key];
+    (0, _utils.assert)(layout, 'UniformLayoutStd140 illegal argument');
+    const typedArray = this.typedArray[layout.type];
+
+    if (layout.size === 1) {
+      typedArray[layout.offset] = value;
+    } else {
+      typedArray.set(value, layout.offset);
     }
-  }, {
-    key: "_alignTo",
-    value: function _alignTo(size, count) {
-      switch (count) {
-        case 1:
-          return size;
-
-        case 2:
-          return size + size % 2;
-
-        default:
-          return size + (4 - size % 4) % 4;
-      }
+  }
+
+  _addUniform(key, uniformType) {
+    const typeAndComponents = (0, _attributeUtils.decomposeCompositeGLType)(uniformType);
+    (0, _utils.assert)(typeAndComponents, ERR_ARGUMENT);
+    const {
+      type,
+      components: count
+    } = typeAndComponents;
+    this.size = this._alignTo(this.size, count);
+    const offset = this.size;
+    this.size += count;
+    this.layout[key] = {
+      type,
+      size: count,
+      offset
+    };
+  }
+
+  _alignTo(size, count) {
+    switch (count) {
+      case 1:
+        return size;
+
+      case 2:
+        return size + size % 2;
+
+      default:
+        return size + (4 - size % 4) % 4;
     }
-  }]);
-  return UniformBufferLayout;
-}();
+  }
+
+}
 
 exports.default = UniformBufferLayout;
 //# sourceMappingURL=uniform-buffer-layout.js.map

package/dist/es5/classes/uniform-buffer-layout.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/classes/uniform-buffer-layout.js"],"names":["ERR_ARGUMENT","GL_FLOAT","GL_INT","GL_UNSIGNED_INT","UniformBufferLayout","layout","size","key","_addUniform","data","Float32Array","typedArray","Int32Array","buffer","Uint32Array","index","offset","undefined","begin","offsets","end","sizes","subarray","values","_setValue","value","type","set","uniformType","typeAndComponents","count","components","_alignTo"],"mappings":";;;;;;;;;;;;;;;AAGA;;AACA;;AAEA,IAAMA,YAAY,GAAG,sCAArB;AAGA,IAAMC,QAAQ,GAAG,MAAjB;AACA,IAAMC,MAAM,GAAG,MAAf;AACA,IAAMC,eAAe,GAAG,MAAxB;;IAGqBC,mB;AACnB,+BAAYC,MAAZ,EAAoB;AAAA;;AAAA;AAClB,SAAKA,MAAL,GAAc,EAAd;AACA,SAAKC,IAAL,GAAY,CAAZ;;AAGA,SAAK,IAAMC,GAAX,IAAkBF,MAAlB,EAA0B;AACxB,WAAKG,WAAL,CAAiBD,GAAjB,EAAsBF,MAAM,CAACE,GAAD,CAA5B;AACD;;AAED,SAAKD,IAAL,IAAa,CAAC,IAAK,KAAKA,IAAL,GAAY,CAAlB,IAAwB,CAArC;AAGA,QAAMG,IAAI,GAAG,IAAIC,YAAJ,CAAiB,KAAKJ,IAAtB,CAAb;AACA,SAAKK,UAAL,2EACGV,QADH,EACcQ,IADd,mDAEGP,MAFH,EAEY,IAAIU,UAAJ,CAAeH,IAAI,CAACI,MAApB,CAFZ,mDAGGV,eAHH,EAGqB,IAAIW,WAAJ,CAAgBL,IAAI,CAACI,MAArB,CAHrB;AAKD;;;;+BAGU;AACT,aAAO,KAAKP,IAAL,GAAY,CAAnB;AACD;;;8BAGS;AACR,aAAO,KAAKK,UAAL,CAAgBV,QAAhB,CAAP;AACD;;;+BAGUc,K,EAAO;AAChB,UAAIN,IAAJ;AACA,UAAIO,MAAJ;;AACA,UAAID,KAAK,KAAKE,SAAd,EAAyB;AACvBR,QAAAA,IAAI,GAAG,KAAKA,IAAZ;AACAO,QAAAA,MAAM,GAAG,CAAT;AACD,OAHD,MAGO;AACL,YAAME,KAAK,GAAG,KAAKC,OAAL,CAAaJ,KAAb,CAAd;AACA,YAAMK,GAAG,GAAGF,KAAK,GAAG,KAAKG,KAAL,CAAWN,KAAX,CAApB;AACAN,QAAAA,IAAI,GAAG,KAAKA,IAAL,CAAUa,QAAV,CAAmBJ,KAAnB,EAA0BE,GAA1B,CAAP;AACAJ,QAAAA,MAAM,GAAGE,KAAK,GAAG,CAAjB;AACD;;AACD,aAAO;AAACT,QAAAA,IAAI,EAAJA,IAAD;AAAOO,QAAAA,MAAM,EAANA;AAAP,OAAP;AACD;;;gCAGWO,M,EAAQ;AAClB,WAAK,IAAMhB,GAAX,IAAkBgB,MAAlB,EAA0B;AACxB,aAAKC,SAAL,CAAejB,GAAf,EAAoBgB,MAAM,CAAChB,GAAD,CAA1B;AACD;;AACD,aAAO,IAAP;AACD;;;8BAESA,G,EAAKkB,K,EAAO;AACpB,UAAMpB,MAAM,GAAG,KAAKA,MAAL,CAAYE,GAAZ,CAAf;AACA,0BAAOF,MAAP,EAAe,sCAAf;AACA,UAAMM,UAAU,GAAG,KAAKA,UAAL,CAAgBN,MAAM,CAACqB,IAAvB,CAAnB;;AACA,UAAIrB,MAAM,CAACC,IAAP,KAAgB,CAApB,EAAuB;AAErBK,QAAAA,UAAU,CAACN,MAAM,CAACW,MAAR,CAAV,GAA4BS,KAA5B;AACD,OAHD,MAGO;AAELd,QAAAA,UAAU,CAACgB,GAAX,CAAeF,KAAf,EAAsBpB,MAAM,CAACW,MAA7B;AACD;AACF;;;gCAEWT,G,EAAKqB,W,EAAa;AAC5B,UAAMC,iBAAiB,GAAG,8CAAyBD,WAAzB,CAA1B;AACA,0BAAOC,iBAAP,EAA0B7B,YAA1B;AAF4B,UAGrB0B,IAHqB,GAGMG,iBAHN,CAGrBH,IAHqB;AAAA,UAGHI,KAHG,GAGMD,iBAHN,CAGfE,UAHe;AAM5B,WAAKzB,IAAL,GAAY,KAAK0B,QAAL,CAAc,KAAK1B,IAAnB,EAAyBwB,KAAzB,CAAZ;AAEA,UAAMd,MAAM,GAAG,KAAKV,IAApB;AAEA,WAAKA,IAAL,IAAawB,KAAb;AAEA,WAAKzB,MAAL,CAAYE,GAAZ,IAAmB;AAACmB,QAAAA,IAAI,EAAJA,IAAD;AAAOpB,QAAAA,IAAI,EAAEwB,KAAb;AAAoBd,QAAAA,MAAM,EAANA;AAApB,OAAnB;AACD;;;6BAGQV,I,EAAMwB,K,EAAO;AACpB,cAAQA,KAAR;AACE,aAAK,CAAL;AACE,iBAAOxB,IAAP;;AACF,aAAK,CAAL;AACE,iBAAOA,IAAI,GAAIA,IAAI,GAAG,CAAtB;;AACF;AACE,iBAAOA,IAAI,GAAI,CAAC,IAAKA,IAAI,GAAG,CAAb,IAAmB,CAAlC;AANJ;AAQD","sourcesContent":["// @ts-nocheck\n\n/* eslint-disable camelcase */\nimport {decomposeCompositeGLType} from '../webgl-utils/attribute-utils';\nimport {assert} from '../utils/assert';\n\nconst ERR_ARGUMENT = 'UniformBufferLayout illegal argument';\n\n// Local constants - these will \"collapse\" during minification\nconst GL_FLOAT = 0x1406;\nconst GL_INT = 0x1404;\nconst GL_UNSIGNED_INT = 0x1405;\n\n// Std140 layout for uniforms\nexport default class UniformBufferLayout {\n  constructor(layout) {\n    this.layout = {};\n    this.size = 0;\n\n    // Add layout (type, size and offset) definitions for each uniform in the layout\n    for (const key in layout) {\n      this._addUniform(key, layout[key]);\n    }\n\n    this.size += (4 - (this.size % 4)) % 4;\n\n    // Allocate three typed arrays pointing at same memory\n    const data = new Float32Array(this.size);\n    this.typedArray = {\n      [GL_FLOAT]: data,\n      [GL_INT]: new Int32Array(data.buffer),\n      [GL_UNSIGNED_INT]: new Uint32Array(data.buffer)\n    };\n  }\n\n  // Get number of bytes needed for buffer allocation\n  getBytes() {\n    return this.size * 4;\n  }\n\n  // Get the current data as Float32Array, for bufferSubData\n  getData() {\n    return this.typedArray[GL_FLOAT];\n  }\n\n  // Get offset and data for one object (for bufferSubData)\n  getSubData(index) {\n    let data;\n    let offset;\n    if (index === undefined) {\n      data = this.data;\n      offset = 0;\n    } else {\n      const begin = this.offsets[index];\n      const end = begin + this.sizes[index];\n      data = this.data.subarray(begin, end);\n      offset = begin * 4;\n    }\n    return {data, offset};\n  }\n\n  // Set a map of values\n  setUniforms(values) {\n    for (const key in values) {\n      this._setValue(key, values[key]);\n    }\n    return this;\n  }\n\n  _setValue(key, value) {\n    const layout = this.layout[key];\n    assert(layout, 'UniformLayoutStd140 illegal argument');\n    const typedArray = this.typedArray[layout.type];\n    if (layout.size === 1) {\n      // single value -> just set it\n      typedArray[layout.offset] = value;\n    } else {\n      // vector/matrix -> copy the supplied (typed) array, starting from offset\n      typedArray.set(value, layout.offset);\n    }\n  }\n\n  _addUniform(key, uniformType) {\n    const typeAndComponents = decomposeCompositeGLType(uniformType);\n    assert(typeAndComponents, ERR_ARGUMENT);\n    const {type, components: count} = typeAndComponents;\n\n    // First, align (bump) current offset to an even multiple of current object (1, 2, 4)\n    this.size = this._alignTo(this.size, count);\n    // Use the aligned size as the offset of the current uniform.\n    const offset = this.size;\n    // Then, add our object's padded size ((1, 2, multiple of 4) to the current offset\n    this.size += count;\n\n    this.layout[key] = {type, size: count, offset};\n  }\n\n  // Align offset to 1, 2 or 4 elements (4, 8 or 16 bytes)\n  _alignTo(size, count) {\n    switch (count) {\n      case 1:\n        return size; // Pad upwards to even multiple of 2\n      case 2:\n        return size + (size % 2); // Pad upwards to even multiple of 2\n      default:\n        return size + ((4 - (size % 4)) % 4); // Pad upwards to even multiple of 4\n    }\n  }\n}\n"],"file":"uniform-buffer-layout.js"}
+{"version":3,"sources":["../../../src/classes/uniform-buffer-layout.ts"],"names":["ERR_ARGUMENT","GL_FLOAT","GL_INT","GL_UNSIGNED_INT","UniformBufferLayout","constructor","layout","size","key","_addUniform","data","Float32Array","typedArray","Int32Array","buffer","Uint32Array","getBytes","getData","getSubData","index","offset","undefined","begin","offsets","end","sizes","subarray","setUniforms","values","_setValue","value","type","set","uniformType","typeAndComponents","components","count","_alignTo"],"mappings":"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","sourcesContent":["// @ts-nocheck\n\nimport {decomposeCompositeGLType} from '../webgl-utils/attribute-utils';\nimport {assert} from '../utils';\n\nconst ERR_ARGUMENT = 'UniformBufferLayout illegal argument';\n\n// Local constants - these will \"collapse\" during minification\nconst GL_FLOAT = 0x1406;\nconst GL_INT = 0x1404;\nconst GL_UNSIGNED_INT = 0x1405;\n\n/**\n * Std140 layout for uniforms\n */\n export default class UniformBufferLayout {\n  constructor(layout) {\n    this.layout = {};\n    this.size = 0;\n\n    // Add layout (type, size and offset) definitions for each uniform in the layout\n    for (const key in layout) {\n      this._addUniform(key, layout[key]);\n    }\n\n    this.size += (4 - (this.size % 4)) % 4;\n\n    // Allocate three typed arrays pointing at same memory\n    const data = new Float32Array(this.size);\n    this.typedArray = {\n      [GL_FLOAT]: data,\n      [GL_INT]: new Int32Array(data.buffer),\n      [GL_UNSIGNED_INT]: new Uint32Array(data.buffer)\n    };\n  }\n\n  // Get number of bytes needed for buffer allocation\n  getBytes(): number {\n    return this.size * 4;\n  }\n\n  // Get the current data as Float32Array, for bufferSubData\n  getData() {\n    return this.typedArray[GL_FLOAT];\n  }\n\n  // Get offset and data for one object (for bufferSubData)\n  getSubData(index): {\n    data: any;\n    offset: any;\n  } {\n    let data;\n    let offset;\n    if (index === undefined) {\n      data = this.data;\n      offset = 0;\n    } else {\n      const begin = this.offsets[index];\n      const end = begin + this.sizes[index];\n      data = this.data.subarray(begin, end);\n      offset = begin * 4;\n    }\n    return {data, offset};\n  }\n\n  // Set a map of values\n  setUniforms(values) {\n    for (const key in values) {\n      this._setValue(key, values[key]);\n    }\n    return this;\n  }\n\n  _setValue(key, value) {\n    const layout = this.layout[key];\n    assert(layout, 'UniformLayoutStd140 illegal argument');\n    const typedArray = this.typedArray[layout.type];\n    if (layout.size === 1) {\n      // single value -> just set it\n      typedArray[layout.offset] = value;\n    } else {\n      // vector/matrix -> copy the supplied (typed) array, starting from offset\n      typedArray.set(value, layout.offset);\n    }\n  }\n\n  _addUniform(key, uniformType) {\n    const typeAndComponents = decomposeCompositeGLType(uniformType);\n    assert(typeAndComponents, ERR_ARGUMENT);\n    const {type, components: count} = typeAndComponents;\n\n    // First, align (bump) current offset to an even multiple of current object (1, 2, 4)\n    this.size = this._alignTo(this.size, count);\n    // Use the aligned size as the offset of the current uniform.\n    const offset = this.size;\n    // Then, add our object's padded size ((1, 2, multiple of 4) to the current offset\n    this.size += count;\n\n    this.layout[key] = {type, size: count, offset};\n  }\n\n  // Align offset to 1, 2 or 4 elements (4, 8 or 16 bytes)\n  _alignTo(size, count) {\n    switch (count) {\n      case 1:\n        return size; // Pad upwards to even multiple of 2\n      case 2:\n        return size + (size % 2); // Pad upwards to even multiple of 2\n      default:\n        return size + ((4 - (size % 4)) % 4); // Pad upwards to even multiple of 4\n    }\n  }\n}\n"],"file":"uniform-buffer-layout.js"}

package/dist/es5/classes/uniforms.js

@@ -10,7 +10,7 @@ exports.parseUniformName = parseUniformName;
 exports.checkUniformValues = checkUniformValues;
 exports.copyUniform = copyUniform;
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _constants = _interopRequireDefault(require("@luma.gl/constants"));
 
 var _gltools = require("@luma.gl/gltools");
 
@@ -20,64 +20,59 @@ var _renderbuffer = _interopRequireDefault(require("./renderbuffer"));
 
 var _texture = _interopRequireDefault(require("./texture"));
 
-var _assert = require("../utils/assert");
-
-var _UNIFORM_SETTERS;
-
-var UNIFORM_SETTERS = (_UNIFORM_SETTERS = {}, (0, _defineProperty2.default)(_UNIFORM_SETTERS, 5126, getArraySetter.bind(null, 'uniform1fv', toFloatArray, 1, setVectorUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35664, getArraySetter.bind(null, 'uniform2fv', toFloatArray, 2, setVectorUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35665, getArraySetter.bind(null, 'uniform3fv', toFloatArray, 3, setVectorUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35666, getArraySetter.bind(null, 'uniform4fv', toFloatArray, 4, setVectorUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 5124, getArraySetter.bind(null, 'uniform1iv', toIntArray, 1, setVectorUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35667, getArraySetter.bind(null, 'uniform2iv', toIntArray, 2, setVectorUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35668, getArraySetter.bind(null, 'uniform3iv', toIntArray, 3, setVectorUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35669, getArraySetter.bind(null, 'uniform4iv', toIntArray, 4, setVectorUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35670, getArraySetter.bind(null, 'uniform1iv', toIntArray, 1, setVectorUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35671, getArraySetter.bind(null, 'uniform2iv', toIntArray, 2, setVectorUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35672, getArraySetter.bind(null, 'uniform3iv', toIntArray, 3, setVectorUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35673, getArraySetter.bind(null, 'uniform4iv', toIntArray, 4, setVectorUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35674, getArraySetter.bind(null, 'uniformMatrix2fv', toFloatArray, 4, setMatrixUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35675, getArraySetter.bind(null, 'uniformMatrix3fv', toFloatArray, 9, setMatrixUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35676, getArraySetter.bind(null, 'uniformMatrix4fv', toFloatArray, 16, setMatrixUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35678, getSamplerSetter), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35680, getSamplerSetter), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 5125, getArraySetter.bind(null, 'uniform1uiv', toUIntArray, 1, setVectorUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 36294, getArraySetter.bind(null, 'uniform2uiv', toUIntArray, 2, setVectorUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 36295, getArraySetter.bind(null, 'uniform3uiv', toUIntArray, 3, setVectorUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 36296, getArraySetter.bind(null, 'uniform4uiv', toUIntArray, 4, setVectorUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35685, getArraySetter.bind(null, 'uniformMatrix2x3fv', toFloatArray, 6, setMatrixUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35686, getArraySetter.bind(null, 'uniformMatrix2x4fv', toFloatArray, 8, setMatrixUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35687, getArraySetter.bind(null, 'uniformMatrix3x2fv', toFloatArray, 6, setMatrixUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35688, getArraySetter.bind(null, 'uniformMatrix3x4fv', toFloatArray, 12, setMatrixUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35689, getArraySetter.bind(null, 'uniformMatrix4x2fv', toFloatArray, 8, setMatrixUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35690, getArraySetter.bind(null, 'uniformMatrix4x3fv', toFloatArray, 12, setMatrixUniform)), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35678, getSamplerSetter), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35680, getSamplerSetter), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35679, getSamplerSetter), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 35682, getSamplerSetter), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 36289, getSamplerSetter), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 36292, getSamplerSetter), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 36293, getSamplerSetter), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 36298, getSamplerSetter), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 36299, getSamplerSetter), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 36300, getSamplerSetter), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 36303, getSamplerSetter), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 36306, getSamplerSetter), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 36307, getSamplerSetter), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 36308, getSamplerSetter), (0, _defineProperty2.default)(_UNIFORM_SETTERS, 36311, getSamplerSetter), _UNIFORM_SETTERS);
-var FLOAT_ARRAY = {};
-var INT_ARRAY = {};
-var UINT_ARRAY = {};
-var array1 = [0];
-
-function toTypedArray(value, uniformLength, Type, cache) {
-  if (uniformLength === 1 && typeof value === 'boolean') {
-    value = value ? 1 : 0;
-  }
-
-  if (Number.isFinite(value)) {
-    array1[0] = value;
-    value = array1;
-  }
-
-  var length = value.length;
-
-  if (length % uniformLength) {
-    _gltools.log.warn("Uniform size should be multiples of ".concat(uniformLength), value)();
-  }
-
-  if (value instanceof Type) {
-    return value;
-  }
-
-  var result = cache[length];
-
-  if (!result) {
-    result = new Type(length);
-    cache[length] = result;
-  }
-
-  for (var i = 0; i < length; i++) {
-    result[i] = value[i];
-  }
-
-  return result;
-}
-
-function toFloatArray(value, uniformLength) {
-  return toTypedArray(value, uniformLength, Float32Array, FLOAT_ARRAY);
-}
-
-function toIntArray(value, uniformLength) {
-  return toTypedArray(value, uniformLength, Int32Array, INT_ARRAY);
-}
-
-function toUIntArray(value, uniformLength) {
-  return toTypedArray(value, uniformLength, Uint32Array, UINT_ARRAY);
-}
+var _utils = require("../utils");
+
+const UNIFORM_SETTERS = {
+  [_constants.default.FLOAT]: getArraySetter.bind(null, 'uniform1fv', toFloatArray, 1, setVectorUniform),
+  [_constants.default.FLOAT_VEC2]: getArraySetter.bind(null, 'uniform2fv', toFloatArray, 2, setVectorUniform),
+  [_constants.default.FLOAT_VEC3]: getArraySetter.bind(null, 'uniform3fv', toFloatArray, 3, setVectorUniform),
+  [_constants.default.FLOAT_VEC4]: getArraySetter.bind(null, 'uniform4fv', toFloatArray, 4, setVectorUniform),
+  [_constants.default.INT]: getArraySetter.bind(null, 'uniform1iv', toIntArray, 1, setVectorUniform),
+  [_constants.default.INT_VEC2]: getArraySetter.bind(null, 'uniform2iv', toIntArray, 2, setVectorUniform),
+  [_constants.default.INT_VEC3]: getArraySetter.bind(null, 'uniform3iv', toIntArray, 3, setVectorUniform),
+  [_constants.default.INT_VEC4]: getArraySetter.bind(null, 'uniform4iv', toIntArray, 4, setVectorUniform),
+  [_constants.default.BOOL]: getArraySetter.bind(null, 'uniform1iv', toIntArray, 1, setVectorUniform),
+  [_constants.default.BOOL_VEC2]: getArraySetter.bind(null, 'uniform2iv', toIntArray, 2, setVectorUniform),
+  [_constants.default.BOOL_VEC3]: getArraySetter.bind(null, 'uniform3iv', toIntArray, 3, setVectorUniform),
+  [_constants.default.BOOL_VEC4]: getArraySetter.bind(null, 'uniform4iv', toIntArray, 4, setVectorUniform),
+  [_constants.default.FLOAT_MAT2]: getArraySetter.bind(null, 'uniformMatrix2fv', toFloatArray, 4, setMatrixUniform),
+  [_constants.default.FLOAT_MAT3]: getArraySetter.bind(null, 'uniformMatrix3fv', toFloatArray, 9, setMatrixUniform),
+  [_constants.default.FLOAT_MAT4]: getArraySetter.bind(null, 'uniformMatrix4fv', toFloatArray, 16, setMatrixUniform),
+  [_constants.default.SAMPLER_2D]: getSamplerSetter,
+  [_constants.default.SAMPLER_CUBE]: getSamplerSetter,
+  [_constants.default.UNSIGNED_INT]: getArraySetter.bind(null, 'uniform1uiv', toUIntArray, 1, setVectorUniform),
+  [_constants.default.UNSIGNED_INT_VEC2]: getArraySetter.bind(null, 'uniform2uiv', toUIntArray, 2, setVectorUniform),
+  [_constants.default.UNSIGNED_INT_VEC3]: getArraySetter.bind(null, 'uniform3uiv', toUIntArray, 3, setVectorUniform),
+  [_constants.default.UNSIGNED_INT_VEC4]: getArraySetter.bind(null, 'uniform4uiv', toUIntArray, 4, setVectorUniform),
+  [_constants.default.FLOAT_MAT2x3]: getArraySetter.bind(null, 'uniformMatrix2x3fv', toFloatArray, 6, setMatrixUniform),
+  [_constants.default.FLOAT_MAT2x4]: getArraySetter.bind(null, 'uniformMatrix2x4fv', toFloatArray, 8, setMatrixUniform),
+  [_constants.default.FLOAT_MAT3x2]: getArraySetter.bind(null, 'uniformMatrix3x2fv', toFloatArray, 6, setMatrixUniform),
+  [_constants.default.FLOAT_MAT3x4]: getArraySetter.bind(null, 'uniformMatrix3x4fv', toFloatArray, 12, setMatrixUniform),
+  [_constants.default.FLOAT_MAT4x2]: getArraySetter.bind(null, 'uniformMatrix4x2fv', toFloatArray, 8, setMatrixUniform),
+  [_constants.default.FLOAT_MAT4x3]: getArraySetter.bind(null, 'uniformMatrix4x3fv', toFloatArray, 12, setMatrixUniform),
+  [_constants.default.SAMPLER_2D]: getSamplerSetter,
+  [_constants.default.SAMPLER_CUBE]: getSamplerSetter,
+  [_constants.default.SAMPLER_3D]: getSamplerSetter,
+  [_constants.default.SAMPLER_2D_SHADOW]: getSamplerSetter,
+  [_constants.default.SAMPLER_2D_ARRAY]: getSamplerSetter,
+  [_constants.default.SAMPLER_2D_ARRAY_SHADOW]: getSamplerSetter,
+  [_constants.default.SAMPLER_CUBE_SHADOW]: getSamplerSetter,
+  [_constants.default.INT_SAMPLER_2D]: getSamplerSetter,
+  [_constants.default.INT_SAMPLER_3D]: getSamplerSetter,
+  [_constants.default.INT_SAMPLER_CUBE]: getSamplerSetter,
+  [_constants.default.INT_SAMPLER_2D_ARRAY]: getSamplerSetter,
+  [_constants.default.UNSIGNED_INT_SAMPLER_2D]: getSamplerSetter,
+  [_constants.default.UNSIGNED_INT_SAMPLER_3D]: getSamplerSetter,
+  [_constants.default.UNSIGNED_INT_SAMPLER_CUBE]: getSamplerSetter,
+  [_constants.default.UNSIGNED_INT_SAMPLER_2D_ARRAY]: getSamplerSetter
+};
+const FLOAT_ARRAY = {};
+const INT_ARRAY = {};
+const UINT_ARRAY = {};
+const array1 = [0];
 
 function getUniformSetter(gl, location, info) {
-  var setter = UNIFORM_SETTERS[info.type];
+  const setter = UNIFORM_SETTERS[info.type];
 
   if (!setter) {
     throw new Error("Unknown GLSL uniform type ".concat(info.type));
@@ -89,14 +84,14 @@ function getUniformSetter(gl, location, info) {
 function parseUniformName(name) {
   if (name[name.length - 1] !== ']') {
     return {
-      name: name,
+      name,
       length: 1,
       isArray: false
     };
   }
 
-  var UNIFORM_NAME_REGEXP = /([^[]*)(\[[0-9]+\])?/;
-  var matches = name.match(UNIFORM_NAME_REGEXP);
+  const UNIFORM_NAME_REGEXP = /([^[]*)(\[[0-9]+\])?/;
+  const matches = name.match(UNIFORM_NAME_REGEXP);
 
   if (!matches || matches.length < 2) {
     throw new Error("Failed to parse GLSL uniform name ".concat(name));
@@ -104,15 +99,15 @@ function parseUniformName(name) {
 
   return {
     name: matches[1],
-    length: matches[2] || 1,
+    length: Number(matches[2]) || 1,
     isArray: Boolean(matches[2])
   };
 }
 
 function checkUniformValues(uniforms, source, uniformMap) {
-  for (var uniformName in uniforms) {
-    var value = uniforms[uniformName];
-    var shouldCheck = !uniformMap || Boolean(uniformMap[uniformName]);
+  for (const uniformName in uniforms) {
+    const value = uniforms[uniformName];
+    const shouldCheck = !uniformMap || Boolean(uniformMap[uniformName]);
 
     if (shouldCheck && !checkUniformValue(value)) {
       source = source ? "".concat(source, " ") : '';
@@ -124,6 +119,22 @@ function checkUniformValues(uniforms, source, uniformMap) {
   return true;
 }
 
+function copyUniform(uniforms, key, value) {
+  if (Array.isArray(value) || ArrayBuffer.isView(value)) {
+    if (uniforms[key]) {
+      const dest = uniforms[key];
+
+      for (let i = 0, len = value.length; i < len; ++i) {
+        dest[i] = value[i];
+      }
+    } else {
+      uniforms[key] = value.slice();
+    }
+  } else {
+    uniforms[key] = value;
+  }
+}
+
 function checkUniformValue(value) {
   if (Array.isArray(value) || ArrayBuffer.isView(value)) {
     return checkUniformArray(value);
@@ -144,30 +155,14 @@ function checkUniformValue(value) {
   return false;
 }
 
-function copyUniform(uniforms, key, value) {
-  if (Array.isArray(value) || ArrayBuffer.isView(value)) {
-    if (uniforms[key]) {
-      var dest = uniforms[key];
-
-      for (var i = 0, len = value.length; i < len; ++i) {
-        dest[i] = value[i];
-      }
-    } else {
-      uniforms[key] = value.slice();
-    }
-  } else {
-    uniforms[key] = value;
-  }
-}
-
 function checkUniformArray(value) {
   if (value.length === 0) {
     return false;
   }
 
-  var checkLength = Math.min(value.length, 16);
+  const checkLength = Math.min(value.length, 16);
 
-  for (var i = 0; i < checkLength; ++i) {
+  for (let i = 0; i < checkLength; ++i) {
     if (!Number.isFinite(value[i])) {
       return false;
     }
@@ -177,9 +172,9 @@ function checkUniformArray(value) {
 }
 
 function getSamplerSetter() {
-  var cache = null;
-  return function (gl, location, value) {
-    var update = cache !== value;
+  let cache = null;
+  return (gl, location, value) => {
+    const update = cache !== value;
 
     if (update) {
       gl.uniform1i(location, value);
@@ -191,21 +186,21 @@ function getSamplerSetter() {
 }
 
 function getArraySetter(functionName, toArray, size, uniformSetter) {
-  var cache = null;
-  var cacheLength = null;
-  return function (gl, location, value) {
-    var arrayValue = toArray(value, size);
-    var length = arrayValue.length;
-    var update = false;
+  let cache = null;
+  let cacheLength = null;
+  return (gl, location, value) => {
+    const arrayValue = toArray(value, size);
+    const length = arrayValue.length;
+    let update = false;
 
     if (cache === null) {
       cache = new Float32Array(length);
       cacheLength = length;
       update = true;
     } else {
-      (0, _assert.assert)(cacheLength === length, 'Uniform length cannot change.');
+      (0, _utils.assert)(cacheLength === length, 'Uniform length cannot change.');
 
-      for (var i = 0; i < length; ++i) {
+      for (let i = 0; i < length; ++i) {
         if (arrayValue[i] !== cache[i]) {
           update = true;
           break;
@@ -229,4 +224,50 @@ function setVectorUniform(gl, functionName, location, value) {
 function setMatrixUniform(gl, functionName, location, value) {
   gl[functionName](location, false, value);
 }
+
+function toTypedArray(value, uniformLength, Type, cache) {
+  if (uniformLength === 1 && typeof value === 'boolean') {
+    value = value ? 1 : 0;
+  }
+
+  if (Number.isFinite(value)) {
+    array1[0] = value;
+    value = array1;
+  }
+
+  const length = value.length;
+
+  if (length % uniformLength) {
+    _gltools.log.warn("Uniform size should be multiples of ".concat(uniformLength), value)();
+  }
+
+  if (value instanceof Type) {
+    return value;
+  }
+
+  let result = cache[length];
+
+  if (!result) {
+    result = new Type(length);
+    cache[length] = result;
+  }
+
+  for (let i = 0; i < length; i++) {
+    result[i] = value[i];
+  }
+
+  return result;
+}
+
+function toFloatArray(value, uniformLength) {
+  return toTypedArray(value, uniformLength, Float32Array, FLOAT_ARRAY);
+}
+
+function toIntArray(value, uniformLength) {
+  return toTypedArray(value, uniformLength, Int32Array, INT_ARRAY);
+}
+
+function toUIntArray(value, uniformLength) {
+  return toTypedArray(value, uniformLength, Uint32Array, UINT_ARRAY);
+}
 //# sourceMappingURL=uniforms.js.map