Merge pull request #11319 from CesiumGS/tracked-entity-fix

Fix for zoom on tracked entity

Author: jjhembd

CHANGES.md

@@ -6,6 +6,7 @@
 
 ##### Fixes :wrench:
 
+- Fixed tracked entity camera controls. [#11286](https://github.com/CesiumGS/cesium/issues/11286)
 - Fixed color creation from CSS color string with modern "space-separated" syntax. [#11271](https://github.com/CesiumGS/cesium/pull/11271)
 - Fixed a race condition when loading cut-out terrain. [#11296](https://github.com/CesiumGS/cesium/pull/11296)
 - Fixed async behavior for custom terrain and imagery providers. [#11274](https://github.com/CesiumGS/cesium/issues/11274)

packages/engine/Source/Scene/ScreenSpaceCameraController.js

@@ -613,6 +613,7 @@ function handleZoom(
       object._zoomMouseStart
     );
 
+    // When camera transform is set, such as tracking an entity, object._globe will be undefined, and no position should be picked
     if (defined(object._globe) && mode === SceneMode.SCENE2D) {
       pickedPosition = camera.getPickRay(startPosition, scratchZoomPickRay)
         .origin;
@@ -621,7 +622,7 @@ function handleZoom(
         pickedPosition.z,
         pickedPosition.x
       );
-    } else {
+    } else if (defined(object._globe)) {
       pickedPosition = pickPosition(
         object,
         startPosition,

packages/engine/Specs/Scene/ScreenSpaceCameraControllerSpec.js

@@ -929,7 +929,7 @@ describe("Scene/ScreenSpaceCameraController", function () {
     );
   });
 
-  it("rotates in Columus view with camera transform set", function () {
+  it("rotates in Columbus view with camera transform set", function () {
     setUpCV();
 
     const origin = Cartesian3.fromDegrees(-72.0, 40.0);
@@ -983,7 +983,7 @@ describe("Scene/ScreenSpaceCameraController", function () {
     expect(camera.position).not.toEqual(position);
   });
 
-  it("zooms in Columus view with camera transform set", function () {
+  it("zooms in Columbus view with camera transform set", function () {
     setUpCV();
 
     const origin = Cartesian3.fromDegrees(-72.0, 40.0);
@@ -1198,6 +1198,70 @@ describe("Scene/ScreenSpaceCameraController", function () {
     );
   });
 
+  it("zooms in on an object in 3D", function () {
+    setUp3D();
+
+    scene.globe = new MockGlobe(scene.mapProjection.ellipsoid);
+
+    updateController();
+
+    const origin = Cartesian3.fromDegrees(-72.0, 40.0, 1.0);
+    camera.setView({
+      destination: origin,
+    });
+
+    updateController();
+
+    scene.pickPositionSupported = true;
+    scene.pickPositionWorldCoordinates = () =>
+      Cartesian3.fromDegrees(-72.0, 40.0, -10.0);
+
+    const position = Cartesian3.clone(camera.position);
+    const startPosition = new Cartesian2(0, 0);
+    const endPosition = new Cartesian2(0, canvas.clientHeight / 2);
+
+    moveMouse(MouseButtons.RIGHT, startPosition, endPosition);
+
+    updateController();
+
+    expect(Cartesian3.magnitude(position)).toBeGreaterThan(
+      Cartesian3.magnitude(camera.position)
+    );
+  });
+
+  it("zooms in on an object in 3D when transform is set", function () {
+    setUp3D();
+
+    scene.globe = new MockGlobe(scene.mapProjection.ellipsoid);
+
+    updateController();
+
+    const origin = Cartesian3.fromDegrees(-72.0, 40.0, 1.0);
+    camera.lookAtTransform(Transforms.eastNorthUpToFixedFrame(origin), {
+      heading: 0,
+      pitch: 0,
+      range: 10,
+    });
+
+    updateController();
+
+    scene.pickPositionSupported = true;
+    scene.pickPositionWorldCoordinates = () =>
+      Cartesian3.fromDegrees(-72.0, 40.0, -10.0);
+
+    const position = Cartesian3.clone(camera.position);
+    const startPosition = new Cartesian2(0, 0);
+    const endPosition = new Cartesian2(0, canvas.clientHeight / 2);
+
+    moveMouse(MouseButtons.RIGHT, startPosition, endPosition);
+
+    updateController();
+
+    expect(Cartesian3.magnitude(position)).toBeGreaterThan(
+      Cartesian3.magnitude(camera.position)
+    );
+  });
+
   it("zoom in 3D to point 0,0", function () {
     setUp3D();
     scene.globe = new MockGlobe(scene.mapProjection.ellipsoid);