@cesium/engine 10.1.0 → 11.1.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-EB7PNZTK.js → chunk-26GA3JAM.js} +6 -5
- package/Build/Workers/{chunk-RZLZWKFN.js → chunk-27HUZ7SA.js} +4 -4
- package/Build/Workers/{chunk-A5CODJ4M.js → chunk-2ZGOQXYU.js} +6 -6
- package/Build/Workers/{chunk-TF776XCO.js → chunk-3Q2L65QU.js} +7 -7
- package/Build/Workers/{chunk-NVOABL76.js → chunk-472HQ3EH.js} +5 -5
- package/Build/Workers/{chunk-QX5XS4LC.js → chunk-5ODQSF26.js} +2 -2
- package/Build/Workers/{chunk-4YSNMHZ4.js → chunk-5OOFQLKF.js} +6 -6
- package/Build/Workers/{chunk-OXALEQPI.js → chunk-5PTXS2GO.js} +49 -23
- package/Build/Workers/{chunk-T77JILCU.js → chunk-6CHGCNMW.js} +2 -2
- package/Build/Workers/{chunk-FEVVHITK.js → chunk-76BYBWHP.js} +4 -4
- package/Build/Workers/{chunk-65MZOUNU.js → chunk-7BMOHCPM.js} +13 -13
- package/Build/Workers/{chunk-VE7BFUIX.js → chunk-7JO7GPJN.js} +1 -1
- package/Build/Workers/{chunk-5BLJ5ZM6.js → chunk-7KTQP4VB.js} +5 -5
- package/Build/Workers/{chunk-G5V4GPZE.js → chunk-7O373FFS.js} +8 -34
- package/Build/Workers/{chunk-S3PI2KFM.js → chunk-AD63PIY6.js} +2 -2
- package/Build/Workers/{chunk-6D66DPRV.js → chunk-BHQJ2NT7.js} +6 -6
- package/Build/Workers/{chunk-I2RC4XVN.js → chunk-C6YYBQXW.js} +4 -4
- package/Build/Workers/{chunk-X2ZQ7RJR.js → chunk-CKY7HOHV.js} +9 -9
- package/Build/Workers/{chunk-TO2PVHKI.js → chunk-DHYHSFFJ.js} +2 -2
- package/Build/Workers/{chunk-R6B7UCQB.js → chunk-DI5NGJUP.js} +2 -2
- package/Build/Workers/{chunk-X23FRWHJ.js → chunk-E27BLMDD.js} +7 -9
- package/Build/Workers/{chunk-N4QEHO3U.js → chunk-E63IIM5T.js} +1 -1
- package/Build/Workers/{chunk-BY3E4ONI.js → chunk-E6V6SQZW.js} +6 -6
- package/Build/Workers/{chunk-LSSWVB2X.js → chunk-EJZTDTUH.js} +4 -4
- package/Build/Workers/{chunk-XLTOBCDI.js → chunk-FDOV2LBJ.js} +7 -7
- package/Build/Workers/{chunk-ACRTCBN5.js → chunk-FIGIZHAQ.js} +11 -11
- package/Build/Workers/{chunk-4RMIRG6T.js → chunk-GESF4OXQ.js} +2 -2
- package/Build/Workers/{chunk-PNFHVBSF.js → chunk-GGZJN2TI.js} +16 -15
- package/Build/Workers/{chunk-KV4EQHK4.js → chunk-GNBFYG7F.js} +83 -79
- package/Build/Workers/{chunk-FOZWUH4T.js → chunk-GWCFU2SA.js} +7 -7
- package/Build/Workers/{chunk-Q55ECN3Y.js → chunk-I2ITFFPX.js} +1 -1
- package/Build/Workers/{chunk-XQI7XZHX.js → chunk-IBLIYJZR.js} +6 -6
- package/Build/Workers/{chunk-D2U4RI64.js → chunk-JW4FOI6M.js} +7 -7
- package/Build/Workers/{chunk-2J3JKXCP.js → chunk-K4GQUNB5.js} +9 -5
- package/Build/Workers/{chunk-POSRARY7.js → chunk-M3GMB5OP.js} +10 -10
- package/Build/Workers/{chunk-OOK53QUQ.js → chunk-MXIZJAPH.js} +1 -1
- package/Build/Workers/{chunk-OWGTMVDB.js → chunk-N5KJGGCM.js} +18 -20
- package/Build/Workers/{chunk-J7MQUQJY.js → chunk-NGPPMXRM.js} +12 -7
- package/Build/Workers/{chunk-OOMCT7OL.js → chunk-O3E4OAOE.js} +13 -13
- package/Build/Workers/{chunk-C3Z23UUJ.js → chunk-PGRPDNHG.js} +19 -23
- package/Build/Workers/{chunk-4VFBBNQ3.js → chunk-PRGYLLJT.js} +1 -1
- package/Build/Workers/{chunk-XZZNKIEV.js → chunk-S6MRMMQU.js} +6 -6
- package/Build/Workers/{chunk-76BYYG7N.js → chunk-SMDOP47J.js} +10 -10
- package/Build/Workers/{chunk-ZU334IDQ.js → chunk-TGONEMZO.js} +11 -11
- package/Build/Workers/{chunk-VRZ46QZ5.js → chunk-TKVT5GQM.js} +13 -13
- package/Build/Workers/{chunk-FDCLACT5.js → chunk-U72QNFOJ.js} +15 -25
- package/Build/Workers/{chunk-F3NDOSTZ.js → chunk-VJZB3WAV.js} +7 -7
- package/Build/Workers/{chunk-GPJR7MPQ.js → chunk-VU2MNO7L.js} +7 -7
- package/Build/Workers/{chunk-R4OIEIPE.js → chunk-XY4BATBS.js} +4 -4
- package/Build/Workers/{chunk-T6LPN7RI.js → chunk-YFXQECWV.js} +5 -5
- package/Build/Workers/{chunk-UCIPJSZX.js → chunk-YSGTGQQO.js} +14 -14
- package/Build/Workers/{chunk-BGE4QVG7.js → chunk-YZ733KKS.js} +12 -12
- package/Build/Workers/combineGeometry.js +23 -25
- package/Build/Workers/createBoxGeometry.js +16 -16
- package/Build/Workers/createBoxOutlineGeometry.js +14 -14
- package/Build/Workers/createCircleGeometry.js +24 -24
- package/Build/Workers/createCircleOutlineGeometry.js +17 -17
- package/Build/Workers/createCoplanarPolygonGeometry.js +31 -31
- package/Build/Workers/createCoplanarPolygonOutlineGeometry.js +29 -29
- package/Build/Workers/createCorridorGeometry.js +27 -27
- package/Build/Workers/createCorridorOutlineGeometry.js +26 -26
- 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 +25 -26
- package/Build/Workers/createGroundPolylineGeometry.js +20 -20
- package/Build/Workers/createPlaneGeometry.js +14 -14
- package/Build/Workers/createPlaneOutlineGeometry.js +13 -13
- package/Build/Workers/createPolygonGeometry.js +36 -40
- package/Build/Workers/createPolygonOutlineGeometry.js +40 -48
- package/Build/Workers/createPolylineGeometry.js +23 -23
- package/Build/Workers/createPolylineVolumeGeometry.js +32 -31
- package/Build/Workers/createPolylineVolumeOutlineGeometry.js +25 -25
- package/Build/Workers/createRectangleGeometry.js +28 -30
- package/Build/Workers/createRectangleOutlineGeometry.js +19 -19
- package/Build/Workers/createSimplePolylineGeometry.js +21 -21
- 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 +22 -26
- package/Build/Workers/createVerticesFromHeightmap.js +26 -26
- package/Build/Workers/createVerticesFromQuantizedTerrainMesh.js +42 -32
- package/Build/Workers/createWallGeometry.js +22 -22
- package/Build/Workers/createWallOutlineGeometry.js +21 -21
- package/Build/Workers/decodeDraco.js +11 -11
- package/Build/Workers/decodeGoogleEarthEnterprisePacket.js +28 -5
- package/Build/Workers/decodeI3S.js +10 -10
- package/Build/Workers/transcodeKTX2.js +19 -18
- package/Build/Workers/transferTypedArrayTest.js +1 -1
- package/Build/Workers/upsampleQuantizedTerrainMesh.js +20 -20
- package/Source/Core/ApproximateTerrainHeights.js +15 -15
- package/Source/Core/ArcGISTiledElevationTerrainProvider.js +33 -35
- package/Source/Core/AttributeCompression.js +12 -12
- package/Source/Core/AxisAlignedBoundingBox.js +2 -2
- package/Source/Core/BingMapsGeocoderService.js +1 -1
- package/Source/Core/BoundingRectangle.js +3 -3
- package/Source/Core/BoundingSphere.js +44 -44
- package/Source/Core/BoxGeometry.js +6 -6
- package/Source/Core/BoxOutlineGeometry.js +3 -3
- package/Source/Core/Cartesian2.js +7 -7
- package/Source/Core/Cartesian3.js +20 -20
- package/Source/Core/Cartesian4.js +8 -8
- package/Source/Core/Cartographic.js +6 -6
- package/Source/Core/CatmullRomSpline.js +6 -6
- package/Source/Core/CesiumTerrainProvider.js +66 -68
- package/Source/Core/Check.d.ts +3 -3
- package/Source/Core/Check.js +11 -11
- package/Source/Core/CircleGeometry.js +6 -6
- package/Source/Core/CircleOutlineGeometry.js +4 -4
- package/Source/Core/Clock.js +4 -4
- package/Source/Core/Color.js +11 -8
- package/Source/Core/ColorGeometryInstanceAttribute.js +1 -1
- package/Source/Core/ComponentDatatype.js +4 -4
- package/Source/Core/CompressedTextureBuffer.js +13 -2
- package/Source/Core/ConstantSpline.js +1 -1
- package/Source/Core/CoplanarPolygonGeometry.js +44 -41
- package/Source/Core/CoplanarPolygonGeometryLibrary.js +5 -5
- package/Source/Core/CoplanarPolygonOutlineGeometry.js +6 -6
- package/Source/Core/CorridorGeometry.js +77 -77
- package/Source/Core/CorridorGeometryLibrary.js +45 -45
- package/Source/Core/CorridorOutlineGeometry.js +16 -16
- package/Source/Core/CullingVolume.js +4 -4
- package/Source/Core/CustomHeightmapTerrainProvider.js +13 -13
- package/Source/Core/CylinderGeometry.js +8 -8
- package/Source/Core/CylinderGeometryLibrary.js +1 -1
- package/Source/Core/CylinderOutlineGeometry.js +4 -4
- package/Source/Core/DeveloperError.js +1 -1
- package/Source/Core/DistanceDisplayConditionGeometryInstanceAttribute.js +20 -21
- package/Source/Core/DoubleEndedPriorityQueue.js +2 -2
- package/Source/Core/EarthOrientationParameters.js +21 -25
- package/Source/Core/EarthOrientationParametersSample.js +1 -1
- package/Source/Core/EllipseGeometry.js +54 -55
- package/Source/Core/EllipseGeometryLibrary.js +12 -12
- package/Source/Core/EllipseOutlineGeometry.js +19 -19
- package/Source/Core/Ellipsoid.js +25 -33
- package/Source/Core/EllipsoidGeodesic.js +17 -16
- package/Source/Core/EllipsoidGeometry.js +9 -8
- package/Source/Core/EllipsoidOutlineGeometry.js +4 -4
- package/Source/Core/EllipsoidRhumbLine.js +33 -32
- package/Source/Core/EllipsoidTangentPlane.js +16 -16
- package/Source/Core/EllipsoidTerrainProvider.js +11 -10
- package/Source/Core/EllipsoidalOccluder.js +110 -130
- package/Source/Core/FeatureDetection.js +4 -4
- package/Source/Core/FrustumGeometry.js +14 -14
- package/Source/Core/FrustumOutlineGeometry.js +4 -4
- package/Source/Core/GeographicTilingScheme.js +6 -6
- package/Source/Core/Geometry.js +15 -17
- package/Source/Core/GeometryAttribute.js +4 -9
- package/Source/Core/GeometryAttributes.js +6 -6
- package/Source/Core/GeometryInstance.js +3 -4
- package/Source/Core/GeometryInstanceAttribute.js +1 -6
- package/Source/Core/GeometryPipeline.js +133 -137
- package/Source/Core/GoogleEarthEnterpriseMetadata.js +19 -20
- package/Source/Core/GoogleEarthEnterpriseTerrainData.js +25 -24
- package/Source/Core/GoogleEarthEnterpriseTerrainProvider.js +17 -21
- package/Source/Core/GoogleEarthEnterpriseTileInformation.js +2 -2
- package/Source/Core/GoogleMaps.js +1 -1
- package/Source/Core/GregorianDate.js +4 -4
- package/Source/Core/GroundPolylineGeometry.js +104 -104
- package/Source/Core/HeadingPitchRoll.js +7 -7
- package/Source/Core/HeightmapTerrainData.js +58 -54
- package/Source/Core/HeightmapTessellator.js +22 -23
- package/Source/Core/HermitePolynomialApproximation.js +8 -8
- package/Source/Core/HermiteSpline.js +11 -11
- package/Source/Core/HilbertOrder.js +1 -1
- package/Source/Core/Iau2006XysData.js +6 -6
- package/Source/Core/IauOrientationAxes.js +2 -2
- package/Source/Core/IauOrientationParameters.js +1 -1
- package/Source/Core/IndexDatatype.js +5 -5
- package/Source/Core/IntersectionTests.js +36 -78
- package/Source/Core/Intersections2D.js +3 -3
- package/Source/Core/Ion.js +1 -1
- package/Source/Core/IonGeocoderService.js +2 -2
- package/Source/Core/IonResource.js +5 -5
- package/Source/Core/Iso8601.js +3 -3
- package/Source/Core/JulianDate.js +23 -33
- package/Source/Core/KTX2Transcoder.js +11 -18
- package/Source/Core/LagrangePolynomialApproximation.js +1 -1
- package/Source/Core/LinearApproximation.js +4 -4
- package/Source/Core/LinearSpline.js +2 -2
- package/Source/Core/Math.js +4 -4
- package/Source/Core/Matrix2.js +3 -3
- package/Source/Core/Matrix3.js +16 -16
- package/Source/Core/Matrix4.js +31 -31
- package/Source/Core/MorphWeightSpline.js +2 -2
- package/Source/Core/NearFarScalar.js +1 -1
- package/Source/Core/Occluder.js +52 -56
- package/Source/Core/OpenCageGeocoderService.js +2 -2
- package/Source/Core/OrientedBoundingBox.js +52 -51
- package/Source/Core/OrthographicFrustum.js +11 -11
- package/Source/Core/OrthographicOffCenterFrustum.js +17 -17
- package/Source/Core/PeliasGeocoderService.js +1 -1
- package/Source/Core/PerspectiveFrustum.js +61 -55
- package/Source/Core/PerspectiveOffCenterFrustum.js +58 -59
- package/Source/Core/PinBuilder.js +1 -1
- package/Source/Core/PixelFormat.js +7 -21
- package/Source/Core/Plane.js +9 -9
- package/Source/Core/PlaneGeometry.js +1 -1
- package/Source/Core/PolygonGeometry.js +95 -94
- package/Source/Core/PolygonGeometryLibrary.js +49 -51
- package/Source/Core/PolygonOutlineGeometry.js +49 -51
- package/Source/Core/PolygonPipeline.js +31 -31
- package/Source/Core/PolylineGeometry.js +10 -10
- package/Source/Core/PolylinePipeline.js +25 -25
- package/Source/Core/PolylineVolumeGeometry.js +9 -9
- package/Source/Core/PolylineVolumeGeometryLibrary.js +51 -51
- package/Source/Core/PolylineVolumeOutlineGeometry.js +6 -6
- package/Source/Core/QuadraticRealPolynomial.js +1 -1
- package/Source/Core/QuantizedMeshTerrainData.js +28 -28
- package/Source/Core/QuarticRealPolynomial.js +1 -1
- package/Source/Core/Quaternion.js +19 -19
- package/Source/Core/QuaternionSpline.js +2 -2
- package/Source/Core/Rectangle.js +34 -13
- package/Source/Core/RectangleCollisionChecker.js +3 -3
- package/Source/Core/RectangleGeometry.js +55 -56
- package/Source/Core/RectangleGeometryLibrary.js +8 -8
- package/Source/Core/RectangleOutlineGeometry.js +20 -20
- package/Source/Core/RequestScheduler.js +6 -6
- package/Source/Core/Resource.js +24 -24
- package/Source/Core/S2Cell.js +16 -80
- package/Source/Core/ScreenSpaceEventHandler.js +54 -53
- package/Source/Core/Simon1994PlanetaryPositions.js +13 -13
- package/Source/Core/SimplePolylineGeometry.js +7 -7
- package/Source/Core/SphereGeometry.js +2 -2
- package/Source/Core/SphereOutlineGeometry.js +3 -3
- package/Source/Core/Spline.js +1 -1
- package/Source/Core/SteppedSpline.js +1 -1
- package/Source/Core/Stereographic.js +9 -9
- package/Source/Core/TaskProcessor.js +13 -13
- package/Source/Core/TerrainEncoding.js +33 -38
- package/Source/Core/TerrainMesh.js +1 -1
- package/Source/Core/TerrainProvider.js +12 -12
- package/Source/Core/TileAvailability.js +28 -28
- package/Source/Core/TileProviderError.js +5 -5
- package/Source/Core/TilingScheme.js +1 -1
- package/Source/Core/TimeInterval.js +4 -4
- package/Source/Core/TimeIntervalCollection.js +16 -15
- package/Source/Core/Tipsify.js +2 -2
- package/Source/Core/Transforms.js +52 -54
- package/Source/Core/TranslationRotationScale.js +1 -1
- package/Source/Core/TridiagonalSystemSolver.js +4 -4
- package/Source/Core/VRTheWorldTerrainProvider.js +28 -26
- package/Source/Core/VertexFormat.js +6 -6
- package/Source/Core/VerticalExaggeration.js +4 -4
- package/Source/Core/VideoSynchronizer.js +1 -1
- package/Source/Core/WallGeometry.js +18 -18
- package/Source/Core/WallGeometryLibrary.js +7 -7
- package/Source/Core/WallOutlineGeometry.js +8 -8
- package/Source/Core/WebMercatorProjection.js +5 -6
- package/Source/Core/WebMercatorTilingScheme.js +13 -13
- package/Source/Core/WireframeIndexGenerator.js +8 -8
- package/Source/Core/arrayRemoveDuplicates.js +1 -1
- package/Source/Core/buildModuleUrl.js +2 -2
- package/Source/Core/decodeGoogleEarthEnterpriseData.js +3 -3
- package/Source/Core/decodeVectorPolylinePositions.js +4 -4
- package/Source/Core/destroyObject.js +1 -1
- package/Source/Core/getJsonFromTypedArray.js +1 -1
- package/Source/Core/getMagic.js +1 -1
- package/Source/Core/loadImageFromTypedArray.js +2 -2
- package/Source/Core/loadKTX2.js +1 -1
- package/Source/Core/pointInsideTriangle.js +1 -1
- package/Source/Core/resizeImageToNextPowerOfTwo.js +1 -1
- package/Source/Core/sampleTerrain.js +7 -7
- package/Source/Core/sampleTerrainMostDetailed.js +7 -7
- package/Source/Core/scaleToGeodeticSurface.js +3 -3
- package/Source/Core/srgbToLinear.js +1 -1
- package/Source/Core/writeTextToCanvas.js +1 -1
- package/Source/DataSources/BillboardGraphics.js +13 -13
- package/Source/DataSources/BillboardVisualizer.js +24 -24
- package/Source/DataSources/BoxGeometryUpdater.js +33 -32
- package/Source/DataSources/BoxGraphics.js +3 -3
- package/Source/DataSources/CallbackPositionProperty.js +173 -0
- package/Source/DataSources/CallbackProperty.js +8 -2
- package/Source/DataSources/Cesium3DTilesetGraphics.js +1 -1
- package/Source/DataSources/Cesium3DTilesetVisualizer.js +6 -6
- package/Source/DataSources/CheckerboardMaterialProperty.js +9 -3
- package/Source/DataSources/ColorMaterialProperty.js +8 -2
- package/Source/DataSources/CompositeEntityCollection.js +14 -15
- package/Source/DataSources/CompositeMaterialProperty.js +10 -11
- package/Source/DataSources/CompositePositionProperty.js +11 -6
- package/Source/DataSources/CompositeProperty.js +7 -7
- package/Source/DataSources/ConstantPositionProperty.js +9 -3
- package/Source/DataSources/CorridorGeometryUpdater.js +61 -56
- package/Source/DataSources/CorridorGraphics.js +6 -6
- package/Source/DataSources/CylinderGeometryUpdater.js +42 -40
- package/Source/DataSources/CylinderGraphics.js +4 -4
- package/Source/DataSources/CzmlDataSource.js +365 -368
- package/Source/DataSources/DataSourceCollection.js +1 -1
- package/Source/DataSources/DataSourceDisplay.js +23 -23
- package/Source/DataSources/DynamicGeometryBatch.js +2 -2
- package/Source/DataSources/DynamicGeometryUpdater.js +14 -18
- package/Source/DataSources/EllipseGeometryUpdater.js +67 -63
- package/Source/DataSources/EllipseGraphics.js +7 -7
- package/Source/DataSources/EllipsoidGeometryUpdater.js +88 -86
- package/Source/DataSources/EllipsoidGraphics.js +5 -5
- package/Source/DataSources/Entity.js +14 -14
- package/Source/DataSources/EntityCluster.js +29 -27
- package/Source/DataSources/EntityCollection.js +7 -7
- package/Source/DataSources/EntityView.js +23 -23
- package/Source/DataSources/GeoJsonDataSource.js +25 -25
- package/Source/DataSources/GeometryUpdater.js +9 -10
- package/Source/DataSources/GeometryUpdaterSet.js +3 -3
- package/Source/DataSources/GeometryVisualizer.js +65 -71
- package/Source/DataSources/GpxDataSource.js +10 -10
- package/Source/DataSources/GridMaterialProperty.js +12 -6
- package/Source/DataSources/GroundGeometryUpdater.js +6 -6
- package/Source/DataSources/ImageMaterialProperty.js +10 -3
- package/Source/DataSources/KmlDataSource.js +212 -212
- package/Source/DataSources/LabelGraphics.js +14 -14
- package/Source/DataSources/LabelVisualizer.js +24 -24
- package/Source/DataSources/MaterialProperty.js +7 -1
- package/Source/DataSources/ModelGraphics.js +37 -17
- package/Source/DataSources/ModelVisualizer.js +41 -32
- package/Source/DataSources/NodeTransformationProperty.js +10 -4
- package/Source/DataSources/PathGraphics.js +2 -2
- package/Source/DataSources/PathVisualizer.js +99 -35
- package/Source/DataSources/PlaneGeometryUpdater.js +38 -37
- package/Source/DataSources/PlaneGraphics.js +2 -2
- package/Source/DataSources/PointGraphics.js +8 -8
- package/Source/DataSources/PointVisualizer.js +29 -29
- package/Source/DataSources/PolygonGeometryUpdater.js +68 -64
- package/Source/DataSources/PolygonGraphics.js +9 -9
- package/Source/DataSources/PolylineArrowMaterialProperty.js +8 -2
- package/Source/DataSources/PolylineDashMaterialProperty.js +11 -5
- package/Source/DataSources/PolylineGeometryUpdater.js +39 -44
- package/Source/DataSources/PolylineGlowMaterialProperty.js +10 -4
- package/Source/DataSources/PolylineGraphics.js +4 -4
- package/Source/DataSources/PolylineOutlineMaterialProperty.js +10 -4
- package/Source/DataSources/PolylineVisualizer.js +39 -43
- package/Source/DataSources/PolylineVolumeGeometryUpdater.js +70 -68
- package/Source/DataSources/PolylineVolumeGraphics.js +2 -2
- package/Source/DataSources/PositionProperty.js +5 -4
- package/Source/DataSources/PositionPropertyArray.js +10 -4
- package/Source/DataSources/Property.js +2 -2
- package/Source/DataSources/PropertyArray.js +6 -6
- package/Source/DataSources/PropertyBag.js +10 -9
- package/Source/DataSources/RectangleGeometryUpdater.js +68 -63
- package/Source/DataSources/RectangleGraphics.js +6 -6
- package/Source/DataSources/ReferenceProperty.js +13 -7
- package/Source/DataSources/Rotation.js +2 -2
- package/Source/DataSources/SampledPositionProperty.js +13 -7
- package/Source/DataSources/SampledProperty.js +22 -20
- package/Source/DataSources/ScaledPositionProperty.js +8 -2
- package/Source/DataSources/StaticGeometryColorBatch.js +41 -41
- package/Source/DataSources/StaticGeometryPerMaterialBatch.js +40 -40
- package/Source/DataSources/StaticGroundGeometryColorBatch.js +26 -27
- package/Source/DataSources/StaticGroundGeometryPerMaterialBatch.js +46 -44
- package/Source/DataSources/StaticGroundPolylinePerMaterialBatch.js +44 -43
- package/Source/DataSources/StaticOutlineGeometryBatch.js +28 -29
- package/Source/DataSources/StripeMaterialProperty.js +9 -3
- package/Source/DataSources/TerrainOffsetProperty.js +20 -11
- package/Source/DataSources/TimeIntervalCollectionPositionProperty.js +35 -31
- package/Source/DataSources/TimeIntervalCollectionProperty.js +6 -6
- package/Source/DataSources/VelocityOrientationProperty.js +9 -4
- package/Source/DataSources/VelocityVectorProperty.js +7 -9
- package/Source/DataSources/WallGeometryUpdater.js +25 -25
- package/Source/DataSources/WallGraphics.js +4 -4
- package/Source/DataSources/createPropertyDescriptor.js +3 -3
- package/Source/DataSources/exportKml.js +90 -86
- package/Source/DataSources/getElement.js +1 -1
- package/Source/DataSources/heightReferenceOnEntityPropertyChanged.js +4 -4
- package/Source/Renderer/AutomaticUniforms.js +3 -18
- package/Source/Renderer/Buffer.js +18 -18
- package/Source/Renderer/ClearCommand.js +1 -1
- package/Source/Renderer/ComputeEngine.js +1 -1
- package/Source/Renderer/Context.js +55 -40
- package/Source/Renderer/CubeMap.js +332 -354
- package/Source/Renderer/CubeMapFace.js +43 -65
- package/Source/Renderer/DrawCommand.js +50 -5
- package/Source/Renderer/Framebuffer.js +48 -49
- package/Source/Renderer/FramebufferManager.js +40 -34
- package/Source/Renderer/MultisampleFramebuffer.js +35 -14
- package/Source/Renderer/PixelDatatype.js +23 -0
- package/Source/Renderer/RenderState.js +36 -36
- package/Source/Renderer/Renderbuffer.js +3 -3
- package/Source/Renderer/Sampler.js +9 -15
- package/Source/Renderer/ShaderBuilder.js +8 -8
- package/Source/Renderer/ShaderCache.js +11 -15
- package/Source/Renderer/ShaderFunction.js +1 -1
- package/Source/Renderer/ShaderProgram.js +22 -15
- package/Source/Renderer/ShaderSource.js +40 -40
- package/Source/Renderer/Texture.js +455 -380
- package/Source/Renderer/UniformState.js +68 -80
- package/Source/Renderer/VertexArray.js +20 -20
- package/Source/Renderer/VertexArrayFacade.js +15 -16
- package/Source/Renderer/createUniform.js +1 -1
- package/Source/Renderer/createUniformArray.js +4 -4
- package/Source/Renderer/demodernizeShader.js +7 -5
- package/Source/Renderer/loadCubeMap.js +3 -8
- package/Source/Scene/ArcGisMapServerImageryProvider.js +39 -45
- package/Source/Scene/ArcGisMapService.js +4 -7
- package/Source/Scene/AutoExposure.js +4 -5
- package/Source/Scene/Axis.js +6 -6
- package/Source/Scene/B3dmParser.js +9 -9
- package/Source/Scene/BatchTable.js +7 -7
- package/Source/Scene/BatchTableHierarchy.js +62 -59
- package/Source/Scene/BatchTexture.js +2 -2
- package/Source/Scene/Billboard.js +45 -43
- package/Source/Scene/BillboardCollection.js +81 -83
- package/Source/Scene/BingMapsImageryProvider.js +13 -13
- package/Source/Scene/BoundingVolumeSemantics.js +10 -10
- package/Source/Scene/BoxEmitter.js +1 -1
- package/Source/Scene/BufferLoader.js +1 -1
- package/Source/Scene/Camera.js +161 -164
- package/Source/Scene/CameraEventAggregator.js +67 -23
- package/Source/Scene/CameraFlightPath.js +25 -25
- package/Source/Scene/Cesium3DTile.js +89 -95
- package/Source/Scene/Cesium3DTileBatchTable.js +61 -61
- package/Source/Scene/Cesium3DTileContentFactory.js +7 -7
- package/Source/Scene/Cesium3DTileFeature.js +1 -1
- package/Source/Scene/Cesium3DTileFeatureTable.js +8 -8
- package/Source/Scene/Cesium3DTileOptimizations.js +1 -1
- package/Source/Scene/Cesium3DTilePointFeature.js +11 -11
- package/Source/Scene/Cesium3DTileStyle.js +26 -24
- package/Source/Scene/Cesium3DTilesVoxelProvider.js +14 -20
- package/Source/Scene/Cesium3DTileset.js +81 -83
- package/Source/Scene/Cesium3DTilesetBaseTraversal.js +8 -16
- package/Source/Scene/Cesium3DTilesetCache.js +2 -2
- package/Source/Scene/Cesium3DTilesetHeatmap.js +5 -5
- package/Source/Scene/Cesium3DTilesetMetadata.js +2 -2
- package/Source/Scene/Cesium3DTilesetMostDetailedTraversal.js +2 -2
- package/Source/Scene/Cesium3DTilesetSkipTraversal.js +8 -12
- package/Source/Scene/Cesium3DTilesetStatistics.js +1 -1
- package/Source/Scene/Cesium3DTilesetTraversal.js +8 -10
- package/Source/Scene/ClassificationPrimitive.js +70 -69
- package/Source/Scene/ClippingPlaneCollection.js +39 -41
- package/Source/Scene/ClippingPolygon.js +8 -8
- package/Source/Scene/ClippingPolygonCollection.js +62 -63
- package/Source/Scene/CloudCollection.js +3 -10
- package/Source/Scene/Composite3DTileContent.js +6 -6
- package/Source/Scene/ConditionsExpression.js +5 -5
- package/Source/Scene/ContentMetadata.js +4 -4
- package/Source/Scene/CreditDisplay.js +8 -8
- package/Source/Scene/CumulusCloud.js +4 -4
- package/Source/Scene/DebugAppearance.js +2 -2
- package/Source/Scene/DebugCameraPrimitive.js +2 -2
- package/Source/Scene/DebugInspector.js +3 -3
- package/Source/Scene/DebugModelMatrixPrimitive.js +4 -4
- package/Source/Scene/DepthPlane.js +7 -7
- package/Source/Scene/DerivedCommand.js +422 -238
- package/Source/Scene/DiscardMissingTileImagePolicy.js +1 -1
- package/Source/Scene/DracoLoader.js +3 -3
- package/Source/Scene/EllipsoidPrimitive.js +7 -7
- package/Source/Scene/EllipsoidSurfaceAppearance.js +3 -3
- package/Source/Scene/Empty3DTileContent.js +1 -1
- package/Source/Scene/Expression.js +91 -91
- package/Source/Scene/Fog.js +8 -41
- package/Source/Scene/FrameRateMonitor.js +22 -22
- package/Source/Scene/FrameState.js +31 -0
- package/Source/Scene/Geometry3DTileContent.js +20 -20
- package/Source/Scene/GetFeatureInfoFormat.js +15 -14
- package/Source/Scene/Globe.js +33 -28
- package/Source/Scene/GlobeDepth.js +95 -66
- package/Source/Scene/GlobeSurfaceShaderSet.js +41 -34
- package/Source/Scene/GlobeSurfaceTile.js +33 -33
- package/Source/Scene/GlobeSurfaceTileProvider.js +132 -127
- package/Source/Scene/GlobeTranslucency.js +4 -4
- package/Source/Scene/GlobeTranslucencyFramebuffer.js +9 -9
- package/Source/Scene/GlobeTranslucencyState.js +53 -55
- package/Source/Scene/GltfBufferViewLoader.js +2 -2
- package/Source/Scene/GltfIndexBufferLoader.js +5 -5
- package/Source/Scene/GltfJsonLoader.js +2 -2
- package/Source/Scene/GltfLoader.js +177 -100
- package/Source/Scene/GltfStructuralMetadataLoader.js +9 -8
- package/Source/Scene/GltfTextureLoader.js +5 -5
- package/Source/Scene/GltfVertexBufferLoader.js +12 -13
- package/Source/Scene/GoogleEarthEnterpriseImageryProvider.js +9 -9
- package/Source/Scene/GoogleEarthEnterpriseMapsProvider.js +9 -9
- package/Source/Scene/GridImageryProvider.js +2 -2
- package/Source/Scene/GroundPolylinePrimitive.js +38 -39
- package/Source/Scene/GroundPrimitive.js +47 -45
- package/Source/Scene/GroupMetadata.js +4 -4
- package/Source/Scene/I3SDataProvider.js +12 -12
- package/Source/Scene/I3SDecoder.js +7 -8
- package/Source/Scene/I3SField.js +8 -8
- package/Source/Scene/I3SGeometry.js +14 -14
- package/Source/Scene/I3SLayer.js +26 -20
- package/Source/Scene/I3SNode.js +17 -17
- package/Source/Scene/I3SSublayer.js +4 -4
- package/Source/Scene/I3SSymbology.js +8 -8
- package/Source/Scene/I3dmParser.js +9 -9
- package/Source/Scene/ImageBasedLighting.js +58 -56
- package/Source/Scene/Imagery.js +3 -3
- package/Source/Scene/ImageryLayer.js +64 -66
- package/Source/Scene/ImageryLayerCollection.js +13 -15
- package/Source/Scene/ImageryLayerFeatureInfo.js +19 -20
- package/Source/Scene/ImageryProvider.js +1 -1
- package/Source/Scene/Implicit3DTileContent.js +34 -37
- package/Source/Scene/ImplicitAvailabilityBitstream.js +2 -2
- package/Source/Scene/ImplicitMetadataView.js +2 -2
- package/Source/Scene/ImplicitSubtree.js +29 -30
- package/Source/Scene/ImplicitSubtreeCache.js +1 -1
- package/Source/Scene/ImplicitSubtreeMetadata.js +5 -5
- package/Source/Scene/ImplicitTileCoordinates.js +11 -11
- package/Source/Scene/ImplicitTileset.js +2 -2
- package/Source/Scene/InvertClassification.js +7 -7
- package/Source/Scene/IonImageryProvider.js +6 -6
- package/Source/Scene/JobScheduler.js +4 -4
- package/Source/Scene/Label.js +31 -31
- package/Source/Scene/LabelCollection.js +17 -15
- package/Source/Scene/MapboxImageryProvider.js +3 -3
- package/Source/Scene/MapboxStyleImageryProvider.js +4 -4
- package/Source/Scene/Material.js +50 -29
- package/Source/Scene/MaterialAppearance.js +4 -4
- package/Source/Scene/Megatexture.js +21 -24
- package/Source/Scene/MetadataClassProperty.js +11 -11
- package/Source/Scene/MetadataComponentType.js +1 -1
- package/Source/Scene/MetadataEntity.js +8 -8
- package/Source/Scene/MetadataEnum.js +1 -1
- package/Source/Scene/MetadataPicking.js +305 -0
- package/Source/Scene/MetadataSchemaLoader.js +1 -1
- package/Source/Scene/MetadataTable.js +2 -2
- package/Source/Scene/MetadataTableProperty.js +22 -22
- package/Source/Scene/Model/AlphaPipelineStage.js +2 -2
- package/Source/Scene/Model/AtmospherePipelineStage.js +3 -3
- package/Source/Scene/Model/B3dmLoader.js +8 -8
- package/Source/Scene/Model/BatchTexturePipelineStage.js +2 -2
- package/Source/Scene/Model/CPUStylingPipelineStage.js +4 -4
- package/Source/Scene/Model/ClassificationModelDrawCommand.js +8 -8
- package/Source/Scene/Model/ClassificationPipelineStage.js +5 -5
- package/Source/Scene/Model/CustomShader.js +9 -9
- package/Source/Scene/Model/CustomShaderPipelineStage.js +37 -38
- package/Source/Scene/Model/DequantizationPipelineStage.js +5 -5
- package/Source/Scene/Model/Extensions/Gpm/AnchorPointDirect.js +61 -0
- package/Source/Scene/Model/Extensions/Gpm/AnchorPointIndirect.js +77 -0
- package/Source/Scene/Model/Extensions/Gpm/CorrelationGroup.js +81 -0
- package/Source/Scene/Model/Extensions/Gpm/GltfGpmLoader.js +248 -0
- package/Source/Scene/Model/Extensions/Gpm/GltfGpmLocal.js +179 -0
- package/Source/Scene/Model/Extensions/Gpm/GltfMeshPrimitiveGpmLoader.js +548 -0
- package/Source/Scene/Model/Extensions/Gpm/MeshPrimitiveGpmLocal.js +28 -0
- package/Source/Scene/Model/Extensions/Gpm/PpeMetadata.js +79 -0
- package/Source/Scene/Model/Extensions/Gpm/PpeSource.js +75 -0
- package/Source/Scene/Model/Extensions/Gpm/PpeTexture.js +127 -0
- package/Source/Scene/Model/Extensions/Gpm/Spdcf.js +103 -0
- package/Source/Scene/Model/Extensions/Gpm/StorageType.js +30 -0
- package/Source/Scene/Model/FeatureIdPipelineStage.js +40 -40
- package/Source/Scene/Model/GeoJsonLoader.js +17 -17
- package/Source/Scene/Model/GeometryPipelineStage.js +23 -24
- package/Source/Scene/Model/I3dmLoader.js +36 -36
- package/Source/Scene/Model/ImageBasedLightingPipelineStage.js +22 -30
- package/Source/Scene/Model/InstancingPipelineStage.js +86 -86
- package/Source/Scene/Model/LightingPipelineStage.js +4 -4
- package/Source/Scene/Model/MaterialPipelineStage.js +78 -93
- package/Source/Scene/Model/MetadataPickingPipelineStage.js +96 -0
- package/Source/Scene/Model/MetadataPipelineStage.js +39 -47
- package/Source/Scene/Model/Model.js +134 -54
- package/Source/Scene/Model/Model3DTileContent.js +32 -13
- package/Source/Scene/Model/ModelAnimationChannel.js +2 -2
- package/Source/Scene/Model/ModelAnimationCollection.js +9 -9
- package/Source/Scene/Model/ModelArticulation.js +2 -2
- package/Source/Scene/Model/ModelArticulationStage.js +4 -4
- package/Source/Scene/Model/ModelClippingPlanesPipelineStage.js +11 -11
- package/Source/Scene/Model/ModelClippingPolygonsPipelineStage.js +6 -6
- package/Source/Scene/Model/ModelColorPipelineStage.js +12 -13
- package/Source/Scene/Model/ModelDrawCommand.js +5 -5
- package/Source/Scene/Model/{buildDrawCommand.js → ModelDrawCommands.js} +85 -28
- package/Source/Scene/Model/ModelFeatureTable.js +5 -5
- package/Source/Scene/Model/ModelMatrixUpdateStage.js +24 -12
- package/Source/Scene/Model/ModelRenderResources.js +1 -1
- package/Source/Scene/Model/ModelRuntimeNode.js +15 -15
- package/Source/Scene/Model/ModelRuntimePrimitive.js +8 -5
- package/Source/Scene/Model/ModelSceneGraph.js +42 -43
- package/Source/Scene/Model/ModelSilhouettePipelineStage.js +4 -4
- package/Source/Scene/Model/ModelSkin.js +4 -4
- package/Source/Scene/Model/ModelSplitterPipelineStage.js +8 -9
- package/Source/Scene/Model/ModelUtility.js +5 -5
- package/Source/Scene/Model/MorphTargetsPipelineStage.js +18 -18
- package/Source/Scene/Model/NodeRenderResources.js +1 -1
- package/Source/Scene/Model/NodeStatisticsPipelineStage.js +1 -1
- package/Source/Scene/Model/PickingPipelineStage.js +5 -5
- package/Source/Scene/Model/PntsLoader.js +7 -7
- package/Source/Scene/Model/PointCloudStylingPipelineStage.js +22 -23
- package/Source/Scene/Model/PrimitiveOutlineGenerator.js +6 -6
- package/Source/Scene/Model/PrimitiveOutlinePipelineStage.js +7 -7
- package/Source/Scene/Model/PrimitiveRenderResources.js +3 -3
- package/Source/Scene/Model/PrimitiveStatisticsPipelineStage.js +1 -1
- package/Source/Scene/Model/SceneMode2DPipelineStage.js +23 -23
- package/Source/Scene/Model/SelectedFeatureIdPipelineStage.js +10 -14
- package/Source/Scene/Model/SkinningPipelineStage.js +5 -5
- package/Source/Scene/Model/StyleCommandsNeeded.js +1 -1
- package/Source/Scene/Model/TextureManager.js +2 -2
- package/Source/Scene/Model/TextureUniform.js +3 -3
- package/Source/Scene/Model/TilesetPipelineStage.js +2 -2
- package/Source/Scene/Model/VerticalExaggerationPipelineStage.js +4 -4
- package/Source/Scene/Model/WireframePipelineStage.js +7 -7
- package/Source/Scene/Model/pickModel.js +26 -26
- package/Source/Scene/ModelComponents.js +13 -4
- package/Source/Scene/Moon.js +6 -5
- package/Source/Scene/Multiple3DTileContent.js +15 -14
- package/Source/Scene/OIT.js +48 -97
- package/Source/Scene/OpenStreetMapImageryProvider.js +8 -7
- package/Source/Scene/OrderedGroundPrimitiveCollection.js +2 -2
- package/Source/Scene/Particle.js +3 -3
- package/Source/Scene/ParticleEmitter.js +1 -1
- package/Source/Scene/ParticleSystem.js +32 -32
- package/Source/Scene/PerInstanceColorAppearance.js +1 -1
- package/Source/Scene/PickDepth.js +16 -4
- package/Source/Scene/PickDepthFramebuffer.js +1 -1
- package/Source/Scene/PickFramebuffer.js +24 -12
- package/Source/Scene/PickedMetadataInfo.js +39 -0
- package/Source/Scene/Picking.js +270 -120
- package/Source/Scene/PntsParser.js +28 -28
- package/Source/Scene/PointCloud.js +39 -38
- package/Source/Scene/PointCloudEyeDomeLighting.js +6 -6
- package/Source/Scene/PointCloudShading.js +3 -3
- package/Source/Scene/PointPrimitive.js +31 -28
- package/Source/Scene/PointPrimitiveCollection.js +34 -33
- package/Source/Scene/Polyline.js +9 -9
- package/Source/Scene/PolylineCollection.js +55 -57
- package/Source/Scene/PolylineColorAppearance.js +3 -3
- package/Source/Scene/PolylineMaterialAppearance.js +3 -3
- package/Source/Scene/PostProcessStage.js +95 -115
- package/Source/Scene/PostProcessStageCollection.js +73 -49
- package/Source/Scene/PostProcessStageComposite.js +2 -2
- package/Source/Scene/PostProcessStageLibrary.js +30 -4
- package/Source/Scene/PostProcessStageTextureCache.js +10 -10
- package/Source/Scene/Primitive.js +93 -93
- package/Source/Scene/PrimitiveCollection.js +1 -1
- package/Source/Scene/PrimitiveLoadPlan.js +1 -1
- package/Source/Scene/PrimitivePipeline.js +30 -30
- package/Source/Scene/PropertyTable.js +5 -5
- package/Source/Scene/PropertyTextureProperty.js +36 -7
- package/Source/Scene/QuadtreePrimitive.js +56 -58
- package/Source/Scene/QuadtreeTile.js +4 -4
- package/Source/Scene/QuadtreeTileProvider.js +1 -1
- package/Source/Scene/ResourceCache.js +7 -7
- package/Source/Scene/ResourceCacheKey.js +15 -15
- package/Source/Scene/Scene.js +897 -677
- package/Source/Scene/SceneFramebuffer.js +2 -2
- package/Source/Scene/SceneTransforms.js +30 -92
- package/Source/Scene/SceneTransitioner.js +47 -47
- package/Source/Scene/ScreenSpaceCameraController.js +171 -157
- package/Source/Scene/SensorVolumePortionToDisplay.js +1 -1
- package/Source/Scene/ShadowMap.js +71 -72
- package/Source/Scene/ShadowMapShader.js +9 -9
- package/Source/Scene/ShadowVolumeAppearance.js +39 -39
- package/Source/Scene/SingleTileImageryProvider.js +3 -3
- package/Source/Scene/SkyAtmosphere.js +8 -8
- package/Source/Scene/SkyBox.js +17 -24
- package/Source/Scene/SpatialNode.js +13 -13
- package/Source/Scene/SpecularEnvironmentCubeMap.js +240 -0
- package/Source/Scene/SphereEmitter.js +1 -1
- package/Source/Scene/StructuralMetadata.js +1 -1
- package/Source/Scene/StyleExpression.js +1 -1
- package/Source/Scene/Sun.js +11 -7
- package/Source/Scene/SunPostProcess.js +6 -6
- package/Source/Scene/TerrainFillMesh.js +157 -156
- package/Source/Scene/TextureAtlas.js +11 -11
- package/Source/Scene/TileBoundingRegion.js +31 -31
- package/Source/Scene/TileBoundingS2Cell.js +37 -40
- package/Source/Scene/TileBoundingSphere.js +2 -2
- package/Source/Scene/TileCoordinatesImageryProvider.js +3 -3
- package/Source/Scene/TileImagery.js +7 -11
- package/Source/Scene/TileMapServiceImageryProvider.js +26 -25
- package/Source/Scene/TileMetadata.js +4 -4
- package/Source/Scene/TileOrientedBoundingBox.js +6 -6
- package/Source/Scene/Tileset3DTileContent.js +1 -1
- package/Source/Scene/TilesetMetadata.js +4 -4
- package/Source/Scene/TimeDynamicImagery.js +3 -3
- package/Source/Scene/TimeDynamicPointCloud.js +9 -9
- package/Source/Scene/Tonemapper.js +35 -23
- package/Source/Scene/TranslucentTileClassification.js +48 -58
- package/Source/Scene/TweenCollection.js +9 -9
- package/Source/Scene/UrlTemplateImageryProvider.js +23 -23
- package/Source/Scene/Vector3DTileClampedPolylines.js +21 -21
- package/Source/Scene/Vector3DTileContent.js +38 -39
- package/Source/Scene/Vector3DTileGeometry.js +11 -8
- package/Source/Scene/Vector3DTilePoints.js +18 -22
- package/Source/Scene/Vector3DTilePolygons.js +6 -6
- package/Source/Scene/Vector3DTilePolylines.js +8 -8
- package/Source/Scene/Vector3DTilePrimitive.js +30 -31
- package/Source/Scene/View.js +111 -80
- package/Source/Scene/VoxelBoxShape.js +34 -34
- package/Source/Scene/VoxelCell.js +7 -7
- package/Source/Scene/VoxelContent.js +1 -1
- package/Source/Scene/VoxelCylinderShape.js +48 -48
- package/Source/Scene/VoxelEllipsoidShape.js +83 -97
- package/Source/Scene/VoxelPrimitive.js +80 -109
- package/Source/Scene/VoxelRenderResources.js +13 -16
- package/Source/Scene/VoxelTraversal.js +41 -41
- package/Source/Scene/WebMapServiceImageryProvider.js +12 -12
- package/Source/Scene/WebMapTileServiceImageryProvider.js +8 -8
- package/Source/Scene/buildVoxelDrawCommands.js +10 -14
- package/Source/Scene/computeFlyToLocationForRectangle.js +7 -5
- package/Source/Scene/createBillboardPointCallback.js +2 -2
- package/Source/Scene/createElevationBandMaterial.js +8 -8
- package/Source/Scene/createGooglePhotorealistic3DTileset.js +1 -1
- package/Source/Scene/createOsmBuildingsAsync.js +1 -1
- package/Source/Scene/createTangentSpaceDebugPrimitive.js +7 -7
- package/Source/Scene/findContentMetadata.js +2 -2
- package/Source/Scene/findTileMetadata.js +2 -2
- package/Source/Scene/getBinaryAccessor.js +1 -1
- package/Source/Scene/getClipAndStyleCode.js +1 -1
- package/Source/Scene/getClippingFunction.js +1 -1
- package/Source/Scene/getMetadataClassProperty.js +43 -0
- package/Source/Scene/parseBatchTable.js +21 -24
- package/Source/Scene/parseFeatureMetadataLegacy.js +3 -3
- package/Source/Scene/parseStructuralMetadata.js +3 -3
- package/Source/Scene/processVoxelProperties.js +28 -33
- package/Source/Shaders/Builtin/CzmBuiltins.js +2 -2
- package/Source/Shaders/Builtin/Functions/packDepth.glsl +2 -2
- package/Source/Shaders/Builtin/Functions/packDepth.js +2 -2
- package/Source/Shaders/Builtin/Functions/pbrLighting.glsl +2 -2
- package/Source/Shaders/Builtin/Functions/pbrLighting.js +2 -2
- package/Source/Shaders/Builtin/Functions/pbrNeutralTonemapping.glsl +23 -0
- package/Source/Shaders/Builtin/Functions/pbrNeutralTonemapping.js +25 -0
- package/Source/Shaders/Builtin/Functions/textureCube.glsl +21 -2
- package/Source/Shaders/Builtin/Functions/textureCube.js +21 -2
- package/Source/Shaders/Builtin/Functions/unpackDepth.glsl +3 -3
- package/Source/Shaders/Builtin/Functions/unpackDepth.js +3 -3
- package/Source/Shaders/Builtin/Functions/windowToEyeCoordinates.glsl +1 -1
- package/Source/Shaders/Builtin/Functions/windowToEyeCoordinates.js +1 -1
- package/Source/Shaders/Builtin/Functions/writeLogDepth.glsl +2 -2
- package/Source/Shaders/Builtin/Functions/writeLogDepth.js +2 -2
- package/Source/Shaders/Builtin/Structs/materialInput.glsl +2 -0
- package/Source/Shaders/Builtin/Structs/materialInput.js +2 -0
- package/Source/Shaders/DepthPlaneVS.glsl +1 -1
- package/Source/Shaders/DepthPlaneVS.js +1 -1
- package/Source/Shaders/GlobeFS.glsl +10 -4
- package/Source/Shaders/GlobeFS.js +10 -4
- package/Source/Shaders/Materials/WaterMaskMaterial.glsl +15 -0
- package/Source/Shaders/Materials/WaterMaskMaterial.js +17 -0
- package/Source/Shaders/Model/AtmosphereStageFS.glsl +1 -1
- package/Source/Shaders/Model/AtmosphereStageFS.js +1 -1
- package/Source/Shaders/Model/ImageBasedLightingStageFS.glsl +40 -29
- package/Source/Shaders/Model/ImageBasedLightingStageFS.js +40 -29
- package/Source/Shaders/Model/LightingStageFS.glsl +2 -2
- package/Source/Shaders/Model/LightingStageFS.js +2 -2
- package/Source/Shaders/Model/ModelFS.glsl +26 -0
- package/Source/Shaders/Model/ModelFS.js +26 -0
- package/Source/Shaders/PostProcessStages/AcesTonemappingStage.glsl +4 -0
- package/Source/Shaders/PostProcessStages/AcesTonemappingStage.js +4 -0
- package/Source/Shaders/PostProcessStages/AmbientOcclusionGenerate.glsl +59 -59
- package/Source/Shaders/PostProcessStages/AmbientOcclusionGenerate.js +60 -60
- package/Source/Shaders/PostProcessStages/FilmicTonemapping.glsl +4 -0
- package/Source/Shaders/PostProcessStages/FilmicTonemapping.js +4 -0
- package/Source/Shaders/PostProcessStages/ModifiedReinhardTonemapping.glsl +4 -0
- package/Source/Shaders/PostProcessStages/ModifiedReinhardTonemapping.js +4 -0
- package/Source/Shaders/PostProcessStages/PbrNeutralTonemapping.glsl +25 -0
- package/Source/Shaders/PostProcessStages/PbrNeutralTonemapping.js +27 -0
- package/Source/Shaders/PostProcessStages/ReinhardTonemapping.glsl +4 -0
- package/Source/Shaders/PostProcessStages/ReinhardTonemapping.js +4 -0
- package/Source/Shaders/SkyAtmosphereFS.glsl +1 -1
- package/Source/Shaders/SkyAtmosphereFS.js +1 -1
- package/Source/Widget/CesiumWidget.js +10 -9
- package/Source/Workers/combineGeometry.js +3 -4
- package/Source/Workers/createCircleGeometry.js +2 -2
- package/Source/Workers/createCircleOutlineGeometry.js +2 -2
- package/Source/Workers/createCoplanarPolygonOutlineGeometry.js +1 -1
- package/Source/Workers/createCorridorOutlineGeometry.js +2 -2
- package/Source/Workers/createEllipsoidOutlineGeometry.js +1 -1
- package/Source/Workers/createGeometry.js +4 -5
- package/Source/Workers/createGroundPolylineGeometry.js +1 -1
- package/Source/Workers/createPolylineVolumeGeometry.js +2 -2
- package/Source/Workers/createPolylineVolumeOutlineGeometry.js +4 -4
- package/Source/Workers/createRectangleOutlineGeometry.js +1 -1
- package/Source/Workers/createSimplePolylineGeometry.js +2 -2
- package/Source/Workers/createTaskProcessorWorker.js +1 -1
- package/Source/Workers/createVectorTileClampedPolylines.js +30 -30
- package/Source/Workers/createVectorTileGeometries.js +18 -18
- package/Source/Workers/createVectorTilePoints.js +3 -3
- package/Source/Workers/createVectorTilePolygons.js +11 -11
- package/Source/Workers/createVectorTilePolylines.js +7 -7
- package/Source/Workers/createVerticesFromGoogleEarthEnterpriseBuffer.js +29 -30
- package/Source/Workers/createVerticesFromQuantizedTerrainMesh.js +60 -60
- package/Source/Workers/decodeDraco.js +23 -23
- package/Source/Workers/decodeGoogleEarthEnterprisePacket.js +3 -3
- package/Source/Workers/decodeI3S.js +53 -53
- package/Source/Workers/transcodeKTX2.js +9 -9
- package/Source/Workers/transferTypedArrayTest.js +1 -1
- package/Source/Workers/upsampleQuantizedTerrainMesh.js +37 -36
- package/index.d.ts +620 -136
- package/index.js +221 -205
- package/package.json +3 -3
- package/Build/Workers/chunk-2GEAGYUY.js +0 -1477
- package/Build/Workers/chunk-3WUV74WM.js +0 -1800
- package/Build/Workers/chunk-4MSUJ4I7.js +0 -456
- package/Build/Workers/chunk-5KWHSZYL.js +0 -834
- package/Build/Workers/chunk-5O6JWQ4E.js +0 -398
- package/Build/Workers/chunk-6OFDHMHR.js +0 -1258
- package/Build/Workers/chunk-AA4GZKOT.js +0 -75
- package/Build/Workers/chunk-B75IEX2S.js +0 -390
- package/Build/Workers/chunk-BAVI3ZS2.js +0 -39
- package/Build/Workers/chunk-BBDZYSZB.js +0 -287
- package/Build/Workers/chunk-C45MU4GZ.js +0 -220
- package/Build/Workers/chunk-CF7P7K7E.js +0 -684
- package/Build/Workers/chunk-D4K27X2M.js +0 -305
- package/Build/Workers/chunk-DKVHRNFY.js +0 -100
- package/Build/Workers/chunk-ELI4BUOT.js +0 -963
- package/Build/Workers/chunk-FQPSOOPH.js +0 -258
- package/Build/Workers/chunk-GNHZH7HP.js +0 -37
- package/Build/Workers/chunk-GWT64LKY.js +0 -171
- package/Build/Workers/chunk-HGEEOMSC.js +0 -157
- package/Build/Workers/chunk-IUROUBPA.js +0 -300
- package/Build/Workers/chunk-JNLWLSTP.js +0 -476
- package/Build/Workers/chunk-JYQNWIQQ.js +0 -44
- package/Build/Workers/chunk-KUN2ZA5X.js +0 -138
- package/Build/Workers/chunk-LXQ5QAEJ.js +0 -196
- package/Build/Workers/chunk-MBZH7YZ7.js +0 -945
- package/Build/Workers/chunk-MKXWJTFQ.js +0 -781
- package/Build/Workers/chunk-MMV6TO3P.js +0 -101
- package/Build/Workers/chunk-MSKXMXJI.js +0 -500
- package/Build/Workers/chunk-OAPA2RTG.js +0 -239
- package/Build/Workers/chunk-OE4MCOC7.js +0 -421
- package/Build/Workers/chunk-OJF4RTJG.js +0 -634
- package/Build/Workers/chunk-OXSI7N4C.js +0 -768
- package/Build/Workers/chunk-PYHLO636.js +0 -2857
- package/Build/Workers/chunk-QD4KM3GO.js +0 -138
- package/Build/Workers/chunk-QMLTCCYG.js +0 -55
- package/Build/Workers/chunk-QYQIVZBU.js +0 -117
- package/Build/Workers/chunk-R3TKLC6E.js +0 -1075
- package/Build/Workers/chunk-R4ZEWO4I.js +0 -122
- package/Build/Workers/chunk-RCK55EDX.js +0 -691
- package/Build/Workers/chunk-RHBWXX7C.js +0 -629
- package/Build/Workers/chunk-SAPFXU5X.js +0 -102
- package/Build/Workers/chunk-TBBFDFCS.js +0 -368
- package/Build/Workers/chunk-TGY6H6N6.js +0 -163
- package/Build/Workers/chunk-UOEUCKKU.js +0 -59
- package/Build/Workers/chunk-VFBNELXB.js +0 -353
- package/Build/Workers/chunk-VYWUFRRR.js +0 -1052
- package/Build/Workers/chunk-WVSELU6O.js +0 -2716
- package/Build/Workers/chunk-X43SJLQL.js +0 -10364
- package/Build/Workers/chunk-XUOJCLOH.js +0 -511
- package/Build/Workers/chunk-YLYBLJ3Y.js +0 -73
- package/Build/Workers/chunk-ZEE2EIFD.js +0 -430
- package/Build/Workers/chunk-ZIKGV7EL.js +0 -58
- package/Source/Scene/OctahedralProjectedCubeMap.js +0 -444
- package/Source/Shaders/Builtin/Functions/sampleOctahedralProjection.glsl +0 -78
- package/Source/Shaders/Builtin/Functions/sampleOctahedralProjection.js +0 -80
- package/Source/Shaders/OctahedralProjectionAtlasFS.glsl +0 -89
- package/Source/Shaders/OctahedralProjectionAtlasFS.js +0 -91
- package/Source/Shaders/OctahedralProjectionFS.glsl +0 -14
- package/Source/Shaders/OctahedralProjectionFS.js +0 -16
- package/Source/Shaders/OctahedralProjectionVS.glsl +0 -10
- package/Source/Shaders/OctahedralProjectionVS.js +0 -12
|
@@ -73,7 +73,7 @@ function calculateAttributes(
|
|
|
73
73
|
positions,
|
|
74
74
|
vertexFormat,
|
|
75
75
|
ellipsoid,
|
|
76
|
-
tangentRotationMatrix
|
|
76
|
+
tangentRotationMatrix,
|
|
77
77
|
) {
|
|
78
78
|
const length = positions.length;
|
|
79
79
|
|
|
@@ -102,7 +102,7 @@ function calculateAttributes(
|
|
|
102
102
|
if (vertexFormat.bitangent) {
|
|
103
103
|
Cartesian3.normalize(
|
|
104
104
|
Cartesian3.cross(normal, tangent, bitangent),
|
|
105
|
-
bitangent
|
|
105
|
+
bitangent,
|
|
106
106
|
);
|
|
107
107
|
}
|
|
108
108
|
}
|
|
@@ -175,7 +175,7 @@ function calculateAttributesWall(positions, vertexFormat, ellipsoid) {
|
|
|
175
175
|
if (vertexFormat.tangent) {
|
|
176
176
|
tangent = Cartesian3.normalize(
|
|
177
177
|
Cartesian3.cross(bitangent, normal, tangent),
|
|
178
|
-
tangent
|
|
178
|
+
tangent,
|
|
179
179
|
);
|
|
180
180
|
}
|
|
181
181
|
}
|
|
@@ -268,7 +268,7 @@ function constructRectangle(rectangleGeometry, computedOptions) {
|
|
|
268
268
|
row,
|
|
269
269
|
col,
|
|
270
270
|
position,
|
|
271
|
-
st
|
|
271
|
+
st,
|
|
272
272
|
);
|
|
273
273
|
|
|
274
274
|
positions[posIndex++] = position.x;
|
|
@@ -294,7 +294,7 @@ function constructRectangle(rectangleGeometry, computedOptions) {
|
|
|
294
294
|
0,
|
|
295
295
|
0,
|
|
296
296
|
position,
|
|
297
|
-
st
|
|
297
|
+
st,
|
|
298
298
|
);
|
|
299
299
|
|
|
300
300
|
positions[posIndex++] = position.x;
|
|
@@ -319,7 +319,7 @@ function constructRectangle(rectangleGeometry, computedOptions) {
|
|
|
319
319
|
height - 1,
|
|
320
320
|
0,
|
|
321
321
|
position,
|
|
322
|
-
st
|
|
322
|
+
st,
|
|
323
323
|
);
|
|
324
324
|
|
|
325
325
|
positions[posIndex++] = position.x;
|
|
@@ -352,7 +352,7 @@ function constructRectangle(rectangleGeometry, computedOptions) {
|
|
|
352
352
|
positions,
|
|
353
353
|
vertexFormat,
|
|
354
354
|
ellipsoid,
|
|
355
|
-
computedOptions.tangentRotationMatrix
|
|
355
|
+
computedOptions.tangentRotationMatrix,
|
|
356
356
|
);
|
|
357
357
|
|
|
358
358
|
let indicesSize = 6 * (width - 1) * (rowHeight - 1);
|
|
@@ -433,7 +433,7 @@ function addWallPositions(
|
|
|
433
433
|
posIndex,
|
|
434
434
|
i,
|
|
435
435
|
topPositions,
|
|
436
|
-
bottomPositions
|
|
436
|
+
bottomPositions,
|
|
437
437
|
) {
|
|
438
438
|
wallPositions[posIndex++] = topPositions[i];
|
|
439
439
|
wallPositions[posIndex++] = topPositions[i + 1];
|
|
@@ -470,7 +470,7 @@ function constructExtrudedRectangle(rectangleGeometry, computedOptions) {
|
|
|
470
470
|
if (shadowVolume) {
|
|
471
471
|
const newVertexFormat = VertexFormat.clone(
|
|
472
472
|
vertexFormat,
|
|
473
|
-
scratchVertexFormat
|
|
473
|
+
scratchVertexFormat,
|
|
474
474
|
);
|
|
475
475
|
newVertexFormat.normal = true;
|
|
476
476
|
rectangleGeometry._vertexFormat = newVertexFormat;
|
|
@@ -486,7 +486,7 @@ function constructExtrudedRectangle(rectangleGeometry, computedOptions) {
|
|
|
486
486
|
topBottomGeo.attributes.position.values,
|
|
487
487
|
maxHeight,
|
|
488
488
|
ellipsoid,
|
|
489
|
-
false
|
|
489
|
+
false,
|
|
490
490
|
);
|
|
491
491
|
topPositions = new Float64Array(topPositions);
|
|
492
492
|
let length = topPositions.length;
|
|
@@ -496,7 +496,7 @@ function constructExtrudedRectangle(rectangleGeometry, computedOptions) {
|
|
|
496
496
|
const bottomPositions = PolygonPipeline.scaleToGeodeticHeight(
|
|
497
497
|
topBottomGeo.attributes.position.values,
|
|
498
498
|
minHeight,
|
|
499
|
-
ellipsoid
|
|
499
|
+
ellipsoid,
|
|
500
500
|
);
|
|
501
501
|
positions.set(bottomPositions, length);
|
|
502
502
|
topBottomGeo.attributes.position.values = positions;
|
|
@@ -586,7 +586,7 @@ function constructExtrudedRectangle(rectangleGeometry, computedOptions) {
|
|
|
586
586
|
const posLength = length / 3;
|
|
587
587
|
const newIndices = IndexDatatype.createTypedArray(
|
|
588
588
|
newLength / 3,
|
|
589
|
-
indicesLength * 2
|
|
589
|
+
indicesLength * 2,
|
|
590
590
|
);
|
|
591
591
|
newIndices.set(indices);
|
|
592
592
|
for (i = 0; i < indicesLength; i += 3) {
|
|
@@ -651,7 +651,7 @@ function constructExtrudedRectangle(rectangleGeometry, computedOptions) {
|
|
|
651
651
|
posIndex,
|
|
652
652
|
threeI,
|
|
653
653
|
topPositions,
|
|
654
|
-
bottomPositions
|
|
654
|
+
bottomPositions,
|
|
655
655
|
);
|
|
656
656
|
posIndex += 6;
|
|
657
657
|
if (vertexFormat.st) {
|
|
@@ -659,7 +659,7 @@ function constructExtrudedRectangle(rectangleGeometry, computedOptions) {
|
|
|
659
659
|
wallTextures,
|
|
660
660
|
stIndex,
|
|
661
661
|
i * 2,
|
|
662
|
-
topSt
|
|
662
|
+
topSt,
|
|
663
663
|
);
|
|
664
664
|
stIndex += 4;
|
|
665
665
|
}
|
|
@@ -683,7 +683,7 @@ function constructExtrudedRectangle(rectangleGeometry, computedOptions) {
|
|
|
683
683
|
posIndex,
|
|
684
684
|
threeI,
|
|
685
685
|
topPositions,
|
|
686
|
-
bottomPositions
|
|
686
|
+
bottomPositions,
|
|
687
687
|
);
|
|
688
688
|
posIndex += 6;
|
|
689
689
|
if (vertexFormat.st) {
|
|
@@ -691,7 +691,7 @@ function constructExtrudedRectangle(rectangleGeometry, computedOptions) {
|
|
|
691
691
|
wallTextures,
|
|
692
692
|
stIndex,
|
|
693
693
|
i * 2,
|
|
694
|
-
topSt
|
|
694
|
+
topSt,
|
|
695
695
|
);
|
|
696
696
|
stIndex += 4;
|
|
697
697
|
}
|
|
@@ -717,7 +717,7 @@ function constructExtrudedRectangle(rectangleGeometry, computedOptions) {
|
|
|
717
717
|
posIndex,
|
|
718
718
|
threeI,
|
|
719
719
|
topPositions,
|
|
720
|
-
bottomPositions
|
|
720
|
+
bottomPositions,
|
|
721
721
|
);
|
|
722
722
|
posIndex += 6;
|
|
723
723
|
if (vertexFormat.st) {
|
|
@@ -725,7 +725,7 @@ function constructExtrudedRectangle(rectangleGeometry, computedOptions) {
|
|
|
725
725
|
wallTextures,
|
|
726
726
|
stIndex,
|
|
727
727
|
southIndex * 2,
|
|
728
|
-
topSt
|
|
728
|
+
topSt,
|
|
729
729
|
);
|
|
730
730
|
stIndex += 4;
|
|
731
731
|
}
|
|
@@ -749,7 +749,7 @@ function constructExtrudedRectangle(rectangleGeometry, computedOptions) {
|
|
|
749
749
|
posIndex,
|
|
750
750
|
threeI,
|
|
751
751
|
topPositions,
|
|
752
|
-
bottomPositions
|
|
752
|
+
bottomPositions,
|
|
753
753
|
);
|
|
754
754
|
posIndex += 6;
|
|
755
755
|
if (vertexFormat.st) {
|
|
@@ -757,7 +757,7 @@ function constructExtrudedRectangle(rectangleGeometry, computedOptions) {
|
|
|
757
757
|
wallTextures,
|
|
758
758
|
stIndex,
|
|
759
759
|
i * 2,
|
|
760
|
-
topSt
|
|
760
|
+
topSt,
|
|
761
761
|
);
|
|
762
762
|
stIndex += 4;
|
|
763
763
|
}
|
|
@@ -781,7 +781,7 @@ function constructExtrudedRectangle(rectangleGeometry, computedOptions) {
|
|
|
781
781
|
posIndex,
|
|
782
782
|
threeI,
|
|
783
783
|
topPositions,
|
|
784
|
-
bottomPositions
|
|
784
|
+
bottomPositions,
|
|
785
785
|
);
|
|
786
786
|
posIndex += 6;
|
|
787
787
|
if (vertexFormat.st) {
|
|
@@ -789,7 +789,7 @@ function constructExtrudedRectangle(rectangleGeometry, computedOptions) {
|
|
|
789
789
|
wallTextures,
|
|
790
790
|
stIndex,
|
|
791
791
|
i * 2,
|
|
792
|
-
topSt
|
|
792
|
+
topSt,
|
|
793
793
|
);
|
|
794
794
|
stIndex += 4;
|
|
795
795
|
}
|
|
@@ -815,7 +815,7 @@ function constructExtrudedRectangle(rectangleGeometry, computedOptions) {
|
|
|
815
815
|
posIndex,
|
|
816
816
|
threeI,
|
|
817
817
|
topPositions,
|
|
818
|
-
bottomPositions
|
|
818
|
+
bottomPositions,
|
|
819
819
|
);
|
|
820
820
|
posIndex += 6;
|
|
821
821
|
if (vertexFormat.st) {
|
|
@@ -823,7 +823,7 @@ function constructExtrudedRectangle(rectangleGeometry, computedOptions) {
|
|
|
823
823
|
wallTextures,
|
|
824
824
|
stIndex,
|
|
825
825
|
northIndex * 2,
|
|
826
|
-
topSt
|
|
826
|
+
topSt,
|
|
827
827
|
);
|
|
828
828
|
stIndex += 4;
|
|
829
829
|
}
|
|
@@ -866,7 +866,7 @@ function constructExtrudedRectangle(rectangleGeometry, computedOptions) {
|
|
|
866
866
|
|
|
867
867
|
const wallIndices = IndexDatatype.createTypedArray(
|
|
868
868
|
wallCount,
|
|
869
|
-
perimeterPositions * 6
|
|
869
|
+
perimeterPositions * 6,
|
|
870
870
|
);
|
|
871
871
|
|
|
872
872
|
let upperLeft;
|
|
@@ -926,7 +926,7 @@ function computeRectangle(rectangle, granularity, rotation, ellipsoid, result) {
|
|
|
926
926
|
rotation,
|
|
927
927
|
0,
|
|
928
928
|
rectangleScratch,
|
|
929
|
-
nwScratch
|
|
929
|
+
nwScratch,
|
|
930
930
|
);
|
|
931
931
|
|
|
932
932
|
const height = computedOptions.height;
|
|
@@ -939,7 +939,7 @@ function computeRectangle(rectangle, granularity, rotation, ellipsoid, result) {
|
|
|
939
939
|
false,
|
|
940
940
|
0,
|
|
941
941
|
0,
|
|
942
|
-
positions[0]
|
|
942
|
+
positions[0],
|
|
943
943
|
);
|
|
944
944
|
RectangleGeometryLibrary.computePosition(
|
|
945
945
|
computedOptions,
|
|
@@ -947,7 +947,7 @@ function computeRectangle(rectangle, granularity, rotation, ellipsoid, result) {
|
|
|
947
947
|
false,
|
|
948
948
|
0,
|
|
949
949
|
width - 1,
|
|
950
|
-
positions[1]
|
|
950
|
+
positions[1],
|
|
951
951
|
);
|
|
952
952
|
RectangleGeometryLibrary.computePosition(
|
|
953
953
|
computedOptions,
|
|
@@ -955,7 +955,7 @@ function computeRectangle(rectangle, granularity, rotation, ellipsoid, result) {
|
|
|
955
955
|
false,
|
|
956
956
|
height - 1,
|
|
957
957
|
0,
|
|
958
|
-
positions[2]
|
|
958
|
+
positions[2],
|
|
959
959
|
);
|
|
960
960
|
RectangleGeometryLibrary.computePosition(
|
|
961
961
|
computedOptions,
|
|
@@ -963,7 +963,7 @@ function computeRectangle(rectangle, granularity, rotation, ellipsoid, result) {
|
|
|
963
963
|
false,
|
|
964
964
|
height - 1,
|
|
965
965
|
width - 1,
|
|
966
|
-
positions[3]
|
|
966
|
+
positions[3],
|
|
967
967
|
);
|
|
968
968
|
|
|
969
969
|
return Rectangle.fromCartesianArray(positions, ellipsoid, result);
|
|
@@ -1020,10 +1020,10 @@ function RectangleGeometry(options) {
|
|
|
1020
1020
|
|
|
1021
1021
|
//>>includeStart('debug', pragmas.debug);
|
|
1022
1022
|
Check.typeOf.object("rectangle", rectangle);
|
|
1023
|
-
Rectangle.
|
|
1023
|
+
Rectangle._validate(rectangle);
|
|
1024
1024
|
if (rectangle.north < rectangle.south) {
|
|
1025
1025
|
throw new DeveloperError(
|
|
1026
|
-
"options.rectangle.north must be greater than or equal to options.rectangle.south"
|
|
1026
|
+
"options.rectangle.north must be greater than or equal to options.rectangle.south",
|
|
1027
1027
|
);
|
|
1028
1028
|
}
|
|
1029
1029
|
//>>includeEnd('debug');
|
|
@@ -1034,16 +1034,16 @@ function RectangleGeometry(options) {
|
|
|
1034
1034
|
this._rectangle = Rectangle.clone(rectangle);
|
|
1035
1035
|
this._granularity = defaultValue(
|
|
1036
1036
|
options.granularity,
|
|
1037
|
-
CesiumMath.RADIANS_PER_DEGREE
|
|
1037
|
+
CesiumMath.RADIANS_PER_DEGREE,
|
|
1038
1038
|
);
|
|
1039
1039
|
this._ellipsoid = Ellipsoid.clone(
|
|
1040
|
-
defaultValue(options.ellipsoid, Ellipsoid.default)
|
|
1040
|
+
defaultValue(options.ellipsoid, Ellipsoid.default),
|
|
1041
1041
|
);
|
|
1042
1042
|
this._surfaceHeight = Math.max(height, extrudedHeight);
|
|
1043
1043
|
this._rotation = defaultValue(options.rotation, 0.0);
|
|
1044
1044
|
this._stRotation = defaultValue(options.stRotation, 0.0);
|
|
1045
1045
|
this._vertexFormat = VertexFormat.clone(
|
|
1046
|
-
defaultValue(options.vertexFormat, VertexFormat.DEFAULT)
|
|
1046
|
+
defaultValue(options.vertexFormat, VertexFormat.DEFAULT),
|
|
1047
1047
|
);
|
|
1048
1048
|
this._extrudedHeight = Math.min(height, extrudedHeight);
|
|
1049
1049
|
this._shadowVolume = defaultValue(options.shadowVolume, false);
|
|
@@ -1140,7 +1140,7 @@ RectangleGeometry.unpack = function (array, startingIndex, result) {
|
|
|
1140
1140
|
const vertexFormat = VertexFormat.unpack(
|
|
1141
1141
|
array,
|
|
1142
1142
|
startingIndex,
|
|
1143
|
-
scratchVertexFormat
|
|
1143
|
+
scratchVertexFormat,
|
|
1144
1144
|
);
|
|
1145
1145
|
startingIndex += VertexFormat.packedLength;
|
|
1146
1146
|
|
|
@@ -1199,17 +1199,17 @@ RectangleGeometry.computeRectangle = function (options, result) {
|
|
|
1199
1199
|
|
|
1200
1200
|
//>>includeStart('debug', pragmas.debug);
|
|
1201
1201
|
Check.typeOf.object("rectangle", rectangle);
|
|
1202
|
-
Rectangle.
|
|
1202
|
+
Rectangle._validate(rectangle);
|
|
1203
1203
|
if (rectangle.north < rectangle.south) {
|
|
1204
1204
|
throw new DeveloperError(
|
|
1205
|
-
"options.rectangle.north must be greater than or equal to options.rectangle.south"
|
|
1205
|
+
"options.rectangle.north must be greater than or equal to options.rectangle.south",
|
|
1206
1206
|
);
|
|
1207
1207
|
}
|
|
1208
1208
|
//>>includeEnd('debug');
|
|
1209
1209
|
|
|
1210
1210
|
const granularity = defaultValue(
|
|
1211
1211
|
options.granularity,
|
|
1212
|
-
CesiumMath.RADIANS_PER_DEGREE
|
|
1212
|
+
CesiumMath.RADIANS_PER_DEGREE,
|
|
1213
1213
|
);
|
|
1214
1214
|
const ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.default);
|
|
1215
1215
|
const rotation = defaultValue(options.rotation, 0.0);
|
|
@@ -1233,12 +1233,12 @@ RectangleGeometry.createGeometry = function (rectangleGeometry) {
|
|
|
1233
1233
|
CesiumMath.equalsEpsilon(
|
|
1234
1234
|
rectangleGeometry._rectangle.north,
|
|
1235
1235
|
rectangleGeometry._rectangle.south,
|
|
1236
|
-
CesiumMath.EPSILON10
|
|
1236
|
+
CesiumMath.EPSILON10,
|
|
1237
1237
|
) ||
|
|
1238
1238
|
CesiumMath.equalsEpsilon(
|
|
1239
1239
|
rectangleGeometry._rectangle.east,
|
|
1240
1240
|
rectangleGeometry._rectangle.west,
|
|
1241
|
-
CesiumMath.EPSILON10
|
|
1241
|
+
CesiumMath.EPSILON10,
|
|
1242
1242
|
)
|
|
1243
1243
|
) {
|
|
1244
1244
|
return undefined;
|
|
@@ -1257,7 +1257,7 @@ RectangleGeometry.createGeometry = function (rectangleGeometry) {
|
|
|
1257
1257
|
stRotation,
|
|
1258
1258
|
rectangleScratch,
|
|
1259
1259
|
nwScratch,
|
|
1260
|
-
stNwScratch
|
|
1260
|
+
stNwScratch,
|
|
1261
1261
|
);
|
|
1262
1262
|
|
|
1263
1263
|
const tangentRotationMatrix = tangentRotationMatrixScratch;
|
|
@@ -1276,7 +1276,7 @@ RectangleGeometry.createGeometry = function (rectangleGeometry) {
|
|
|
1276
1276
|
surfaceHeight,
|
|
1277
1277
|
extrudedHeight,
|
|
1278
1278
|
0,
|
|
1279
|
-
CesiumMath.EPSILON2
|
|
1279
|
+
CesiumMath.EPSILON2,
|
|
1280
1280
|
);
|
|
1281
1281
|
|
|
1282
1282
|
computedOptions.lonScalar = 1.0 / rectangleGeometry._rectangle.width;
|
|
@@ -1292,13 +1292,13 @@ RectangleGeometry.createGeometry = function (rectangleGeometry) {
|
|
|
1292
1292
|
rectangle,
|
|
1293
1293
|
ellipsoid,
|
|
1294
1294
|
surfaceHeight,
|
|
1295
|
-
topBoundingSphere
|
|
1295
|
+
topBoundingSphere,
|
|
1296
1296
|
);
|
|
1297
1297
|
const bottomBS = BoundingSphere.fromRectangle3D(
|
|
1298
1298
|
rectangle,
|
|
1299
1299
|
ellipsoid,
|
|
1300
1300
|
extrudedHeight,
|
|
1301
|
-
bottomBoundingSphere
|
|
1301
|
+
bottomBoundingSphere,
|
|
1302
1302
|
);
|
|
1303
1303
|
boundingSphere = BoundingSphere.union(topBS, bottomBS);
|
|
1304
1304
|
} else {
|
|
@@ -1307,7 +1307,7 @@ RectangleGeometry.createGeometry = function (rectangleGeometry) {
|
|
|
1307
1307
|
geometry.attributes.position.values,
|
|
1308
1308
|
surfaceHeight,
|
|
1309
1309
|
ellipsoid,
|
|
1310
|
-
false
|
|
1310
|
+
false,
|
|
1311
1311
|
);
|
|
1312
1312
|
|
|
1313
1313
|
if (defined(rectangleGeometry._offsetAttribute)) {
|
|
@@ -1327,7 +1327,7 @@ RectangleGeometry.createGeometry = function (rectangleGeometry) {
|
|
|
1327
1327
|
boundingSphere = BoundingSphere.fromRectangle3D(
|
|
1328
1328
|
rectangle,
|
|
1329
1329
|
ellipsoid,
|
|
1330
|
-
surfaceHeight
|
|
1330
|
+
surfaceHeight,
|
|
1331
1331
|
);
|
|
1332
1332
|
}
|
|
1333
1333
|
|
|
@@ -1350,7 +1350,7 @@ RectangleGeometry.createGeometry = function (rectangleGeometry) {
|
|
|
1350
1350
|
RectangleGeometry.createShadowVolume = function (
|
|
1351
1351
|
rectangleGeometry,
|
|
1352
1352
|
minHeightFunc,
|
|
1353
|
-
maxHeightFunc
|
|
1353
|
+
maxHeightFunc,
|
|
1354
1354
|
) {
|
|
1355
1355
|
const granularity = rectangleGeometry._granularity;
|
|
1356
1356
|
const ellipsoid = rectangleGeometry._ellipsoid;
|
|
@@ -1383,7 +1383,7 @@ function textureCoordinateRotationPoints(rectangleGeometry) {
|
|
|
1383
1383
|
|
|
1384
1384
|
const rectangle = Rectangle.clone(
|
|
1385
1385
|
rectangleGeometry._rectangle,
|
|
1386
|
-
unrotatedTextureRectangleScratch
|
|
1386
|
+
unrotatedTextureRectangleScratch,
|
|
1387
1387
|
);
|
|
1388
1388
|
const granularity = rectangleGeometry._granularity;
|
|
1389
1389
|
const ellipsoid = rectangleGeometry._ellipsoid;
|
|
@@ -1396,7 +1396,7 @@ function textureCoordinateRotationPoints(rectangleGeometry) {
|
|
|
1396
1396
|
granularity,
|
|
1397
1397
|
rotation,
|
|
1398
1398
|
ellipsoid,
|
|
1399
|
-
unrotatedTextureRectangleScratch
|
|
1399
|
+
unrotatedTextureRectangleScratch,
|
|
1400
1400
|
);
|
|
1401
1401
|
|
|
1402
1402
|
// Assume a computed "east-north" texture coordinate system based on spherical or planar tricks, bounded by `boundingRectangle`.
|
|
@@ -1420,11 +1420,11 @@ function textureCoordinateRotationPoints(rectangleGeometry) {
|
|
|
1420
1420
|
const boundingRectangle = rectangleGeometry.rectangle;
|
|
1421
1421
|
const toDesiredInComputed = Matrix2.fromRotation(
|
|
1422
1422
|
rectangleGeometry._stRotation,
|
|
1423
|
-
rotation2DScratch
|
|
1423
|
+
rotation2DScratch,
|
|
1424
1424
|
);
|
|
1425
1425
|
const boundingRectangleCenter = Rectangle.center(
|
|
1426
1426
|
boundingRectangle,
|
|
1427
|
-
rectangleCenterScratch
|
|
1427
|
+
rectangleCenterScratch,
|
|
1428
1428
|
);
|
|
1429
1429
|
|
|
1430
1430
|
for (let i = 0; i < 3; ++i) {
|
|
@@ -1462,7 +1462,7 @@ Object.defineProperties(RectangleGeometry.prototype, {
|
|
|
1462
1462
|
this._rectangle,
|
|
1463
1463
|
this._granularity,
|
|
1464
1464
|
this._rotation,
|
|
1465
|
-
this._ellipsoid
|
|
1465
|
+
this._ellipsoid,
|
|
1466
1466
|
);
|
|
1467
1467
|
}
|
|
1468
1468
|
return this._rotatedRectangle;
|
|
@@ -1478,9 +1478,8 @@ Object.defineProperties(RectangleGeometry.prototype, {
|
|
|
1478
1478
|
textureCoordinateRotationPoints: {
|
|
1479
1479
|
get: function () {
|
|
1480
1480
|
if (!defined(this._textureCoordinateRotationPoints)) {
|
|
1481
|
-
this._textureCoordinateRotationPoints =
|
|
1482
|
-
this
|
|
1483
|
-
);
|
|
1481
|
+
this._textureCoordinateRotationPoints =
|
|
1482
|
+
textureCoordinateRotationPoints(this);
|
|
1484
1483
|
}
|
|
1485
1484
|
return this._textureCoordinateRotationPoints;
|
|
1486
1485
|
},
|
|
@@ -27,7 +27,7 @@ RectangleGeometryLibrary.computePosition = function (
|
|
|
27
27
|
row,
|
|
28
28
|
col,
|
|
29
29
|
position,
|
|
30
|
-
st
|
|
30
|
+
st,
|
|
31
31
|
) {
|
|
32
32
|
const radiiSquared = ellipsoid.radiiSquared;
|
|
33
33
|
const nwCorner = computedOptions.nwCorner;
|
|
@@ -91,7 +91,7 @@ function getRotationOptions(
|
|
|
91
91
|
granularityY,
|
|
92
92
|
center,
|
|
93
93
|
width,
|
|
94
|
-
height
|
|
94
|
+
height,
|
|
95
95
|
) {
|
|
96
96
|
const cosRotation = Math.cos(rotation);
|
|
97
97
|
const granYCos = granularityY * cosRotation;
|
|
@@ -109,7 +109,7 @@ function getRotationOptions(
|
|
|
109
109
|
nwCartesian = Matrix2.multiplyByVector(
|
|
110
110
|
rotationMatrix,
|
|
111
111
|
nwCartesian,
|
|
112
|
-
nwCartesian
|
|
112
|
+
nwCartesian,
|
|
113
113
|
);
|
|
114
114
|
nwCartesian = Cartesian3.add(nwCartesian, centerCartesian, nwCartesian);
|
|
115
115
|
nwCorner = proj.unproject(nwCartesian, nwCorner);
|
|
@@ -156,7 +156,7 @@ RectangleGeometryLibrary.computeOptions = function (
|
|
|
156
156
|
stRotation,
|
|
157
157
|
boundingRectangleScratch,
|
|
158
158
|
nwCornerResult,
|
|
159
|
-
stNwCornerResult
|
|
159
|
+
stNwCornerResult,
|
|
160
160
|
) {
|
|
161
161
|
let east = rectangle.east;
|
|
162
162
|
let west = rectangle.west;
|
|
@@ -203,7 +203,7 @@ RectangleGeometryLibrary.computeOptions = function (
|
|
|
203
203
|
|
|
204
204
|
const boundingRectangle = Rectangle.clone(
|
|
205
205
|
rectangle,
|
|
206
|
-
boundingRectangleScratch
|
|
206
|
+
boundingRectangleScratch,
|
|
207
207
|
);
|
|
208
208
|
|
|
209
209
|
const computedOptions = {
|
|
@@ -227,7 +227,7 @@ RectangleGeometryLibrary.computeOptions = function (
|
|
|
227
227
|
granularityY,
|
|
228
228
|
center,
|
|
229
229
|
width,
|
|
230
|
-
height
|
|
230
|
+
height,
|
|
231
231
|
);
|
|
232
232
|
north = rotationOptions.north;
|
|
233
233
|
south = rotationOptions.south;
|
|
@@ -242,7 +242,7 @@ RectangleGeometryLibrary.computeOptions = function (
|
|
|
242
242
|
south > CesiumMath.PI_OVER_TWO
|
|
243
243
|
) {
|
|
244
244
|
throw new DeveloperError(
|
|
245
|
-
"Rotated rectangle is invalid. It crosses over either the north or south pole."
|
|
245
|
+
"Rotated rectangle is invalid. It crosses over either the north or south pole.",
|
|
246
246
|
);
|
|
247
247
|
}
|
|
248
248
|
//>>includeEnd('debug')
|
|
@@ -269,7 +269,7 @@ RectangleGeometryLibrary.computeOptions = function (
|
|
|
269
269
|
granularityY,
|
|
270
270
|
center,
|
|
271
271
|
width,
|
|
272
|
-
height
|
|
272
|
+
height,
|
|
273
273
|
);
|
|
274
274
|
|
|
275
275
|
computedOptions.stGranYCos = stRotationOptions.granYCos;
|
|
@@ -60,7 +60,7 @@ function constructRectangle(geometry, computedOptions) {
|
|
|
60
60
|
false,
|
|
61
61
|
row,
|
|
62
62
|
0,
|
|
63
|
-
position
|
|
63
|
+
position,
|
|
64
64
|
);
|
|
65
65
|
positions[posIndex++] = position.x;
|
|
66
66
|
positions[posIndex++] = position.y;
|
|
@@ -73,7 +73,7 @@ function constructRectangle(geometry, computedOptions) {
|
|
|
73
73
|
false,
|
|
74
74
|
row,
|
|
75
75
|
col,
|
|
76
|
-
position
|
|
76
|
+
position,
|
|
77
77
|
);
|
|
78
78
|
positions[posIndex++] = position.x;
|
|
79
79
|
positions[posIndex++] = position.y;
|
|
@@ -89,7 +89,7 @@ function constructRectangle(geometry, computedOptions) {
|
|
|
89
89
|
false,
|
|
90
90
|
row,
|
|
91
91
|
col,
|
|
92
|
-
position
|
|
92
|
+
position,
|
|
93
93
|
);
|
|
94
94
|
positions[posIndex++] = position.x;
|
|
95
95
|
positions[posIndex++] = position.y;
|
|
@@ -106,7 +106,7 @@ function constructRectangle(geometry, computedOptions) {
|
|
|
106
106
|
false,
|
|
107
107
|
row,
|
|
108
108
|
col,
|
|
109
|
-
position
|
|
109
|
+
position,
|
|
110
110
|
);
|
|
111
111
|
positions[posIndex++] = position.x;
|
|
112
112
|
positions[posIndex++] = position.y;
|
|
@@ -122,7 +122,7 @@ function constructRectangle(geometry, computedOptions) {
|
|
|
122
122
|
false,
|
|
123
123
|
row,
|
|
124
124
|
col,
|
|
125
|
-
position
|
|
125
|
+
position,
|
|
126
126
|
);
|
|
127
127
|
positions[posIndex++] = position.x;
|
|
128
128
|
positions[posIndex++] = position.y;
|
|
@@ -132,7 +132,7 @@ function constructRectangle(geometry, computedOptions) {
|
|
|
132
132
|
const indicesSize = (positions.length / 3) * 2;
|
|
133
133
|
const indices = IndexDatatype.createTypedArray(
|
|
134
134
|
positions.length / 3,
|
|
135
|
-
indicesSize
|
|
135
|
+
indicesSize,
|
|
136
136
|
);
|
|
137
137
|
|
|
138
138
|
let index = 0;
|
|
@@ -171,7 +171,7 @@ function constructExtrudedRectangle(rectangleGeometry, computedOptions) {
|
|
|
171
171
|
geo.attributes.position.values,
|
|
172
172
|
maxHeight,
|
|
173
173
|
ellipsoid,
|
|
174
|
-
false
|
|
174
|
+
false,
|
|
175
175
|
);
|
|
176
176
|
let length = topPositions.length;
|
|
177
177
|
const positions = new Float64Array(length * 2);
|
|
@@ -179,7 +179,7 @@ function constructExtrudedRectangle(rectangleGeometry, computedOptions) {
|
|
|
179
179
|
const bottomPositions = PolygonPipeline.scaleToGeodeticHeight(
|
|
180
180
|
geo.attributes.position.values,
|
|
181
181
|
minHeight,
|
|
182
|
-
ellipsoid
|
|
182
|
+
ellipsoid,
|
|
183
183
|
);
|
|
184
184
|
positions.set(bottomPositions, length);
|
|
185
185
|
geo.attributes.position.values = positions;
|
|
@@ -197,7 +197,7 @@ function constructExtrudedRectangle(rectangleGeometry, computedOptions) {
|
|
|
197
197
|
const indicesSize = (positions.length / 3 + corners) * 2;
|
|
198
198
|
const indices = IndexDatatype.createTypedArray(
|
|
199
199
|
positions.length / 3,
|
|
200
|
-
indicesSize
|
|
200
|
+
indicesSize,
|
|
201
201
|
);
|
|
202
202
|
length = positions.length / 6;
|
|
203
203
|
let index = 0;
|
|
@@ -275,7 +275,7 @@ function RectangleOutlineGeometry(options) {
|
|
|
275
275
|
const rectangle = options.rectangle;
|
|
276
276
|
const granularity = defaultValue(
|
|
277
277
|
options.granularity,
|
|
278
|
-
CesiumMath.RADIANS_PER_DEGREE
|
|
278
|
+
CesiumMath.RADIANS_PER_DEGREE,
|
|
279
279
|
);
|
|
280
280
|
const ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.default);
|
|
281
281
|
const rotation = defaultValue(options.rotation, 0.0);
|
|
@@ -284,10 +284,10 @@ function RectangleOutlineGeometry(options) {
|
|
|
284
284
|
if (!defined(rectangle)) {
|
|
285
285
|
throw new DeveloperError("rectangle is required.");
|
|
286
286
|
}
|
|
287
|
-
Rectangle.
|
|
287
|
+
Rectangle._validate(rectangle);
|
|
288
288
|
if (rectangle.north < rectangle.south) {
|
|
289
289
|
throw new DeveloperError(
|
|
290
|
-
"options.rectangle.north must be greater than options.rectangle.south"
|
|
290
|
+
"options.rectangle.north must be greater than options.rectangle.south",
|
|
291
291
|
);
|
|
292
292
|
}
|
|
293
293
|
//>>includeEnd('debug');
|
|
@@ -430,7 +430,7 @@ RectangleOutlineGeometry.createGeometry = function (rectangleGeometry) {
|
|
|
430
430
|
rectangleGeometry._rotation,
|
|
431
431
|
0,
|
|
432
432
|
rectangleScratch,
|
|
433
|
-
nwScratch
|
|
433
|
+
nwScratch,
|
|
434
434
|
);
|
|
435
435
|
|
|
436
436
|
let geometry;
|
|
@@ -440,12 +440,12 @@ RectangleOutlineGeometry.createGeometry = function (rectangleGeometry) {
|
|
|
440
440
|
CesiumMath.equalsEpsilon(
|
|
441
441
|
rectangle.north,
|
|
442
442
|
rectangle.south,
|
|
443
|
-
CesiumMath.EPSILON10
|
|
443
|
+
CesiumMath.EPSILON10,
|
|
444
444
|
) ||
|
|
445
445
|
CesiumMath.equalsEpsilon(
|
|
446
446
|
rectangle.east,
|
|
447
447
|
rectangle.west,
|
|
448
|
-
CesiumMath.EPSILON10
|
|
448
|
+
CesiumMath.EPSILON10,
|
|
449
449
|
)
|
|
450
450
|
) {
|
|
451
451
|
return undefined;
|
|
@@ -457,7 +457,7 @@ RectangleOutlineGeometry.createGeometry = function (rectangleGeometry) {
|
|
|
457
457
|
surfaceHeight,
|
|
458
458
|
extrudedHeight,
|
|
459
459
|
0,
|
|
460
|
-
CesiumMath.EPSILON2
|
|
460
|
+
CesiumMath.EPSILON2,
|
|
461
461
|
);
|
|
462
462
|
let offsetValue;
|
|
463
463
|
if (extrude) {
|
|
@@ -485,13 +485,13 @@ RectangleOutlineGeometry.createGeometry = function (rectangleGeometry) {
|
|
|
485
485
|
rectangle,
|
|
486
486
|
ellipsoid,
|
|
487
487
|
surfaceHeight,
|
|
488
|
-
topBoundingSphere
|
|
488
|
+
topBoundingSphere,
|
|
489
489
|
);
|
|
490
490
|
const bottomBS = BoundingSphere.fromRectangle3D(
|
|
491
491
|
rectangle,
|
|
492
492
|
ellipsoid,
|
|
493
493
|
extrudedHeight,
|
|
494
|
-
bottomBoundingSphere
|
|
494
|
+
bottomBoundingSphere,
|
|
495
495
|
);
|
|
496
496
|
boundingSphere = BoundingSphere.union(topBS, bottomBS);
|
|
497
497
|
} else {
|
|
@@ -500,7 +500,7 @@ RectangleOutlineGeometry.createGeometry = function (rectangleGeometry) {
|
|
|
500
500
|
geometry.attributes.position.values,
|
|
501
501
|
surfaceHeight,
|
|
502
502
|
ellipsoid,
|
|
503
|
-
false
|
|
503
|
+
false,
|
|
504
504
|
);
|
|
505
505
|
|
|
506
506
|
if (defined(rectangleGeometry._offsetAttribute)) {
|
|
@@ -520,7 +520,7 @@ RectangleOutlineGeometry.createGeometry = function (rectangleGeometry) {
|
|
|
520
520
|
boundingSphere = BoundingSphere.fromRectangle3D(
|
|
521
521
|
rectangle,
|
|
522
522
|
ellipsoid,
|
|
523
|
-
surfaceHeight
|
|
523
|
+
surfaceHeight,
|
|
524
524
|
);
|
|
525
525
|
}
|
|
526
526
|
|