cesium 0.15.0 → 0.16.0

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

@@ -1,5 +1,6 @@
 /*global define*/
 define([
+        './clone',
         './defaultValue',
         './DeveloperError',
         './Math',
@@ -9,6 +10,7 @@ define([
         './ComponentDatatype',
         './PrimitiveType'
     ], function(
+        clone,
         defaultValue,
         DeveloperError,
         CesiumMath,
@@ -51,7 +53,7 @@ define([
      * @param {Array|Float32Array} [description.indices] The array to use to store computed indices.  If undefined, indices will be not computed.
      */
     ExtentTessellator.computeVertices = function(description) {
-        description = defaultValue(description, {});
+        description = defaultValue(description, defaultValue.EMPTY_OBJECT);
 
         var extent = description.extent;
         var surfaceHeight = description.surfaceHeight;
@@ -200,32 +202,35 @@ define([
      * });
      */
     ExtentTessellator.compute = function(description) {
-        description = defaultValue(description, {});
+        description = defaultValue(description, defaultValue.EMPTY_OBJECT);
+
+        // make a copy of description to allow us to change values before passing to computeVertices
+        var computeVerticesDescription = clone(description);
 
         var extent = description.extent;
         extent.validate();
 
         var ellipsoid = defaultValue(description.ellipsoid, Ellipsoid.WGS84);
-        description.radiiSquared = ellipsoid.getRadiiSquared();
-        description.relativeToCenter = defaultValue(description.relativeToCenter, Cartesian3.ZERO);
+        computeVerticesDescription.radiiSquared = ellipsoid.getRadiiSquared();
+        computeVerticesDescription.relativeToCenter = defaultValue(description.relativeToCenter, Cartesian3.ZERO);
 
         var granularity = defaultValue(description.granularity, 0.1);
-        description.surfaceHeight = defaultValue(description.surfaceHeight, 0.0);
+        computeVerticesDescription.surfaceHeight = defaultValue(description.surfaceHeight, 0.0);
 
-        description.width = Math.ceil((extent.east - extent.west) / granularity) + 1;
-        description.height = Math.ceil((extent.north - extent.south) / granularity) + 1;
+        computeVerticesDescription.width = Math.ceil((extent.east - extent.west) / granularity) + 1;
+        computeVerticesDescription.height = Math.ceil((extent.north - extent.south) / granularity) + 1;
 
         var vertices = [];
         var indices = [];
         var textureCoordinates = [];
 
-        description.generateTextureCoordinates = defaultValue(description.generateTextureCoordinates, false);
-        description.interleaveTextureCoordinates = false;
-        description.vertices = vertices;
-        description.textureCoordinates = textureCoordinates;
-        description.indices = indices;
+        computeVerticesDescription.generateTextureCoordinates = defaultValue(computeVerticesDescription.generateTextureCoordinates, false);
+        computeVerticesDescription.interleaveTextureCoordinates = false;
+        computeVerticesDescription.vertices = vertices;
+        computeVerticesDescription.textureCoordinates = textureCoordinates;
+        computeVerticesDescription.indices = indices;
 
-        ExtentTessellator.computeVertices(description);
+        ExtentTessellator.computeVertices(computeVerticesDescription);
 
         var mesh = {
             attributes : {},
@@ -338,32 +343,35 @@ define([
      * var vacontext.createVertexArray(attributes, indexBuffer);
      */
     ExtentTessellator.computeBuffers = function(description) {
-        description = defaultValue(description, {});
+        description = defaultValue(description, defaultValue.EMPTY_OBJECT);
+
+        // make a copy of description to allow us to change values before passing to computeVertices
+        var computeVerticesDescription = clone(description);
 
         var extent = description.extent;
         extent.validate();
 
         var ellipsoid = defaultValue(description.ellipsoid, Ellipsoid.WGS84);
-        description.radiiSquared = ellipsoid.getRadiiSquared();
-        description.relativeToCenter = defaultValue(description.relativeToCenter, Cartesian3.ZERO);
+        computeVerticesDescription.radiiSquared = ellipsoid.getRadiiSquared();
+        computeVerticesDescription.relativeToCenter = defaultValue(description.relativeToCenter, Cartesian3.ZERO);
 
         var granularity = defaultValue(description.granularity, 0.1);
-        description.surfaceHeight = defaultValue(description.surfaceHeight, 0.0);
+        computeVerticesDescription.surfaceHeight = defaultValue(description.surfaceHeight, 0.0);
 
-        description.width = Math.ceil((extent.east - extent.west) / granularity) + 1;
-        description.height = Math.ceil((extent.north - extent.south) / granularity) + 1;
+        computeVerticesDescription.width = Math.ceil((extent.east - extent.west) / granularity) + 1;
+        computeVerticesDescription.height = Math.ceil((extent.north - extent.south) / granularity) + 1;
 
         var vertices = [];
         var indices = [];
         var textureCoordinates = [];
 
-        description.generateTextureCoordinates = defaultValue(description.generateTextureCoordinates, false);
-        description.interleaveTextureCoordinates = defaultValue(description.interleaveTextureCoordinates, false);
-        description.vertices = vertices;
-        description.textureCoordinates = textureCoordinates;
-        description.indices = indices;
+        computeVerticesDescription.generateTextureCoordinates = defaultValue(description.generateTextureCoordinates, false);
+        computeVerticesDescription.interleaveTextureCoordinates = defaultValue(description.interleaveTextureCoordinates, false);
+        computeVerticesDescription.vertices = vertices;
+        computeVerticesDescription.textureCoordinates = textureCoordinates;
+        computeVerticesDescription.indices = indices;
 
-        ExtentTessellator.computeVertices(description);
+        ExtentTessellator.computeVertices(computeVerticesDescription);
 
         var result = {
             indices : indices

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

@@ -74,19 +74,7 @@ define(['./Math'
 
     /**
      * <p>
-     * Interpolates values using the supplied interpolation algorithm.  The appropriate subset of input
-     * values to use for the interpolation is determined automatically from an interpolation given
-     * degree.
-     * </p>
-     * <p>
-     * The xTable array can contain any number of elements, and the appropriate subset will be
-     * selected according to the degree of interpolation requested.  For example, if degree is 5,
-     * the 6 elements surrounding x will be used for interpolation.  When using
-     * {@link LinearApproximation} the degree should be 1 since it always deals with only 2 elements
-     * surrounding x. The yTable array should contain a number of elements equal to:
-     * <code>xTable.length * yStride</code>.  If insufficient elements are provided
-     * to perform the requested degree of interpolation, the highest possible degree of interpolation
-     * will be performed.
+     * Interpolates values using Hermite Polynomial Approximation.
      * </p>
      *
      * @param {Number} x The independent variable for which the dependent variables will be interpolated.
@@ -95,22 +83,33 @@ define(['./Math'
      * in this array must be in increasing order and the same value must not occur twice in the array.
      *
      * @param {Array} yTable The array of dependent variables to use to interpolate.  For a set of three
-     * dependent values (p,q,w) and their derivatives (dp, dq, dw) at time 1 and time 2 this should be
-     * as follows: {p1, q1, w1, dp1, dq1, dw1, p2, q2, w2, dp2, dq2, dw2}.
+     * dependent values (p,q,w) at time 1 and time 2 this should be as follows: {p1, q1, w1, p2, q2, w2}.
      *
      * @param {Number} yStride The number of dependent variable values in yTable corresponding to
      * each independent variable value in xTable.
      *
-     * @returns An array of interpolated values.  The array contains at least yStride elements, each
-     * of which is an interpolated dependent variable value.
+     * @param {Array} [result] An existing array into which to store the result.
+     *
+     * @returns The array of interpolated values, or the result parameter if one was provided.
      *
      * @see LinearApproximation
      * @see LagrangePolynomialApproximation
      *
      * @memberof HermitePolynomialApproximation
      */
-    HermitePolynomialApproximation.interpolateOrderZero = function(x, xTable, yTable, yStride) {
-        var length = xTable.length, i, j, d, s, len, index, result = new Array(yStride), coefficients = new Array(yStride);
+    HermitePolynomialApproximation.interpolateOrderZero = function(x, xTable, yTable, yStride, result) {
+        if (typeof result === 'undefined') {
+            result = new Array(yStride);
+        }
+
+        var i;
+        var j;
+        var d;
+        var s;
+        var len;
+        var index;
+        var length = xTable.length;
+        var coefficients = new Array(yStride);
 
         for (i = 0; i < yStride; i++) {
             result[i] = 0;

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

@@ -1,15 +1,15 @@
 /*global define*/
-define([
+define(['./defaultValue',
         './DeveloperError',
         './Matrix4',
         './Cartesian4',
         './TridiagonalSystemSolver'
-    ],
-    function(
-        DeveloperError,
-        Matrix4,
-        Cartesian4,
-        TridiagonalSystemSolver) {
+        ], function(
+                defaultValue,
+                DeveloperError,
+                Matrix4,
+                Cartesian4,
+                TridiagonalSystemSolver) {
     "use strict";
 
     /**
@@ -64,7 +64,7 @@ define([
      * var spline = new HermiteSpline(controlPoints);
      */
     var HermiteSpline = function(controlPoints) {
-        if (!controlPoints || !(controlPoints instanceof Array) || controlPoints.length < 3) {
+        if (typeof controlPoints === 'undefined' || !(controlPoints instanceof Array) || controlPoints.length < 3) {
             throw new DeveloperError('controlPoints is required. It must be an array with at least a length of 3.');
         }
 
@@ -72,10 +72,10 @@ define([
 
         this._lastTimeIndex = 0;
 
-        if (!this._points[0].tangent || !this._points[this._points.length - 1].tangent) {
-            this._generateNatural();
-        } else if (this._points[0].tangent && !this._points[1].tangent && this._points[this._points.length - 1].tangent && !this._points[this._points.length - 2].tangent) {
-            this._generateClamped();
+        if (typeof this._points[0].tangent === 'undefined' || typeof this._points[this._points.length - 1].tangent === 'undefined') {
+            generateNatural(this);
+        } else if (typeof this._points[0].tangent !== 'undefined' && typeof this._points[1].tangent === 'undefined' && typeof this._points[this._points.length - 1].tangent !== 'undefined' && typeof this._points[this._points.length - 2].tangent === 'undefined') {
+            generateClamped(this);
         }
     };
 
@@ -85,88 +85,88 @@ define([
              1.0, -2.0,  1.0,  0.0,
              1.0, -1.0,  0.0,  0.0);
 
-    HermiteSpline.prototype._findIndex = function(time) {
+    function findIndex(hermiteSpline, 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 = defaultValue(hermiteSpline._lastTimeIndex, 0);
+        if (time >= hermiteSpline._points[i].time) {
+            if (i + 1 < hermiteSpline._points.length && time < hermiteSpline._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 < hermiteSpline._points.length && time < hermiteSpline._points[i + 2].time) {
+                hermiteSpline._lastTimeIndex = i + 1;
+                return hermiteSpline._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 >= hermiteSpline._points[i - 1].time) {
+            hermiteSpline._lastTimeIndex = i - 1;
+            return hermiteSpline._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 < hermiteSpline._points.length - 1; ++i) {
+            if (time >= hermiteSpline._points[i].time && time < hermiteSpline._points[i + 1].time) {
                 break;
             }
         }
 
-        if (i === this._points.length - 1) {
-            i = this._points.length - 2;
+        if (i === hermiteSpline._points.length - 1) {
+            i = hermiteSpline._points.length - 2;
         }
 
-        this._lastTimeIndex = i;
-        return this._lastTimeIndex;
-    };
+        hermiteSpline._lastTimeIndex = i;
+        return hermiteSpline._lastTimeIndex;
+    }
 
-    HermiteSpline.prototype._generateClamped = function() {
+    function generateClamped(hermiteSpline) {
         var l = [], d = [], u = [], r = [];
-        l.length = u.length = this._points.length - 1;
-        d.length = r.length = this._points.length;
+        l.length = u.length = hermiteSpline._points.length - 1;
+        d.length = r.length = hermiteSpline._points.length;
 
         var i;
         l[0] = d[0] = 1.0;
         u[0] = 0.0;
-        r[0] = this._points[0].tangent;
+        r[0] = hermiteSpline._points[0].tangent;
         for (i = 1; i < l.length - 1; ++i) {
             l[i] = u[i] = 1.0;
             d[i] = 4.0;
-            r[i] = this._points[i + 1].point.subtract(this._points[i - 1].point).multiplyByScalar(3.0);
+            r[i] = hermiteSpline._points[i + 1].point.subtract(hermiteSpline._points[i - 1].point).multiplyByScalar(3.0);
         }
         l[i] = 0.0;
         u[i] = 1.0;
         d[i] = 4.0;
-        r[i] = this._points[i + 1].point.subtract(this._points[i - 1].point).multiplyByScalar(3.0);
+        r[i] = hermiteSpline._points[i + 1].point.subtract(hermiteSpline._points[i - 1].point).multiplyByScalar(3.0);
         d[i + 1] = 1.0;
-        r[i + 1] = this._points[i + 1].tangent;
+        r[i + 1] = hermiteSpline._points[i + 1].tangent;
 
         var tangents = TridiagonalSystemSolver.solve(l, d, u, r);
-        for (i = 0; i < this._points.length; ++i) {
-            this._points[i].tangent = tangents[i];
+        for (i = 0; i < hermiteSpline._points.length; ++i) {
+            hermiteSpline._points[i].tangent = tangents[i];
         }
-    };
+    }
 
-    HermiteSpline.prototype._generateNatural = function() {
+    function generateNatural(hermiteSpline){
         var l = [], d = [], u = [], r = [];
-        l.length = u.length = this._points.length - 1;
-        d.length = r.length = this._points.length;
+        l.length = u.length = hermiteSpline._points.length - 1;
+        d.length = r.length = hermiteSpline._points.length;
 
         var i;
         l[0] = u[0] = 1.0;
         d[0] = 2.0;
-        r[0] = this._points[1].point.subtract(this._points[0].point).multiplyByScalar(3.0);
+        r[0] = hermiteSpline._points[1].point.subtract(hermiteSpline._points[0].point).multiplyByScalar(3.0);
         for (i = 1; i < l.length; ++i) {
             l[i] = u[i] = 1.0;
             d[i] = 4.0;
-            r[i] = this._points[i + 1].point.subtract(this._points[i - 1].point).multiplyByScalar(3.0);
+            r[i] = hermiteSpline._points[i + 1].point.subtract(hermiteSpline._points[i - 1].point).multiplyByScalar(3.0);
         }
         d[i] = 2.0;
-        r[i] = this._points[i].point.subtract(this._points[i - 1].point).multiplyByScalar(3.0);
+        r[i] = hermiteSpline._points[i].point.subtract(hermiteSpline._points[i - 1].point).multiplyByScalar(3.0);
 
         var tangents = TridiagonalSystemSolver.solve(l, d, u, r);
-        for (i = 0; i < this._points.length; ++i) {
-            this._points[i].tangent = tangents[i];
+        for (i = 0; i < hermiteSpline._points.length; ++i) {
+            hermiteSpline._points[i].tangent = tangents[i];
         }
-    };
+    }
 
     /**
      * Returns the array of control points.
@@ -215,7 +215,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);
 
         var timeVec = new Cartesian4(0.0, u * u, u);

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

@@ -2,18 +2,17 @@
 define([
         './buildModuleUrl',
         './defaultValue',
-        './loadJson',
         './Iau2006XysSample',
         './JulianDate',
+        './loadJson',
         './TimeStandard',
         '../ThirdParty/when'
-    ],
-    function(
+    ], function(
         buildModuleUrl,
         defaultValue,
-        loadJson,
         Iau2006XysSample,
         JulianDate,
+        loadJson,
         TimeStandard,
         when) {
     "use strict";
@@ -35,7 +34,7 @@ define([
      * @param {Number} [description.totalSamples=27426] The total number of samples in all XYS files.
      */
     var Iau2006XysData = function Iau2006XysData(description) {
-        description = description || {};
+        description = defaultValue(description, defaultValue.EMPTY_OBJECT);
 
         this._xysFileUrlTemplate = defaultValue(description.xysFileUrlTemplate, buildModuleUrl('Assets/IAU2006_XYS/IAU2006_XYS_{0}.json'));
         this._interpolationOrder = defaultValue(description.interpolationOrder, 9);

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

@@ -28,19 +28,7 @@ define(function() {
 
     /**
      * <p>
-     * Interpolates values using the supplied interpolation algorithm.  The appropriate subset of input
-     * values to use for the interpolation is determined automatically from an interpolation given
-     * degree.
-     * </p>
-     * <p>
-     * The xTable array can contain any number of elements, and the appropriate subset will be
-     * selected according to the degree of interpolation requested.  For example, if degree is 5,
-     * the 6 elements surrounding x will be used for interpolation.  When using
-     * {@link LinearApproximation} the degree should be 1 since it always deals with only 2 elements
-     * surrounding x. The yTable array should contain a number of elements equal to:
-     * <code>xTable.length * yStride</code>.  If insufficient elements are provided
-     * to perform the requested degree of interpolation, the highest possible degree of interpolation
-     * will be performed.
+     * Interpolates values using Lagrange Polynomial Approximation.
      * </p>
      *
      * @param {Number} x The independent variable for which the dependent variables will be interpolated.
@@ -49,26 +37,28 @@ define(function() {
      * in this array must be in increasing order and the same value must not occur twice in the array.
      *
      * @param {Array} yTable The array of dependent variables to use to interpolate.  For a set of three
-     * dependent values (p,q,w) and their derivatives (dp, dq, dw) at time 1 and time 2 this should be
-     * as follows: {p1, q1, w1, dp1, dq1, dw1, p2, q2, w2, dp2, dq2, dw2}.
+     * dependent values (p,q,w) at time 1 and time 2 this should be as follows: {p1, q1, w1, p2, q2, w2}.
      *
      * @param {Number} yStride The number of dependent variable values in yTable corresponding to
      * each independent variable value in xTable.
      *
-     * @returns An array of interpolated values.  The array contains at least yStride elements, each
-     * of which is an interpolated dependent variable value.
+     * @param {Array} [result] An existing array into which to store the result.
+     *
+     * @returns The array of interpolated values, or the result parameter if one was provided.
      *
      * @see LinearApproximation
      * @see HermitePolynomialApproximation
      *
      * @memberof LagrangePolynomialApproximation
-     *
      */
-    LagrangePolynomialApproximation.interpolateOrderZero = function(x, xTable, yTable, yStride) {
+    LagrangePolynomialApproximation.interpolateOrderZero = function(x, xTable, yTable, yStride, result) {
+        if (typeof result === 'undefined') {
+            result = new Array(yStride);
+        }
+
         var i;
         var j;
         var length = xTable.length;
-        var result = new Array(yStride);
 
         for (i = 0; i < yStride; i++) {
             result[i] = 0;

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

@@ -37,19 +37,7 @@ define([
 
     /**
      * <p>
-     * Interpolates values using the supplied interpolation algorithm.  The appropriate subset of input
-     * values to use for the interpolation is determined automatically from an interpolation given
-     * degree.
-     * </p>
-     * <p>
-     * The xTable array can contain any number of elements, and the appropriate subset will be
-     * selected according to the degree of interpolation requested.  For example, if degree is 5,
-     * the 6 elements surrounding x will be used for interpolation.  When using
-     * {@link LinearApproximation} the degree should be 1 since it always deals with only 2 elements
-     * surrounding x. The yTable array should contain a number of elements equal to:
-     * <code>xTable.length * yStride</code>.  If insufficient elements are provided
-     * to perform the requested degree of interpolation, the highest possible degree of interpolation
-     * will be performed.
+     * Interpolates values using linear approximation.
      * </p>
      *
      * @param {Number} x The independent variable for which the dependent variables will be interpolated.
@@ -58,36 +46,44 @@ define([
      * in this array must be in increasing order and the same value must not occur twice in the array.
      *
      * @param {Array} yTable The array of dependent variables to use to interpolate.  For a set of three
-     * dependent values (p,q,w) and their derivatives (dp, dq, dw) at time 1 and time 2 this should be
-     * as follows: {p1, q1, w1, dp1, dq1, dw1, p2, q2, w2, dp2, dq2, dw2}.
+     * dependent values (p,q,w) at time 1 and time 2 this should be as follows: {p1, q1, w1, p2, q2, w2}.
      *
      * @param {Number} yStride The number of dependent variable values in yTable corresponding to
      * each independent variable value in xTable.
      *
-     * @returns An array of interpolated values.  The array contains at least yStride elements, each
-     * of which is an interpolated dependent variable value.
+     * @param {Array} [result] An existing array into which to store the result.
+     *
+     * @returns The array of interpolated values, or the result parameter if one was provided.
      *
      * @see LagrangePolynomialApproximation
      * @see HermitePolynomialApproximation
      *
-     *
      * @memberof LinearApproximation
      */
-    LinearApproximation.interpolateOrderZero = function(x, xTable, yTable, yStride) {
+    LinearApproximation.interpolateOrderZero = function(x, xTable, yTable, yStride, result) {
         if (xTable.length !== 2) {
             throw new DeveloperError('The xTable provided to the linear interpolator must have exactly two elements.');
         } else if (yStride <= 0) {
             throw new DeveloperError('There must be at least 1 dependent variable for each independent variable.');
         }
 
-        var result = new Array(yStride), x0 = xTable[0], x1 = xTable[1], i, y0, y1;
+        if (typeof result === 'undefined') {
+            result = new Array(yStride);
+        }
+
+        var i;
+        var y0;
+        var y1;
+        var x0 = xTable[0];
+        var x1 = xTable[1];
 
-        for (i = 0; i < yStride; i++) {
-            //calculates the interpolated values
+        if (x0 === x1) {
+            throw new DeveloperError('Divide by zero error: xTable[0] and xTable[1] are equal');
+        }
 
+        for (i = 0; i < yStride; i++) {
             y0 = yTable[i];
             y1 = yTable[i + yStride];
-
             result[i] = (((y1 - y0) * x) + (x1 * y0) - (x0 * y1)) / (x1 - x0);
         }