Merge pull request #3 from AnalyticalGraphicsInc/master

Update from original

Apps/CesiumViewer/CesiumViewer.js

@@ -3,7 +3,6 @@ define([
         'Cesium/Core/Cartesian3',
         'Cesium/Core/defined',
         'Cesium/Core/formatError',
-        'Cesium/Core/getFilenameFromUri',
         'Cesium/Core/Math',
         'Cesium/Core/objectToQuery',
         'Cesium/Core/queryToObject',
@@ -19,7 +18,6 @@ define([
         Cartesian3,
         defined,
         formatError,
-        getFilenameFromUri,
         CesiumMath,
         objectToQuery,
         queryToObject,

Apps/Sandcastle/gallery/Terrain.html

@@ -33,6 +33,9 @@
 //Sandcastle_Begin
 var viewer = new Cesium.Viewer('cesiumContainer');
 
+// set lighting to true
+viewer.scene.globe.enableLighting = true;
+
 var cesiumTerrainProviderMeshes = new Cesium.CesiumTerrainProvider({
     url : 'https://assets.agi.com/stk-terrain/world',
     requestWaterMask : true,
@@ -93,10 +96,7 @@
 Sandcastle.addDefaultToolbarMenu([{
     text : 'Mount Everest',
     onselect : function() {
-        var target = new Cesium.Cartesian3(300770.50872389384, 5634912.131394585, 2978152.2865545116);
-        var offset = new Cesium.Cartesian3(6344.974098678562, -793.3419798081741, 2499.9508860763162);
-        viewer.camera.lookAt(target, offset);
-        viewer.camera.lookAtTransform(Cesium.Matrix4.IDENTITY);
+        lookAtMtEverest();
     }
 }, {
     text : 'Half Dome',
@@ -118,6 +118,13 @@
 
 var terrainSamplePositions;
 
+function lookAtMtEverest() {
+    var target = new Cesium.Cartesian3(300770.50872389384, 5634912.131394585, 2978152.2865545116);
+    var offset = new Cesium.Cartesian3(6344.974098678562, -793.3419798081741, 2499.9508860763162);
+    viewer.camera.lookAt(target, offset);
+    viewer.camera.lookAtTransform(Cesium.Matrix4.IDENTITY);
+}
+
 function sampleTerrainSuccess() {
     var ellipsoid = Cesium.Ellipsoid.WGS84;
 
@@ -152,10 +159,13 @@
     viewer.entities.resumeEvents();
 }
 
-Sandcastle.addToggleButton('Lighting', viewer.scene.globe.enableLighting, function(checked) {
+Sandcastle.addToggleButton('Enable Lighting', viewer.scene.globe.enableLighting, function(checked) {
     viewer.scene.globe.enableLighting = checked;
 });
 
+Sandcastle.addToggleButton('Enable fog', viewer.scene.fog.enabled, function(checked) {
+    viewer.scene.fog.enabled = checked;
+});
 
 Sandcastle.addToolbarButton('Sample Everest Terrain', function() {
     var gridWidth = 41;
@@ -175,12 +185,9 @@
     }
 
     Cesium.when(Cesium.sampleTerrain(viewer.terrainProvider, 9, terrainSamplePositions), sampleTerrainSuccess);
-}, 'sampleButtons');
 
-
-Sandcastle.addToggleButton('Enable fog', viewer.scene.fog.enabled, function(checked) {
-    viewer.scene.fog.enabled = checked;
-});
+    lookAtMtEverest();
+}, 'sampleButtons');
 
 //Sandcastle_End
     Sandcastle.finishedLoading();

CHANGES.md

@@ -2,11 +2,14 @@ Change Log
 ==========
 
 ### 1.28 - 2016-12-01
-* Deprecated
-    *
-* Breaking changes
-    *
-* Added support for saving html and css in Github Gists. [#4125](https://github.com/AnalyticalGraphicsInc/cesium/issues/4125)
+
+* Improved terrain/imagery load ordering, especially when the terrain is already fully loaded and a new imagery layer is loaded.  This results in a 25% reduction in load times in many cases. [#4616](https://github.com/AnalyticalGraphicsInc/cesium/pull/4616)
+* Improved `Billboard`, `Label`, and `PointPrimitive` visual quality. [#4675](https://github.com/AnalyticalGraphicsInc/cesium/pull/4675)
+   * Corrected odd-width and odd-height billboard sizes from being incorrectly rounded up.
+   * Changed depth testing from `LESS` to `LEQUAL`, allowing label glyphs of equal depths to overlap.
+   * Label glyph positions have been adjusted and corrected.
+   * `TextureAtlas.borderWidthInPixels` has always been applied to the upper and right edges of each internal texture, but is now also applied to the bottom and left edges of the entire TextureAtlas, guaranteeing borders on all sides regardless of position within the atlas.
+* Added support for saving html and css in GitHub Gists. [#4125](https://github.com/AnalyticalGraphicsInc/cesium/issues/4125)
 * Fixed `Cartographic.fromCartesian` when the cartesian is not on the ellipsoid surface. [#4611](https://github.com/AnalyticalGraphicsInc/cesium/issues/4611)
 
 ### 1.27 - 2016-11-01

CONTRIBUTORS.md

@@ -114,3 +114,5 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
 * [Leesa Fini](https://github.com/leesafini)
 * [Victor Malaret](https://github.com/malaretv)
 * [David Friedman](https://github.com/duvifn)
+* [Abhishek Potnis](https://github.com/abhishekvp)
+

README.md

@@ -46,6 +46,20 @@ We appreciate attribution by including the Cesium logo and link in your app.
 ### Demos ###
 
 <p align="center">
+<a href="http://cesiumjs.org/demos/IMERG.html"><img src="http://cesiumjs.org/demos/images/IMERG.jpg" height="150" /></a>&nbsp;
+<a href="http://cesiumjs.org/demos/OrbitLogic.html"><img src="http://cesiumjs.org/demos/images/OrbitLogic.png" height="150" /></a>&nbsp;
+<a href="http://cesiumjs.org/demos/nextPlace.html"><img src="http://cesiumjs.org/demos/images/nextPlace.jpg" height="150" /></a>&nbsp;
+<a href="http://cesiumjs.org/demos/Entwine.html"><img src="http://cesiumjs.org/demos/images/Entwine.png" height="150" /></a>&nbsp;
+<a href="http://cesiumjs.org/demos/FlightAirMap.html"><img src="http://cesiumjs.org/demos/images/FlightAirMap.jpg" height="150" /></a>&nbsp;
+<a href="http://cesiumjs.org/demos/NYPLphotographers.html"><img src="http://cesiumjs.org/demos/images/NYPLphotographers.png" height="150" /></a>&nbsp;
+<a href="http://cesiumjs.org/demos/RiftVelocity.html"><img src="http://cesiumjs.org/demos/images/RiftVelocity.jpg" height="150" /></a>&nbsp;
+<a href="http://cesiumjs.org/demos/ContextCapture.html"><img src="http://cesiumjs.org/demos/images/ContextCapture.jpg" height="150" /></a>&nbsp;
+<a href="http://cesiumjs.org/demos/VolumeRaycast.html"><img src="http://cesiumjs.org/demos/images/VolumeRaycast.jpg" height="150" /></a>&nbsp;
+<a href="http://cesiumjs.org/demos/TXGeothermal.html"><img src="http://cesiumjs.org/demos/images/TXGeothermal.png" height="150" /></a>&nbsp;
+<a href="http://cesiumjs.org/demos/LiquidGalaxy.html"><img src="http://cesiumjs.org/demos/images/LiquidGalaxy.jpg" height="150" /></a>&nbsp;
+<a href="http://cesiumjs.org/demos/KansasAviation.html"><img src="http://cesiumjs.org/demos/images/Kansas.jpg" height="150" /></a>&nbsp;
+<a href="http://cesiumjs.org/demos/Desalination.html"><img src="http://cesiumjs.org/demos/images/Desal.png" height="150" /></a>&nbsp;
+<a href="http://cesiumjs.org/demos/GlobalSubsurface.html"><img src="http://cesiumjs.org/demos/images/GlobalSubsurface.png" height="150" /></a>&nbsp;
 <a href="http://cesiumjs.org/demos/ShakeFinder.html"><img src="http://cesiumjs.org/demos/images/ShakeFinder.jpg" height="150" /></a>&nbsp;
 <a href="http://cesiumjs.org/demos/GeoPort3D.html"><img src="http://cesiumjs.org/demos/images/GeoPort3D.jpg" height="150" /></a>&nbsp;
 <a href="http://cesiumjs.org/demos/HurricaneHunters.html"><img src="http://cesiumjs.org/demos/images/HurricaneHunters.jpg" height="150" /></a>&nbsp;

Source/Core/AttributeCompression.js

@@ -2,14 +2,12 @@
 define([
         './Cartesian2',
         './Cartesian3',
-        './defaultValue',
         './defined',
         './DeveloperError',
         './Math'
     ], function(
         Cartesian2,
         Cartesian3,
-        defaultValue,
         defined,
         DeveloperError,
         CesiumMath) {

Source/Core/BoundingSphere.js

@@ -11,7 +11,6 @@ define([
         './Interval',
         './Matrix3',
         './Matrix4',
-        './Plane',
         './Rectangle'
     ], function(
         Cartesian3,
@@ -25,7 +24,6 @@ define([
         Interval,
         Matrix3,
         Matrix4,
-        Plane,
         Rectangle) {
     'use strict';
 

Source/Core/CesiumTerrainProvider.js

@@ -17,10 +17,8 @@ define([
         './loadArrayBuffer',
         './loadJson',
         './Math',
-        './Matrix3',
         './OrientedBoundingBox',
         './QuantizedMeshTerrainData',
-        './RuntimeError',
         './TerrainProvider',
         './throttleRequestByServer',
         './TileProviderError'
@@ -42,10 +40,8 @@ define([
         loadArrayBuffer,
         loadJson,
         CesiumMath,
-        Matrix3,
         OrientedBoundingBox,
         QuantizedMeshTerrainData,
-        RuntimeError,
         TerrainProvider,
         throttleRequestByServer,
         TileProviderError) {

Source/Core/CircleGeometry.js

@@ -7,7 +7,6 @@ define([
         './DeveloperError',
         './EllipseGeometry',
         './Ellipsoid',
-        './Math',
         './VertexFormat'
     ], function(
         Cartesian3,
@@ -17,7 +16,6 @@ define([
         DeveloperError,
         EllipseGeometry,
         Ellipsoid,
-        CesiumMath,
         VertexFormat) {
     'use strict';
 

Source/Core/CorridorGeometryLibrary.js

@@ -3,7 +3,6 @@ define([
         './Cartesian3',
         './CornerType',
         './defined',
-        './isArray',
         './Math',
         './Matrix3',
         './PolylinePipeline',
@@ -13,7 +12,6 @@ define([
         Cartesian3,
         CornerType,
         defined,
-        isArray,
         CesiumMath,
         Matrix3,
         PolylinePipeline,

Source/Core/DistanceDisplayCondition.js

@@ -1,11 +1,9 @@
 /*global define*/
 define([
-        './Cartesian3',
         './defaultValue',
         './defined',
         './defineProperties'
     ], function(
-        Cartesian3,
         defaultValue,
         defined,
         defineProperties) {