Skip to content

Commit a51a4c4

Browse files
committed
Merge pull request #2992 from AnalyticalGraphicsInc/tracking-zoom
Fix zooming when tracking an object in 2D.
2 parents 2b6f147 + ea4f6f2 commit a51a4c4

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

Source/Scene/ScreenSpaceCameraController.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,11 @@ define([
465465
var camera = scene.camera;
466466
var mode = scene.mode;
467467

468-
var pickedPosition = mode !== SceneMode.SCENE2D ? pickGlobe(object, startPosition, scratchPickCartesian) : camera.getPickRay(startPosition, scratchZoomPickRay).origin;
468+
var pickedPosition;
469+
if (defined(object._globe)) {
470+
pickedPosition = mode !== SceneMode.SCENE2D ? pickGlobe(object, startPosition, scratchPickCartesian) : camera.getPickRay(startPosition, scratchZoomPickRay).origin;
471+
}
472+
469473
if (!defined(pickedPosition)) {
470474
camera.zoomIn(distance);
471475
return;

0 commit comments

Comments
 (0)