Skip to content

Commit 0b73417

Browse files
author
JoshuaStorm
committed
Slightly better transition
1 parent e1a906d commit 0b73417

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

Source/Scene/SceneTransitioner.js

+1-10
Original file line numberDiff line numberDiff line change
@@ -660,23 +660,14 @@ define([
660660
var endDir = Cartesian3.clone(cameraCV.direction, scratch3DToCVEndDir);
661661
var endUp = Cartesian3.clone(cameraCV.up, scratch3DToCVEndUp);
662662

663-
var startRight = camera.frustum.right;
664-
var endRight = endPos.z * 0.5;
663+
morphOrthographicToPerspective(transitioner, 0.0, cameraCV, complete);
665664

666665
function update(value) {
667666
columbusViewMorph(startPos, endPos, value.time, camera.position);
668667
columbusViewMorph(startDir, endDir, value.time, camera.direction);
669668
columbusViewMorph(startUp, endUp, value.time, camera.up);
670669
Cartesian3.cross(camera.direction, camera.up, camera.right);
671670
Cartesian3.normalize(camera.right, camera.right);
672-
673-
var frustum = camera.frustum;
674-
frustum.right = CesiumMath.lerp(startRight, endRight, value.time);
675-
frustum.left = -frustum.right;
676-
frustum.top = frustum.right * (scene.drawingBufferHeight / scene.drawingBufferWidth);
677-
frustum.bottom = -frustum.top;
678-
679-
camera.position.z = 2.0 * scene.mapProjection.ellipsoid.maximumRadius;
680671
}
681672
var tween = scene.tweens.add({
682673
duration : duration,

0 commit comments

Comments
 (0)