Merge branch 'master' into fix-flickering

Author: lilleyse

.concierge/templates/pullRequestOpened.hbs

@@ -0,0 +1,24 @@
+{{#if claEnabled}}
+{{#if askForCla}}
+[![Please sign the CLA before we review this PR.](https://img.shields.io/badge/CLA-required-red.svg)](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla)
+
+Welcome to the Cesium community @{{ userName }}!
+
+Can you please send in a [Contributor License Agreement](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla) (CLA) so that we can review and merge this pull request?
+{{else}}
+![Signed CLA is on file.](https://img.shields.io/badge/CLA-signed-brightgreen.svg)
+
+@{{ userName }}, thanks for the pull request! Maintainers, we have a signed CLA from @{{ userName }}, so you can review this at any time.
+{{/if}}
+{{else}}
+@{{ userName }}, thanks for the pull request!
+{{/if}}
+
+{{#if askAboutChanges}}
+:warning: I noticed that [CHANGES.md]({{ repository_url }}/blob/master/CHANGES.md) has not been updated. If this change updates the public API in any way, fixes a bug, or makes any non-trivial update, please add a bullet point to `CHANGES.md` and comment on this pull request so we know it was updated. For more info, see the [Pull Request Guidelines]( https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#pull-request-guidelines).
+
+{{/if}}
+{{#if askAboutThirdParty}}
+:warning: I noticed that a file in one of our ThirdParty folders (`{{ thirdPartyFolders }}`) has been added or modified. Please verify that it has a section in [LICENSE.md]({{ repository_url }}/blob/master/LICENSE.md) and that its license information is up to date with this new version. Once you do, please confirm by commenting on this pull request.
+
+{{/if}}

.concierge/templates/signature.hbs

@@ -0,0 +1,5 @@
+---
+
+__I am a bot who helps you make Cesium awesome! [Contributions to my configuration are welcome.](https://github.com/AnalyticalGraphicsInc/cesium/tree/master/.concierge)__
+
+:earth_africa: :earth_americas: :earth_asia:

.npmignore

@@ -1,3 +1,4 @@
+/.concierge
 /.eslintcache
 /.externalToolBuilders
 /.gitattributes

Apps/Sandcastle/gallery/Labels.html

@@ -121,6 +121,17 @@
     });
 }
 
+function setRightToLeft() {
+    Sandcastle.declare(setRightToLeft);
+    Cesium.Label.enableRightToLeftDetection = true; //Only needs to be set once at the beginning of the application.
+    viewer.entities.add({
+        position : Cesium.Cartesian3.fromDegrees(-75.1641667, 39.9522222),
+        label : {
+            text : 'Master (אדון): Hello\nתלמיד (student): שלום'
+        }
+    });
+}
+
 Sandcastle.addToolbarMenu([{
     text : 'Add label',
     onselect : function() {
@@ -157,6 +168,12 @@
         scaleByDistance();
         Sandcastle.highlight(scaleByDistance);
     }
+}, {
+    text : 'Set label with right-to-left language',
+    onselect : function() {
+        setRightToLeft();
+        Sandcastle.highlight(setRightToLeft);
+    }
 }]);
 
 Sandcastle.reset = function() {

CHANGES.md

@@ -3,6 +3,7 @@ Change Log
 
 ### 1.39 - 2017-11-01
 
+* Added support for right-to-left language detection in labels, currently Hebrew and Arabic are supported. To enable it, set `Cesium.Label.enableRightToLeftDetection = true` at the beginning of your application. [#5771](https://github.com/AnalyticalGraphicsInc/cesium/pull/5771)
 * Added the ability to load Cesium's assets from the local file system if security permissions allow it. [#5830](https://github.com/AnalyticalGraphicsInc/cesium/issues/5830)
 * Added function that inserts missing namespace declarations into KML files. [#5860](https://github.com/AnalyticalGraphicsInc/cesium/pull/5860)
 * Added support for the layer.json `parentUrl` property in `CesiumTerrainProvider` to allow for compositing of tilesets.
@@ -16,6 +17,7 @@ Change Log
 * Improved CZML Reference Properties example [#5754](https://github.com/AnalyticalGraphicsInc/cesium/pull/5754)
 * Fixed bug with placemarks in imported KML: placemarks with no specified icon would be displayed with default icon. [#5819](https://github.com/AnalyticalGraphicsInc/cesium/issues/5819)
 * Fixed flickering artifacts on tilesets with thin walls. [#5940](https://github.com/AnalyticalGraphicsInc/cesium/pull/5940)
+* Fixed bright fog when terrain lighting is enabled and added `Fog.minimumBrightness` to affect how bright the fog will be when in complete darkness. [#5934](https://github.com/AnalyticalGraphicsInc/cesium/pull/5934)
 
 ### 1.38 - 2017-10-02
 
@@ -143,7 +145,7 @@ Change Log
 * Updated glTF/glb MIME types. [#5420](https://github.com/AnalyticalGraphicsInc/cesium/issues/5420)
 * Added `Cesium.Math.randomBetween`.
 * Modified `defaultValue` to check for both `undefined` and `null`. [#5551](https://github.com/AnalyticalGraphicsInc/cesium/pull/5551)
-* The `throttleRequestByServer` function has been removed. Instead use `RequestScheduler.throttleRequest` to throttle requests.
+* The `throttleRequestByServer` function has been removed. Instead pass a `Request` object with `throttleByServer` set to `true` to any of following load functions: `loadWithXhr`, `loadArrayBuffer`, `loadBlob`, `loadImageViaBlob`, `loadText`, `loadJson`, `loadJsonp`, `loadXML`, `loadImageFromTypedArray`, `loadImage`, `loadCRN`, and `loadKTX`.
 
 ### 1.34 - 2017-06-01
 

CONTRIBUTORS.md

@@ -92,6 +92,9 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
    * [Jannes Bolling](https://github.com/jbo023)
 * [Logilab](https://www.logilab.fr/)
    * [Florent Cayré](https://github.com/fcayre/)
+* [webiks](https://www.webiks.com)
+  * [Hod Bauer](https://github.com/hodbauer)
+  * [Yonatan Kra](https://github.com/yonatankra)
 * [Novetta](http://www.novetta.com/)
    * [Joshua Bernstein](https://github.com/jbernstein/)
    * [Natanael Rivera](https://github.com/nrivera-Novetta/)

Source/Scene/Fog.js

@@ -24,7 +24,6 @@ define([
          * @default true
          */
         this.enabled = true;
-
         /**
          * A scalar that determines the density of the fog. Terrain that is in full fog are culled.
          * The density of the fog increases as this number approaches 1.0 and becomes less dense as it approaches zero.
@@ -44,6 +43,13 @@ define([
          * @default 2.0
          */
         this.screenSpaceErrorFactor = 2.0;
+        /**
+         * The minimum brightness of the fog color from lighting. A value of 0.0 can cause the fog to be completely black. A value of 1.0 will not affect
+         * the brightness at all.
+         * @type {Number}
+         * @default 0.1
+         */
+        this.minimumBrightness = 0.1;
     }
 
     // These values were found by sampling the density at certain views and finding at what point culled tiles impacted the view at the horizon.
@@ -135,6 +141,7 @@ define([
 
         frameState.fog.density = density;
         frameState.fog.sse = this.screenSpaceErrorFactor;
+        frameState.fog.minimumBrightness = this.minimumBrightness;
     };
 
     return Fog;

Source/Scene/FrameState.js

@@ -208,7 +208,14 @@ define([
              * @type {Number}
              * @default undefined
              */
-            sse : undefined
+            sse : undefined,
+            /**
+             * The minimum brightness of terrain with fog applied.
+             *
+             * @type {Number}
+             * @default undefined
+             */
+            minimumBrightness : undefined
         };
 
         /**

Source/Scene/GlobeSurfaceTileProvider.js

@@ -849,6 +849,9 @@ define([
             u_dayTextureSplit : function() {
                 return this.properties.dayTextureSplit;
             },
+            u_minimumBrightness : function() {
+                return frameState.fog.minimumBrightness;
+            },
 
             // make a separate object so that changes to the properties are seen on
             // derived commands that combine another uniform map with this one.