Merge pull request #4907 from AnalyticalGraphicsInc/better-bounding-s…

…pheres Fix busted ellipsoid bounding spheres
CesiumGS · Jan 23, 2017 · 6b844e1 · 6b844e1
2 parents 0219b31 + 3df7dea
commit 6b844e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/Source/DataSources/dynamicGeometryGetBoundingSphere.js b/Source/DataSources/dynamicGeometryGetBoundingSphere.js
@@ -29,23 +29,20 @@ define([
         //>>includeEnd('debug');
 
         var attributes;
-        var modelMatrix;
 
         //Outline and Fill geometries have the same bounding sphere, so just use whichever one is defined and ready
         if (defined(primitive) && primitive.show && primitive.ready) {
             attributes = primitive.getGeometryInstanceAttributes(entity);
             if (defined(attributes) && defined(attributes.boundingSphere)) {
-                modelMatrix = defaultValue(primitive.modelMatrix, Matrix4.IDENTITY);
-                BoundingSphere.transform(attributes.boundingSphere, modelMatrix, result);
+                BoundingSphere.clone(attributes.boundingSphere, result);
                 return BoundingSphereState.DONE;
             }
         }
 
         if (defined(outlinePrimitive) && outlinePrimitive.show && outlinePrimitive.ready) {
             attributes = outlinePrimitive.getGeometryInstanceAttributes(entity);
             if (defined(attributes) && defined(attributes.boundingSphere)) {
-                modelMatrix = defaultValue(outlinePrimitive.modelMatrix, Matrix4.IDENTITY);
-                BoundingSphere.transform(attributes.boundingSphere, modelMatrix, result);
+                BoundingSphere.clone(attributes.boundingSphere, result);
                 return BoundingSphereState.DONE;
             }
         }

diff --git a/Specs/createDynamicGeometryBoundingSphereSpecs.js b/Specs/createDynamicGeometryBoundingSphereSpecs.js
@@ -35,7 +35,7 @@ define([
                 var primitive = scene.primitives.get(0);
                 expect(state).toBe(BoundingSphereState.DONE);
                 var attributes = primitive.getGeometryInstanceAttributes(entity);
-                expect(result).toEqualEpsilon(BoundingSphere.transform(attributes.boundingSphere, primitive.modelMatrix, new BoundingSphere()), CesiumMath.EPSILON6);
+                expect(result).toEqualEpsilon(attributes.boundingSphere, CesiumMath.EPSILON6);
 
                 updater.destroy();
                 scene.primitives.removeAll();
@@ -62,7 +62,7 @@ define([
                 var primitive = scene.primitives.get(0);
                 expect(state).toBe(BoundingSphereState.DONE);
                 var attributes = primitive.getGeometryInstanceAttributes(entity);
-                expect(result).toEqualEpsilon(BoundingSphere.transform(attributes.boundingSphere, primitive.modelMatrix, new BoundingSphere()), CesiumMath.EPSILON6);
+                expect(result).toEqualEpsilon(attributes.boundingSphere, CesiumMath.EPSILON6);
 
                 updater.destroy();
                 scene.primitives.removeAll();