Merge branch 'master' into request-scheduler-again

AnalyticalGraphicsInc · 01bcc7d08f2dcc520d675ca4db7e566ecd39f662 · lilleyse committed Jun 13, 2017 · Jun 13, 2017 · 01bcc7d
2 parents 76660c3 + 71a5273
commit 01bcc7d08f2dcc520d675ca4db7e566ecd39f662
diff --git a/.eslintrc b/.eslintrc
@@ -1,40 +0,0 @@
-{
-    "extends": "eslint:recommended",
-    "env": {
-        "browser": true
-    },
-    "globals": {
-        "DataView": false,
-        "ArrayBuffer": false,
-        "Float32Array": false,
-        "Float64Array": false,
-        "Int16Array": false,
-        "Int32Array": false,
-        "Int8Array": false,
-        "Uint16Array": false,
-        "Uint32Array": false,
-        "Uint8Array": false,
-        "Uint8ClampedArray": false
-    },
-    "plugins": [
-        "html"
-    ],
-    "rules": {
-        "curly": ["error"],
-        "eqeqeq": ["error"],
-        "guard-for-in": ["error"],
-        "new-cap": ["error", {"properties": false}],
-        "no-caller": ["error"],
-        "no-console": "off",
-        "no-empty": ["error"],
-        "no-extend-native": ["error"],
-        "no-extra-boolean-cast": "off",
-        "no-irregular-whitespace": ["error"],
-        "no-new": ["error"],
-        "no-undef": ["error"],
-        "no-unused-vars": ["error", {"vars": "all", "args": "none"}],
-        "semi": ["error"],
-        "strict": ["error"],
-        "wrap-iife": ["error", "any"]
-    }
-}
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,6 @@
+{
+    "extends": "./Tools/eslint-config-cesium/browser.js",
+    "rules": {
+        "no-unused-vars": ["error", {"vars": "all", "args": "none"}]
+    }
+}
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="JavaScriptLibraryMappings">
-    <file url="file://$PROJECT_DIR$" libraries="{cesium/node_modules}" />
     <includedPredefinedLibrary name="WebGL" />
+    <excludedPredefinedLibrary name="cesium/Tools/eslint-config-cesium/node_modules" />
   </component>
-</project>
+</project>
diff --git a/Apps/Sandcastle/.eslintrc → Apps/Sandcastle/.eslintrc.json b/Apps/Sandcastle/.eslintrc → Apps/Sandcastle/.eslintrc.json
@@ -1,5 +1,5 @@
 {
-    "extends": "../../.eslintrc",
+    "extends": "../../.eslintrc.json",
     "globals": {
         "JSON": true,
         "require": true,
diff --git a/Apps/Sandcastle/gallery/Callback Property.html b/Apps/Sandcastle/gallery/Callback Property.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
+    <meta name="description" content="Use Viewer to start building new applications or easily embed Cesium into existing applications.">
+    <meta name="cesium-sandcastle-labels" content="Beginner, Showcases">
+    <title>Cesium Demo</title>
+    <script type="text/javascript" src="../Sandcastle-header.js"></script>
+    <script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.20/require.js"></script>
+    <script type="text/javascript">
+    require.config({
+        baseUrl : '../../../Source',
+        waitSeconds : 60
+    });
+    </script>
+</head>
+<body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
+<style>
+    @import url(../templates/bucket.css);
+</style>
+<div id="cesiumContainer" class="fullSize"></div>
+<div id="loadingOverlay"><h1>Loading...</h1></div>
+<div id="toolbar"></div>
+<script id="cesium_sandcastle_script">
+function startup(Cesium) {
+    'use strict';
+//Sandcastle_Begin
+// This example illustrates a Callback Property, a property whose
+// value is lazily evaluated by a callback function.
+// Use a CallbackProperty when your data can't be pre-computed
+// or needs to be derived from other properties at runtime.
+var viewer = new Cesium.Viewer('cesiumContainer');
+
+var startLatitude = 35;
+var startLongitude = -120;
+var endLongitude;
+var startTime = Cesium.JulianDate.now();
+
+// Add a polyline to the scene. Positions are dynamic.
+var isConstant = false;
+var redLine =  viewer.entities.add({
+    polyline : {
+        // This callback updates positions each frame.
+        positions : new Cesium.CallbackProperty(function(time, result) {
+            endLongitude = startLongitude + 0.001 * Cesium.JulianDate.secondsDifference(time, startTime);
+            return Cesium.Cartesian3.fromDegreesArray([startLongitude, startLatitude, endLongitude, startLatitude], Cesium.Ellipsoid.WGS84, result);
+        }, isConstant),
+        width : 5,
+        material : Cesium.Color.RED
+    }
+});
+
+var startCartographic = Cesium.Cartographic.fromDegrees(startLongitude, startLatitude);
+
+// use scratch object to avoid new allocations per frame.
+var endCartographic = new Cesium.Cartographic();
+var scratch = new Cesium.Cartographic();
+var geodesic = new Cesium.EllipsoidGeodesic();
+
+// Calculate the length of the line
+function getLength(time, result) {
+    // Get the end position from the polyLine's callback.
+    var endPoint = redLine.polyline.positions.getValue(time, result)[1];
+    endCartographic = Cesium.Cartographic.fromCartesian(endPoint);
+
+    geodesic.setEndPoints(startCartographic, endCartographic);
+    var lengthInMeters = Math.round(geodesic.surfaceDistance);
+    return (lengthInMeters / 1000).toFixed(1) + " km";
+}
+
+function getMidpoint(time, result) {
+    // Get the end position from the polyLine's callback.
+    var endPoint = redLine.polyline.positions.getValue(time, result)[1];
+    endCartographic = Cesium.Cartographic.fromCartesian(endPoint);
+
+    geodesic.setEndPoints(startCartographic, endCartographic);
+    var midpointCartographic = geodesic.interpolateUsingFraction(0.5, scratch);
+    return Cesium.Cartesian3.fromRadians(midpointCartographic.longitude, midpointCartographic.latitude);
+}
+
+// Label the polyline with calculated length.
+var label = viewer.entities.add({
+    position : new Cesium.CallbackProperty(getMidpoint, isConstant),
+    label : {
+        // This callback updates the length to print each frame.
+        text: new Cesium.CallbackProperty(getLength, isConstant),
+        font : '20px sans-serif',
+        pixelOffset : new Cesium.Cartesian2(0.0, 20)
+    }
+});
+
+// Keep the view centered.
+viewer.trackedEntity = label;
+//Sandcastle_End
+    Sandcastle.finishedLoading();
+}
+if (typeof Cesium !== "undefined") {
+    startup(Cesium);
+} else if (typeof require === "function") {
+    require(["Cesium"], startup);
+}
+</script>
+</body>
+</html>
diff --git a/Apps/Sandcastle/gallery/Callback Property.jpg b/Apps/Sandcastle/gallery/Callback Property.jpg
diff --git a/CHANGES.md b/CHANGES.md
@@ -5,9 +5,14 @@ Change Log
 
 * Deprecated
    * `GoogleEarthImageryProvider` has been deprecated and will be removed in Cesium 1.37, use `GoogleEarthEnterpriseMapsProvider` instead. 
+   * The `throttleRequest` parameter for `TerrainProvider.requestTileGeometry`, `CesiumTerrainProvider.requestTileGeometry`, `VRTheWorldTerrainProvider.requestTileGeometry`, and `EllipsoidTerrainProvider.requestTileGeometry` is deprecated and will be replaced with an optional `Request` object. The `throttleRequests` parameter will be removed in 1.37. Instead to throttle requests set the request's `throttle` property to `true`.
+   * The ability to provide a Promise for the `options.url` parameter of `loadWithXhr` and for the `url` parameter of `loadArrayBuffer`, `loadBlob`, `loadImageViaBlob`, `loadText`, `loadJson`, `loadXML`, `loadImage`, `loadCRN`, `loadKTX`, and `loadCubeMap` is deprecated. This will be removed in 1.37, instead `url` must be a string.
+* Added an `options.request` parameter to `loadWithXhr` and a `request` parameter to `loadArrayBuffer`, `loadBlob`, `loadImageViaBlob`, `loadText`, `loadJson`, `loadJsonp`, `loadXML`, `loadImageFromTypedArray`, `loadImage`, `loadCRN`, and `loadKTX`.
 * Fixed bug where if polylines were set to follow the surface of an undefined globe, Cesium would crash [#5413] https://github.com/AnalyticalGraphicsInc/cesium/pull/5413
 * Fixed a bug where picking clusters would return undefined instead of a list of the clustered entities. [#5286](https://github.com/AnalyticalGraphicsInc/cesium/issues/5286)
 * Reduced the amount of Sun bloom post-process effect near the horizon. [#5381](https://github.com/AnalyticalGraphicsInc/cesium/issues/5381)
+* Updated glTF/glb MIME types. [#5420](https://github.com/AnalyticalGraphicsInc/cesium/issues/5420)
+* Fixed a bug where camera zooming worked incorrectly when the display height was greater than the display width [#5421] (https://github.com/AnalyticalGraphicsInc/cesium/pull/5421)
 * Added Sandcastle demo for ArcticDEM data. [#5224](https://github.com/AnalyticalGraphicsInc/cesium/issues/5224)
 * `CzmlDataSource` and `KmlDataSource` load functions now take an optional `query` object, which will append query parameters to all network requests. [#5419](https://github.com/AnalyticalGraphicsInc/cesium/pull/5419), [#5434](https://github.com/AnalyticalGraphicsInc/cesium/pull/5434)
 * Fixed geocoder bug so geocoder can accurately handle NSEW inputs [#5407] (https://github.com/AnalyticalGraphicsInc/cesium/pull/5407)
diff --git a/Source/Core/CesiumTerrainProvider.js b/Source/Core/CesiumTerrainProvider.js
@@ -8,6 +8,7 @@ define([
         './defaultValue',
         './defined',
         './defineProperties',
+        './deprecationWarning',
         './DeveloperError',
         './Event',
         './GeographicTilingScheme',
@@ -19,8 +20,9 @@ define([
         './Math',
         './OrientedBoundingBox',
         './QuantizedMeshTerrainData',
+        './Request',
+        './RequestType',
         './TerrainProvider',
-        './throttleRequestByServer',
         './TileAvailability',
         './TileProviderError'
     ], function(
@@ -32,6 +34,7 @@ define([
         defaultValue,
         defined,
         defineProperties,
+        deprecationWarning,
         DeveloperError,
         Event,
         GeographicTilingScheme,
@@ -43,14 +46,15 @@ define([
         CesiumMath,
         OrientedBoundingBox,
         QuantizedMeshTerrainData,
+        Request,
+        RequestType,
         TerrainProvider,
-        throttleRequestByServer,
         TileAvailability,
         TileProviderError) {
     'use strict';
 
     /**
-     * A {@link TerrainProvider} that access terrain data in a Cesium terrain format.
+     * A {@link TerrainProvider} that accesses terrain data in a Cesium terrain format.
      * The format is described on the
      * {@link https://github.com/AnalyticalGraphicsInc/cesium/wiki/Cesium-Terrain-Server|Cesium wiki}.
      *
@@ -489,17 +493,16 @@ define([
      * @param {Number} x The X coordinate of the tile for which to request geometry.
      * @param {Number} y The Y coordinate of the tile for which to request geometry.
      * @param {Number} level The level of the tile for which to request geometry.
-     * @param {Boolean} [throttleRequests=true] True if the number of simultaneous requests should be limited,
-     *                  or false if the request should be initiated regardless of the number of requests
-     *                  already in progress.
+     * @param {Request} [request] The request object. Intended for internal use only.
+     *
      * @returns {Promise.<TerrainData>|undefined} A promise for the requested geometry.  If this method
      *          returns undefined instead of a promise, it is an indication that too many requests are already
      *          pending and the request will be retried later.
      *
      * @exception {DeveloperError} This function must not be called before {@link CesiumTerrainProvider#ready}
      *            returns true.
      */
-    CesiumTerrainProvider.prototype.requestTileGeometry = function(x, y, level, throttleRequests) {
+    CesiumTerrainProvider.prototype.requestTileGeometry = function(x, y, level, request) {
         //>>includeStart('debug', pragmas.debug)
         if (!this._ready) {
             throw new DeveloperError('requestTileGeometry must not be called before the terrain provider is ready.');
@@ -522,8 +525,6 @@ define([
             url = proxy.getURL(url);
         }
 
-        var promise;
-
         var extensionList = [];
         if (this._requestVertexNormals && this._hasVertexNormals) {
             extensionList.push(this._littleEndianExtensionSize ? 'octvertexnormals' : 'vertexnormals');
@@ -532,17 +533,19 @@ define([
             extensionList.push('watermask');
         }
 
-        function tileLoader(tileUrl) {
-            return loadArrayBuffer(tileUrl, getRequestHeader(extensionList));
+        if (typeof request === 'boolean') {
+            deprecationWarning('throttleRequests', 'The throttleRequest parameter for requestTileGeometry was deprecated in Cesium 1.35.  It will be removed in 1.37.');
+            request = new Request({
+                throttle : request,
+                throttleByServer : request,
+                type : RequestType.TERRAIN
+            });
         }
-        throttleRequests = defaultValue(throttleRequests, true);
-        if (throttleRequests) {
-            promise = throttleRequestByServer(url, tileLoader);
-            if (!defined(promise)) {
-                return undefined;
-            }
-        } else {
-            promise = tileLoader(url);
+
+        var promise = loadArrayBuffer(url, getRequestHeader(extensionList), request);
+
+        if (!defined(promise)) {
+            return undefined;
         }
 
         var that = this;