Avoid parameter reassignment in Camera.flyToBoundingSphere and Camera.viewBoundingSphere

CHANGES.md

@@ -46,6 +46,7 @@ Change Log
 * Fixed a bug where rapidly updating a `PolylineCollection` could result in an instanceIndex is out of range error. [#8546](https://github.com/AnalyticalGraphicsInc/cesium/pull/8546)
 * Fixed a crash that could occur when an entity was deleted while the corresponding `Primitive` was being created asynchronously. [#8569](https://github.com/AnalyticalGraphicsInc/cesium/pull/8569)
 * Fixed a crash when calling `camera.lookAt` with the origin as the target. This could happen when looking at a tileset with the origin as its center. [#8571](https://github.com/AnalyticalGraphicsInc/cesium/pull/8571)
+* Fixed a bug where `camera.viewBoundingSphere` was modifying the `offset` parameter [#8438](https://github.com/AnalyticalGraphicsInc/cesium/pull/8438)
 
 ### 1.65.0 - 2020-01-06
 

CONTRIBUTORS.md

@@ -244,3 +244,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
 * [Tinco Andringa](https://github.com/tinco)
 * [André Borud](https://github.com/andreborud)
 * [Nathan Schulte](https://github.com/nmschulte)
+* [Jan Wąsak](https://github.com/jhnwsk)

Source/Scene/Camera.js

@@ -2868,9 +2868,7 @@ import SceneMode from './SceneMode.js';
     var MINIMUM_ZOOM = 100.0;
 
     function adjustBoundingSphereOffset(camera, boundingSphere, offset) {
-        if (!defined(offset)) {
-            offset = HeadingPitchRange.clone(Camera.DEFAULT_OFFSET);
-        }
+        offset = HeadingPitchRange.clone(defined(offset) ? offset : Camera.DEFAULT_OFFSET);
 
         var minimumZoom = camera._scene.screenSpaceCameraController.minimumZoomDistance;
         var maximumZoom = camera._scene.screenSpaceCameraController.maximumZoomDistance;

Specs/Scene/CameraSpec.js

@@ -2660,6 +2660,23 @@ describe('Scene/Camera', function() {
         expect(camera.pitch).toEqualEpsilon(pitch, CesiumMath.EPSILON5);
     });
 
+    it('viewBoundingSphere does not modify offset.range when it is zero', function() {
+        scene.mode = SceneMode.SCENE3D;
+
+        var heading = CesiumMath.toRadians(45.0);
+        var pitch = CesiumMath.toRadians(-45.0);
+        var range = 0.0;
+        var offset = new HeadingPitchRange(heading, pitch, range);
+
+        var sphere = new BoundingSphere(Cartesian3.fromDegrees(-117.16, 32.71, 0.0), 10.0);
+        camera.viewBoundingSphere(sphere, offset);
+        camera._setTransform(Matrix4.IDENTITY);
+
+        expect(offset.heading).toEqual(CesiumMath.toRadians(45.0));
+        expect(offset.pitch).toEqual(CesiumMath.toRadians(-45.0));
+        expect(offset.range).toEqual(0.0);
+    });
+
     it('viewBoundingSphere in 2D', function() {
         var frustum = new OrthographicOffCenterFrustum();
         frustum.left = -10.0;
@@ -2775,6 +2792,20 @@ describe('Scene/Camera', function() {
         expect(CesiumMath.equalsEpsilon(distance, maxValue, 0.1)).toBe(true);
     });
 
+    it('flyToBoundingSphere does not modify options.offset range if it is zero ', function() {
+        scene.mode = SceneMode.SCENE3D;
+        var options = {
+            offset: new HeadingPitchRange(0.0, -1.5, 0.0)
+        };
+
+        var sphere = new BoundingSphere(Cartesian3.fromDegrees(-117.16, 32.71, 0.0), 100000.0);
+        camera.flyToBoundingSphere(sphere, options);
+
+        expect(options.offset.heading).toEqual(0.0);
+        expect(options.offset.pitch).toEqual(-1.5);
+        expect(options.offset.range).toEqual(0.0);
+    });
+
     it('distanceToBoundingSphere', function() {
         scene.mode = SceneMode.SCENE3D;