Merge pull request CesiumGS#3 from CesiumGS/master

merge master
huiyan-fe · Jun 11, 2020 · 0af455a · 0af455a
2 parents e36d7ef + c6a993f
commit 0af455a
Show file tree

Hide file tree

Showing 440 changed files with 12,716 additions and 5,244 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,7 @@ Thumbs.db
 /Apps/Sandcastle/templates/bucket.css
 
 /Source/Cesium.js
+/Source/Cesium.d.ts
 
 /Specs/SpecList.js
 /Source/Shaders/**/*.js

diff --git a/.prettierignore b/.prettierignore
@@ -13,9 +13,11 @@
 !Tools/**/
 
 !**/*.js
+!**/*.cjs
 !**/*.css
 !**/*.html
 !**/*.md
+!**/*.ts
 
 # Re-ignore a few things caught above
 **/*.min.js

diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,7 @@ script:
   - npm --silent run prettier-check
 
   - npm --silent run build
+  - npm --silent run build-ts
   - npm --silent run coverage -- --browsers FirefoxHeadless --webgl-stub --failTaskOnError --suppressPassed
 
   - travis_wait 20 npm --silent run makeZipFile -- --concurrency 1

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
diff --git a/Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck.dae b/Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck.dae
diff --git a/Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck.jpg b/Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck.jpg
diff --git a/Apps/SampleData/models/ParcLeadMine/ParcLeadMine.glb b/Apps/SampleData/models/ParcLeadMine/ParcLeadMine.glb
diff --git a/Apps/Sandcastle/CesiumSandcastle.js b/Apps/Sandcastle/CesiumSandcastle.js
@@ -550,6 +550,7 @@ require({
     lineNumbers: true,
     matchBrackets: true,
     indentUnit: 2,
+    viewportMargin: 1300,
     extraKeys: {
       "Ctrl-Space": "autocomplete",
       F8: "runCesium",
@@ -566,6 +567,7 @@ require({
     lineNumbers: true,
     matchBrackets: true,
     indentUnit: 2,
+    viewportMargin: 1300,
     extraKeys: {
       F8: "runCesium",
       Tab: "indentMore",

diff --git a/Apps/Sandcastle/gallery/Cartographic Limit Rectangle.html b/Apps/Sandcastle/gallery/Cartographic Limit Rectangle.html
@@ -39,6 +39,9 @@
           terrainProvider: Cesium.createWorldTerrain(),
         });
 
+        var scene = viewer.scene;
+        var globe = scene.globe;
+
         // Tropics of Cancer and Capricorn
         var coffeeBeltRectangle = Cesium.Rectangle.fromDegrees(
           -180.0,
@@ -47,9 +50,11 @@
           23.43687
         );
 
-        viewer.scene.globe.cartographicLimitRectangle = coffeeBeltRectangle;
-        viewer.scene.globe.showSkirts = false;
-        viewer.scene.skyAtmosphere.show = false;
+        globe.cartographicLimitRectangle = coffeeBeltRectangle;
+        globe.showSkirts = false;
+        globe.backFaceCulling = false;
+        globe.undergroundColor = undefined;
+        scene.skyAtmosphere.show = false;
 
         // Add rectangles to show bounds
         var rectangles = [];

diff --git a/Apps/Sandcastle/gallery/Cartographic Limit Rectangle.jpg b/Apps/Sandcastle/gallery/Cartographic Limit Rectangle.jpg
diff --git a/Apps/Sandcastle/gallery/Cesium OSM Buildings.html b/Apps/Sandcastle/gallery/Cesium OSM Buildings.html
@@ -0,0 +1,62 @@
+<!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="Worldwide 3D buildings with rich metadata from OpenStreetMap."
+    />
+    <meta
+      name="cesium-sandcastle-labels"
+      content="Beginner, Showcases, ion Assets"
+    />
+    <title>Cesium Demo</title>
+    <script type="text/javascript" src="../Sandcastle-header.js"></script>
+    <script
+      type="text/javascript"
+      src="../../../Build/CesiumUnminified/Cesium.js"
+      nomodule
+    ></script>
+    <script type="module" src="../load-cesium-es6.js"></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
+        var viewer = new Cesium.Viewer("cesiumContainer", {
+          terrainProvider: Cesium.createWorldTerrain(),
+        });
+
+        viewer.scene.primitives.add(Cesium.createOsmBuildings());
+
+        viewer.scene.camera.flyTo({
+          destination: Cesium.Cartesian3.fromDegrees(-74.019, 40.6912, 750),
+          orientation: {
+            heading: Cesium.Math.toRadians(20),
+            pitch: Cesium.Math.toRadians(-20),
+          },
+        }); //Sandcastle_End
+        Sandcastle.finishedLoading();
+      }
+      if (typeof Cesium !== "undefined") {
+        window.startupCalled = true;
+        startup(Cesium);
+      }
+    </script>
+  </body>
+</html>
diff --git a/Apps/Sandcastle/gallery/Cesium OSM Buildings.jpg b/Apps/Sandcastle/gallery/Cesium OSM Buildings.jpg
diff --git a/Apps/Sandcastle/gallery/Custom Geocoder.html b/Apps/Sandcastle/gallery/Custom Geocoder.html
@@ -56,7 +56,7 @@
          * The function called to geocode using this geocoder service.
          *
          * @param {String} input The query to be sent to the geocoder service
-         * @returns {Promise<GeocoderService~Result[]>}
+         * @returns {Promise<GeocoderService.Result[]>}
          */
         OpenStreetMapNominatimGeocoder.prototype.geocode = function (input) {
           var endpoint = "https://nominatim.openstreetmap.org/search";

diff --git a/Apps/Sandcastle/gallery/Earth at Night.html b/Apps/Sandcastle/gallery/Earth at Night.html
@@ -39,6 +39,40 @@
         var viewer = new Cesium.Viewer("cesiumContainer", {
           imageryProvider: new Cesium.IonImageryProvider({ assetId: 3812 }),
         });
+
+        // The rest of the code is for dynamic lighting
+        var dynamicLighting = false;
+
+        viewer.clock.multiplier = 4000;
+
+        var imageryLayers = viewer.imageryLayers;
+        var nightLayer = imageryLayers.get(0);
+        var dayLayer = imageryLayers.addImageryProvider(
+          new Cesium.IonImageryProvider({
+            assetId: 3845,
+          })
+        );
+        imageryLayers.lowerToBottom(dayLayer);
+
+        function updateLighting(dynamicLighting) {
+          dayLayer.show = dynamicLighting;
+          viewer.scene.globe.enableLighting = dynamicLighting;
+          viewer.clock.shouldAnimate = dynamicLighting;
+
+          // If dynamic lighting is enabled, make the night imagery invisible
+          // on the lit side of the globe.
+          nightLayer.dayAlpha = dynamicLighting ? 0.0 : 1.0;
+        }
+
+        updateLighting(dynamicLighting);
+
+        Sandcastle.addToggleButton(
+          "Dynamic lighting",
+          dynamicLighting,
+          function (checked) {
+            updateLighting(checked);
+          }
+        );
         //Sandcastle_End
         Sandcastle.finishedLoading();
       }

diff --git a/Apps/Sandcastle/gallery/Export KML.html b/Apps/Sandcastle/gallery/Export KML.html
@@ -49,8 +49,8 @@
             version: "1.0",
           },
           {
-            id: "aircraft model",
-            name: "Cesium Air",
+            id: "truck model",
+            name: "Cesium Milk Truck",
             position: {
               cartographicDegrees: [-77, 37, 0],
             },
@@ -85,7 +85,7 @@
         });
 
         var texturePromise = Cesium.Resource.fetchBlob({
-          url: "../../SampleData/models/CesiumMilkTruck/CesiumMilkTruck.png",
+          url: "../../SampleData/models/CesiumMilkTruck/CesiumMilkTruck.jpg",
         });
 
         // This callback allows us to set the URL of the model to use
@@ -96,7 +96,7 @@
 
           if (resource.url.indexOf("CesiumMilkTruck") !== -1) {
             externalFiles["model/CesiumMilkTruck.dae"] = daeModelPromise;
-            externalFiles["model/CesiumMilkTruck.png"] = texturePromise;
+            externalFiles["model/CesiumMilkTruck.jpg"] = texturePromise;
 
             return "model/CesiumMilkTruck.dae";
           }
@@ -132,7 +132,7 @@
                   .add(dataSourcePromise)
                   .then(function (dataSource) {
                     viewer.trackedEntity = dataSource.entities.getById(
-                      "aircraft model"
+                      "truck model"
                     );
                   });
               },
@@ -152,7 +152,8 @@
             })
             .then(function (result) {
               downloadBlob(filenameToSave, result.kmz);
-            });
+            })
+            .otherwise(console.error);
         });
         //Sandcastle_End
         Sandcastle.finishedLoading();

diff --git a/Apps/Sandcastle/gallery/Fog Post Process.html b/Apps/Sandcastle/gallery/Fog Post Process.html
@@ -0,0 +1,116 @@
+<!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="Fog post process" />
+    <meta
+      name="cesium-sandcastle-labels"
+      content="Showcases, Post Processing"
+    />
+    <title>Cesium Demo</title>
+    <script type="text/javascript" src="../Sandcastle-header.js"></script>
+    <script type="text/javascript" src="../CesiumUnminified/Cesium.js"></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
+        var viewer = new Cesium.Viewer("cesiumContainer", {
+          shouldAnimate: true,
+        });
+
+        if (!viewer.scene.context.depthTexture) {
+          window.alert("This browser does not support the fog post process.");
+        }
+
+        var tileset = new Cesium.Cesium3DTileset({
+          url: Cesium.IonResource.fromAssetId(40866),
+        });
+
+        viewer.scene.primitives.add(tileset);
+
+        viewer.scene.camera.setView({
+          destination: new Cesium.Cartesian3(
+            1216356.033078094,
+            -4736402.278325668,
+            4081270.375520902
+          ),
+          orientation: new Cesium.HeadingPitchRoll(
+            0.08033365594766728,
+            -0.29519015695063455,
+            0.00027759141518046704
+          ),
+          endTransform: Cesium.Matrix4.IDENTITY,
+        });
+
+        var fragmentShaderSource =
+          "float getDistance(sampler2D depthTexture, vec2 texCoords) \n" +
+          "{ \n" +
+          "    float depth = czm_unpackDepth(texture2D(depthTexture, texCoords)); \n" +
+          "    if (depth == 0.0) { \n" +
+          "        return czm_infinity; \n" +
+          "    } \n" +
+          "    vec4 eyeCoordinate = czm_windowToEyeCoordinates(gl_FragCoord.xy, depth); \n" +
+          "    return -eyeCoordinate.z / eyeCoordinate.w; \n" +
+          "} \n" +
+          "float interpolateByDistance(vec4 nearFarScalar, float distance) \n" +
+          "{ \n" +
+          "    float startDistance = nearFarScalar.x; \n" +
+          "    float startValue = nearFarScalar.y; \n" +
+          "    float endDistance = nearFarScalar.z; \n" +
+          "    float endValue = nearFarScalar.w; \n" +
+          "    float t = clamp((distance - startDistance) / (endDistance - startDistance), 0.0, 1.0); \n" +
+          "    return mix(startValue, endValue, t); \n" +
+          "} \n" +
+          "vec4 alphaBlend(vec4 sourceColor, vec4 destinationColor) \n" +
+          "{ \n" +
+          "    return sourceColor * vec4(sourceColor.aaa, 1.0) + destinationColor * (1.0 - sourceColor.a); \n" +
+          "} \n" +
+          "uniform sampler2D colorTexture; \n" +
+          "uniform sampler2D depthTexture; \n" +
+          "uniform vec4 fogByDistance; \n" +
+          "uniform vec4 fogColor; \n" +
+          "varying vec2 v_textureCoordinates; \n" +
+          "void main(void) \n" +
+          "{ \n" +
+          "    float distance = getDistance(depthTexture, v_textureCoordinates); \n" +
+          "    vec4 sceneColor = texture2D(colorTexture, v_textureCoordinates); \n" +
+          "    float blendAmount = interpolateByDistance(fogByDistance, distance); \n" +
+          "    vec4 finalFogColor = vec4(fogColor.rgb, fogColor.a * blendAmount); \n" +
+          "    gl_FragColor = alphaBlend(finalFogColor, sceneColor); \n" +
+          "} \n";
+
+        var ellipsoid = viewer.scene.globe.ellipsoid;
+        var postProcessStage = viewer.scene.postProcessStages.add(
+          new Cesium.PostProcessStage({
+            fragmentShader: fragmentShaderSource,
+            uniforms: {
+              fogByDistance: new Cesium.Cartesian4(10, 0.0, 200, 1.0),
+              fogColor: Cesium.Color.BLACK,
+            },
+          })
+        ); //Sandcastle_End
+        Sandcastle.finishedLoading();
+      }
+      if (typeof Cesium !== "undefined") {
+        window.startupCalled = true;
+        startup(Cesium);
+      }
+    </script>
+  </body>
+</html>
diff --git a/Apps/Sandcastle/gallery/Fog Post Process.jpg b/Apps/Sandcastle/gallery/Fog Post Process.jpg