@cesium/engine 11.0.0 → 11.1.0

package/Source/DataSources/LabelGraphics.js

@@ -290,7 +290,7 @@ Object.defineProperties(LabelGraphics.prototype, {
    * @type {Property|undefined}
    */
   pixelOffsetScaleByDistance: createPropertyDescriptor(
-    "pixelOffsetScaleByDistance"
+    "pixelOffsetScaleByDistance",
   ),
 
   /**
@@ -311,7 +311,7 @@ Object.defineProperties(LabelGraphics.prototype, {
    * @type {Property|undefined}
    */
   distanceDisplayCondition: createPropertyDescriptor(
-    "distanceDisplayCondition"
+    "distanceDisplayCondition",
   ),
 
   /**
@@ -321,7 +321,7 @@ Object.defineProperties(LabelGraphics.prototype, {
    * @type {Property|undefined}
    */
   disableDepthTestDistance: createPropertyDescriptor(
-    "disableDepthTestDistance"
+    "disableDepthTestDistance",
   ),
 });
 
@@ -379,52 +379,52 @@ LabelGraphics.prototype.merge = function (source) {
   this.scale = defaultValue(this.scale, source.scale);
   this.showBackground = defaultValue(
     this.showBackground,
-    source.showBackground
+    source.showBackground,
   );
   this.backgroundColor = defaultValue(
     this.backgroundColor,
-    source.backgroundColor
+    source.backgroundColor,
   );
   this.backgroundPadding = defaultValue(
     this.backgroundPadding,
-    source.backgroundPadding
+    source.backgroundPadding,
   );
   this.pixelOffset = defaultValue(this.pixelOffset, source.pixelOffset);
   this.eyeOffset = defaultValue(this.eyeOffset, source.eyeOffset);
   this.horizontalOrigin = defaultValue(
     this.horizontalOrigin,
-    source.horizontalOrigin
+    source.horizontalOrigin,
   );
   this.verticalOrigin = defaultValue(
     this.verticalOrigin,
-    source.verticalOrigin
+    source.verticalOrigin,
   );
   this.heightReference = defaultValue(
     this.heightReference,
-    source.heightReference
+    source.heightReference,
   );
   this.fillColor = defaultValue(this.fillColor, source.fillColor);
   this.outlineColor = defaultValue(this.outlineColor, source.outlineColor);
   this.outlineWidth = defaultValue(this.outlineWidth, source.outlineWidth);
   this.translucencyByDistance = defaultValue(
     this.translucencyByDistance,
-    source.translucencyByDistance
+    source.translucencyByDistance,
   );
   this.pixelOffsetScaleByDistance = defaultValue(
     this.pixelOffsetScaleByDistance,
-    source.pixelOffsetScaleByDistance
+    source.pixelOffsetScaleByDistance,
   );
   this.scaleByDistance = defaultValue(
     this.scaleByDistance,
-    source.scaleByDistance
+    source.scaleByDistance,
   );
   this.distanceDisplayCondition = defaultValue(
     this.distanceDisplayCondition,
-    source.distanceDisplayCondition
+    source.distanceDisplayCondition,
   );
   this.disableDepthTestDistance = defaultValue(
     this.disableDepthTestDistance,
-    source.disableDepthTestDistance
+    source.disableDepthTestDistance,
   );
 };
 export default LabelGraphics;

package/Source/DataSources/LabelVisualizer.js

@@ -69,7 +69,7 @@ function LabelVisualizer(entityCluster, entityCollection) {
 
   entityCollection.collectionChanged.addEventListener(
     LabelVisualizer.prototype._onCollectionChanged,
-    this
+    this,
   );
 
   this._cluster = entityCluster;
@@ -111,7 +111,7 @@ LabelVisualizer.prototype.update = function (time) {
       position = Property.getValueOrUndefined(
         entity._position,
         time,
-        positionScratch
+        positionScratch,
       );
       text = Property.getValueOrUndefined(labelGraphics._text, time);
       show = defined(position) && defined(text);
@@ -131,7 +131,7 @@ LabelVisualizer.prototype.update = function (time) {
     const heightReference = Property.getValueOrDefault(
       labelGraphics._heightReference,
       time,
-      defaultHeightReference
+      defaultHeightReference,
     );
 
     if (!defined(label)) {
@@ -154,98 +154,98 @@ LabelVisualizer.prototype.update = function (time) {
     label.scale = Property.getValueOrDefault(
       labelGraphics._scale,
       time,
-      defaultScale
+      defaultScale,
     );
     label.font = Property.getValueOrDefault(
       labelGraphics._font,
       time,
-      defaultFont
+      defaultFont,
     );
     label.style = Property.getValueOrDefault(
       labelGraphics._style,
       time,
-      defaultStyle
+      defaultStyle,
     );
     label.fillColor = Property.getValueOrDefault(
       labelGraphics._fillColor,
       time,
       defaultFillColor,
-      fillColorScratch
+      fillColorScratch,
     );
     label.outlineColor = Property.getValueOrDefault(
       labelGraphics._outlineColor,
       time,
       defaultOutlineColor,
-      outlineColorScratch
+      outlineColorScratch,
     );
     label.outlineWidth = Property.getValueOrDefault(
       labelGraphics._outlineWidth,
       time,
-      defaultOutlineWidth
+      defaultOutlineWidth,
     );
     label.showBackground = Property.getValueOrDefault(
       labelGraphics._showBackground,
       time,
-      defaultShowBackground
+      defaultShowBackground,
     );
     label.backgroundColor = Property.getValueOrDefault(
       labelGraphics._backgroundColor,
       time,
       defaultBackgroundColor,
-      backgroundColorScratch
+      backgroundColorScratch,
     );
     label.backgroundPadding = Property.getValueOrDefault(
       labelGraphics._backgroundPadding,
       time,
       defaultBackgroundPadding,
-      backgroundPaddingScratch
+      backgroundPaddingScratch,
     );
     label.pixelOffset = Property.getValueOrDefault(
       labelGraphics._pixelOffset,
       time,
       defaultPixelOffset,
-      pixelOffsetScratch
+      pixelOffsetScratch,
     );
     label.eyeOffset = Property.getValueOrDefault(
       labelGraphics._eyeOffset,
       time,
       defaultEyeOffset,
-      eyeOffsetScratch
+      eyeOffsetScratch,
     );
     label.heightReference = heightReference;
     label.horizontalOrigin = Property.getValueOrDefault(
       labelGraphics._horizontalOrigin,
       time,
-      defaultHorizontalOrigin
+      defaultHorizontalOrigin,
     );
     label.verticalOrigin = Property.getValueOrDefault(
       labelGraphics._verticalOrigin,
       time,
-      defaultVerticalOrigin
+      defaultVerticalOrigin,
     );
     label.translucencyByDistance = Property.getValueOrUndefined(
       labelGraphics._translucencyByDistance,
       time,
-      translucencyByDistanceScratch
+      translucencyByDistanceScratch,
     );
     label.pixelOffsetScaleByDistance = Property.getValueOrUndefined(
       labelGraphics._pixelOffsetScaleByDistance,
       time,
-      pixelOffsetScaleByDistanceScratch
+      pixelOffsetScaleByDistanceScratch,
     );
     label.scaleByDistance = Property.getValueOrUndefined(
       labelGraphics._scaleByDistance,
       time,
-      scaleByDistanceScratch
+      scaleByDistanceScratch,
     );
     label.distanceDisplayCondition = Property.getValueOrUndefined(
       labelGraphics._distanceDisplayCondition,
       time,
-      distanceDisplayConditionScratch
+      distanceDisplayConditionScratch,
     );
     label.disableDepthTestDistance = Property.getValueOrUndefined(
       labelGraphics._disableDepthTestDistance,
-      time
+      time,
     );
 
     if (updateClamping) {
@@ -284,7 +284,7 @@ LabelVisualizer.prototype.getBoundingSphere = function (entity, result) {
   const label = item.label;
   result.center = Cartesian3.clone(
     defaultValue(label._clampedPosition, label.position),
-    result.center
+    result.center,
   );
   result.radius = 0;
   return BoundingSphereState.DONE;
@@ -305,7 +305,7 @@ LabelVisualizer.prototype.isDestroyed = function () {
 LabelVisualizer.prototype.destroy = function () {
   this._entityCollection.collectionChanged.removeEventListener(
     LabelVisualizer.prototype._onCollectionChanged,
-    this
+    this,
   );
   const entities = this._entityCollection.values;
   for (let i = 0; i < entities.length; i++) {
@@ -318,7 +318,7 @@ LabelVisualizer.prototype._onCollectionChanged = function (
   entityCollection,
   added,
   removed,
-  changed
+  changed,
 ) {
   let i;
   let entity;

package/Source/DataSources/ModelGraphics.js

@@ -26,6 +26,7 @@ function createArticulationStagePropertyBag(value) {
  * @property {Property | boolean} [show=true] A boolean Property specifying the visibility of the model.
  * @property {Property | string | Resource} [uri] A string or Resource Property specifying the URI of the glTF asset.
  * @property {Property | number} [scale=1.0] A numeric Property specifying a uniform linear scale.
+ * @property {Property | boolean} [enableVerticalExaggeration=true] A boolean Property specifying if the model is exaggerated along the ellipsoid normal when {@link Scene.verticalExaggeration} is set to a value other than <code>1.0</code>.
  * @property {Property | number} [minimumPixelSize=0.0] A numeric Property specifying the approximate minimum pixel size of the model regardless of zoom.
  * @property {Property | number} [maximumScale] The maximum scale size of a model. An upper limit for minimumPixelSize.
  * @property {Property | boolean} [incrementallyLoadTextures=true] Determine if textures may continue to stream in after the model is loaded.
@@ -70,6 +71,10 @@ function ModelGraphics(options) {
   this._uriSubscription = undefined;
   this._scale = undefined;
   this._scaleSubscription = undefined;
+  this._hasVerticalExaggeration = undefined;
+  this._hasVerticalExaggerationSubscription = undefined;
+  this._enableVerticalExaggeration = undefined;
+  this._enableVerticalExaggerationSubscription = undefined;
   this._minimumPixelSize = undefined;
   this._minimumPixelSizeSubscription = undefined;
   this._maximumScale = undefined;
@@ -150,6 +155,16 @@ Object.defineProperties(ModelGraphics.prototype, {
    */
   scale: createPropertyDescriptor("scale"),
 
+  /**
+   * Gets or sets the boolean Property specifying if the model is exaggerated along the ellipsoid normal when {@link Scene.verticalExaggeration} is set to a value other than <code>1.0</code>.
+   * @memberof ModelGraphics.prototype
+   * @type {Property|undefined}
+   * @default true
+   */
+  enableVerticalExaggeration: createPropertyDescriptor(
+    "enableVerticalExaggeration",
+  ),
+
   /**
    * Gets or sets the numeric Property specifying the approximate minimum
    * pixel size of the model regardless of zoom. This can be used to ensure that
@@ -177,7 +192,7 @@ Object.defineProperties(ModelGraphics.prototype, {
    * @type {Property|undefined}
    */
   incrementallyLoadTextures: createPropertyDescriptor(
-    "incrementallyLoadTextures"
+    "incrementallyLoadTextures",
   ),
 
   /**
@@ -261,7 +276,7 @@ Object.defineProperties(ModelGraphics.prototype, {
    * @type {Property|undefined}
    */
   imageBasedLightingFactor: createPropertyDescriptor(
-    "imageBasedLightingFactor"
+    "imageBasedLightingFactor",
   ),
 
   /**
@@ -277,7 +292,7 @@ Object.defineProperties(ModelGraphics.prototype, {
    * @type {Property|undefined}
    */
   distanceDisplayCondition: createPropertyDescriptor(
-    "distanceDisplayCondition"
+    "distanceDisplayCondition",
   ),
 
   /**
@@ -290,7 +305,7 @@ Object.defineProperties(ModelGraphics.prototype, {
   nodeTransformations: createPropertyDescriptor(
     "nodeTransformations",
     undefined,
-    createNodeTransformationPropertyBag
+    createNodeTransformationPropertyBag,
   ),
 
   /**
@@ -302,7 +317,7 @@ Object.defineProperties(ModelGraphics.prototype, {
   articulations: createPropertyDescriptor(
     "articulations",
     undefined,
-    createArticulationStagePropertyBag
+    createArticulationStagePropertyBag,
   ),
 
   /**
@@ -333,6 +348,7 @@ ModelGraphics.prototype.clone = function (result) {
   result.show = this.show;
   result.uri = this.uri;
   result.scale = this.scale;
+  result.enableVerticalExaggeration = this.enableVerticalExaggeration;
   result.minimumPixelSize = this.minimumPixelSize;
   result.maximumScale = this.maximumScale;
   result.incrementallyLoadTextures = this.incrementallyLoadTextures;
@@ -370,54 +386,58 @@ ModelGraphics.prototype.merge = function (source) {
   this.show = defaultValue(this.show, source.show);
   this.uri = defaultValue(this.uri, source.uri);
   this.scale = defaultValue(this.scale, source.scale);
+  this.enableVerticalExaggeration = defaultValue(
+    this.enableVerticalExaggeration,
+    source.enableVerticalExaggeration,
+  );
   this.minimumPixelSize = defaultValue(
     this.minimumPixelSize,
-    source.minimumPixelSize
+    source.minimumPixelSize,
   );
   this.maximumScale = defaultValue(this.maximumScale, source.maximumScale);
   this.incrementallyLoadTextures = defaultValue(
     this.incrementallyLoadTextures,
-    source.incrementallyLoadTextures
+    source.incrementallyLoadTextures,
   );
   this.runAnimations = defaultValue(this.runAnimations, source.runAnimations);
   this.clampAnimations = defaultValue(
     this.clampAnimations,
-    source.clampAnimations
+    source.clampAnimations,
   );
   this.shadows = defaultValue(this.shadows, source.shadows);
   this.heightReference = defaultValue(
     this.heightReference,
-    source.heightReference
+    source.heightReference,
   );
   this.silhouetteColor = defaultValue(
     this.silhouetteColor,
-    source.silhouetteColor
+    source.silhouetteColor,
   );
   this.silhouetteSize = defaultValue(
     this.silhouetteSize,
-    source.silhouetteSize
+    source.silhouetteSize,
   );
   this.color = defaultValue(this.color, source.color);
   this.colorBlendMode = defaultValue(
     this.colorBlendMode,
-    source.colorBlendMode
+    source.colorBlendMode,
   );
   this.colorBlendAmount = defaultValue(
     this.colorBlendAmount,
-    source.colorBlendAmount
+    source.colorBlendAmount,
   );
   this.imageBasedLightingFactor = defaultValue(
     this.imageBasedLightingFactor,
-    source.imageBasedLightingFactor
+    source.imageBasedLightingFactor,
   );
   this.lightColor = defaultValue(this.lightColor, source.lightColor);
   this.distanceDisplayCondition = defaultValue(
     this.distanceDisplayCondition,
-    source.distanceDisplayCondition
+    source.distanceDisplayCondition,
   );
   this.clippingPlanes = defaultValue(
     this.clippingPlanes,
-    source.clippingPlanes
+    source.clippingPlanes,
   );
   this.customShader = defaultValue(this.customShader, source.customShader);
 
@@ -429,7 +449,7 @@ ModelGraphics.prototype.merge = function (source) {
     } else {
       this.nodeTransformations = new PropertyBag(
         sourceNodeTransformations,
-        createNodeTransformationProperty
+        createNodeTransformationProperty,
       );
     }
   }

package/Source/DataSources/ModelVisualizer.js

@@ -23,6 +23,7 @@ import Property from "./Property.js";
 import Cartographic from "../Core/Cartographic.js";
 
 const defaultScale = 1.0;
+const defaultEnableVerticalExaggeration = true;
 const defaultMinimumPixelSize = 0.0;
 const defaultIncrementallyLoadTextures = true;
 const defaultClampAnimations = true;
@@ -58,7 +59,7 @@ function ModelVisualizer(scene, entityCollection) {
 
   entityCollection.collectionChanged.addEventListener(
     ModelVisualizer.prototype._onCollectionChanged,
-    this
+    this,
   );
 
   this._scene = scene;
@@ -74,7 +75,7 @@ async function createModelPrimitive(
   visualizer,
   entity,
   resource,
-  incrementallyLoadTextures
+  incrementallyLoadTextures,
 ) {
   const primitives = visualizer._primitives;
   const modelHash = visualizer._modelHash;
@@ -149,7 +150,7 @@ ModelVisualizer.prototype.update = function (time) {
     if (show) {
       modelMatrix = entity.computeModelMatrix(time, modelMatrixScratch);
       resource = Resource.createIfNeeded(
-        Property.getValueOrUndefined(modelGraphics._uri, time)
+        Property.getValueOrUndefined(modelGraphics._uri, time),
       );
       show = defined(modelMatrix) && defined(resource);
     }
@@ -181,7 +182,7 @@ ModelVisualizer.prototype.update = function (time) {
       const incrementallyLoadTextures = Property.getValueOrDefault(
         modelGraphics._incrementallyLoadTextures,
         time,
-        defaultIncrementallyLoadTextures
+        defaultIncrementallyLoadTextures,
       );
 
       createModelPrimitive(this, entity, resource, incrementallyLoadTextures);
@@ -196,76 +197,84 @@ ModelVisualizer.prototype.update = function (time) {
     model.scale = Property.getValueOrDefault(
       modelGraphics._scale,
       time,
-      defaultScale
+      defaultScale,
     );
+
+    model.enableVerticalExaggeration = Property.getValueOrDefault(
+      modelGraphics._enableVerticalExaggeration,
+      time,
+      defaultEnableVerticalExaggeration,
+    );
+
     model.minimumPixelSize = Property.getValueOrDefault(
       modelGraphics._minimumPixelSize,
       time,
-      defaultMinimumPixelSize
+      defaultMinimumPixelSize,
     );
     model.maximumScale = Property.getValueOrUndefined(
       modelGraphics._maximumScale,
-      time
+      time,
     );
     model.modelMatrix = Matrix4.clone(modelMatrix, model.modelMatrix);
     model.shadows = Property.getValueOrDefault(
       modelGraphics._shadows,
       time,
-      defaultShadows
+      defaultShadows,
     );
     model.heightReference = Property.getValueOrDefault(
       modelGraphics._heightReference,
       time,
-      defaultHeightReference
+      defaultHeightReference,
     );
     model.distanceDisplayCondition = Property.getValueOrUndefined(
       modelGraphics._distanceDisplayCondition,
-      time
+      time,
     );
     model.silhouetteColor = Property.getValueOrDefault(
       modelGraphics._silhouetteColor,
       time,
       defaultSilhouetteColor,
-      scratchColor
+      scratchColor,
     );
     model.silhouetteSize = Property.getValueOrDefault(
       modelGraphics._silhouetteSize,
       time,
-      defaultSilhouetteSize
+      defaultSilhouetteSize,
     );
     model.color = Property.getValueOrDefault(
       modelGraphics._color,
       time,
       defaultColor,
-      scratchColor
+      scratchColor,
     );
     model.colorBlendMode = Property.getValueOrDefault(
       modelGraphics._colorBlendMode,
       time,
-      defaultColorBlendMode
+      defaultColorBlendMode,
     );
     model.colorBlendAmount = Property.getValueOrDefault(
       modelGraphics._colorBlendAmount,
       time,
-      defaultColorBlendAmount
+      defaultColorBlendAmount,
     );
     model.clippingPlanes = Property.getValueOrUndefined(
       modelGraphics._clippingPlanes,
-      time
+      time,
     );
     model.clampAnimations = Property.getValueOrDefault(
       modelGraphics._clampAnimations,
       time,
-      defaultClampAnimations
-    );
-    model.imageBasedLighting.imageBasedLightingFactor = Property.getValueOrDefault(
-      modelGraphics._imageBasedLightingFactor,
-      time,
-      defaultImageBasedLightingFactor
+      defaultClampAnimations,
     );
+    model.imageBasedLighting.imageBasedLightingFactor =
+      Property.getValueOrDefault(
+        modelGraphics._imageBasedLightingFactor,
+        time,
+        defaultImageBasedLightingFactor,
+      );
     let lightColor = Property.getValueOrUndefined(
       modelGraphics._lightColor,
-      time
+      time,
     );
 
     // Convert from Color to Cartesian3
@@ -277,7 +286,7 @@ ModelVisualizer.prototype.update = function (time) {
     model.lightColor = lightColor;
     model.customShader = Property.getValueOrUndefined(
       modelGraphics._customShader,
-      time
+      time,
     );
 
     // It's possible for getBoundingSphere to run before
@@ -288,7 +297,7 @@ ModelVisualizer.prototype.update = function (time) {
       const runAnimations = Property.getValueOrDefault(
         modelGraphics._runAnimations,
         time,
-        true
+        true,
       );
       if (modelData.animationsRunning !== runAnimations) {
         if (runAnimations) {
@@ -305,7 +314,7 @@ ModelVisualizer.prototype.update = function (time) {
       const nodeTransformations = Property.getValueOrUndefined(
         modelGraphics._nodeTransformations,
         time,
-        modelData.nodeTransformationsScratch
+        modelData.nodeTransformationsScratch,
       );
       if (defined(nodeTransformations)) {
         const nodeNames = Object.keys(nodeTransformations);
@@ -328,12 +337,12 @@ ModelVisualizer.prototype.update = function (time) {
 
           const transformationMatrix = Matrix4.fromTranslationRotationScale(
             nodeTransformation,
-            nodeMatrixScratch
+            nodeMatrixScratch,
           );
           modelNode.matrix = Matrix4.multiply(
             modelNode.originalMatrix,
             transformationMatrix,
-            transformationMatrix
+            transformationMatrix,
           );
         }
       }
@@ -343,7 +352,7 @@ ModelVisualizer.prototype.update = function (time) {
       const articulations = Property.getValueOrUndefined(
         modelGraphics._articulations,
         time,
-        modelData.articulationsScratch
+        modelData.articulationsScratch,
       );
       if (defined(articulations)) {
         const articulationStageKeys = Object.keys(articulations);
@@ -388,7 +397,7 @@ ModelVisualizer.prototype.isDestroyed = function () {
 ModelVisualizer.prototype.destroy = function () {
   this._entityCollection.collectionChanged.removeEventListener(
     ModelVisualizer.prototype._onCollectionChanged,
-    this
+    this,
   );
   const entities = this._entitiesToVisualize.values;
   const modelHash = this._modelHash;
@@ -451,7 +460,7 @@ ModelVisualizer.prototype.getBoundingSphere = function (entity, result) {
     scratchPosition.z = modelMatrix[14];
     const cartoPosition = ellipsoid.cartesianToCartographic(
       scratchPosition,
-      scratchCartographic
+      scratchCartographic,
     );
 
     const height = scene.getHeight(cartoPosition, model.heightReference);
@@ -479,7 +488,7 @@ ModelVisualizer.prototype._onCollectionChanged = function (
   entityCollection,
   added,
   removed,
-  changed
+  changed,
 ) {
   let i;
   let entity;

package/Source/DataSources/NodeTransformationProperty.js

@@ -114,19 +114,19 @@ NodeTransformationProperty.prototype.getValue = function (time, result) {
     this._translation,
     time,
     defaultNodeTransformation.translation,
-    result.translation
+    result.translation,
   );
   result.rotation = Property.getValueOrClonedDefault(
     this._rotation,
     time,
     defaultNodeTransformation.rotation,
-    result.rotation
+    result.rotation,
   );
   result.scale = Property.getValueOrClonedDefault(
     this._scale,
     time,
     defaultNodeTransformation.scale,
-    result.scale
+    result.scale,
   );
   return result;
 };

package/Source/DataSources/PathGraphics.js

@@ -112,7 +112,7 @@ Object.defineProperties(PathGraphics.prototype, {
    * @type {Property|undefined}
    */
   distanceDisplayCondition: createPropertyDescriptor(
-    "distanceDisplayCondition"
+    "distanceDisplayCondition",
   ),
 });
 
@@ -157,7 +157,7 @@ PathGraphics.prototype.merge = function (source) {
   this.material = defaultValue(this.material, source.material);
   this.distanceDisplayCondition = defaultValue(
     this.distanceDisplayCondition,
-    source.distanceDisplayCondition
+    source.distanceDisplayCondition,
   );
 };
 export default PathGraphics;