RubyGems - cesium - Versions diffs - 0.22.0 → 0.23.0 - Mend

cesium 0.22.0 → 0.23.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (83) hide show

data/app/assets/javascripts/Core/loadArrayBuffer.js CHANGED

@@ -28,7 +28,11 @@ define(['Core/loadWithXhr'], function(
      * });
      */
     var loadArrayBuffer = function(url, headers) {
-        return loadWithXhr(url, 'arraybuffer', headers);
+        return loadWithXhr({
+            url : url,
+            responseType : 'arraybuffer',
+            headers : headers
+        });
     };
     return loadArrayBuffer;

data/app/assets/javascripts/Core/loadBlob.js CHANGED

@@ -28,7 +28,11 @@ define(['Core/loadWithXhr'], function(
      * });
      */
     var loadBlob = function(url, headers) {
-        return loadWithXhr(url, 'blob', headers);
+        return loadWithXhr({
+            url : url,
+            responseType : 'blob',
+            headers : headers
+        });
     };
     return loadBlob;

data/app/assets/javascripts/Core/loadText.js CHANGED

@@ -32,7 +32,10 @@ define(['Core/loadWithXhr'], function(
      * @see <a href='http://wiki.commonjs.org/wiki/Promises/A'>CommonJS Promises/A</a>
      */
     var loadText = function(url, headers) {
-        return loadWithXhr(url, undefined, headers);
+        return loadWithXhr({
+            url : url,
+            headers : headers
+        });
     };
     return loadText;

data/app/assets/javascripts/Core/loadWithXhr.js CHANGED

@@ -1,6 +1,7 @@
 /*global define*/
-define(['Core/defined', 'Core/DeveloperError', 'Core/RequestErrorEvent', 'ThirdParty/when'], function(
+define(['Core/defined', 'Core/defaultValue', 'Core/DeveloperError', 'Core/RequestErrorEvent', 'ThirdParty/when'], function(
         defined,
+        defaultValue,
         DeveloperError,
         RequestErrorEvent,
         when) {
@@ -14,45 +15,60 @@ define(['Core/defined', 'Core/DeveloperError', 'Core/RequestErrorEvent', 'ThirdP
      *
      * @exports loadWithXhr
      *
-     * @param {String|Promise} url The URL of the data, or a promise for the URL.
-     * @param {String} responseType The type of response.  This controls the type of item returned.
-     * @param {Object} [headers] HTTP headers to send with the requests.
+     * @param {Object} options Options for the request.
+     * @param {String|Promise} options.url The URL of the data, or a promise for the URL.
+     * @param {String} [options.responseType] The type of response.  This controls the type of item returned.
+     * @param {String} [options.method='GET'] The HTTP method to use.
+     * @param {String} [options.data] The data to send with the request, if any.
+     * @param {Object} [options.headers] HTTP headers to send with the request, if any.
      *
      * @returns {Promise} a promise that will resolve to the requested data when loaded.
      *
+     * @exception {DeveloperError} options.url is required.
+     *
      * @see <a href='http://www.w3.org/TR/cors/'>Cross-Origin Resource Sharing</a>
      * @see <a href='http://wiki.commonjs.org/wiki/Promises/A'>CommonJS Promises/A</a>
      *
      * @see loadArrayBuffer
      * @see loadBlob
+     * @see loadJson
      * @see loadText
      *
      * @example
-     * // load a single URL asynchronously
-     * loadWithXhr('some/url', 'blob').then(function(blob) {
+     * // Load a single URL asynchronously. In real code, you should use loadBlob instead.
+     * loadWithXhr({
+     *     url : 'some/url',
+     *     responseType : 'blob'
+     * }).then(function(blob) {
      *     // use the data
      * }, function() {
      *     // an error occurred
      * });
      */
-    var loadWithXhr = function(url, responseType, headers) {
-        if (!defined(url)) {
-            throw new DeveloperError('url is required.');
+    var loadWithXhr = function(options) {
+        options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+        if (!defined(options.url)) {
+            throw new DeveloperError('options.url is required.');
         }
-        return when(url, function(url) {
+        var responseType = options.responseType;
+        var method = defaultValue(options.method, 'GET');
+        var data = options.data;
+        var headers = options.headers;
+        return when(options.url, function(url) {
             var deferred = when.defer();
-            loadWithXhr.load(url, responseType, headers, deferred);
+            loadWithXhr.load(url, responseType, method, data, headers, deferred);
             return deferred.promise;
         });
     };
     // This is broken out into a separate function so that it can be mocked for testing purposes.
-    loadWithXhr.load = function(url, responseType, headers, deferred) {
+    loadWithXhr.load = function(url, responseType, method, data, headers, deferred) {
         var xhr = new XMLHttpRequest();
-        xhr.open('GET', url, true);
+        xhr.open(method, url, true);
         if (defined(headers)) {
             for ( var key in headers) {
@@ -78,7 +94,7 @@ define(['Core/defined', 'Core/DeveloperError', 'Core/RequestErrorEvent', 'ThirdP
             deferred.reject(new RequestErrorEvent());
         };
-        xhr.send();
+        xhr.send(data);
     };
     loadWithXhr.defaultLoad = loadWithXhr.load;

data/app/assets/javascripts/DynamicScene/PolylineOutlineMaterialProperty.js CHANGED

@@ -27,9 +27,9 @@ define(['Core/Color', 'Core/defined', 'DynamicScene/ConstantProperty', 'DynamicS
         /**
          * A Number {@link Property} which determines the polyline's outline width.
          * @type {Property}
-         * @default new ConstantProperty(1)
+         * @default new ConstantProperty(0)
          */
-        this.outlineWidth = new ConstantProperty(1);
+        this.outlineWidth = new ConstantProperty(0);
     };
     /**

data/app/assets/javascripts/Renderer/AutomaticUniforms.js CHANGED

@@ -32,7 +32,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_VECTOR4;
+                return UniformDatatype.FLOAT_VEC4;
             },
             getValue : function(uniformState) {
@@ -79,7 +79,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             },
             getValue : function(uniformState) {
@@ -127,7 +127,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             },
             getValue : function(uniformState) {
@@ -160,7 +160,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             },
             getValue : function(uniformState) {
@@ -192,7 +192,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             },
             getValue : function(uniformState) {
@@ -227,7 +227,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             },
             getValue : function(uniformState) {
@@ -261,7 +261,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             },
             getValue : function(uniformState) {
@@ -294,7 +294,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX3;
+                return UniformDatatype.FLOAT_MAT3;
             },
             getValue : function(uniformState) {
@@ -328,7 +328,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX3;
+                return UniformDatatype.FLOAT_MAT3;
             },
             getValue : function(uniformState) {
@@ -360,7 +360,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             },
             getValue : function(uniformState) {
@@ -394,7 +394,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             },
             getValue : function(uniformState) {
@@ -427,7 +427,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX3;
+                return UniformDatatype.FLOAT_MAT3;
             },
             getValue : function(uniformState) {
@@ -461,7 +461,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX3;
+                return UniformDatatype.FLOAT_MAT3;
             },
             getValue : function(uniformState) {
@@ -495,7 +495,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             },
             getValue : function(uniformState) {
@@ -527,7 +527,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             },
             getValue : function(uniformState) {
@@ -562,7 +562,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             },
             getValue : function(uniformState) {
@@ -602,7 +602,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             },
             getValue : function(uniformState) {
@@ -642,7 +642,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             },
             getValue : function(uniformState) {
@@ -682,7 +682,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             },
             getValue : function(uniformState) {
@@ -713,7 +713,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             },
             getValue : function(uniformState) {
@@ -748,7 +748,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             },
             getValue : function(uniformState) {
@@ -785,7 +785,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             },
             getValue : function(uniformState) {
@@ -825,7 +825,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             },
             getValue : function(uniformState) {
@@ -866,7 +866,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             },
             getValue : function(uniformState) {
@@ -906,7 +906,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX4;
+                return UniformDatatype.FLOAT_MAT4;
             },
             getValue : function(uniformState) {
@@ -941,7 +941,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX3;
+                return UniformDatatype.FLOAT_MAT3;
             },
             getValue : function(uniformState) {
@@ -979,7 +979,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX3;
+                return UniformDatatype.FLOAT_MAT3;
             },
             getValue : function(uniformState) {
@@ -1013,7 +1013,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX3;
+                return UniformDatatype.FLOAT_MAT3;
             },
             getValue : function(uniformState) {
@@ -1049,7 +1049,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX3;
+                return UniformDatatype.FLOAT_MAT3;
             },
             getValue : function(uniformState) {
@@ -1072,7 +1072,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_VECTOR2;
+                return UniformDatatype.FLOAT_VEC2;
             },
             getValue : function(uniformState) {
@@ -1104,7 +1104,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_VECTOR2;
+                return UniformDatatype.FLOAT_VEC2;
             },
             getValue : function(uniformState) {
@@ -1136,7 +1136,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_VECTOR2;
+                return UniformDatatype.FLOAT_VEC2;
             },
             getValue : function(uniformState) {
@@ -1192,7 +1192,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_VECTOR3;
+                return UniformDatatype.FLOAT_VEC3;
             },
             getValue : function(uniformState) {
@@ -1219,7 +1219,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_VECTOR3;
+                return UniformDatatype.FLOAT_VEC3;
             },
             getValue : function(uniformState) {
@@ -1251,7 +1251,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_VECTOR3;
+                return UniformDatatype.FLOAT_VEC3;
             },
             getValue : function(uniformState) {
@@ -1280,7 +1280,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_VECTOR3;
+                return UniformDatatype.FLOAT_VEC3;
             },
             getValue : function(uniformState) {
@@ -1311,7 +1311,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_VECTOR3;
+                return UniformDatatype.FLOAT_VEC3;
             },
             getValue : function(uniformState) {
@@ -1341,7 +1341,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_VECTOR3;
+                return UniformDatatype.FLOAT_VEC3;
             },
             getValue : function(uniformState) {
@@ -1371,7 +1371,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_VECTOR3;
+                return UniformDatatype.FLOAT_VEC3;
             },
             getValue : function(uniformState) {
@@ -1395,7 +1395,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_VECTOR3;
+                return UniformDatatype.FLOAT_VEC3;
             },
             getValue : function(uniformState) {
@@ -1515,7 +1515,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             },
             getDatatype : function() {
-                return UniformDatatype.FLOAT_MATRIX3;
+                return UniformDatatype.FLOAT_MAT3;
             },
             getValue : function(uniformState) {