@cesium/engine 1.1.0 → 2.1.0

package/Source/Scene/createElevationBandMaterial.js

@@ -411,15 +411,15 @@ function createLayeredEntries(layers) {
 /**
  * @typedef createElevationBandMaterialEntry
  *
- * @property {Number} height The height.
+ * @property {number} height The height.
  * @property {Color} color The color at this height.
  */
 /**
  * @typedef createElevationBandMaterialBand
  *
  * @property {createElevationBandMaterialEntry[]} entries A list of elevation entries. They will automatically be sorted from lowest to highest. If there is only one entry and <code>extendsDownards</code> and <code>extendUpwards</code> are both <code>false</code>, they will both be set to <code>true</code>.
- * @property {Boolean} [extendDownwards=false] If <code>true</code>, the band's minimum elevation color will extend infinitely downwards.
- * @property {Boolean} [extendUpwards=false] If <code>true</code>, the band's maximum elevation color will extend infinitely upwards.
+ * @property {boolean} [extendDownwards=false] If <code>true</code>, the band's minimum elevation color will extend infinitely downwards.
+ * @property {boolean} [extendUpwards=false] If <code>true</code>, the band's maximum elevation color will extend infinitely upwards.
  */
 
 /**
@@ -430,7 +430,7 @@ function createLayeredEntries(layers) {
  *
  * @function createElevationBandMaterial
  *
- * @param {Object} options Object with the following properties:
+ * @param {object} options Object with the following properties:
  * @param {Scene} options.scene The scene where the visualization is taking place.
  * @param {createElevationBandMaterialBand[]} options.layers A list of bands ordered from lowest to highest precedence.
  * @returns {Material} A new {@link Material} instance.
@@ -462,9 +462,7 @@ function createLayeredEntries(layers) {
  * });
  */
 function createElevationBandMaterial(options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const scene = options.scene;
-  const layers = options.layers;
+  const { scene, layers } = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.scene", scene);
@@ -472,36 +470,34 @@ function createElevationBandMaterial(options) {
   Check.typeOf.number.greaterThan("options.layers.length", layers.length, 0);
   //>>includeEnd('debug');
 
+  const { context } = scene;
   const entries = createLayeredEntries(layers);
   const entriesLength = entries.length;
-  let i;
 
   let heightTexBuffer;
   let heightTexDatatype;
   let heightTexFormat;
 
-  const isPackedHeight = !createElevationBandMaterial._useFloatTexture(
-    scene.context
-  );
+  const isPackedHeight = !createElevationBandMaterial._useFloatTexture(context);
   if (isPackedHeight) {
     heightTexDatatype = PixelDatatype.UNSIGNED_BYTE;
     heightTexFormat = PixelFormat.RGBA;
     heightTexBuffer = new Uint8Array(entriesLength * 4);
-    for (i = 0; i < entriesLength; i++) {
+    for (let i = 0; i < entriesLength; i++) {
       Cartesian4.packFloat(entries[i].height, scratchPackedFloat);
       Cartesian4.pack(scratchPackedFloat, heightTexBuffer, i * 4);
     }
   } else {
     heightTexDatatype = PixelDatatype.FLOAT;
-    heightTexFormat = PixelFormat.LUMINANCE;
+    heightTexFormat = context.webgl2 ? PixelFormat.RED : PixelFormat.LUMINANCE;
     heightTexBuffer = new Float32Array(entriesLength);
-    for (i = 0; i < entriesLength; i++) {
+    for (let i = 0; i < entriesLength; i++) {
       heightTexBuffer[i] = entries[i].height;
     }
   }
 
   const heightsTex = Texture.create({
-    context: scene.context,
+    context: context,
     pixelFormat: heightTexFormat,
     pixelDatatype: heightTexDatatype,
     source: {
@@ -518,7 +514,7 @@ function createElevationBandMaterial(options) {
   });
 
   const colorsArray = new Uint8Array(entriesLength * 4);
-  for (i = 0; i < entriesLength; i++) {
+  for (let i = 0; i < entriesLength; i++) {
     const color = entries[i].color;
     color.toBytes(scratchColorBytes);
     colorsArray[i * 4 + 0] = scratchColorBytes[0];
@@ -528,7 +524,7 @@ function createElevationBandMaterial(options) {
   }
 
   const colorsTex = Texture.create({
-    context: scene.context,
+    context: context,
     pixelFormat: PixelFormat.RGBA,
     pixelDatatype: PixelDatatype.UNSIGNED_BYTE,
     source: {
@@ -544,18 +540,17 @@ function createElevationBandMaterial(options) {
     }),
   });
 
-  const material = Material.fromType("ElevationBand", {
+  return Material.fromType("ElevationBand", {
     heights: heightsTex,
     colors: colorsTex,
   });
-  return material;
 }
 
 /**
  * Function for checking if the context will allow floating point textures for heights.
  *
  * @param {Context} context The {@link Context}.
- * @returns {Boolean} <code>true</code> if floating point textures can be used for heights.
+ * @returns {boolean} <code>true</code> if floating point textures can be used for heights.
  * @private
  */
 createElevationBandMaterial._useFloatTexture = function (context) {

package/Source/Scene/createOsmBuildings.js

@@ -13,7 +13,7 @@ import Cesium3DTileStyle from "./Cesium3DTileStyle.js";
  *
  * @function
  *
- * @param {Object} [options] Construction options. Any options allowed by the {@link Cesium3DTileset} constructor
+ * @param {object} [options] Construction options. Any options allowed by the {@link Cesium3DTileset} constructor
  *        may be specified here. In addition to those, the following properties are supported:
  * @param {Color} [options.defaultColor=Color.WHITE] The default color to use for buildings
  *        that do not have a color. This parameter is ignored if <code>options.style</code> is specified.
@@ -21,8 +21,8 @@ import Cesium3DTileStyle from "./Cesium3DTileStyle.js";
  *        specified, a default style is used which gives each building or building part a
  *        color inferred from its OpenStreetMap <code>tags</code>. If no color can be inferred,
  *        <code>options.defaultColor</code> is used.
- * @param {Boolean} [options.enableShowOutline=true] If true, enable rendering outlines. This can be set to false to avoid the additional processing of geometry at load time.
- * @param {Boolean} [options.showOutline=true] Whether to show outlines around buildings. When true,
+ * @param {boolean} [options.enableShowOutline=true] If true, enable rendering outlines. This can be set to false to avoid the additional processing of geometry at load time.
+ * @param {boolean} [options.showOutline=true] Whether to show outlines around buildings. When true,
  *        outlines are displayed. When false, outlines are not displayed.
  * @returns {Cesium3DTileset}
  *

package/Source/Scene/createTangentSpaceDebugPrimitive.js

@@ -16,9 +16,9 @@ import Primitive from "./Primitive.js";
  *
  * @function
  *
- * @param {Object} options Object with the following properties:
+ * @param {object} options Object with the following properties:
  * @param {Geometry} options.geometry The <code>Geometry</code> instance with the attribute.
- * @param {Number} [options.length=10000.0] The length of each line segment in meters.  This can be negative to point the vector in the opposite direction.
+ * @param {number} [options.length=10000.0] The length of each line segment in meters.  This can be negative to point the vector in the opposite direction.
  * @param {Matrix4} [options.modelMatrix=Matrix4.IDENTITY] The model matrix that transforms to transform the geometry from model to world coordinates.
  * @returns {Primitive} A new <code>Primitive</code> instance with geometry for the vectors.
  *

package/Source/Scene/createWorldImagery.js

@@ -7,7 +7,7 @@ import IonWorldImageryStyle from "./IonWorldImageryStyle.js";
  *
  * @function
  *
- * @param {Object} [options] Object with the following properties:
+ * @param {object} [options] Object with the following properties:
  * @param {IonWorldImageryStyle} [options.style=IonWorldImageryStyle] The style of base imagery, only AERIAL, AERIAL_WITH_LABELS, and ROAD are currently supported.
  * @returns {IonImageryProvider}
  *

package/Source/Scene/findContentMetadata.js

@@ -12,7 +12,7 @@ import oneTimeWarning from "../Core/oneTimeWarning.js";
  * @function
  *
  * @param {Cesium3DTileset} tileset The tileset to query for content metadata
- * @param {Object} contentHeader the JSON header for a {@link Cesium3DTileContent}
+ * @param {object} contentHeader the JSON header for a {@link Cesium3DTileContent}
  * @return {ContentMetadata} the content metadata, or <code>undefined</code> if not found
  * @private
  * @experimental This feature is using part of the 3D Tiles spec that is not final and is subject to change without Cesium's standard deprecation policy.

package/Source/Scene/findGroupMetadata.js

@@ -9,7 +9,7 @@ import hasExtension from "./hasExtension.js";
  * @function
  *
  * @param {Cesium3DTileset} tileset The tileset to query for group metadata
- * @param {Object} contentHeader the JSON header for a {@link Cesium3DTileContent}
+ * @param {object} contentHeader the JSON header for a {@link Cesium3DTileContent}
  * @return {GroupMetadata} the group metadata, or <code>undefined</code> if not found
  * @private
  * @experimental This feature is using part of the 3D Tiles spec that is not final and is subject to change without Cesium's standard deprecation policy.

package/Source/Scene/findTileMetadata.js

@@ -14,7 +14,7 @@ import oneTimeWarning from "../Core/oneTimeWarning.js";
  * @function
  *
  * @param {Cesium3DTileset} tileset The tileset to query for tile metadata
- * @param {Object} tileHeader the JSON header for a {@link Cesium3DTile}
+ * @param {object} tileHeader the JSON header for a {@link Cesium3DTile}
  * @return {TileMetadata} the tile metadata, or <code>undefined</code> if not found
  * @private
  * @experimental This feature is using part of the 3D Tiles spec that is not final and is subject to change without Cesium's standard deprecation policy.

package/Source/Scene/getClipAndStyleCode.js

@@ -3,10 +3,10 @@ import Check from "../Core/Check.js";
 /**
  * Gets a GLSL snippet that clips a fragment using the `clip` function from {@link getClippingFunction} and styles it.
  *
- * @param {String} samplerUniformName Name of the uniform for the clipping planes texture sampler.
- * @param {String} matrixUniformName Name of the uniform for the clipping planes matrix.
- * @param {String} styleUniformName Name of the uniform for the clipping planes style, a vec4.
- * @returns {String} A string containing GLSL that clips and styles the current fragment.
+ * @param {string} samplerUniformName Name of the uniform for the clipping planes texture sampler.
+ * @param {string} matrixUniformName Name of the uniform for the clipping planes matrix.
+ * @param {string} styleUniformName Name of the uniform for the clipping planes style, a vec4.
+ * @returns {string} A string containing GLSL that clips and styles the current fragment.
  * @private
  */
 function getClipAndStyleCode(
@@ -27,7 +27,7 @@ function getClipAndStyleCode(
     `    float clippingPlanesEdgeWidth = ${styleUniformName}.a; \n` +
     `    if (clipDistance > 0.0 && clipDistance < clippingPlanesEdgeWidth) \n` +
     `    { \n` +
-    `        gl_FragColor = clippingPlanesEdgeColor;\n` +
+    `        out_FragColor = clippingPlanesEdgeColor;\n` +
     `    } \n`;
   return shaderCode;
 }

package/Source/Scene/getClippingFunction.js

@@ -8,7 +8,7 @@ const textureResolutionScratch = new Cartesian2();
  *
  * @param {ClippingPlaneCollection} clippingPlaneCollection ClippingPlaneCollection with a defined texture.
  * @param {Context} context The current rendering context.
- * @returns {String} A string containing GLSL functions for retrieving clipping planes.
+ * @returns {string} A string containing GLSL functions for retrieving clipping planes.
  * @private
  */
 function getClippingFunction(clippingPlaneCollection, context) {
@@ -122,7 +122,7 @@ function getClippingPlaneFloat(width, height) {
     `    int pixX = clippingPlaneNumber - (pixY * ${width});\n` +
     `    float u = (float(pixX) + 0.5) * ${pixelWidthString};\n` + // sample from center of pixel
     `    float v = (float(pixY) + 0.5) * ${pixelHeightString};\n` +
-    `    vec4 plane = texture2D(packedClippingPlanes, vec2(u, v));\n` +
+    `    vec4 plane = texture(packedClippingPlanes, vec2(u, v));\n` +
     `    return czm_transformPlane(plane, transform);\n` +
     `}\n`;
   return functionString;
@@ -151,11 +151,11 @@ function getClippingPlaneUint8(width, height) {
     `    int pixX = clippingPlaneStartIndex - (pixY * ${width});\n` +
     `    float u = (float(pixX) + 0.5) * ${pixelWidthString};\n` + // sample from center of pixel
     `    float v = (float(pixY) + 0.5) * ${pixelHeightString};\n` +
-    `    vec4 oct32 = texture2D(packedClippingPlanes, vec2(u, v)) * 255.0;\n` +
+    `    vec4 oct32 = texture(packedClippingPlanes, vec2(u, v)) * 255.0;\n` +
     `    vec2 oct = vec2(oct32.x * 256.0 + oct32.y, oct32.z * 256.0 + oct32.w);\n` +
     `    vec4 plane;\n` +
     `    plane.xyz = czm_octDecode(oct, 65535.0);\n` +
-    `    plane.w = czm_unpackFloat(texture2D(packedClippingPlanes, vec2(u + ${pixelWidthString}, v)));\n` +
+    `    plane.w = czm_unpackFloat(texture(packedClippingPlanes, vec2(u + ${pixelWidthString}, v)));\n` +
     `    return czm_transformPlane(plane, transform);\n` +
     `}\n`;
   return functionString;

package/Source/Scene/hasExtension.js

@@ -3,9 +3,9 @@ import defined from "../Core/defined.js";
 /**
  * Check if a specific extension is present on a JSON object. This can be used
  * for either 3D Tiles extensions or glTF extensions
- * @param {Object} json The JSON object
- * @param {String} extensionName The name of the extension, e.g. '3DTILES_implicit_tiling'
- * @returns {Boolean} True if the extension is present
+ * @param {object} json The JSON object
+ * @param {string} extensionName The name of the extension, e.g. '3DTILES_implicit_tiling'
+ * @returns {boolean} True if the extension is present
  * @private
  */
 function hasExtension(json, extensionName) {

package/Source/Scene/parseBatchTable.js

@@ -25,11 +25,11 @@ import oneTimeWarning from "../Core/oneTimeWarning.js";
  * See the {@link https://github.com/CesiumGS/glTF/tree/3d-tiles-next/extensions/2.0/Vendor/EXT_structural_metadata|EXT_structural_metadata Extension} for glTF.
  * </p>
  *
- * @param {Object} options Object with the following properties:
- * @param {Number} options.count The number of features in the batch table.
- * @param {Object} options.batchTable The batch table JSON
+ * @param {object} options Object with the following properties:
+ * @param {number} options.count The number of features in the batch table.
+ * @param {object} options.batchTable The batch table JSON
  * @param {Uint8Array} [options.binaryBody] The batch table binary body
- * @param {Boolean} [options.parseAsPropertyAttributes=false] If true, binary properties are parsed as property attributes instead of a property table. This is used for .pnts models for GPU styling.
+ * @param {boolean} [options.parseAsPropertyAttributes=false] If true, binary properties are parsed as property attributes instead of a property table. This is used for .pnts models for GPU styling.
  * @param {ModelComponents.Attribute[]} [options.customAttributeOutput] Pass in an empty array here and this method will populate it with a list of custom attributes that will store the values of the property attributes. The attributes will be created with typed arrays, the caller is responsible for uploading them to the GPU. This option is required when options.parseAsPropertyAttributes is true.
  * @return {StructuralMetadata} A transcoded structural metadata object
  *
@@ -149,8 +149,8 @@ function parseBatchTable(options) {
  * Divide the batch table's properties into binary, JSON and hierarchy
  * extension as each is handled separately
  *
- * @param {Object} batchTable The batch table JSON
- * @returns {Object} The batch table divided into binary, JSON and hierarchy portions. Extras and extensions are also divided out for ease of processing.
+ * @param {object} batchTable The batch table JSON
+ * @returns {object} The batch table divided into binary, JSON and hierarchy portions. Extras and extensions are also divided out for ease of processing.
  *
  * @private
  */
@@ -208,11 +208,11 @@ function partitionProperties(batchTable) {
  * Transcode the binary properties of the batch table to be compatible with
  * <code>EXT_structural_metadata</code>
  *
- * @param {Number} featureCount The number of features in the batch table
- * @param {String} className The name of the metadata class to be created.
- * @param {Object.<String, Object>} binaryProperties A dictionary of property ID to property definition
+ * @param {number} featureCount The number of features in the batch table
+ * @param {string} className The name of the metadata class to be created.
+ * @param {Object<string, Object>} binaryProperties A dictionary of property ID to property definition
  * @param {Uint8Array} [binaryBody] The binary body of the batch table
- * @return {Object} Transcoded data needed for constructing a {@link StructuralMetadata} object.
+ * @return {object} Transcoded data needed for constructing a {@link StructuralMetadata} object.
  *
  * @private
  */
@@ -405,8 +405,8 @@ function transcodeBinaryPropertiesAsPropertyAttributes(
  * Given a property definition from the batch table, compute the equivalent
  * <code>EXT_structural_metadata</code> type definition
  *
- * @param {Object} property The batch table property definition
- * @return {Object} The corresponding structural metadata property definition
+ * @param {object} property The batch table property definition
+ * @return {object} The corresponding structural metadata property definition
  * @private
  */
 function transcodePropertyType(property) {
@@ -422,8 +422,8 @@ function transcodePropertyType(property) {
  * Convert the component type of a batch table property to the corresponding
  * type used with structural metadata
  *
- * @property {String} componentType the batch table's component type
- * @return {String} The corresponding structural metadata data type
+ * @property {string} componentType the batch table's component type
+ * @return {string} The corresponding structural metadata data type
  *
  * @private
  */

package/Source/Scene/parseBoundingVolumeSemantics.js

@@ -14,7 +14,7 @@ import defined from "../Core/defined.js";
  * @see {@link https://github.com/CesiumGS/3d-tiles/tree/main/specification/Metadata/Semantics|3D Metadata Semantic Reference} for the various bounding volumes and minimum/maximum heights.
  *
  * @param {TileMetadata} tileMetadata The metadata object for looking up values by semantic. In practice, this will typically be a {@link ImplicitMetadataView}
- * @return {Object} An object containing a <code>tile</code> property and a <code>content</code> property. These contain the bounding volume, and any minimum or maximum height.
+ * @return {object} An object containing a <code>tile</code> property and a <code>content</code> property. These contain the bounding volume, and any minimum or maximum height.
  *
  * @private
  * @experimental This feature is using part of the 3D Tiles spec that is not final and is subject to change without Cesium's standard deprecation policy.
@@ -47,9 +47,9 @@ function parseBoundingVolumeSemantics(tileMetadata) {
  * is the prefix. e.g. <code>TILE_BOUNDING_BOX</code> and
  * <code>CONTENT_BOUNDING_BOX</code> have the same memory layout.
  *
- * @param {String} prefix Either "TILE" or "CONTENT"
+ * @param {string} prefix Either "TILE" or "CONTENT"
  * @param {TileMetadata} tileMetadata The tileMetadata for looking up values
- * @return {Object} An object representing the JSON description of the tile metadata
+ * @return {object} An object representing the JSON description of the tile metadata
  * @private
  */
 function parseBoundingVolume(prefix, tileMetadata) {
@@ -93,9 +93,9 @@ function parseBoundingVolume(prefix, tileMetadata) {
  * quadtree bounds for implicit tiling. This works for both
  * <code>TILE_MINIMUM_HEIGHT</code> and <code>CONTENT_MINIMUM_HEIGHT</code>
  *
- * @param {String} prefix Either "TILE" or "CONTENT"
+ * @param {string} prefix Either "TILE" or "CONTENT"
  * @param {TileMetadata} tileMetadata The tileMetadata for looking up values
- * @return {Number} The minimum height
+ * @return {number} The minimum height
  * @private
  */
 function parseMinimumHeight(prefix, tileMetadata) {
@@ -108,9 +108,9 @@ function parseMinimumHeight(prefix, tileMetadata) {
  * quadtree bounds for implicit tiling. This works for both
  * <code>TILE_MAXIMUM_HEIGHT</code> and <code>CONTENT_MAXIMUM_HEIGHT</code>
  *
- * @param {String} prefix Either "TILE" or "CONTENT"
+ * @param {string} prefix Either "TILE" or "CONTENT"
  * @param {TileMetadata} tileMetadata The tileMetadata for looking up values
- * @return {Number} The maximum height
+ * @return {number} The maximum height
  * @private
  */
 function parseMaximumHeight(prefix, tileMetadata) {

package/Source/Scene/parseFeatureMetadataLegacy.js

@@ -11,11 +11,11 @@ import MetadataTable from "./MetadataTable.js";
  * Parse the <code>EXT_feature_metadata</code> glTF extension to create a
  * structural metadata object.
  *
- * @param {Object} options Object with the following properties:
- * @param {Object} options.extension The extension JSON object.
+ * @param {object} options Object with the following properties:
+ * @param {object} options.extension The extension JSON object.
  * @param {MetadataSchema} options.schema The parsed schema.
- * @param {Object.<String, Uint8Array>} [options.bufferViews] An object mapping bufferView IDs to Uint8Array objects.
- * @param {Object.<String, Texture>} [options.textures] An object mapping texture IDs to {@link Texture} objects.
+ * @param {Object<string, Uint8Array>} [options.bufferViews] An object mapping bufferView IDs to Uint8Array objects.
+ * @param {Object<string, Texture>} [options.textures] An object mapping texture IDs to {@link Texture} objects.
  * @return {StructuralMetadata} A structural metadata object
  * @private
  * @experimental This feature is using part of the 3D Tiles spec that is not final and is subject to change without Cesium's standard deprecation policy.

package/Source/Scene/parseStructuralMetadata.js

@@ -11,11 +11,11 @@ import MetadataTable from "./MetadataTable.js";
  * Parse the <code>EXT_structural_metadata</code> glTF extension to create a
  * structural metadata object.
  *
- * @param {Object} options Object with the following properties:
- * @param {Object} options.extension The extension JSON object.
+ * @param {object} options Object with the following properties:
+ * @param {object} options.extension The extension JSON object.
  * @param {MetadataSchema} options.schema The parsed schema.
- * @param {Object.<String, Uint8Array>} [options.bufferViews] An object mapping bufferView IDs to Uint8Array objects.
- * @param {Object.<String, Texture>} [options.textures] An object mapping texture IDs to {@link Texture} objects.
+ * @param {Object<string, Uint8Array>} [options.bufferViews] An object mapping bufferView IDs to Uint8Array objects.
+ * @param {Object<string, Texture>} [options.textures] An object mapping texture IDs to {@link Texture} objects.
  * @return {StructuralMetadata} A structural metadata object
  * @private
  * @experimental This feature is using part of the 3D Tiles spec that is not final and is subject to change without Cesium's standard deprecation policy.

package/Source/Scene/preprocess3DTileContent.js

@@ -9,10 +9,10 @@ import Cesium3DTileContentType from "./Cesium3DTileContentType.js";
  * {@link Cesium3DTileContentType} and the payload. The payload is either
  * binary or JSON depending on the content type.
  *
- * @typedef {Object} PreprocessedContent
+ * @typedef {object} PreprocessedContent
  * @property {Cesium3DTileContentType} contentType The type of the content
  * @property {Uint8Array} [binaryPayload] For binary files, the payload is returned as a typed array with byteOffset of 0
- * @property {Object} [jsonPayload] For JSON files, the results are returned as a JSON object.
+ * @property {object} [jsonPayload] For JSON files, the results are returned as a JSON object.
  * @private
  */
 

package/Source/Scene/processVoxelProperties.js

@@ -151,6 +151,7 @@ function processVoxelProperties(renderResources, primitive) {
   shaderBuilder.addStructField(voxelStructId, "vec3", "positionUvLocal");
   shaderBuilder.addStructField(voxelStructId, "vec3", "viewDirUv");
   shaderBuilder.addStructField(voxelStructId, "vec3", "viewDirWorld");
+  shaderBuilder.addStructField(voxelStructId, "vec3", "surfaceNormal");
   shaderBuilder.addStructField(voxelStructId, "float", "travelDistance");
 
   // FragmentInput struct
@@ -340,7 +341,7 @@ function processVoxelProperties(renderResources, primitive) {
       const componentType = componentTypes[i];
       const glslTextureSwizzle = getGlslTextureSwizzle(type, componentType);
       shaderBuilder.addFunctionLines(functionId, [
-        `properties.${name} = texture2D(u_megatextureTextures[${i}], texcoord)${glslTextureSwizzle};`,
+        `properties.${name} = texture(u_megatextureTextures[${i}], texcoord)${glslTextureSwizzle};`,
       ]);
     }
     shaderBuilder.addFunctionLines(functionId, [
@@ -355,7 +356,7 @@ function processVoxelProperties(renderResources, primitive) {
  * @function
  *
  * @param {MetadataType} type The {@link MetadataType}.
- * @returns {String} The GLSL type.
+ * @returns {string} The GLSL type.
  *
  * @private
  */
@@ -377,7 +378,7 @@ function getGlslType(type) {
  * @function
  *
  * @param {MetadataType} type The {@link MetadataType}.
- * @returns {String} The GLSL swizzle.
+ * @returns {string} The GLSL swizzle.
  *
  * @private
  */
@@ -399,7 +400,7 @@ function getGlslTextureSwizzle(type) {
  * @function
  *
  * @param {MetadataType} type The {@link MetadataType}.
- * @returns {String} The GLSL type.
+ * @returns {string} The GLSL type.
  *
  * @private
  */
@@ -421,8 +422,8 @@ function getGlslPartialDerivativeType(type) {
  *
  * @function
  *
- * @param {Number} number The number to convert.
- * @returns {String} The number as floating point in GLSL.
+ * @param {number} number The number to convert.
+ * @returns {string} The number as floating point in GLSL.
  *
  * @private
  */
@@ -440,8 +441,8 @@ function getGlslNumberAsFloat(number) {
  * @function
  *
  * @param {MetadataType} type
- * @param {Number} index
- * @returns {String}
+ * @param {number} index
+ * @returns {string}
  *
  * @private
  */

package/Source/Shaders/AdjustTranslucentFS.glsl

@@ -1,21 +1,24 @@
 #ifdef MRT
-#extension GL_EXT_draw_buffers : enable
+layout (location = 0) out vec4 out_FragData_0;
+layout (location = 1) out vec4 out_FragData_1;
+#else
+layout (location = 0) out vec4 out_FragColor;
 #endif
 
 uniform vec4 u_bgColor;
 uniform sampler2D u_depthTexture;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 void main()
 {
-    if (texture2D(u_depthTexture, v_textureCoordinates).r < 1.0)
+    if (texture(u_depthTexture, v_textureCoordinates).r < 1.0)
     {
 #ifdef MRT
-        gl_FragData[0] = u_bgColor;
-        gl_FragData[1] = vec4(u_bgColor.a);
+        out_FragData_0 = u_bgColor;
+        out_FragData_1 = vec4(u_bgColor.a);
 #else
-        gl_FragColor = u_bgColor;
+        out_FragColor = u_bgColor;
 #endif
         return;
     }

package/Source/Shaders/AdjustTranslucentFS.js

@@ -1,22 +1,25 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "#ifdef MRT\n\
-#extension GL_EXT_draw_buffers : enable\n\
+layout (location = 0) out vec4 out_FragData_0;\n\
+layout (location = 1) out vec4 out_FragData_1;\n\
+#else\n\
+layout (location = 0) out vec4 out_FragColor;\n\
 #endif\n\
 \n\
 uniform vec4 u_bgColor;\n\
 uniform sampler2D u_depthTexture;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 void main()\n\
 {\n\
-    if (texture2D(u_depthTexture, v_textureCoordinates).r < 1.0)\n\
+    if (texture(u_depthTexture, v_textureCoordinates).r < 1.0)\n\
     {\n\
 #ifdef MRT\n\
-        gl_FragData[0] = u_bgColor;\n\
-        gl_FragData[1] = vec4(u_bgColor.a);\n\
+        out_FragData_0 = u_bgColor;\n\
+        out_FragData_1 = vec4(u_bgColor.a);\n\
 #else\n\
-        gl_FragColor = u_bgColor;\n\
+        out_FragColor = u_bgColor;\n\
 #endif\n\
         return;\n\
     }\n\

package/Source/Shaders/Appearances/AllMaterialAppearanceFS.glsl

@@ -1,8 +1,8 @@
-varying vec3 v_positionEC;
-varying vec3 v_normalEC;
-varying vec3 v_tangentEC;
-varying vec3 v_bitangentEC;
-varying vec2 v_st;
+in vec3 v_positionEC;
+in vec3 v_normalEC;
+in vec3 v_tangentEC;
+in vec3 v_bitangentEC;
+in vec2 v_st;
 
 void main()
 {
@@ -22,8 +22,8 @@ void main()
     czm_material material = czm_getMaterial(materialInput);
 
 #ifdef FLAT
-    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);
+    out_FragColor = vec4(material.diffuse + material.emission, material.alpha);
 #else
-    gl_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);
+    out_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);
 #endif
 }

package/Source/Shaders/Appearances/AllMaterialAppearanceFS.js

@@ -1,9 +1,9 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "varying vec3 v_positionEC;\n\
-varying vec3 v_normalEC;\n\
-varying vec3 v_tangentEC;\n\
-varying vec3 v_bitangentEC;\n\
-varying vec2 v_st;\n\
+export default "in vec3 v_positionEC;\n\
+in vec3 v_normalEC;\n\
+in vec3 v_tangentEC;\n\
+in vec3 v_bitangentEC;\n\
+in vec2 v_st;\n\
 \n\
 void main()\n\
 {\n\
@@ -23,9 +23,9 @@ void main()\n\
     czm_material material = czm_getMaterial(materialInput);\n\
 \n\
 #ifdef FLAT\n\
-    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
+    out_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
 #else\n\
-    gl_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);\n\
+    out_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);\n\
 #endif\n\
 }\n\
 ";

package/Source/Shaders/Appearances/AllMaterialAppearanceVS.glsl

@@ -1,16 +1,16 @@
-attribute vec3 position3DHigh;
-attribute vec3 position3DLow;
-attribute vec3 normal;
-attribute vec3 tangent;
-attribute vec3 bitangent;
-attribute vec2 st;
-attribute float batchId;
+in vec3 position3DHigh;
+in vec3 position3DLow;
+in vec3 normal;
+in vec3 tangent;
+in vec3 bitangent;
+in vec2 st;
+in float batchId;
 
-varying vec3 v_positionEC;
-varying vec3 v_normalEC;
-varying vec3 v_tangentEC;
-varying vec3 v_bitangentEC;
-varying vec2 v_st;
+out vec3 v_positionEC;
+out vec3 v_normalEC;
+out vec3 v_tangentEC;
+out vec3 v_bitangentEC;
+out vec2 v_st;
 
 void main()
 {