@cesium/engine 1.1.0 → 2.1.0

package/Source/Scene/PointCloudEyeDomeLighting.js

@@ -126,25 +126,30 @@ function getECShaderProgram(context, shaderProgram) {
 
     const fs = shaderProgram.fragmentShaderSource.clone();
 
+    fs.sources.splice(
+      0,
+      0,
+      `layout (location = 0) out vec4 out_FragData_0;\nlayout (location = 1) out vec4 out_FragData_1;`
+    );
+
     fs.sources = fs.sources.map(function (source) {
       source = ShaderSource.replaceMain(
         source,
         "czm_point_cloud_post_process_main"
       );
-      source = source.replace(/gl_FragColor/g, "gl_FragData[0]");
+      source = source.replaceAll(/out_FragColor/g, "out_FragData_0");
       return source;
     });
 
-    fs.sources.unshift("#extension GL_EXT_draw_buffers : enable \n");
     fs.sources.push(
       "void main() \n" +
         "{ \n" +
         "    czm_point_cloud_post_process_main(); \n" +
         "#ifdef LOG_DEPTH\n" +
         "    czm_writeLogDepth();\n" +
-        "    gl_FragData[1] = czm_packDepth(gl_FragDepthEXT); \n" +
+        "    out_FragData_1 = czm_packDepth(gl_FragDepth); \n" +
         "#else\n" +
-        "    gl_FragData[1] = czm_packDepth(gl_FragCoord.z);\n" +
+        "    out_FragData_1 = czm_packDepth(gl_FragCoord.z);\n" +
         "#endif\n" +
         "}"
     );
@@ -249,7 +254,7 @@ PointCloudEyeDomeLighting.prototype.update = 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 PointCloudEyeDomeLighting#destroy
  */

package/Source/Scene/PointCloudShading.js

@@ -5,16 +5,16 @@ import PointCloudEyeDomeLighting from "./PointCloudEyeDomeLighting.js";
  * Options for performing point attenuation based on geometric error when rendering
  * point clouds using 3D Tiles.
  *
- * @param {Object} [options] Object with the following properties:
- * @param {Boolean} [options.attenuation=false] Perform point attenuation based on geometric error.
- * @param {Number} [options.geometricErrorScale=1.0] Scale to be applied to each tile's geometric error.
- * @param {Number} [options.maximumAttenuation] Maximum attenuation in pixels. Defaults to the Cesium3DTileset's maximumScreenSpaceError.
- * @param {Number} [options.baseResolution] Average base resolution for the dataset in meters. Substitute for Geometric Error when not available.
- * @param {Boolean} [options.eyeDomeLighting=true] When true, use eye dome lighting when drawing with point attenuation.
- * @param {Number} [options.eyeDomeLightingStrength=1.0] Increasing this value increases contrast on slopes and edges.
- * @param {Number} [options.eyeDomeLightingRadius=1.0] Increase the thickness of contours from eye dome lighting.
- * @param {Boolean} [options.backFaceCulling=false] Determines whether back-facing points are hidden. This option works only if data has normals included.
- * @param {Boolean} [options.normalShading=true] Determines whether a point cloud that contains normals is shaded by the scene's light source.
+ * @param {object} [options] Object with the following properties:
+ * @param {boolean} [options.attenuation=false] Perform point attenuation based on geometric error.
+ * @param {number} [options.geometricErrorScale=1.0] Scale to be applied to each tile's geometric error.
+ * @param {number} [options.maximumAttenuation] Maximum attenuation in pixels. Defaults to the Cesium3DTileset's maximumScreenSpaceError.
+ * @param {number} [options.baseResolution] Average base resolution for the dataset in meters. Substitute for Geometric Error when not available.
+ * @param {boolean} [options.eyeDomeLighting=true] When true, use eye dome lighting when drawing with point attenuation.
+ * @param {number} [options.eyeDomeLightingStrength=1.0] Increasing this value increases contrast on slopes and edges.
+ * @param {number} [options.eyeDomeLightingRadius=1.0] Increase the thickness of contours from eye dome lighting.
+ * @param {boolean} [options.backFaceCulling=false] Determines whether back-facing points are hidden. This option works only if data has normals included.
+ * @param {boolean} [options.normalShading=true] Determines whether a point cloud that contains normals is shaded by the scene's light source.
  *
  * @alias PointCloudShading
  * @constructor
@@ -24,14 +24,14 @@ function PointCloudShading(options) {
 
   /**
    * Perform point attenuation based on geometric error.
-   * @type {Boolean}
+   * @type {boolean}
    * @default false
    */
   this.attenuation = defaultValue(pointCloudShading.attenuation, false);
 
   /**
    * Scale to be applied to the geometric error before computing attenuation.
-   * @type {Number}
+   * @type {number}
    * @default 1.0
    */
   this.geometricErrorScale = defaultValue(
@@ -41,7 +41,7 @@ function PointCloudShading(options) {
 
   /**
    * Maximum point attenuation in pixels. If undefined, the Cesium3DTileset's maximumScreenSpaceError will be used.
-   * @type {Number}
+   * @type {number}
    */
   this.maximumAttenuation = pointCloudShading.maximumAttenuation;
 
@@ -49,7 +49,7 @@ function PointCloudShading(options) {
    * Average base resolution for the dataset in meters.
    * Used in place of geometric error when geometric error is 0.
    * If undefined, an approximation will be computed for each tile that has geometric error of 0.
-   * @type {Number}
+   * @type {number}
    */
   this.baseResolution = pointCloudShading.baseResolution;
 
@@ -58,14 +58,14 @@ function PointCloudShading(options) {
    * Requires support for EXT_frag_depth, OES_texture_float, and WEBGL_draw_buffers extensions in WebGL 1.0,
    * otherwise eye dome lighting is ignored.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.eyeDomeLighting = defaultValue(pointCloudShading.eyeDomeLighting, true);
 
   /**
    * Eye dome lighting strength (apparent contrast)
-   * @type {Number}
+   * @type {number}
    * @default 1.0
    */
   this.eyeDomeLightingStrength = defaultValue(
@@ -75,7 +75,7 @@ function PointCloudShading(options) {
 
   /**
    * Thickness of contours from eye dome lighting
-   * @type {Number}
+   * @type {number}
    * @default 1.0
    */
   this.eyeDomeLightingRadius = defaultValue(
@@ -87,7 +87,7 @@ function PointCloudShading(options) {
    * Determines whether back-facing points are hidden.
    * This option works only if data has normals included.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default false
    */
   this.backFaceCulling = defaultValue(pointCloudShading.backFaceCulling, false);
@@ -95,7 +95,7 @@ function PointCloudShading(options) {
   /**
    * Determines whether a point cloud that contains normals is shaded by the scene's light source.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.normalShading = defaultValue(pointCloudShading.normalShading, true);
@@ -105,7 +105,7 @@ function PointCloudShading(options) {
  * Determines if point cloud shading is supported.
  *
  * @param {Scene} scene The scene.
- * @returns {Boolean} <code>true</code> if point cloud shading is supported; otherwise, returns <code>false</code>
+ * @returns {boolean} <code>true</code> if point cloud shading is supported; otherwise, returns <code>false</code>
  */
 PointCloudShading.isSupported = function (scene) {
   return PointCloudEyeDomeLighting.isSupported(scene.context);

package/Source/Scene/PointPrimitive.js

@@ -147,7 +147,7 @@ Object.defineProperties(PointPrimitive.prototype, {
    * Determines if this point will be shown.  Use this to hide or show a point, instead
    * of removing it and re-adding it to the collection.
    * @memberof PointPrimitive.prototype
-   * @type {Boolean}
+   * @type {boolean}
    */
   show: {
     get: function () {
@@ -286,7 +286,7 @@ Object.defineProperties(PointPrimitive.prototype, {
   /**
    * Gets or sets the inner size of the point in pixels.
    * @memberof PointPrimitive.prototype
-   * @type {Number}
+   * @type {number}
    */
   pixelSize: {
     get: function () {
@@ -369,7 +369,7 @@ Object.defineProperties(PointPrimitive.prototype, {
    * Gets or sets the outline width in pixels.  This width adds to pixelSize,
    * increasing the total size of the point.
    * @memberof PointPrimitive.prototype
-   * @type {Number}
+   * @type {number}
    */
   outlineWidth: {
     get: function () {
@@ -421,7 +421,7 @@ Object.defineProperties(PointPrimitive.prototype, {
    * Gets or sets the distance from the camera at which to disable the depth test to, for example, prevent clipping against terrain.
    * When set to zero, the depth test is always applied. When set to Number.POSITIVE_INFINITY, the depth test is never applied.
    * @memberof PointPrimitive.prototype
-   * @type {Number}
+   * @type {number}
    * @default 0.0
    */
   disableDepthTestDistance: {
@@ -472,7 +472,7 @@ Object.defineProperties(PointPrimitive.prototype, {
   /**
    * Determines whether or not this point will be shown or hidden because it was clustered.
    * @memberof PointPrimitive.prototype
-   * @type {Boolean}
+   * @type {boolean}
    * @private
    */
   clusterShow: {
@@ -635,7 +635,7 @@ PointPrimitive.getScreenSpaceBoundingBox = function (
  * are equal.  Points in different collections can be equal.
  *
  * @param {PointPrimitive} other The point to compare for equality.
- * @returns {Boolean} <code>true</code> if the points are equal; otherwise, <code>false</code>.
+ * @returns {boolean} <code>true</code> if the points are equal; otherwise, <code>false</code>.
  */
 PointPrimitive.prototype.equals = function (other) {
   return (

package/Source/Scene/PointPrimitiveCollection.js

@@ -58,13 +58,13 @@ const attributeLocations = {
  * @alias PointPrimitiveCollection
  * @constructor
  *
- * @param {Object} [options] Object with the following properties:
+ * @param {object} [options] Object with the following properties:
  * @param {Matrix4} [options.modelMatrix=Matrix4.IDENTITY] The 4x4 transformation matrix that transforms each point from model to world coordinates.
- * @param {Boolean} [options.debugShowBoundingVolume=false] For debugging only. Determines if this primitive's commands' bounding spheres are shown.
+ * @param {boolean} [options.debugShowBoundingVolume=false] For debugging only. Determines if this primitive's commands' bounding spheres are shown.
  * @param {BlendOption} [options.blendOption=BlendOption.OPAQUE_AND_TRANSLUCENT] The point blending option. The default
  * is used for rendering both opaque and translucent points. However, if either all of the points are completely opaque or all are completely translucent,
  * setting the technique to BlendOption.OPAQUE or BlendOption.TRANSLUCENT can improve performance by up to 2x.
- * @param {Boolean} [options.show=true] Determines if the primitives in the collection will be shown.
+ * @param {boolean} [options.show=true] Determines if the primitives in the collection will be shown.
  *
  * @performance For best performance, prefer a few collections, each with many points, to
  * many collections with only a few points each.  Organize collections so that points
@@ -131,7 +131,7 @@ function PointPrimitiveCollection(options) {
   /**
    * Determines if primitives in this collection will be shown.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.show = defaultValue(options.show, true);
@@ -179,7 +179,7 @@ function PointPrimitiveCollection(options) {
    * Draws the bounding sphere for each draw command in the primitive.
    * </p>
    *
-   * @type {Boolean}
+   * @type {boolean}
    *
    * @default false
    */
@@ -232,7 +232,7 @@ Object.defineProperties(PointPrimitiveCollection.prototype, {
    * {@link PointPrimitiveCollection#get} to iterate over all the points
    * in the collection.
    * @memberof PointPrimitiveCollection.prototype
-   * @type {Number}
+   * @type {number}
    */
   length: {
     get: function () {
@@ -255,7 +255,7 @@ function destroyPointPrimitives(pointPrimitives) {
  * Creates and adds a point with the specified initial properties to the collection.
  * The added point is returned so it can be modified or removed from the collection later.
  *
- * @param {Object}[options] A template describing the point's properties as shown in Example 1.
+ * @param {object}[options] A template describing the point's properties as shown in Example 1.
  * @returns {PointPrimitive} The point that was added to the collection.
  *
  * @performance Calling <code>add</code> is expected constant time.  However, the collection's vertex buffer
@@ -300,7 +300,7 @@ PointPrimitiveCollection.prototype.add = function (options) {
  * Removes a point from the collection.
  *
  * @param {PointPrimitive} pointPrimitive The point to remove.
- * @returns {Boolean} <code>true</code> if the point was removed; <code>false</code> if the point was not found in the collection.
+ * @returns {boolean} <code>true</code> if the point was removed; <code>false</code> if the point was not found in the collection.
  *
  * @performance Calling <code>remove</code> is expected constant time.  However, the collection's vertex buffer
  * is rewritten - an <code>O(n)</code> operation that also incurs CPU to GPU overhead.  For
@@ -394,7 +394,7 @@ PointPrimitiveCollection.prototype._updatePointPrimitive = function (
  * Check whether this collection contains a given point.
  *
  * @param {PointPrimitive} [pointPrimitive] The point to check for.
- * @returns {Boolean} true if this collection contains the point, false otherwise.
+ * @returns {boolean} true if this collection contains the point, false otherwise.
  *
  * @see PointPrimitiveCollection#get
  */
@@ -411,7 +411,7 @@ PointPrimitiveCollection.prototype.contains = function (pointPrimitive) {
  * {@link PointPrimitiveCollection#length} to iterate over all the points
  * in the collection.
  *
- * @param {Number} index The zero-based index of the point.
+ * @param {number} index The zero-based index of the point.
  * @returns {PointPrimitive} The point at the specified index.
  *
  * @performance Expected constant time.  If points were removed from the collection and
@@ -1181,7 +1181,7 @@ PointPrimitiveCollection.prototype.update = function (frameState) {
  * 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 PointPrimitiveCollection#destroy
  */

package/Source/Scene/Polyline.js

@@ -21,13 +21,13 @@ import Material from "./Material.js";
  * @internalConstructor
  * @class
  *
- * @privateParam {Object} options Object with the following properties:
- * @privateParam {Boolean} [options.show=true] <code>true</code> if this polyline will be shown; otherwise, <code>false</code>.
- * @privateParam {Number} [options.width=1.0] The width of the polyline in pixels.
- * @privateParam {Boolean} [options.loop=false] Whether a line segment will be added between the last and first line positions to make this line a loop.
+ * @privateParam {object} options Object with the following properties:
+ * @privateParam {boolean} [options.show=true] <code>true</code> if this polyline will be shown; otherwise, <code>false</code>.
+ * @privateParam {number} [options.width=1.0] The width of the polyline in pixels.
+ * @privateParam {boolean} [options.loop=false] Whether a line segment will be added between the last and first line positions to make this line a loop.
  * @privateParam {Material} [options.material=Material.ColorType] The material.
  * @privateParam {Cartesian3[]} [options.positions] The positions.
- * @privateParam {Object} [options.id] The user-defined object to be returned when this polyline is picked.
+ * @privateParam {object} [options.id] The user-defined object to be returned when this polyline is picked.
  * @privateParam {DistanceDisplayCondition} [options.distanceDisplayCondition] The condition specifying at what distance from the camera that this polyline will be displayed.
  * @privateParam {PolylineCollection} polylineCollection The renderable polyline collection.
  *
@@ -118,7 +118,7 @@ Object.defineProperties(Polyline.prototype, {
    * Determines if this polyline will be shown.  Use this to hide or show a polyline, instead
    * of removing it and re-adding it to the collection.
    * @memberof Polyline.prototype
-   * @type {Boolean}
+   * @type {boolean}
    */
   show: {
     get: function () {
@@ -221,7 +221,7 @@ Object.defineProperties(Polyline.prototype, {
   /**
    * Gets or sets the width of the polyline.
    * @memberof Polyline.prototype
-   * @type {Number}
+   * @type {number}
    */
   width: {
     get: function () {
@@ -245,7 +245,7 @@ Object.defineProperties(Polyline.prototype, {
   /**
    * Gets or sets whether a line segment will be added between the first and last polyline positions.
    * @memberof Polyline.prototype
-   * @type {Boolean}
+   * @type {boolean}
    */
   loop: {
     get: function () {
@@ -316,7 +316,7 @@ Object.defineProperties(Polyline.prototype, {
   /**
    * Gets the destruction status of this polyline
    * @memberof Polyline.prototype
-   * @type {Boolean}
+   * @type {boolean}
    * @default false
    * @private
    */

package/Source/Scene/PolylineCollection.js

@@ -77,10 +77,10 @@ const attributeLocations = {
  * @alias PolylineCollection
  * @constructor
  *
- * @param {Object} [options] Object with the following properties:
+ * @param {object} [options] Object with the following properties:
  * @param {Matrix4} [options.modelMatrix=Matrix4.IDENTITY] The 4x4 transformation matrix that transforms each polyline from model to world coordinates.
- * @param {Boolean} [options.debugShowBoundingVolume=false] For debugging only. Determines if this primitive's commands' bounding spheres are shown.
- * @param {Boolean} [options.show=true] Determines if the polylines in the collection will be shown.
+ * @param {boolean} [options.debugShowBoundingVolume=false] For debugging only. Determines if this primitive's commands' bounding spheres are shown.
+ * @param {boolean} [options.show=true] Determines if the polylines in the collection will be shown.
  *
  * @performance For best performance, prefer a few collections, each with many polylines, to
  * many collections with only a few polylines each.  Organize collections so that polylines
@@ -120,7 +120,7 @@ function PolylineCollection(options) {
   /**
    * Determines if polylines in this collection will be shown.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.show = defaultValue(options.show, true);
@@ -145,7 +145,7 @@ function PolylineCollection(options) {
    * Draws the bounding sphere for each draw command in the primitive.
    * </p>
    *
-   * @type {Boolean}
+   * @type {boolean}
    *
    * @default false
    */
@@ -200,7 +200,7 @@ Object.defineProperties(PolylineCollection.prototype, {
    * {@link PolylineCollection#get} to iterate over all the polylines
    * in the collection.
    * @memberof PolylineCollection.prototype
-   * @type {Number}
+   * @type {number}
    */
   length: {
     get: function () {
@@ -214,7 +214,7 @@ Object.defineProperties(PolylineCollection.prototype, {
      * Creates and adds a polyline with the specified initial properties to the collection.
      * The added polyline is returned so it can be modified or removed from the collection later.
      *
-     * @param {Object}[options] A template describing the polyline's properties as shown in Example 1.
+     * @param {object}[options] A template describing the polyline's properties as shown in Example 1.
      * @returns {Polyline} The polyline that was added to the collection.
      *
      * @performance After calling <code>add</code>, {@link PolylineCollection#update} is called and
@@ -251,7 +251,7 @@ PolylineCollection.prototype.add = function (options) {
  * Removes a polyline from the collection.
  *
  * @param {Polyline} polyline The polyline to remove.
- * @returns {Boolean} <code>true</code> if the polyline was removed; <code>false</code> if the polyline was not found in the collection.
+ * @returns {boolean} <code>true</code> if the polyline was removed; <code>false</code> if the polyline was not found in the collection.
  *
  * @performance After calling <code>remove</code>, {@link PolylineCollection#update} is called and
  * the collection's vertex buffer is rewritten - an <code>O(n)</code> operation that also incurs CPU to GPU overhead.
@@ -320,7 +320,7 @@ PolylineCollection.prototype.removeAll = function () {
  * Determines if this collection contains the specified polyline.
  *
  * @param {Polyline} polyline The polyline to check for.
- * @returns {Boolean} true if this collection contains the polyline, false otherwise.
+ * @returns {boolean} true if this collection contains the polyline, false otherwise.
  *
  * @see PolylineCollection#get
  */
@@ -335,7 +335,7 @@ PolylineCollection.prototype.contains = function (polyline) {
  * {@link PolylineCollection#length} to iterate over all the polylines
  * in the collection.
  *
- * @param {Number} index The zero-based index of the polyline.
+ * @param {number} index The zero-based index of the polyline.
  * @returns {Polyline} The polyline at the specified index.
  *
  * @performance If polylines were removed from the collection and
@@ -786,7 +786,7 @@ function createCommandLists(
  * 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 PolylineCollection#destroy
  */
@@ -1294,8 +1294,7 @@ PolylineBucket.prototype.updateShader = function (
 
   // Check for use of v_polylineAngle in material shader
   if (
-    this.material.shaderSource.search(/varying\s+float\s+v_polylineAngle;/g) !==
-    -1
+    this.material.shaderSource.search(/in\s+float\s+v_polylineAngle;/g) !== -1
   ) {
     defines.push("POLYLINE_DASH");
   }
@@ -1306,11 +1305,7 @@ PolylineBucket.prototype.updateShader = function (
 
   const fs = new ShaderSource({
     defines: defines,
-    sources: [
-      "varying vec4 v_pickColor;\n",
-      this.material.shaderSource,
-      PolylineFS,
-    ],
+    sources: ["in vec4 v_pickColor;\n", this.material.shaderSource, PolylineFS],
   });
 
   const vsSource = batchTable.getVertexShaderCallback()(PolylineVS);

package/Source/Scene/PolylineColorAppearance.js

@@ -22,11 +22,11 @@ if (!FeatureDetection.isInternetExplorer()) {
  * @alias PolylineColorAppearance
  * @constructor
  *
- * @param {Object} [options] Object with the following properties:
- * @param {Boolean} [options.translucent=true] When <code>true</code>, the geometry is expected to appear translucent so {@link PolylineColorAppearance#renderState} has alpha blending enabled.
- * @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 {boolean} [options.translucent=true] When <code>true</code>, the geometry is expected to appear translucent so {@link PolylineColorAppearance#renderState} has alpha blending enabled.
+ * @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.
  *
  * @example
  * // A solid white line segment
@@ -70,7 +70,7 @@ function PolylineColorAppearance(options) {
    * When <code>true</code>, the geometry is expected to appear translucent so
    * {@link PolylineColorAppearance#renderState} has alpha blending enabled.
    *
-   * @type {Boolean}
+   * @type {boolean}
    *
    * @default true
    */
@@ -102,7 +102,7 @@ Object.defineProperties(PolylineColorAppearance.prototype, {
    *
    * @memberof PolylineColorAppearance.prototype
    *
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   vertexShaderSource: {
@@ -116,7 +116,7 @@ Object.defineProperties(PolylineColorAppearance.prototype, {
    *
    * @memberof PolylineColorAppearance.prototype
    *
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   fragmentShaderSource: {
@@ -134,7 +134,7 @@ Object.defineProperties(PolylineColorAppearance.prototype, {
    *
    * @memberof PolylineColorAppearance.prototype
    *
-   * @type {Object}
+   * @type {object}
    * @readonly
    */
   renderState: {
@@ -150,7 +150,7 @@ Object.defineProperties(PolylineColorAppearance.prototype, {
    *
    * @memberof PolylineColorAppearance.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    *
    * @default false
@@ -195,7 +195,7 @@ PolylineColorAppearance.VERTEX_FORMAT = VertexFormat.POSITION_ONLY;
  *
  * @function
  *
- * @returns {String} The full GLSL fragment shader source.
+ * @returns {string} The full GLSL fragment shader source.
  */
 PolylineColorAppearance.prototype.getFragmentShaderSource =
   Appearance.prototype.getFragmentShaderSource;
@@ -205,7 +205,7 @@ PolylineColorAppearance.prototype.getFragmentShaderSource =
  *
  * @function
  *
- * @returns {Boolean} <code>true</code> if the appearance is translucent.
+ * @returns {boolean} <code>true</code> if the appearance is translucent.
  */
 PolylineColorAppearance.prototype.isTranslucent =
   Appearance.prototype.isTranslucent;
@@ -217,7 +217,7 @@ PolylineColorAppearance.prototype.isTranslucent =
  *
  * @function
  *
- * @returns {Object} The render state.
+ * @returns {object} The render state.
  */
 PolylineColorAppearance.prototype.getRenderState =
   Appearance.prototype.getRenderState;

package/Source/Scene/PolylineMaterialAppearance.js

@@ -21,12 +21,12 @@ if (!FeatureDetection.isInternetExplorer()) {
  * @alias PolylineMaterialAppearance
  * @constructor
  *
- * @param {Object} [options] Object with the following properties:
- * @param {Boolean} [options.translucent=true] When <code>true</code>, the geometry is expected to appear translucent so {@link PolylineMaterialAppearance#renderState} has alpha blending enabled.
+ * @param {object} [options] Object with the following properties:
+ * @param {boolean} [options.translucent=true] When <code>true</code>, the geometry is expected to appear translucent so {@link PolylineMaterialAppearance#renderState} has alpha blending enabled.
  * @param {Material} [options.material=Material.ColorType] The material used to determine the fragment color.
- * @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 {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.
  *
  * @see {@link https://github.com/CesiumGS/cesium/wiki/Fabric|Fabric}
  *
@@ -72,7 +72,7 @@ function PolylineMaterialAppearance(options) {
    * When <code>true</code>, the geometry is expected to appear translucent so
    * {@link PolylineMaterialAppearance#renderState} has alpha blending enabled.
    *
-   * @type {Boolean}
+   * @type {boolean}
    *
    * @default true
    */
@@ -104,16 +104,15 @@ Object.defineProperties(PolylineMaterialAppearance.prototype, {
    *
    * @memberof PolylineMaterialAppearance.prototype
    *
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   vertexShaderSource: {
     get: function () {
       let vs = this._vertexShaderSource;
       if (
-        this.material.shaderSource.search(
-          /varying\s+float\s+v_polylineAngle;/g
-        ) !== -1
+        this.material.shaderSource.search(/in\s+float\s+v_polylineAngle;/g) !==
+        -1
       ) {
         vs = `#define POLYLINE_DASH\n${vs}`;
       }
@@ -126,7 +125,7 @@ Object.defineProperties(PolylineMaterialAppearance.prototype, {
    *
    * @memberof PolylineMaterialAppearance.prototype
    *
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   fragmentShaderSource: {
@@ -145,7 +144,7 @@ Object.defineProperties(PolylineMaterialAppearance.prototype, {
    *
    * @memberof PolylineMaterialAppearance.prototype
    *
-   * @type {Object}
+   * @type {object}
    * @readonly
    */
   renderState: {
@@ -161,7 +160,7 @@ Object.defineProperties(PolylineMaterialAppearance.prototype, {
    *
    * @memberof PolylineMaterialAppearance.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    *
    * @default false
@@ -207,7 +206,7 @@ PolylineMaterialAppearance.VERTEX_FORMAT = VertexFormat.POSITION_AND_ST;
  *
  * @function
  *
- * @returns {String} The full GLSL fragment shader source.
+ * @returns {string} The full GLSL fragment shader source.
  */
 PolylineMaterialAppearance.prototype.getFragmentShaderSource =
   Appearance.prototype.getFragmentShaderSource;
@@ -217,7 +216,7 @@ PolylineMaterialAppearance.prototype.getFragmentShaderSource =
  *
  * @function
  *
- * @returns {Boolean} <code>true</code> if the appearance is translucent.
+ * @returns {boolean} <code>true</code> if the appearance is translucent.
  */
 PolylineMaterialAppearance.prototype.isTranslucent =
   Appearance.prototype.isTranslucent;
@@ -229,7 +228,7 @@ PolylineMaterialAppearance.prototype.isTranslucent =
  *
  * @function
  *
- * @returns {Object} The render state.
+ * @returns {object} The render state.
  */
 PolylineMaterialAppearance.prototype.getRenderState =
   Appearance.prototype.getRenderState;