@cesium/engine 11.0.0 → 11.1.0

package/Source/DataSources/PathVisualizer.js

@@ -11,6 +11,7 @@ import TimeInterval from "../Core/TimeInterval.js";
 import Transforms from "../Core/Transforms.js";
 import PolylineCollection from "../Scene/PolylineCollection.js";
 import SceneMode from "../Scene/SceneMode.js";
+import CallbackPositionProperty from "./CallbackPositionProperty.js";
 import CompositePositionProperty from "./CompositePositionProperty.js";
 import ConstantPositionProperty from "./ConstantPositionProperty.js";
 import MaterialProperty from "./MaterialProperty.js";
@@ -43,7 +44,7 @@ function subSampleSampledProperty(
   referenceFrame,
   maximumStep,
   startingIndex,
-  result
+  result,
 ) {
   let r = startingIndex;
   //Always step exactly on start (but only use it if it exists.)
@@ -75,7 +76,7 @@ function subSampleSampledProperty(
       tmp = property.getValueInReferenceFrame(
         updateTime,
         referenceFrame,
-        result[r]
+        result[r],
       );
       if (defined(tmp)) {
         result[r++] = tmp;
@@ -90,7 +91,7 @@ function subSampleSampledProperty(
       tmp = property.getValueInReferenceFrame(
         current,
         referenceFrame,
-        result[r]
+        result[r],
       );
       if (defined(tmp)) {
         result[r++] = tmp;
@@ -115,7 +116,7 @@ function subSampleSampledProperty(
         current = JulianDate.addSeconds(
           current,
           sampleStepSize,
-          new JulianDate()
+          new JulianDate(),
         );
         sampleStepsTaken++;
         continue;
@@ -135,6 +136,58 @@ function subSampleSampledProperty(
   return r;
 }
 
+function subSampleCallbackPositionProperty(
+  property,
+  start,
+  stop,
+  updateTime,
+  referenceFrame,
+  maximumStep,
+  startingIndex,
+  result,
+) {
+  let tmp;
+  let i = 0;
+  let index = startingIndex;
+  let time = start;
+  let steppedOnNow =
+    !defined(updateTime) ||
+    JulianDate.lessThanOrEquals(updateTime, start) ||
+    JulianDate.greaterThanOrEquals(updateTime, stop);
+  while (JulianDate.lessThan(time, stop)) {
+    if (!steppedOnNow && JulianDate.greaterThanOrEquals(time, updateTime)) {
+      steppedOnNow = true;
+      tmp = property.getValueInReferenceFrame(
+        updateTime,
+        referenceFrame,
+        result[index],
+      );
+      if (defined(tmp)) {
+        result[index] = tmp;
+        index++;
+      }
+    }
+    tmp = property.getValueInReferenceFrame(
+      time,
+      referenceFrame,
+      result[index],
+    );
+    if (defined(tmp)) {
+      result[index] = tmp;
+      index++;
+    }
+    i++;
+    time = JulianDate.addSeconds(start, maximumStep * i, new JulianDate());
+  }
+  //Always sample stop.
+  tmp = property.getValueInReferenceFrame(stop, referenceFrame, result[index]);
+  if (defined(tmp)) {
+    result[index] = tmp;
+    index++;
+  }
+  return index;
+}
+
 function subSampleGenericProperty(
   property,
   start,
@@ -143,7 +196,7 @@ function subSampleGenericProperty(
   referenceFrame,
   maximumStep,
   startingIndex,
-  result
+  result,
 ) {
   let tmp;
   let i = 0;
@@ -160,7 +213,7 @@ function subSampleGenericProperty(
       tmp = property.getValueInReferenceFrame(
         updateTime,
         referenceFrame,
-        result[index]
+        result[index],
       );
       if (defined(tmp)) {
         result[index] = tmp;
@@ -170,7 +223,7 @@ function subSampleGenericProperty(
     tmp = property.getValueInReferenceFrame(
       time,
       referenceFrame,
-      result[index]
+      result[index],
     );
     if (defined(tmp)) {
       result[index] = tmp;
@@ -196,7 +249,7 @@ function subSampleIntervalProperty(
   referenceFrame,
   maximumStep,
   startingIndex,
-  result
+  result,
 ) {
   subSampleIntervalPropertyScratch.start = start;
   subSampleIntervalPropertyScratch.stop = stop;
@@ -209,7 +262,7 @@ function subSampleIntervalProperty(
       !TimeInterval.intersect(
         interval,
         subSampleIntervalPropertyScratch,
-        scratchTimeInterval
+        scratchTimeInterval,
       ).isEmpty
     ) {
       let time = interval.start;
@@ -220,14 +273,14 @@ function subSampleIntervalProperty(
           time = JulianDate.addSeconds(
             interval.start,
             JulianDate.secondsDifference(interval.stop, interval.start) / 2,
-            new JulianDate()
+            new JulianDate(),
           );
         }
       }
       const tmp = property.getValueInReferenceFrame(
         time,
         referenceFrame,
-        result[index]
+        result[index],
       );
       if (defined(tmp)) {
         result[index] = tmp;
@@ -246,12 +299,12 @@ function subSampleConstantProperty(
   referenceFrame,
   maximumStep,
   startingIndex,
-  result
+  result,
 ) {
   const tmp = property.getValueInReferenceFrame(
     start,
     referenceFrame,
-    result[startingIndex]
+    result[startingIndex],
   );
   if (defined(tmp)) {
     result[startingIndex++] = tmp;
@@ -267,7 +320,7 @@ function subSampleCompositeProperty(
   referenceFrame,
   maximumStep,
   startingIndex,
-  result
+  result,
 ) {
   subSampleCompositePropertyScratch.start = start;
   subSampleCompositePropertyScratch.stop = stop;
@@ -280,7 +333,7 @@ function subSampleCompositeProperty(
       !TimeInterval.intersect(
         interval,
         subSampleCompositePropertyScratch,
-        scratchTimeInterval
+        scratchTimeInterval,
       ).isEmpty
     ) {
       const intervalStart = interval.start;
@@ -304,7 +357,7 @@ function subSampleCompositeProperty(
         referenceFrame,
         maximumStep,
         index,
-        result
+        result,
       );
     }
   }
@@ -319,7 +372,7 @@ function reallySubSample(
   referenceFrame,
   maximumStep,
   index,
-  result
+  result,
 ) {
   //Unwrap any references until we have the actual property.
   while (property instanceof ReferenceProperty) {
@@ -337,7 +390,18 @@ function reallySubSample(
       referenceFrame,
       maximumStep,
       index,
-      result
+      result,
+    );
+  } else if (property instanceof CallbackPositionProperty) {
+    index = subSampleCallbackPositionProperty(
+      property,
+      start,
+      stop,
+      updateTime,
+      referenceFrame,
+      maximumStep,
+      index,
+      result,
     );
   } else if (property instanceof CompositePositionProperty) {
     index = subSampleCompositeProperty(
@@ -348,7 +412,7 @@ function reallySubSample(
       referenceFrame,
       maximumStep,
       index,
-      result
+      result,
     );
   } else if (property instanceof TimeIntervalCollectionPositionProperty) {
     index = subSampleIntervalProperty(
@@ -359,7 +423,7 @@ function reallySubSample(
       referenceFrame,
       maximumStep,
       index,
-      result
+      result,
     );
   } else if (
     property instanceof ConstantPositionProperty ||
@@ -374,7 +438,7 @@ function reallySubSample(
       referenceFrame,
       maximumStep,
       index,
-      result
+      result,
     );
   } else {
     //Fallback to generic sampling.
@@ -386,7 +450,7 @@ function reallySubSample(
       referenceFrame,
       maximumStep,
       index,
-      result
+      result,
     );
   }
   return index;
@@ -399,7 +463,7 @@ function subSample(
   updateTime,
   referenceFrame,
   maximumStep,
-  result
+  result,
 ) {
   if (!defined(result)) {
     result = [];
@@ -413,7 +477,7 @@ function subSample(
     referenceFrame,
     maximumStep,
     0,
-    result
+    result,
   );
   result.length = length;
   return result;
@@ -432,12 +496,12 @@ PolylineUpdater.prototype.update = function (time) {
   if (this._referenceFrame === ReferenceFrame.INERTIAL) {
     const toFixed = Transforms.computeIcrfToCentralBodyFixedMatrix(
       time,
-      toFixedScratch
+      toFixedScratch,
     );
     Matrix4.fromRotationTranslation(
       toFixed,
       Cartesian3.ZERO,
-      this._polylineCollection.modelMatrix
+      this._polylineCollection.modelMatrix,
     );
   }
 };
@@ -463,7 +527,7 @@ PolylineUpdater.prototype.updateObject = function (time, item) {
     const leadTime = Property.getValueOrUndefined(pathGraphics._leadTime, time);
     const trailTime = Property.getValueOrUndefined(
       pathGraphics._trailTime,
-      time
+      time,
     );
     const availability = entity._availability;
     const hasAvailability = defined(availability);
@@ -530,7 +594,7 @@ PolylineUpdater.prototype.updateObject = function (time, item) {
   const resolution = Property.getValueOrDefault(
     pathGraphics._resolution,
     time,
-    defaultResolution
+    defaultResolution,
   );
 
   polyline.show = true;
@@ -541,22 +605,22 @@ PolylineUpdater.prototype.updateObject = function (time, item) {
     time,
     this._referenceFrame,
     resolution,
-    polyline.positions.slice()
+    polyline.positions.slice(),
   );
   polyline.material = MaterialProperty.getValue(
     time,
     pathGraphics._material,
-    polyline.material
+    polyline.material,
   );
   polyline.width = Property.getValueOrDefault(
     pathGraphics._width,
     time,
-    defaultWidth
+    defaultWidth,
   );
   polyline.distanceDisplayCondition = Property.getValueOrUndefined(
     pathGraphics._distanceDisplayCondition,
     time,
-    polyline.distanceDisplayCondition
+    polyline.distanceDisplayCondition,
   );
 };
 
@@ -596,7 +660,7 @@ function PathVisualizer(scene, entityCollection) {
 
   entityCollection.collectionChanged.addEventListener(
     PathVisualizer.prototype._onCollectionChanged,
-    this
+    this,
   );
 
   this._scene = scene;
@@ -694,7 +758,7 @@ PathVisualizer.prototype.isDestroyed = function () {
 PathVisualizer.prototype.destroy = function () {
   this._entityCollection.collectionChanged.removeEventListener(
     PathVisualizer.prototype._onCollectionChanged,
-    this
+    this,
   );
 
   const updaters = this._updaters;
@@ -711,7 +775,7 @@ PathVisualizer.prototype._onCollectionChanged = function (
   entityCollection,
   added,
   removed,
-  changed
+  changed,
 ) {
   let i;
   let entity;

package/Source/DataSources/PlaneGeometryUpdater.js

@@ -70,7 +70,7 @@ PlaneGeometryUpdater.prototype.createFillGeometryInstance = function (time) {
 
   if (!this._fillEnabled) {
     throw new DeveloperError(
-      "This instance does not represent a filled geometry."
+      "This instance does not represent a filled geometry.",
     );
   }
   //>>includeEnd('debug');
@@ -85,14 +85,14 @@ PlaneGeometryUpdater.prototype.createFillGeometryInstance = function (time) {
     isAvailable &&
       entity.isShowing &&
       this._showProperty.getValue(time) &&
-      this._fillProperty.getValue(time)
-  );
-  const distanceDisplayCondition = this._distanceDisplayConditionProperty.getValue(
-    time
-  );
-  const distanceDisplayConditionAttribute = DistanceDisplayConditionGeometryInstanceAttribute.fromDistanceDisplayCondition(
-    distanceDisplayCondition
+      this._fillProperty.getValue(time),
   );
+  const distanceDisplayCondition =
+    this._distanceDisplayConditionProperty.getValue(time);
+  const distanceDisplayConditionAttribute =
+    DistanceDisplayConditionGeometryInstanceAttribute.fromDistanceDisplayCondition(
+      distanceDisplayCondition,
+    );
   if (this._materialProperty instanceof ColorMaterialProperty) {
     let currentColor;
     if (
@@ -123,12 +123,12 @@ PlaneGeometryUpdater.prototype.createFillGeometryInstance = function (time) {
   const plane = Property.getValueOrDefault(
     planeGraphics.plane,
     time,
-    options.plane
+    options.plane,
   );
   const dimensions = Property.getValueOrUndefined(
     planeGraphics.dimensions,
     time,
-    options.dimensions
+    options.dimensions,
   );
 
   options.plane = plane;
@@ -138,7 +138,7 @@ PlaneGeometryUpdater.prototype.createFillGeometryInstance = function (time) {
     plane,
     dimensions,
     modelMatrix,
-    modelMatrix
+    modelMatrix,
   );
 
   return new GeometryInstance({
@@ -163,7 +163,7 @@ PlaneGeometryUpdater.prototype.createOutlineGeometryInstance = function (time) {
 
   if (!this._outlineEnabled) {
     throw new DeveloperError(
-      "This instance does not represent an outlined geometry."
+      "This instance does not represent an outlined geometry.",
     );
   }
   //>>includeEnd('debug');
@@ -174,11 +174,10 @@ PlaneGeometryUpdater.prototype.createOutlineGeometryInstance = function (time) {
     this._outlineColorProperty,
     time,
     Color.BLACK,
-    scratchColor
-  );
-  const distanceDisplayCondition = this._distanceDisplayConditionProperty.getValue(
-    time
+    scratchColor,
   );
+  const distanceDisplayCondition =
+    this._distanceDisplayConditionProperty.getValue(time);
 
   const planeGraphics = entity.plane;
   const options = this._options;
@@ -186,12 +185,12 @@ PlaneGeometryUpdater.prototype.createOutlineGeometryInstance = function (time) {
   const plane = Property.getValueOrDefault(
     planeGraphics.plane,
     time,
-    options.plane
+    options.plane,
   );
   const dimensions = Property.getValueOrUndefined(
     planeGraphics.dimensions,
     time,
-    options.dimensions
+    options.dimensions,
   );
 
   options.plane = plane;
@@ -201,7 +200,7 @@ PlaneGeometryUpdater.prototype.createOutlineGeometryInstance = function (time) {
     plane,
     dimensions,
     modelMatrix,
-    modelMatrix
+    modelMatrix,
   );
 
   return new GeometryInstance({
@@ -213,12 +212,13 @@ PlaneGeometryUpdater.prototype.createOutlineGeometryInstance = function (time) {
         isAvailable &&
           entity.isShowing &&
           this._showProperty.getValue(time) &&
-          this._showOutlineProperty.getValue(time)
+          this._showOutlineProperty.getValue(time),
       ),
       color: ColorGeometryInstanceAttribute.fromColor(outlineColor),
-      distanceDisplayCondition: DistanceDisplayConditionGeometryInstanceAttribute.fromDistanceDisplayCondition(
-        distanceDisplayCondition
-      ),
+      distanceDisplayCondition:
+        DistanceDisplayConditionGeometryInstanceAttribute.fromDistanceDisplayCondition(
+          distanceDisplayCondition,
+        ),
     },
   });
 };
@@ -257,7 +257,7 @@ PlaneGeometryUpdater.prototype._setStaticOptions = function (entity, plane) {
   options.plane = plane.plane.getValue(Iso8601.MINIMUM_VALUE, options.plane);
   options.dimensions = plane.dimensions.getValue(
     Iso8601.MINIMUM_VALUE,
-    options.dimensions
+    options.dimensions,
   );
 };
 
@@ -269,33 +269,34 @@ PlaneGeometryUpdater.DynamicGeometryUpdater = DynamicPlaneGeometryUpdater;
 function DynamicPlaneGeometryUpdater(
   geometryUpdater,
   primitives,
-  groundPrimitives
+  groundPrimitives,
 ) {
   DynamicGeometryUpdater.call(
     this,
     geometryUpdater,
     primitives,
-    groundPrimitives
+    groundPrimitives,
   );
 }
 
 if (defined(Object.create)) {
   DynamicPlaneGeometryUpdater.prototype = Object.create(
-    DynamicGeometryUpdater.prototype
+    DynamicGeometryUpdater.prototype,
   );
-  DynamicPlaneGeometryUpdater.prototype.constructor = DynamicPlaneGeometryUpdater;
+  DynamicPlaneGeometryUpdater.prototype.constructor =
+    DynamicPlaneGeometryUpdater;
 }
 
 DynamicPlaneGeometryUpdater.prototype._isHidden = function (
   entity,
   plane,
-  time
+  time,
 ) {
   const options = this._options;
   const position = Property.getValueOrUndefined(
     entity.position,
     time,
-    positionScratch
+    positionScratch,
   );
   return (
     !defined(position) ||
@@ -308,14 +309,14 @@ DynamicPlaneGeometryUpdater.prototype._isHidden = function (
 DynamicPlaneGeometryUpdater.prototype._setOptions = function (
   entity,
   plane,
-  time
+  time,
 ) {
   const options = this._options;
   options.plane = Property.getValueOrDefault(plane.plane, time, options.plane);
   options.dimensions = Property.getValueOrUndefined(
     plane.dimensions,
     time,
-    options.dimensions
+    options.dimensions,
   );
 };
 
@@ -333,7 +334,7 @@ function createPrimitiveMatrix(plane, dimensions, transform, result) {
   const translation = Cartesian3.multiplyByScalar(
     normal,
     -distance,
-    scratchTranslation
+    scratchTranslation,
   );
 
   let up = Cartesian3.clone(Cartesian3.UNIT_Z, scratchUp);
@@ -341,7 +342,7 @@ function createPrimitiveMatrix(plane, dimensions, transform, result) {
     CesiumMath.equalsEpsilon(
       Math.abs(Cartesian3.dot(up, normal)),
       1.0,
-      CesiumMath.EPSILON8
+      CesiumMath.EPSILON8,
     )
   ) {
     up = Cartesian3.clone(Cartesian3.UNIT_Y, up);
@@ -361,18 +362,18 @@ function createPrimitiveMatrix(plane, dimensions, transform, result) {
     dimensions.x,
     dimensions.y,
     1.0,
-    scratchScale
+    scratchScale,
   );
   const rotationScaleMatrix = Matrix3.multiplyByScale(
     rotationMatrix,
     scale,
-    scratchRotationScale
+    scratchRotationScale,
   );
 
   const localTransform = Matrix4.fromRotationTranslation(
     rotationScaleMatrix,
     translation,
-    scratchLocalTransform
+    scratchLocalTransform,
   );
   return Matrix4.multiplyTransformation(transform, localTransform, result);
 }

package/Source/DataSources/PlaneGraphics.js

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

package/Source/DataSources/PointGraphics.js

@@ -145,7 +145,7 @@ Object.defineProperties(PointGraphics.prototype, {
    * @type {Property|undefined}
    */
   distanceDisplayCondition: createPropertyDescriptor(
-    "distanceDisplayCondition"
+    "distanceDisplayCondition",
   ),
 
   /**
@@ -155,7 +155,7 @@ Object.defineProperties(PointGraphics.prototype, {
    * @type {Property|undefined}
    */
   disableDepthTestDistance: createPropertyDescriptor(
-    "disableDepthTestDistance"
+    "disableDepthTestDistance",
   ),
 
   /**
@@ -208,31 +208,31 @@ PointGraphics.prototype.merge = function (source) {
   this.pixelSize = defaultValue(this.pixelSize, source.pixelSize);
   this.heightReference = defaultValue(
     this.heightReference,
-    source.heightReference
+    source.heightReference,
   );
   this.color = defaultValue(this.color, source.color);
   this.outlineColor = defaultValue(this.outlineColor, source.outlineColor);
   this.outlineWidth = defaultValue(this.outlineWidth, source.outlineWidth);
   this.scaleByDistance = defaultValue(
     this.scaleByDistance,
-    source.scaleByDistance
+    source.scaleByDistance,
   );
   this.translucencyByDistance = defaultValue(
     this._translucencyByDistance,
-    source.translucencyByDistance
+    source.translucencyByDistance,
   );
   this.distanceDisplayCondition = defaultValue(
     this.distanceDisplayCondition,
-    source.distanceDisplayCondition
+    source.distanceDisplayCondition,
   );
   this.disableDepthTestDistance = defaultValue(
     this.disableDepthTestDistance,
-    source.disableDepthTestDistance
+    source.disableDepthTestDistance,
   );
 
   this.splitDirection = defaultValue(
     this.splitDirection,
-    source.splitDirection
+    source.splitDirection,
   );
 };
 export default PointGraphics;