Merge pull request #4501 from ggetz/cv-tilt

Tilted CV view and adjust transition from 2D to CV

Author: pjcozzi

Source/Scene/SceneTransitioner.js

@@ -126,11 +126,12 @@ define([
 
         if (duration > 0.0) {
             position.x = 0.0;
-            position.y = 0.0;
-            position.z = 5.0 * ellipsoid.maximumRadius;
+            position.y = -1.0;
+            position.z = 1.0;
+            position = Cartesian3.multiplyByScalar(Cartesian3.normalize(position, position), 5.0 * ellipsoid.maximumRadius, position);
 
-            Cartesian3.negate(Cartesian3.UNIT_Z, direction);
-            Cartesian3.clone(Cartesian3.UNIT_Y, up);
+            Cartesian3.negate(Cartesian3.normalize(position, direction), direction);
+            Cartesian3.cross(Cartesian3.UNIT_X, direction, up);
         } else {
             var camera = scene.camera;
             if (this._previousMode === SceneMode.SCENE2D) {
@@ -694,48 +695,42 @@ define([
         var scene = transitioner._scene;
         var camera = scene.camera;
 
-        var startPos = Cartesian3.clone(camera.position, scratch3DToCVStartPos);
-        var startDir = Cartesian3.clone(camera.direction, scratch3DToCVStartDir);
-        var startUp = Cartesian3.clone(camera.up, scratch3DToCVStartUp);
-
         var endPos = Cartesian3.clone(cameraCV.position, scratch3DToCVEndPos);
         var endDir = Cartesian3.clone(cameraCV.direction, scratch3DToCVEndDir);
         var endUp = Cartesian3.clone(cameraCV.up, scratch3DToCVEndUp);
 
-        var startRight = camera.frustum.right;
-        var endRight = endPos.z * 0.5;
-
-        function update(value) {
-            columbusViewMorph(startPos, endPos, value.time, camera.position);
-            columbusViewMorph(startDir, endDir, value.time, camera.direction);
-            columbusViewMorph(startUp, endUp, value.time, camera.up);
-            Cartesian3.cross(camera.direction, camera.up, camera.right);
-            Cartesian3.normalize(camera.right, camera.right);
-
-            var frustum = camera.frustum;
-            frustum.right = CesiumMath.lerp(startRight, endRight, value.time);
-            frustum.left = -frustum.right;
-            frustum.top = frustum.right * (scene.drawingBufferHeight / scene.drawingBufferWidth);
-            frustum.bottom = -frustum.top;
-
-            camera.position.z = 2.0 * scene.mapProjection.ellipsoid.maximumRadius;
-        }
-        var tween = scene.tweens.add({
-            duration : duration,
-            easingFunction : EasingFunction.QUARTIC_OUT,
-            startObject : {
-                time : 0.0
-            },
-            stopObject : {
-                time : 1.0
-            },
-            update : update,
-            complete : function() {
-                scene._mode = SceneMode.MORPHING;
-                morphOrthographicToPerspective(transitioner, duration, cameraCV, complete);
+        scene._mode = SceneMode.MORPHING;
+        morphOrthographicToPerspective(transitioner, 0.0, cameraCV, function() {
+            camera.frustum = cameraCV.frustum.clone();
+
+            var startPos = Cartesian3.clone(camera.position, scratch3DToCVStartPos);
+            var startDir = Cartesian3.clone(camera.direction, scratch3DToCVStartDir);
+            var startUp = Cartesian3.clone(camera.up, scratch3DToCVStartUp);
+            startPos.z = endPos.z;
+
+            function update(value) {
+                columbusViewMorph(startPos, endPos, value.time, camera.position);
+                columbusViewMorph(startDir, endDir, value.time, camera.direction);
+                columbusViewMorph(startUp, endUp, value.time, camera.up);
+                Cartesian3.cross(camera.direction, camera.up, camera.right);
+                Cartesian3.normalize(camera.right, camera.right);
             }
+            var tween = scene.tweens.add({
+                duration : duration,
+                easingFunction : EasingFunction.QUARTIC_OUT,
+                startObject : {
+                    time : 0.0
+                },
+                stopObject : {
+                    time : 1.0
+                },
+                update : update,
+                complete : function() {
+                    complete(transitioner);
+                }
+            });
+            transitioner._currentTweens.push(tween);
         });
-        transitioner._currentTweens.push(tween);
     }
 
     var scratch3DToCVStartPos = new Cartesian3();