@cesium/engine 9.2.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/Workers/{chunk-WOYQB5HM.js → chunk-2J3JKXCP.js} +5 -5
- package/Build/Workers/{chunk-IXYFH7DV.js → chunk-3WUV74WM.js} +2 -2
- package/Build/Workers/{chunk-3PV5HQ2R.js → chunk-4BAE4PWO.js} +6 -6
- package/Build/Workers/{chunk-WHDEZSAL.js → chunk-4MSUJ4I7.js} +8 -8
- package/Build/Workers/{chunk-ZHJDE6JN.js → chunk-4YSNMHZ4.js} +6 -6
- package/Build/Workers/{chunk-LZFFO4KB.js → chunk-5S7OLEPK.js} +12 -12
- package/Build/Workers/{chunk-GX2BWBN2.js → chunk-7XGC6YB2.js} +14 -14
- package/Build/Workers/{chunk-IF2OX6R4.js → chunk-AA4GZKOT.js} +1 -1
- package/Build/Workers/{chunk-26NE4LRW.js → chunk-AD5HBJ2F.js} +11 -8
- package/Build/Workers/{chunk-4RG6WOXH.js → chunk-AVI4IUWC.js} +11 -11
- package/Build/Workers/{chunk-3VDHTBY5.js → chunk-BCL4PHHT.js} +10 -10
- package/Build/Workers/{chunk-WP3LCUOE.js → chunk-BDFNKFOE.js} +13 -13
- package/Build/Workers/{chunk-KTZK2UDR.js → chunk-BJF5LOWE.js} +7 -7
- package/Build/Workers/{chunk-W4OS542B.js → chunk-C2CGMAIU.js} +13 -13
- package/Build/Workers/{chunk-EJZVBTX4.js → chunk-COYFZ5VA.js} +6 -6
- package/Build/Workers/{chunk-PHT53MCH.js → chunk-DGS5QNIO.js} +13 -13
- package/Build/Workers/{chunk-UYKG3UFK.js → chunk-DKVHRNFY.js} +5 -5
- package/Build/Workers/{chunk-7PFZ4Z7C.js → chunk-DOXCPOG4.js} +11 -9
- package/Build/Workers/{chunk-A5CSB5ZE.js → chunk-FXIHSF7O.js} +9 -9
- package/Build/Workers/{chunk-GOQEANLM.js → chunk-G3YR53LY.js} +13 -13
- package/Build/Workers/{chunk-7HLZRYGD.js → chunk-GR3CDLCP.js} +7 -7
- package/Build/Workers/{chunk-YGNQJ4YI.js → chunk-GRAT5GE7.js} +5 -5
- package/Build/Workers/{chunk-SC3TBKST.js → chunk-I2RC4XVN.js} +4 -4
- package/Build/Workers/{chunk-26XJDV3D.js → chunk-JYAHOGGL.js} +15 -15
- package/Build/Workers/{chunk-RRUO4QEK.js → chunk-KUN2ZA5X.js} +4 -4
- package/Build/Workers/{chunk-BBBTT36L.js → chunk-L6RTJ3RE.js} +14 -14
- package/Build/Workers/{chunk-RDR4KVPA.js → chunk-LCLJJ2MZ.js} +18 -18
- package/Build/Workers/{chunk-BNT2SNWU.js → chunk-LEABCTLP.js} +4 -4
- package/Build/Workers/{chunk-I6CW7ZE5.js → chunk-MDHQR3ZS.js} +10 -8
- package/Build/Workers/{chunk-ETC45PHH.js → chunk-MSKXMXJI.js} +4 -4
- package/Build/Workers/{chunk-QZIWFSRM.js → chunk-NTXTUNEF.js} +4 -4
- package/Build/Workers/{chunk-GUFV24F4.js → chunk-O3JCMSS3.js} +17 -17
- package/Build/Workers/{chunk-UICVDDCQ.js → chunk-OOK53QUQ.js} +1 -1
- package/Build/Workers/{chunk-G7IAO7CW.js → chunk-OORVMGDU.js} +7 -7
- package/Build/Workers/{chunk-OYP23VAL.js → chunk-PCP4YQST.js} +11 -11
- package/Build/Workers/{chunk-GX5LMUGZ.js → chunk-PYHLO636.js} +42 -13
- package/Build/Workers/{chunk-TDIGL45B.js → chunk-Q55ECN3Y.js} +1 -1
- package/Build/Workers/{chunk-5OK5JFDP.js → chunk-QD4KM3GO.js} +5 -5
- package/Build/Workers/{chunk-CVCVMOQA.js → chunk-QMLTCCYG.js} +1 -1
- package/Build/Workers/{chunk-AROLUUGS.js → chunk-QX5XS4LC.js} +2 -2
- package/Build/Workers/{chunk-TP4FFUAH.js → chunk-R6B7UCQB.js} +2 -2
- package/Build/Workers/{chunk-U6MTSO6A.js → chunk-RJYML24O.js} +11 -11
- package/Build/Workers/{chunk-DIVFF6DK.js → chunk-S3PI2KFM.js} +2 -2
- package/Build/Workers/{chunk-PUQR43HZ.js → chunk-STBBMQGG.js} +6 -6
- package/Build/Workers/{chunk-CFBGPZU6.js → chunk-SYCPRK3D.js} +10 -10
- package/Build/Workers/{chunk-U2LSTOMA.js → chunk-T77JILCU.js} +2 -2
- package/Build/Workers/{chunk-RTIT7UDN.js → chunk-TO2PVHKI.js} +2 -2
- package/Build/Workers/{chunk-EODIOQ35.js → chunk-VE7BFUIX.js} +1 -1
- package/Build/Workers/{chunk-K5F23SZO.js → chunk-VFBNELXB.js} +7 -7
- package/Build/Workers/{chunk-YGTWKLFY.js → chunk-VO3ACQB2.js} +19 -19
- package/Build/Workers/{chunk-UKJCFXVV.js → chunk-X23FRWHJ.js} +6 -6
- package/Build/Workers/{chunk-2TRB253J.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 +5 -5
- package/Build/Workers/decodeI3S.js +10 -10
- package/Build/Workers/transcodeKTX2.js +7 -7
- 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/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/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/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 +6 -4
- 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/GltfLoaderUtil.js +2 -4
- 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/MapboxImageryProvider.js +1 -1
- package/Source/Scene/MapboxStyleImageryProvider.js +1 -1
- package/Source/Scene/MetadataSemantic.js +4 -4
- package/Source/Scene/Model/InstancingPipelineStage.js +3 -3
- package/Source/Scene/Model/MaterialPipelineStage.js +49 -0
- package/Source/Scene/Model/Model.js +7 -4
- package/Source/Scene/Model/ModelSceneGraph.js +1 -1
- package/Source/Scene/Model/SceneMode2DPipelineStage.js +3 -3
- package/Source/Scene/Model/pickModel.js +2 -2
- package/Source/Scene/ModelComponents.js +9 -0
- package/Source/Scene/Picking.js +4 -13
- package/Source/Scene/PointPrimitive.js +5 -2
- 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 +2 -2
- package/Source/Shaders/Builtin/Functions/ellipsoidTextureCoordinates.glsl +10 -0
- package/Source/Shaders/Builtin/Functions/{ellipsoidWgs84TextureCoordinates.js → ellipsoidTextureCoordinates.js} +3 -3
- 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 +2 -0
- package/Source/Shaders/Builtin/Structs/modelMaterial.js +2 -0
- package/Source/Shaders/EllipsoidFS.glsl +1 -1
- package/Source/Shaders/EllipsoidFS.js +1 -1
- package/Source/Shaders/GlobeFS.glsl +2 -2
- package/Source/Shaders/GlobeFS.js +2 -2
- package/Source/Shaders/Model/MaterialStageFS.glsl +21 -12
- package/Source/Shaders/Model/MaterialStageFS.js +21 -12
- package/Source/Widget/CesiumWidget.css +0 -5
- package/Source/Widget/CesiumWidget.js +29 -28
- package/index.d.ts +181 -113
- package/index.js +208 -208
- package/package.json +2 -2
- package/Source/Shaders/Builtin/Functions/ellipsoidWgs84TextureCoordinates.glsl +0 -10
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @license
|
|
3
3
|
* Cesium - https://github.com/CesiumGS/cesium
|
|
4
|
-
* Version 1.
|
|
4
|
+
* Version 1.119
|
|
5
5
|
*
|
|
6
6
|
* Copyright 2011-2022 Cesium Contributors
|
|
7
7
|
*
|
|
@@ -25,35 +25,35 @@
|
|
|
25
25
|
|
|
26
26
|
import {
|
|
27
27
|
require_draco_decoder_nodejs
|
|
28
|
-
} from "./chunk-
|
|
28
|
+
} from "./chunk-3WUV74WM.js";
|
|
29
29
|
import {
|
|
30
30
|
Color_default
|
|
31
|
-
} from "./chunk-
|
|
31
|
+
} from "./chunk-4YSNMHZ4.js";
|
|
32
32
|
import {
|
|
33
33
|
createTaskProcessorWorker_default
|
|
34
|
-
} from "./chunk-
|
|
34
|
+
} from "./chunk-QX5XS4LC.js";
|
|
35
35
|
import {
|
|
36
36
|
WebMercatorProjection_default
|
|
37
|
-
} from "./chunk-
|
|
37
|
+
} from "./chunk-X23FRWHJ.js";
|
|
38
38
|
import {
|
|
39
39
|
Cartesian3_default,
|
|
40
40
|
Cartographic_default,
|
|
41
41
|
Ellipsoid_default,
|
|
42
42
|
Matrix3_default
|
|
43
|
-
} from "./chunk-
|
|
43
|
+
} from "./chunk-PYHLO636.js";
|
|
44
44
|
import {
|
|
45
45
|
Math_default
|
|
46
|
-
} from "./chunk-
|
|
46
|
+
} from "./chunk-MSKXMXJI.js";
|
|
47
47
|
import {
|
|
48
48
|
defaultValue_default
|
|
49
|
-
} from "./chunk-
|
|
49
|
+
} from "./chunk-VE7BFUIX.js";
|
|
50
50
|
import {
|
|
51
51
|
Check_default
|
|
52
|
-
} from "./chunk-
|
|
52
|
+
} from "./chunk-S3PI2KFM.js";
|
|
53
53
|
import {
|
|
54
54
|
__toESM,
|
|
55
55
|
defined_default
|
|
56
|
-
} from "./chunk-
|
|
56
|
+
} from "./chunk-AA4GZKOT.js";
|
|
57
57
|
|
|
58
58
|
// packages/engine/Source/Workers/decodeI3S.js
|
|
59
59
|
var import_draco_decoder_nodejs = __toESM(require_draco_decoder_nodejs(), 1);
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @license
|
|
3
3
|
* Cesium - https://github.com/CesiumGS/cesium
|
|
4
|
-
* Version 1.
|
|
4
|
+
* Version 1.119
|
|
5
5
|
*
|
|
6
6
|
* Copyright 2011-2022 Cesium Contributors
|
|
7
7
|
*
|
|
@@ -25,25 +25,25 @@
|
|
|
25
25
|
|
|
26
26
|
import {
|
|
27
27
|
createTaskProcessorWorker_default
|
|
28
|
-
} from "./chunk-
|
|
28
|
+
} from "./chunk-QX5XS4LC.js";
|
|
29
29
|
import {
|
|
30
30
|
WebGLConstants_default
|
|
31
|
-
} from "./chunk-
|
|
31
|
+
} from "./chunk-OOK53QUQ.js";
|
|
32
32
|
import {
|
|
33
33
|
RuntimeError_default
|
|
34
|
-
} from "./chunk-
|
|
34
|
+
} from "./chunk-T77JILCU.js";
|
|
35
35
|
import {
|
|
36
36
|
defaultValue_default
|
|
37
|
-
} from "./chunk-
|
|
37
|
+
} from "./chunk-VE7BFUIX.js";
|
|
38
38
|
import {
|
|
39
39
|
Check_default
|
|
40
|
-
} from "./chunk-
|
|
40
|
+
} from "./chunk-S3PI2KFM.js";
|
|
41
41
|
import {
|
|
42
42
|
__commonJS,
|
|
43
43
|
__require,
|
|
44
44
|
__toESM,
|
|
45
45
|
defined_default
|
|
46
|
-
} from "./chunk-
|
|
46
|
+
} from "./chunk-AA4GZKOT.js";
|
|
47
47
|
|
|
48
48
|
// packages/engine/Source/ThirdParty/Workers/basis_transcoder.js
|
|
49
49
|
var require_basis_transcoder = __commonJS({
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @license
|
|
3
3
|
* Cesium - https://github.com/CesiumGS/cesium
|
|
4
|
-
* Version 1.
|
|
4
|
+
* Version 1.119
|
|
5
5
|
*
|
|
6
6
|
* Copyright 2011-2022 Cesium Contributors
|
|
7
7
|
*
|
|
@@ -26,49 +26,49 @@
|
|
|
26
26
|
import {
|
|
27
27
|
EllipsoidalOccluder_default,
|
|
28
28
|
TerrainEncoding_default
|
|
29
|
-
} from "./chunk-
|
|
29
|
+
} from "./chunk-BCL4PHHT.js";
|
|
30
30
|
import {
|
|
31
31
|
createTaskProcessorWorker_default
|
|
32
|
-
} from "./chunk-
|
|
32
|
+
} from "./chunk-QX5XS4LC.js";
|
|
33
33
|
import {
|
|
34
34
|
OrientedBoundingBox_default
|
|
35
|
-
} from "./chunk-
|
|
35
|
+
} from "./chunk-AVI4IUWC.js";
|
|
36
36
|
import {
|
|
37
37
|
AttributeCompression_default
|
|
38
|
-
} from "./chunk-
|
|
39
|
-
import "./chunk-
|
|
40
|
-
import "./chunk-
|
|
41
|
-
import "./chunk-
|
|
42
|
-
import "./chunk-
|
|
38
|
+
} from "./chunk-OORVMGDU.js";
|
|
39
|
+
import "./chunk-SYCPRK3D.js";
|
|
40
|
+
import "./chunk-STBBMQGG.js";
|
|
41
|
+
import "./chunk-XD445VDH.js";
|
|
42
|
+
import "./chunk-4BAE4PWO.js";
|
|
43
43
|
import {
|
|
44
44
|
IndexDatatype_default
|
|
45
|
-
} from "./chunk-
|
|
45
|
+
} from "./chunk-QD4KM3GO.js";
|
|
46
46
|
import {
|
|
47
47
|
BoundingSphere_default
|
|
48
|
-
} from "./chunk-
|
|
48
|
+
} from "./chunk-DOXCPOG4.js";
|
|
49
49
|
import {
|
|
50
50
|
Rectangle_default
|
|
51
|
-
} from "./chunk-
|
|
52
|
-
import "./chunk-
|
|
51
|
+
} from "./chunk-O3JCMSS3.js";
|
|
52
|
+
import "./chunk-2J3JKXCP.js";
|
|
53
53
|
import {
|
|
54
54
|
Cartesian2_default,
|
|
55
55
|
Cartesian3_default,
|
|
56
56
|
Cartographic_default,
|
|
57
57
|
Ellipsoid_default
|
|
58
|
-
} from "./chunk-
|
|
58
|
+
} from "./chunk-PYHLO636.js";
|
|
59
59
|
import {
|
|
60
60
|
Math_default
|
|
61
|
-
} from "./chunk-
|
|
62
|
-
import "./chunk-
|
|
63
|
-
import "./chunk-
|
|
64
|
-
import "./chunk-
|
|
61
|
+
} from "./chunk-MSKXMXJI.js";
|
|
62
|
+
import "./chunk-OOK53QUQ.js";
|
|
63
|
+
import "./chunk-T77JILCU.js";
|
|
64
|
+
import "./chunk-VE7BFUIX.js";
|
|
65
65
|
import {
|
|
66
66
|
Check_default,
|
|
67
67
|
DeveloperError_default
|
|
68
|
-
} from "./chunk-
|
|
68
|
+
} from "./chunk-S3PI2KFM.js";
|
|
69
69
|
import {
|
|
70
70
|
defined_default
|
|
71
|
-
} from "./chunk-
|
|
71
|
+
} from "./chunk-AA4GZKOT.js";
|
|
72
72
|
|
|
73
73
|
// packages/engine/Source/Core/Intersections2D.js
|
|
74
74
|
var Intersections2D = {};
|
|
@@ -56,7 +56,7 @@ ApproximateTerrainHeights.initialize = function () {
|
|
|
56
56
|
/**
|
|
57
57
|
* Computes the minimum and maximum terrain heights for a given rectangle
|
|
58
58
|
* @param {Rectangle} rectangle The bounding rectangle
|
|
59
|
-
* @param {Ellipsoid} [ellipsoid=Ellipsoid.
|
|
59
|
+
* @param {Ellipsoid} [ellipsoid=Ellipsoid.default] The ellipsoid
|
|
60
60
|
* @return {{minimumTerrainHeight: number, maximumTerrainHeight: number}}
|
|
61
61
|
*/
|
|
62
62
|
ApproximateTerrainHeights.getMinimumMaximumHeights = function (
|
|
@@ -71,7 +71,7 @@ ApproximateTerrainHeights.getMinimumMaximumHeights = function (
|
|
|
71
71
|
);
|
|
72
72
|
}
|
|
73
73
|
//>>includeEnd('debug');
|
|
74
|
-
ellipsoid = defaultValue(ellipsoid, Ellipsoid.
|
|
74
|
+
ellipsoid = defaultValue(ellipsoid, Ellipsoid.default);
|
|
75
75
|
|
|
76
76
|
const xyLevel = getTileXYLevel(rectangle);
|
|
77
77
|
|
|
@@ -130,7 +130,7 @@ ApproximateTerrainHeights.getMinimumMaximumHeights = function (
|
|
|
130
130
|
/**
|
|
131
131
|
* Computes the bounding sphere based on the tile heights in the rectangle
|
|
132
132
|
* @param {Rectangle} rectangle The bounding rectangle
|
|
133
|
-
* @param {Ellipsoid} [ellipsoid=Ellipsoid.
|
|
133
|
+
* @param {Ellipsoid} [ellipsoid=Ellipsoid.default] The ellipsoid
|
|
134
134
|
* @return {BoundingSphere} The result bounding sphere
|
|
135
135
|
*/
|
|
136
136
|
ApproximateTerrainHeights.getBoundingSphere = function (rectangle, ellipsoid) {
|
|
@@ -142,7 +142,7 @@ ApproximateTerrainHeights.getBoundingSphere = function (rectangle, ellipsoid) {
|
|
|
142
142
|
);
|
|
143
143
|
}
|
|
144
144
|
//>>includeEnd('debug');
|
|
145
|
-
ellipsoid = defaultValue(ellipsoid, Ellipsoid.
|
|
145
|
+
ellipsoid = defaultValue(ellipsoid, Ellipsoid.default);
|
|
146
146
|
|
|
147
147
|
const xyLevel = getTileXYLevel(rectangle);
|
|
148
148
|
|
|
@@ -27,9 +27,9 @@ const ALL_CHILDREN = 15;
|
|
|
27
27
|
* Initialization options for the ArcGISTiledElevationTerrainProvider constructor
|
|
28
28
|
*
|
|
29
29
|
* @property {string} [token] The authorization token to use to connect to the service.
|
|
30
|
-
* @property {Ellipsoid} [ellipsoid] The ellipsoid. If the tilingScheme is specified,
|
|
30
|
+
* @property {Ellipsoid} [ellipsoid=Ellipsoid.default] The ellipsoid. If the tilingScheme is specified,
|
|
31
31
|
* this parameter is ignored and the tiling scheme's ellipsoid is used instead.
|
|
32
|
-
* If neither parameter is specified, the
|
|
32
|
+
* If neither parameter is specified, the default ellipsoid is used.
|
|
33
33
|
*/
|
|
34
34
|
|
|
35
35
|
/**
|
|
@@ -41,7 +41,7 @@ const ALL_CHILDREN = 15;
|
|
|
41
41
|
* @param {ArcGISTiledElevationTerrainProvider.ConstructorOptions} [options] An object describing initialization options.
|
|
42
42
|
*/
|
|
43
43
|
function TerrainProviderBuilder(options) {
|
|
44
|
-
this.ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.
|
|
44
|
+
this.ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.default);
|
|
45
45
|
|
|
46
46
|
this.credit = undefined;
|
|
47
47
|
this.tilingScheme = undefined;
|
|
@@ -446,7 +446,7 @@ ArcGISTiledElevationTerrainProvider.prototype.requestTileGeometry = function (
|
|
|
446
446
|
encoding: that._encoding,
|
|
447
447
|
});
|
|
448
448
|
})
|
|
449
|
-
.catch(function (error) {
|
|
449
|
+
.catch(async function (error) {
|
|
450
450
|
if (
|
|
451
451
|
defined(availabilityRequest) &&
|
|
452
452
|
availabilityRequest.state === RequestState.CANCELLED
|
|
@@ -455,10 +455,14 @@ ArcGISTiledElevationTerrainProvider.prototype.requestTileGeometry = function (
|
|
|
455
455
|
|
|
456
456
|
// Don't reject the promise till the request is actually cancelled
|
|
457
457
|
// Otherwise it will think the request failed, but it didn't.
|
|
458
|
-
|
|
459
|
-
request.
|
|
460
|
-
|
|
461
|
-
|
|
458
|
+
try {
|
|
459
|
+
await request.deferred?.promise;
|
|
460
|
+
} catch {
|
|
461
|
+
// Eat this error
|
|
462
|
+
}
|
|
463
|
+
|
|
464
|
+
request.state = RequestState.CANCELLED;
|
|
465
|
+
return Promise.reject(error);
|
|
462
466
|
}
|
|
463
467
|
return Promise.reject(error);
|
|
464
468
|
});
|
|
@@ -3,6 +3,7 @@ import Cartographic from "./Cartographic.js";
|
|
|
3
3
|
import Check from "./Check.js";
|
|
4
4
|
import defaultValue from "./defaultValue.js";
|
|
5
5
|
import defined from "./defined.js";
|
|
6
|
+
import Ellipsoid from "./Ellipsoid.js";
|
|
6
7
|
import GeographicProjection from "./GeographicProjection.js";
|
|
7
8
|
import Intersect from "./Intersect.js";
|
|
8
9
|
import Rectangle from "./Rectangle.js";
|
|
@@ -177,6 +178,7 @@ BoundingRectangle.fromRectangle = function (rectangle, projection, result) {
|
|
|
177
178
|
return result;
|
|
178
179
|
}
|
|
179
180
|
|
|
181
|
+
defaultProjection._ellipsoid = Ellipsoid.default;
|
|
180
182
|
projection = defaultValue(projection, defaultProjection);
|
|
181
183
|
|
|
182
184
|
const lowerLeft = projection.project(
|
|
@@ -275,6 +275,7 @@ BoundingSphere.fromRectangleWithHeights2D = function (
|
|
|
275
275
|
return result;
|
|
276
276
|
}
|
|
277
277
|
|
|
278
|
+
defaultProjection._ellipsoid = Ellipsoid.default;
|
|
278
279
|
projection = defaultValue(projection, defaultProjection);
|
|
279
280
|
|
|
280
281
|
Rectangle.southwest(rectangle, fromRectangle2DSouthwest);
|
|
@@ -311,7 +312,7 @@ const fromRectangle3DScratch = [];
|
|
|
311
312
|
* on the ellipsoid and contained in the rectangle. It may not be accurate for all rectangles on all types of ellipsoids.
|
|
312
313
|
*
|
|
313
314
|
* @param {Rectangle} [rectangle] The valid rectangle used to create a bounding sphere.
|
|
314
|
-
* @param {Ellipsoid} [ellipsoid=Ellipsoid.
|
|
315
|
+
* @param {Ellipsoid} [ellipsoid=Ellipsoid.default] The ellipsoid used to determine positions of the rectangle.
|
|
315
316
|
* @param {number} [surfaceHeight=0.0] The height above the surface of the ellipsoid.
|
|
316
317
|
* @param {BoundingSphere} [result] The object onto which to store the result.
|
|
317
318
|
* @returns {BoundingSphere} The modified result parameter or a new BoundingSphere instance if none was provided.
|
|
@@ -322,7 +323,7 @@ BoundingSphere.fromRectangle3D = function (
|
|
|
322
323
|
surfaceHeight,
|
|
323
324
|
result
|
|
324
325
|
) {
|
|
325
|
-
ellipsoid = defaultValue(ellipsoid, Ellipsoid.
|
|
326
|
+
ellipsoid = defaultValue(ellipsoid, Ellipsoid.default);
|
|
326
327
|
surfaceHeight = defaultValue(surfaceHeight, 0.0);
|
|
327
328
|
|
|
328
329
|
if (!defined(result)) {
|
|
@@ -1277,6 +1278,7 @@ BoundingSphere.projectTo2D = function (sphere, projection, result) {
|
|
|
1277
1278
|
Check.typeOf.object("sphere", sphere);
|
|
1278
1279
|
//>>includeEnd('debug');
|
|
1279
1280
|
|
|
1281
|
+
projectTo2DProjection._ellipsoid = Ellipsoid.default;
|
|
1280
1282
|
projection = defaultValue(projection, projectTo2DProjection);
|
|
1281
1283
|
|
|
1282
1284
|
const ellipsoid = projection.ellipsoid;
|
|
@@ -866,7 +866,7 @@ Cartesian3.midpoint = function (left, right, result) {
|
|
|
866
866
|
* @param {number} longitude The longitude, in degrees
|
|
867
867
|
* @param {number} latitude The latitude, in degrees
|
|
868
868
|
* @param {number} [height=0.0] The height, in meters, above the ellipsoid.
|
|
869
|
-
* @param {Ellipsoid} [ellipsoid=Ellipsoid.
|
|
869
|
+
* @param {Ellipsoid} [ellipsoid=Ellipsoid.default] The ellipsoid on which the position lies.
|
|
870
870
|
* @param {Cartesian3} [result] The object onto which to store the result.
|
|
871
871
|
* @returns {Cartesian3} The position
|
|
872
872
|
*
|
|
@@ -892,7 +892,9 @@ Cartesian3.fromDegrees = function (
|
|
|
892
892
|
|
|
893
893
|
let scratchN = new Cartesian3();
|
|
894
894
|
let scratchK = new Cartesian3();
|
|
895
|
-
|
|
895
|
+
|
|
896
|
+
// To prevent a circular dependency, this value is overridden by Ellipsoid when Ellipsoid.default is set
|
|
897
|
+
Cartesian3._ellipsoidRadiiSquared = new Cartesian3(
|
|
896
898
|
6378137.0 * 6378137.0,
|
|
897
899
|
6378137.0 * 6378137.0,
|
|
898
900
|
6356752.3142451793 * 6356752.3142451793
|
|
@@ -904,7 +906,7 @@ const wgs84RadiiSquared = new Cartesian3(
|
|
|
904
906
|
* @param {number} longitude The longitude, in radians
|
|
905
907
|
* @param {number} latitude The latitude, in radians
|
|
906
908
|
* @param {number} [height=0.0] The height, in meters, above the ellipsoid.
|
|
907
|
-
* @param {Ellipsoid} [ellipsoid=Ellipsoid.
|
|
909
|
+
* @param {Ellipsoid} [ellipsoid=Ellipsoid.default] The ellipsoid on which the position lies.
|
|
908
910
|
* @param {Cartesian3} [result] The object onto which to store the result.
|
|
909
911
|
* @returns {Cartesian3} The position
|
|
910
912
|
*
|
|
@@ -924,9 +926,10 @@ Cartesian3.fromRadians = function (
|
|
|
924
926
|
//>>includeEnd('debug');
|
|
925
927
|
|
|
926
928
|
height = defaultValue(height, 0.0);
|
|
927
|
-
|
|
928
|
-
|
|
929
|
-
|
|
929
|
+
|
|
930
|
+
const radiiSquared = !defined(ellipsoid)
|
|
931
|
+
? Cartesian3._ellipsoidRadiiSquared
|
|
932
|
+
: ellipsoid.radiiSquared;
|
|
930
933
|
|
|
931
934
|
const cosLatitude = Math.cos(latitude);
|
|
932
935
|
scratchN.x = cosLatitude * Math.cos(longitude);
|
|
@@ -949,7 +952,7 @@ Cartesian3.fromRadians = function (
|
|
|
949
952
|
* Returns an array of Cartesian3 positions given an array of longitude and latitude values given in degrees.
|
|
950
953
|
*
|
|
951
954
|
* @param {number[]} coordinates A list of longitude and latitude values. Values alternate [longitude, latitude, longitude, latitude...].
|
|
952
|
-
* @param {Ellipsoid} [ellipsoid=Ellipsoid.
|
|
955
|
+
* @param {Ellipsoid} [ellipsoid=Ellipsoid.default] The ellipsoid on which the coordinates lie.
|
|
953
956
|
* @param {Cartesian3[]} [result] An array of Cartesian3 objects to store the result.
|
|
954
957
|
* @returns {Cartesian3[]} The array of positions.
|
|
955
958
|
*
|
|
@@ -993,7 +996,7 @@ Cartesian3.fromDegreesArray = function (coordinates, ellipsoid, result) {
|
|
|
993
996
|
* Returns an array of Cartesian3 positions given an array of longitude and latitude values given in radians.
|
|
994
997
|
*
|
|
995
998
|
* @param {number[]} coordinates A list of longitude and latitude values. Values alternate [longitude, latitude, longitude, latitude...].
|
|
996
|
-
* @param {Ellipsoid} [ellipsoid=Ellipsoid.
|
|
999
|
+
* @param {Ellipsoid} [ellipsoid=Ellipsoid.default] The ellipsoid on which the coordinates lie.
|
|
997
1000
|
* @param {Cartesian3[]} [result] An array of Cartesian3 objects to store the result.
|
|
998
1001
|
* @returns {Cartesian3[]} The array of positions.
|
|
999
1002
|
*
|
|
@@ -1037,7 +1040,7 @@ Cartesian3.fromRadiansArray = function (coordinates, ellipsoid, result) {
|
|
|
1037
1040
|
* Returns an array of Cartesian3 positions given an array of longitude, latitude and height values where longitude and latitude are given in degrees.
|
|
1038
1041
|
*
|
|
1039
1042
|
* @param {number[]} coordinates A list of longitude, latitude and height values. Values alternate [longitude, latitude, height, longitude, latitude, height...].
|
|
1040
|
-
* @param {Ellipsoid} [ellipsoid=Ellipsoid.
|
|
1043
|
+
* @param {Ellipsoid} [ellipsoid=Ellipsoid.default] The ellipsoid on which the position lies.
|
|
1041
1044
|
* @param {Cartesian3[]} [result] An array of Cartesian3 objects to store the result.
|
|
1042
1045
|
* @returns {Cartesian3[]} The array of positions.
|
|
1043
1046
|
*
|
|
@@ -1082,7 +1085,7 @@ Cartesian3.fromDegreesArrayHeights = function (coordinates, ellipsoid, result) {
|
|
|
1082
1085
|
* Returns an array of Cartesian3 positions given an array of longitude, latitude and height values where longitude and latitude are given in radians.
|
|
1083
1086
|
*
|
|
1084
1087
|
* @param {number[]} coordinates A list of longitude, latitude and height values. Values alternate [longitude, latitude, height, longitude, latitude, height...].
|
|
1085
|
-
* @param {Ellipsoid} [ellipsoid=Ellipsoid.
|
|
1088
|
+
* @param {Ellipsoid} [ellipsoid=Ellipsoid.default] The ellipsoid on which the position lies.
|
|
1086
1089
|
* @param {Cartesian3[]} [result] An array of Cartesian3 objects to store the result.
|
|
1087
1090
|
* @returns {Cartesian3[]} The array of positions.
|
|
1088
1091
|
*
|
|
@@ -83,6 +83,7 @@ Cartographic.fromDegrees = function (longitude, latitude, height, result) {
|
|
|
83
83
|
Check.typeOf.number("longitude", longitude);
|
|
84
84
|
Check.typeOf.number("latitude", latitude);
|
|
85
85
|
//>>includeEnd('debug');
|
|
86
|
+
|
|
86
87
|
longitude = CesiumMath.toRadians(longitude);
|
|
87
88
|
latitude = CesiumMath.toRadians(latitude);
|
|
88
89
|
|
|
@@ -92,37 +93,39 @@ Cartographic.fromDegrees = function (longitude, latitude, height, result) {
|
|
|
92
93
|
const cartesianToCartographicN = new Cartesian3();
|
|
93
94
|
const cartesianToCartographicP = new Cartesian3();
|
|
94
95
|
const cartesianToCartographicH = new Cartesian3();
|
|
95
|
-
|
|
96
|
+
|
|
97
|
+
// To avoid circular dependencies, these are set by Ellipsoid when Ellipsoid.default is set.
|
|
98
|
+
Cartographic._ellipsoidOneOverRadii = new Cartesian3(
|
|
96
99
|
1.0 / 6378137.0,
|
|
97
100
|
1.0 / 6378137.0,
|
|
98
101
|
1.0 / 6356752.3142451793
|
|
99
102
|
);
|
|
100
|
-
|
|
103
|
+
Cartographic._ellipsoidOneOverRadiiSquared = new Cartesian3(
|
|
101
104
|
1.0 / (6378137.0 * 6378137.0),
|
|
102
105
|
1.0 / (6378137.0 * 6378137.0),
|
|
103
106
|
1.0 / (6356752.3142451793 * 6356752.3142451793)
|
|
104
107
|
);
|
|
105
|
-
|
|
108
|
+
Cartographic._ellipsoidCenterToleranceSquared = CesiumMath.EPSILON1;
|
|
106
109
|
|
|
107
110
|
/**
|
|
108
111
|
* Creates a new Cartographic instance from a Cartesian position. The values in the
|
|
109
112
|
* resulting object will be in radians.
|
|
110
113
|
*
|
|
111
114
|
* @param {Cartesian3} cartesian The Cartesian position to convert to cartographic representation.
|
|
112
|
-
* @param {Ellipsoid} [ellipsoid=Ellipsoid.
|
|
115
|
+
* @param {Ellipsoid} [ellipsoid=Ellipsoid.default] The ellipsoid on which the position lies.
|
|
113
116
|
* @param {Cartographic} [result] The object onto which to store the result.
|
|
114
117
|
* @returns {Cartographic} The modified result parameter, new Cartographic instance if none was provided, or undefined if the cartesian is at the center of the ellipsoid.
|
|
115
118
|
*/
|
|
116
119
|
Cartographic.fromCartesian = function (cartesian, ellipsoid, result) {
|
|
117
120
|
const oneOverRadii = defined(ellipsoid)
|
|
118
121
|
? ellipsoid.oneOverRadii
|
|
119
|
-
:
|
|
122
|
+
: Cartographic._ellipsoidOneOverRadii;
|
|
120
123
|
const oneOverRadiiSquared = defined(ellipsoid)
|
|
121
124
|
? ellipsoid.oneOverRadiiSquared
|
|
122
|
-
:
|
|
125
|
+
: Cartographic._ellipsoidOneOverRadiiSquared;
|
|
123
126
|
const centerToleranceSquared = defined(ellipsoid)
|
|
124
127
|
? ellipsoid._centerToleranceSquared
|
|
125
|
-
:
|
|
128
|
+
: Cartographic._ellipsoidCenterToleranceSquared;
|
|
126
129
|
|
|
127
130
|
//`cartesian is required.` is thrown from scaleToGeodeticSurface
|
|
128
131
|
const p = scaleToGeodeticSurface(
|
|
@@ -165,7 +168,7 @@ Cartographic.fromCartesian = function (cartesian, ellipsoid, result) {
|
|
|
165
168
|
* object should be in radians.
|
|
166
169
|
*
|
|
167
170
|
* @param {Cartographic} cartographic Input to be converted into a Cartesian3 output.
|
|
168
|
-
* @param {Ellipsoid} [ellipsoid=Ellipsoid.
|
|
171
|
+
* @param {Ellipsoid} [ellipsoid=Ellipsoid.default] The ellipsoid on which the position lies.
|
|
169
172
|
* @param {Cartesian3} [result] The object onto which to store the result.
|
|
170
173
|
* @returns {Cartesian3} The position
|
|
171
174
|
*/
|
|
@@ -5,6 +5,7 @@ import Check from "./Check.js";
|
|
|
5
5
|
import Credit from "./Credit.js";
|
|
6
6
|
import defaultValue from "./defaultValue.js";
|
|
7
7
|
import defined from "./defined.js";
|
|
8
|
+
import Ellipsoid from "./Ellipsoid.js";
|
|
8
9
|
import Event from "./Event.js";
|
|
9
10
|
import GeographicTilingScheme from "./GeographicTilingScheme.js";
|
|
10
11
|
import WebMercatorTilingScheme from "./WebMercatorTilingScheme.js";
|
|
@@ -45,7 +46,7 @@ function LayerInformation(layer) {
|
|
|
45
46
|
* @property {boolean} [requestVertexNormals=false] Flag that indicates if the client should request additional lighting information from the server, in the form of per vertex normals if available.
|
|
46
47
|
* @property {boolean} [requestWaterMask=false] Flag that indicates if the client should request per tile water masks from the server, if available.
|
|
47
48
|
* @property {boolean} [requestMetadata=true] Flag that indicates if the client should request per tile metadata from the server, if available.
|
|
48
|
-
* @property {Ellipsoid} [ellipsoid] The ellipsoid. If not specified, the
|
|
49
|
+
* @property {Ellipsoid} [ellipsoid=Ellipsoid.default] The ellipsoid. If not specified, the default ellipsoid is used.
|
|
49
50
|
* @property {Credit|string} [credit] A credit for the data source, which is displayed on the canvas.
|
|
50
51
|
*/
|
|
51
52
|
|
|
@@ -61,7 +62,7 @@ function TerrainProviderBuilder(options) {
|
|
|
61
62
|
this.requestVertexNormals = defaultValue(options.requestVertexNormals, false);
|
|
62
63
|
this.requestWaterMask = defaultValue(options.requestWaterMask, false);
|
|
63
64
|
this.requestMetadata = defaultValue(options.requestMetadata, true);
|
|
64
|
-
this.ellipsoid = options.ellipsoid;
|
|
65
|
+
this.ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.default);
|
|
65
66
|
|
|
66
67
|
this.heightmapWidth = 65;
|
|
67
68
|
this.heightmapStructure = undefined;
|
|
@@ -15,7 +15,7 @@ import VertexFormat from "./VertexFormat.js";
|
|
|
15
15
|
* @param {object} options Object with the following properties:
|
|
16
16
|
* @param {Cartesian3} options.center The circle's center point in the fixed frame.
|
|
17
17
|
* @param {number} options.radius The radius in meters.
|
|
18
|
-
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.
|
|
18
|
+
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.default] The ellipsoid the circle will be on.
|
|
19
19
|
* @param {number} [options.height=0.0] The distance in meters between the circle and the ellipsoid surface.
|
|
20
20
|
* @param {number} [options.granularity=0.02] The angular distance between points on the circle in radians.
|
|
21
21
|
* @param {VertexFormat} [options.vertexFormat=VertexFormat.DEFAULT] The vertex attributes to be computed.
|
|
@@ -90,7 +90,7 @@ const scratchEllipseGeometry = new EllipseGeometry({
|
|
|
90
90
|
const scratchOptions = {
|
|
91
91
|
center: new Cartesian3(),
|
|
92
92
|
radius: undefined,
|
|
93
|
-
ellipsoid: Ellipsoid.clone(Ellipsoid.
|
|
93
|
+
ellipsoid: Ellipsoid.clone(Ellipsoid.default),
|
|
94
94
|
height: undefined,
|
|
95
95
|
extrudedHeight: undefined,
|
|
96
96
|
granularity: undefined,
|
|
@@ -123,6 +123,10 @@ CircleGeometry.unpack = function (array, startingIndex, result) {
|
|
|
123
123
|
ellipseGeometry._ellipsoid,
|
|
124
124
|
scratchOptions.ellipsoid
|
|
125
125
|
);
|
|
126
|
+
scratchOptions.ellipsoid = Ellipsoid.clone(
|
|
127
|
+
ellipseGeometry._ellipsoid,
|
|
128
|
+
scratchEllipseGeometry._ellipsoid
|
|
129
|
+
);
|
|
126
130
|
scratchOptions.height = ellipseGeometry._height;
|
|
127
131
|
scratchOptions.extrudedHeight = ellipseGeometry._extrudedHeight;
|
|
128
132
|
scratchOptions.granularity = ellipseGeometry._granularity;
|
|
@@ -14,7 +14,7 @@ import Ellipsoid from "./Ellipsoid.js";
|
|
|
14
14
|
* @param {object} options Object with the following properties:
|
|
15
15
|
* @param {Cartesian3} options.center The circle's center point in the fixed frame.
|
|
16
16
|
* @param {number} options.radius The radius in meters.
|
|
17
|
-
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.
|
|
17
|
+
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.default] The ellipsoid the circle will be on.
|
|
18
18
|
* @param {number} [options.height=0.0] The distance in meters between the circle and the ellipsoid surface.
|
|
19
19
|
* @param {number} [options.granularity=0.02] The angular distance between points on the circle in radians.
|
|
20
20
|
* @param {number} [options.extrudedHeight=0.0] The distance in meters between the circle's extruded face and the ellipsoid surface.
|
|
@@ -231,7 +231,7 @@ function createGeometryFromPolygon(
|
|
|
231
231
|
* @param {PolygonHierarchy} options.polygonHierarchy A polygon hierarchy that can include holes.
|
|
232
232
|
* @param {number} [options.stRotation=0.0] The rotation of the texture coordinates, in radians. A positive rotation is counter-clockwise.
|
|
233
233
|
* @param {VertexFormat} [options.vertexFormat=VertexFormat.DEFAULT] The vertex attributes to be computed.
|
|
234
|
-
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.
|
|
234
|
+
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.default] The ellipsoid to be used as a reference.
|
|
235
235
|
* @param {PolygonHierarchy} [options.textureCoordinates] Texture coordinates as a {@link PolygonHierarchy} of {@link Cartesian2} points.
|
|
236
236
|
*
|
|
237
237
|
* @example
|
|
@@ -259,7 +259,7 @@ function CoplanarPolygonGeometry(options) {
|
|
|
259
259
|
this._polygonHierarchy = polygonHierarchy;
|
|
260
260
|
this._stRotation = defaultValue(options.stRotation, 0.0);
|
|
261
261
|
this._ellipsoid = Ellipsoid.clone(
|
|
262
|
-
defaultValue(options.ellipsoid, Ellipsoid.
|
|
262
|
+
defaultValue(options.ellipsoid, Ellipsoid.default)
|
|
263
263
|
);
|
|
264
264
|
this._workerName = "createCoplanarPolygonGeometry";
|
|
265
265
|
this._textureCoordinates = textureCoordinates;
|
|
@@ -291,7 +291,7 @@ function CoplanarPolygonGeometry(options) {
|
|
|
291
291
|
* @param {Cartesian3[]} options.positions An array of positions that defined the corner points of the polygon.
|
|
292
292
|
* @param {VertexFormat} [options.vertexFormat=VertexFormat.DEFAULT] The vertex attributes to be computed.
|
|
293
293
|
* @param {number} [options.stRotation=0.0] The rotation of the texture coordinates, in radians. A positive rotation is counter-clockwise.
|
|
294
|
-
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.
|
|
294
|
+
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.default] The ellipsoid to be used as a reference.
|
|
295
295
|
* @param {PolygonHierarchy} [options.textureCoordinates] Texture coordinates as a {@link PolygonHierarchy} of {@link Cartesian2} points.
|
|
296
296
|
* @returns {CoplanarPolygonGeometry}
|
|
297
297
|
*
|
|
@@ -1050,7 +1050,7 @@ function computeRectangle(positions, ellipsoid, width, cornerType, result) {
|
|
|
1050
1050
|
* @param {object} options Object with the following properties:
|
|
1051
1051
|
* @param {Cartesian3[]} options.positions An array of positions that define the center of the corridor.
|
|
1052
1052
|
* @param {number} options.width The distance between the edges of the corridor in meters.
|
|
1053
|
-
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.
|
|
1053
|
+
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.default] The ellipsoid to be used as a reference.
|
|
1054
1054
|
* @param {number} [options.granularity=CesiumMath.RADIANS_PER_DEGREE] The distance, in radians, between each latitude and longitude. Determines the number of positions in the buffer.
|
|
1055
1055
|
* @param {number} [options.height=0] The distance in meters between the ellipsoid surface and the positions.
|
|
1056
1056
|
* @param {number} [options.extrudedHeight] The distance in meters between the ellipsoid surface and the extruded face.
|
|
@@ -1084,7 +1084,7 @@ function CorridorGeometry(options) {
|
|
|
1084
1084
|
|
|
1085
1085
|
this._positions = positions;
|
|
1086
1086
|
this._ellipsoid = Ellipsoid.clone(
|
|
1087
|
-
defaultValue(options.ellipsoid, Ellipsoid.
|
|
1087
|
+
defaultValue(options.ellipsoid, Ellipsoid.default)
|
|
1088
1088
|
);
|
|
1089
1089
|
this._vertexFormat = VertexFormat.clone(
|
|
1090
1090
|
defaultValue(options.vertexFormat, VertexFormat.DEFAULT)
|
|
@@ -1246,7 +1246,7 @@ CorridorGeometry.unpack = function (array, startingIndex, result) {
|
|
|
1246
1246
|
* @param {object} options Object with the following properties:
|
|
1247
1247
|
* @param {Cartesian3[]} options.positions An array of positions that define the center of the corridor.
|
|
1248
1248
|
* @param {number} options.width The distance between the edges of the corridor in meters.
|
|
1249
|
-
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.
|
|
1249
|
+
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.default] The ellipsoid to be used as a reference.
|
|
1250
1250
|
* @param {CornerType} [options.cornerType=CornerType.ROUNDED] Determines the style of the corners.
|
|
1251
1251
|
* @param {Rectangle} [result] An object in which to store the result.
|
|
1252
1252
|
*
|
|
@@ -1262,7 +1262,7 @@ CorridorGeometry.computeRectangle = function (options, result) {
|
|
|
1262
1262
|
Check.defined("options.width", width);
|
|
1263
1263
|
//>>includeEnd('debug');
|
|
1264
1264
|
|
|
1265
|
-
const ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.
|
|
1265
|
+
const ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.default);
|
|
1266
1266
|
const cornerType = defaultValue(options.cornerType, CornerType.ROUNDED);
|
|
1267
1267
|
|
|
1268
1268
|
return computeRectangle(positions, ellipsoid, width, cornerType, result);
|
|
@@ -361,7 +361,7 @@ function computePositionsExtruded(params) {
|
|
|
361
361
|
* @param {object} options Object with the following properties:
|
|
362
362
|
* @param {Cartesian3[]} options.positions An array of positions that define the center of the corridor outline.
|
|
363
363
|
* @param {number} options.width The distance between the edges of the corridor outline.
|
|
364
|
-
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.
|
|
364
|
+
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.default] The ellipsoid to be used as a reference.
|
|
365
365
|
* @param {number} [options.granularity=CesiumMath.RADIANS_PER_DEGREE] The distance, in radians, between each latitude and longitude. Determines the number of positions in the buffer.
|
|
366
366
|
* @param {number} [options.height=0] The distance in meters between the positions and the ellipsoid surface.
|
|
367
367
|
* @param {number} [options.extrudedHeight] The distance in meters between the extruded face and the ellipsoid surface.
|
|
@@ -390,7 +390,7 @@ function CorridorOutlineGeometry(options) {
|
|
|
390
390
|
|
|
391
391
|
this._positions = positions;
|
|
392
392
|
this._ellipsoid = Ellipsoid.clone(
|
|
393
|
-
defaultValue(options.ellipsoid, Ellipsoid.
|
|
393
|
+
defaultValue(options.ellipsoid, Ellipsoid.default)
|
|
394
394
|
);
|
|
395
395
|
this._width = width;
|
|
396
396
|
this._height = Math.max(height, extrudedHeight);
|
package/Source/Core/Credit.js
CHANGED
|
@@ -9,7 +9,7 @@ const creditToId = {};
|
|
|
9
9
|
/**
|
|
10
10
|
* A credit contains data pertaining to how to display attributions/credits for certain content on the screen.
|
|
11
11
|
* @param {string} html An string representing an html code snippet
|
|
12
|
-
* @param {boolean} [showOnScreen=false] If true, the credit will be visible in the main credit container. Otherwise, it will appear in a popover
|
|
12
|
+
* @param {boolean} [showOnScreen=false] If true, the credit will be visible in the main credit container. Otherwise, it will appear in a popover. All credits are displayed `inline`, if you have an image we recommend sizing it correctly to match the text or use css to `vertical-align` it.
|
|
13
13
|
*
|
|
14
14
|
* @alias Credit
|
|
15
15
|
* @constructor
|
|
@@ -18,7 +18,7 @@ const creditToId = {};
|
|
|
18
18
|
*
|
|
19
19
|
* @example
|
|
20
20
|
* // Create a credit with a tooltip, image and link
|
|
21
|
-
* const credit = new Cesium.Credit('<a href="https://cesium.com/" target="_blank"><img src="/images/cesium_logo.png" title="Cesium"/></a>');
|
|
21
|
+
* const credit = new Cesium.Credit('<a href="https://cesium.com/" target="_blank"><img src="/images/cesium_logo.png" style="vertical-align: -7px" title="Cesium"/></a>');
|
|
22
22
|
*/
|
|
23
23
|
function Credit(html, showOnScreen) {
|
|
24
24
|
//>>includeStart('debug', pragmas.debug);
|
|
@@ -95,6 +95,7 @@ Object.defineProperties(Credit.prototype, {
|
|
|
95
95
|
const html = DOMPurify.sanitize(this._html);
|
|
96
96
|
|
|
97
97
|
const div = document.createElement("div");
|
|
98
|
+
div.className = "cesium-credit-wrapper";
|
|
98
99
|
div._creditId = this._id;
|
|
99
100
|
div.style.display = "inline";
|
|
100
101
|
div.innerHTML = html;
|