@cesium/engine 9.1.0 → 10.0.0
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.
- package/Build/ThirdParty/Workers/pako_deflate.min.js +108 -210
- package/Build/ThirdParty/Workers/pako_inflate.min.js +466 -568
- package/Build/ThirdParty/Workers/z-worker-pako.js +54 -104
- package/Build/Workers/{chunk-TMMOULW3.js → chunk-2J3JKXCP.js} +5 -5
- package/Build/Workers/{chunk-ZDP32RQI.js → chunk-3WUV74WM.js} +95 -155
- package/Build/Workers/{chunk-FOZQIHZK.js → chunk-4BAE4PWO.js} +6 -6
- package/Build/Workers/{chunk-CYAJYEKW.js → chunk-4MSUJ4I7.js} +8 -8
- package/Build/Workers/{chunk-KPY4F4BW.js → chunk-4YSNMHZ4.js} +6 -6
- package/Build/Workers/{chunk-66E3H2KU.js → chunk-5S7OLEPK.js} +12 -12
- package/Build/Workers/{chunk-4AJGCQFX.js → chunk-7XGC6YB2.js} +14 -14
- package/Build/Workers/{chunk-BDUJXBVF.js → chunk-AA4GZKOT.js} +3 -5
- package/Build/Workers/{chunk-7LPEGKOF.js → chunk-AD5HBJ2F.js} +11 -8
- package/Build/Workers/{chunk-XHLDDE65.js → chunk-AVI4IUWC.js} +11 -11
- package/Build/Workers/{chunk-MWYZ64MH.js → chunk-BCL4PHHT.js} +10 -10
- package/Build/Workers/{chunk-PWF3YJJ5.js → chunk-BDFNKFOE.js} +13 -13
- package/Build/Workers/{chunk-7VZNXIKG.js → chunk-BJF5LOWE.js} +7 -7
- package/Build/Workers/{chunk-3S2MFY4B.js → chunk-C2CGMAIU.js} +13 -13
- package/Build/Workers/{chunk-UAJEGIWA.js → chunk-COYFZ5VA.js} +6 -6
- package/Build/Workers/{chunk-ZWPIM77Q.js → chunk-DGS5QNIO.js} +13 -13
- package/Build/Workers/{chunk-V7JB576Q.js → chunk-DKVHRNFY.js} +5 -5
- package/Build/Workers/{chunk-NI2R52QD.js → chunk-DOXCPOG4.js} +11 -9
- package/Build/Workers/{chunk-XWML5Y7N.js → chunk-FXIHSF7O.js} +9 -9
- package/Build/Workers/{chunk-LW7WGHEU.js → chunk-G3YR53LY.js} +13 -13
- package/Build/Workers/{chunk-34DGOKCO.js → chunk-GR3CDLCP.js} +7 -7
- package/Build/Workers/{chunk-AOIKO5Y7.js → chunk-GRAT5GE7.js} +5 -5
- package/Build/Workers/{chunk-AOFMPKUB.js → chunk-I2RC4XVN.js} +4 -4
- package/Build/Workers/{chunk-PK7TEP3J.js → chunk-JYAHOGGL.js} +15 -15
- package/Build/Workers/{chunk-4KIUON73.js → chunk-KUN2ZA5X.js} +4 -4
- package/Build/Workers/{chunk-POLFRINT.js → chunk-L6RTJ3RE.js} +14 -14
- package/Build/Workers/{chunk-LVJCR7DH.js → chunk-LCLJJ2MZ.js} +18 -18
- package/Build/Workers/{chunk-3RZK5NNV.js → chunk-LEABCTLP.js} +4 -4
- package/Build/Workers/{chunk-QKF7XXEQ.js → chunk-MDHQR3ZS.js} +10 -8
- package/Build/Workers/{chunk-4PHPQRSH.js → chunk-MSKXMXJI.js} +5 -6
- package/Build/Workers/{chunk-GIFJ77E4.js → chunk-NTXTUNEF.js} +4 -4
- package/Build/Workers/{chunk-I5TDPPC4.js → chunk-O3JCMSS3.js} +17 -17
- package/Build/Workers/{chunk-PEABJLCK.js → chunk-OOK53QUQ.js} +1 -1
- package/Build/Workers/{chunk-PS6AEMBR.js → chunk-OORVMGDU.js} +7 -7
- package/Build/Workers/{chunk-JI2445T5.js → chunk-PCP4YQST.js} +11 -11
- package/Build/Workers/{chunk-C5CE4OG6.js → chunk-PYHLO636.js} +42 -13
- package/Build/Workers/{chunk-S4XDCPKD.js → chunk-Q55ECN3Y.js} +1 -1
- package/Build/Workers/{chunk-WWP3I7R5.js → chunk-QD4KM3GO.js} +5 -5
- package/Build/Workers/{chunk-YLZTCEBJ.js → chunk-QMLTCCYG.js} +1 -1
- package/Build/Workers/{chunk-IBXGK4WV.js → chunk-QX5XS4LC.js} +2 -2
- package/Build/Workers/{chunk-RL73GOEF.js → chunk-R6B7UCQB.js} +2 -2
- package/Build/Workers/{chunk-RR7EOKGZ.js → chunk-RJYML24O.js} +48 -85
- package/Build/Workers/{chunk-U4IMCOF5.js → chunk-S3PI2KFM.js} +2 -2
- package/Build/Workers/{chunk-6HCAQOVK.js → chunk-STBBMQGG.js} +6 -6
- package/Build/Workers/{chunk-CE6GTZ4I.js → chunk-SYCPRK3D.js} +10 -10
- package/Build/Workers/{chunk-WFICTTOE.js → chunk-T77JILCU.js} +2 -2
- package/Build/Workers/{chunk-ZC4AGBZK.js → chunk-TO2PVHKI.js} +2 -2
- package/Build/Workers/{chunk-UCPPWV64.js → chunk-VE7BFUIX.js} +1 -1
- package/Build/Workers/{chunk-2CSEEWHN.js → chunk-VFBNELXB.js} +7 -7
- package/Build/Workers/{chunk-A6NCZSL3.js → chunk-VO3ACQB2.js} +19 -19
- package/Build/Workers/{chunk-WEGCQ5DY.js → chunk-X23FRWHJ.js} +6 -6
- package/Build/Workers/{chunk-G7CJQKKD.js → chunk-XD445VDH.js} +7 -7
- package/Build/Workers/combineGeometry.js +22 -22
- package/Build/Workers/createBoxGeometry.js +16 -16
- package/Build/Workers/createBoxOutlineGeometry.js +14 -14
- package/Build/Workers/createCircleGeometry.js +29 -25
- package/Build/Workers/createCircleOutlineGeometry.js +17 -17
- package/Build/Workers/createCoplanarPolygonGeometry.js +32 -32
- package/Build/Workers/createCoplanarPolygonOutlineGeometry.js +29 -29
- package/Build/Workers/createCorridorGeometry.js +29 -29
- package/Build/Workers/createCorridorOutlineGeometry.js +27 -27
- package/Build/Workers/createCylinderGeometry.js +18 -18
- package/Build/Workers/createCylinderOutlineGeometry.js +16 -16
- package/Build/Workers/createEllipseGeometry.js +24 -24
- package/Build/Workers/createEllipseOutlineGeometry.js +17 -17
- package/Build/Workers/createEllipsoidGeometry.js +17 -17
- package/Build/Workers/createEllipsoidOutlineGeometry.js +16 -16
- package/Build/Workers/createFrustumGeometry.js +16 -16
- package/Build/Workers/createFrustumOutlineGeometry.js +16 -16
- package/Build/Workers/createGeometry.js +22 -22
- package/Build/Workers/createGroundPolylineGeometry.js +24 -24
- package/Build/Workers/createPlaneGeometry.js +14 -14
- package/Build/Workers/createPlaneOutlineGeometry.js +13 -13
- package/Build/Workers/createPolygonGeometry.js +32 -32
- package/Build/Workers/createPolygonOutlineGeometry.js +29 -29
- package/Build/Workers/createPolylineGeometry.js +24 -24
- package/Build/Workers/createPolylineVolumeGeometry.js +30 -30
- package/Build/Workers/createPolylineVolumeOutlineGeometry.js +26 -26
- package/Build/Workers/createRectangleGeometry.js +27 -27
- package/Build/Workers/createRectangleOutlineGeometry.js +19 -19
- package/Build/Workers/createSimplePolylineGeometry.js +22 -22
- package/Build/Workers/createSphereGeometry.js +17 -17
- package/Build/Workers/createSphereOutlineGeometry.js +16 -16
- package/Build/Workers/createTaskProcessorWorker.js +3 -3
- package/Build/Workers/createVectorTileClampedPolylines.js +13 -13
- package/Build/Workers/createVectorTileGeometries.js +22 -22
- package/Build/Workers/createVectorTilePoints.js +12 -12
- package/Build/Workers/createVectorTilePolygons.js +20 -20
- package/Build/Workers/createVectorTilePolylines.js +13 -13
- package/Build/Workers/createVerticesFromGoogleEarthEnterpriseBuffer.js +20 -20
- package/Build/Workers/createVerticesFromHeightmap.js +21 -21
- package/Build/Workers/createVerticesFromQuantizedTerrainMesh.js +17 -17
- package/Build/Workers/createWallGeometry.js +23 -23
- package/Build/Workers/createWallOutlineGeometry.js +22 -22
- package/Build/Workers/decodeDraco.js +11 -11
- package/Build/Workers/decodeGoogleEarthEnterprisePacket.js +12 -19
- package/Build/Workers/decodeI3S.js +10 -10
- package/Build/Workers/transcodeKTX2.js +43 -79
- package/Build/Workers/transferTypedArrayTest.js +1 -1
- package/Build/Workers/upsampleQuantizedTerrainMesh.js +20 -20
- package/Source/Core/ApproximateTerrainHeights.js +4 -4
- package/Source/Core/ArcGISTiledElevationTerrainProvider.js +12 -8
- package/Source/Core/BoundingRectangle.js +2 -0
- package/Source/Core/BoundingSphere.js +4 -2
- package/Source/Core/Cartesian3.js +13 -10
- package/Source/Core/Cartographic.js +11 -8
- package/Source/Core/CesiumTerrainProvider.js +3 -2
- package/Source/Core/CircleGeometry.js +6 -2
- package/Source/Core/CircleOutlineGeometry.js +1 -1
- package/Source/Core/CoplanarPolygonGeometry.js +3 -3
- package/Source/Core/CorridorGeometry.js +4 -4
- package/Source/Core/CorridorOutlineGeometry.js +2 -2
- package/Source/Core/Credit.js +3 -2
- package/Source/Core/CustomHeightmapTerrainProvider.js +17 -3
- package/Source/Core/EllipseGeometry.js +4 -4
- package/Source/Core/EllipseOutlineGeometry.js +2 -2
- package/Source/Core/Ellipsoid.js +34 -0
- package/Source/Core/EllipsoidGeodesic.js +2 -2
- package/Source/Core/EllipsoidRhumbLine.js +4 -4
- package/Source/Core/EllipsoidTangentPlane.js +3 -3
- package/Source/Core/EllipsoidTerrainProvider.js +3 -3
- package/Source/Core/GeographicProjection.js +4 -3
- package/Source/Core/GeographicTilingScheme.js +3 -3
- package/Source/Core/GeometryPipeline.js +2 -2
- package/Source/Core/GoogleEarthEnterpriseTerrainProvider.js +1 -1
- package/Source/Core/GoogleMaps.js +1 -1
- package/Source/Core/GroundPolylineGeometry.js +1 -1
- package/Source/Core/HeightmapTessellator.js +2 -2
- package/Source/Core/Ion.js +1 -1
- package/Source/Core/Math.js +0 -5
- package/Source/Core/Occluder.js +3 -3
- package/Source/Core/OrientedBoundingBox.js +2 -2
- package/Source/Core/PolygonGeometry.js +4 -4
- package/Source/Core/PolygonGeometryLibrary.js +1 -1
- package/Source/Core/PolygonOutlineGeometry.js +3 -3
- package/Source/Core/PolygonPipeline.js +2 -2
- package/Source/Core/PolylineGeometry.js +2 -2
- package/Source/Core/PolylinePipeline.js +6 -6
- package/Source/Core/PolylineVolumeGeometry.js +2 -2
- package/Source/Core/PolylineVolumeOutlineGeometry.js +2 -2
- package/Source/Core/Rectangle.js +6 -6
- package/Source/Core/RectangleGeometry.js +6 -6
- package/Source/Core/RectangleGeometryLibrary.js +3 -0
- package/Source/Core/RectangleOutlineGeometry.js +2 -2
- package/Source/Core/Simon1994PlanetaryPositions.js +3 -2
- package/Source/Core/SimplePolylineGeometry.js +2 -2
- package/Source/Core/Stereographic.js +2 -2
- package/Source/Core/TaskProcessor.js +19 -3
- package/Source/Core/Transforms.js +17 -17
- package/Source/Core/VRTheWorldTerrainProvider.js +2 -2
- package/Source/Core/WallGeometry.js +3 -3
- package/Source/Core/WallOutlineGeometry.js +3 -3
- package/Source/Core/WebMercatorTilingScheme.js +3 -3
- package/Source/Core/createWorldTerrainAsync.js +2 -0
- package/Source/Core/sampleTerrain.js +3 -3
- package/Source/DataSources/BoxGeometryUpdater.js +2 -2
- package/Source/DataSources/CylinderGeometryUpdater.js +2 -2
- package/Source/DataSources/CzmlDataSource.js +8 -8
- package/Source/DataSources/EllipsoidGeometryUpdater.js +3 -3
- package/Source/DataSources/EntityCluster.js +1 -1
- package/Source/DataSources/EntityView.js +2 -2
- package/Source/DataSources/KmlDataSource.js +4 -4
- package/Source/DataSources/ModelVisualizer.js +1 -2
- package/Source/DataSources/PolygonGeometryUpdater.js +1 -1
- package/Source/DataSources/PolylineGeometryUpdater.js +3 -2
- package/Source/DataSources/RectangleGeometryUpdater.js +1 -1
- package/Source/DataSources/ScaledPositionProperty.js +2 -2
- package/Source/DataSources/TerrainOffsetProperty.js +3 -7
- package/Source/DataSources/VelocityOrientationProperty.js +2 -2
- package/Source/DataSources/exportKml.js +2 -2
- package/Source/Renderer/UniformState.js +1 -1
- package/Source/Scene/ArcGisMapServerImageryProvider.js +2 -2
- package/Source/Scene/ArcGisMapService.js +1 -1
- package/Source/Scene/Billboard.js +8 -6
- package/Source/Scene/BingMapsImageryProvider.js +1 -1
- package/Source/Scene/Camera.js +16 -10
- package/Source/Scene/Cesium3DTileset.js +1 -1
- package/Source/Scene/ClippingPolygon.js +2 -2
- package/Source/Scene/ClippingPolygonCollection.js +1 -1
- package/Source/Scene/CreditDisplay.js +94 -104
- package/Source/Scene/Globe.js +16 -13
- package/Source/Scene/GltfLoader.js +458 -435
- package/Source/Scene/GltfLoaderUtil.js +5 -16
- package/Source/Scene/GltfPipeline/forEachTextureInMaterial.js +23 -7
- package/Source/Scene/GltfStructuralMetadataLoader.js +11 -9
- package/Source/Scene/GoogleEarthEnterpriseImageryProvider.js +1 -1
- package/Source/Scene/GoogleEarthEnterpriseMapsProvider.js +1 -1
- package/Source/Scene/GridImageryProvider.js +2 -2
- package/Source/Scene/ImageryLayerCollection.js +2 -2
- package/Source/Scene/Label.js +1 -1
- package/Source/Scene/MapboxImageryProvider.js +1 -1
- package/Source/Scene/MapboxStyleImageryProvider.js +1 -1
- package/Source/Scene/MetadataSemantic.js +4 -4
- package/Source/Scene/Model/AlphaPipelineStage.js +1 -1
- package/Source/Scene/Model/GeometryPipelineStage.js +15 -43
- package/Source/Scene/Model/ImageBasedLightingPipelineStage.js +7 -0
- package/Source/Scene/Model/InstancingPipelineStage.js +3 -3
- package/Source/Scene/Model/LightingPipelineStage.js +2 -4
- package/Source/Scene/Model/MaterialPipelineStage.js +395 -29
- package/Source/Scene/Model/Model.js +15 -7
- package/Source/Scene/Model/ModelSceneGraph.js +1 -1
- package/Source/Scene/Model/ModelUtility.js +3 -0
- package/Source/Scene/Model/SceneMode2DPipelineStage.js +3 -3
- package/Source/Scene/Model/VerticalExaggerationPipelineStage.js +4 -6
- package/Source/Scene/Model/pickModel.js +2 -2
- package/Source/Scene/ModelComponents.js +178 -1
- package/Source/Scene/PickDepth.js +23 -15
- package/Source/Scene/Picking.js +4 -13
- package/Source/Scene/PointPrimitive.js +5 -2
- package/Source/Scene/ResourceCache.js +41 -50
- package/Source/Scene/ResourceCacheKey.js +41 -53
- package/Source/Scene/Scene.js +39 -31
- package/Source/Scene/SceneTransforms.js +78 -20
- package/Source/Scene/SceneTransitioner.js +2 -2
- package/Source/Scene/ScreenSpaceCameraController.js +29 -19
- package/Source/Scene/SkyBox.js +26 -0
- package/Source/Scene/Sun.js +1 -1
- package/Source/Shaders/Builtin/CzmBuiltins.js +4 -10
- package/Source/Shaders/Builtin/Functions/ellipsoidTextureCoordinates.glsl +10 -0
- package/Source/Shaders/Builtin/Functions/{ellipsoidWgs84TextureCoordinates.js → ellipsoidTextureCoordinates.js} +3 -3
- package/Source/Shaders/Builtin/Functions/maximumComponent.glsl +21 -0
- package/Source/Shaders/Builtin/Functions/maximumComponent.js +23 -0
- package/Source/Shaders/Builtin/Functions/pbrLighting.glsl +108 -44
- package/Source/Shaders/Builtin/Functions/pbrLighting.js +108 -44
- package/Source/Shaders/Builtin/Structs/materialInput.glsl +1 -1
- package/Source/Shaders/Builtin/Structs/materialInput.js +1 -1
- package/Source/Shaders/Builtin/Structs/modelMaterial.glsl +16 -0
- package/Source/Shaders/Builtin/Structs/modelMaterial.js +16 -0
- package/Source/Shaders/EllipsoidFS.glsl +1 -1
- package/Source/Shaders/EllipsoidFS.js +1 -1
- package/Source/Shaders/GlobeFS.glsl +3 -3
- package/Source/Shaders/GlobeFS.js +3 -3
- package/Source/Shaders/Model/ImageBasedLightingStageFS.glsl +211 -133
- package/Source/Shaders/Model/ImageBasedLightingStageFS.js +212 -133
- package/Source/Shaders/Model/LightingStageFS.glsl +113 -48
- package/Source/Shaders/Model/LightingStageFS.js +113 -48
- package/Source/Shaders/Model/MaterialStageFS.glsl +407 -136
- package/Source/Shaders/Model/MaterialStageFS.js +407 -136
- package/Source/Widget/CesiumWidget.css +0 -5
- package/Source/Widget/CesiumWidget.js +29 -28
- package/index.d.ts +184 -116
- package/index.js +92 -95
- package/package.json +2 -2
- package/Source/Shaders/Builtin/Functions/defaultPbrMaterial.glsl +0 -16
- package/Source/Shaders/Builtin/Functions/defaultPbrMaterial.js +0 -18
- package/Source/Shaders/Builtin/Functions/ellipsoidWgs84TextureCoordinates.glsl +0 -10
- package/Source/Shaders/Builtin/Functions/pbrMetallicRoughnessMaterial.glsl +0 -37
- package/Source/Shaders/Builtin/Functions/pbrMetallicRoughnessMaterial.js +0 -39
- package/Source/Shaders/Builtin/Functions/pbrSpecularGlossinessMaterial.glsl +0 -30
- package/Source/Shaders/Builtin/Functions/pbrSpecularGlossinessMaterial.js +0 -32
- package/Source/Shaders/Builtin/Structs/pbrParameters.glsl +0 -16
- package/Source/Shaders/Builtin/Structs/pbrParameters.js +0 -18
|
@@ -24,7 +24,7 @@ function DataRectangle(rectangle, maxLevel) {
|
|
|
24
24
|
*
|
|
25
25
|
* Initialization options for the VRTheWorldTerrainProvider constructor
|
|
26
26
|
*
|
|
27
|
-
* @property {Ellipsoid} [ellipsoid] The ellipsoid. If not specified, the
|
|
27
|
+
* @property {Ellipsoid} [ellipsoid=Ellipsoid.default] The ellipsoid. If not specified, the default ellipsoid is used.
|
|
28
28
|
* @property {Credit|string} [credit] A credit for the data source, which is displayed on the canvas.
|
|
29
29
|
*/
|
|
30
30
|
|
|
@@ -37,7 +37,7 @@ function DataRectangle(rectangle, maxLevel) {
|
|
|
37
37
|
* @param {VRTheWorldTerrainProvider.ConstructorOptions} options An object describing initialization options
|
|
38
38
|
*/
|
|
39
39
|
function TerrainProviderBuilder(options) {
|
|
40
|
-
this.ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.
|
|
40
|
+
this.ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.default);
|
|
41
41
|
this.tilingScheme = undefined;
|
|
42
42
|
this.heightmapWidth = undefined;
|
|
43
43
|
this.heightmapHeight = undefined;
|
|
@@ -36,7 +36,7 @@ const scratchNormal = new Cartesian3();
|
|
|
36
36
|
* wall at <code>positions</code>. If undefined, the height of each position in used.
|
|
37
37
|
* @param {number[]} [options.minimumHeights] An array parallel to <code>positions</code> that give the minimum height of the
|
|
38
38
|
* wall at <code>positions</code>. If undefined, the height at each position is 0.0.
|
|
39
|
-
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.
|
|
39
|
+
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.default] The ellipsoid for coordinate manipulation
|
|
40
40
|
* @param {VertexFormat} [options.vertexFormat=VertexFormat.DEFAULT] The vertex attributes to be computed.
|
|
41
41
|
*
|
|
42
42
|
* @exception {DeveloperError} positions length must be greater than or equal to 2.
|
|
@@ -95,7 +95,7 @@ function WallGeometry(options) {
|
|
|
95
95
|
options.granularity,
|
|
96
96
|
CesiumMath.RADIANS_PER_DEGREE
|
|
97
97
|
);
|
|
98
|
-
const ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.
|
|
98
|
+
const ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.default);
|
|
99
99
|
|
|
100
100
|
this._positions = wallPositions;
|
|
101
101
|
this._minimumHeights = minimumHeights;
|
|
@@ -280,7 +280,7 @@ WallGeometry.unpack = function (array, startingIndex, result) {
|
|
|
280
280
|
* wall at <code>positions</code>. If undefined, the height of each position in used.
|
|
281
281
|
* @param {number} [options.minimumHeight] A constant that defines the minimum height of the
|
|
282
282
|
* wall at <code>positions</code>. If undefined, the height at each position is 0.0.
|
|
283
|
-
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.
|
|
283
|
+
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.default] The ellipsoid for coordinate manipulation
|
|
284
284
|
* @param {VertexFormat} [options.vertexFormat=VertexFormat.DEFAULT] The vertex attributes to be computed.
|
|
285
285
|
* @returns {WallGeometry}
|
|
286
286
|
*
|
|
@@ -30,7 +30,7 @@ const scratchCartesian3Position2 = new Cartesian3();
|
|
|
30
30
|
* wall at <code>positions</code>. If undefined, the height of each position in used.
|
|
31
31
|
* @param {number[]} [options.minimumHeights] An array parallel to <code>positions</code> that give the minimum height of the
|
|
32
32
|
* wall at <code>positions</code>. If undefined, the height at each position is 0.0.
|
|
33
|
-
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.
|
|
33
|
+
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.default] The ellipsoid for coordinate manipulation
|
|
34
34
|
*
|
|
35
35
|
* @exception {DeveloperError} positions length must be greater than or equal to 2.
|
|
36
36
|
* @exception {DeveloperError} positions and maximumHeights must have the same length.
|
|
@@ -85,7 +85,7 @@ function WallOutlineGeometry(options) {
|
|
|
85
85
|
options.granularity,
|
|
86
86
|
CesiumMath.RADIANS_PER_DEGREE
|
|
87
87
|
);
|
|
88
|
-
const ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.
|
|
88
|
+
const ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.default);
|
|
89
89
|
|
|
90
90
|
this._positions = wallPositions;
|
|
91
91
|
this._minimumHeights = minimumHeights;
|
|
@@ -255,7 +255,7 @@ WallOutlineGeometry.unpack = function (array, startingIndex, result) {
|
|
|
255
255
|
* wall at <code>positions</code>. If undefined, the height of each position in used.
|
|
256
256
|
* @param {number} [options.minimumHeight] A constant that defines the minimum height of the
|
|
257
257
|
* wall at <code>positions</code>. If undefined, the height at each position is 0.0.
|
|
258
|
-
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.
|
|
258
|
+
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.default] The ellipsoid for coordinate manipulation
|
|
259
259
|
* @returns {WallOutlineGeometry}
|
|
260
260
|
*
|
|
261
261
|
*
|
|
@@ -13,8 +13,8 @@ import WebMercatorProjection from "./WebMercatorProjection.js";
|
|
|
13
13
|
* @constructor
|
|
14
14
|
*
|
|
15
15
|
* @param {object} [options] Object with the following properties:
|
|
16
|
-
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.
|
|
17
|
-
* the
|
|
16
|
+
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.default] The ellipsoid whose surface is being tiled. Defaults to
|
|
17
|
+
* the default ellipsoid.
|
|
18
18
|
* @param {number} [options.numberOfLevelZeroTilesX=1] The number of tiles in the X direction at level zero of
|
|
19
19
|
* the tile tree.
|
|
20
20
|
* @param {number} [options.numberOfLevelZeroTilesY=1] The number of tiles in the Y direction at level zero of
|
|
@@ -31,7 +31,7 @@ import WebMercatorProjection from "./WebMercatorProjection.js";
|
|
|
31
31
|
function WebMercatorTilingScheme(options) {
|
|
32
32
|
options = defaultValue(options, defaultValue.EMPTY_OBJECT);
|
|
33
33
|
|
|
34
|
-
this._ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.
|
|
34
|
+
this._ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.default);
|
|
35
35
|
this._numberOfLevelZeroTilesX = defaultValue(
|
|
36
36
|
options.numberOfLevelZeroTilesX,
|
|
37
37
|
1
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import CesiumTerrainProvider from "./CesiumTerrainProvider.js";
|
|
2
2
|
import defaultValue from "./defaultValue.js";
|
|
3
|
+
import Ellipsoid from "./Ellipsoid.js";
|
|
3
4
|
|
|
4
5
|
/**
|
|
5
6
|
* Creates a {@link CesiumTerrainProvider} instance for the {@link https://cesium.com/content/#cesium-world-terrain|Cesium World Terrain}.
|
|
@@ -43,6 +44,7 @@ function createWorldTerrainAsync(options) {
|
|
|
43
44
|
return CesiumTerrainProvider.fromIonAssetId(1, {
|
|
44
45
|
requestVertexNormals: defaultValue(options.requestVertexNormals, false),
|
|
45
46
|
requestWaterMask: defaultValue(options.requestWaterMask, false),
|
|
47
|
+
ellipsoid: Ellipsoid.WGS84,
|
|
46
48
|
});
|
|
47
49
|
}
|
|
48
50
|
export default createWorldTerrainAsync;
|
|
@@ -20,7 +20,7 @@ import defined from "./defined.js";
|
|
|
20
20
|
* @param {TerrainProvider} terrainProvider The terrain provider from which to query heights.
|
|
21
21
|
* @param {number} level The terrain level-of-detail from which to query terrain heights.
|
|
22
22
|
* @param {Cartographic[]} positions The positions to update with terrain heights.
|
|
23
|
-
* @param {boolean} [rejectOnTileFail=false] If true, for
|
|
23
|
+
* @param {boolean} [rejectOnTileFail=false] If true, for any failed terrain tile requests, the promise will be rejected. If false, returned heights will be undefined.
|
|
24
24
|
* @returns {Promise<Cartographic[]>} A promise that resolves to the provided list of positions when terrain the query has completed.
|
|
25
25
|
*
|
|
26
26
|
* @see sampleTerrainMostDetailed
|
|
@@ -139,12 +139,12 @@ function drainTileRequestQueue(tileRequests, results, rejectOnTileFail) {
|
|
|
139
139
|
rejectOnTileFail
|
|
140
140
|
);
|
|
141
141
|
if (success) {
|
|
142
|
-
return drainTileRequestQueue(tileRequests, results);
|
|
142
|
+
return drainTileRequestQueue(tileRequests, results, rejectOnTileFail);
|
|
143
143
|
}
|
|
144
144
|
|
|
145
145
|
// wait a small fixed amount of time first, before retrying the same request again
|
|
146
146
|
return delay(100).then(() => {
|
|
147
|
-
return drainTileRequestQueue(tileRequests, results);
|
|
147
|
+
return drainTileRequestQueue(tileRequests, results, rejectOnTileFail);
|
|
148
148
|
});
|
|
149
149
|
}
|
|
150
150
|
|
|
@@ -147,7 +147,7 @@ BoxGeometryUpdater.prototype.createFillGeometryInstance = function (time) {
|
|
|
147
147
|
time,
|
|
148
148
|
entity.box.heightReference,
|
|
149
149
|
this._options.dimensions.z * 0.5,
|
|
150
|
-
this._scene.
|
|
150
|
+
this._scene.ellipsoid
|
|
151
151
|
),
|
|
152
152
|
attributes: attributes,
|
|
153
153
|
});
|
|
@@ -215,7 +215,7 @@ BoxGeometryUpdater.prototype.createOutlineGeometryInstance = function (time) {
|
|
|
215
215
|
time,
|
|
216
216
|
entity.box.heightReference,
|
|
217
217
|
this._options.dimensions.z * 0.5,
|
|
218
|
-
this._scene.
|
|
218
|
+
this._scene.ellipsoid
|
|
219
219
|
),
|
|
220
220
|
attributes: attributes,
|
|
221
221
|
});
|
|
@@ -157,7 +157,7 @@ CylinderGeometryUpdater.prototype.createFillGeometryInstance = function (time) {
|
|
|
157
157
|
time,
|
|
158
158
|
entity.cylinder.heightReference,
|
|
159
159
|
this._options.length * 0.5,
|
|
160
|
-
this._scene.
|
|
160
|
+
this._scene.ellipsoid
|
|
161
161
|
),
|
|
162
162
|
attributes: attributes,
|
|
163
163
|
});
|
|
@@ -227,7 +227,7 @@ CylinderGeometryUpdater.prototype.createOutlineGeometryInstance = function (
|
|
|
227
227
|
time,
|
|
228
228
|
entity.cylinder.heightReference,
|
|
229
229
|
this._options.length * 0.5,
|
|
230
|
-
this._scene.
|
|
230
|
+
this._scene.ellipsoid
|
|
231
231
|
),
|
|
232
232
|
attributes: attributes,
|
|
233
233
|
});
|
|
@@ -279,7 +279,7 @@ function convertCartographicRadiansToCartesian(cartographicRadians) {
|
|
|
279
279
|
scratchCartographic.longitude = cartographicRadians[0];
|
|
280
280
|
scratchCartographic.latitude = cartographicRadians[1];
|
|
281
281
|
scratchCartographic.height = cartographicRadians[2];
|
|
282
|
-
Ellipsoid.
|
|
282
|
+
Ellipsoid.default.cartographicToCartesian(
|
|
283
283
|
scratchCartographic,
|
|
284
284
|
scratchCartesian
|
|
285
285
|
);
|
|
@@ -293,7 +293,7 @@ function convertCartographicRadiansToCartesian(cartographicRadians) {
|
|
|
293
293
|
scratchCartographic.longitude = cartographicRadians[i + 1];
|
|
294
294
|
scratchCartographic.latitude = cartographicRadians[i + 2];
|
|
295
295
|
scratchCartographic.height = cartographicRadians[i + 3];
|
|
296
|
-
Ellipsoid.
|
|
296
|
+
Ellipsoid.default.cartographicToCartesian(
|
|
297
297
|
scratchCartographic,
|
|
298
298
|
scratchCartesian
|
|
299
299
|
);
|
|
@@ -313,7 +313,7 @@ function convertCartographicDegreesToCartesian(cartographicDegrees) {
|
|
|
313
313
|
);
|
|
314
314
|
scratchCartographic.latitude = CesiumMath.toRadians(cartographicDegrees[1]);
|
|
315
315
|
scratchCartographic.height = cartographicDegrees[2];
|
|
316
|
-
Ellipsoid.
|
|
316
|
+
Ellipsoid.default.cartographicToCartesian(
|
|
317
317
|
scratchCartographic,
|
|
318
318
|
scratchCartesian
|
|
319
319
|
);
|
|
@@ -331,7 +331,7 @@ function convertCartographicDegreesToCartesian(cartographicDegrees) {
|
|
|
331
331
|
cartographicDegrees[i + 2]
|
|
332
332
|
);
|
|
333
333
|
scratchCartographic.height = cartographicDegrees[i + 3];
|
|
334
|
-
Ellipsoid.
|
|
334
|
+
Ellipsoid.default.cartographicToCartesian(
|
|
335
335
|
scratchCartographic,
|
|
336
336
|
scratchCartesian
|
|
337
337
|
);
|
|
@@ -1828,12 +1828,12 @@ function processPositionArrayPacketData(
|
|
|
1828
1828
|
} else if (defined(packetData.cartographicRadians)) {
|
|
1829
1829
|
packetData.array = Cartesian3.fromRadiansArrayHeights(
|
|
1830
1830
|
packetData.cartographicRadians,
|
|
1831
|
-
Ellipsoid.
|
|
1831
|
+
Ellipsoid.default
|
|
1832
1832
|
);
|
|
1833
1833
|
} else if (defined(packetData.cartographicDegrees)) {
|
|
1834
1834
|
packetData.array = Cartesian3.fromDegreesArrayHeights(
|
|
1835
1835
|
packetData.cartographicDegrees,
|
|
1836
|
-
Ellipsoid.
|
|
1836
|
+
Ellipsoid.default
|
|
1837
1837
|
);
|
|
1838
1838
|
}
|
|
1839
1839
|
|
|
@@ -1885,11 +1885,11 @@ function unpackCartesianArray(array) {
|
|
|
1885
1885
|
}
|
|
1886
1886
|
|
|
1887
1887
|
function unpackCartographicRadiansArray(array) {
|
|
1888
|
-
return Cartesian3.fromRadiansArrayHeights(array, Ellipsoid.
|
|
1888
|
+
return Cartesian3.fromRadiansArrayHeights(array, Ellipsoid.default);
|
|
1889
1889
|
}
|
|
1890
1890
|
|
|
1891
1891
|
function unpackCartographicDegreesArray(array) {
|
|
1892
|
-
return Cartesian3.fromDegreesArrayHeights(array, Ellipsoid.
|
|
1892
|
+
return Cartesian3.fromDegreesArrayHeights(array, Ellipsoid.default);
|
|
1893
1893
|
}
|
|
1894
1894
|
|
|
1895
1895
|
function processPositionArrayOfArraysPacketData(
|
|
@@ -178,7 +178,7 @@ EllipsoidGeometryUpdater.prototype.createFillGeometryInstance = function (
|
|
|
178
178
|
time,
|
|
179
179
|
entity.ellipsoid.heightReference,
|
|
180
180
|
this._options.radii.z * 0.5,
|
|
181
|
-
this._scene.
|
|
181
|
+
this._scene.ellipsoid,
|
|
182
182
|
modelMatrixResult
|
|
183
183
|
),
|
|
184
184
|
attributes: attributes,
|
|
@@ -250,7 +250,7 @@ EllipsoidGeometryUpdater.prototype.createOutlineGeometryInstance = function (
|
|
|
250
250
|
time,
|
|
251
251
|
entity.ellipsoid.heightReference,
|
|
252
252
|
this._options.radii.z * 0.5,
|
|
253
|
-
this._scene.
|
|
253
|
+
this._scene.ellipsoid,
|
|
254
254
|
modelMatrixResult
|
|
255
255
|
),
|
|
256
256
|
attributes: attributes,
|
|
@@ -413,7 +413,7 @@ DynamicEllipsoidGeometryUpdater.prototype.update = function (time) {
|
|
|
413
413
|
time,
|
|
414
414
|
ellipsoid.heightReference,
|
|
415
415
|
radii.z * 0.5,
|
|
416
|
-
this._scene.
|
|
416
|
+
this._scene.ellipsoid,
|
|
417
417
|
this._modelMatrix
|
|
418
418
|
)
|
|
419
419
|
: undefined;
|
|
@@ -280,7 +280,7 @@ function createDeclutterCallback(entityCluster) {
|
|
|
280
280
|
const previousHeight = entityCluster._previousHeight;
|
|
281
281
|
const currentHeight = scene.camera.positionCartographic.height;
|
|
282
282
|
|
|
283
|
-
const ellipsoid = scene.
|
|
283
|
+
const ellipsoid = scene.ellipsoid;
|
|
284
284
|
const cameraPosition = scene.camera.positionWC;
|
|
285
285
|
const occluder = new EllipsoidalOccluder(ellipsoid, cameraPosition);
|
|
286
286
|
|
|
@@ -277,7 +277,7 @@ function updateTransform(
|
|
|
277
277
|
*
|
|
278
278
|
* @param {Entity} entity The entity to track with the camera.
|
|
279
279
|
* @param {Scene} scene The scene to use.
|
|
280
|
-
* @param {Ellipsoid} [ellipsoid=Ellipsoid.
|
|
280
|
+
* @param {Ellipsoid} [ellipsoid=Ellipsoid.default] The ellipsoid to use for orienting the camera.
|
|
281
281
|
*/
|
|
282
282
|
function EntityView(entity, scene, ellipsoid) {
|
|
283
283
|
//>>includeStart('debug', pragmas.debug);
|
|
@@ -301,7 +301,7 @@ function EntityView(entity, scene, ellipsoid) {
|
|
|
301
301
|
* The ellipsoid to use for orienting the camera.
|
|
302
302
|
* @type {Ellipsoid}
|
|
303
303
|
*/
|
|
304
|
-
this.ellipsoid = defaultValue(ellipsoid, Ellipsoid.
|
|
304
|
+
this.ellipsoid = defaultValue(ellipsoid, Ellipsoid.default);
|
|
305
305
|
|
|
306
306
|
/**
|
|
307
307
|
* The bounding sphere of the object.
|
|
@@ -3545,7 +3545,7 @@ function load(dataSource, entityCollection, data, options) {
|
|
|
3545
3545
|
*
|
|
3546
3546
|
* @property {string} [sourceUri] Overrides the url to use for resolving relative links and other KML network features.
|
|
3547
3547
|
* @property {boolean} [clampToGround=false] true if we want the geometry features (Polygons, LineStrings and LinearRings) clamped to the ground.
|
|
3548
|
-
* @property {Ellipsoid} [ellipsoid=Ellipsoid.
|
|
3548
|
+
* @property {Ellipsoid} [ellipsoid=Ellipsoid.default] The global ellipsoid used for geographical calculations.
|
|
3549
3549
|
* @property {Element|string} [screenOverlayContainer] A container for ScreenOverlay images.
|
|
3550
3550
|
*/
|
|
3551
3551
|
|
|
@@ -3560,7 +3560,7 @@ function load(dataSource, entityCollection, data, options) {
|
|
|
3560
3560
|
*
|
|
3561
3561
|
* @property {string} [sourceUri] Overrides the url to use for resolving relative links and other KML network features.
|
|
3562
3562
|
* @property {boolean} [clampToGround=false] true if we want the geometry features (Polygons, LineStrings and LinearRings) clamped to the ground.
|
|
3563
|
-
* @property {Ellipsoid} [ellipsoid=Ellipsoid.
|
|
3563
|
+
* @property {Ellipsoid} [ellipsoid=Ellipsoid.default] The global ellipsoid used for geographical calculations.
|
|
3564
3564
|
* @property {Element|string} [screenOverlayContainer] A container for ScreenOverlay images.
|
|
3565
3565
|
|
|
3566
3566
|
*/
|
|
@@ -3647,7 +3647,7 @@ function KmlDataSource(options) {
|
|
|
3647
3647
|
: Rectangle.clone(Rectangle.MAX_VALUE),
|
|
3648
3648
|
};
|
|
3649
3649
|
|
|
3650
|
-
this._ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.
|
|
3650
|
+
this._ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.default);
|
|
3651
3651
|
|
|
3652
3652
|
// User specified credit
|
|
3653
3653
|
let credit = options.credit;
|
|
@@ -4204,7 +4204,7 @@ KmlDataSource.prototype.update = function (time) {
|
|
|
4204
4204
|
const href = networkLink.href.clone();
|
|
4205
4205
|
|
|
4206
4206
|
href.setQueryParameters(networkLink.cookie);
|
|
4207
|
-
const ellipsoid = defaultValue(that._ellipsoid, Ellipsoid.
|
|
4207
|
+
const ellipsoid = defaultValue(that._ellipsoid, Ellipsoid.default);
|
|
4208
4208
|
processNetworkLinkQueryString(
|
|
4209
4209
|
href,
|
|
4210
4210
|
that.camera,
|
|
@@ -441,8 +441,7 @@ ModelVisualizer.prototype.getBoundingSphere = function (entity, result) {
|
|
|
441
441
|
}
|
|
442
442
|
|
|
443
443
|
const scene = this._scene;
|
|
444
|
-
const
|
|
445
|
-
const ellipsoid = defaultValue(globe?.ellipsoid, Ellipsoid.WGS84);
|
|
444
|
+
const ellipsoid = defaultValue(scene.ellipsoid, Ellipsoid.default);
|
|
446
445
|
|
|
447
446
|
const hasHeightReference = model.heightReference !== HeightReference.NONE;
|
|
448
447
|
if (hasHeightReference) {
|
|
@@ -243,7 +243,7 @@ PolygonGeometryUpdater.prototype._computeCenter = function (time, result) {
|
|
|
243
243
|
if (positions.length === 0) {
|
|
244
244
|
return;
|
|
245
245
|
}
|
|
246
|
-
const ellipsoid = this._scene.
|
|
246
|
+
const ellipsoid = this._scene.ellipsoid;
|
|
247
247
|
|
|
248
248
|
const tangentPlane = EllipsoidTangentPlane.fromPoints(positions, ellipsoid);
|
|
249
249
|
const positions2D = tangentPlane.projectPointsOntoPlane(
|
|
@@ -789,8 +789,9 @@ DynamicGeometryUpdater.prototype.update = function (time) {
|
|
|
789
789
|
arcType = Property.getValueOrDefault(polyline._arcType, time, arcType);
|
|
790
790
|
|
|
791
791
|
const globe = geometryUpdater._scene.globe;
|
|
792
|
+
const ellipsoid = geometryUpdater._scene.ellipsoid;
|
|
792
793
|
if (arcType !== ArcType.NONE && defined(globe)) {
|
|
793
|
-
generateCartesianArcOptions.ellipsoid =
|
|
794
|
+
generateCartesianArcOptions.ellipsoid = ellipsoid;
|
|
794
795
|
generateCartesianArcOptions.positions = positions;
|
|
795
796
|
generateCartesianArcOptions.granularity = Property.getValueOrUndefined(
|
|
796
797
|
polyline._granularity,
|
|
@@ -798,7 +799,7 @@ DynamicGeometryUpdater.prototype.update = function (time) {
|
|
|
798
799
|
);
|
|
799
800
|
generateCartesianArcOptions.height = PolylinePipeline.extractHeights(
|
|
800
801
|
positions,
|
|
801
|
-
|
|
802
|
+
ellipsoid
|
|
802
803
|
);
|
|
803
804
|
if (arcType === ArcType.GEODESIC) {
|
|
804
805
|
positions = PolylinePipeline.generateCartesianArc(
|
|
@@ -220,7 +220,7 @@ RectangleGeometryUpdater.prototype._computeCenter = function (time, result) {
|
|
|
220
220
|
return;
|
|
221
221
|
}
|
|
222
222
|
const center = Rectangle.center(rect, scratchCarto);
|
|
223
|
-
return Cartographic.toCartesian(center, Ellipsoid.
|
|
223
|
+
return Cartographic.toCartesian(center, Ellipsoid.default, result);
|
|
224
224
|
};
|
|
225
225
|
|
|
226
226
|
RectangleGeometryUpdater.prototype._isHidden = function (entity, rectangle) {
|
|
@@ -6,7 +6,7 @@ import ReferenceFrame from "../Core/ReferenceFrame.js";
|
|
|
6
6
|
import Property from "./Property.js";
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
|
-
* This is a temporary class for scaling position properties to the
|
|
9
|
+
* This is a temporary class for scaling position properties to the ellipsoid surface.
|
|
10
10
|
* It will go away or be refactored to support data with arbitrary height references.
|
|
11
11
|
* @private
|
|
12
12
|
*/
|
|
@@ -80,7 +80,7 @@ ScaledPositionProperty.prototype.getValueInReferenceFrame = function (
|
|
|
80
80
|
|
|
81
81
|
result = this._value.getValueInReferenceFrame(time, referenceFrame, result);
|
|
82
82
|
return defined(result)
|
|
83
|
-
? Ellipsoid.
|
|
83
|
+
? Ellipsoid.default.scaleToGeodeticSurface(result, result)
|
|
84
84
|
: undefined;
|
|
85
85
|
};
|
|
86
86
|
|
|
@@ -72,7 +72,7 @@ function TerrainOffsetProperty(
|
|
|
72
72
|
|
|
73
73
|
this._updateClamping();
|
|
74
74
|
|
|
75
|
-
this._normal = scene.
|
|
75
|
+
this._normal = scene.ellipsoid.geodeticSurfaceNormal(
|
|
76
76
|
position,
|
|
77
77
|
this._normal
|
|
78
78
|
);
|
|
@@ -115,14 +115,13 @@ TerrainOffsetProperty.prototype._updateClamping = function () {
|
|
|
115
115
|
}
|
|
116
116
|
|
|
117
117
|
const scene = this._scene;
|
|
118
|
-
const globe = scene.globe;
|
|
119
118
|
const position = this._position;
|
|
120
119
|
|
|
121
120
|
if (Cartesian3.equals(position, Cartesian3.ZERO)) {
|
|
122
121
|
this._terrainHeight = 0;
|
|
123
122
|
return;
|
|
124
123
|
}
|
|
125
|
-
const ellipsoid =
|
|
124
|
+
const ellipsoid = scene.ellipsoid;
|
|
126
125
|
const cartographicPosition = ellipsoid.cartesianToCartographic(
|
|
127
126
|
position,
|
|
128
127
|
this._cartographicPosition
|
|
@@ -204,10 +203,7 @@ TerrainOffsetProperty.prototype.getValue = function (time, result) {
|
|
|
204
203
|
|
|
205
204
|
this._updateClamping();
|
|
206
205
|
|
|
207
|
-
const normal = scene.
|
|
208
|
-
position,
|
|
209
|
-
this._normal
|
|
210
|
-
);
|
|
206
|
+
const normal = scene.ellipsoid.geodeticSurfaceNormal(position, this._normal);
|
|
211
207
|
return Cartesian3.multiplyByScalar(normal, this._terrainHeight, result);
|
|
212
208
|
};
|
|
213
209
|
|
|
@@ -17,7 +17,7 @@ import VelocityVectorProperty from "./VelocityVectorProperty.js";
|
|
|
17
17
|
* @constructor
|
|
18
18
|
*
|
|
19
19
|
* @param {PositionProperty} [position] The position property used to compute the orientation.
|
|
20
|
-
* @param {Ellipsoid} [ellipsoid=Ellipsoid.
|
|
20
|
+
* @param {Ellipsoid} [ellipsoid=Ellipsoid.default] The ellipsoid used to determine which way is up.
|
|
21
21
|
*
|
|
22
22
|
* @example
|
|
23
23
|
* //Create an entity with position and orientation.
|
|
@@ -34,7 +34,7 @@ function VelocityOrientationProperty(position, ellipsoid) {
|
|
|
34
34
|
this._ellipsoid = undefined;
|
|
35
35
|
this._definitionChanged = new Event();
|
|
36
36
|
|
|
37
|
-
this.ellipsoid = defaultValue(ellipsoid, Ellipsoid.
|
|
37
|
+
this.ellipsoid = defaultValue(ellipsoid, Ellipsoid.default);
|
|
38
38
|
|
|
39
39
|
const that = this;
|
|
40
40
|
this._velocityVectorProperty.definitionChanged.addEventListener(function () {
|
|
@@ -249,7 +249,7 @@ IdManager.prototype.get = function (id) {
|
|
|
249
249
|
*
|
|
250
250
|
* @param {object} options An object with the following properties:
|
|
251
251
|
* @param {EntityCollection} options.entities The EntityCollection to export as KML.
|
|
252
|
-
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.
|
|
252
|
+
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.default] The ellipsoid for the output file.
|
|
253
253
|
* @param {exportKmlModelCallback} [options.modelCallback] A callback that will be called with a {@link ModelGraphics} instance and should return the URI to use in the KML. Required if a model exists in the entity collection.
|
|
254
254
|
* @param {JulianDate} [options.time=entities.computeAvailability().start] The time value to use to get properties that are not time varying in KML.
|
|
255
255
|
* @param {TimeInterval} [options.defaultAvailability=entities.computeAvailability()] The interval that will be sampled if an entity doesn't have an availability.
|
|
@@ -405,7 +405,7 @@ exportKml._createState = function (options) {
|
|
|
405
405
|
const kmlDoc = document.implementation.createDocument(kmlNamespace, "kml");
|
|
406
406
|
return {
|
|
407
407
|
kmlDoc: kmlDoc,
|
|
408
|
-
ellipsoid: defaultValue(options.ellipsoid, Ellipsoid.
|
|
408
|
+
ellipsoid: defaultValue(options.ellipsoid, Ellipsoid.default),
|
|
409
409
|
idManager: new IdManager(),
|
|
410
410
|
styleCache: styleCache,
|
|
411
411
|
externalFileHandler: externalFileHandler,
|
|
@@ -1173,7 +1173,7 @@ Object.defineProperties(UniformState.prototype, {
|
|
|
1173
1173
|
*/
|
|
1174
1174
|
ellipsoid: {
|
|
1175
1175
|
get: function () {
|
|
1176
|
-
return defaultValue(this._ellipsoid, Ellipsoid.
|
|
1176
|
+
return defaultValue(this._ellipsoid, Ellipsoid.default);
|
|
1177
1177
|
},
|
|
1178
1178
|
},
|
|
1179
1179
|
});
|
|
@@ -49,9 +49,9 @@ import DeveloperError from "../Core/DeveloperError.js";
|
|
|
49
49
|
* a tiled layer.
|
|
50
50
|
* @property {TilingScheme} [tilingScheme=new GeographicTilingScheme()] The tiling scheme to use to divide the world into tiles.
|
|
51
51
|
* This parameter is ignored when accessing a tiled server.
|
|
52
|
-
* @property {Ellipsoid} [ellipsoid] The ellipsoid. If the tilingScheme is specified and used,
|
|
52
|
+
* @property {Ellipsoid} [ellipsoid=Ellipsoid.default] The ellipsoid. If the tilingScheme is specified and used,
|
|
53
53
|
* this parameter is ignored and the tiling scheme's ellipsoid is used instead. If neither
|
|
54
|
-
* parameter is specified, the
|
|
54
|
+
* parameter is specified, the default ellipsoid is used.
|
|
55
55
|
* @property {Credit|string} [credit] A credit for the data source, which is displayed on the canvas. This parameter is ignored when accessing a tiled server.
|
|
56
56
|
* @property {number} [tileWidth=256] The width of each tile in pixels. This parameter is ignored when accessing a tiled server.
|
|
57
57
|
* @property {number} [tileHeight=256] The height of each tile in pixels. This parameter is ignored when accessing a tiled server.
|
|
@@ -4,7 +4,7 @@ import Resource from "../Core/Resource.js";
|
|
|
4
4
|
|
|
5
5
|
let defaultTokenCredit;
|
|
6
6
|
const defaultAccessToken =
|
|
7
|
-
"
|
|
7
|
+
"AAPTxy8BH1VEsoebNVZXo8HurEOF051kAEKlhkOhBEc9BmRcs5cw5x8CvIyg2oiotXJmY_GjoEUuuKAUvdWxusIx25kUy2AttkOs0FgosGzFJSsjafpWC40GiE5hiD0FLNSh3kxIW6w-5qqUQCEAwGY1t4yH7Fj-PjrkjPfSpw0_r2xF3lKLd0_LSmPWXCkYhqV1O67tWLNImHyr7SurJ92sA5YIG1pMJKEQU3Qv5k18p0g.AT1_sGbfSYDL";
|
|
8
8
|
/**
|
|
9
9
|
* Default options for accessing the ArcGIS image tile service.
|
|
10
10
|
*
|
|
@@ -28,7 +28,7 @@ import VerticalOrigin from "./VerticalOrigin.js";
|
|
|
28
28
|
* Initialization options for the first param of Billboard constructor
|
|
29
29
|
*
|
|
30
30
|
* @property {Cartesian3} position The cartesian position of the billboard.
|
|
31
|
-
* @property {
|
|
31
|
+
* @property {*} [id] A user-defined object to return when the billboard is picked with {@link Scene#pick}.
|
|
32
32
|
* @property {boolean} [show=true] Determines if this billboard will be shown.
|
|
33
33
|
* @property {string | HTMLCanvasElement} [image] A loaded HTMLImageElement, ImageData, or a url to an image to use for the billboard.
|
|
34
34
|
* @property {number} [scale=1.0] A number specifying the uniform scale that is multiplied with the billboard's image size in pixels.
|
|
@@ -892,7 +892,7 @@ Object.defineProperties(Billboard.prototype, {
|
|
|
892
892
|
/**
|
|
893
893
|
* Gets or sets the user-defined object returned when the billboard is picked.
|
|
894
894
|
* @memberof Billboard.prototype
|
|
895
|
-
* @type {
|
|
895
|
+
* @type {*}
|
|
896
896
|
*/
|
|
897
897
|
id: {
|
|
898
898
|
get: function () {
|
|
@@ -1104,8 +1104,7 @@ Billboard._updateClamping = function (collection, owner) {
|
|
|
1104
1104
|
return;
|
|
1105
1105
|
}
|
|
1106
1106
|
|
|
1107
|
-
const
|
|
1108
|
-
const ellipsoid = defaultValue(globe?.ellipsoid, Ellipsoid.WGS84);
|
|
1107
|
+
const ellipsoid = defaultValue(scene.ellipsoid, Ellipsoid.default);
|
|
1109
1108
|
|
|
1110
1109
|
const mode = scene.frameState.mode;
|
|
1111
1110
|
|
|
@@ -1375,7 +1374,10 @@ Billboard._computeActualPosition = function (
|
|
|
1375
1374
|
}
|
|
1376
1375
|
|
|
1377
1376
|
Matrix4.multiplyByPoint(modelMatrix, position, tempCartesian3);
|
|
1378
|
-
return SceneTransforms.
|
|
1377
|
+
return SceneTransforms.computeActualEllipsoidPosition(
|
|
1378
|
+
frameState,
|
|
1379
|
+
tempCartesian3
|
|
1380
|
+
);
|
|
1379
1381
|
};
|
|
1380
1382
|
|
|
1381
1383
|
const scratchCartesian3 = new Cartesian3();
|
|
@@ -1397,7 +1399,7 @@ Billboard._computeScreenSpacePosition = function (
|
|
|
1397
1399
|
);
|
|
1398
1400
|
|
|
1399
1401
|
// World to window coordinates
|
|
1400
|
-
const positionWC = SceneTransforms.
|
|
1402
|
+
const positionWC = SceneTransforms.worldWithEyeOffsetToWindowCoordinates(
|
|
1401
1403
|
scene,
|
|
1402
1404
|
positionWorld,
|
|
1403
1405
|
eyeOffset,
|
|
@@ -28,7 +28,7 @@ import ImageryProvider from "./ImageryProvider.js";
|
|
|
28
28
|
* @property {string} [culture=''] The culture to use when requesting Bing Maps imagery. Not
|
|
29
29
|
* all cultures are supported. See {@link http://msdn.microsoft.com/en-us/library/hh441729.aspx}
|
|
30
30
|
* for information on the supported cultures.
|
|
31
|
-
* @property {Ellipsoid} [ellipsoid] The ellipsoid. If not specified, the
|
|
31
|
+
* @property {Ellipsoid} [ellipsoid=Ellipsoid.default] The ellipsoid. If not specified, the default ellipsoid is used.
|
|
32
32
|
* @property {TileDiscardPolicy} [tileDiscardPolicy] The policy that determines if a tile
|
|
33
33
|
* is invalid and should be discarded. By default, a {@link DiscardEmptyTileImagePolicy}
|
|
34
34
|
* will be used, with the expectation that the Bing Maps server will send a zero-length response for missing tiles.
|