@cesium/engine 10.1.0 → 11.1.0

package/Source/Scene/CameraEventAggregator.js

@@ -9,7 +9,7 @@ import ScreenSpaceEventType from "../Core/ScreenSpaceEventType.js";
 import CameraEventType from "./CameraEventType.js";
 
 function getKey(type, modifier) {
-  let key = type;
+  let key = `${type}`;
   if (defined(modifier)) {
     key += `+${modifier}`;
   }
@@ -19,20 +19,20 @@ function getKey(type, modifier) {
 function clonePinchMovement(pinchMovement, result) {
   Cartesian2.clone(
     pinchMovement.distance.startPosition,
-    result.distance.startPosition
+    result.distance.startPosition,
   );
   Cartesian2.clone(
     pinchMovement.distance.endPosition,
-    result.distance.endPosition
+    result.distance.endPosition,
   );
 
   Cartesian2.clone(
     pinchMovement.angleAndHeight.startPosition,
-    result.angleAndHeight.startPosition
+    result.angleAndHeight.startPosition,
   );
   Cartesian2.clone(
     pinchMovement.angleAndHeight.endPosition,
-    result.angleAndHeight.endPosition
+    result.angleAndHeight.endPosition,
   );
 }
 
@@ -74,11 +74,11 @@ function listenToPinch(aggregator, modifier, canvas) {
         event.position1,
         event.position2,
         0.5,
-        eventStartPosition[key]
+        eventStartPosition[key],
       );
     },
     ScreenSpaceEventType.PINCH_START,
-    modifier
+    modifier,
   );
 
   aggregator._eventHandler.setInputAction(
@@ -88,7 +88,7 @@ function listenToPinch(aggregator, modifier, canvas) {
       releaseTime[key] = new Date();
     },
     ScreenSpaceEventType.PINCH_END,
-    modifier
+    modifier,
   );
 
   aggregator._eventHandler.setInputAction(
@@ -98,11 +98,11 @@ function listenToPinch(aggregator, modifier, canvas) {
         if (!update[key]) {
           Cartesian2.clone(
             mouseMovement.distance.endPosition,
-            movement.distance.endPosition
+            movement.distance.endPosition,
           );
           Cartesian2.clone(
             mouseMovement.angleAndHeight.endPosition,
-            movement.angleAndHeight.endPosition
+            movement.angleAndHeight.endPosition,
           );
         } else {
           clonePinchMovement(mouseMovement, movement);
@@ -126,7 +126,7 @@ function listenToPinch(aggregator, modifier, canvas) {
       }
     },
     ScreenSpaceEventType.PINCH_MOVE,
-    modifier
+    modifier,
   );
 }
 
@@ -168,7 +168,7 @@ function listenToWheel(aggregator, modifier) {
       update[key] = false;
     },
     ScreenSpaceEventType.WHEEL,
-    modifier
+    modifier,
   );
 }
 
@@ -178,7 +178,6 @@ function listenMouseButtonDownUp(aggregator, modifier, type) {
   const isDown = aggregator._isDown;
   const eventStartPosition = aggregator._eventStartPosition;
   const pressTime = aggregator._pressTime;
-  const releaseTime = aggregator._releaseTime;
 
   isDown[key] = false;
   eventStartPosition[key] = new Cartesian2();
@@ -214,25 +213,69 @@ function listenMouseButtonDownUp(aggregator, modifier, type) {
       Cartesian2.clone(event.position, eventStartPosition[key]);
     },
     down,
-    modifier
+    modifier,
   );
 
   aggregator._eventHandler.setInputAction(
     function () {
-      aggregator._buttonsDown = Math.max(aggregator._buttonsDown - 1, 0);
-      isDown[key] = false;
-      releaseTime[key] = new Date();
+      cancelMouseDownAction(getKey(type, undefined), aggregator);
+      for (const modifier of Object.values(KeyboardEventModifier)) {
+        const cancelKey = getKey(type, modifier);
+        cancelMouseDownAction(cancelKey, aggregator);
+      }
     },
     up,
-    modifier
+    modifier,
   );
 }
 
+function cancelMouseDownAction(cancelKey, aggregator) {
+  const releaseTime = aggregator._releaseTime;
+  const isDown = aggregator._isDown;
+  if (isDown[cancelKey]) {
+    aggregator._buttonsDown = Math.max(aggregator._buttonsDown - 1, 0);
+  }
+  isDown[cancelKey] = false;
+  releaseTime[cancelKey] = new Date();
+}
+
 function cloneMouseMovement(mouseMovement, result) {
   Cartesian2.clone(mouseMovement.startPosition, result.startPosition);
   Cartesian2.clone(mouseMovement.endPosition, result.endPosition);
 }
 
+function refreshMouseDownStatus(type, modifier, aggregator) {
+  // first: Judge if the mouse is pressed
+  const isDown = aggregator._isDown;
+  let anyButtonIsDown = false;
+  const currentKey = getKey(type, modifier);
+  for (const [downKey, downValue] of Object.entries(isDown)) {
+    if (downKey.startsWith(type) && downValue && downKey !== currentKey) {
+      anyButtonIsDown = true;
+      cancelMouseDownAction(downKey, aggregator);
+    }
+  }
+
+  if (!anyButtonIsDown) {
+    return;
+  }
+
+  // second: If it is pressed, it will be transferred to the current modifier.
+  const pressTime = aggregator._pressTime;
+  let lastMovement = aggregator._lastMovement[currentKey];
+  if (!defined(lastMovement)) {
+    lastMovement = aggregator._lastMovement[currentKey] = {
+      startPosition: new Cartesian2(),
+      endPosition: new Cartesian2(),
+      valid: false,
+    };
+  }
+  aggregator._buttonsDown++;
+  lastMovement.valid = false;
+  isDown[currentKey] = true;
+  pressTime[currentKey] = new Date();
+}
+
 function listenMouseMove(aggregator, modifier) {
   const update = aggregator._update;
   const movement = aggregator._movement;
@@ -271,11 +314,12 @@ function listenMouseMove(aggregator, modifier) {
           const type = CameraEventType[typeName];
           if (defined(type)) {
             const key = getKey(type, modifier);
+            refreshMouseDownStatus(type, modifier, aggregator);
             if (isDown[key]) {
               if (!update[key]) {
                 Cartesian2.clone(
                   mouseMovement.endPosition,
-                  movement[key].endPosition
+                  movement[key].endPosition,
                 );
               } else {
                 cloneMouseMovement(movement[key], lastMovement[key]);
@@ -290,11 +334,11 @@ function listenMouseMove(aggregator, modifier) {
 
       Cartesian2.clone(
         mouseMovement.endPosition,
-        aggregator._currentMousePosition
+        aggregator._currentMousePosition,
       );
     },
     ScreenSpaceEventType.MOUSE_MOVE,
-    modifier
+    modifier,
   );
 }
 
@@ -473,7 +517,7 @@ CameraEventAggregator.prototype.isButtonDown = function (type, modifier) {
  */
 CameraEventAggregator.prototype.getStartMousePosition = function (
   type,
-  modifier
+  modifier,
 ) {
   //>>includeStart('debug', pragmas.debug);
   if (!defined(type)) {
@@ -516,7 +560,7 @@ CameraEventAggregator.prototype.getButtonPressTime = function (type, modifier) {
  */
 CameraEventAggregator.prototype.getButtonReleaseTime = function (
   type,
-  modifier
+  modifier,
 ) {
   //>>includeStart('debug', pragmas.debug);
   if (!defined(type)) {

package/Source/Scene/CameraFlightPath.js

@@ -46,7 +46,7 @@ function createPitchFunction(
   startPitch,
   endPitch,
   heightFunction,
-  pitchAdjustHeight
+  pitchAdjustHeight,
 ) {
   if (defined(pitchAdjustHeight) && heightFunction(0.5) > pitchAdjustHeight) {
     const startHeight = heightFunction(0.0);
@@ -77,7 +77,7 @@ function createHeightFunction(
   destination,
   startHeight,
   endHeight,
-  optionAltitude
+  optionAltitude,
 ) {
   let altitude = optionAltitude;
   const maxHeight = Math.max(startHeight, endHeight);
@@ -91,19 +91,19 @@ function createHeightFunction(
 
     const diff = Cartesian3.subtract(start, end, scratchCart);
     const verticalDistance = Cartesian3.magnitude(
-      Cartesian3.multiplyByScalar(up, Cartesian3.dot(diff, up), scratchCart2)
+      Cartesian3.multiplyByScalar(up, Cartesian3.dot(diff, up), scratchCart2),
     );
     const horizontalDistance = Cartesian3.magnitude(
       Cartesian3.multiplyByScalar(
         right,
         Cartesian3.dot(diff, right),
-        scratchCart2
-      )
+        scratchCart2,
+      ),
     );
 
     altitude = Math.min(
       getAltitude(frustum, verticalDistance, horizontalDistance) * 0.2,
-      1000000000.0
+      1000000000.0,
     );
   }
 
@@ -130,7 +130,7 @@ function adjustAngleForLERP(startAngle, endAngle) {
     CesiumMath.equalsEpsilon(
       startAngle,
       CesiumMath.TWO_PI,
-      CesiumMath.EPSILON11
+      CesiumMath.EPSILON11,
     )
   ) {
     startAngle = 0.0;
@@ -155,7 +155,7 @@ function createUpdateCV(
   pitch,
   roll,
   optionAltitude,
-  optionPitchAdjustHeight
+  optionPitchAdjustHeight,
 ) {
   const camera = scene.camera;
 
@@ -169,14 +169,14 @@ function createUpdateCV(
     destination,
     start.z,
     destination.z,
-    optionAltitude
+    optionAltitude,
   );
 
   const pitchFunction = createPitchFunction(
     startPitch,
     pitch,
     heightFunction,
-    optionPitchAdjustHeight
+    optionPitchAdjustHeight,
   );
 
   function update(value) {
@@ -226,7 +226,7 @@ function createUpdate3D(
   optionAltitude,
   optionFlyOverLongitude,
   optionFlyOverLongitudeWeight,
-  optionPitchAdjustHeight
+  optionPitchAdjustHeight,
 ) {
   const camera = scene.camera;
   const projection = scene.mapProjection;
@@ -234,7 +234,7 @@ function createUpdate3D(
 
   const startCart = Cartographic.clone(
     camera.positionCartographic,
-    scratchStartCart
+    scratchStartCart,
   );
   const startPitch = camera.pitch;
   const startHeading = adjustAngleForLERP(camera.heading, heading);
@@ -242,7 +242,7 @@ function createUpdate3D(
 
   const destCart = ellipsoid.cartesianToCartographic(
     destination,
-    scratchEndCart
+    scratchEndCart,
   );
   startCart.longitude = CesiumMath.zeroToTwoPi(startCart.longitude);
   destCart.longitude = CesiumMath.zeroToTwoPi(destCart.longitude);
@@ -288,13 +288,13 @@ function createUpdate3D(
     destination,
     startCart.height,
     destCart.height,
-    optionAltitude
+    optionAltitude,
   );
   const pitchFunction = createPitchFunction(
     startPitch,
     pitch,
     heightFunction,
-    optionPitchAdjustHeight
+    optionPitchAdjustHeight,
   );
 
   // Isolate scope for update function.
@@ -315,7 +315,7 @@ function createUpdate3D(
         CesiumMath.lerp(startLongitude, destLongitude, time),
         CesiumMath.lerp(startLatitude, destLatitude, time),
         heightFunction(time),
-        ellipsoid
+        ellipsoid,
       );
 
       camera.setView({
@@ -338,7 +338,7 @@ function createUpdate2D(
   heading,
   pitch,
   roll,
-  optionAltitude
+  optionAltitude,
 ) {
   const camera = scene.camera;
 
@@ -351,7 +351,7 @@ function createUpdate2D(
     destination,
     startHeight,
     destination.z,
-    optionAltitude
+    optionAltitude,
   );
 
   function update(value) {
@@ -470,7 +470,7 @@ CameraFlightPath.createTween = function (scene, options) {
     CesiumMath.equalsEpsilon(
       Math.max(frustum.right - frustum.left, frustum.top - frustum.bottom),
       destination.z,
-      CesiumMath.EPSILON6
+      CesiumMath.EPSILON6,
     );
 
   empty =
@@ -479,7 +479,7 @@ CameraFlightPath.createTween = function (scene, options) {
       Cartesian3.equalsEpsilon(
         destination,
         camera.position,
-        CesiumMath.EPSILON10
+        CesiumMath.EPSILON10,
       ));
 
   empty =
@@ -487,17 +487,17 @@ CameraFlightPath.createTween = function (scene, options) {
     CesiumMath.equalsEpsilon(
       CesiumMath.negativePiToPi(heading),
       CesiumMath.negativePiToPi(camera.heading),
-      CesiumMath.EPSILON10
+      CesiumMath.EPSILON10,
     ) &&
     CesiumMath.equalsEpsilon(
       CesiumMath.negativePiToPi(pitch),
       CesiumMath.negativePiToPi(camera.pitch),
-      CesiumMath.EPSILON10
+      CesiumMath.EPSILON10,
     ) &&
     CesiumMath.equalsEpsilon(
       CesiumMath.negativePiToPi(roll),
       CesiumMath.negativePiToPi(camera.roll),
-      CesiumMath.EPSILON10
+      CesiumMath.EPSILON10,
     );
 
   if (empty) {
@@ -521,7 +521,7 @@ CameraFlightPath.createTween = function (scene, options) {
         maximumHeight,
         flyOverLongitude,
         flyOverLongitudeWeight,
-        pitchAdjustHeight
+        pitchAdjustHeight,
       );
       update({ time: 1.0 });
 
@@ -542,7 +542,7 @@ CameraFlightPath.createTween = function (scene, options) {
     maximumHeight,
     flyOverLongitude,
     flyOverLongitudeWeight,
-    pitchAdjustHeight
+    pitchAdjustHeight,
   );
 
   if (!defined(easingFunction)) {