@cesium/engine 2.4.0 → 2.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (68) hide show
  1. package/Build/Workers/{Color-e5bfda3f.js → Color-8e135f71.js} +4 -4
  2. package/Build/Workers/cesiumWorkerBootstrapper.js +1 -1
  3. package/Build/Workers/createPolylineGeometry.js +1 -1
  4. package/Build/Workers/createSimplePolylineGeometry.js +1 -1
  5. package/Build/Workers/createVectorTileGeometries.js +1 -1
  6. package/Build/Workers/createVectorTilePolygons.js +1 -1
  7. package/Build/Workers/package.js +1 -1
  8. package/Build/Workers/transferTypedArrayTest.js +1 -1
  9. package/Source/Core/ArcGISTiledElevationTerrainProvider.js +3 -3
  10. package/Source/Core/CesiumTerrainProvider.js +28 -3
  11. package/Source/Core/Color.js +4 -4
  12. package/Source/Core/CustomHeightmapTerrainProvider.js +2 -2
  13. package/Source/Core/EllipsoidTerrainProvider.js +2 -2
  14. package/Source/Core/GoogleEarthEnterpriseMetadata.js +2 -2
  15. package/Source/Core/GoogleEarthEnterpriseTerrainProvider.js +4 -4
  16. package/Source/Core/GoogleMaps.js +1 -1
  17. package/Source/Core/Ion.js +2 -1
  18. package/Source/Core/VRTheWorldTerrainProvider.js +3 -3
  19. package/Source/Core/createWorldTerrain.js +2 -1
  20. package/Source/Core/sampleTerrain.js +5 -1
  21. package/Source/Core/sampleTerrainMostDetailed.js +5 -1
  22. package/Source/DataSources/DataSourceDisplay.js +3 -2
  23. package/Source/DataSources/Entity.js +2 -3
  24. package/Source/DataSources/ModelVisualizer.js +6 -1
  25. package/Source/Renderer/demodernizeShader.js +3 -0
  26. package/Source/Scene/ArcGisMapServerImageryProvider.js +23 -23
  27. package/Source/Scene/ArcGisMapService.js +1 -1
  28. package/Source/Scene/Billboard.js +0 -7
  29. package/Source/Scene/BingMapsImageryProvider.js +23 -23
  30. package/Source/Scene/Cesium3DTileBatchTable.js +0 -3
  31. package/Source/Scene/Globe.js +7 -3
  32. package/Source/Scene/GlobeSurfaceTile.js +7 -1
  33. package/Source/Scene/GlobeSurfaceTileProvider.js +46 -21
  34. package/Source/Scene/GoogleEarthEnterpriseImageryProvider.js +24 -24
  35. package/Source/Scene/GoogleEarthEnterpriseMapsProvider.js +22 -22
  36. package/Source/Scene/GridImageryProvider.js +22 -22
  37. package/Source/Scene/Imagery.js +5 -2
  38. package/Source/Scene/ImageryLayer.js +13 -3
  39. package/Source/Scene/IonImageryProvider.js +23 -23
  40. package/Source/Scene/MapboxImageryProvider.js +22 -22
  41. package/Source/Scene/MapboxStyleImageryProvider.js +22 -22
  42. package/Source/Scene/Model/CustomShader.js +1 -1
  43. package/Source/Scene/ScreenSpaceCameraController.js +2 -1
  44. package/Source/Scene/SingleTileImageryProvider.js +22 -22
  45. package/Source/Scene/TileCoordinatesImageryProvider.js +22 -22
  46. package/Source/Scene/TileMapServiceImageryProvider.js +1 -1
  47. package/Source/Scene/UrlTemplateImageryProvider.js +23 -23
  48. package/Source/Scene/WebMapServiceImageryProvider.js +22 -22
  49. package/Source/Scene/WebMapTileServiceImageryProvider.js +22 -22
  50. package/Source/Scene/computeFlyToLocationForRectangle.js +5 -1
  51. package/Source/Scene/createOsmBuildings.js +2 -1
  52. package/Source/Scene/createWorldImagery.js +1 -1
  53. package/Source/Shaders/BillboardCollectionFS.glsl +0 -4
  54. package/Source/Shaders/BillboardCollectionFS.js +1 -5
  55. package/Source/Shaders/Builtin/Functions/writeLogDepth.glsl +0 -3
  56. package/Source/Shaders/Builtin/Functions/writeLogDepth.js +0 -3
  57. package/Source/Shaders/Materials/ElevationContourMaterial.glsl +0 -4
  58. package/Source/Shaders/Materials/ElevationContourMaterial.js +1 -5
  59. package/Source/Shaders/Materials/GridMaterial.glsl +0 -4
  60. package/Source/Shaders/Materials/GridMaterial.js +1 -5
  61. package/Source/Shaders/Materials/PolylineArrowMaterial.glsl +0 -4
  62. package/Source/Shaders/Materials/PolylineArrowMaterial.js +1 -5
  63. package/Source/Shaders/Model/ModelFS.glsl +0 -6
  64. package/Source/Shaders/Model/ModelFS.js +1 -7
  65. package/Source/Widget/CesiumWidget.js +1 -1
  66. package/index.d.ts +7 -7
  67. package/index.js +61 -61
  68. package/package.json +2 -2
@@ -371,7 +371,7 @@ function ArcGisMapServerImageryProvider(options) {
371
371
  if (defined(options.url)) {
372
372
  deprecationWarning(
373
373
  "ArcGisMapServerImageryProvider options.url",
374
- "options.url was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ArcGisMapServerImageryProvider.fromUrl instead."
374
+ "options.url was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ArcGisMapServerImageryProvider.fromUrl instead."
375
375
  );
376
376
  const resource = Resource.createIfNeeded(options.url);
377
377
  resource.appendForwardSlash();
@@ -706,7 +706,7 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
706
706
  get: function () {
707
707
  deprecationWarning(
708
708
  "ArcGisMapServerImageryProvider.ready",
709
- "ArcGisMapServerImageryProvider.ready was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ArcGisMapServerImageryProvider.fromUrl instead."
709
+ "ArcGisMapServerImageryProvider.ready was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ArcGisMapServerImageryProvider.fromUrl instead."
710
710
  );
711
711
  return this._ready;
712
712
  },
@@ -723,7 +723,7 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
723
723
  get: function () {
724
724
  deprecationWarning(
725
725
  "ArcGisMapServerImageryProvider.readyPromise",
726
- "ArcGisMapServerImageryProvider.readyPromise was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ArcGisMapServerImageryProvider.fromUrl instead."
726
+ "ArcGisMapServerImageryProvider.readyPromise was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ArcGisMapServerImageryProvider.fromUrl instead."
727
727
  );
728
728
  return this._readyPromise;
729
729
  },
@@ -798,14 +798,14 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
798
798
  get: function () {
799
799
  deprecationWarning(
800
800
  "ArcGisMapServerImageryProvider.defaultAlpha",
801
- "ArcGisMapServerImageryProvider.defaultAlpha was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.alpha instead."
801
+ "ArcGisMapServerImageryProvider.defaultAlpha was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.alpha instead."
802
802
  );
803
803
  return this._defaultAlpha;
804
804
  },
805
805
  set: function (value) {
806
806
  deprecationWarning(
807
807
  "ArcGisMapServerImageryProvider.defaultAlpha",
808
- "ArcGisMapServerImageryProvider.defaultAlpha was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.alpha instead."
808
+ "ArcGisMapServerImageryProvider.defaultAlpha was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.alpha instead."
809
809
  );
810
810
  this._defaultAlpha = value;
811
811
  },
@@ -822,14 +822,14 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
822
822
  get: function () {
823
823
  deprecationWarning(
824
824
  "ArcGisMapServerImageryProvider.defaultNightAlpha",
825
- "ArcGisMapServerImageryProvider.defaultNightAlpha was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.nightAlpha instead."
825
+ "ArcGisMapServerImageryProvider.defaultNightAlpha was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.nightAlpha instead."
826
826
  );
827
827
  return this._defaultNightAlpha;
828
828
  },
829
829
  set: function (value) {
830
830
  deprecationWarning(
831
831
  "ArcGisMapServerImageryProvider.defaultNightAlpha",
832
- "ArcGisMapServerImageryProvider.defaultNightAlpha was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.nightAlpha instead."
832
+ "ArcGisMapServerImageryProvider.defaultNightAlpha was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.nightAlpha instead."
833
833
  );
834
834
  this._defaultNightAlpha = value;
835
835
  },
@@ -846,14 +846,14 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
846
846
  get: function () {
847
847
  deprecationWarning(
848
848
  "ArcGisMapServerImageryProvider.defaultDayAlpha",
849
- "ArcGisMapServerImageryProvider.defaultDayAlpha was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.dayAlpha instead."
849
+ "ArcGisMapServerImageryProvider.defaultDayAlpha was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.dayAlpha instead."
850
850
  );
851
851
  return this._defaultDayAlpha;
852
852
  },
853
853
  set: function (value) {
854
854
  deprecationWarning(
855
855
  "ArcGisMapServerImageryProvider.defaultDayAlpha",
856
- "ArcGisMapServerImageryProvider.defaultDayAlpha was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.dayAlpha instead."
856
+ "ArcGisMapServerImageryProvider.defaultDayAlpha was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.dayAlpha instead."
857
857
  );
858
858
  this._defaultDayAlpha = value;
859
859
  },
@@ -870,14 +870,14 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
870
870
  get: function () {
871
871
  deprecationWarning(
872
872
  "ArcGisMapServerImageryProvider.defaultBrightness",
873
- "ArcGisMapServerImageryProvider.defaultBrightness was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.brightness instead."
873
+ "ArcGisMapServerImageryProvider.defaultBrightness was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.brightness instead."
874
874
  );
875
875
  return this._defaultBrightness;
876
876
  },
877
877
  set: function (value) {
878
878
  deprecationWarning(
879
879
  "ArcGisMapServerImageryProvider.defaultBrightness",
880
- "ArcGisMapServerImageryProvider.defaultBrightness was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.brightness instead."
880
+ "ArcGisMapServerImageryProvider.defaultBrightness was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.brightness instead."
881
881
  );
882
882
  this._defaultBrightness = value;
883
883
  },
@@ -894,14 +894,14 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
894
894
  get: function () {
895
895
  deprecationWarning(
896
896
  "ArcGisMapServerImageryProvider.defaultContrast",
897
- "ArcGisMapServerImageryProvider.defaultContrast was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.contrast instead."
897
+ "ArcGisMapServerImageryProvider.defaultContrast was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.contrast instead."
898
898
  );
899
899
  return this._defaultContrast;
900
900
  },
901
901
  set: function (value) {
902
902
  deprecationWarning(
903
903
  "ArcGisMapServerImageryProvider.defaultContrast",
904
- "ArcGisMapServerImageryProvider.defaultContrast was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.contrast instead."
904
+ "ArcGisMapServerImageryProvider.defaultContrast was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.contrast instead."
905
905
  );
906
906
  this._defaultContrast = value;
907
907
  },
@@ -917,14 +917,14 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
917
917
  get: function () {
918
918
  deprecationWarning(
919
919
  "ArcGisMapServerImageryProvider.defaultHue",
920
- "ArcGisMapServerImageryProvider.defaultHue was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.hue instead."
920
+ "ArcGisMapServerImageryProvider.defaultHue was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.hue instead."
921
921
  );
922
922
  return this._defaultHue;
923
923
  },
924
924
  set: function (value) {
925
925
  deprecationWarning(
926
926
  "ArcGisMapServerImageryProvider.defaultHue",
927
- "ArcGisMapServerImageryProvider.defaultHue was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.hue instead."
927
+ "ArcGisMapServerImageryProvider.defaultHue was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.hue instead."
928
928
  );
929
929
  this._defaultHue = value;
930
930
  },
@@ -941,14 +941,14 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
941
941
  get: function () {
942
942
  deprecationWarning(
943
943
  "ArcGisMapServerImageryProvider.defaultSaturation",
944
- "ArcGisMapServerImageryProvider.defaultSaturation was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.saturation instead."
944
+ "ArcGisMapServerImageryProvider.defaultSaturation was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.saturation instead."
945
945
  );
946
946
  return this._defaultSaturation;
947
947
  },
948
948
  set: function (value) {
949
949
  deprecationWarning(
950
950
  "ArcGisMapServerImageryProvider.defaultSaturation",
951
- "ArcGisMapServerImageryProvider.defaultSaturation was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.saturation instead."
951
+ "ArcGisMapServerImageryProvider.defaultSaturation was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.saturation instead."
952
952
  );
953
953
  this._defaultSaturation = value;
954
954
  },
@@ -964,14 +964,14 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
964
964
  get: function () {
965
965
  deprecationWarning(
966
966
  "ArcGisMapServerImageryProvider.defaultGamma",
967
- "ArcGisMapServerImageryProvider.defaultGamma was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.gamma instead."
967
+ "ArcGisMapServerImageryProvider.defaultGamma was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.gamma instead."
968
968
  );
969
969
  return this._defaultGamma;
970
970
  },
971
971
  set: function (value) {
972
972
  deprecationWarning(
973
973
  "ArcGisMapServerImageryProvider.defaultGamma",
974
- "ArcGisMapServerImageryProvider.defaultGamma was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.gamma instead."
974
+ "ArcGisMapServerImageryProvider.defaultGamma was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.gamma instead."
975
975
  );
976
976
  this._defaultGamma = value;
977
977
  },
@@ -987,14 +987,14 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
987
987
  get: function () {
988
988
  deprecationWarning(
989
989
  "ArcGisMapServerImageryProvider.defaultMinificationFilter",
990
- "ArcGisMapServerImageryProvider.defaultMinificationFilter was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.minificationFilter instead."
990
+ "ArcGisMapServerImageryProvider.defaultMinificationFilter was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.minificationFilter instead."
991
991
  );
992
992
  return this._defaultMinificationFilter;
993
993
  },
994
994
  set: function (value) {
995
995
  deprecationWarning(
996
996
  "ArcGisMapServerImageryProvider.defaultMinificationFilter",
997
- "ArcGisMapServerImageryProvider.defaultMinificationFilter was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.minificationFilter instead."
997
+ "ArcGisMapServerImageryProvider.defaultMinificationFilter was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.minificationFilter instead."
998
998
  );
999
999
  this._defaultMinificationFilter = value;
1000
1000
  },
@@ -1010,14 +1010,14 @@ Object.defineProperties(ArcGisMapServerImageryProvider.prototype, {
1010
1010
  get: function () {
1011
1011
  deprecationWarning(
1012
1012
  "ArcGisMapServerImageryProvider.defaultMagnificationFilter",
1013
- "ArcGisMapServerImageryProvider.defaultMagnificationFilter was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.magnificationFilter instead."
1013
+ "ArcGisMapServerImageryProvider.defaultMagnificationFilter was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.magnificationFilter instead."
1014
1014
  );
1015
1015
  return this._defaultMagnificationFilter;
1016
1016
  },
1017
1017
  set: function (value) {
1018
1018
  deprecationWarning(
1019
1019
  "ArcGisMapServerImageryProvider.defaultMagnificationFilter",
1020
- "ArcGisMapServerImageryProvider.defaultMagnificationFilter was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.magnificationFilter instead."
1020
+ "ArcGisMapServerImageryProvider.defaultMagnificationFilter was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.magnificationFilter instead."
1021
1021
  );
1022
1022
  this._defaultMagnificationFilter = value;
1023
1023
  },
@@ -4,7 +4,7 @@ import Resource from "../Core/Resource.js";
4
4
 
5
5
  let defaultTokenCredit;
6
6
  const defaultAccessToken =
7
- "AAPKd815e334cb774973b7245e23a67f4d08Js7A8e8xvfBpgnZIzp1jbL3FWJTmx7AKG8wa87OwDcWEu4CxQCNiydpPbGpALiTf";
7
+ "AAPKac82a6d80f1340a4aa9587f789d07e96a_Jj1a4fbA59cggYHArDizxxA2U4QDofLUm36VivpUsSRyK7O1JjRPwy916Y-7ld";
8
8
  /**
9
9
  * Default options for accessing the ArcGIS image tile service.
10
10
  *
@@ -1169,13 +1169,6 @@ Billboard.prototype._loadImage = function () {
1169
1169
  }
1170
1170
 
1171
1171
  if (defined(image)) {
1172
- // No need to wait on imageIndexPromise since these have already been added to the atlas
1173
- const index = atlas.getImageIndex(imageId);
1174
- if (defined(index)) {
1175
- completeImageLoad(index);
1176
- return;
1177
- }
1178
-
1179
1172
  imageIndexPromise = atlas.addImage(imageId, image);
1180
1173
  }
1181
1174
  if (defined(imageSubRegion)) {
@@ -245,7 +245,7 @@ function BingMapsImageryProvider(options) {
245
245
  if (defined(options.url)) {
246
246
  deprecationWarning(
247
247
  "BingMapsImageryProvider options.url",
248
- "options.url was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use BingMapsImageryProvider.fromUrl instead."
248
+ "options.url was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use BingMapsImageryProvider.fromUrl instead."
249
249
  );
250
250
 
251
251
  //>>includeStart('debug', pragmas.debug);
@@ -467,7 +467,7 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
467
467
  get: function () {
468
468
  deprecationWarning(
469
469
  "BingMapsImageryProvider.ready",
470
- "BingMapsImageryProvider.ready was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use BingMapsImageryProvider.fromUrl instead."
470
+ "BingMapsImageryProvider.ready was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use BingMapsImageryProvider.fromUrl instead."
471
471
  );
472
472
  return this._ready;
473
473
  },
@@ -484,7 +484,7 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
484
484
  get: function () {
485
485
  deprecationWarning(
486
486
  "BingMapsImageryProvider.readyPromise",
487
- "BingMapsImageryProvider.readyPromise was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use BingMapsImageryProvider.fromUrl instead."
487
+ "BingMapsImageryProvider.readyPromise was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use BingMapsImageryProvider.fromUrl instead."
488
488
  );
489
489
  return this._readyPromise;
490
490
  },
@@ -530,14 +530,14 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
530
530
  get: function () {
531
531
  deprecationWarning(
532
532
  "BingMapsImageryProvider.defaultAlpha",
533
- "BingMapsImageryProvider.defaultAlpha was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.alpha instead."
533
+ "BingMapsImageryProvider.defaultAlpha was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.alpha instead."
534
534
  );
535
535
  return this._defaultAlpha;
536
536
  },
537
537
  set: function (value) {
538
538
  deprecationWarning(
539
539
  "BingMapsImageryProvider.defaultAlpha",
540
- "BingMapsImageryProvider.defaultAlpha was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.alpha instead."
540
+ "BingMapsImageryProvider.defaultAlpha was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.alpha instead."
541
541
  );
542
542
  this._defaultAlpha = value;
543
543
  },
@@ -554,14 +554,14 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
554
554
  get: function () {
555
555
  deprecationWarning(
556
556
  "BingMapsImageryProvider.defaultNightAlpha",
557
- "BingMapsImageryProvider.defaultNightAlpha was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.nightAlpha instead."
557
+ "BingMapsImageryProvider.defaultNightAlpha was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.nightAlpha instead."
558
558
  );
559
559
  return this.defaultNightAlpha;
560
560
  },
561
561
  set: function (value) {
562
562
  deprecationWarning(
563
563
  "BingMapsImageryProvider.defaultNightAlpha",
564
- "BingMapsImageryProvider.defaultNightAlpha was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.nightAlpha instead."
564
+ "BingMapsImageryProvider.defaultNightAlpha was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.nightAlpha instead."
565
565
  );
566
566
  this.defaultNightAlpha = value;
567
567
  },
@@ -578,14 +578,14 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
578
578
  get: function () {
579
579
  deprecationWarning(
580
580
  "BingMapsImageryProvider.defaultDayAlpha",
581
- "BingMapsImageryProvider.defaultDayAlpha was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.dayAlpha instead."
581
+ "BingMapsImageryProvider.defaultDayAlpha was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.dayAlpha instead."
582
582
  );
583
583
  return this._defaultDayAlpha;
584
584
  },
585
585
  set: function (value) {
586
586
  deprecationWarning(
587
587
  "BingMapsImageryProvider.defaultDayAlpha",
588
- "BingMapsImageryProvider.defaultDayAlpha was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.dayAlpha instead."
588
+ "BingMapsImageryProvider.defaultDayAlpha was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.dayAlpha instead."
589
589
  );
590
590
  this._defaultDayAlpha = value;
591
591
  },
@@ -602,14 +602,14 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
602
602
  get: function () {
603
603
  deprecationWarning(
604
604
  "BingMapsImageryProvider.defaultBrightness",
605
- "BingMapsImageryProvider.defaultBrightness was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.brightness instead."
605
+ "BingMapsImageryProvider.defaultBrightness was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.brightness instead."
606
606
  );
607
607
  return this._defaultBrightness;
608
608
  },
609
609
  set: function (value) {
610
610
  deprecationWarning(
611
611
  "BingMapsImageryProvider.defaultBrightness",
612
- "BingMapsImageryProvider.defaultBrightness was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.brightness instead."
612
+ "BingMapsImageryProvider.defaultBrightness was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.brightness instead."
613
613
  );
614
614
  this._defaultBrightness = value;
615
615
  },
@@ -626,14 +626,14 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
626
626
  get: function () {
627
627
  deprecationWarning(
628
628
  "BingMapsImageryProvider.defaultContrast",
629
- "BingMapsImageryProvider.defaultContrast was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.contrast instead."
629
+ "BingMapsImageryProvider.defaultContrast was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.contrast instead."
630
630
  );
631
631
  return this._defaultContrast;
632
632
  },
633
633
  set: function (value) {
634
634
  deprecationWarning(
635
635
  "BingMapsImageryProvider.defaultContrast",
636
- "BingMapsImageryProvider.defaultContrast was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.contrast instead."
636
+ "BingMapsImageryProvider.defaultContrast was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.contrast instead."
637
637
  );
638
638
  this._defaultContrast = value;
639
639
  },
@@ -649,14 +649,14 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
649
649
  get: function () {
650
650
  deprecationWarning(
651
651
  "BingMapsImageryProvider.defaultHue",
652
- "BingMapsImageryProvider.defaultHue was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.hue instead."
652
+ "BingMapsImageryProvider.defaultHue was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.hue instead."
653
653
  );
654
654
  return this._defaultHue;
655
655
  },
656
656
  set: function (value) {
657
657
  deprecationWarning(
658
658
  "BingMapsImageryProvider.defaultHue",
659
- "BingMapsImageryProvider.defaultHue was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.hue instead."
659
+ "BingMapsImageryProvider.defaultHue was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.hue instead."
660
660
  );
661
661
  this._defaultHue = value;
662
662
  },
@@ -673,14 +673,14 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
673
673
  get: function () {
674
674
  deprecationWarning(
675
675
  "BingMapsImageryProvider.defaultSaturation",
676
- "BingMapsImageryProvider.defaultSaturation was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.saturation instead."
676
+ "BingMapsImageryProvider.defaultSaturation was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.saturation instead."
677
677
  );
678
678
  return this._defaultSaturation;
679
679
  },
680
680
  set: function (value) {
681
681
  deprecationWarning(
682
682
  "BingMapsImageryProvider.defaultSaturation",
683
- "BingMapsImageryProvider.defaultSaturation was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.saturation instead."
683
+ "BingMapsImageryProvider.defaultSaturation was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.saturation instead."
684
684
  );
685
685
  this._defaultSaturation = value;
686
686
  },
@@ -696,14 +696,14 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
696
696
  get: function () {
697
697
  deprecationWarning(
698
698
  "BingMapsImageryProvider.defaultGamma",
699
- "BingMapsImageryProvider.defaultGamma was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.gamma instead."
699
+ "BingMapsImageryProvider.defaultGamma was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.gamma instead."
700
700
  );
701
701
  return this._defaultGamma;
702
702
  },
703
703
  set: function (value) {
704
704
  deprecationWarning(
705
705
  "BingMapsImageryProvider.defaultGamma",
706
- "BingMapsImageryProvider.defaultGamma was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.gamma instead."
706
+ "BingMapsImageryProvider.defaultGamma was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.gamma instead."
707
707
  );
708
708
  this._defaultGamma = value;
709
709
  },
@@ -719,14 +719,14 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
719
719
  get: function () {
720
720
  deprecationWarning(
721
721
  "BingMapsImageryProvider.defaultMinificationFilter",
722
- "BingMapsImageryProvider.defaultMinificationFilter was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.minificationFilter instead."
722
+ "BingMapsImageryProvider.defaultMinificationFilter was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.minificationFilter instead."
723
723
  );
724
724
  return this._defaultMinificationFilter;
725
725
  },
726
726
  set: function (value) {
727
727
  deprecationWarning(
728
728
  "BingMapsImageryProvider.defaultMinificationFilter",
729
- "BingMapsImageryProvider.defaultMinificationFilter was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.minificationFilter instead."
729
+ "BingMapsImageryProvider.defaultMinificationFilter was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.minificationFilter instead."
730
730
  );
731
731
  this._defaultMinificationFilter = value;
732
732
  },
@@ -742,14 +742,14 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
742
742
  get: function () {
743
743
  deprecationWarning(
744
744
  "BingMapsImageryProvider.defaultMagnificationFilter",
745
- "BingMapsImageryProvider.defaultMagnificationFilter was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.magnificationFilter instead."
745
+ "BingMapsImageryProvider.defaultMagnificationFilter was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.magnificationFilter instead."
746
746
  );
747
747
  return this._defaultMagnificationFilter;
748
748
  },
749
749
  set: function (value) {
750
750
  deprecationWarning(
751
751
  "BingMapsImageryProvider.defaultMagnificationFilter",
752
- "BingMapsImageryProvider.defaultMagnificationFilter was deprecated in CesiumJS 1.104. It will be in CesiumJS 1.107. Use ImageryLayer.magnificationFilter instead."
752
+ "BingMapsImageryProvider.defaultMagnificationFilter was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ImageryLayer.magnificationFilter instead."
753
753
  );
754
754
  this._defaultMagnificationFilter = value;
755
755
  },
@@ -1050,9 +1050,6 @@ function getLogDepthPolygonOffsetFragmentShaderProgram(context, shaderProgram) {
1050
1050
  fs.defines = defined(fs.defines) ? fs.defines.slice(0) : [];
1051
1051
  fs.defines.push("POLYGON_OFFSET");
1052
1052
 
1053
- fs.sources.unshift(
1054
- "#ifdef GL_OES_standard_derivatives\n#extension GL_OES_standard_derivatives : enable\n#endif\n"
1055
- );
1056
1053
  shader = context.shaderCache.createDerivedShaderProgram(
1057
1054
  shaderProgram,
1058
1055
  "zBackfaceLogDepth",
@@ -983,12 +983,16 @@ Globe.prototype.beginFrame = function (frameState) {
983
983
  const surface = this._surface;
984
984
  const tileProvider = surface.tileProvider;
985
985
  const terrainProvider = this.terrainProvider;
986
+ // ready is deprecated; This is here for backwards compatibility
987
+ const terrainReady =
988
+ defined(terrainProvider) &&
989
+ (defined(terrainProvider._ready)
990
+ ? terrainProvider._ready
991
+ : !defined(terrainProvider.ready) || terrainProvider.ready);
986
992
  const hasWaterMask =
987
993
  this.showWaterEffect &&
988
- defined(terrainProvider) &&
994
+ terrainReady &&
989
995
  terrainProvider.hasWaterMask &&
990
- // ready is deprecated; This is here for backwards compatibility
991
- terrainProvider._ready &&
992
996
  terrainProvider.hasWaterMask;
993
997
 
994
998
  if (hasWaterMask && this._oceanNormalMapResourceDirty) {
@@ -346,7 +346,13 @@ GlobeSurfaceTile.prototype.processImagery = function (
346
346
  if (tileImagery.loadingImagery.state === ImageryState.PLACEHOLDER) {
347
347
  const imageryLayer = tileImagery.loadingImagery.imageryLayer;
348
348
  // ImageryProvider.ready is deprecated. This is here for backwards compatibility
349
- if (imageryLayer.ready && imageryLayer.imageryProvider._ready) {
349
+ const imageryProvider = imageryLayer.imageryProvider;
350
+ if (
351
+ imageryLayer.ready &&
352
+ (defined(imageryProvider._ready)
353
+ ? imageryProvider._ready
354
+ : !defined(imageryProvider.ready) || imageryProvider.ready)
355
+ ) {
350
356
  // Remove the placeholder and add the actual skeletons (if any)
351
357
  // at the same position. Then continue the loop at the same index.
352
358
  tileImagery.freeResources();
@@ -237,15 +237,32 @@ Object.defineProperties(GlobeSurfaceTileProvider.prototype, {
237
237
  */
238
238
  ready: {
239
239
  get: function () {
240
- return (
241
- defined(this._terrainProvider) &&
240
+ const terrainProvider = this._terrainProvider;
241
+ if (
242
+ !defined(terrainProvider) ||
242
243
  // TerrainProvider.ready is deprecated; This is here for backwards compatibility
243
- this._terrainProvider._ready &&
244
- (this._imageryLayers.length === 0 ||
245
- // ImageryProvider.ready is deprecated; This is here for backwards compatibility
246
- (this._imageryLayers.get(0).ready &&
247
- this._imageryLayers.get(0).imageryProvider._ready))
248
- );
244
+ (defined(terrainProvider._ready)
245
+ ? !terrainProvider._ready
246
+ : defined(terrainProvider.ready) && !terrainProvider.ready)
247
+ ) {
248
+ return false;
249
+ }
250
+
251
+ if (this._imageryLayers.length === 0) {
252
+ return true;
253
+ }
254
+
255
+ const imageryLayer = this._imageryLayers.get(0);
256
+ if (!imageryLayer.ready) {
257
+ return false;
258
+ }
259
+
260
+ // ImageryProvider.ready is deprecated; This is here for backwards compatibility
261
+ const imageryProvider = imageryLayer.imageryProvider;
262
+ const imageryProviderReady = defined(imageryProvider._ready)
263
+ ? imageryProvider._ready
264
+ : !defined(imageryProvider.ready) || imageryProvider.ready;
265
+ return imageryProviderReady;
249
266
  },
250
267
  },
251
268
 
@@ -346,25 +363,30 @@ GlobeSurfaceTileProvider.prototype.update = function (frameState) {
346
363
 
347
364
  function updateCredits(surface, frameState) {
348
365
  const creditDisplay = frameState.creditDisplay;
366
+ const terrainProvider = surface._terrainProvider;
349
367
  if (
350
- defined(surface._terrainProvider) &&
368
+ defined(terrainProvider) &&
351
369
  // ready is deprecated; This is here for backwards compatibility
352
- surface._terrainProvider._ready &&
353
- defined(surface._terrainProvider.credit)
370
+ (defined(terrainProvider._ready)
371
+ ? terrainProvider._ready
372
+ : !defined(terrainProvider.ready) || terrainProvider.ready) &&
373
+ defined(terrainProvider.credit)
354
374
  ) {
355
- creditDisplay.addCreditToNextFrame(surface._terrainProvider.credit);
375
+ creditDisplay.addCreditToNextFrame(terrainProvider.credit);
356
376
  }
357
377
 
358
378
  const imageryLayers = surface._imageryLayers;
359
379
  for (let i = 0, len = imageryLayers.length; i < len; ++i) {
360
380
  const layer = imageryLayers.get(i);
361
- // ImageryProvider.ready is deprecated; This is here for backwards compatibility
362
- if (
363
- layer.ready &&
364
- layer.imageryProvider._ready &&
365
- defined(layer.imageryProvider.credit)
366
- ) {
367
- creditDisplay.addCreditToNextFrame(layer.imageryProvider.credit);
381
+ if (layer.ready) {
382
+ // ImageryProvider.ready is deprecated; This is here for backwards compatibility
383
+ const imageryProvider = layer.imageryProvider;
384
+ const imageryProviderReady = defined(imageryProvider._ready)
385
+ ? imageryProvider._ready
386
+ : !defined(imageryProvider.ready) || imageryProvider.ready;
387
+ if (imageryProviderReady && defined(layer.imageryProvider.credit)) {
388
+ creditDisplay.addCreditToNextFrame(layer.imageryProvider.credit);
389
+ }
368
390
  }
369
391
  }
370
392
  }
@@ -2144,10 +2166,13 @@ function addDrawCommandsForTile(tileProvider, tile, frameState) {
2144
2166
  tileProvider.hasWaterMask && defined(waterMaskTexture);
2145
2167
  const oceanNormalMap = tileProvider.oceanNormalMap;
2146
2168
  const showOceanWaves = showReflectiveOcean && defined(oceanNormalMap);
2169
+ const terrainProvider = tileProvider.terrainProvider;
2147
2170
  const hasVertexNormals =
2148
- defined(tileProvider.terrainProvider) &&
2171
+ defined(terrainProvider) &&
2149
2172
  // ready is deprecated; This is here for backwards compatibility
2150
- tileProvider.terrainProvider._ready &&
2173
+ (defined(terrainProvider._ready)
2174
+ ? terrainProvider._ready
2175
+ : !defined(terrainProvider.ready) || terrainProvider.ready) &&
2151
2176
  tileProvider.terrainProvider.hasVertexNormals;
2152
2177
  const enableFog =
2153
2178
  frameState.fog.enabled && frameState.fog.renderable && !cameraUnderground;