cherry-pick distanceToTile fix from #3365

Author: lilleyse

Source/Scene/TileBoundingBox.js

@@ -148,63 +148,64 @@ define([
     var vectorScratch = new Cartesian3();
 
     TileBoundingBox.prototype.distanceToCamera = function(frameState) {
-        var southwestCornerCartesian = this.southwestCornerCartesian;
-        var northeastCornerCartesian = this.northeastCornerCartesian;
-        var westNormal = this.westNormal;
-        var southNormal = this.southNormal;
-        var eastNormal = this.eastNormal;
-        var northNormal = this.northNormal;
-        var maximumHeight = this.maximumHeight;
-
-        if (frameState.mode !== SceneMode.SCENE3D) {
-            southwestCornerCartesian = frameState.mapProjection.project(Rectangle.southwest(this.rectangle), southwestCornerScratch);
-            southwestCornerCartesian.z = southwestCornerCartesian.y;
-            southwestCornerCartesian.y = southwestCornerCartesian.x;
-            southwestCornerCartesian.x = 0.0;
-            northeastCornerCartesian = frameState.mapProjection.project(Rectangle.northeast(this.rectangle), northeastCornerScratch);
-            northeastCornerCartesian.z = northeastCornerCartesian.y;
-            northeastCornerCartesian.y = northeastCornerCartesian.x;
-            northeastCornerCartesian.x = 0.0;
-            westNormal = negativeUnitY;
-            eastNormal = Cartesian3.UNIT_Y;
-            southNormal = negativeUnitZ;
-            northNormal = Cartesian3.UNIT_Z;
-            maximumHeight = 0.0;
-        }
-
-        var cameraCartesianPosition = frameState.camera.positionWC;
-        var cameraCartographicPosition = frameState.camera.positionCartographic;
+        var camera = frameState.camera;
+        var cameraCartesianPosition = camera.positionWC;
+        var cameraCartographicPosition = camera.positionCartographic;
 
-        var vectorFromSouthwestCorner = Cartesian3.subtract(cameraCartesianPosition, southwestCornerCartesian, vectorScratch);
-        var distanceToWestPlane = Cartesian3.dot(vectorFromSouthwestCorner, westNormal);
-        var distanceToSouthPlane = Cartesian3.dot(vectorFromSouthwestCorner, southNormal);
-
-        var vectorFromNortheastCorner = Cartesian3.subtract(cameraCartesianPosition, northeastCornerCartesian, vectorScratch);
-        var distanceToEastPlane = Cartesian3.dot(vectorFromNortheastCorner, eastNormal);
-        var distanceToNorthPlane = Cartesian3.dot(vectorFromNortheastCorner, northNormal);
+        var result = 0.0;
+        if (!Rectangle.contains(this.rectangle, cameraCartographicPosition)) {
+            var southwestCornerCartesian = this.southwestCornerCartesian;
+            var northeastCornerCartesian = this.northeastCornerCartesian;
+            var westNormal = this.westNormal;
+            var southNormal = this.southNormal;
+            var eastNormal = this.eastNormal;
+            var northNormal = this.northNormal;
+
+            if (frameState.mode !== SceneMode.SCENE3D) {
+                southwestCornerCartesian = frameState.mapProjection.project(Rectangle.southwest(this.rectangle), southwestCornerScratch);
+                southwestCornerCartesian.z = southwestCornerCartesian.y;
+                southwestCornerCartesian.y = southwestCornerCartesian.x;
+                southwestCornerCartesian.x = 0.0;
+                northeastCornerCartesian = frameState.mapProjection.project(Rectangle.northeast(this.rectangle), northeastCornerScratch);
+                northeastCornerCartesian.z = northeastCornerCartesian.y;
+                northeastCornerCartesian.y = northeastCornerCartesian.x;
+                northeastCornerCartesian.x = 0.0;
+                westNormal = negativeUnitY;
+                eastNormal = Cartesian3.UNIT_Y;
+                southNormal = negativeUnitZ;
+                northNormal = Cartesian3.UNIT_Z;
+            }
+
+            var vectorFromSouthwestCorner = Cartesian3.subtract(cameraCartesianPosition, southwestCornerCartesian, vectorScratch);
+            var distanceToWestPlane = Cartesian3.dot(vectorFromSouthwestCorner, westNormal);
+            var distanceToSouthPlane = Cartesian3.dot(vectorFromSouthwestCorner, southNormal);
+
+            var vectorFromNortheastCorner = Cartesian3.subtract(cameraCartesianPosition, northeastCornerCartesian, vectorScratch);
+            var distanceToEastPlane = Cartesian3.dot(vectorFromNortheastCorner, eastNormal);
+            var distanceToNorthPlane = Cartesian3.dot(vectorFromNortheastCorner, northNormal);
+
+            if (distanceToWestPlane > 0.0) {
+                result += distanceToWestPlane * distanceToWestPlane;
+            } else if (distanceToEastPlane > 0.0) {
+                result += distanceToEastPlane * distanceToEastPlane;
+            }
+
+            if (distanceToSouthPlane > 0.0) {
+                result += distanceToSouthPlane * distanceToSouthPlane;
+            } else if (distanceToNorthPlane > 0.0) {
+                result += distanceToNorthPlane * distanceToNorthPlane;
+            }
+        }
 
         var cameraHeight;
         if (frameState.mode === SceneMode.SCENE3D) {
             cameraHeight = cameraCartographicPosition.height;
         } else {
             cameraHeight = cameraCartesianPosition.x;
         }
-        var distanceFromTop = cameraHeight - maximumHeight;
-
-        var result = 0.0;
-
-        if (distanceToWestPlane > 0.0) {
-            result += distanceToWestPlane * distanceToWestPlane;
-        } else if (distanceToEastPlane > 0.0) {
-            result += distanceToEastPlane * distanceToEastPlane;
-        }
-
-        if (distanceToSouthPlane > 0.0) {
-            result += distanceToSouthPlane * distanceToSouthPlane;
-        } else if (distanceToNorthPlane > 0.0) {
-            result += distanceToNorthPlane * distanceToNorthPlane;
-        }
 
+        var maximumHeight = frameState.mode === SceneMode.SCENE3D ? this.maximumHeight : 0.0;
+        var distanceFromTop = cameraHeight - maximumHeight;
         if (distanceFromTop > 0.0) {
             result += distanceFromTop * distanceFromTop;
         }