Merge branch 'master' into texture-transform

CesiumGS · Apr 7, 2019 · cd0195a · cd0195a
2 parents ef534ae + 502f34a
commit cd0195a
Show file tree

Hide file tree

Showing 62 changed files with 1,635 additions and 313 deletions.
diff --git a/Apps/Sandcastle/gallery/3D Tiles Interior.html b/Apps/Sandcastle/gallery/3D Tiles Interior.html
@@ -31,7 +31,7 @@
 var viewer = new Cesium.Viewer('cesiumContainer');
 
 var tileset = new Cesium.Cesium3DTileset({
-    url: Cesium.IonResource.fromAssetId(5742)
+    url: Cesium.IonResource.fromAssetId(19365)
 });
 viewer.scene.primitives.add(tileset);
 

diff --git a/Apps/Sandcastle/gallery/3D Tiles Interior.jpg b/Apps/Sandcastle/gallery/3D Tiles Interior.jpg
diff --git a/Apps/Sandcastle/gallery/3D Tiles Point Cloud Shading.html b/Apps/Sandcastle/gallery/3D Tiles Point Cloud Shading.html
@@ -174,6 +174,8 @@
         destination: new Cesium.Cartesian3(4401744.644145314, 225051.41078911052, 4595420.374784433),
         orientation: new Cesium.HeadingPitchRoll(5.646733805039757, -0.276607153839886, 6.281110875400085)
     });
+
+    tilesetToViewModel(tileset);
 }
 
 function checkZero(newValue) {

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,24 +1,49 @@
 Change Log
 ==========
 
+### 1.57 - 2019-05-01
+
+##### Additions :tada:
+* Added support for the `KHR_texture_transform` glTF extension. [#7549](https://github.com/AnalyticalGraphicsInc/cesium/pull/7549)
+
+##### Fixes :wrench:
+* Fixed an error where `clampToHeightMostDetailed` or `sampleHeightMostDetailed` would crash if entities were created when the promise resolved. [#7690](https://github.com/AnalyticalGraphicsInc/cesium/pull/7690)
+* Added support for the `KHR_texture_transform` glTF extension. [#7549](https://github.com/AnalyticalGraphicsInc/cesium/pull/7549)
+
+### 1.56.1 - 2019-04-02
+
+##### Additions :tada:
+* `Resource.fetchImage` now takes a `preferImageBitmap` option to use `createImageBitmap` when supported to move image decode off the main thread. This option defaults to `false`.
+
+##### Breaking Changes :mega:
+* The following breaking changes are relative to 1.56. The `Resource.fetchImage` behavior is now identical to 1.55 and earlier.
+    * Changed `Resource.fetchImage` back to return an `Image` by default, instead of an `ImageBitmap` when supported. Note that an `ImageBitmap` cannot be flipped during texture upload. Instead, set `flipY : true` during fetch to flip it.
+    * Changed the default `flipY` option in `Resource.fetchImage` to false. This only has an effect when ImageBitmap is used.
+
 ### 1.56 - 2019-04-01
 
 ##### Breaking Changes :mega:
 * `Resource.fetchImage` now returns an `ImageBitmap` instead of `Image` when supported. This allows for decoding images while fetching using `createImageBitmap` to greatly speed up texture upload and decrease frame drops when loading models with large textures. [#7579](https://github.com/AnalyticalGraphicsInc/cesium/pull/7579)
+* `Cesium3DTileStyle.style` now has an empty `Object` as its default value, instead of `undefined`. [#7567](https://github.com/AnalyticalGraphicsInc/cesium/issues/7567)
+* `Scene.clampToHeight` now takes an optional `width` argument before the `result` argument. [#7693](https://github.com/AnalyticalGraphicsInc/cesium/pull/7693)
+* In the `Resource` class, `addQueryParameters` and `addTemplateValues` have been removed. Please use `setQueryParameters` and `setTemplateValues` instead. [#7695](https://github.com/AnalyticalGraphicsInc/cesium/issues/7695)
 
 ##### Deprecated :hourglass_flowing_sand:
 * `Resource.fetchImage` now takes an options object. Use `resource.fetchImage({ preferBlob: true })` instead of `resource.fetchImage(true)`. The previous function definition will no longer work in 1.57. [#7579](https://github.com/AnalyticalGraphicsInc/cesium/pull/7579)
 
 ##### Additions :tada:
+* Added support for touch and hold gesture. The touch and hold delay can be customized by updating `ScreenSpaceEventHandler.touchHoldDelayMilliseconds`. [#7286](https://github.com/AnalyticalGraphicsInc/cesium/pull/7286)
 * `Resource.fetchImage` now has a `flipY` option to vertically flip an image during fetch & decode. It is only valid when `ImageBitmapOptions` is supported by the browser. [#7579](https://github.com/AnalyticalGraphicsInc/cesium/pull/7579)
 * Added `backFaceCulling` and `normalShading` options to `PointCloudShading`. Both options are only applicable for point clouds containing normals. [#7399](https://github.com/AnalyticalGraphicsInc/cesium/pull/7399)
 * Added support for touch and hold gesture. The touch and hold delay can be customized by updating `ScreenSpaceEventHandler.touchHoldDelayMilliseconds`. [#7286](https://github.com/AnalyticalGraphicsInc/cesium/pull/7286)
-* Added support for the `KHR_texture_transform` glTF extension. [#7549](https://github.com/AnalyticalGraphicsInc/cesium/pull/7549)
+* `Cesium3DTileStyle.style` reacts to updates and represents the current state of the style. [#7567](https://github.com/AnalyticalGraphicsInc/cesium/issues/7567)
 
 ##### Fixes :wrench:
 * Fixed the value for `BlendFunction.ONE_MINUS_CONSTANT_COLOR`. [#7624](https://github.com/AnalyticalGraphicsInc/cesium/pull/7624)
-* Fixed `HeadingPitchRoll.pitch` being `NaN` when using `.fromQuaternion` do to a rounding error
-for pitches close to +/- 90°. [#7654](https://github.com/AnalyticalGraphicsInc/cesium/pull/7654)
+* Fixed `HeadingPitchRoll.pitch` being `NaN` when using `.fromQuaternion` due to a rounding error for pitches close to +/- 90°. [#7654](https://github.com/AnalyticalGraphicsInc/cesium/pull/7654)
+* Fixed a type of crash caused by the camera being rotated through terrain. [#6783](https://github.com/AnalyticalGraphicsInc/cesium/issues/6783)
+* Fixed an error in `Resource` when used with template replacements using numeric keys. [#7668](https://github.com/AnalyticalGraphicsInc/cesium/pull/7668)
+* Fixed an error in `Cesium3DTilePointFeature` where `anchorLineColor` used the same color instance instead of cloning the color [#7686](https://github.com/AnalyticalGraphicsInc/cesium/pull/7686)
 
 ### 1.55 - 2019-03-01
 

diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_0.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_0.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_1.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_1.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_10.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_10.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_11.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_11.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_12.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_12.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_13.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_13.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_14.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_14.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_15.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_15.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_16.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_16.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_17.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_17.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_18.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_18.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_19.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_19.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_2.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_2.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_20.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_20.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_21.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_21.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_22.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_22.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_23.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_23.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_24.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_24.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_25.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_25.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_26.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_26.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_27.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_27.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_3.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_3.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_4.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_4.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_5.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_5.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_6.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_6.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_7.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_7.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_8.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_8.json
diff --git a/Source/Assets/IAU2006_XYS/IAU2006_XYS_9.json b/Source/Assets/IAU2006_XYS/IAU2006_XYS_9.json
diff --git a/Source/Core/Ion.js b/Source/Core/Ion.js
@@ -9,7 +9,7 @@ define([
     'use strict';
 
     var defaultTokenCredit;
-    var defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkZDJhY2VhYy0wYzljLTRiNWUtYmNhOC04OTQyZDk1YmZhMDkiLCJpZCI6MjU5LCJzY29wZXMiOlsiYXNyIiwiZ2MiXSwiaWF0IjoxNTUxNDUyMjc4fQ.B5BkE4TUBja1yOnT9sC6t8rrWghvVep21tzBq6r7aHo';
+    var defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJlZTNjZGYzNC0wMzI5LTQ3NGEtOWM1Yy03YzhhOWU4NTI2MGQiLCJpZCI6MjU5LCJzY29wZXMiOlsiYXNyIiwiZ2MiXSwiaWF0IjoxNTU0MTQwMTQxfQ.egqhQs14qStY2dQTESVJz2JnUoXFNz4EFkdl50yqoOw';
 
     /**
      * Default settings for accessing the Cesium ion API.

diff --git a/Source/Core/IonResource.js b/Source/Core/IonResource.js
@@ -172,6 +172,7 @@ define([
             };
             if (defined(userOptions)) {
                 options.flipY = userOptions.flipY;
+                options.preferImageBitmap = userOptions.preferImageBitmap;
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -172,6 +172,7 @@ define([ @@
                 };
                 if (defined(userOptions)) {
                     options.flipY = userOptions.flipY;
+                    options.preferImageBitmap = userOptions.preferImageBitmap;
                 }
             }
@@ Expand Down @@