Initial work for computing bounding sphere

Author: lilleyse

Source/Scene/PointCloud.js

@@ -1,5 +1,6 @@
 define([
         '../Core/arraySlice',
+        '../Core/BoundingSphere',
         '../Core/Cartesian3',
         '../Core/Cartesian4',
         '../Core/Check',
@@ -39,6 +40,7 @@ define([
         './ShadowMode'
     ], function(
         arraySlice,
+        BoundingSphere,
         Cartesian3,
         Cartesian4,
         Check,
@@ -171,7 +173,8 @@ define([
 
         this.time = 0.0; // For styling
         this.shadows = ShadowMode.ENABLED;
-        this.boundingVolume = undefined;
+        this.boundingSphere = undefined;
+        this._computeBoundingSphere = defaultValue(options.computeBoundingSphere, true);
 
         this.clippingPlanes = undefined;
         this.isClipped = false;
@@ -602,6 +605,16 @@ define([
             strideInBytes : 0
         });
 
+        if (isQuantized || isQuantizedDraco) {
+            if (pointCloud._computeBoundingSphere) {
+                // Quantized volume offset is applied later to the model matrix
+                var scale = pointCloud._quantizedVolumeScale;
+                var center = Cartesian3.multiplyByScalar(scale, 0.5, new Cartesian3());
+                var radius = Cartesian3.maximumComponent(scale) * 0.5;
+                pointCloud.boundingSphere = new BoundingSphere(center, radius);
+            }
+        }
+
         if (hasColors) {
             if (isRGB565) {
                 attributes.push({
@@ -1148,10 +1161,6 @@ define([
         }
     }
 
-    var scratchComputedTranslation = new Cartesian4();
-    var scratchComputedMatrixIn2D = new Matrix4();
-    var scratchModelMatrix = new Matrix4();
-
     function decodeDraco(pointCloud, context) {
         if (pointCloud._decodingState === DecodingState.READY) {
             return false;
@@ -1207,6 +1216,10 @@ define([
         return true;
     }
 
+    var scratchComputedTranslation = new Cartesian4();
+    var scratchModelMatrix = new Matrix4();
+    var scratchScale = new Cartesian3();
+
     PointCloud.prototype.update = function(frameState) {
         var context = frameState.context;
         var decoding = decodeDraco(this, context);
@@ -1247,16 +1260,24 @@ define([
                 var translation = Matrix4.getColumn(modelMatrix, 3, scratchComputedTranslation);
                 if (!Cartesian4.equals(translation, Cartesian4.UNIT_W)) {
                     Transforms.basisTo2D(projection, modelMatrix, modelMatrix);
-                } else {
-                    var center = this.boundingVolume.center;
-                    var to2D = Transforms.wgs84To2DModelMatrix(projection, center, scratchComputedMatrixIn2D);
-                    Matrix4.multiply(to2D, modelMatrix, modelMatrix);
                 }
             }
 
             Matrix4.clone(modelMatrix, this._drawCommand.modelMatrix);
 
-            this._drawCommand.boundingVolume = this.boundingVolume;
+            if (this._computeBoundingSphere) {
+                var boundingSphere = this._drawCommand.boundingVolume;
+                if (!defined(boundingSphere)) {
+                    boundingSphere = this.boundingSphere.clone();
+                    this._drawCommand.boundingVolume = boundingSphere;
+                }
+                var center = boundingSphere.center;
+                Matrix4.multiplyByPoint(modelMatrix, center, center);
+                var scale = Matrix4.getScale(modelMatrix, scratchScale);
+                boundingSphere.radius *= Cartesian3.maximumComponent(scale);
+            } else {
+                this._drawCommand.boundingVolume = this.boundingSphere;
+            }
         }
 
         if (this.clippingPlanesDirty) {

Source/Scene/PointCloud3DTileContent.js

@@ -62,6 +62,7 @@ define([
         this._pointCloud = new PointCloud({
             arrayBuffer : arrayBuffer,
             byteOffset : byteOffset,
+            computeBoundingSphere : false,
             opaquePass : Pass.CESIUM_3D_TILE,
             vertexShaderLoaded : getVertexShaderLoaded(this),
             fragmentShaderLoaded : getFragmentShaderLoaded(this),
@@ -286,11 +287,11 @@ define([
             batchTable.update(tileset, frameState);
         }
 
-        var boundingVolume;
+        var boundingSphere;
         if (defined(tile._contentBoundingVolume)) {
-            boundingVolume = mode === SceneMode.SCENE3D ? tile._contentBoundingVolume.boundingSphere : tile._contentBoundingVolume2D.boundingSphere;
+            boundingSphere = mode === SceneMode.SCENE3D ? tile._contentBoundingVolume.boundingSphere : tile._contentBoundingVolume2D.boundingSphere;
         } else {
-            boundingVolume = mode === SceneMode.SCENE3D ? tile._boundingVolume.boundingSphere : tile._boundingVolume2D.boundingSphere;
+            boundingSphere = mode === SceneMode.SCENE3D ? tile._boundingVolume.boundingSphere : tile._boundingVolume2D.boundingSphere;
         }
 
         var styleDirty = this._styleDirty;
@@ -301,7 +302,7 @@ define([
         pointCloud.modelMatrix = tile.computedTransform;
         pointCloud.time = tileset.timeSinceLoad;
         pointCloud.shadows = tileset.shadows;
-        pointCloud.boundingVolume = boundingVolume;
+        pointCloud.boundingSphere = boundingSphere;
         pointCloud.clippingPlanes = clippingPlanes;
         pointCloud.isClipped = defined(clippingPlanes) && clippingPlanes.enabled && tile._isClipped;
         pointCloud.clippingPlanesDirty = tile.clippingPlanesDirty;

Source/Scene/TimeDynamicPointCloud.js

@@ -323,6 +323,7 @@ define([
             }).then(function(arrayBuffer) {
                 frame.pointCloud = new PointCloud({
                     arrayBuffer : arrayBuffer,
+                    computeBoundingSphere : true,
                     fragmentShaderLoaded : getFragmentShaderLoaded,
                     uniformMapLoaded : getUniformMapLoaded(that),
                     pickIdLoaded : getPickIdLoaded