cesium 0.15.0 → 0.16.0

data/app/assets/javascripts/Core/Math.js

@@ -397,7 +397,7 @@ define([
     };
 
     /**
-     * Alters the value of input x such that <code>-CesiumMath.PI</code> <= x <= <code>CesiumMath.PI</code>
+     * Produces an angle in the range 0 <= angle <= 2Pi which is equivalent to the provided angle.
      * @param {Number} angle in radians
      * @return {Number} The angle in the range ()<code>-CesiumMath.PI</code>, <code>CesiumMath.PI</code>).
      */
@@ -417,11 +417,23 @@ define([
         return x > pi ? pi : x;
     };
 
+    /**
+     * Produces an angle in the range -Pi <= angle <= Pi which is equivalent to the provided angle.
+     * @param {Number} angle in radians
+     * @return {Number} The angle in the range (0 , <code>CesiumMath.TWO_PI</code>).
+     */
+    CesiumMath.zeroToTwoPi = function(x) {
+        var value = x % CesiumMath.TWO_PI;
+        // We do a second modules here if we add 2Pi to ensure that we don't have any numerical issues with very
+        // small negative values.
+        return (value < 0.0) ? (value + CesiumMath.TWO_PI) % CesiumMath.TWO_PI : value;
+    };
+
     /**
      * DOC_TBA
      */
     CesiumMath.equalsEpsilon = function(left, right, epsilon) {
-        epsilon = epsilon || 0.0;
+        epsilon = defaultValue(epsilon, 0.0);
         return Math.abs(left - right) <= epsilon;
     };
 
@@ -510,7 +522,7 @@ define([
             throw new DeveloperError('A number greater than or equal to 0 is required.');
         }
 
-        var m = n | 0;
+        var m = defaultValue(n, 0);
         return (m !== 0) && ((m & (m - 1)) === 0);
     };
 

data/app/assets/javascripts/Core/Matrix4.js

@@ -715,7 +715,6 @@ define([
         return result;
     };
 
-    var EMPTY_OBJECT = {};
     /**
      * Computes a Matrix4 instance that transforms from normalized device coordinates to window coordinates.
      * @memberof Matrix4
@@ -742,7 +741,7 @@ define([
      * var m = Matrix4.computeViewportTransformation(context.getViewport());
      */
     Matrix4.computeViewportTransformation = function(viewport, nearDepthRange, farDepthRange, result) {
-        viewport = defaultValue(viewport, EMPTY_OBJECT);
+        viewport = defaultValue(viewport, defaultValue.EMPTY_OBJECT);
         var x = defaultValue(viewport.x, 0.0);
         var y = defaultValue(viewport.y, 0.0);
         var width = defaultValue(viewport.width, 0.0);
@@ -797,6 +796,18 @@ define([
      * @return {Array} The modified Array parameter or a new Array instance if one was not provided.
      *
      * @exception {DeveloperError} matrix is required.
+     *
+     * @example
+     * //create an array from an instance of Matrix4
+     * // m = [10.0, 14.0, 18.0, 22.0]
+     * //     [11.0, 15.0, 19.0, 23.0]
+     * //     [12.0, 16.0, 20.0, 24.0]
+     * //     [13.0, 17.0, 21.0, 25.0]
+     * var a = Matrix4.toArray(m);
+     *
+     * // m remains the same
+     * //creates a = [10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0]
+     *
      */
     Matrix4.toArray = function(matrix, result) {
         if (typeof matrix === 'undefined') {
@@ -867,6 +878,23 @@ define([
      * @exception {DeveloperError} index is required and must be 0, 1, 2, or 3.
      *
      * @see Cartesian4
+     *
+     * @example
+     * //returns a Cartesian4 instance with values from the specified column
+     * // m = [10.0, 11.0, 12.0, 13.0]
+     * //     [14.0, 15.0, 16.0, 17.0]
+     * //     [18.0, 19.0, 20.0, 21.0]
+     * //     [22.0, 23.0, 24.0, 25.0]
+     *
+     * //Example 1: Creates an instance of Cartesian
+     * var a = Matrix4.getColumn(m, 2);
+     *
+     * //Example 2: Sets values for Cartesian instance
+     * var a = new Cartesian4();
+     * Matrix4.getColumn(m, 2, a);
+     *
+     * // a.x = 12.0; a.y = 16.0; a.z = 20.0; a.w = 24.0;
+     *
      */
     Matrix4.getColumn = function(matrix, index, result) {
         if (typeof matrix === 'undefined') {
@@ -908,6 +936,22 @@ define([
      * @exception {DeveloperError} index is required and must be 0, 1, 2, or 3.
      *
      * @see Cartesian4
+     *
+     * @example
+     * //creates a new Matrix4 instance with new column values from the Cartesian4 instance
+     * // m = [10.0, 11.0, 12.0, 13.0]
+     * //     [14.0, 15.0, 16.0, 17.0]
+     * //     [18.0, 19.0, 20.0, 21.0]
+     * //     [22.0, 23.0, 24.0, 25.0]
+     *
+     * var a = Matrix4.setColumn(m, 2, new Cartesian4(99.0, 98.0, 97.0, 96.0));
+     *
+     * // m remains the same
+     * // a = [10.0, 11.0, 99.0, 13.0]
+     * //     [14.0, 15.0, 98.0, 17.0]
+     * //     [18.0, 19.0, 97.0, 21.0]
+     * //     [22.0, 23.0, 96.0, 25.0]
+     *
      */
     Matrix4.setColumn = function(matrix, index, cartesian, result) {
         if (typeof matrix === 'undefined') {
@@ -941,6 +985,22 @@ define([
      * @exception {DeveloperError} index is required and must be 0, 1, 2, or 3.
      *
      * @see Cartesian4
+     *
+     * @example
+     * //returns a Cartesian4 instance with values from the specified column
+     * // m = [10.0, 11.0, 12.0, 13.0]
+     * //     [14.0, 15.0, 16.0, 17.0]
+     * //     [18.0, 19.0, 20.0, 21.0]
+     * //     [22.0, 23.0, 24.0, 25.0]
+     *
+     * //Example 1: Returns an instance of Cartesian
+     * var a = Matrix4.getRow(m, 2);
+     *
+     * //Example 1: Sets values for a Cartesian instance
+     * var a = new Cartesian4();
+     * Matrix4.getRow(m, 2, a);
+     *
+     * // a.x = 18.0; a.y = 19.0; a.z = 20.0; a.w = 21.0;
      */
     Matrix4.getRow = function(matrix, index, result) {
         if (typeof matrix === 'undefined') {
@@ -981,6 +1041,22 @@ define([
      * @exception {DeveloperError} index is required and must be 0, 1, 2, or 3.
      *
      * @see Cartesian4
+     *
+     * @example
+     * //create a new Matrix4 instance with new row values from the Cartesian4 instance
+     * // m = [10.0, 11.0, 12.0, 13.0]
+     * //     [14.0, 15.0, 16.0, 17.0]
+     * //     [18.0, 19.0, 20.0, 21.0]
+     * //     [22.0, 23.0, 24.0, 25.0]
+     *
+     * var a = Matrix4.setRow(m, 2, new Cartesian4(99.0, 98.0, 97.0, 96.0));
+     *
+     * // m remains the same
+     * // a = [10.0, 11.0, 12.0, 13.0]
+     * //     [14.0, 15.0, 16.0, 17.0]
+     * //     [99.0, 98.0, 97.0, 96.0]
+     * //     [22.0, 23.0, 24.0, 25.0]
+     *
      */
     Matrix4.setRow = function(matrix, index, cartesian, result) {
         if (typeof matrix === 'undefined') {
@@ -1311,6 +1387,22 @@ define([
      *
      * @exception {DeveloperError} matrix is required.
      * @exception {DeveloperError} scalar is required and must be a number.
+     *
+     * @example
+     * //create a Matrix4 instance which is a scaled version of the supplied Matrix4
+     * // m = [10.0, 11.0, 12.0, 13.0]
+     * //     [14.0, 15.0, 16.0, 17.0]
+     * //     [18.0, 19.0, 20.0, 21.0]
+     * //     [22.0, 23.0, 24.0, 25.0]
+     *
+     * var a = Matrix4.multiplyByScalar(m, -2);
+     *
+     * // m remains the same
+     * // a = [-20.0, -22.0, -24.0, -26.0]
+     * //     [-28.0, -30.0, -32.0, -34.0]
+     * //     [-36.0, -38.0, -40.0, -42.0]
+     * //     [-44.0, -46.0, -48.0, -50.0]
+     *
      */
     Matrix4.multiplyByScalar = function(matrix, scalar, result) {
         if (typeof matrix === 'undefined') {
@@ -1354,6 +1446,22 @@ define([
      * @return {Matrix4} The modified result parameter or a new Matrix4 instance if one was not provided.
      *
      * @exception {DeveloperError} matrix is required.
+     *
+     * @example
+     * //create a new Matrix4 instance which is a negation of a Matrix4
+     * // m = [10.0, 11.0, 12.0, 13.0]
+     * //     [14.0, 15.0, 16.0, 17.0]
+     * //     [18.0, 19.0, 20.0, 21.0]
+     * //     [22.0, 23.0, 24.0, 25.0]
+     *
+     * var a = Matrix4.negate(m);
+     *
+     * // m remains the same
+     * // a = [-10.0, -11.0, -12.0, -13.0]
+     * //     [-14.0, -15.0, -16.0, -17.0]
+     * //     [-18.0, -19.0, -20.0, -21.0]
+     * //     [-22.0, -23.0, -24.0, -25.0]
+     *
      */
     Matrix4.negate = function(matrix, result) {
         if (typeof matrix === 'undefined') {
@@ -1394,6 +1502,22 @@ define([
      * @return {Matrix4} The modified result parameter or a new Matrix4 instance if one was not provided.
      *
      * @exception {DeveloperError} matrix is required.
+     *
+     * @example
+     * //returns transpose of a Matrix4
+     * // m = [10.0, 11.0, 12.0, 13.0]
+     * //     [14.0, 15.0, 16.0, 17.0]
+     * //     [18.0, 19.0, 20.0, 21.0]
+     * //     [22.0, 23.0, 24.0, 25.0]
+     *
+     * var a = Matrix4.negate(m);
+     *
+     * // m remains the same
+     * // a = [10.0, 14.0, 18.0, 22.0]
+     * //     [11.0, 15.0, 19.0, 23.0]
+     * //     [12.0, 16.0, 20.0, 24.0]
+     * //     [13.0, 17.0, 21.0, 25.0]
+     *
      */
     Matrix4.transpose = function(matrix, result) {
         if (typeof matrix === 'undefined') {
@@ -1440,6 +1564,28 @@ define([
      * @param {Matrix4} [left] The first matrix.
      * @param {Matrix4} [right] The second matrix.
      * @return {Boolean} <code>true</code> if left and right are equal, <code>false</code> otherwise.
+     *
+     * @example
+     * //compares two Matrix4 instances
+     *
+     * // a = [10.0, 14.0, 18.0, 22.0]
+     * //     [11.0, 15.0, 19.0, 23.0]
+     * //     [12.0, 16.0, 20.0, 24.0]
+     * //     [13.0, 17.0, 21.0, 25.0]
+     *
+     * // b = [10.0, 14.0, 18.0, 22.0]
+     * //     [11.0, 15.0, 19.0, 23.0]
+     * //     [12.0, 16.0, 20.0, 24.0]
+     * //     [13.0, 17.0, 21.0, 25.0]
+     *
+     * if(Matrix4.equals(a,b)) {
+     *      console.log("Both matrices are equal");
+     * } else {
+     *      console.log("They are not equal");
+     * }
+     *
+     * //Prints "Both matrices are equal" on the console
+     *
      */
     Matrix4.equals = function(left, right) {
         return (left === right) ||
@@ -1475,6 +1621,28 @@ define([
      * @return {Boolean} <code>true</code> if left and right are within the provided epsilon, <code>false</code> otherwise.
      *
      * @exception {DeveloperError} epsilon is required and must be a number.
+     *
+     * @example
+     * //compares two Matrix4 instances
+     *
+     * // a = [10.5, 14.5, 18.5, 22.5]
+     * //     [11.5, 15.5, 19.5, 23.5]
+     * //     [12.5, 16.5, 20.5, 24.5]
+     * //     [13.5, 17.5, 21.5, 25.5]
+     *
+     * // b = [10.0, 14.0, 18.0, 22.0]
+     * //     [11.0, 15.0, 19.0, 23.0]
+     * //     [12.0, 16.0, 20.0, 24.0]
+     * //     [13.0, 17.0, 21.0, 25.0]
+     *
+     * if(Matrix4.equalsEpsilon(a,b,0.1)){
+     *      console.log("Difference between both the matrices is less than 0.1");
+     * } else {
+     *      console.log("Difference between both the matrices is not less than 0.1");
+     * }
+     *
+     * //Prints "Difference between both the matrices is not less than 0.1" on the console
+     *
      */
     Matrix4.equalsEpsilon = function(left, right, epsilon) {
         if (typeof epsilon !== 'number') {
@@ -1538,6 +1706,22 @@ define([
      * @exception {DeveloperError} matrix is required.
      *
      * @see Matrix3
+     *
+     * @example
+     * // returns a Matrix3 instance from a Matrix4 instance
+     *
+     * // m = [10.0, 14.0, 18.0, 22.0]
+     * //     [11.0, 15.0, 19.0, 23.0]
+     * //     [12.0, 16.0, 20.0, 24.0]
+     * //     [13.0, 17.0, 21.0, 25.0]
+     *
+     * var b = new Matrix3();
+     * Matrix4.getRotation(m,b);
+     *
+     * // b = [10.0, 14.0, 18.0]
+     * //     [11.0, 15.0, 19.0]
+     * //     [12.0, 16.0, 20.0]
+     *
      */
     Matrix4.getRotation = function(matrix, result) {
         if (typeof matrix === 'undefined') {

data/app/assets/javascripts/Core/MeshFilters.js

@@ -98,9 +98,9 @@ define([
             return lines;
         }
 
-        if (mesh) {
+        if (typeof mesh !== 'undefined') {
             var indexLists = mesh.indexLists;
-            if (indexLists) {
+            if (typeof indexLists !== 'undefined') {
                 var count = indexLists.length;
                 for ( var i = 0; i < count; ++i) {
                     var indices = indexLists[i];
@@ -132,7 +132,7 @@ define([
     MeshFilters.createAttributeIndices = function(mesh) {
         var indices = {};
 
-        if (mesh) {
+        if (typeof mesh !== 'undefined') {
             var attributes = mesh.attributes;
             var j = 0;
 
@@ -152,7 +152,7 @@ define([
     MeshFilters.mapAttributeIndices = function(indices, map) {
         var mappedIndices = {};
 
-        if (indices && map) {
+        if (typeof indices !== 'undefined' && typeof map !== 'undefined') {
             for ( var name in map) {
                 if (map.hasOwnProperty(name)) {
                     mappedIndices[map[name]] = indices[name];
@@ -199,7 +199,7 @@ define([
      * mesh = MeshFilters.reorderForPreVertexCache(mesh);
      */
     MeshFilters.reorderForPreVertexCache = function(mesh) {
-        if (mesh) {
+        if (typeof mesh !== 'undefined') {
             var numVertices = MeshFilters._computeNumberOfAttributes(mesh);
 
             var indexCrossReferenceOldToNew = [];
@@ -209,7 +209,7 @@ define([
 
             //Construct cross reference and reorder indices
             var indexLists = mesh.indexLists;
-            if (indexLists) {
+            if (typeof indexLists !== 'undefined') {
                 var count = indexLists.length;
                 for ( var j = 0; j < count; ++j) {
                     var indicesIn = indexLists[j].values;
@@ -242,7 +242,7 @@ define([
 
             //Reorder Vertices
             var attributes = mesh.attributes;
-            if (attributes) {
+            if (typeof attributes !== 'undefined') {
                 for ( var property in attributes) {
                     if (attributes.hasOwnProperty(property) && attributes[property].values) {
                         var elementsIn = attributes[property].values;
@@ -292,9 +292,9 @@ define([
      * mesh = MeshFilters.reorderForPostVertexCache(mesh);
      */
     MeshFilters.reorderForPostVertexCache = function(mesh, cacheCapacity) {
-        if (mesh) {
+        if (typeof mesh !== 'undefined') {
             var indexLists = mesh.indexLists;
-            if (indexLists) {
+            if (typeof indexLists !== 'undefined') {
                 var count = indexLists.length;
                 for ( var i = 0; i < count; i++) {
                     var indices = indexLists[i].values;
@@ -371,7 +371,7 @@ define([
 
         var meshes = [];
 
-        if (mesh) {
+        if (typeof mesh !== 'undefined') {
             MeshFilters._verifyTrianglesPrimitiveType(mesh.indexLists);
 
             var numberOfVertices = MeshFilters._computeNumberOfAttributes(mesh);
@@ -380,7 +380,7 @@ define([
             // some indices are outside the range of unsigned short [0, 64K - 1]
             var sixtyFourK = 64 * 1024;
             var indexLists = mesh.indexLists;
-            if (indexLists && (numberOfVertices > sixtyFourK)) {
+            if (typeof indexLists !== 'undefined' && (numberOfVertices > sixtyFourK)) {
                 // PERFORMANCE_IDEA:  If an input mesh has more than one index-list.  This creates
                 // at least one vertex-array per index-list.  A more sophisticated implementation
                 // may create less vertex-arrays.
@@ -457,8 +457,8 @@ define([
      * DOC_TBA
      */
     MeshFilters.projectTo2D = function(mesh, projection) {
-        if (mesh && mesh.attributes && mesh.attributes.position) {
-            projection = projection || new GeographicProjection();
+        if (typeof mesh !== 'undefined' && typeof mesh.attributes !== 'undefined' && typeof mesh.attributes.position !== 'undefined') {
+            projection = typeof projection !== 'undefined' ? projection : new GeographicProjection();
             var ellipsoid = projection.getEllipsoid();
 
             // Project original positions to 2D.

data/app/assets/javascripts/Core/OrientationInterpolator.js

@@ -25,7 +25,7 @@ define([
      * @see HermiteSpline
      */
     var OrientationInterpolator = function(controlPoints) {
-        if (!controlPoints || !(controlPoints instanceof Array) || controlPoints.length < 2) {
+        if (typeof controlPoints === 'undefined' || !(controlPoints instanceof Array) || controlPoints.length < 2) {
             throw new DeveloperError('controlPoints is required. It must be an array with at least a length of 3.');
         }
 
@@ -43,38 +43,38 @@ define([
         return this._points;
     };
 
-    OrientationInterpolator.prototype._findIndex = function(time) {
+    function findIndex(orientationInterpolator, time) {
         // Take advantage of temporal coherence by checking current, next and previous intervals
         // for containment of time.
-        var i = this._lastTimeIndex || 0;
-        if (time >= this._points[i].time) {
-            if (i + 1 < this._points.length && time < this._points[i + 1].time) {
+        var i = orientationInterpolator._lastTimeIndex || 0;
+        if (time >= orientationInterpolator._points[i].time) {
+            if (i + 1 < orientationInterpolator._points.length && time < orientationInterpolator._points[i + 1].time) {
                 return i;
-            } else if (i + 2 < this._points.length && time < this._points[i + 2].time) {
-                this._lastTimeIndex = i + 1;
-                return this._lastTimeIndex;
+            } else if (i + 2 < orientationInterpolator._points.length && time < orientationInterpolator._points[i + 2].time) {
+                orientationInterpolator._lastTimeIndex = i + 1;
+                return orientationInterpolator._lastTimeIndex;
             }
-        } else if (i - 1 >= 0 && time >= this._points[i - 1].time) {
-            this._lastTimeIndex = i - 1;
-            return this._lastTimeIndex;
+        } else if (i - 1 >= 0 && time >= orientationInterpolator._points[i - 1].time) {
+            orientationInterpolator._lastTimeIndex = i - 1;
+            return orientationInterpolator._lastTimeIndex;
         }
 
         // The above failed so do a linear search. For the use cases so far, the
         // length of the list is less than 10. In the future, if there is a bottle neck,
         // it might be here.
-        for (i = 0; i < this._points.length - 1; ++i) {
-            if (time >= this._points[i].time && time < this._points[i + 1].time) {
+        for (i = 0; i < orientationInterpolator._points.length - 1; ++i) {
+            if (time >= orientationInterpolator._points[i].time && time < orientationInterpolator._points[i + 1].time) {
                 break;
             }
         }
 
-        if (i === this._points.length - 1) {
-            i = this._points.length - 2;
+        if (i === orientationInterpolator._points.length - 1) {
+            i = orientationInterpolator._points.length - 2;
         }
 
-        this._lastTimeIndex = i;
-        return this._lastTimeIndex;
-    };
+        orientationInterpolator._lastTimeIndex = i;
+        return orientationInterpolator._lastTimeIndex;
+    }
 
     /**
      * Evaluates the orientation at a given time.
@@ -99,7 +99,7 @@ define([
             throw new DeveloperError('time is out of range.');
         }
 
-        var i = this._findIndex(time);
+        var i = findIndex(this, time);
         var u = (time - this._points[i].time) / (this._points[i + 1].time - this._points[i].time);
 
         return this._points[i].orientation.slerp(this._points[i + 1].orientation, u);