Merge pull request #4848 from shehzan10/check-boundingSphere

Replace DeveloperError with Check in BoundingSphere
CesiumGS · Jan 11, 2017 · 2554d15 · 2554d15
2 parents bdf3e4f + 364a419
commit 2554d15
Showing 1 changed file with 27 additions and 82 deletions.
diff --git a/Source/Core/BoundingSphere.js b/Source/Core/BoundingSphere.js
@@ -2,9 +2,9 @@
 define([
         './Cartesian3',
         './Cartographic',
+        './Check',
         './defaultValue',
         './defined',
-        './DeveloperError',
         './Ellipsoid',
         './GeographicProjection',
         './Intersect',
@@ -15,9 +15,9 @@ define([
     ], function(
         Cartesian3,
         Cartographic,
+        Check,
         defaultValue,
         defined,
-        DeveloperError,
         Ellipsoid,
         GeographicProjection,
         Intersect,
@@ -348,9 +348,7 @@ define([
         stride = defaultValue(stride, 3);
 
         //>>includeStart('debug', pragmas.debug);
-        if (stride < 3) {
-            throw new DeveloperError('stride must be 3 or greater.');
-        }
+        Check.numeric.minimum(stride, 3);
         //>>includeEnd('debug');
 
         var currentPos = fromPointsCurrentPos;
@@ -656,9 +654,8 @@ define([
      */
     BoundingSphere.fromCornerPoints = function(corner, oppositeCorner, result) {
         //>>includeStart('debug', pragmas.debug);
-        if (!defined(corner) || !defined(oppositeCorner)) {
-            throw new DeveloperError('corner and oppositeCorner are required.');
-        }
+        Check.typeOf.object(corner, 'corner');
+        Check.typeOf.object(oppositeCorner, 'oppositeCorner');
         //>>includeEnd('debug');
 
         if (!defined(result)) {
@@ -684,9 +681,7 @@ define([
      */
     BoundingSphere.fromEllipsoid = function(ellipsoid, result) {
         //>>includeStart('debug', pragmas.debug);
-        if (!defined(ellipsoid)) {
-            throw new DeveloperError('ellipsoid is required.');
-        }
+        Check.typeOf.object(ellipsoid, 'ellipsoid');
         //>>includeEnd('debug');
 
         if (!defined(result)) {
@@ -814,13 +809,8 @@ define([
      */
     BoundingSphere.pack = function(value, array, startingIndex) {
         //>>includeStart('debug', pragmas.debug);
-        if (!defined(value)) {
-            throw new DeveloperError('value is required');
-        }
-
-        if (!defined(array)) {
-            throw new DeveloperError('array is required');
-        }
+        Check.typeOf.object(value, 'value');
+        Check.defined(array, 'array');
         //>>includeEnd('debug');
 
         startingIndex = defaultValue(startingIndex, 0);
@@ -844,9 +834,7 @@ define([
      */
     BoundingSphere.unpack = function(array, startingIndex, result) {
         //>>includeStart('debug', pragmas.debug);
-        if (!defined(array)) {
-            throw new DeveloperError('array is required');
-        }
+        Check.defined(array, 'array');
         //>>includeEnd('debug');
 
         startingIndex = defaultValue(startingIndex, 0);
@@ -875,13 +863,8 @@ define([
      */
     BoundingSphere.union = function(left, right, result) {
         //>>includeStart('debug', pragmas.debug);
-        if (!defined(left)) {
-            throw new DeveloperError('left is required.');
-        }
-
-        if (!defined(right)) {
-            throw new DeveloperError('right is required.');
-        }
+        Check.typeOf.object(left, 'left');
+        Check.typeOf.object(right, 'right');
         //>>includeEnd('debug');
 
         if (!defined(result)) {
@@ -932,13 +915,8 @@ define([
      */
     BoundingSphere.expand = function(sphere, point, result) {
         //>>includeStart('debug', pragmas.debug);
-        if (!defined(sphere)) {
-            throw new DeveloperError('sphere is required.');
-        }
-
-        if (!defined(point)) {
-            throw new DeveloperError('point is required.');
-        }
+        Check.typeOf.object(sphere, 'sphere');
+        Check.typeOf.object(point, 'point');
         //>>includeEnd('debug');
 
         result = BoundingSphere.clone(sphere, result);
@@ -963,13 +941,8 @@ define([
      */
     BoundingSphere.intersectPlane = function(sphere, plane) {
         //>>includeStart('debug', pragmas.debug);
-        if (!defined(sphere)) {
-            throw new DeveloperError('sphere is required.');
-        }
-
-        if (!defined(plane)) {
-            throw new DeveloperError('plane is required.');
-        }
+        Check.typeOf.object(sphere, 'sphere');
+        Check.typeOf.object(plane, 'plane');
         //>>includeEnd('debug');
 
         var center = sphere.center;
@@ -997,13 +970,8 @@ define([
      */
     BoundingSphere.transform = function(sphere, transform, result) {
         //>>includeStart('debug', pragmas.debug);
-        if (!defined(sphere)) {
-            throw new DeveloperError('sphere is required.');
-        }
-
-        if (!defined(transform)) {
-            throw new DeveloperError('transform is required.');
-        }
+        Check.typeOf.object(sphere, 'sphere');
+        Check.typeOf.object(transform, 'transform');
         //>>includeEnd('debug');
 
         if (!defined(result)) {
@@ -1033,12 +1001,8 @@ define([
      */
     BoundingSphere.distanceSquaredTo = function(sphere, cartesian) {
         //>>includeStart('debug', pragmas.debug);
-        if (!defined(sphere)) {
-            throw new DeveloperError('sphere is required.');
-        }
-        if (!defined(cartesian)) {
-            throw new DeveloperError('cartesian is required.');
-        }
+        Check.typeOf.object(sphere, 'sphere');
+        Check.typeOf.object(cartesian, 'cartesian');
         //>>includeEnd('debug');
 
         var diff = Cartesian3.subtract(sphere.center, cartesian, distanceSquaredToScratch);
@@ -1062,13 +1026,8 @@ define([
      */
     BoundingSphere.transformWithoutScale = function(sphere, transform, result) {
         //>>includeStart('debug', pragmas.debug);
-        if (!defined(sphere)) {
-            throw new DeveloperError('sphere is required.');
-        }
-
-        if (!defined(transform)) {
-            throw new DeveloperError('transform is required.');
-        }
+        Check.typeOf.object(sphere, 'sphere');
+        Check.typeOf.object(transform, 'transform');
         //>>includeEnd('debug');
 
         if (!defined(result)) {
@@ -1097,17 +1056,9 @@ define([
      */
     BoundingSphere.computePlaneDistances = function(sphere, position, direction, result) {
         //>>includeStart('debug', pragmas.debug);
-        if (!defined(sphere)) {
-            throw new DeveloperError('sphere is required.');
-        }
-
-        if (!defined(position)) {
-            throw new DeveloperError('position is required.');
-        }
-
-        if (!defined(direction)) {
-            throw new DeveloperError('direction is required.');
-        }
+        Check.typeOf.object(sphere, 'sphere');
+        Check.typeOf.object(position, 'position');
+        Check.typeOf.object(direction, 'direction');
         //>>includeEnd('debug');
 
         if (!defined(result)) {
@@ -1144,9 +1095,7 @@ define([
      */
     BoundingSphere.projectTo2D = function(sphere, projection, result) {
         //>>includeStart('debug', pragmas.debug);
-        if (!defined(sphere)) {
-            throw new DeveloperError('sphere is required.');
-        }
+        Check.typeOf.object(sphere, 'sphere');
         //>>includeEnd('debug');
 
         projection = defaultValue(projection, projectTo2DProjection);
@@ -1243,12 +1192,8 @@ define([
      */
     BoundingSphere.isOccluded = function(sphere, occluder) {
         //>>includeStart('debug', pragmas.debug);
-        if (!defined(sphere)) {
-            throw new DeveloperError('sphere is required.');
-        }
-        if (!defined(occluder)) {
-            throw new DeveloperError('occluder is required.');
-        }
+        Check.typeOf.object(sphere, 'sphere');
+        Check.typeOf.object(occluder, 'occluder');
         //>>includeEnd('debug');
         return !occluder.isBoundingSphereVisible(sphere);
     };