@cesium/engine 1.1.0 → 2.1.0

package/Source/Scene/ContentMetadata.js

@@ -9,8 +9,8 @@ import MetadataEntity from "./MetadataEntity.js";
  * See the {@link https://github.com/CesiumGS/3d-tiles/tree/main/extensions/3DTILES_metadata|3DTILES_metadata Extension} for 3D Tiles
  * </p>
  *
- * @param {Object} options Object with the following properties:
- * @param {Object} options.content Either the content metadata JSON (3D Tiles 1.1) or the extension JSON attached to the content.
+ * @param {object} options Object with the following properties:
+ * @param {object} options.content Either the content metadata JSON (3D Tiles 1.1) or the extension JSON attached to the content.
  * @param {MetadataClass} options.class The class that the content metadata conforms to.
  *
  * @alias ContentMetadata
@@ -53,7 +53,7 @@ Object.defineProperties(ContentMetadata.prototype, {
    * Extra user-defined properties.
    *
    * @memberof ContentMetadata.prototype
-   * @type {Object}
+   * @type {object}
    * @readonly
    * @private
    */
@@ -67,7 +67,7 @@ Object.defineProperties(ContentMetadata.prototype, {
    * An object containing extensions.
    *
    * @memberof ContentMetadata.prototype
-   * @type {Object}
+   * @type {object}
    * @readonly
    * @private
    */
@@ -81,8 +81,8 @@ Object.defineProperties(ContentMetadata.prototype, {
 /**
  * Returns whether the content has this property.
  *
- * @param {String} propertyId The case-sensitive ID of the property.
- * @returns {Boolean} Whether the content has this property.
+ * @param {string} propertyId The case-sensitive ID of the property.
+ * @returns {boolean} Whether the content has this property.
  * @private
  */
 ContentMetadata.prototype.hasProperty = function (propertyId) {
@@ -92,8 +92,8 @@ ContentMetadata.prototype.hasProperty = function (propertyId) {
 /**
  * Returns whether the content has a property with the given semantic.
  *
- * @param {String} semantic The case-sensitive semantic of the property.
- * @returns {Boolean} Whether the content has a property with the given semantic.
+ * @param {string} semantic The case-sensitive semantic of the property.
+ * @returns {boolean} Whether the content has a property with the given semantic.
  * @private
  */
 ContentMetadata.prototype.hasPropertyBySemantic = function (semantic) {
@@ -107,8 +107,8 @@ ContentMetadata.prototype.hasPropertyBySemantic = function (semantic) {
 /**
  * Returns an array of property IDs.
  *
- * @param {String[]} [results] An array into which to store the results.
- * @returns {String[]} The property IDs.
+ * @param {string[]} [results] An array into which to store the results.
+ * @returns {string[]} The property IDs.
  * @private
  */
 ContentMetadata.prototype.getPropertyIds = function (results) {
@@ -121,7 +121,7 @@ ContentMetadata.prototype.getPropertyIds = function (results) {
  * If the property is normalized the normalized value is returned.
  * </p>
  *
- * @param {String} propertyId The case-sensitive ID of the property.
+ * @param {string} propertyId The case-sensitive ID of the property.
  * @returns {*} The value of the property or <code>undefined</code> if the content does not have this property.
  * @private
  */
@@ -135,9 +135,9 @@ ContentMetadata.prototype.getProperty = function (propertyId) {
  * If the property is normalized a normalized value must be provided to this function.
  * </p>
  *
- * @param {String} propertyId The case-sensitive ID of the property.
+ * @param {string} propertyId The case-sensitive ID of the property.
  * @param {*} value The value of the property that will be copied.
- * @returns {Boolean} <code>true</code> if the property was set, <code>false</code> otherwise.
+ * @returns {boolean} <code>true</code> if the property was set, <code>false</code> otherwise.
  * @private
  */
 ContentMetadata.prototype.setProperty = function (propertyId, value) {
@@ -152,7 +152,7 @@ ContentMetadata.prototype.setProperty = function (propertyId, value) {
 /**
  * Returns a copy of the value of the property with the given semantic.
  *
- * @param {String} semantic The case-sensitive semantic of the property.
+ * @param {string} semantic The case-sensitive semantic of the property.
  * @returns {*} The value of the property or <code>undefined</code> if the content does not have this semantic.
  * @private
  */
@@ -167,9 +167,9 @@ ContentMetadata.prototype.getPropertyBySemantic = function (semantic) {
 /**
  * Sets the value of the property with the given semantic.
  *
- * @param {String} semantic The case-sensitive semantic of the property.
+ * @param {string} semantic The case-sensitive semantic of the property.
  * @param {*} value The value of the property that will be copied.
- * @returns {Boolean} <code>true</code> if the property was set, <code>false</code> otherwise.
+ * @returns {boolean} <code>true</code> if the property was set, <code>false</code> otherwise.
  * @private
  */
 ContentMetadata.prototype.setPropertyBySemantic = function (semantic, value) {

package/Source/Scene/CreditDisplay.js

@@ -280,7 +280,7 @@ function appendCss() {
  * The credit display is responsible for displaying credits on screen.
  *
  * @param {HTMLElement} container The HTML element where credits will be displayed
- * @param {String} [delimiter= ' • '] The string to separate text credits
+ * @param {string} [delimiter= ' • '] The string to separate text credits
  * @param {HTMLElement} [viewport=document.body] The HTML element that will contain the credits popup
  *
  * @alias CreditDisplay
@@ -550,7 +550,7 @@ CreditDisplay.prototype.destroy = function () {
  * Returns true if this object was destroyed; otherwise, false.
  * <br /><br />
  *
- * @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>.
  */
 CreditDisplay.prototype.isDestroyed = function () {
   return false;

package/Source/Scene/CullFace.js

@@ -3,13 +3,13 @@ import WebGLConstants from "../Core/WebGLConstants.js";
 /**
  * Determines which triangles, if any, are culled.
  *
- * @enum {Number}
+ * @enum {number}
  */
 const CullFace = {
   /**
    * Front-facing triangles are culled.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   FRONT: WebGLConstants.FRONT,
@@ -17,7 +17,7 @@ const CullFace = {
   /**
    * Back-facing triangles are culled.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   BACK: WebGLConstants.BACK,
@@ -25,7 +25,7 @@ const CullFace = {
   /**
    * Both front-facing and back-facing triangles are culled.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   FRONT_AND_BACK: WebGLConstants.FRONT_AND_BACK,

package/Source/Scene/CumulusCloud.js

@@ -88,7 +88,7 @@ Object.defineProperties(CumulusCloud.prototype, {
    * Determines if this cumulus cloud will be shown.  Use this to hide or show a cloud, instead
    * of removing it and re-adding it to the collection.
    * @memberof CumulusCloud.prototype
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   show: {
@@ -293,7 +293,7 @@ Object.defineProperties(CumulusCloud.prototype, {
    * </div>
    *
    * @memberof CumulusCloud.prototype
-   * @type {Number}
+   * @type {number}
    * @default -1.0
    */
   slice: {
@@ -325,7 +325,7 @@ Object.defineProperties(CumulusCloud.prototype, {
    * </tr></table>
    * </div>
    * @memberof CumulusCloud.prototype
-   * @type {Number}
+   * @type {number}
    * @default 1.0
    */
   brightness: {

package/Source/Scene/DebugAppearance.js

@@ -14,13 +14,13 @@ import Appearance from "./Appearance.js";
  * @alias DebugAppearance
  * @constructor
  *
- * @param {Object} options Object with the following properties:
- * @param {String} options.attributeName The name of the attribute to visualize.
- * @param {Boolean} [options.perInstanceAttribute=false] Boolean that determines whether this attribute is a per-instance geometry attribute.
- * @param {String} [options.glslDatatype='vec3'] The GLSL datatype of the attribute.  Supported datatypes are <code>float</code>, <code>vec2</code>, <code>vec3</code>, and <code>vec4</code>.
- * @param {String} [options.vertexShaderSource] Optional GLSL vertex shader source to override the default vertex shader.
- * @param {String} [options.fragmentShaderSource] Optional GLSL fragment shader source to override the default fragment shader.
- * @param {Object} [options.renderState] Optional render state to override the default render state.
+ * @param {object} options Object with the following properties:
+ * @param {string} options.attributeName The name of the attribute to visualize.
+ * @param {boolean} [options.perInstanceAttribute=false] Boolean that determines whether this attribute is a per-instance geometry attribute.
+ * @param {string} [options.glslDatatype='vec3'] The GLSL datatype of the attribute.  Supported datatypes are <code>float</code>, <code>vec2</code>, <code>vec3</code>, and <code>vec4</code>.
+ * @param {string} [options.vertexShaderSource] Optional GLSL vertex shader source to override the default vertex shader.
+ * @param {string} [options.fragmentShaderSource] Optional GLSL fragment shader source to override the default fragment shader.
+ * @param {object} [options.renderState] Optional render state to override the default render state.
  *
  * @exception {DeveloperError} options.glslDatatype must be float, vec2, vec3, or vec4.
  *
@@ -88,14 +88,12 @@ function DebugAppearance(options) {
 
   const vs =
     `${
-      "attribute vec3 position3DHigh;\n" +
-      "attribute vec3 position3DLow;\n" +
-      "attribute float batchId;\n"
+      "in vec3 position3DHigh;\n" +
+      "in vec3 position3DLow;\n" +
+      "in float batchId;\n"
     }${
-      perInstanceAttribute
-        ? ""
-        : `attribute ${glslDatatype} ${attributeName};\n`
-    }varying ${glslDatatype} ${varyingName};\n` +
+      perInstanceAttribute ? "" : `in ${glslDatatype} ${attributeName};\n`
+    }out ${glslDatatype} ${varyingName};\n` +
     `void main()\n` +
     `{\n` +
     `vec4 p = czm_translateRelativeToEye(position3DHigh, position3DLow);\n${
@@ -105,10 +103,10 @@ function DebugAppearance(options) {
     }gl_Position = czm_modelViewProjectionRelativeToEye * p;\n` +
     `}`;
   const fs =
-    `varying ${glslDatatype} ${varyingName};\n${getColor}\n` +
+    `in ${glslDatatype} ${varyingName};\n${getColor}\n` +
     `void main()\n` +
     `{\n` +
-    `gl_FragColor = getColor();\n` +
+    `out_FragColor = getColor();\n` +
     `}`;
 
   /**
@@ -124,7 +122,7 @@ function DebugAppearance(options) {
   /**
    * When <code>true</code>, the geometry is expected to appear translucent.
    *
-   * @type {Boolean}
+   * @type {boolean}
    *
    * @default false
    */
@@ -151,7 +149,7 @@ Object.defineProperties(DebugAppearance.prototype, {
    *
    * @memberof DebugAppearance.prototype
    *
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   vertexShaderSource: {
@@ -167,7 +165,7 @@ Object.defineProperties(DebugAppearance.prototype, {
    *
    * @memberof DebugAppearance.prototype
    *
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   fragmentShaderSource: {
@@ -181,7 +179,7 @@ Object.defineProperties(DebugAppearance.prototype, {
    *
    * @memberof DebugAppearance.prototype
    *
-   * @type {Object}
+   * @type {object}
    * @readonly
    */
   renderState: {
@@ -195,7 +193,7 @@ Object.defineProperties(DebugAppearance.prototype, {
    *
    * @memberof DebugAppearance.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    *
    * @default false
@@ -211,7 +209,7 @@ Object.defineProperties(DebugAppearance.prototype, {
    *
    * @memberof DebugAppearance.prototype
    *
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   attributeName: {
@@ -225,7 +223,7 @@ Object.defineProperties(DebugAppearance.prototype, {
    *
    * @memberof DebugAppearance.prototype
    *
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   glslDatatype: {
@@ -241,7 +239,7 @@ Object.defineProperties(DebugAppearance.prototype, {
  *
  * @function
  *
- * @returns {String} The full GLSL fragment shader source.
+ * @returns {string} The full GLSL fragment shader source.
  */
 DebugAppearance.prototype.getFragmentShaderSource =
   Appearance.prototype.getFragmentShaderSource;
@@ -251,7 +249,7 @@ DebugAppearance.prototype.getFragmentShaderSource =
  *
  * @function
  *
- * @returns {Boolean} <code>true</code> if the appearance is translucent.
+ * @returns {boolean} <code>true</code> if the appearance is translucent.
  */
 DebugAppearance.prototype.isTranslucent = Appearance.prototype.isTranslucent;
 
@@ -262,7 +260,7 @@ DebugAppearance.prototype.isTranslucent = Appearance.prototype.isTranslucent;
  *
  * @function
  *
- * @returns {Object} The render state.
+ * @returns {object} The render state.
  */
 DebugAppearance.prototype.getRenderState = Appearance.prototype.getRenderState;
 export default DebugAppearance;

package/Source/Scene/DebugCameraPrimitive.js

@@ -23,13 +23,13 @@ import Primitive from "./Primitive.js";
  * @alias DebugCameraPrimitive
  * @constructor
  *
- * @param {Object} options Object with the following properties:
+ * @param {object} options Object with the following properties:
  * @param {Camera} options.camera The camera.
- * @param {Number[]} [options.frustumSplits] Distances to the near and far planes of the camera frustums. This overrides the camera's frustum near and far values.
+ * @param {number[]} [options.frustumSplits] Distances to the near and far planes of the camera frustums. This overrides the camera's frustum near and far values.
  * @param {Color} [options.color=Color.CYAN] The color of the debug outline.
- * @param {Boolean} [options.updateOnChange=true] Whether the primitive updates when the underlying camera changes.
- * @param {Boolean} [options.show=true] Determines if this primitive will be shown.
- * @param {Object} [options.id] A user-defined object to return when the instance is picked with {@link Scene#pick}.
+ * @param {boolean} [options.updateOnChange=true] Whether the primitive updates when the underlying camera changes.
+ * @param {boolean} [options.show=true] Determines if this primitive will be shown.
+ * @param {object} [options.id] A user-defined object to return when the instance is picked with {@link Scene#pick}.
  *
  * @example
  * primitives.add(new Cesium.DebugCameraPrimitive({
@@ -54,7 +54,7 @@ function DebugCameraPrimitive(options) {
   /**
    * Determines if this primitive will be shown.
    *
-   * @type Boolean
+   * @type {boolean}
    * @default true
    */
   this.show = defaultValue(options.show, true);
@@ -220,7 +220,7 @@ DebugCameraPrimitive.prototype.update = function (frameState) {
  * <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 DebugCameraPrimitive#destroy
  */

package/Source/Scene/DebugInspector.js

@@ -31,7 +31,7 @@ function createDebugShowFrustumsShaderProgram(scene, shaderProgram) {
   const targets = [];
   fs.sources = fs.sources.map(function (source) {
     source = ShaderSource.replaceMain(source, "czm_Debug_main");
-    const re = /gl_FragData\[(\d+)\]/g;
+    const re = /out_FragData_(\d+)/g;
     let match;
     while ((match = re.exec(source)) !== null) {
       if (targets.indexOf(match[1]) === -1) {
@@ -52,12 +52,12 @@ function createDebugShowFrustumsShaderProgram(scene, shaderProgram) {
   let i;
   if (length > 0) {
     for (i = 0; i < length; ++i) {
-      newMain += `    gl_FragData[${targets[i]}].rgb *= debugShowCommandsColor;\n`;
-      newMain += `    gl_FragData[${targets[i]}].rgb *= debugShowFrustumsColor;\n`;
+      newMain += `    out_FragData_${targets[i]}.rgb *= debugShowCommandsColor;\n`;
+      newMain += `    out_FragData_${targets[i]}.rgb *= debugShowFrustumsColor;\n`;
     }
   } else {
-    newMain += "    gl_FragColor.rgb *= debugShowCommandsColor;\n";
-    newMain += "    gl_FragColor.rgb *= debugShowFrustumsColor;\n";
+    newMain += "    out_FragColor.rgb *= debugShowCommandsColor;\n";
+    newMain += "    out_FragColor.rgb *= debugShowFrustumsColor;\n";
   }
   newMain += "}";
 

package/Source/Scene/DebugModelMatrixPrimitive.js

@@ -24,12 +24,12 @@ import Primitive from "./Primitive.js";
  * @alias DebugModelMatrixPrimitive
  * @constructor
  *
- * @param {Object} [options] Object with the following properties:
- * @param {Number} [options.length=10000000.0] The length of the axes in meters.
- * @param {Number} [options.width=2.0] The width of the axes in pixels.
+ * @param {object} [options] Object with the following properties:
+ * @param {number} [options.length=10000000.0] The length of the axes in meters.
+ * @param {number} [options.width=2.0] The width of the axes in pixels.
  * @param {Matrix4} [options.modelMatrix=Matrix4.IDENTITY] The 4x4 matrix that defines the reference frame, i.e., origin plus axes, to visualize.
- * @param {Boolean} [options.show=true] Determines if this primitive will be shown.
- * @param {Object} [options.id] A user-defined object to return when the instance is picked with {@link Scene#pick}
+ * @param {boolean} [options.show=true] Determines if this primitive will be shown.
+ * @param {object} [options.id] A user-defined object to return when the instance is picked with {@link Scene#pick}
  *
  * @example
  * primitives.add(new Cesium.DebugModelMatrixPrimitive({
@@ -44,7 +44,7 @@ function DebugModelMatrixPrimitive(options) {
   /**
    * The length of the axes in meters.
    *
-   * @type {Number}
+   * @type {number}
    * @default 10000000.0
    */
   this.length = defaultValue(options.length, 10000000.0);
@@ -53,7 +53,7 @@ function DebugModelMatrixPrimitive(options) {
   /**
    * The width of the axes in pixels.
    *
-   * @type {Number}
+   * @type {number}
    * @default 2.0
    */
   this.width = defaultValue(options.width, 2.0);
@@ -62,7 +62,7 @@ function DebugModelMatrixPrimitive(options) {
   /**
    * Determines if this primitive will be shown.
    *
-   * @type Boolean
+   * @type {boolean}
    * @default true
    */
   this.show = defaultValue(options.show, true);
@@ -191,7 +191,7 @@ DebugModelMatrixPrimitive.prototype.update = function (frameState) {
  * <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 DebugModelMatrixPrimitive#destroy
  */

package/Source/Scene/DepthFunction.js

@@ -3,13 +3,13 @@ import WebGLConstants from "../Core/WebGLConstants.js";
 /**
  * Determines the function used to compare two depths for the depth test.
  *
- * @enum {Number}
+ * @enum {number}
  */
 const DepthFunction = {
   /**
    * The depth test never passes.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   NEVER: WebGLConstants.NEVER,
@@ -17,7 +17,7 @@ const DepthFunction = {
   /**
    * The depth test passes if the incoming depth is less than the stored depth.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   LESS: WebGLConstants.LESS,
@@ -25,7 +25,7 @@ const DepthFunction = {
   /**
    * The depth test passes if the incoming depth is equal to the stored depth.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   EQUAL: WebGLConstants.EQUAL,
@@ -33,7 +33,7 @@ const DepthFunction = {
   /**
    * The depth test passes if the incoming depth is less than or equal to the stored depth.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   LESS_OR_EQUAL: WebGLConstants.LEQUAL,
@@ -41,7 +41,7 @@ const DepthFunction = {
   /**
    * The depth test passes if the incoming depth is greater than the stored depth.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   GREATER: WebGLConstants.GREATER,
@@ -49,7 +49,7 @@ const DepthFunction = {
   /**
    * The depth test passes if the incoming depth is not equal to the stored depth.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   NOT_EQUAL: WebGLConstants.NOTEQUAL,
@@ -57,7 +57,7 @@ const DepthFunction = {
   /**
    * The depth test passes if the incoming depth is greater than or equal to the stored depth.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   GREATER_OR_EQUAL: WebGLConstants.GEQUAL,
@@ -65,7 +65,7 @@ const DepthFunction = {
   /**
    * The depth test always passes.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   ALWAYS: WebGLConstants.ALWAYS,

package/Source/Scene/DepthPlane.js

@@ -173,12 +173,6 @@ DepthPlane.prototype.update = function (frameState) {
       sources: [DepthPlaneFS],
     });
     if (useLogDepth) {
-      const extension =
-        "#ifdef GL_EXT_frag_depth \n" +
-        "#extension GL_EXT_frag_depth : enable \n" +
-        "#endif \n\n";
-
-      fs.sources.push(extension);
       fs.defines.push("LOG_DEPTH");
       vs.defines.push("LOG_DEPTH");
     }

package/Source/Scene/DerivedCommand.js

@@ -8,7 +8,7 @@ import ShaderSource from "../Renderer/ShaderSource.js";
  */
 function DerivedCommand() {}
 
-const fragDepthRegex = /\bgl_FragDepthEXT\b/;
+const fragDepthRegex = /\bgl_FragDepth\b/;
 const discardRegex = /\bdiscard\b/;
 
 function getDepthOnlyShaderProgram(context, shaderProgram) {
@@ -44,18 +44,18 @@ function getDepthOnlyShaderProgram(context, shaderProgram) {
     let source;
     if (!writesDepthOrDiscards && !usesLogDepth) {
       source =
-        "void main() \n" + "{ \n" + "    gl_FragColor = vec4(1.0); \n" + "} \n";
+        "void main() \n" +
+        "{ \n" +
+        "    out_FragColor = vec4(1.0); \n" +
+        "} \n";
       fs = new ShaderSource({
         sources: [source],
       });
     } else if (!writesDepthOrDiscards && usesLogDepth) {
       source =
-        "#ifdef GL_EXT_frag_depth \n" +
-        "#extension GL_EXT_frag_depth : enable \n" +
-        "#endif \n\n" +
         "void main() \n" +
         "{ \n" +
-        "    gl_FragColor = vec4(1.0); \n" +
+        "    out_FragColor = vec4(1.0); \n" +
         "    czm_writeLogDepth(); \n" +
         "} \n";
       fs = new ShaderSource({
@@ -145,7 +145,6 @@ DerivedCommand.createDepthOnlyDerivedCommand = function (
 
 const writeLogDepthRegex = /\s+czm_writeLogDepth\(/;
 const vertexlogDepthRegex = /\s+czm_vertexLogDepth\(/;
-const extensionRegex = /\s*#extension\s+GL_EXT_frag_depth\s*:\s*enable/;
 
 function getLogDepthShaderProgram(context, shaderProgram) {
   const disableLogDepthWrite =
@@ -210,20 +209,7 @@ function getLogDepthShaderProgram(context, shaderProgram) {
       writesLogDepth = true;
     }
 
-    let addExtension = true;
-    for (i = 0; i < length; ++i) {
-      if (extensionRegex.test(sources[i])) {
-        addExtension = false;
-      }
-    }
-
     let logSource = "";
-    if (addExtension) {
-      logSource +=
-        "#ifdef GL_EXT_frag_depth \n" +
-        "#extension GL_EXT_frag_depth : enable \n" +
-        "#endif \n\n";
-    }
 
     if (!writesLogDepth) {
       for (i = 0; i < length; i++) {
@@ -297,10 +283,10 @@ function getPickShaderProgram(context, shaderProgram, pickId) {
         "void main() \n" +
         "{ \n" +
         "    czm_non_pick_main(); \n" +
-        "    if (gl_FragColor.a == 0.0) { \n" +
+        "    if (out_FragColor.a == 0.0) { \n" +
         "        discard; \n" +
         "    } \n" +
-        "    gl_FragColor = "
+        "    out_FragColor = "
       }${pickId}; \n` + `} \n`;
     const newSources = new Array(length + 1);
     for (let i = 0; i < length; ++i) {

package/Source/Scene/DeviceOrientationCameraController.js

@@ -97,7 +97,7 @@ DeviceOrientationCameraController.prototype.update = function () {
  * Returns true if this object was destroyed; otherwise, false.
  * <br /><br />
  *
- * @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>.
  */
 DeviceOrientationCameraController.prototype.isDestroyed = function () {
   return false;

package/Source/Scene/DirectionalLight.js

@@ -7,10 +7,10 @@ import DeveloperError from "../Core/DeveloperError.js";
 /**
  * A light that gets emitted in a single direction from infinitely far away.
  *
- * @param {Object} options Object with the following properties:
+ * @param {object} options Object with the following properties:
  * @param {Cartesian3} options.direction The direction in which light gets emitted.
  * @param {Color} [options.color=Color.WHITE] The color of the light.
- * @param {Number} [options.intensity=1.0] The intensity of the light.
+ * @param {number} [options.intensity=1.0] The intensity of the light.
  *
  * @exception {DeveloperError} options.direction cannot be zero-length
  *
@@ -41,7 +41,7 @@ function DirectionalLight(options) {
 
   /**
    * The intensity of the light.
-   * @type {Number}
+   * @type {number}
    * @default 1.0
    */
   this.intensity = defaultValue(options.intensity, 1.0);

package/Source/Scene/DiscardEmptyTileImagePolicy.js

@@ -14,7 +14,7 @@ function DiscardEmptyTileImagePolicy(options) {}
 
 /**
  * Determines if the discard policy is ready to process images.
- * @returns {Boolean} True if the discard policy is ready to process images; otherwise, false.
+ * @returns {boolean} True if the discard policy is ready to process images; otherwise, false.
  */
 DiscardEmptyTileImagePolicy.prototype.isReady = function () {
   return true;
@@ -24,7 +24,7 @@ DiscardEmptyTileImagePolicy.prototype.isReady = function () {
  * Given a tile image, decide whether to discard that image.
  *
  * @param {HTMLImageElement} image An image to test.
- * @returns {Boolean} True if the image should be discarded; otherwise, false.
+ * @returns {boolean} True if the image should be discarded; otherwise, false.
  */
 DiscardEmptyTileImagePolicy.prototype.shouldDiscardImage = function (image) {
   return DiscardEmptyTileImagePolicy.EMPTY_IMAGE === image;