CesiumGS · lilleyse · Sep 24, 2018 · Jul 25, 2018 · Jul 25, 2018 · Aug 1, 2018
diff --git a/Apps/Sandcastle/gallery/Atmosphere.html b/Apps/Sandcastle/gallery/Atmosphere.html
@@ -0,0 +1,174 @@
+<!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="Adjust hue, saturation, and brightness of the sky/atmosphere.">
+    <meta name="cesium-sandcastle-labels" content="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);
+    #toolbar {
+        background: rgba(42, 42, 42, 0.8);
+        padding: 4px;
+        border-radius: 4px;
+    }
+    #toolbar input {
+        vertical-align: middle;
+        padding-top: 2px;
+        padding-bottom: 2px;
+    }
+</style>
+<div id="cesiumContainer" class="fullSize"></div>
+<div id="loadingOverlay"><h1>Loading...</h1></div>
+<div id="toolbar">
+<table><tbody>
+<tr>
+    <td>Lighting Fade Out Distance</td>
+    <td>
+        <input type="range" min="1e6" max="1e8" step="1e6" data-bind="value: lightingFadeOutDistance, valueUpdate: 'input'">
+        <input type="text" size="10" data-bind="value: lightingFadeOutDistance">
+    </td>
+</tr>
+<tr>
+    <td>Lighting Fade In Distance</td>
+    <td>
+        <input type="range" min="1e6" max="1e8" step="1e6" data-bind="value: lightingFadeInDistance, valueUpdate: 'input'">
+        <input type="text" size="10" data-bind="value: lightingFadeInDistance">
+    </td>
+</tr>
+<tr>
+    <td>Night Fade Out Distance</td>
+    <td>
+        <input type="range" min="1e6" max="1e8" step="1e6" data-bind="value: nightFadeOutDistance, valueUpdate: 'input'">
+        <input type="text" size="10" data-bind="value: nightFadeOutDistance">
+    </td>
+</tr>
+<tr>
+    <td>Night Fade In Distance</td>
+    <td>
+        <input type="range" min="1e6" max="1e8" step="1e6" data-bind="value: nightFadeInDistance, valueUpdate: 'input'">
+        <input type="text" size="10" data-bind="value: nightFadeInDistance">
+    </td>
+</tr>
+</tbody></table>
+</div>
+<script id="cesium_sandcastle_script">
+function startup(Cesium) {
+    'use strict';
+//Sandcastle_Begin
+var viewer = new Cesium.Viewer('cesiumContainer', {
+    sceneModePicker:false
+});
+var scene = viewer.scene;
+var globe = scene.globe;
+
+var defaultLightFadeOut = globe.lightingFadeOutDistance;
+var defaultLightFadeIn = globe.lightingFadeInDistance;
+var defaultNightFadeOut = globe.nightFadeOutDistance;
+var defaultNightFadeIn = globe.nightFadeInDistance;
+
+// The viewModel tracks the state of our mini application.
+var viewModel = {
+    lightingFadeOutDistance : defaultLightFadeOut,
+    lightingFadeInDistance : defaultLightFadeIn,
+    nightFadeOutDistance : defaultNightFadeOut,
+    nightFadeInDistance : defaultNightFadeIn
+};
+// Convert the viewModel members into knockout observables.
+Cesium.knockout.track(viewModel);
+
+// Bind the viewModel to the DOM elements of the UI that call for it.
+var toolbar = document.getElementById('toolbar');
+Cesium.knockout.applyBindings(viewModel, toolbar);
+
+// Make the skyAtmosphere's HSB parameters subscribers of the viewModel.
+function subscribeParameter(name) {
+    Cesium.knockout.getObservable(viewModel, name).subscribe(
+        function(newValue) {
+            globe[name] = newValue;
+        }
+    );
+}
+
+subscribeParameter('lightingFadeOutDistance');
+subscribeParameter('lightingFadeInDistance');
+subscribeParameter('nightFadeOutDistance');
+subscribeParameter('nightFadeInDistance');
+
+Sandcastle.addToggleButton('Ground atmosphere', globe.showGroundAtmosphere, function(checked) {
+    globe.showGroundAtmosphere = checked;
+});
+
+Sandcastle.addToggleButton('Lighting', globe.enableLighting, function(checked) {
+    globe.enableLighting = checked;
+});
+
+Sandcastle.addToolbarMenu([{
+    text : 'Cesium World Terrain - no effects',
+    onselect : function() {
+        viewer.terrainProvider = Cesium.createWorldTerrain();
+    }
+}, {
+    text : 'Cesium World Terrain w/ Vertex Normals',
+    onselect : function() {
+        viewer.terrainProvider = Cesium.createWorldTerrain({
+            requestVertexNormals : true
+        });
+    }
+}, {
+    text : 'Cesium World Terrain w/ Water',
+    onselect : function() {
+        viewer.terrainProvider = Cesium.createWorldTerrain({
+            requestWaterMask : true
+        });
+    }
+}, {
+    text : 'Cesium World Terrain w/ Vertex Normals and Water',
+    onselect : function() {
+        viewer.terrainProvider = Cesium.createWorldTerrain({
+            requestVertexNormals : true,
+            requestWaterMask : true
+        });
+    }
+}, {
+    text : 'EllipsoidTerrainProvider',
+    onselect : function() {
+        viewer.terrainProvider = new Cesium.EllipsoidTerrainProvider();
+    }
+}]);
+
+Sandcastle.addToolbarButton('Reset Fade Distances', function() {
+    globe.lightingFadeOutDistance = defaultLightFadeOut;
+    globe.lightingFadeInDistance = defaultLightFadeIn;
+    globe.nightFadeOutDistance = defaultNightFadeOut;
+    globe.nightFadeInDistance = defaultNightFadeIn;
+
+    viewModel.lightingFadeOutDistance = defaultLightFadeOut;
+    viewModel.lightingFadeInDistance = defaultLightFadeIn;
+    viewModel.nightFadeOutDistance = defaultNightFadeOut;
+    viewModel.nightFadeInDistance = defaultNightFadeIn;
+});
+
+//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/Atmosphere.jpg b/Apps/Sandcastle/gallery/Atmosphere.jpg
diff --git a/CHANGES.md b/CHANGES.md
@@ -10,6 +10,8 @@ Change Log
 * Update [gltf-pipeline](https://github.com/AnalyticalGraphicsInc/gltf-pipeline/) to 2.0. [#6805](https://github.com/AnalyticalGraphicsInc/cesium/pull/6805)
 * Added `cartographicLimitRectangle` to `Globe`. Use this to limit terrain and imagery to a specific `Rectangle` area. [#6987](https://github.com/AnalyticalGraphicsInc/cesium/pull/6987)
 * Added `OpenCageGeocoderService`, which provides geocoding via [OpenCage](https://opencagedata.com/). [#7015](https://github.com/AnalyticalGraphicsInc/cesium/pull/7015)
+* Added ground atmosphere lighting in 3D. This can be toggled with `Globe.showGroundAtmosphere`. [6877](https://github.com/AnalyticalGraphicsInc/cesium/pull/6877)
+    * Added `Globe.nightFadeOutDistance` and `Globe.nightFadeInDistance` to configure when ground atmosphere night lighting fades in and out. [6877](https://github.com/AnalyticalGraphicsInc/cesium/pull/6877)
 
 ##### Fixes :wrench:
 * Fixed picking for overlapping translucent primitives. [#7039](https://github.com/AnalyticalGraphicsInc/cesium/pull/7039)

diff --git a/Source/Scene/Globe.js b/Source/Scene/Globe.js
@@ -131,27 +131,53 @@ define([
          * Enable lighting the globe with the sun as a light source.
          *
          * @type {Boolean}
-         * @default false
+         * @default true
          */
         this.enableLighting = false;
 
+        /**
+         * Enable the ground atmosphere.
+         *
+         * @type {Boolean}
+         * @default true
+         */
+        this.showGroundAtmosphere = true;
+
         /**
          * The distance where everything becomes lit. This only takes effect
          * when <code>enableLighting</code> is <code>true</code>.
          *
          * @type {Number}
-         * @default 6500000.0
+         * @default 10000000.0
          */
-        this.lightingFadeOutDistance = 6500000.0;
+        this.lightingFadeOutDistance = 1.0e7;
 
         /**
          * The distance where lighting resumes. This only takes effect
          * when <code>enableLighting</code> is <code>true</code>.
          *
          * @type {Number}
-         * @default 9000000.0
+         * @default 20000000.0
+         */
+        this.lightingFadeInDistance = 2.0e7;
+
+        /**
+         * The distance where the darkness of night from the ground atmosphere fades out to a lit ground atmosphere.
+         * This only takes effect when <code>showGroundAtmosphere</code> and <code>enableLighting</code> are <code>true</code>.
+         *
+         * @type {Number}
+         * @default 10000000.0
+         */
+        this.nightFadeOutDistance = 1.0e7;
+
+        /**
+         * The distance where the darkness of night from the ground atmosphere fades in to an unlit ground atmosphere.
+         * This only takes effect when <code>showGroundAtmosphere</code> and <code>enableLighting</code> are <code>true</code>.
+         *
+         * @type {Number}
+         * @default 50000000.0
          */
-        this.lightingFadeInDistance = 9000000.0;
+        this.nightFadeInDistance = 5.0e7;
 
         /**
          * True if an animated wave effect should be shown in areas of the globe
@@ -187,7 +213,7 @@ define([
         this.shadows = ShadowMode.RECEIVE_ONLY;
 
         this._oceanNormalMap = undefined;
-        this._zoomedOutOceanSpecularIntensity = 0.5;
+        this._zoomedOutOceanSpecularIntensity = undefined;
     }
 
     defineProperties(Globe.prototype, {
@@ -372,7 +398,7 @@ define([
 
         var requireNormals = defined(globe._material) && (globe._material.shaderSource.match(/slope/) || globe._material.shaderSource.match('normalEC'));
 
-        var fragmentSources = [];
+        var fragmentSources = [GroundAtmosphere];
         if (defined(globe._material) && (!requireNormals || globe._terrainProvider.requestVertexNormals)) {
             fragmentSources.push(globe._material.shaderSource);
             defines.push('APPLY_MATERIAL');
@@ -640,11 +666,10 @@ define([
         var mode = frameState.mode;
 
         if (pass.render) {
-            // Don't show the ocean specular highlights when zoomed out in 2D and Columbus View.
-            if (mode === SceneMode.SCENE3D) {
-                this._zoomedOutOceanSpecularIntensity = 0.5;
+            if (this.showGroundAtmosphere) {
+                this._zoomedOutOceanSpecularIntensity = 0.4;
             } else {
-                this._zoomedOutOceanSpecularIntensity = 0.0;
+                this._zoomedOutOceanSpecularIntensity = 0.5;
             }
 
             surface.maximumScreenSpaceError = this.maximumScreenSpaceError;
@@ -653,10 +678,13 @@ define([
             tileProvider.terrainProvider = this.terrainProvider;
             tileProvider.lightingFadeOutDistance = this.lightingFadeOutDistance;
             tileProvider.lightingFadeInDistance = this.lightingFadeInDistance;
-            tileProvider.zoomedOutOceanSpecularIntensity = this._zoomedOutOceanSpecularIntensity;
+            tileProvider.nightFadeOutDistance = this.nightFadeOutDistance;
+            tileProvider.nightFadeInDistance = this.nightFadeInDistance;
+            tileProvider.zoomedOutOceanSpecularIntensity = mode === SceneMode.SCENE3D ? this._zoomedOutOceanSpecularIntensity : 0.0;
             tileProvider.hasWaterMask = hasWaterMask;
             tileProvider.oceanNormalMap = this._oceanNormalMap;
             tileProvider.enableLighting = this.enableLighting;
+            tileProvider.showGroundAtmosphere = this.showGroundAtmosphere;
             tileProvider.shadows = this.shadows;
 
             surface.beginFrame(frameState);

diff --git a/Source/Scene/GlobeSurfaceShaderSet.js b/Source/Scene/GlobeSurfaceShaderSet.js
@@ -66,7 +66,29 @@ define([
         return useWebMercatorProjection ? get2DYPositionFractionMercatorProjection : get2DYPositionFractionGeographicProjection;
     }
 
-    GlobeSurfaceShaderSet.prototype.getShaderProgram = function(frameState, surfaceTile, numberOfDayTextures, applyBrightness, applyContrast, applyHue, applySaturation, applyGamma, applyAlpha, applySplit, showReflectiveOcean, showOceanWaves, enableLighting, hasVertexNormals, useWebMercatorProjection, enableFog, enableClippingPlanes, clippingPlanes, clippedByBoundaries) {
+    GlobeSurfaceShaderSet.prototype.getShaderProgram = function(options) {
+        var frameState = options.frameState;
+        var surfaceTile = options.surfaceTile;
+        var numberOfDayTextures = options.numberOfDayTextures;
+        var applyBrightness = options.applyBrightness;
+        var applyContrast = options.applyContrast;
+        var applyHue = options.applyHue;
+        var applySaturation = options.applySaturation;
+        var applyGamma = options.applyGamma;
+        var applyAlpha = options.applyAlpha;
+        var applySplit = options.applySplit;
+        var showReflectiveOcean = options.showReflectiveOcean;
+        var showOceanWaves = options.showOceanWaves;
+        var enableLighting = options.enableLighting;
+        var showGroundAtmosphere = options.showGroundAtmosphere;
+        var perFragmentGroundAtmosphere = options.perFragmentGroundAtmosphere;
+        var hasVertexNormals = options.hasVertexNormals;
+        var useWebMercatorProjection = options.useWebMercatorProjection;
+        var enableFog = options.enableFog;
+        var enableClippingPlanes = options.enableClippingPlanes;
+        var clippingPlanes = options.clippingPlanes;
+        var clippedByBoundaries = options.clippedByBoundaries;
+
         var quantization = 0;
         var quantizationDefine = '';
 
@@ -102,14 +124,16 @@ define([
                     (showReflectiveOcean << 8) |
                     (showOceanWaves << 9) |
                     (enableLighting << 10) |
-                    (hasVertexNormals << 11) |
-                    (useWebMercatorProjection << 12) |
-                    (enableFog << 13) |
-                    (quantization << 14) |
-                    (applySplit << 15) |
-                    (enableClippingPlanes << 16) |
-                    (vertexLogDepth << 17) |
-                    (cartographicLimitRectangleFlag << 18);
+                    (showGroundAtmosphere << 11) |
+                    (perFragmentGroundAtmosphere << 12) |
+                    (hasVertexNormals << 13) |
+                    (useWebMercatorProjection << 14) |
+                    (enableFog << 15) |
+                    (quantization << 16) |
+                    (applySplit << 17) |
+                    (enableClippingPlanes << 18) |
+                    (vertexLogDepth << 19) |
+                    (cartographicLimitRectangleFlag << 20);
 
         var currentClippingShaderState = 0;
         if (defined(clippingPlanes)) {
@@ -180,6 +204,14 @@ define([
                 }
             }
 
+            if (showGroundAtmosphere) {
+                vs.defines.push('GROUND_ATMOSPHERE');
+                fs.defines.push('GROUND_ATMOSPHERE');
+                if (perFragmentGroundAtmosphere) {
+                    fs.defines.push('PER_FRAGMENT_GROUND_ATMOSPHERE');
+                }
+            }
+
             vs.defines.push('INCLUDE_WEB_MERCATOR_Y');
             fs.defines.push('INCLUDE_WEB_MERCATOR_Y');