@cesium/engine 1.1.0 → 2.1.0

package/Source/Renderer/ShaderBuilder.js

@@ -43,9 +43,9 @@ import ShaderFunction from "./ShaderFunction.js";
  *  "void main()",
  *  "{",
  *  "    #ifdef SOLID_COLOR",
- *  "    gl_FragColor = vec4(u_color, 1.0);",
+ *  "    out_FragColor = vec4(u_color, 1.0);",
  *  "    #else",
- *  "    gl_FragColor = vec4(v_color, 1.0);",
+ *  "    out_FragColor = vec4(v_color, 1.0);",
  *  "    #endif",
  *  "}"
  * ]);
@@ -92,7 +92,7 @@ Object.defineProperties(ShaderBuilder.prototype, {
    * the vertex shader.
    *
    * @memberof ShaderBuilder.prototype
-   * @type {Object.<String, Number>}
+   * @type {Object<string, number>}
    * @readonly
    * @private
    */
@@ -107,8 +107,8 @@ Object.defineProperties(ShaderBuilder.prototype, {
  * Add a <code>#define</code> macro to one or both of the shaders. These lines
  * will appear at the top of the final shader source.
  *
- * @param {String} identifier An identifier for the macro. Identifiers must use uppercase letters with underscores to be consistent with Cesium's style guide.
- * @param {String} [value] The value of the macro. If undefined, the define will not include a value. The value will be converted to GLSL code via <code>toString()</code>
+ * @param {string} identifier An identifier for the macro. Identifiers must use uppercase letters with underscores to be consistent with Cesium's style guide.
+ * @param {string} [value] The value of the macro. If undefined, the define will not include a value. The value will be converted to GLSL code via <code>toString()</code>
  * @param {ShaderDestination} [destination=ShaderDestination.BOTH] Whether the define appears in the vertex shader, the fragment shader, or both.
  *
  * @example
@@ -141,8 +141,8 @@ ShaderBuilder.prototype.addDefine = function (identifier, value, destination) {
 
 /**
  * Add a new dynamically-generated struct to the shader
- * @param {String} structId A unique ID to identify this struct in {@link ShaderBuilder#addStructField}
- * @param {String} structName The name of the struct as it will appear in the shader.
+ * @param {string} structId A unique ID to identify this struct in {@link ShaderBuilder#addStructField}
+ * @param {string} structName The name of the struct as it will appear in the shader.
  * @param {ShaderDestination} destination Whether the struct will appear in the vertex shader, the fragment shader, or both.
  *
  * @example
@@ -174,9 +174,9 @@ ShaderBuilder.prototype.addStruct = function (
 
 /**
  * Add a field to a dynamically-generated struct.
- * @param {String} structId The ID of the struct. This must be created first with {@link ShaderBuilder#addStruct}
- * @param {String} type The GLSL type of the field
- * @param {String} identifier The identifier of the field.
+ * @param {string} structId The ID of the struct. This must be created first with {@link ShaderBuilder#addStruct}
+ * @param {string} type The GLSL type of the field
+ * @param {string} identifier The identifier of the field.
  *
  * @example
  * // generates the following struct in the fragment shader
@@ -200,8 +200,8 @@ ShaderBuilder.prototype.addStructField = function (structId, type, identifier) {
 
 /**
  * Add a new dynamically-generated function to the shader.
- * @param {String} functionName The name of the function. This will be used to identify the function in {@link ShaderBuilder#addFunctionLines}.
- * @param {String} signature The full signature of the function as it will appear in the shader. Do not include the curly braces.
+ * @param {string} functionName The name of the function. This will be used to identify the function in {@link ShaderBuilder#addFunctionLines}.
+ * @param {string} signature The full signature of the function as it will appear in the shader. Do not include the curly braces.
  * @param {ShaderDestination} destination Whether the struct will appear in the vertex shader, the fragment shader, or both.
  * @example
  * // generates the following function in the vertex shader
@@ -233,8 +233,8 @@ ShaderBuilder.prototype.addFunction = function (
 
 /**
  * Add lines to a dynamically-generated function
- * @param {String} functionName The name of the function. This must be created beforehand using {@link ShaderBuilder#addFunction}
- * @param {String|String[]} lines One or more lines of GLSL code to add to the function body. Do not include any preceding or ending whitespace, but do include the semicolon for each line.
+ * @param {string} functionName The name of the function. This must be created beforehand using {@link ShaderBuilder#addFunction}
+ * @param {string|string[]} lines One or more lines of GLSL code to add to the function body. Do not include any preceding or ending whitespace, but do include the semicolon for each line.
  *
  * @example
  * // generates the following function in the vertex shader
@@ -265,8 +265,8 @@ ShaderBuilder.prototype.addFunctionLines = function (functionName, lines) {
  * Add a uniform declaration to one or both of the shaders. These lines
  * will appear grouped near the top of the final shader source.
  *
- * @param {String} type The GLSL type of the uniform.
- * @param {String} identifier An identifier for the uniform. Identifiers must begin with <code>u_</code> to be consistent with Cesium's style guide.
+ * @param {string} type The GLSL type of the uniform.
+ * @param {string} identifier An identifier for the uniform. Identifiers must begin with <code>u_</code> to be consistent with Cesium's style guide.
  * @param {ShaderDestination} [destination=ShaderDestination.BOTH] Whether the uniform appears in the vertex shader, the fragment shader, or both.
  *
  * @example
@@ -302,12 +302,12 @@ ShaderBuilder.prototype.addUniform = function (type, identifier, destination) {
  * {@link ShaderBuilder#addAttribute}
  * </p>
  *
- * @param {String} type The GLSL type of the attribute
- * @param {String} identifier An identifier for the attribute. Identifiers must begin with <code>a_</code> to be consistent with Cesium's style guide.
- * @return {Number} The integer location of the attribute. This location can be used when creating attributes for a {@link VertexArray}. This will always be 0.
+ * @param {string} type The GLSL type of the attribute
+ * @param {string} identifier An identifier for the attribute. Identifiers must begin with <code>a_</code> to be consistent with Cesium's style guide.
+ * @return {number} The integer location of the attribute. This location can be used when creating attributes for a {@link VertexArray}. This will always be 0.
  *
  * @example
- * // creates the line "attribute vec3 a_position;"
+ * // creates the line "in vec3 a_position;"
  * shaderBuilder.setPositionAttribute("vec3", "a_position");
  */
 ShaderBuilder.prototype.setPositionAttribute = function (type, identifier) {
@@ -322,7 +322,7 @@ ShaderBuilder.prototype.setPositionAttribute = function (type, identifier) {
   }
   //>>includeEnd('debug');
 
-  this._positionAttributeLine = `attribute ${type} ${identifier};`;
+  this._positionAttributeLine = `in ${type} ${identifier};`;
 
   // Some WebGL implementations require attribute 0 to always be active, so
   // this builder assumes the position will always go in location 0
@@ -338,12 +338,12 @@ ShaderBuilder.prototype.setPositionAttribute = function (type, identifier) {
  * reserved for the position attribute. See {@link ShaderBuilder#setPositionAttribute}
  * </p>
  *
- * @param {String} type The GLSL type of the attribute
- * @param {String} identifier An identifier for the attribute. Identifiers must begin with <code>a_</code> to be consistent with Cesium's style guide.
- * @return {Number} The integer location of the attribute. This location can be used when creating attributes for a {@link VertexArray}
+ * @param {string} type The GLSL type of the attribute
+ * @param {string} identifier An identifier for the attribute. Identifiers must begin with <code>a_</code> to be consistent with Cesium's style guide.
+ * @return {number} The integer location of the attribute. This location can be used when creating attributes for a {@link VertexArray}
  *
  * @example
- * // creates the line "attribute vec2 a_texCoord0;" in the vertex shader
+ * // creates the line "in vec2 a_texCoord0;" in the vertex shader
  * shaderBuilder.addAttribute("vec2", "a_texCoord0");
  */
 ShaderBuilder.prototype.addAttribute = function (type, identifier) {
@@ -352,7 +352,7 @@ ShaderBuilder.prototype.addAttribute = function (type, identifier) {
   Check.typeOf.string("identifier", identifier);
   //>>includeEnd('debug');
 
-  const line = `attribute ${type} ${identifier};`;
+  const line = `in ${type} ${identifier};`;
   this._attributeLines.push(line);
 
   const location = this._nextAttributeLocation;
@@ -367,11 +367,12 @@ ShaderBuilder.prototype.addAttribute = function (type, identifier) {
 /**
  * Add a varying declaration to both the vertex and fragment shaders.
  *
- * @param {String} type The GLSL type of the varying
- * @param {String} identifier An identifier for the varying. Identifiers must begin with <code>v_</code> to be consistent with Cesium's style guide.
+ * @param {string} type The GLSL type of the varying
+ * @param {string} identifier An identifier for the varying. Identifiers must begin with <code>v_</code> to be consistent with Cesium's style guide.
  *
  * @example
- * // creates the line "varying vec3 v_color;" in both shaders
+ * // creates the line "in vec3 v_color;" in the vertex shader
+ * // creates the line "out vec3 v_color;" in the fragment shader
  * shaderBuilder.addVarying("vec3", "v_color");
  */
 ShaderBuilder.prototype.addVarying = function (type, identifier) {
@@ -380,15 +381,15 @@ ShaderBuilder.prototype.addVarying = function (type, identifier) {
   Check.typeOf.string("identifier", identifier);
   //>>includeEnd('debug');
 
-  const line = `varying ${type} ${identifier};`;
-  this._vertexShaderParts.varyingLines.push(line);
-  this._fragmentShaderParts.varyingLines.push(line);
+  const line = `${type} ${identifier};`;
+  this._vertexShaderParts.varyingLines.push(`out ${line}`);
+  this._fragmentShaderParts.varyingLines.push(`in ${line}`);
 };
 
 /**
  * Appends lines of GLSL code to the vertex shader
  *
- * @param {String|String[]} lines One or more lines to add to the end of the vertex shader source
+ * @param {string|string[]} lines One or more lines to add to the end of the vertex shader source
  *
  * @example
  * shaderBuilder.addVertexLines([
@@ -420,16 +421,16 @@ ShaderBuilder.prototype.addVertexLines = function (lines) {
 /**
  * Appends lines of GLSL code to the fragment shader
  *
- * @param {String[]} lines The lines to add to the end of the fragment shader source
+ * @param {string[]} lines The lines to add to the end of the fragment shader source
  *
  * @example
  * shaderBuilder.addFragmentLines([
  *  "void main()",
  *  "{",
  *  "    #ifdef SOLID_COLOR",
- *  "    gl_FragColor = vec4(u_color, 1.0);",
+ *  "    out_FragColor = vec4(u_color, 1.0);",
  *  "    #else",
- *  "    gl_FragColor = vec4(v_color, 1.0);",
+ *  "    out_FragColor = vec4(v_color, 1.0);",
  *  "    #endif",
  *  "}"
  * ]);

package/Source/Renderer/ShaderCache.js

@@ -29,11 +29,11 @@ Object.defineProperties(ShaderCache.prototype, {
      * replace an existing reference to a shader program, which is passed as the first argument.
      * </p>
      *
-     * @param {Object} options Object with the following properties:
+     * @param {object} options Object with the following properties:
      * @param {ShaderProgram} [options.shaderProgram] The shader program that is being reassigned.
-     * @param {String|ShaderSource} options.vertexShaderSource The GLSL source for the vertex shader.
-     * @param {String|ShaderSource} options.fragmentShaderSource The GLSL source for the fragment shader.
-     * @param {Object} options.attributeLocations Indices for the attribute inputs to the vertex shader.
+     * @param {string|ShaderSource} options.vertexShaderSource The GLSL source for the vertex shader.
+     * @param {string|ShaderSource} options.fragmentShaderSource The GLSL source for the fragment shader.
+     * @param {object} options.attributeLocations Indices for the attribute inputs to the vertex shader.
 
      * @returns {ShaderProgram} The cached or newly created shader program.
      *
@@ -65,10 +65,10 @@ function toSortedJson(dictionary) {
  * Returns a shader program from the cache, or creates and caches a new shader program,
  * given the GLSL vertex and fragment shader source and attribute locations.
  *
- * @param {Object} options Object with the following properties:
- * @param {String|ShaderSource} options.vertexShaderSource The GLSL source for the vertex shader.
- * @param {String|ShaderSource} options.fragmentShaderSource The GLSL source for the fragment shader.
- * @param {Object} options.attributeLocations Indices for the attribute inputs to the vertex shader.
+ * @param {object} options Object with the following properties:
+ * @param {string|ShaderSource} options.vertexShaderSource The GLSL source for the vertex shader.
+ * @param {string|ShaderSource} options.fragmentShaderSource The GLSL source for the fragment shader.
+ * @param {object} options.attributeLocations Indices for the attribute inputs to the vertex shader.
  *
  * @returns {ShaderProgram} The cached or newly created shader program.
  */

package/Source/Renderer/ShaderDestination.js

@@ -16,7 +16,7 @@ const ShaderDestination = {
  * Check if a variable should be included in the vertex shader.
  *
  * @param {ShaderDestination} destination The ShaderDestination to check
- * @return {Boolean} <code>true</code> if the variable appears in the vertex shader, or <code>false</code> otherwise
+ * @return {boolean} <code>true</code> if the variable appears in the vertex shader, or <code>false</code> otherwise
  * @private
  */
 ShaderDestination.includesVertexShader = function (destination) {
@@ -34,7 +34,7 @@ ShaderDestination.includesVertexShader = function (destination) {
  * Check if a variable should be included in the vertex shader.
  *
  * @param {ShaderDestination} destination The ShaderDestination to check
- * @return {Boolean} <code>true</code> if the variable appears in the vertex shader, or <code>false</code> otherwise
+ * @return {boolean} <code>true</code> if the variable appears in the vertex shader, or <code>false</code> otherwise
  * @private
  */
 ShaderDestination.includesFragmentShader = function (destination) {

package/Source/Renderer/ShaderFunction.js

@@ -7,7 +7,7 @@ import DeveloperError from "../Core/DeveloperError.js";
  * @constructor
  *
  * @see {@link ShaderBuilder}
- * @param {String} signature The full signature of the function as it will appear in the shader. Do not include the curly braces.
+ * @param {string} signature The full signature of the function as it will appear in the shader. Do not include the curly braces.
  * @example
  * // generate the following function
  * //
@@ -31,7 +31,7 @@ function ShaderFunction(signature) {
 
 /**
  * Adds one or more lines to the body of the function
- * @param {String|String[]} lines One or more lines of GLSL code to add to the function body. Do not include any preceding or ending whitespace, but do include the semicolon for each line.
+ * @param {string|string[]} lines One or more lines of GLSL code to add to the function body. Do not include any preceding or ending whitespace, but do include the semicolon for each line.
  */
 ShaderFunction.prototype.addLines = function (lines) {
   //>>includeStart('debug', pragmas.debug);
@@ -57,7 +57,7 @@ ShaderFunction.prototype.addLines = function (lines) {
 
 /**
  * Generate lines of GLSL code for use with {@link ShaderBuilder}
- * @return {String[]}
+ * @return {string[]}
  */
 ShaderFunction.prototype.generateGlslLines = function () {
   return [].concat(this.signature, "{", this.body, "}");

package/Source/Renderer/ShaderSource.js

@@ -1,9 +1,9 @@
 import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
 import DeveloperError from "../Core/DeveloperError.js";
-import modernizeShader from "../Renderer/modernizeShader.js";
 import CzmBuiltins from "../Shaders/Builtin/CzmBuiltins.js";
 import AutomaticUniforms from "./AutomaticUniforms.js";
+import demodernizeShader from "./demodernizeShader.js";
 
 function removeComments(source) {
   // remove inline comments
@@ -223,12 +223,6 @@ function combineShader(shaderSource, isFragmentShader, context) {
   // combine into single string
   let result = "";
 
-  // #version must be first
-  // defaults to #version 100 if not specified
-  if (defined(version)) {
-    result = `#version ${version}\n`;
-  }
-
   const extensionsLength = extensions.length;
   for (i = 0; i < extensionsLength; i++) {
     result += extensions[i];
@@ -261,12 +255,6 @@ function combineShader(shaderSource, isFragmentShader, context) {
     }
   }
 
-  // GLSLModernizer inserts its own layout qualifiers
-  // at this position in the source
-  if (context.webgl2) {
-    result += "#define OUTPUT_DECLARATION\n\n";
-  }
-
   // Define a constant for the OES_texture_float_linear extension since WebGL does not.
   if (context.textureFloatLinear) {
     result += "#define OES_texture_float_linear\n\n";
@@ -278,19 +266,36 @@ function combineShader(shaderSource, isFragmentShader, context) {
   }
 
   // append built-ins
+  let builtinSources = "";
   if (shaderSource.includeBuiltIns) {
-    result += getBuiltinsAndAutomaticUniforms(combinedSources);
+    builtinSources = getBuiltinsAndAutomaticUniforms(combinedSources);
   }
 
   // reset line number
   result += "\n#line 0\n";
 
   // append actual source
+  const combinedShader = builtinSources + combinedSources;
+  if (
+    context.webgl2 &&
+    isFragmentShader &&
+    !/layout\s*\(location\s*=\s*0\)\s*out\s+vec4\s+out_FragColor;/g.test(
+      combinedShader
+    ) &&
+    !/czm_out_FragColor/g.test(combinedShader) &&
+    /out_FragColor/g.test(combinedShader)
+  ) {
+    result += "layout(location = 0) out vec4 out_FragColor;\n\n";
+  }
+
+  result += builtinSources;
   result += combinedSources;
 
   // modernize the source
-  if (context.webgl2) {
-    result = modernizeShader(result, isFragmentShader, true);
+  if (!context.webgl2) {
+    result = demodernizeShader(result, isFragmentShader);
+  } else {
+    result = `#version 300 es\n${result}`;
   }
 
   return result;
@@ -299,24 +304,24 @@ function combineShader(shaderSource, isFragmentShader, context) {
 /**
  * An object containing various inputs that will be combined to form a final GLSL shader string.
  *
- * @param {Object} [options] Object with the following properties:
- * @param {String[]} [options.sources] An array of strings to combine containing GLSL code for the shader.
- * @param {String[]} [options.defines] An array of strings containing GLSL identifiers to <code>#define</code>.
- * @param {String} [options.pickColorQualifier] The GLSL qualifier, <code>uniform</code> or <code>varying</code>, for the input <code>czm_pickColor</code>.  When defined, a pick fragment shader is generated.
- * @param {Boolean} [options.includeBuiltIns=true] If true, referenced built-in functions will be included with the combined shader.  Set to false if this shader will become a source in another shader, to avoid duplicating functions.
+ * @param {object} [options] Object with the following properties:
+ * @param {string[]} [options.sources] An array of strings to combine containing GLSL code for the shader.
+ * @param {string[]} [options.defines] An array of strings containing GLSL identifiers to <code>#define</code>.
+ * @param {string} [options.pickColorQualifier] The GLSL qualifier, <code>uniform</code> or <code>in</code>, for the input <code>czm_pickColor</code>.  When defined, a pick fragment shader is generated.
+ * @param {boolean} [options.includeBuiltIns=true] If true, referenced built-in functions will be included with the combined shader.  Set to false if this shader will become a source in another shader, to avoid duplicating functions.
  *
- * @exception {DeveloperError} options.pickColorQualifier must be 'uniform' or 'varying'.
+ * @exception {DeveloperError} options.pickColorQualifier must be 'uniform' or 'in'.
  *
  * @example
  * // 1. Prepend #defines to a shader
  * const source = new Cesium.ShaderSource({
  *   defines : ['WHITE'],
- *   sources : ['void main() { \n#ifdef WHITE\n gl_FragColor = vec4(1.0); \n#else\n gl_FragColor = vec4(0.0); \n#endif\n }']
+ *   sources : ['void main() { \n#ifdef WHITE\n out_FragColor = vec4(1.0); \n#else\n out_FragColor = vec4(0.0); \n#endif\n }']
  * });
  *
  * // 2. Modify a fragment shader for picking
  * const source2 = new Cesium.ShaderSource({
- *   sources : ['void main() { gl_FragColor = vec4(1.0); }'],
+ *   sources : ['void main() { out_FragColor = vec4(1.0); }'],
  *   pickColorQualifier : 'uniform'
  * });
  *
@@ -330,10 +335,10 @@ function ShaderSource(options) {
   if (
     defined(pickColorQualifier) &&
     pickColorQualifier !== "uniform" &&
-    pickColorQualifier !== "varying"
+    pickColorQualifier !== "in"
   ) {
     throw new DeveloperError(
-      "options.pickColorQualifier must be 'uniform' or 'varying'."
+      "options.pickColorQualifier must be 'uniform' or 'in'."
     );
   }
   //>>includeEnd('debug');
@@ -363,7 +368,7 @@ ShaderSource.replaceMain = function (source, renamedMain) {
  * {@link ShaderSource#createCombinedFragmentShader} are both expensive to
  * compute, create a simpler string key for lookups in the {@link ShaderCache}.
  *
- * @returns {String} A key for identifying this shader
+ * @returns {string} A key for identifying this shader
  *
  * @private
  */
@@ -383,7 +388,7 @@ ShaderSource.prototype.getCacheKey = function () {
  *
  * @param {Context} context The current rendering context
  *
- * @returns {String} The combined shader string.
+ * @returns {string} The combined shader string.
  */
 ShaderSource.prototype.createCombinedVertexShader = function (context) {
   return combineShader(this, false, context);
@@ -394,7 +399,7 @@ ShaderSource.prototype.createCombinedVertexShader = function (context) {
  *
  * @param {Context} context The current rendering context
  *
- * @returns {String} The combined shader string.
+ * @returns {string} The combined shader string.
  */
 ShaderSource.prototype.createCombinedFragmentShader = function (context) {
   return combineShader(this, true, context);
@@ -430,8 +435,8 @@ ShaderSource.createPickVertexShaderSource = function (vertexShaderSource) {
     "czm_old_main"
   );
   const pickMain =
-    "attribute vec4 pickColor; \n" +
-    "varying vec4 czm_pickColor; \n" +
+    "in vec4 pickColor; \n" +
+    "out vec4 czm_pickColor; \n" +
     "void main() \n" +
     "{ \n" +
     "    czm_old_main(); \n" +
@@ -454,10 +459,10 @@ ShaderSource.createPickFragmentShaderSource = function (
     `void main() \n` +
     `{ \n` +
     `    czm_old_main(); \n` +
-    `    if (gl_FragColor.a == 0.0) { \n` +
+    `    if (out_FragColor.a == 0.0) { \n` +
     `       discard; \n` +
     `    } \n` +
-    `    gl_FragColor = czm_pickColor; \n` +
+    `    out_FragColor = czm_pickColor; \n` +
     `}`;
 
   return `${renamedFS}\n${pickMain}`;

package/Source/Renderer/ShaderStruct.js

@@ -5,7 +5,7 @@
  * @constructor
  *
  * @see {@link ShaderBuilder}
- * @param {String} name The name of the struct as it will appear in the shader.
+ * @param {string} name The name of the struct as it will appear in the shader.
  * @example
  * // Generate the struct:
  * //
@@ -30,8 +30,8 @@ function ShaderStruct(name) {
 
 /**
  * Add a field to the struct
- * @param {String} type The type of the struct field
- * @param {String} identifier The identifier of the struct field
+ * @param {string} type The type of the struct field
+ * @param {string} identifier The identifier of the struct field
  */
 ShaderStruct.prototype.addField = function (type, identifier) {
   const field = `    ${type} ${identifier};`;
@@ -40,7 +40,7 @@ ShaderStruct.prototype.addField = function (type, identifier) {
 
 /**
  * Generate a list of lines of GLSL code for use with {@link ShaderBuilder}
- * @return {String[]} The generated GLSL code.
+ * @return {string[]} The generated GLSL code.
  */
 ShaderStruct.prototype.generateGlslLines = function () {
   let fields = this.fields;

package/Source/Renderer/Texture.js

@@ -411,13 +411,13 @@ Texture.create = function (options) {
  * Creates a texture, and copies a subimage of the framebuffer to it.  When called without arguments,
  * the texture is the same width and height as the framebuffer and contains its contents.
  *
- * @param {Object} options Object with the following properties:
+ * @param {object} options Object with the following properties:
  * @param {Context} options.context The context in which the Texture gets created.
  * @param {PixelFormat} [options.pixelFormat=PixelFormat.RGB] The texture's internal pixel format.
- * @param {Number} [options.framebufferXOffset=0] An offset in the x direction in the framebuffer where copying begins from.
- * @param {Number} [options.framebufferYOffset=0] An offset in the y direction in the framebuffer where copying begins from.
- * @param {Number} [options.width=canvas.clientWidth] The width of the texture in texels.
- * @param {Number} [options.height=canvas.clientHeight] The height of the texture in texels.
+ * @param {number} [options.framebufferXOffset=0] An offset in the x direction in the framebuffer where copying begins from.
+ * @param {number} [options.framebufferYOffset=0] An offset in the y direction in the framebuffer where copying begins from.
+ * @param {number} [options.width=canvas.clientWidth] The width of the texture in texels.
+ * @param {number} [options.height=canvas.clientHeight] The height of the texture in texels.
  * @param {Framebuffer} [options.framebuffer=defaultFramebuffer] The framebuffer from which to create the texture.  If this
  *        parameter is not specified, the default framebuffer is used.
  * @returns {Texture} A texture with contents from the framebuffer.
@@ -515,7 +515,7 @@ Object.defineProperties(Texture.prototype, {
   /**
    * A unique id for the texture
    * @memberof Texture.prototype
-   * @type {String}
+   * @type {string}
    * @readonly
    * @private
    */
@@ -531,7 +531,7 @@ Object.defineProperties(Texture.prototype, {
    * coordinates in both directions, uses linear filtering for both magnification and minification,
    * and uses a maximum anisotropy of 1.0.
    * @memberof Texture.prototype
-   * @type {Object}
+   * @type {object}
    */
   sampler: {
     get: function () {
@@ -648,12 +648,12 @@ Object.defineProperties(Texture.prototype, {
 /**
  * Copy new image data into this texture, from a source {@link ImageData}, {@link HTMLImageElement}, {@link HTMLCanvasElement}, or {@link HTMLVideoElement}.
  * or an object with width, height, and arrayBufferView properties.
- * @param {Object} options Object with the following properties:
- * @param {Object} options.source The source {@link ImageData}, {@link HTMLImageElement}, {@link HTMLCanvasElement}, or {@link HTMLVideoElement},
+ * @param {object} options Object with the following properties:
+ * @param {object} options.source The source {@link ImageData}, {@link HTMLImageElement}, {@link HTMLCanvasElement}, or {@link HTMLVideoElement},
  *                        or an object with width, height, and arrayBufferView properties.
- * @param {Number} [options.xOffset=0] The offset in the x direction within the texture to copy into.
- * @param {Number} [options.yOffset=0] The offset in the y direction within the texture to copy into.
- * @param {Boolean} [options.skipColorSpaceConversion=false] If true, any custom gamma or color profiles in the texture will be ignored.
+ * @param {number} [options.xOffset=0] The offset in the x direction within the texture to copy into.
+ * @param {number} [options.yOffset=0] The offset in the y direction within the texture to copy into.
+ * @param {boolean} [options.skipColorSpaceConversion=false] If true, any custom gamma or color profiles in the texture will be ignored.
  *
  * @exception {DeveloperError} Cannot call copyFrom when the texture pixel format is DEPTH_COMPONENT or DEPTH_STENCIL.
  * @exception {DeveloperError} Cannot call copyFrom with a compressed texture pixel format.
@@ -872,12 +872,12 @@ Texture.prototype.copyFrom = function (options) {
 };
 
 /**
- * @param {Number} [xOffset=0] The offset in the x direction within the texture to copy into.
- * @param {Number} [yOffset=0] The offset in the y direction within the texture to copy into.
- * @param {Number} [framebufferXOffset=0] optional
- * @param {Number} [framebufferYOffset=0] optional
- * @param {Number} [width=width] optional
- * @param {Number} [height=height] optional
+ * @param {number} [xOffset=0] The offset in the x direction within the texture to copy into.
+ * @param {number} [yOffset=0] The offset in the y direction within the texture to copy into.
+ * @param {number} [framebufferXOffset=0] optional
+ * @param {number} [framebufferYOffset=0] optional
+ * @param {number} [width=width] optional
+ * @param {number} [height=height] optional
  *
  * @exception {DeveloperError} Cannot call copyFromFramebuffer when the texture pixel format is DEPTH_COMPONENT or DEPTH_STENCIL.
  * @exception {DeveloperError} Cannot call copyFromFramebuffer when the texture pixel data type is FLOAT.

package/Source/Renderer/TextureMagnificationFilter.js

@@ -3,7 +3,7 @@ import WebGLConstants from "../Core/WebGLConstants.js";
 /**
  * Enumerates all possible filters used when magnifying WebGL textures.
  *
- * @enum {Number}
+ * @enum {number}
  *
  * @see TextureMinificationFilter
  */
@@ -11,14 +11,14 @@ const TextureMagnificationFilter = {
   /**
    * Samples the texture by returning the closest pixel.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   NEAREST: WebGLConstants.NEAREST,
   /**
    * Samples the texture through bi-linear interpolation of the four nearest pixels. This produces smoother results than <code>NEAREST</code> filtering.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   LINEAR: WebGLConstants.LINEAR,
@@ -27,7 +27,7 @@ const TextureMagnificationFilter = {
 /**
  * Validates the given <code>textureMinificationFilter</code> with respect to the possible enum values.
  * @param textureMagnificationFilter
- * @returns {Boolean} <code>true</code> if <code>textureMagnificationFilter</code> is valid.
+ * @returns {boolean} <code>true</code> if <code>textureMagnificationFilter</code> is valid.
  *
  * @private
  */

package/Source/Renderer/TextureMinificationFilter.js

@@ -3,7 +3,7 @@ import WebGLConstants from "../Core/WebGLConstants.js";
 /**
  * Enumerates all possible filters used when minifying WebGL textures.
  *
- * @enum {Number}
+ * @enum {number}
  *
  * @see TextureMagnificationFilter
  */
@@ -11,14 +11,14 @@ const TextureMinificationFilter = {
   /**
    * Samples the texture by returning the closest pixel.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   NEAREST: WebGLConstants.NEAREST,
   /**
    * Samples the texture through bi-linear interpolation of the four nearest pixels. This produces smoother results than <code>NEAREST</code> filtering.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   LINEAR: WebGLConstants.LINEAR,
@@ -28,7 +28,7 @@ const TextureMinificationFilter = {
    * Requires that the texture has a mipmap. The mip level is chosen by the view angle and screen-space size of the texture.
    * </p>
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   NEAREST_MIPMAP_NEAREST: WebGLConstants.NEAREST_MIPMAP_NEAREST,
@@ -38,7 +38,7 @@ const TextureMinificationFilter = {
    * Requires that the texture has a mipmap. The mip level is chosen by the view angle and screen-space size of the texture.
    * </p>
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   LINEAR_MIPMAP_NEAREST: WebGLConstants.LINEAR_MIPMAP_NEAREST,
@@ -51,7 +51,7 @@ const TextureMinificationFilter = {
    * Requires that the texture has a mipmap. The mip level is chosen by the view angle and screen-space size of the texture.
    * </p>
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   NEAREST_MIPMAP_LINEAR: WebGLConstants.NEAREST_MIPMAP_LINEAR,
@@ -63,7 +63,7 @@ const TextureMinificationFilter = {
    * <p>
    * Requires that the texture has a mipmap. The mip level is chosen by the view angle and screen-space size of the texture.
    * </p>
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   LINEAR_MIPMAP_LINEAR: WebGLConstants.LINEAR_MIPMAP_LINEAR,
@@ -75,7 +75,7 @@ const TextureMinificationFilter = {
  * @private
  *
  * @param textureMinificationFilter
- * @returns {Boolean} <code>true</code> if <code>textureMinificationFilter</code> is valid.
+ * @returns {boolean} <code>true</code> if <code>textureMinificationFilter</code> is valid.
  */
 TextureMinificationFilter.validate = function (textureMinificationFilter) {
   return (