Merge pull request #7806 from AnalyticalGraphicsInc/clipping-planes-fix

mramato · web-flow · commit 3a4d4e892768 · 2019-05-01T14:28:33.000-04:00
Fixed clipping planes crash
diff --git a/Source/Scene/GlobeSurfaceTileProvider.js b/Source/Scene/GlobeSurfaceTileProvider.js
@@ -631,7 +631,7 @@ define([
         }
 
         var clippingPlanes = this._clippingPlanes;
-        if (defined(clippingPlanes) && clippingPlanes.enabled) {
+        if (defined(clippingPlanes) && clippingPlanes.enabled && defined(boundingVolume)) {
             var planeIntersection = clippingPlanes.computeIntersectionWithBoundingVolume(boundingVolume);
             tile.isClipped = (planeIntersection !== Intersect.INSIDE);
             if (planeIntersection === Intersect.OUTSIDE) {
@@ -645,8 +645,6 @@ define([
             if (intersection === Intersect.OUTSIDE) {
                 return Visibility.NONE;
             }
-        } else {
-            console.log('no bounding volume');
         }
 
         var ortho3D = frameState.mode === SceneMode.SCENE3D && frameState.camera.frustum instanceof OrthographicFrustum;

Original file line number	Diff line number	Diff line change
`@@ -631,7 +631,7 @@ define([`
`631`	`631`	`}`
`632`	`632`
`633`	`633`	`var clippingPlanes = this._clippingPlanes;`
`634`		`- if (defined(clippingPlanes) && clippingPlanes.enabled) {`
	`634`	`+ if (defined(clippingPlanes) && clippingPlanes.enabled && defined(boundingVolume)) {`
`635`	`635`	`var planeIntersection = clippingPlanes.computeIntersectionWithBoundingVolume(boundingVolume);`
`636`	`636`	`tile.isClipped = (planeIntersection !== Intersect.INSIDE);`
`637`	`637`	`if (planeIntersection === Intersect.OUTSIDE) {`
`@@ -645,8 +645,6 @@ define([`
`645`	`645`	`if (intersection === Intersect.OUTSIDE) {`
`646`	`646`	`return Visibility.NONE;`
`647`	`647`	`}`
`648`		`- } else {`
`649`		`- console.log('no bounding volume');`
`650`	`648`	`}`
`651`	`649`
`652`	`650`	`var ortho3D = frameState.mode === SceneMode.SCENE3D && frameState.camera.frustum instanceof OrthographicFrustum;`