@cesium/engine 1.1.0 → 2.1.0

package/Source/Scene/ArcGisMapServerImageryProvider.js

@@ -20,12 +20,12 @@ import ImageryLayerFeatureInfo from "./ImageryLayerFeatureInfo.js";
 import ImageryProvider from "./ImageryProvider.js";
 
 /**
- * @typedef {Object} ArcGisMapServerImageryProvider.ConstructorOptions
+ * @typedef {object} ArcGisMapServerImageryProvider.ConstructorOptions
  *
  * Initialization options for the ArcGisMapServerImageryProvider constructor
  *
- * @property {Resource|String} url The URL of the ArcGIS MapServer service.
- * @property {String} [token] The ArcGIS token used to authenticate with the ArcGIS MapServer service.
+ * @property {Resource|string} url The URL of the ArcGIS MapServer service.
+ * @property {string} [token] The ArcGIS token used to authenticate with the ArcGIS MapServer service.
  * @property {TileDiscardPolicy} [tileDiscardPolicy] The policy that determines if a tile
  *        is invalid and should be discarded.  If this value is not specified, a default
  *        {@link DiscardMissingTileImagePolicy} is used for tiled map servers, and a
@@ -37,11 +37,11 @@ import ImageryProvider from "./ImageryProvider.js";
  *        these defaults should be correct tile discarding for a standard ArcGIS Server.  To ensure
  *        that no tiles are discarded, construct and pass a {@link NeverTileDiscardPolicy} for this
  *        parameter.
- * @property {Boolean} [usePreCachedTilesIfAvailable=true] If true, the server's pre-cached
+ * @property {boolean} [usePreCachedTilesIfAvailable=true] If true, the server's pre-cached
  *        tiles are used if they are available.  If false, any pre-cached tiles are ignored and the
  *        'export' service is used.
- * @property {String} [layers] A comma-separated list of the layers to show, or undefined if all layers should be shown.
- * @property {Boolean} [enablePickFeatures=true] If true, {@link ArcGisMapServerImageryProvider#pickFeatures} will invoke
+ * @property {string} [layers] A comma-separated list of the layers to show, or undefined if all layers should be shown.
+ * @property {boolean} [enablePickFeatures=true] If true, {@link ArcGisMapServerImageryProvider#pickFeatures} will invoke
  *        the Identify service on the MapServer and return the features included in the response.  If false,
  *        {@link ArcGisMapServerImageryProvider#pickFeatures} will immediately return undefined (indicating no pickable features)
  *        without communicating with the server.  Set this property to false if you don't want this provider's features to
@@ -53,10 +53,10 @@ import ImageryProvider from "./ImageryProvider.js";
  * @property {Ellipsoid} [ellipsoid] The ellipsoid.  If the tilingScheme is specified and used,
  *                    this parameter is ignored and the tiling scheme's ellipsoid is used instead. If neither
  *                    parameter is specified, the WGS84 ellipsoid is used.
- * @property {Credit|String} [credit] A credit for the data source, which is displayed on the canvas.  This parameter is ignored when accessing a tiled server.
- * @property {Number} [tileWidth=256] The width of each tile in pixels.  This parameter is ignored when accessing a tiled server.
- * @property {Number} [tileHeight=256] The height of each tile in pixels.  This parameter is ignored when accessing a tiled server.
- * @property {Number} [maximumLevel] The maximum tile level to request, or undefined if there is no maximum.  This parameter is ignored when accessing
+ * @property {Credit|string} [credit] A credit for the data source, which is displayed on the canvas.  This parameter is ignored when accessing a tiled server.
+ * @property {number} [tileWidth=256] The width of each tile in pixels.  This parameter is ignored when accessing a tiled server.
+ * @property {number} [tileHeight=256] The height of each tile in pixels.  This parameter is ignored when accessing a tiled server.
+ * @property {number} [maximumLevel] The maximum tile level to request, or undefined if there is no maximum.  This parameter is ignored when accessing
  *                                        a tiled server.
  */
 
@@ -100,7 +100,7 @@ function ArcGisMapServerImageryProvider(options) {
    * The default alpha blending value of this provider, with 0.0 representing fully transparent and
    * 1.0 representing fully opaque.
    *
-   * @type {Number|undefined}
+   * @type {number|undefined}
    * @default undefined
    */
   this.defaultAlpha = undefined;
@@ -109,7 +109,7 @@ function ArcGisMapServerImageryProvider(options) {
    * The default alpha blending value on the night side of the globe of this provider, with 0.0 representing fully transparent and
    * 1.0 representing fully opaque.
    *
-   * @type {Number|undefined}
+   * @type {number|undefined}
    * @default undefined
    */
   this.defaultNightAlpha = undefined;
@@ -118,7 +118,7 @@ function ArcGisMapServerImageryProvider(options) {
    * The default alpha blending value on the day side of the globe of this provider, with 0.0 representing fully transparent and
    * 1.0 representing fully opaque.
    *
-   * @type {Number|undefined}
+   * @type {number|undefined}
    * @default undefined
    */
   this.defaultDayAlpha = undefined;
@@ -127,7 +127,7 @@ function ArcGisMapServerImageryProvider(options) {
    * The default brightness of this provider.  1.0 uses the unmodified imagery color.  Less than 1.0
    * makes the imagery darker while greater than 1.0 makes it brighter.
    *
-   * @type {Number|undefined}
+   * @type {number|undefined}
    * @default undefined
    */
   this.defaultBrightness = undefined;
@@ -136,7 +136,7 @@ function ArcGisMapServerImageryProvider(options) {
    * The default contrast of this provider.  1.0 uses the unmodified imagery color.  Less than 1.0 reduces
    * the contrast while greater than 1.0 increases it.
    *
-   * @type {Number|undefined}
+   * @type {number|undefined}
    * @default undefined
    */
   this.defaultContrast = undefined;
@@ -144,7 +144,7 @@ function ArcGisMapServerImageryProvider(options) {
   /**
    * The default hue of this provider in radians. 0.0 uses the unmodified imagery color.
    *
-   * @type {Number|undefined}
+   * @type {number|undefined}
    * @default undefined
    */
   this.defaultHue = undefined;
@@ -153,7 +153,7 @@ function ArcGisMapServerImageryProvider(options) {
    * The default saturation of this provider. 1.0 uses the unmodified imagery color. Less than 1.0 reduces the
    * saturation while greater than 1.0 increases it.
    *
-   * @type {Number|undefined}
+   * @type {number|undefined}
    * @default undefined
    */
   this.defaultSaturation = undefined;
@@ -161,7 +161,7 @@ function ArcGisMapServerImageryProvider(options) {
   /**
    * The default gamma correction to apply to this provider.  1.0 uses the unmodified imagery color.
    *
-   * @type {Number|undefined}
+   * @type {number|undefined}
    * @default undefined
    */
   this.defaultGamma = undefined;
@@ -219,7 +219,7 @@ function ArcGisMapServerImageryProvider(options) {
    * invoke the "identify" operation on the ArcGIS server and return the features included in the response.  If false,
    * {@link ArcGisMapServerImageryProvider#pickFeatures} will immediately return undefined (indicating no pickable features)
    * without communicating with the server.
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.enablePickFeatures = defaultValue(options.enablePickFeatures, true);
@@ -448,7 +448,7 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
   /**
    * Gets the URL of the ArcGIS MapServer.
    * @memberof ArcGisMapServerImageryProvider.prototype
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   url: {
@@ -460,7 +460,7 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
   /**
    * Gets the ArcGIS token used to authenticate with the ArcGis MapServer service.
    * @memberof ArcGisMapServerImageryProvider.prototype
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   token: {
@@ -485,7 +485,7 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
    * Gets the width of each tile, in pixels. This function should
    * not be called before {@link ArcGisMapServerImageryProvider#ready} returns true.
    * @memberof ArcGisMapServerImageryProvider.prototype
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   tileWidth: {
@@ -506,7 +506,7 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
    * Gets the height of each tile, in pixels.  This function should
    * not be called before {@link ArcGisMapServerImageryProvider#ready} returns true.
    * @memberof ArcGisMapServerImageryProvider.prototype
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   tileHeight: {
@@ -527,7 +527,7 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
    * Gets the maximum level-of-detail that can be requested.  This function should
    * not be called before {@link ArcGisMapServerImageryProvider#ready} returns true.
    * @memberof ArcGisMapServerImageryProvider.prototype
-   * @type {Number|undefined}
+   * @type {number|undefined}
    * @readonly
    */
   maximumLevel: {
@@ -548,7 +548,7 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
    * Gets the minimum level-of-detail that can be requested.  This function should
    * not be called before {@link ArcGisMapServerImageryProvider#ready} returns true.
    * @memberof ArcGisMapServerImageryProvider.prototype
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   minimumLevel: {
@@ -647,7 +647,7 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
   /**
    * Gets a value indicating whether or not the provider is ready for use.
    * @memberof ArcGisMapServerImageryProvider.prototype
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    */
   ready: {
@@ -659,7 +659,7 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
   /**
    * Gets a promise that resolves to true when the provider is ready for use.
    * @memberof ArcGisMapServerImageryProvider.prototype
-   * @type {Promise.<Boolean>}
+   * @type {Promise<boolean>}
    * @readonly
    */
   readyPromise: {
@@ -688,7 +688,7 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
    * not have pre-cached tiles.
    * @memberof ArcGisMapServerImageryProvider.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    * @default true
    */
@@ -706,7 +706,7 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
    * and texture upload time are reduced.
    * @memberof ArcGisMapServerImageryProvider.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    * @default true
    */
@@ -720,7 +720,7 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
    * Gets the comma-separated list of layer IDs to show.
    * @memberof ArcGisMapServerImageryProvider.prototype
    *
-   * @type {String}
+   * @type {string}
    */
   layers: {
     get: function () {
@@ -732,9 +732,9 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
 /**
  * Gets the credits to be displayed when a given tile is displayed.
  *
- * @param {Number} x The tile X coordinate.
- * @param {Number} y The tile Y coordinate.
- * @param {Number} level The tile level;
+ * @param {number} x The tile X coordinate.
+ * @param {number} y The tile Y coordinate.
+ * @param {number} level The tile level;
  * @returns {Credit[]} The credits to be displayed when the tile is displayed.
  *
  * @exception {DeveloperError} <code>getTileCredits</code> must not be called before the imagery provider is ready.
@@ -751,11 +751,11 @@ ArcGisMapServerImageryProvider.prototype.getTileCredits = function (
  * Requests the image for a given tile.  This function should
  * not be called before {@link ArcGisMapServerImageryProvider#ready} returns true.
  *
- * @param {Number} x The tile X coordinate.
- * @param {Number} y The tile Y coordinate.
- * @param {Number} level The tile level.
+ * @param {number} x The tile X coordinate.
+ * @param {number} y The tile Y coordinate.
+ * @param {number} level The tile level.
  * @param {Request} [request] The request object. Intended for internal use only.
- * @returns {Promise.<ImageryTypes>|undefined} A promise for the image that will resolve when the image is available, or
+ * @returns {Promise<ImageryTypes>|undefined} A promise for the image that will resolve when the image is available, or
  *          undefined if there are too many active requests to the server, and the request should be retried later.
  *
  * @exception {DeveloperError} <code>requestImage</code> must not be called before the imagery provider is ready.
@@ -785,12 +785,12 @@ ArcGisMapServerImageryProvider.prototype.requestImage = function (
      * Asynchronously determines what features, if any, are located at a given longitude and latitude within
      * a tile.  This function should not be called before {@link ImageryProvider#ready} returns true.
      *
-     * @param {Number} x The tile X coordinate.
-     * @param {Number} y The tile Y coordinate.
-     * @param {Number} level The tile level.
-     * @param {Number} longitude The longitude at which to pick features.
-     * @param {Number} latitude  The latitude at which to pick features.
-     * @return {Promise.<ImageryLayerFeatureInfo[]>|undefined} A promise for the picked features that will resolve when the asynchronous
+     * @param {number} x The tile X coordinate.
+     * @param {number} y The tile Y coordinate.
+     * @param {number} level The tile level.
+     * @param {number} longitude The longitude at which to pick features.
+     * @param {number} latitude  The latitude at which to pick features.
+     * @return {Promise<ImageryLayerFeatureInfo[]>|undefined} A promise for the picked features that will resolve when the asynchronous
      *                   picking completes.  The resolved value is an array of {@link ImageryLayerFeatureInfo}
      *                   instances.  The array may be empty if no features are found at the given location.
      *

package/Source/Scene/AttributeType.js

@@ -10,7 +10,7 @@ import Matrix4 from "../Core/Matrix4.js";
 /**
  * An enum describing the attribute type for glTF and 3D Tiles.
  *
- * @enum {String}
+ * @enum {string}
  *
  * @private
  */
@@ -18,7 +18,7 @@ const AttributeType = {
   /**
    * The attribute is a single component.
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   SCALAR: "SCALAR",
@@ -26,7 +26,7 @@ const AttributeType = {
   /**
    * The attribute is a two-component vector.
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   VEC2: "VEC2",
@@ -34,7 +34,7 @@ const AttributeType = {
   /**
    * The attribute is a three-component vector.
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   VEC3: "VEC3",
@@ -42,7 +42,7 @@ const AttributeType = {
   /**
    * The attribute is a four-component vector.
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   VEC4: "VEC4",
@@ -50,7 +50,7 @@ const AttributeType = {
   /**
    * The attribute is a 2x2 matrix.
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   MAT2: "MAT2",
@@ -58,7 +58,7 @@ const AttributeType = {
   /**
    * The attribute is a 3x3 matrix.
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   MAT3: "MAT3",
@@ -66,7 +66,7 @@ const AttributeType = {
   /**
    * The attribute is a 4x4 matrix.
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   MAT4: "MAT4",
@@ -107,7 +107,7 @@ AttributeType.getMathType = function (attributeType) {
  * Gets the number of components per attribute.
  *
  * @param {AttributeType} attributeType The attribute type.
- * @returns {Number} The number of components.
+ * @returns {number} The number of components.
  *
  * @private
  */
@@ -138,7 +138,7 @@ AttributeType.getNumberOfComponents = function (attributeType) {
  * types require one, but matrices require multiple attribute locations.
  *
  * @param {AttributeType} attributeType The attribute type.
- * @returns {Number} The number of attribute locations needed in the shader
+ * @returns {number} The number of attribute locations needed in the shader
  *
  * @private
  */
@@ -166,7 +166,7 @@ AttributeType.getAttributeLocationCount = function (attributeType) {
  * Gets the GLSL type for the attribute type.
  *
  * @param {AttributeType} attributeType The attribute type.
- * @returns {String} The GLSL type for the attribute type.
+ * @returns {string} The GLSL type for the attribute type.
  *
  * @private
  */

package/Source/Scene/AutoExposure.js

@@ -39,7 +39,7 @@ function AutoExposure() {
   /**
    * Whether or not to execute this post-process stage when ready.
    *
-   * @type {Boolean}
+   * @type {boolean}
    */
   this.enabled = true;
   this._enabled = true;
@@ -47,7 +47,7 @@ function AutoExposure() {
   /**
    * The minimum value used to clamp the luminance.
    *
-   * @type {Number}
+   * @type {number}
    * @default 0.1
    */
   this.minimumLuminance = 0.1;
@@ -55,7 +55,7 @@ function AutoExposure() {
   /**
    * The maximum value used to clamp the luminance.
    *
-   * @type {Number}
+   * @type {number}
    * @default 10.0
    */
   this.maximumLuminance = 10.0;
@@ -68,7 +68,7 @@ Object.defineProperties(AutoExposure.prototype, {
    * to load.
    *
    * @memberof AutoExposure.prototype
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    */
   ready: {
@@ -80,7 +80,7 @@ Object.defineProperties(AutoExposure.prototype, {
    * The unique name of this post-process stage for reference by other stages.
    *
    * @memberof AutoExposure.prototype
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   name: {
@@ -203,16 +203,16 @@ function createUniformMap(autoexposure, index) {
 function getShaderSource(index, length) {
   let source =
     "uniform sampler2D colorTexture; \n" +
-    "varying vec2 v_textureCoordinates; \n" +
+    "in vec2 v_textureCoordinates; \n" +
     "float sampleTexture(vec2 offset) { \n";
 
   if (index === 0) {
     source +=
-      "    vec4 color = texture2D(colorTexture, v_textureCoordinates + offset); \n" +
+      "    vec4 color = texture(colorTexture, v_textureCoordinates + offset); \n" +
       "    return czm_luminance(color.rgb); \n";
   } else {
     source +=
-      "    return texture2D(colorTexture, v_textureCoordinates + offset).r; \n";
+      "    return texture(colorTexture, v_textureCoordinates + offset).r; \n";
   }
 
   source += "}\n\n";
@@ -244,13 +244,13 @@ function getShaderSource(index, length) {
 
   if (index === length - 1) {
     source +=
-      "    float previous = texture2D(previousLuminance, vec2(0.5)).r; \n" +
+      "    float previous = texture(previousLuminance, vec2(0.5)).r; \n" +
       "    color = clamp(color, minMaxLuminance.x, minMaxLuminance.y); \n" +
       "    color = previous + (color - previous) / (60.0 * 1.5); \n" +
       "    color = clamp(color, minMaxLuminance.x, minMaxLuminance.y); \n";
   }
 
-  source += "    gl_FragColor = vec4(color); \n" + "} \n";
+  source += "    out_FragColor = vec4(color); \n" + "} \n";
   return source;
 }
 
@@ -358,7 +358,7 @@ AutoExposure.prototype.execute = function (context, colorTexture) {
  * <code>isDestroyed</code> will result in a {@link DeveloperError} exception.
  * </p>
  *
- * @returns {Boolean} <code>true</code> if this object was destroyed; otherwise, <code>false</code>.
+ * @returns {boolean} <code>true</code> if this object was destroyed; otherwise, <code>false</code>.
  *
  * @see AutoExposure#destroy
  */

package/Source/Scene/Axis.js

@@ -6,13 +6,13 @@ import Matrix4 from "../Core/Matrix4.js";
 /**
  * An enum describing the x, y, and z axes and helper conversion functions.
  *
- * @enum {Number}
+ * @enum {number}
  */
 const Axis = {
   /**
    * Denotes the x-axis.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   X: 0,
@@ -20,7 +20,7 @@ const Axis = {
   /**
    * Denotes the y-axis.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   Y: 1,
@@ -28,7 +28,7 @@ const Axis = {
   /**
    * Denotes the z-axis.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   Z: 2,
@@ -97,8 +97,8 @@ Axis.Y_UP_TO_X_UP = Matrix4.fromRotationTranslation(
 /**
  * Gets the axis by name
  *
- * @param {String} name The name of the axis.
- * @returns {Number} The axis enum.
+ * @param {string} name The name of the axis.
+ * @returns {number} The axis enum.
  */
 Axis.fromName = function (name) {
   //>>includeStart('debug', pragmas.debug);

package/Source/Scene/B3dmParser.js

@@ -21,8 +21,8 @@ const sizeOfUint32 = Uint32Array.BYTES_PER_ELEMENT;
  * @private
  *
  * @param {ArrayBuffer} arrayBuffer The array buffer containing the b3dm.
- * @param {Number} [byteOffset=0] The byte offset of the beginning of the b3dm in the array buffer.
- * @returns {Object} Returns an object with the batch length, feature table (binary and json), batch table (binary and json) and glTF parts of the b3dm.
+ * @param {number} [byteOffset=0] The byte offset of the beginning of the b3dm in the array buffer.
+ * @returns {object} Returns an object with the batch length, feature table (binary and json), batch table (binary and json) and glTF parts of the b3dm.
  */
 B3dmParser.parse = function (arrayBuffer, byteOffset) {
   const byteStart = defaultValue(byteOffset, 0);

package/Source/Scene/BatchTable.js

@@ -22,7 +22,7 @@ import Texture from "../Renderer/Texture.js";
  * @param {Context} context The context in which the batch table is created.
  * @param {Object[]} attributes An array of objects describing a per instance attribute. Each object contains a datatype, components per attributes, whether it is normalized and a function name
  *     to retrieve the value in the vertex shader.
- * @param {Number} numberOfInstances The number of instances in a batch table.
+ * @param {number} numberOfInstances The number of instances in a batch table.
  *
  * @example
  * // create the batch table
@@ -142,7 +142,7 @@ Object.defineProperties(BatchTable.prototype, {
   /**
    * The number of instances.
    * @memberOf BatchTable.prototype
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   numberOfInstances: {
@@ -247,10 +247,10 @@ const scratchGetAttributeCartesian4 = new Cartesian4();
 /**
  * Gets the value of an attribute in the table.
  *
- * @param {Number} instanceIndex The index of the instance.
- * @param {Number} attributeIndex The index of the attribute.
+ * @param {number} instanceIndex The index of the instance.
+ * @param {number} attributeIndex The index of the attribute.
  * @param {undefined|Cartesian2|Cartesian3|Cartesian4} [result] The object onto which to store the result. The type is dependent on the attribute's number of components.
- * @returns {Number|Cartesian2|Cartesian3|Cartesian4} The attribute value stored for the instance.
+ * @returns {number|Cartesian2|Cartesian3|Cartesian4} The attribute value stored for the instance.
  *
  * @exception {DeveloperError} instanceIndex is out of range.
  * @exception {DeveloperError} attributeIndex is out of range.
@@ -315,9 +315,9 @@ const setAttributeScratchCartesian4 = new Cartesian4();
 /**
  * Sets the value of an attribute in the table.
  *
- * @param {Number} instanceIndex The index of the instance.
- * @param {Number} attributeIndex The index of the attribute.
- * @param {Number|Cartesian2|Cartesian3|Cartesian4} value The value to be stored in the table. The type of value will depend on the number of components of the attribute.
+ * @param {number} instanceIndex The index of the instance.
+ * @param {number} attributeIndex The index of the attribute.
+ * @param {number|Cartesian2|Cartesian3|Cartesian4} value The value to be stored in the table. The type of value will depend on the number of components of the attribute.
  *
  * @exception {DeveloperError} instanceIndex is out of range.
  * @exception {DeveloperError} attributeIndex is out of range.
@@ -530,12 +530,12 @@ function getGlslAttributeFunction(batchTable, attributeIndex) {
   ) {
     glslFunction +=
       "vec4 textureValue; \n" +
-      "textureValue.x = czm_unpackFloat(texture2D(batchTexture, st)); \n" +
-      "textureValue.y = czm_unpackFloat(texture2D(batchTexture, st + vec2(batchTextureStep.x, 0.0))); \n" +
-      "textureValue.z = czm_unpackFloat(texture2D(batchTexture, st + vec2(batchTextureStep.x * 2.0, 0.0))); \n" +
-      "textureValue.w = czm_unpackFloat(texture2D(batchTexture, st + vec2(batchTextureStep.x * 3.0, 0.0))); \n";
+      "textureValue.x = czm_unpackFloat(texture(batchTexture, st)); \n" +
+      "textureValue.y = czm_unpackFloat(texture(batchTexture, st + vec2(batchTextureStep.x, 0.0))); \n" +
+      "textureValue.z = czm_unpackFloat(texture(batchTexture, st + vec2(batchTextureStep.x * 2.0, 0.0))); \n" +
+      "textureValue.w = czm_unpackFloat(texture(batchTexture, st + vec2(batchTextureStep.x * 3.0, 0.0))); \n";
   } else {
-    glslFunction += "    vec4 textureValue = texture2D(batchTexture, st); \n";
+    glslFunction += "    vec4 textureValue = texture(batchTexture, st); \n";
   }
 
   glslFunction += `    ${functionReturnType} value = textureValue${functionReturnValue}; \n`;
@@ -593,7 +593,7 @@ BatchTable.prototype.getVertexShaderCallback = function () {
  * If this object was destroyed, it should not be used; calling any function other than
  * <code>isDestroyed</code> will result in a {@link DeveloperError} exception.
  *
- * @returns {Boolean} <code>true</code> if this object was destroyed; otherwise, <code>false</code>.
+ * @returns {boolean} <code>true</code> if this object was destroyed; otherwise, <code>false</code>.
  *
  * @see BatchTable#destroy
  */
@@ -622,15 +622,15 @@ BatchTable.prototype.destroy = function () {
  * A callback for updating uniform maps.
  * @callback BatchTable.updateUniformMapCallback
  *
- * @param {Object} uniformMap The uniform map.
- * @returns {Object} The new uniform map with properties for retrieving values from the batch table.
+ * @param {object} uniformMap The uniform map.
+ * @returns {object} The new uniform map with properties for retrieving values from the batch table.
  */
 
 /**
  * A callback for updating a vertex shader source.
  * @callback BatchTable.updateVertexShaderSourceCallback
  *
- * @param {String} vertexShaderSource The vertex shader source.
- * @returns {String} The new vertex shader source with the functions for retrieving batch table values injected.
+ * @param {string} vertexShaderSource The vertex shader source.
+ * @returns {string} The new vertex shader source with the functions for retrieving batch table values injected.
  */
 export default BatchTable;