@cesium/engine 14.0.0 → 16.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-WVNLSTOF.js → chunk-2TQ64T4I.js} +2 -2
- package/Build/Workers/{chunk-ED6GLQTK.js → chunk-34EWMUFG.js} +1 -1
- package/Build/Workers/{chunk-HEZHXDYB.js → chunk-4LHK6E47.js} +1 -1
- package/Build/Workers/{chunk-7EO56M5R.js → chunk-5TN3LG2T.js} +2 -2
- package/Build/Workers/{chunk-7ZB2RVIQ.js → chunk-6B7KGA5P.js} +16 -19
- package/Build/Workers/{chunk-3QLSKXKF.js → chunk-B75OO2DU.js} +7 -10
- package/Build/Workers/{chunk-Q4ZVWJXX.js → chunk-COOLDICB.js} +9 -11
- package/Build/Workers/{chunk-3PIZQT3I.js → chunk-CQNYYX3N.js} +4 -4
- package/Build/Workers/{chunk-JPDKYBLF.js → chunk-CUJH7PS5.js} +27 -29
- package/Build/Workers/{chunk-CI2HEJFC.js → chunk-EAWYQ44R.js} +39 -41
- package/Build/Workers/{chunk-SDIDRZDG.js → chunk-EJJDBH5W.js} +7 -7
- package/Build/Workers/{chunk-5KWRW7YL.js → chunk-EO44CO62.js} +2 -2
- package/Build/Workers/{chunk-N2XAJBC6.js → chunk-EOIUWEAK.js} +26 -28
- package/Build/Workers/{chunk-YJX7X577.js → chunk-ERKJ7IWJ.js} +21 -23
- package/Build/Workers/{chunk-J7IH4EYI.js → chunk-ESED7XBA.js} +13 -16
- package/Build/Workers/{chunk-F4CUH4MR.js → chunk-FW2OX42E.js} +18 -21
- package/Build/Workers/{chunk-FX4R4MTH.js → chunk-GH6I7PBY.js} +6 -9
- package/Build/Workers/{chunk-FYGLNDKG.js → chunk-GQVSADCI.js} +19 -22
- package/Build/Workers/{chunk-TY4DKOWR.js → chunk-ICU72UPR.js} +4 -4
- package/Build/Workers/{chunk-DT5NFR5C.js → chunk-ILVAXLMC.js} +7 -7
- package/Build/Workers/{chunk-ZGFIT57T.js → chunk-KKV6XBF5.js} +27 -23
- package/Build/Workers/{chunk-HKHQ3EDR.js → chunk-KV6TEHXY.js} +4 -4
- package/Build/Workers/{chunk-B4GSRXE3.js → chunk-LCSH4ZOB.js} +7 -10
- package/Build/Workers/{chunk-LNSWJ43X.js → chunk-M5J3S3HY.js} +17 -26
- package/Build/Workers/{chunk-LJBJM6VI.js → chunk-NB6D74SQ.js} +6 -6
- package/Build/Workers/{chunk-4CHMVQTQ.js → chunk-NREPBWCX.js} +14 -14
- package/Build/Workers/{chunk-PWF4EY5P.js → chunk-OD4Q7HE5.js} +4 -4
- package/Build/Workers/{chunk-77XPS7ZA.js → chunk-OMFZ4IN6.js} +15 -24
- package/Build/Workers/{chunk-HUFQVUMY.js → chunk-OMZGZVHI.js} +12 -17
- package/Build/Workers/{chunk-LOZ4NKY3.js → chunk-ORIMMEHO.js} +18 -20
- package/Build/Workers/{chunk-5S5OOA6U.js → chunk-OWLBD6BL.js} +1 -1
- package/Build/Workers/{chunk-VCNOFQYH.js → chunk-PB6SE3SZ.js} +9 -12
- package/Build/Workers/{chunk-3JBEPBPL.js → chunk-PT6U7UNY.js} +25 -30
- package/Build/Workers/{chunk-G3BVMPWG.js → chunk-RWAFHSX3.js} +2 -2
- package/Build/Workers/{chunk-KHWLAQVA.js → chunk-S2NKKWYE.js} +1 -1
- package/Build/Workers/{chunk-FFBJDW4A.js → chunk-S3IQBSIB.js} +6 -6
- package/Build/Workers/{chunk-3LYROPON.js → chunk-SCUQTTCN.js} +16 -19
- package/Build/Workers/{chunk-ZMNLEL6W.js → chunk-TBSA4MNF.js} +5 -8
- package/Build/Workers/{chunk-EWDGNOJE.js → chunk-TEUGW455.js} +9 -12
- package/Build/Workers/{chunk-XK4OP6VA.js → chunk-TL5YKZJF.js} +33 -41
- package/Build/Workers/{chunk-KM6MITPF.js → chunk-V4Y7C25O.js} +46 -42
- package/Build/Workers/{chunk-OMXHEJTK.js → chunk-VNDECE6N.js} +2 -2
- package/Build/Workers/{chunk-LS3KVHYY.js → chunk-VVTAI2TN.js} +6 -9
- package/Build/Workers/{chunk-WEHZP4SE.js → chunk-VXAAIRJ7.js} +129 -146
- package/Build/Workers/{chunk-MVM4JV5U.js → chunk-WGIOUM2S.js} +9 -12
- package/Build/Workers/{chunk-JHBPC4LK.js → chunk-XF6EBVKV.js} +7 -7
- package/Build/Workers/{chunk-D7ZBZPHV.js → chunk-XMKE4XB2.js} +5 -5
- package/Build/Workers/{chunk-7UHKH6M3.js → chunk-YA4XALD5.js} +34 -36
- package/Build/Workers/{chunk-KSYBJA4M.js → chunk-YFXXUW6U.js} +6 -12
- package/Build/Workers/{chunk-Z3QWTHI7.js → chunk-YL26OJCG.js} +21 -23
- package/Build/Workers/{chunk-K4AH3TDT.js → chunk-ZLJDDRGB.js} +14 -17
- package/Build/Workers/combineGeometry.js +21 -22
- package/Build/Workers/createBoxGeometry.js +15 -16
- package/Build/Workers/createBoxOutlineGeometry.js +20 -25
- package/Build/Workers/createCircleGeometry.js +26 -28
- package/Build/Workers/createCircleOutlineGeometry.js +19 -21
- package/Build/Workers/createCoplanarPolygonGeometry.js +38 -42
- package/Build/Workers/createCoplanarPolygonOutlineGeometry.js +34 -36
- package/Build/Workers/createCorridorGeometry.js +42 -49
- package/Build/Workers/createCorridorOutlineGeometry.js +36 -43
- package/Build/Workers/createCylinderGeometry.js +17 -18
- package/Build/Workers/createCylinderOutlineGeometry.js +23 -25
- package/Build/Workers/createEllipseGeometry.js +23 -24
- package/Build/Workers/createEllipseOutlineGeometry.js +16 -17
- package/Build/Workers/createEllipsoidGeometry.js +16 -17
- package/Build/Workers/createEllipsoidOutlineGeometry.js +15 -16
- package/Build/Workers/createFrustumGeometry.js +15 -16
- package/Build/Workers/createFrustumOutlineGeometry.js +18 -21
- package/Build/Workers/createGeometry.js +22 -25
- package/Build/Workers/createGroundPolylineGeometry.js +34 -42
- package/Build/Workers/createPlaneGeometry.js +19 -21
- package/Build/Workers/createPlaneOutlineGeometry.js +12 -13
- package/Build/Workers/createPolygonGeometry.js +45 -50
- package/Build/Workers/createPolygonOutlineGeometry.js +39 -44
- package/Build/Workers/createPolylineGeometry.js +33 -40
- package/Build/Workers/createPolylineVolumeGeometry.js +37 -44
- package/Build/Workers/createPolylineVolumeOutlineGeometry.js +32 -39
- package/Build/Workers/createRectangleGeometry.js +41 -51
- package/Build/Workers/createRectangleOutlineGeometry.js +28 -33
- package/Build/Workers/createSimplePolylineGeometry.js +29 -34
- package/Build/Workers/createSphereGeometry.js +17 -20
- package/Build/Workers/createSphereOutlineGeometry.js +16 -19
- package/Build/Workers/createTaskProcessorWorker.js +3 -3
- package/Build/Workers/createVectorTileClampedPolylines.js +12 -13
- package/Build/Workers/createVectorTileGeometries.js +21 -22
- package/Build/Workers/createVectorTilePoints.js +11 -12
- package/Build/Workers/createVectorTilePolygons.js +19 -20
- package/Build/Workers/createVectorTilePolylines.js +12 -13
- package/Build/Workers/createVerticesFromGoogleEarthEnterpriseBuffer.js +20 -23
- package/Build/Workers/createVerticesFromHeightmap.js +31 -58
- package/Build/Workers/createVerticesFromQuantizedTerrainMesh.js +17 -18
- package/Build/Workers/createWallGeometry.js +30 -35
- package/Build/Workers/createWallOutlineGeometry.js +28 -33
- package/Build/Workers/decodeDraco.js +10 -11
- package/Build/Workers/decodeGoogleEarthEnterprisePacket.js +5 -5
- package/Build/Workers/decodeI3S.js +10 -16
- package/Build/Workers/transcodeKTX2.js +50 -46
- package/Build/Workers/transferTypedArrayTest.js +1 -1
- package/Build/Workers/upsampleQuantizedTerrainMesh.js +19 -20
- package/Source/Core/ApproximateTerrainHeights.js +2 -3
- package/Source/Core/ArcGISTiledElevationTerrainProvider.js +6 -6
- package/Source/Core/AxisAlignedBoundingBox.js +2 -3
- package/Source/Core/BingMapsGeocoderService.js +2 -2
- package/Source/Core/BoundingRectangle.js +7 -8
- package/Source/Core/BoundingSphere.js +10 -11
- package/Source/Core/BoxGeometry.js +7 -7
- package/Source/Core/BoxOutlineGeometry.js +7 -9
- package/Source/Core/Cartesian2.js +4 -5
- package/Source/Core/Cartesian3.js +7 -8
- package/Source/Core/Cartesian4.js +6 -7
- package/Source/Core/Cartographic.js +5 -6
- package/Source/Core/CatmullRomSpline.js +2 -2
- package/Source/Core/CesiumTerrainProvider.js +11 -14
- package/Source/Core/CircleGeometry.js +2 -2
- package/Source/Core/CircleOutlineGeometry.js +2 -2
- package/Source/Core/Clock.js +7 -10
- package/Source/Core/Color.js +28 -28
- package/Source/Core/ColorGeometryInstanceAttribute.js +4 -5
- package/Source/Core/ComponentDatatype.js +4 -6
- package/Source/Core/CoplanarPolygonGeometry.js +8 -10
- package/Source/Core/CoplanarPolygonOutlineGeometry.js +5 -5
- package/Source/Core/CorridorGeometry.js +15 -20
- package/Source/Core/CorridorOutlineGeometry.js +10 -15
- package/Source/Core/Credit.js +1 -2
- package/Source/Core/CullingVolume.js +1 -2
- package/Source/Core/CustomHeightmapTerrainProvider.js +3 -3
- package/Source/Core/CylinderGeometry.js +7 -7
- package/Source/Core/CylinderOutlineGeometry.js +7 -7
- package/Source/Core/DistanceDisplayCondition.js +4 -5
- package/Source/Core/DistanceDisplayConditionGeometryInstanceAttribute.js +2 -3
- package/Source/Core/EarthOrientationParameters.js +4 -4
- package/Source/Core/EllipseGeometry.js +17 -23
- package/Source/Core/EllipseOutlineGeometry.js +12 -15
- package/Source/Core/Ellipsoid.js +7 -8
- package/Source/Core/EllipsoidGeodesic.js +1 -2
- package/Source/Core/EllipsoidGeometry.js +15 -15
- package/Source/Core/EllipsoidOutlineGeometry.js +15 -15
- package/Source/Core/EllipsoidRhumbLine.js +3 -4
- package/Source/Core/EllipsoidTangentPlane.js +1 -2
- package/Source/Core/EllipsoidTerrainProvider.js +4 -4
- package/Source/Core/EllipsoidalOccluder.js +2 -3
- package/Source/Core/FeatureDetection.js +1 -2
- package/Source/Core/Frozen.js +24 -0
- package/Source/Core/FrustumGeometry.js +7 -8
- package/Source/Core/FrustumOutlineGeometry.js +3 -4
- package/Source/Core/GeographicProjection.js +1 -2
- package/Source/Core/GeographicTilingScheme.js +6 -12
- package/Source/Core/Geometry.js +4 -7
- package/Source/Core/GeometryAttribute.js +3 -3
- package/Source/Core/GeometryAttributes.js +2 -2
- package/Source/Core/GeometryInstance.js +4 -6
- package/Source/Core/GeometryInstanceAttribute.js +3 -3
- package/Source/Core/GeometryPipeline.js +3 -4
- package/Source/Core/GoogleEarthEnterpriseMetadata.js +13 -24
- package/Source/Core/GoogleEarthEnterpriseTerrainData.js +9 -12
- package/Source/Core/GoogleEarthEnterpriseTerrainProvider.js +3 -3
- package/Source/Core/GoogleGeocoderService.js +2 -2
- package/Source/Core/GregorianDate.js +8 -9
- package/Source/Core/GroundPolylineGeometry.js +8 -8
- package/Source/Core/HeadingPitchRange.js +3 -4
- package/Source/Core/HeadingPitchRoll.js +3 -4
- package/Source/Core/Heap.js +3 -4
- package/Source/Core/HeightmapTerrainData.js +22 -38
- package/Source/Core/HeightmapTessellator.js +21 -37
- package/Source/Core/HermitePolynomialApproximation.js +1 -2
- package/Source/Core/HermiteSpline.js +5 -5
- package/Source/Core/ITwinPlatform.js +66 -12
- package/Source/Core/Iau2006XysData.js +8 -10
- package/Source/Core/IntersectionTests.js +1 -2
- package/Source/Core/Interval.js +2 -4
- package/Source/Core/Ion.js +1 -1
- package/Source/Core/IonGeocoderService.js +6 -10
- package/Source/Core/IonResource.js +6 -6
- package/Source/Core/JulianDate.js +11 -12
- package/Source/Core/LinearSpline.js +2 -2
- package/Source/Core/ManagedArray.js +2 -3
- package/Source/Core/Math.js +36 -27
- package/Source/Core/Matrix2.js +7 -8
- package/Source/Core/Matrix3.js +12 -13
- package/Source/Core/Matrix4.js +28 -28
- package/Source/Core/MorphWeightSpline.js +2 -2
- package/Source/Core/NearFarScalar.js +6 -7
- package/Source/Core/Occluder.js +1 -2
- package/Source/Core/OffsetGeometryInstanceAttribute.js +3 -4
- package/Source/Core/OpenCageGeocoderService.js +1 -2
- package/Source/Core/OrientedBoundingBox.js +7 -8
- package/Source/Core/OrthographicFrustum.js +6 -6
- package/Source/Core/OrthographicOffCenterFrustum.js +4 -4
- package/Source/Core/PerspectiveFrustum.js +8 -8
- package/Source/Core/PerspectiveOffCenterFrustum.js +4 -4
- package/Source/Core/PlaneGeometry.js +5 -5
- package/Source/Core/PolygonGeometry.js +16 -19
- package/Source/Core/PolygonGeometryLibrary.js +27 -6
- package/Source/Core/PolygonOutlineGeometry.js +11 -14
- package/Source/Core/PolygonPipeline.js +5 -6
- package/Source/Core/PolylineGeometry.js +10 -15
- package/Source/Core/PolylinePipeline.js +7 -14
- package/Source/Core/PolylineVolumeGeometry.js +8 -13
- package/Source/Core/PolylineVolumeOutlineGeometry.js +7 -12
- package/Source/Core/QuantizedMeshTerrainData.js +12 -16
- package/Source/Core/Quaternion.js +7 -8
- package/Source/Core/QuaternionSpline.js +2 -2
- package/Source/Core/Ray.js +2 -3
- package/Source/Core/Rectangle.js +18 -19
- package/Source/Core/RectangleGeometry.js +17 -25
- package/Source/Core/RectangleGeometryLibrary.js +1 -1
- package/Source/Core/RectangleOutlineGeometry.js +10 -13
- package/Source/Core/Request.js +6 -6
- package/Source/Core/RequestScheduler.js +4 -6
- package/Source/Core/Resource.js +13 -16
- package/Source/Core/S2Cell.js +2 -3
- package/Source/Core/ScreenSpaceEventHandler.js +1 -2
- package/Source/Core/ShowGeometryInstanceAttribute.js +1 -2
- package/Source/Core/Simon1994PlanetaryPositions.js +9 -9
- package/Source/Core/SimplePolylineGeometry.js +8 -11
- package/Source/Core/SphereGeometry.js +1 -2
- package/Source/Core/SphereOutlineGeometry.js +1 -2
- package/Source/Core/Spherical.js +4 -5
- package/Source/Core/Spline.js +1 -2
- package/Source/Core/SteppedSpline.js +2 -2
- package/Source/Core/TaskProcessor.js +2 -9
- package/Source/Core/TerrainData.js +1 -1
- package/Source/Core/TerrainEncoding.js +4 -11
- package/Source/Core/TerrainMesh.js +1 -3
- package/Source/Core/TerrainProvider.js +1 -1
- package/Source/Core/TexturePacker.js +166 -0
- package/Source/Core/TileProviderError.js +1 -2
- package/Source/Core/TimeInterval.js +7 -7
- package/Source/Core/TimeIntervalCollection.js +7 -7
- package/Source/Core/Tipsify.js +5 -5
- package/Source/Core/Transforms.js +10 -15
- package/Source/Core/TranslationRotationScale.js +3 -6
- package/Source/Core/VRTheWorldTerrainProvider.js +5 -5
- package/Source/Core/VertexFormat.js +10 -10
- package/Source/Core/VerticalExaggeration.js +1 -1
- package/Source/Core/VideoSynchronizer.js +6 -6
- package/Source/Core/WallGeometry.js +8 -11
- package/Source/Core/WallOutlineGeometry.js +7 -10
- package/Source/Core/WebMercatorProjection.js +1 -2
- package/Source/Core/WebMercatorTilingScheme.js +5 -11
- package/Source/Core/arrayRemoveDuplicates.js +1 -2
- package/Source/Core/clone.js +1 -3
- package/Source/Core/combine.js +1 -2
- package/Source/Core/createWorldBathymetryAsync.js +3 -3
- package/Source/Core/createWorldTerrainAsync.js +4 -4
- package/Source/Core/defaultValue.js +20 -1
- package/Source/Core/destroyObject.js +1 -5
- package/Source/Core/getAbsoluteUri.js +1 -2
- package/Source/Core/getMagic.js +1 -2
- package/Source/Core/getStringFromTypedArray.js +2 -3
- package/Source/Core/loadImageFromTypedArray.js +2 -6
- package/Source/Core/oneTimeWarning.js +1 -2
- package/Source/Core/writeTextToCanvas.js +10 -13
- package/Source/DataSources/BillboardGraphics.js +27 -53
- package/Source/DataSources/BillboardVisualizer.js +3 -3
- package/Source/DataSources/BoxGraphics.js +13 -18
- package/Source/DataSources/CallbackPositionProperty.js +1 -2
- package/Source/DataSources/Cesium3DTilesetGraphics.js +6 -8
- package/Source/DataSources/CheckerboardMaterialProperty.js +2 -2
- package/Source/DataSources/CompositePositionProperty.js +1 -2
- package/Source/DataSources/ConstantPositionProperty.js +1 -2
- package/Source/DataSources/CorridorGraphics.js +23 -35
- package/Source/DataSources/CylinderGraphics.js +18 -25
- package/Source/DataSources/CzmlDataSource.js +34 -60
- package/Source/DataSources/DataSourceClock.js +12 -13
- package/Source/DataSources/DataSourceCollection.js +2 -3
- package/Source/DataSources/DataSourceDisplay.js +2 -5
- package/Source/DataSources/EllipseGraphics.js +26 -40
- package/Source/DataSources/EllipsoidGeometryUpdater.js +1 -2
- package/Source/DataSources/EllipsoidGraphics.js +21 -32
- package/Source/DataSources/Entity.js +7 -9
- package/Source/DataSources/EntityCluster.js +53 -28
- package/Source/DataSources/EntityView.js +1 -2
- package/Source/DataSources/GeoJsonDataSource.js +12 -12
- package/Source/DataSources/GeometryUpdater.js +12 -17
- package/Source/DataSources/GeometryVisualizer.js +2 -3
- package/Source/DataSources/GpxDataSource.js +4 -7
- package/Source/DataSources/GridMaterialProperty.js +2 -2
- package/Source/DataSources/GroundGeometryUpdater.js +1 -2
- package/Source/DataSources/ImageMaterialProperty.js +2 -2
- package/Source/DataSources/KmlDataSource.js +84 -158
- package/Source/DataSources/LabelGraphics.js +27 -56
- package/Source/DataSources/LabelVisualizer.js +1 -2
- package/Source/DataSources/ModelGraphics.js +29 -63
- package/Source/DataSources/ModelVisualizer.js +1 -2
- package/Source/DataSources/NodeTransformationProperty.js +2 -2
- package/Source/DataSources/PathGraphics.js +10 -12
- package/Source/DataSources/PlaneGraphics.js +13 -15
- package/Source/DataSources/PointGraphics.js +17 -32
- package/Source/DataSources/PolygonGraphics.js +28 -45
- package/Source/DataSources/PolylineDashMaterialProperty.js +2 -2
- package/Source/DataSources/PolylineGeometryUpdater.js +9 -14
- package/Source/DataSources/PolylineGlowMaterialProperty.js +2 -2
- package/Source/DataSources/PolylineGraphics.js +16 -23
- package/Source/DataSources/PolylineOutlineMaterialProperty.js +2 -2
- package/Source/DataSources/PolylineVisualizer.js +2 -3
- package/Source/DataSources/PolylineVolumeGraphics.js +15 -17
- package/Source/DataSources/PositionPropertyArray.js +1 -2
- package/Source/DataSources/Property.js +1 -2
- package/Source/DataSources/PropertyBag.js +1 -2
- package/Source/DataSources/RectangleGraphics.js +23 -35
- package/Source/DataSources/Rotation.js +4 -5
- package/Source/DataSources/SampledPositionProperty.js +2 -3
- package/Source/DataSources/SampledProperty.js +6 -11
- package/Source/DataSources/StaticGroundPolylinePerMaterialBatch.js +1 -2
- package/Source/DataSources/StripeMaterialProperty.js +2 -2
- package/Source/DataSources/TimeIntervalCollectionPositionProperty.js +1 -2
- package/Source/DataSources/VelocityOrientationProperty.js +1 -2
- package/Source/DataSources/VelocityVectorProperty.js +1 -2
- package/Source/DataSources/WallGraphics.js +15 -23
- package/Source/DataSources/createPropertyDescriptor.js +2 -3
- package/Source/DataSources/exportKml.js +11 -14
- package/Source/Renderer/Buffer.js +5 -5
- package/Source/Renderer/ClearCommand.js +2 -2
- package/Source/Renderer/ComputeCommand.js +3 -3
- package/Source/Renderer/Context.js +22 -37
- package/Source/Renderer/CubeMap.js +6 -6
- package/Source/Renderer/CubeMapFace.js +11 -12
- package/Source/Renderer/DrawCommand.js +14 -25
- package/Source/Renderer/Framebuffer.js +3 -3
- package/Source/Renderer/FramebufferManager.js +25 -39
- package/Source/Renderer/MultisampleFramebuffer.js +2 -2
- package/Source/Renderer/RenderState.js +63 -92
- package/Source/Renderer/Renderbuffer.js +4 -4
- package/Source/Renderer/Sampler.js +2 -2
- package/Source/Renderer/ShaderBuilder.js +2 -3
- package/Source/Renderer/ShaderProgram.js +3 -3
- package/Source/Renderer/ShaderSource.js +3 -3
- package/Source/Renderer/Texture.js +16 -15
- package/Source/Renderer/TextureAtlas.js +802 -0
- package/Source/Renderer/UniformState.js +6 -11
- package/Source/Renderer/VertexArray.js +14 -23
- package/Source/Renderer/VertexArrayFacade.js +7 -11
- package/Source/Scene/Appearance.js +4 -4
- package/Source/Scene/ArcGisMapServerImageryProvider.js +23 -37
- package/Source/Scene/ArcGisMapService.js +1 -1
- package/Source/Scene/B3dmParser.js +2 -3
- package/Source/Scene/BatchTableHierarchy.js +6 -13
- package/Source/Scene/Billboard.js +105 -182
- package/Source/Scene/BillboardCollection.js +140 -224
- package/Source/Scene/BillboardLoadState.js +44 -0
- package/Source/Scene/BillboardTexture.js +348 -0
- package/Source/Scene/BingMapsImageryProvider.js +6 -6
- package/Source/Scene/BoxEmitter.js +1 -2
- package/Source/Scene/BufferLoader.js +2 -2
- package/Source/Scene/Camera.js +45 -64
- package/Source/Scene/CameraFlightPath.js +6 -6
- package/Source/Scene/Cesium3DContentGroup.js +2 -2
- package/Source/Scene/Cesium3DTile.js +3 -4
- package/Source/Scene/Cesium3DTileBatchTable.js +6 -49
- package/Source/Scene/Cesium3DTileFeatureTable.js +2 -3
- package/Source/Scene/Cesium3DTilePointFeature.js +10 -18
- package/Source/Scene/Cesium3DTileStyle.js +4 -7
- package/Source/Scene/Cesium3DTilesVoxelProvider.js +419 -137
- package/Source/Scene/Cesium3DTileset.js +77 -143
- package/Source/Scene/Cesium3DTilesetMetadata.js +3 -3
- package/Source/Scene/Cesium3DTilesetStatistics.js +0 -1
- package/Source/Scene/CircleEmitter.js +2 -3
- package/Source/Scene/ClassificationPrimitive.js +15 -26
- package/Source/Scene/ClippingPlaneCollection.js +7 -12
- package/Source/Scene/ClippingPolygon.js +1 -2
- package/Source/Scene/ClippingPolygonCollection.js +4 -4
- package/Source/Scene/CloudCollection.js +9 -11
- package/Source/Scene/Composite3DTileContent.js +1 -2
- package/Source/Scene/ConeEmitter.js +1 -2
- package/Source/Scene/ContentMetadata.js +2 -2
- package/Source/Scene/CreditDisplay.js +5 -9
- package/Source/Scene/CumulusCloud.js +9 -15
- package/Source/Scene/DebugAppearance.js +7 -7
- package/Source/Scene/DebugCameraPrimitive.js +5 -5
- package/Source/Scene/DebugModelMatrixPrimitive.js +6 -8
- package/Source/Scene/DepthPlane.js +1 -2
- package/Source/Scene/DirectionalLight.js +2 -3
- package/Source/Scene/DiscardMissingTileImagePolicy.js +2 -2
- package/Source/Scene/DynamicEnvironmentMapManager.js +15 -24
- package/Source/Scene/EllipsoidPrimitive.js +11 -19
- package/Source/Scene/EllipsoidSurfaceAppearance.js +11 -15
- package/Source/Scene/Expression.js +1 -0
- package/Source/Scene/FrameRateMonitor.js +12 -21
- package/Source/Scene/FrustumCommands.js +2 -3
- package/Source/Scene/Geometry3DTileContent.js +9 -16
- package/Source/Scene/Globe.js +3 -4
- package/Source/Scene/GlobeSurfaceTileProvider.js +9 -18
- package/Source/Scene/GlobeTranslucencyState.js +12 -25
- package/Source/Scene/GltfBufferViewLoader.js +4 -4
- package/Source/Scene/GltfDracoLoader.js +2 -2
- package/Source/Scene/GltfImageLoader.js +2 -2
- package/Source/Scene/GltfIndexBufferLoader.js +5 -5
- package/Source/Scene/GltfJsonLoader.js +2 -2
- package/Source/Scene/GltfLoader.js +22 -37
- package/Source/Scene/GltfLoaderUtil.js +11 -11
- package/Source/Scene/GltfPipeline/addDefaults.js +37 -64
- package/Source/Scene/GltfPipeline/addToArray.js +1 -3
- package/Source/Scene/GltfPipeline/moveTechniqueRenderStates.js +2 -5
- package/Source/Scene/GltfPipeline/parseGlb.js +1 -5
- package/Source/Scene/GltfPipeline/removeUnusedElements.js +1 -2
- package/Source/Scene/GltfPipeline/updateVersion.js +28 -49
- package/Source/Scene/GltfStructuralMetadataLoader.js +5 -6
- package/Source/Scene/GltfTextureLoader.js +3 -3
- package/Source/Scene/GltfVertexBufferLoader.js +5 -5
- package/Source/Scene/GoogleEarthEnterpriseImageryProvider.js +2 -2
- package/Source/Scene/GoogleEarthEnterpriseMapsProvider.js +3 -4
- package/Source/Scene/GridImageryProvider.js +10 -13
- package/Source/Scene/GroundPolylinePrimitive.js +11 -22
- package/Source/Scene/GroundPrimitive.js +13 -24
- package/Source/Scene/GroupMetadata.js +2 -2
- package/Source/Scene/I3SDataProvider.js +10 -15
- package/Source/Scene/I3SNode.js +1 -6
- package/Source/Scene/I3SSublayer.js +1 -2
- package/Source/Scene/I3SSymbology.js +2 -3
- package/Source/Scene/I3dmParser.js +1 -2
- package/Source/Scene/ITwinData.js +11 -6
- package/Source/Scene/ImageBasedLighting.js +2 -2
- package/Source/Scene/ImageryLayer.js +42 -71
- package/Source/Scene/ImageryLayerCollection.js +2 -3
- package/Source/Scene/Implicit3DTileContent.js +3 -4
- package/Source/Scene/ImplicitAvailabilityBitstream.js +2 -5
- package/Source/Scene/ImplicitMetadataView.js +2 -2
- package/Source/Scene/ImplicitSubtree.js +10 -15
- package/Source/Scene/ImplicitSubtreeCache.js +3 -3
- package/Source/Scene/ImplicitSubtreeMetadata.js +2 -2
- package/Source/Scene/InstanceAttributeSemantic.js +1 -1
- package/Source/Scene/IonImageryProvider.js +3 -3
- package/Source/Scene/KeyframeNode.js +16 -2
- package/Source/Scene/Label.js +19 -36
- package/Source/Scene/LabelCollection.js +218 -196
- package/Source/Scene/MapboxImageryProvider.js +4 -4
- package/Source/Scene/MapboxStyleImageryProvider.js +5 -5
- package/Source/Scene/Material.js +14 -20
- package/Source/Scene/MaterialAppearance.js +12 -18
- package/Source/Scene/Megatexture.js +145 -82
- package/Source/Scene/MetadataClass.js +4 -4
- package/Source/Scene/MetadataClassProperty.js +11 -14
- package/Source/Scene/MetadataEnum.js +4 -7
- package/Source/Scene/MetadataEnumValue.js +2 -2
- package/Source/Scene/MetadataSchema.js +4 -4
- package/Source/Scene/MetadataSchemaLoader.js +2 -2
- package/Source/Scene/MetadataTable.js +2 -2
- package/Source/Scene/MetadataTableProperty.js +17 -31
- package/Source/Scene/Model/AlphaPipelineStage.js +1 -2
- package/Source/Scene/Model/B3dmLoader.js +15 -26
- package/Source/Scene/Model/BatchTexturePipelineStage.js +1 -2
- package/Source/Scene/Model/ClassificationModelDrawCommand.js +2 -2
- package/Source/Scene/Model/CustomShader.js +10 -14
- package/Source/Scene/Model/Extensions/Gpm/GltfMeshPrimitiveGpmLoader.js +3 -3
- package/Source/Scene/Model/FeatureIdPipelineStage.js +1 -5
- package/Source/Scene/Model/GeoJsonLoader.js +5 -8
- package/Source/Scene/Model/I3dmLoader.js +13 -21
- package/Source/Scene/Model/MaterialPipelineStage.js +1 -2
- package/Source/Scene/Model/Model.js +41 -63
- package/Source/Scene/Model/ModelAnimation.js +5 -6
- package/Source/Scene/Model/ModelAnimationChannel.js +2 -2
- package/Source/Scene/Model/ModelAnimationCollection.js +4 -4
- package/Source/Scene/Model/ModelArticulation.js +2 -2
- package/Source/Scene/Model/ModelArticulationStage.js +2 -2
- package/Source/Scene/Model/ModelDrawCommand.js +3 -3
- package/Source/Scene/Model/ModelFeatureTable.js +3 -9
- package/Source/Scene/Model/ModelLightingOptions.js +3 -3
- package/Source/Scene/Model/ModelNode.js +1 -1
- package/Source/Scene/Model/ModelRuntimeNode.js +2 -2
- package/Source/Scene/Model/ModelRuntimePrimitive.js +2 -2
- package/Source/Scene/Model/ModelSceneGraph.js +2 -2
- package/Source/Scene/Model/ModelSkin.js +2 -2
- package/Source/Scene/Model/ModelUtility.js +5 -1
- package/Source/Scene/Model/PickingPipelineStage.js +1 -2
- package/Source/Scene/Model/PntsLoader.js +6 -6
- package/Source/Scene/Model/PointCloudStylingPipelineStage.js +1 -5
- package/Source/Scene/Model/PrimitiveOutlineGenerator.js +2 -2
- package/Source/Scene/Model/SelectedFeatureIdPipelineStage.js +2 -3
- package/Source/Scene/Model/TextureUniform.js +5 -8
- package/Source/Scene/Model/VaryingType.js +2 -2
- package/Source/Scene/Model/pickModel.js +4 -5
- package/Source/Scene/Moon.js +5 -5
- package/Source/Scene/OpenStreetMapImageryProvider.js +7 -7
- package/Source/Scene/OrderedGroundPrimitiveCollection.js +1 -2
- package/Source/Scene/Particle.js +11 -17
- package/Source/Scene/ParticleBurst.js +5 -5
- package/Source/Scene/ParticleSystem.js +24 -54
- package/Source/Scene/PerInstanceColorAppearance.js +8 -8
- package/Source/Scene/PerformanceDisplay.js +3 -3
- package/Source/Scene/PickFramebuffer.js +4 -5
- package/Source/Scene/Picking.js +3 -4
- package/Source/Scene/PntsParser.js +1 -2
- package/Source/Scene/PointCloud.js +6 -12
- package/Source/Scene/PointCloudShading.js +9 -18
- package/Source/Scene/PointPrimitive.js +11 -21
- package/Source/Scene/PointPrimitiveCollection.js +6 -14
- package/Source/Scene/Polyline.js +5 -5
- package/Source/Scene/PolylineCollection.js +5 -10
- package/Source/Scene/PolylineColorAppearance.js +7 -11
- package/Source/Scene/PolylineMaterialAppearance.js +7 -11
- package/Source/Scene/PostProcessStage.js +2 -2
- package/Source/Scene/PostProcessStageComposite.js +3 -6
- package/Source/Scene/Primitive.js +21 -42
- package/Source/Scene/PrimitiveCollection.js +4 -4
- package/Source/Scene/PrimitivePipeline.js +1 -2
- package/Source/Scene/PropertyAttribute.js +2 -2
- package/Source/Scene/PropertyAttributeProperty.js +4 -4
- package/Source/Scene/PropertyTable.js +2 -2
- package/Source/Scene/PropertyTexture.js +2 -2
- package/Source/Scene/PropertyTextureProperty.js +4 -4
- package/Source/Scene/QuadtreePrimitive.js +84 -66
- package/Source/Scene/QuadtreeTile.js +170 -0
- package/Source/Scene/ResourceCache.js +11 -11
- package/Source/Scene/ResourceCacheKey.js +11 -11
- package/Source/Scene/Scene.js +66 -40
- package/Source/Scene/ScreenSpaceCameraController.js +10 -20
- package/Source/Scene/ShadowMap.js +15 -15
- package/Source/Scene/ShadowVolumeAppearance.js +1 -2
- package/Source/Scene/SingleTileImageryProvider.js +4 -4
- package/Source/Scene/SkyAtmosphere.js +1 -2
- package/Source/Scene/SkyBox.js +1 -2
- package/Source/Scene/SpatialNode.js +4 -11
- package/Source/Scene/SphereEmitter.js +2 -3
- package/Source/Scene/StructuralMetadata.js +2 -2
- package/Source/Scene/SunLight.js +4 -4
- package/Source/Scene/SupportedImageFormats.js +4 -4
- package/Source/Scene/TileBoundingRegion.js +4 -5
- package/Source/Scene/TileBoundingS2Cell.js +3 -4
- package/Source/Scene/TileCoordinatesImageryProvider.js +5 -5
- package/Source/Scene/TileMapServiceImageryProvider.js +18 -27
- package/Source/Scene/TileMetadata.js +2 -2
- package/Source/Scene/TilesetMetadata.js +2 -2
- package/Source/Scene/TimeDynamicImagery.js +2 -2
- package/Source/Scene/TimeDynamicPointCloud.js +8 -10
- package/Source/Scene/TweenCollection.js +13 -16
- package/Source/Scene/UrlTemplateImageryProvider.js +11 -15
- package/Source/Scene/Vector3DTileClampedPolylines.js +1 -2
- package/Source/Scene/Vector3DTileContent.js +16 -20
- package/Source/Scene/Vector3DTileGeometry.js +1 -2
- package/Source/Scene/Vector3DTilePoints.js +2 -5
- package/Source/Scene/Vector3DTilePolygons.js +2 -3
- package/Source/Scene/Vector3DTilePolylines.js +1 -2
- package/Source/Scene/Vector3DTilePrimitive.js +9 -13
- package/Source/Scene/VoxelBoxShape.js +14 -8
- package/Source/Scene/VoxelCell.js +6 -5
- package/Source/Scene/VoxelContent.js +171 -107
- package/Source/Scene/VoxelCylinderShape.js +69 -69
- package/Source/Scene/VoxelEllipsoidShape.js +17 -8
- package/Source/Scene/VoxelMetadataOrder.js +24 -0
- package/Source/Scene/VoxelPrimitive.js +134 -79
- package/Source/Scene/VoxelProvider.js +22 -29
- package/Source/Scene/VoxelRenderResources.js +26 -7
- package/Source/Scene/VoxelShape.js +10 -3
- package/Source/Scene/VoxelTraversal.js +260 -180
- package/Source/Scene/WebMapServiceImageryProvider.js +17 -24
- package/Source/Scene/WebMapTileServiceImageryProvider.js +7 -10
- package/Source/Scene/createElevationBandMaterial.js +4 -4
- package/Source/Scene/createGooglePhotorealistic3DTileset.js +8 -16
- package/Source/Scene/createOsmBuildingsAsync.js +3 -6
- package/Source/Scene/createTangentSpaceDebugPrimitive.js +4 -6
- package/Source/Scene/createWorldImageryAsync.js +3 -3
- package/Source/Scene/findContentMetadata.js +2 -5
- package/Source/Scene/findTileMetadata.js +2 -5
- package/Source/Scene/parseBatchTable.js +1 -5
- package/Source/Scene/parseFeatureMetadataLegacy.js +2 -2
- package/Source/Scene/parseStructuralMetadata.js +2 -2
- package/Source/Scene/processVoxelProperties.js +3 -0
- package/Source/Shaders/GlobeFS.glsl +10 -1
- package/Source/Shaders/GlobeFS.js +10 -1
- package/Source/Shaders/Voxels/Megatexture.glsl +4 -16
- package/Source/Shaders/Voxels/Megatexture.js +4 -16
- package/Source/Shaders/Voxels/Octree.glsl +44 -7
- package/Source/Shaders/Voxels/Octree.js +44 -7
- package/Source/Shaders/Voxels/VoxelFS.glsl +9 -15
- package/Source/Shaders/Voxels/VoxelFS.js +9 -15
- package/Source/Shaders/Voxels/convertUvToCylinder.glsl +15 -15
- package/Source/Shaders/Voxels/convertUvToCylinder.js +15 -15
- package/Source/Widget/CesiumWidget.js +17 -25
- package/Source/Workers/createGeometry.js +1 -2
- package/Source/Workers/createVerticesFromGoogleEarthEnterpriseBuffer.js +1 -2
- package/Source/Workers/decodeI3S.js +1 -5
- package/Source/Workers/transcodeKTX2.js +1 -2
- package/index.d.ts +231 -92
- package/index.js +315 -310
- package/package.json +3 -3
- package/Build/Workers/chunk-TVL3F7IU.js +0 -39
- package/Source/Scene/TextureAtlas.js +0 -558
package/Source/Scene/Camera.js
CHANGED
|
@@ -3,7 +3,7 @@ import Cartesian2 from "../Core/Cartesian2.js";
|
|
|
3
3
|
import Cartesian3 from "../Core/Cartesian3.js";
|
|
4
4
|
import Cartesian4 from "../Core/Cartesian4.js";
|
|
5
5
|
import Cartographic from "../Core/Cartographic.js";
|
|
6
|
-
import
|
|
6
|
+
import Frozen from "../Core/Frozen.js";
|
|
7
7
|
import defined from "../Core/defined.js";
|
|
8
8
|
import DeveloperError from "../Core/DeveloperError.js";
|
|
9
9
|
import EasingFunction from "../Core/EasingFunction.js";
|
|
@@ -1208,8 +1208,8 @@ function calculateOrthographicFrustumWidth(camera) {
|
|
|
1208
1208
|
const globe = scene.globe;
|
|
1209
1209
|
|
|
1210
1210
|
const mousePosition = scratchAdjustOrthographicFrustumMousePosition;
|
|
1211
|
-
mousePosition.x = scene.drawingBufferWidth / 2.0;
|
|
1212
|
-
mousePosition.y = scene.drawingBufferHeight / 2.0;
|
|
1211
|
+
mousePosition.x = scene.drawingBufferWidth / scene.pixelRatio / 2.0;
|
|
1212
|
+
mousePosition.y = scene.drawingBufferHeight / scene.pixelRatio / 2.0;
|
|
1213
1213
|
|
|
1214
1214
|
let rayIntersection;
|
|
1215
1215
|
if (defined(globe)) {
|
|
@@ -1485,11 +1485,8 @@ const scratchHpr = new HeadingPitchRoll();
|
|
|
1485
1485
|
* });
|
|
1486
1486
|
*/
|
|
1487
1487
|
Camera.prototype.setView = function (options) {
|
|
1488
|
-
options =
|
|
1489
|
-
let orientation =
|
|
1490
|
-
options.orientation,
|
|
1491
|
-
defaultValue.EMPTY_OBJECT,
|
|
1492
|
-
);
|
|
1488
|
+
options = options ?? Frozen.EMPTY_OBJECT;
|
|
1489
|
+
let orientation = options.orientation ?? Frozen.EMPTY_OBJECT;
|
|
1493
1490
|
|
|
1494
1491
|
const mode = this._mode;
|
|
1495
1492
|
if (mode === SceneMode.MORPHING) {
|
|
@@ -1500,11 +1497,10 @@ Camera.prototype.setView = function (options) {
|
|
|
1500
1497
|
this._setTransform(options.endTransform);
|
|
1501
1498
|
}
|
|
1502
1499
|
|
|
1503
|
-
let convert =
|
|
1504
|
-
let destination =
|
|
1505
|
-
options.destination
|
|
1506
|
-
Cartesian3.clone(this.positionWC, scratchSetViewCartesian)
|
|
1507
|
-
);
|
|
1500
|
+
let convert = options.convert ?? true;
|
|
1501
|
+
let destination =
|
|
1502
|
+
options.destination ??
|
|
1503
|
+
Cartesian3.clone(this.positionWC, scratchSetViewCartesian);
|
|
1508
1504
|
if (defined(destination) && defined(destination.west)) {
|
|
1509
1505
|
destination = this.getRectangleCameraCoordinates(
|
|
1510
1506
|
destination,
|
|
@@ -1528,9 +1524,9 @@ Camera.prototype.setView = function (options) {
|
|
|
1528
1524
|
);
|
|
1529
1525
|
}
|
|
1530
1526
|
|
|
1531
|
-
scratchHpr.heading =
|
|
1532
|
-
scratchHpr.pitch =
|
|
1533
|
-
scratchHpr.roll =
|
|
1527
|
+
scratchHpr.heading = orientation.heading ?? 0.0;
|
|
1528
|
+
scratchHpr.pitch = orientation.pitch ?? -CesiumMath.PI_OVER_TWO;
|
|
1529
|
+
scratchHpr.roll = orientation.roll ?? 0.0;
|
|
1534
1530
|
|
|
1535
1531
|
if (mode === SceneMode.SCENE3D) {
|
|
1536
1532
|
setView3D(this, destination, scratchHpr);
|
|
@@ -1803,7 +1799,7 @@ Camera.prototype.move = function (direction, amount) {
|
|
|
1803
1799
|
* @see Camera#moveBackward
|
|
1804
1800
|
*/
|
|
1805
1801
|
Camera.prototype.moveForward = function (amount) {
|
|
1806
|
-
amount =
|
|
1802
|
+
amount = amount ?? this.defaultMoveAmount;
|
|
1807
1803
|
|
|
1808
1804
|
if (this._mode === SceneMode.SCENE2D) {
|
|
1809
1805
|
// 2D mode
|
|
@@ -1824,7 +1820,7 @@ Camera.prototype.moveForward = function (amount) {
|
|
|
1824
1820
|
* @see Camera#moveForward
|
|
1825
1821
|
*/
|
|
1826
1822
|
Camera.prototype.moveBackward = function (amount) {
|
|
1827
|
-
amount =
|
|
1823
|
+
amount = amount ?? this.defaultMoveAmount;
|
|
1828
1824
|
|
|
1829
1825
|
if (this._mode === SceneMode.SCENE2D) {
|
|
1830
1826
|
// 2D mode
|
|
@@ -1843,7 +1839,7 @@ Camera.prototype.moveBackward = function (amount) {
|
|
|
1843
1839
|
* @see Camera#moveDown
|
|
1844
1840
|
*/
|
|
1845
1841
|
Camera.prototype.moveUp = function (amount) {
|
|
1846
|
-
amount =
|
|
1842
|
+
amount = amount ?? this.defaultMoveAmount;
|
|
1847
1843
|
this.move(this.up, amount);
|
|
1848
1844
|
};
|
|
1849
1845
|
|
|
@@ -1856,7 +1852,7 @@ Camera.prototype.moveUp = function (amount) {
|
|
|
1856
1852
|
* @see Camera#moveUp
|
|
1857
1853
|
*/
|
|
1858
1854
|
Camera.prototype.moveDown = function (amount) {
|
|
1859
|
-
amount =
|
|
1855
|
+
amount = amount ?? this.defaultMoveAmount;
|
|
1860
1856
|
this.move(this.up, -amount);
|
|
1861
1857
|
};
|
|
1862
1858
|
|
|
@@ -1868,7 +1864,7 @@ Camera.prototype.moveDown = function (amount) {
|
|
|
1868
1864
|
* @see Camera#moveLeft
|
|
1869
1865
|
*/
|
|
1870
1866
|
Camera.prototype.moveRight = function (amount) {
|
|
1871
|
-
amount =
|
|
1867
|
+
amount = amount ?? this.defaultMoveAmount;
|
|
1872
1868
|
this.move(this.right, amount);
|
|
1873
1869
|
};
|
|
1874
1870
|
|
|
@@ -1881,7 +1877,7 @@ Camera.prototype.moveRight = function (amount) {
|
|
|
1881
1877
|
* @see Camera#moveRight
|
|
1882
1878
|
*/
|
|
1883
1879
|
Camera.prototype.moveLeft = function (amount) {
|
|
1884
|
-
amount =
|
|
1880
|
+
amount = amount ?? this.defaultMoveAmount;
|
|
1885
1881
|
this.move(this.right, -amount);
|
|
1886
1882
|
};
|
|
1887
1883
|
|
|
@@ -1894,7 +1890,7 @@ Camera.prototype.moveLeft = function (amount) {
|
|
|
1894
1890
|
* @see Camera#lookRight
|
|
1895
1891
|
*/
|
|
1896
1892
|
Camera.prototype.lookLeft = function (amount) {
|
|
1897
|
-
amount =
|
|
1893
|
+
amount = amount ?? this.defaultLookAmount;
|
|
1898
1894
|
|
|
1899
1895
|
// only want view of map to change in 3D mode, 2D visual is incorrect when look changes
|
|
1900
1896
|
if (this._mode !== SceneMode.SCENE2D) {
|
|
@@ -1911,7 +1907,7 @@ Camera.prototype.lookLeft = function (amount) {
|
|
|
1911
1907
|
* @see Camera#lookLeft
|
|
1912
1908
|
*/
|
|
1913
1909
|
Camera.prototype.lookRight = function (amount) {
|
|
1914
|
-
amount =
|
|
1910
|
+
amount = amount ?? this.defaultLookAmount;
|
|
1915
1911
|
|
|
1916
1912
|
// only want view of map to change in 3D mode, 2D visual is incorrect when look changes
|
|
1917
1913
|
if (this._mode !== SceneMode.SCENE2D) {
|
|
@@ -1928,7 +1924,7 @@ Camera.prototype.lookRight = function (amount) {
|
|
|
1928
1924
|
* @see Camera#lookDown
|
|
1929
1925
|
*/
|
|
1930
1926
|
Camera.prototype.lookUp = function (amount) {
|
|
1931
|
-
amount =
|
|
1927
|
+
amount = amount ?? this.defaultLookAmount;
|
|
1932
1928
|
|
|
1933
1929
|
// only want view of map to change in 3D mode, 2D visual is incorrect when look changes
|
|
1934
1930
|
if (this._mode !== SceneMode.SCENE2D) {
|
|
@@ -1945,7 +1941,7 @@ Camera.prototype.lookUp = function (amount) {
|
|
|
1945
1941
|
* @see Camera#lookUp
|
|
1946
1942
|
*/
|
|
1947
1943
|
Camera.prototype.lookDown = function (amount) {
|
|
1948
|
-
amount =
|
|
1944
|
+
amount = amount ?? this.defaultLookAmount;
|
|
1949
1945
|
|
|
1950
1946
|
// only want view of map to change in 3D mode, 2D visual is incorrect when look changes
|
|
1951
1947
|
if (this._mode !== SceneMode.SCENE2D) {
|
|
@@ -1973,7 +1969,7 @@ Camera.prototype.look = function (axis, angle) {
|
|
|
1973
1969
|
}
|
|
1974
1970
|
//>>includeEnd('debug');
|
|
1975
1971
|
|
|
1976
|
-
const turnAngle =
|
|
1972
|
+
const turnAngle = angle ?? this.defaultLookAmount;
|
|
1977
1973
|
const quaternion = Quaternion.fromAxisAngle(
|
|
1978
1974
|
axis,
|
|
1979
1975
|
-turnAngle,
|
|
@@ -1998,7 +1994,7 @@ Camera.prototype.look = function (axis, angle) {
|
|
|
1998
1994
|
* @see Camera#twistRight
|
|
1999
1995
|
*/
|
|
2000
1996
|
Camera.prototype.twistLeft = function (amount) {
|
|
2001
|
-
amount =
|
|
1997
|
+
amount = amount ?? this.defaultLookAmount;
|
|
2002
1998
|
this.look(this.direction, amount);
|
|
2003
1999
|
};
|
|
2004
2000
|
|
|
@@ -2010,7 +2006,7 @@ Camera.prototype.twistLeft = function (amount) {
|
|
|
2010
2006
|
* @see Camera#twistLeft
|
|
2011
2007
|
*/
|
|
2012
2008
|
Camera.prototype.twistRight = function (amount) {
|
|
2013
|
-
amount =
|
|
2009
|
+
amount = amount ?? this.defaultLookAmount;
|
|
2014
2010
|
this.look(this.direction, -amount);
|
|
2015
2011
|
};
|
|
2016
2012
|
|
|
@@ -2035,7 +2031,7 @@ Camera.prototype.rotate = function (axis, angle) {
|
|
|
2035
2031
|
}
|
|
2036
2032
|
//>>includeEnd('debug');
|
|
2037
2033
|
|
|
2038
|
-
const turnAngle =
|
|
2034
|
+
const turnAngle = angle ?? this.defaultRotateAmount;
|
|
2039
2035
|
const quaternion = Quaternion.fromAxisAngle(
|
|
2040
2036
|
axis,
|
|
2041
2037
|
-turnAngle,
|
|
@@ -2060,7 +2056,7 @@ Camera.prototype.rotate = function (axis, angle) {
|
|
|
2060
2056
|
* @see Camera#rotate
|
|
2061
2057
|
*/
|
|
2062
2058
|
Camera.prototype.rotateDown = function (angle) {
|
|
2063
|
-
angle =
|
|
2059
|
+
angle = angle ?? this.defaultRotateAmount;
|
|
2064
2060
|
rotateVertical(this, angle);
|
|
2065
2061
|
};
|
|
2066
2062
|
|
|
@@ -2073,7 +2069,7 @@ Camera.prototype.rotateDown = function (angle) {
|
|
|
2073
2069
|
* @see Camera#rotate
|
|
2074
2070
|
*/
|
|
2075
2071
|
Camera.prototype.rotateUp = function (angle) {
|
|
2076
|
-
angle =
|
|
2072
|
+
angle = angle ?? this.defaultRotateAmount;
|
|
2077
2073
|
rotateVertical(this, -angle);
|
|
2078
2074
|
};
|
|
2079
2075
|
|
|
@@ -2146,7 +2142,7 @@ function rotateVertical(camera, angle) {
|
|
|
2146
2142
|
* @see Camera#rotate
|
|
2147
2143
|
*/
|
|
2148
2144
|
Camera.prototype.rotateRight = function (angle) {
|
|
2149
|
-
angle =
|
|
2145
|
+
angle = angle ?? this.defaultRotateAmount;
|
|
2150
2146
|
rotateHorizontal(this, -angle);
|
|
2151
2147
|
};
|
|
2152
2148
|
|
|
@@ -2159,7 +2155,7 @@ Camera.prototype.rotateRight = function (angle) {
|
|
|
2159
2155
|
* @see Camera#rotate
|
|
2160
2156
|
*/
|
|
2161
2157
|
Camera.prototype.rotateLeft = function (angle) {
|
|
2162
|
-
angle =
|
|
2158
|
+
angle = angle ?? this.defaultRotateAmount;
|
|
2163
2159
|
rotateHorizontal(this, angle);
|
|
2164
2160
|
};
|
|
2165
2161
|
|
|
@@ -2256,7 +2252,7 @@ function zoom3D(camera, amount) {
|
|
|
2256
2252
|
* @see Camera#zoomOut
|
|
2257
2253
|
*/
|
|
2258
2254
|
Camera.prototype.zoomIn = function (amount) {
|
|
2259
|
-
amount =
|
|
2255
|
+
amount = amount ?? this.defaultZoomAmount;
|
|
2260
2256
|
if (this._mode === SceneMode.SCENE2D) {
|
|
2261
2257
|
zoom2D(this, amount);
|
|
2262
2258
|
} else {
|
|
@@ -2273,7 +2269,7 @@ Camera.prototype.zoomIn = function (amount) {
|
|
|
2273
2269
|
* @see Camera#zoomIn
|
|
2274
2270
|
*/
|
|
2275
2271
|
Camera.prototype.zoomOut = function (amount) {
|
|
2276
|
-
amount =
|
|
2272
|
+
amount = amount ?? this.defaultZoomAmount;
|
|
2277
2273
|
if (this._mode === SceneMode.SCENE2D) {
|
|
2278
2274
|
zoom2D(this, -amount);
|
|
2279
2275
|
} else {
|
|
@@ -2345,7 +2341,7 @@ Camera.prototype.lookAt = function (target, offset) {
|
|
|
2345
2341
|
//>>includeEnd('debug');
|
|
2346
2342
|
|
|
2347
2343
|
const scene = this._scene;
|
|
2348
|
-
const ellipsoid =
|
|
2344
|
+
const ellipsoid = scene.ellipsoid ?? Ellipsoid.default;
|
|
2349
2345
|
|
|
2350
2346
|
const transform = Transforms.eastNorthUpToFixedFrame(
|
|
2351
2347
|
target,
|
|
@@ -2840,7 +2836,7 @@ Camera.prototype.getRectangleCameraCoordinates = function (rectangle, result) {
|
|
|
2840
2836
|
|
|
2841
2837
|
const pickEllipsoid3DRay = new Ray();
|
|
2842
2838
|
function pickEllipsoid3D(camera, windowPosition, ellipsoid, result) {
|
|
2843
|
-
ellipsoid =
|
|
2839
|
+
ellipsoid = ellipsoid ?? Ellipsoid.default;
|
|
2844
2840
|
const ray = camera.getPickRay(windowPosition, pickEllipsoid3DRay);
|
|
2845
2841
|
const intersection = IntersectionTests.rayEllipsoid(ray, ellipsoid);
|
|
2846
2842
|
if (!intersection) {
|
|
@@ -2920,7 +2916,7 @@ Camera.prototype.pickEllipsoid = function (windowPosition, ellipsoid, result) {
|
|
|
2920
2916
|
result = new Cartesian3();
|
|
2921
2917
|
}
|
|
2922
2918
|
|
|
2923
|
-
ellipsoid =
|
|
2919
|
+
ellipsoid = ellipsoid ?? Ellipsoid.default;
|
|
2924
2920
|
|
|
2925
2921
|
if (this._mode === SceneMode.SCENE3D) {
|
|
2926
2922
|
result = pickEllipsoid3D(this, windowPosition, ellipsoid, result);
|
|
@@ -3000,27 +2996,15 @@ function getPickRayOrthographic(camera, windowPosition, result) {
|
|
|
3000
2996
|
y *= (frustum.top - frustum.bottom) * 0.5;
|
|
3001
2997
|
|
|
3002
2998
|
const origin = result.origin;
|
|
3003
|
-
Cartesian3.clone(camera.
|
|
2999
|
+
Cartesian3.clone(camera.positionWC, origin);
|
|
3004
3000
|
|
|
3005
|
-
Cartesian3.multiplyByScalar(camera.
|
|
3001
|
+
Cartesian3.multiplyByScalar(camera.rightWC, x, scratchDirection);
|
|
3006
3002
|
Cartesian3.add(scratchDirection, origin, origin);
|
|
3007
|
-
Cartesian3.multiplyByScalar(camera.
|
|
3003
|
+
Cartesian3.multiplyByScalar(camera.upWC, y, scratchDirection);
|
|
3008
3004
|
Cartesian3.add(scratchDirection, origin, origin);
|
|
3009
3005
|
|
|
3010
3006
|
Cartesian3.clone(camera.directionWC, result.direction);
|
|
3011
3007
|
|
|
3012
|
-
if (
|
|
3013
|
-
camera._mode === SceneMode.COLUMBUS_VIEW ||
|
|
3014
|
-
camera._mode === SceneMode.SCENE2D
|
|
3015
|
-
) {
|
|
3016
|
-
Cartesian3.fromElements(
|
|
3017
|
-
result.origin.z,
|
|
3018
|
-
result.origin.x,
|
|
3019
|
-
result.origin.y,
|
|
3020
|
-
result.origin,
|
|
3021
|
-
);
|
|
3022
|
-
}
|
|
3023
|
-
|
|
3024
3008
|
return result;
|
|
3025
3009
|
}
|
|
3026
3010
|
|
|
@@ -3270,7 +3254,7 @@ const newOptions = {
|
|
|
3270
3254
|
|
|
3271
3255
|
/**
|
|
3272
3256
|
* Cancels the current camera flight and leaves the camera at its current location.
|
|
3273
|
-
* If no flight is in progress, this
|
|
3257
|
+
* If no flight is in progress, this function does nothing.
|
|
3274
3258
|
*/
|
|
3275
3259
|
Camera.prototype.cancelFlight = function () {
|
|
3276
3260
|
if (defined(this._currentFlight)) {
|
|
@@ -3281,7 +3265,7 @@ Camera.prototype.cancelFlight = function () {
|
|
|
3281
3265
|
|
|
3282
3266
|
/**
|
|
3283
3267
|
* Completes the current camera flight and moves the camera immediately to its final destination.
|
|
3284
|
-
* If no flight is in progress, this
|
|
3268
|
+
* If no flight is in progress, this function does nothing.
|
|
3285
3269
|
*/
|
|
3286
3270
|
Camera.prototype.completeFlight = function () {
|
|
3287
3271
|
if (defined(this._currentFlight)) {
|
|
@@ -3363,7 +3347,7 @@ Camera.prototype.completeFlight = function () {
|
|
|
3363
3347
|
* });
|
|
3364
3348
|
*/
|
|
3365
3349
|
Camera.prototype.flyTo = function (options) {
|
|
3366
|
-
options =
|
|
3350
|
+
options = options ?? Frozen.EMPTY_OBJECT;
|
|
3367
3351
|
let destination = options.destination;
|
|
3368
3352
|
//>>includeStart('debug', pragmas.debug);
|
|
3369
3353
|
if (!defined(destination)) {
|
|
@@ -3386,10 +3370,7 @@ Camera.prototype.flyTo = function (options) {
|
|
|
3386
3370
|
);
|
|
3387
3371
|
}
|
|
3388
3372
|
|
|
3389
|
-
let orientation =
|
|
3390
|
-
options.orientation,
|
|
3391
|
-
defaultValue.EMPTY_OBJECT,
|
|
3392
|
-
);
|
|
3373
|
+
let orientation = options.orientation ?? Frozen.EMPTY_OBJECT;
|
|
3393
3374
|
if (defined(orientation.direction)) {
|
|
3394
3375
|
orientation = directionUpToHeadingPitchRoll(
|
|
3395
3376
|
this,
|
|
@@ -3607,7 +3588,7 @@ Camera.prototype.flyToBoundingSphere = function (boundingSphere, options) {
|
|
|
3607
3588
|
}
|
|
3608
3589
|
//>>includeEnd('debug');
|
|
3609
3590
|
|
|
3610
|
-
options =
|
|
3591
|
+
options = options ?? Frozen.EMPTY_OBJECT;
|
|
3611
3592
|
const scene2D =
|
|
3612
3593
|
this._mode === SceneMode.SCENE2D || this._mode === SceneMode.COLUMBUS_VIEW;
|
|
3613
3594
|
this._setTransform(Matrix4.IDENTITY);
|
|
@@ -3633,7 +3614,7 @@ Camera.prototype.flyToBoundingSphere = function (boundingSphere, options) {
|
|
|
3633
3614
|
}
|
|
3634
3615
|
|
|
3635
3616
|
const scene = this._scene;
|
|
3636
|
-
const ellipsoid =
|
|
3617
|
+
const ellipsoid = scene.ellipsoid ?? Ellipsoid.default;
|
|
3637
3618
|
|
|
3638
3619
|
const transform = Transforms.eastNorthUpToFixedFrame(
|
|
3639
3620
|
boundingSphere.center,
|
|
@@ -3823,7 +3804,7 @@ function addToResult(x, y, index, camera, ellipsoid, computedHorizonQuad) {
|
|
|
3823
3804
|
* @returns {Rectangle|undefined} The visible rectangle or undefined if the ellipsoid isn't visible at all.
|
|
3824
3805
|
*/
|
|
3825
3806
|
Camera.prototype.computeViewRectangle = function (ellipsoid, result) {
|
|
3826
|
-
ellipsoid =
|
|
3807
|
+
ellipsoid = ellipsoid ?? Ellipsoid.default;
|
|
3827
3808
|
const cullingVolume = this.frustum.computeCullingVolume(
|
|
3828
3809
|
this.positionWC,
|
|
3829
3810
|
this.directionWC,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import Cartesian2 from "../Core/Cartesian2.js";
|
|
2
2
|
import Cartesian3 from "../Core/Cartesian3.js";
|
|
3
3
|
import Cartographic from "../Core/Cartographic.js";
|
|
4
|
-
import
|
|
4
|
+
import Frozen from "../Core/Frozen.js";
|
|
5
5
|
import defined from "../Core/defined.js";
|
|
6
6
|
import DeveloperError from "../Core/DeveloperError.js";
|
|
7
7
|
import EasingFunction from "../Core/EasingFunction.js";
|
|
@@ -404,7 +404,7 @@ function wrapCallback(controller, cb) {
|
|
|
404
404
|
}
|
|
405
405
|
|
|
406
406
|
CameraFlightPath.createTween = function (scene, options) {
|
|
407
|
-
options =
|
|
407
|
+
options = options ?? Frozen.EMPTY_OBJECT;
|
|
408
408
|
let destination = options.destination;
|
|
409
409
|
|
|
410
410
|
//>>includeStart('debug', pragmas.debug);
|
|
@@ -421,7 +421,7 @@ CameraFlightPath.createTween = function (scene, options) {
|
|
|
421
421
|
return emptyFlight();
|
|
422
422
|
}
|
|
423
423
|
|
|
424
|
-
const convert =
|
|
424
|
+
const convert = options.convert ?? true;
|
|
425
425
|
const projection = scene.mapProjection;
|
|
426
426
|
const ellipsoid = projection.ellipsoid;
|
|
427
427
|
const maximumHeight = options.maximumHeight;
|
|
@@ -449,9 +449,9 @@ CameraFlightPath.createTween = function (scene, options) {
|
|
|
449
449
|
duration = Math.min(duration, 3.0);
|
|
450
450
|
}
|
|
451
451
|
|
|
452
|
-
const heading =
|
|
453
|
-
const pitch =
|
|
454
|
-
const roll =
|
|
452
|
+
const heading = options.heading ?? 0.0;
|
|
453
|
+
const pitch = options.pitch ?? -CesiumMath.PI_OVER_TWO;
|
|
454
|
+
const roll = options.roll ?? 0.0;
|
|
455
455
|
|
|
456
456
|
const controller = scene.screenSpaceCameraController;
|
|
457
457
|
controller.enableInputs = false;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import Check from "../Core/Check.js";
|
|
2
|
-
import
|
|
2
|
+
import Frozen from "../Core/Frozen.js";
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* Simple abstraction for a group. This class exists to make the metadata API
|
|
@@ -16,7 +16,7 @@ import defaultValue from "../Core/defaultValue.js";
|
|
|
16
16
|
* @experimental This feature is using part of the 3D Tiles spec that is not final and is subject to change without Cesium's standard deprecation policy.
|
|
17
17
|
*/
|
|
18
18
|
function Cesium3DContentGroup(options) {
|
|
19
|
-
options =
|
|
19
|
+
options = options ?? Frozen.EMPTY_OBJECT;
|
|
20
20
|
//>>includeStart('debug', pragmas.debug);
|
|
21
21
|
Check.typeOf.object("options.metadata", options.metadata);
|
|
22
22
|
//>>includeEnd('debug');
|
|
@@ -3,7 +3,6 @@ import Cartesian3 from "../Core/Cartesian3.js";
|
|
|
3
3
|
import Color from "../Core/Color.js";
|
|
4
4
|
import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js";
|
|
5
5
|
import CullingVolume from "../Core/CullingVolume.js";
|
|
6
|
-
import defaultValue from "../Core/defaultValue.js";
|
|
7
6
|
import defined from "../Core/defined.js";
|
|
8
7
|
import deprecationWarning from "../Core/deprecationWarning.js";
|
|
9
8
|
import destroyObject from "../Core/destroyObject.js";
|
|
@@ -597,7 +596,7 @@ Object.defineProperties(Cesium3DTile.prototype, {
|
|
|
597
596
|
*/
|
|
598
597
|
contentBoundingVolume: {
|
|
599
598
|
get: function () {
|
|
600
|
-
return
|
|
599
|
+
return this._contentBoundingVolume ?? this._boundingVolume;
|
|
601
600
|
},
|
|
602
601
|
},
|
|
603
602
|
|
|
@@ -915,7 +914,7 @@ Cesium3DTile.prototype.getScreenSpaceError = function (
|
|
|
915
914
|
progressiveResolutionHeightFraction,
|
|
916
915
|
) {
|
|
917
916
|
const tileset = this._tileset;
|
|
918
|
-
const heightFraction =
|
|
917
|
+
const heightFraction = progressiveResolutionHeightFraction ?? 1.0;
|
|
919
918
|
const parentGeometricError = defined(this.parent)
|
|
920
919
|
? this.parent.geometricError
|
|
921
920
|
: tileset._scaledGeometricError;
|
|
@@ -1975,7 +1974,7 @@ Cesium3DTile.prototype.updateTransform = function (
|
|
|
1975
1974
|
parentTransform,
|
|
1976
1975
|
frameState,
|
|
1977
1976
|
) {
|
|
1978
|
-
parentTransform =
|
|
1977
|
+
parentTransform = parentTransform ?? Matrix4.IDENTITY;
|
|
1979
1978
|
const computedTransform = Matrix4.multiplyTransformation(
|
|
1980
1979
|
parentTransform,
|
|
1981
1980
|
this.transform,
|
|
@@ -3,7 +3,6 @@ import Check from "../Core/Check.js";
|
|
|
3
3
|
import clone from "../Core/clone.js";
|
|
4
4
|
import Color from "../Core/Color.js";
|
|
5
5
|
import combine from "../Core/combine.js";
|
|
6
|
-
import defaultValue from "../Core/defaultValue.js";
|
|
7
6
|
import defined from "../Core/defined.js";
|
|
8
7
|
import deprecationWarning from "../Core/deprecationWarning.js";
|
|
9
8
|
import destroyObject from "../Core/destroyObject.js";
|
|
@@ -48,7 +47,7 @@ function Cesium3DTileBatchTable(
|
|
|
48
47
|
if (defined(batchTableJson)) {
|
|
49
48
|
extensions = batchTableJson.extensions;
|
|
50
49
|
}
|
|
51
|
-
this._extensions =
|
|
50
|
+
this._extensions = extensions ?? {};
|
|
52
51
|
|
|
53
52
|
const properties = initializeProperties(batchTableJson);
|
|
54
53
|
this._properties = properties;
|
|
@@ -266,13 +265,11 @@ Cesium3DTileBatchTable.prototype.applyStyle = function (style) {
|
|
|
266
265
|
for (let i = 0; i < length; ++i) {
|
|
267
266
|
const feature = content.getFeature(i);
|
|
268
267
|
const color = defined(style.color)
|
|
269
|
-
?
|
|
270
|
-
|
|
271
|
-
DEFAULT_COLOR_VALUE,
|
|
272
|
-
)
|
|
268
|
+
? (style.color.evaluateColor(feature, scratchColor) ??
|
|
269
|
+
DEFAULT_COLOR_VALUE)
|
|
273
270
|
: DEFAULT_COLOR_VALUE;
|
|
274
271
|
const show = defined(style.show)
|
|
275
|
-
?
|
|
272
|
+
? (style.show.evaluate(feature) ?? DEFAULT_SHOW_VALUE)
|
|
276
273
|
: DEFAULT_SHOW_VALUE;
|
|
277
274
|
this.setColor(i, color);
|
|
278
275
|
this.setShow(i, show);
|
|
@@ -783,45 +780,6 @@ Cesium3DTileBatchTable.prototype.getFragmentShaderCallback = function (
|
|
|
783
780
|
};
|
|
784
781
|
};
|
|
785
782
|
|
|
786
|
-
Cesium3DTileBatchTable.prototype.getClassificationFragmentShaderCallback =
|
|
787
|
-
function () {
|
|
788
|
-
if (this.featuresLength === 0) {
|
|
789
|
-
return;
|
|
790
|
-
}
|
|
791
|
-
return function (source) {
|
|
792
|
-
source = ShaderSource.replaceMain(source, "tile_main");
|
|
793
|
-
if (ContextLimits.maximumVertexTextureImageUnits > 0) {
|
|
794
|
-
// When VTF is supported, per-feature show/hide already happened in the fragment shader
|
|
795
|
-
source +=
|
|
796
|
-
"uniform sampler2D tile_pickTexture;\n" +
|
|
797
|
-
"in vec2 tile_featureSt; \n" +
|
|
798
|
-
"in vec4 tile_featureColor; \n" +
|
|
799
|
-
"void main() \n" +
|
|
800
|
-
"{ \n" +
|
|
801
|
-
" tile_main(); \n" +
|
|
802
|
-
" out_FragColor = tile_featureColor; \n" +
|
|
803
|
-
" out_FragColor.rgb *= out_FragColor.a; \n" +
|
|
804
|
-
"}";
|
|
805
|
-
} else {
|
|
806
|
-
source +=
|
|
807
|
-
"uniform sampler2D tile_batchTexture; \n" +
|
|
808
|
-
"uniform sampler2D tile_pickTexture;\n" +
|
|
809
|
-
"in vec2 tile_featureSt; \n" +
|
|
810
|
-
"void main() \n" +
|
|
811
|
-
"{ \n" +
|
|
812
|
-
" tile_main(); \n" +
|
|
813
|
-
" vec4 featureProperties = texture(tile_batchTexture, tile_featureSt); \n" +
|
|
814
|
-
" if (featureProperties.a == 0.0) { \n" + // show: alpha == 0 - false, non-zero - true
|
|
815
|
-
" discard; \n" +
|
|
816
|
-
" } \n" +
|
|
817
|
-
" out_FragColor = featureProperties; \n" +
|
|
818
|
-
" out_FragColor.rgb *= out_FragColor.a; \n" +
|
|
819
|
-
"} \n";
|
|
820
|
-
}
|
|
821
|
-
return source;
|
|
822
|
-
};
|
|
823
|
-
};
|
|
824
|
-
|
|
825
783
|
function getColorBlend(batchTable) {
|
|
826
784
|
const tileset = batchTable._content.tileset;
|
|
827
785
|
const colorBlendMode = tileset.colorBlendMode;
|
|
@@ -851,9 +809,8 @@ Cesium3DTileBatchTable.prototype.getUniformMapCallback = function () {
|
|
|
851
809
|
const batchUniformMap = {
|
|
852
810
|
tile_batchTexture: function () {
|
|
853
811
|
// PERFORMANCE_IDEA: we could also use a custom shader that avoids the texture read.
|
|
854
|
-
return
|
|
855
|
-
that._batchTexture.batchTexture
|
|
856
|
-
that._batchTexture.defaultTexture,
|
|
812
|
+
return (
|
|
813
|
+
that._batchTexture.batchTexture ?? that._batchTexture.defaultTexture
|
|
857
814
|
);
|
|
858
815
|
},
|
|
859
816
|
tile_textureDimensions: function () {
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import ComponentDatatype from "../Core/ComponentDatatype.js";
|
|
2
|
-
import defaultValue from "../Core/defaultValue.js";
|
|
3
2
|
import defined from "../Core/defined.js";
|
|
4
3
|
|
|
5
4
|
/**
|
|
@@ -55,8 +54,8 @@ Cesium3DTileFeatureTable.prototype.getGlobalProperty = function (
|
|
|
55
54
|
}
|
|
56
55
|
|
|
57
56
|
if (defined(jsonValue.byteOffset)) {
|
|
58
|
-
componentType =
|
|
59
|
-
componentLength =
|
|
57
|
+
componentType = componentType ?? ComponentDatatype.UNSIGNED_INT;
|
|
58
|
+
componentLength = componentLength ?? 1;
|
|
60
59
|
return getTypedArrayFromBinary(
|
|
61
60
|
this,
|
|
62
61
|
semantic,
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import Cartographic from "../Core/Cartographic.js";
|
|
2
2
|
import Color from "../Core/Color.js";
|
|
3
|
-
import defaultValue from "../Core/defaultValue.js";
|
|
4
3
|
import defined from "../Core/defined.js";
|
|
5
4
|
import Cesium3DTileFeature from "./Cesium3DTileFeature.js";
|
|
6
5
|
import createBillboardPointCallback from "./createBillboardPointCallback.js";
|
|
@@ -411,7 +410,7 @@ Object.defineProperties(Cesium3DTilePointFeature.prototype, {
|
|
|
411
410
|
return this._heightOffset;
|
|
412
411
|
},
|
|
413
412
|
set: function (value) {
|
|
414
|
-
const offset =
|
|
413
|
+
const offset = this._heightOffset ?? 0.0;
|
|
415
414
|
|
|
416
415
|
const ellipsoid = this._content.tileset.ellipsoid;
|
|
417
416
|
const cart = ellipsoid.cartesianToCartographic(
|
|
@@ -652,22 +651,15 @@ function setBillboardImage(feature) {
|
|
|
652
651
|
return;
|
|
653
652
|
}
|
|
654
653
|
|
|
655
|
-
const newColor =
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
const
|
|
660
|
-
feature.
|
|
661
|
-
Cesium3DTilePointFeature.
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
feature._pointOutlineWidth,
|
|
665
|
-
Cesium3DTilePointFeature.defaultPointOutlineWidth,
|
|
666
|
-
);
|
|
667
|
-
const newPointSize = defaultValue(
|
|
668
|
-
feature._pointSize,
|
|
669
|
-
Cesium3DTilePointFeature.defaultPointSize,
|
|
670
|
-
);
|
|
654
|
+
const newColor = feature._color ?? Cesium3DTilePointFeature.defaultColor;
|
|
655
|
+
const newOutlineColor =
|
|
656
|
+
feature._pointOutlineColor ??
|
|
657
|
+
Cesium3DTilePointFeature.defaultPointOutlineColor;
|
|
658
|
+
const newOutlineWidth =
|
|
659
|
+
feature._pointOutlineWidth ??
|
|
660
|
+
Cesium3DTilePointFeature.defaultPointOutlineWidth;
|
|
661
|
+
const newPointSize =
|
|
662
|
+
feature._pointSize ?? Cesium3DTilePointFeature.defaultPointSize;
|
|
671
663
|
|
|
672
664
|
const currentColor = feature._billboardColor;
|
|
673
665
|
const currentOutlineColor = feature._billboardOutlineColor;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import clone from "../Core/clone.js";
|
|
2
|
-
import
|
|
2
|
+
import Frozen from "../Core/Frozen.js";
|
|
3
3
|
import defined from "../Core/defined.js";
|
|
4
4
|
import DeveloperError from "../Core/DeveloperError.js";
|
|
5
5
|
import Resource from "../Core/Resource.js";
|
|
@@ -86,7 +86,7 @@ function Cesium3DTileStyle(style) {
|
|
|
86
86
|
}
|
|
87
87
|
|
|
88
88
|
function setup(that, styleJson) {
|
|
89
|
-
styleJson =
|
|
89
|
+
styleJson = clone(styleJson, true) ?? that._style;
|
|
90
90
|
that._style = styleJson;
|
|
91
91
|
|
|
92
92
|
that.show = styleJson.show;
|
|
@@ -119,7 +119,7 @@ function setup(that, styleJson) {
|
|
|
119
119
|
const meta = {};
|
|
120
120
|
if (defined(styleJson.meta)) {
|
|
121
121
|
const defines = styleJson.defines;
|
|
122
|
-
const metaJson =
|
|
122
|
+
const metaJson = styleJson.meta ?? Frozen.EMPTY_OBJECT;
|
|
123
123
|
for (const property in metaJson) {
|
|
124
124
|
if (metaJson.hasOwnProperty(property)) {
|
|
125
125
|
meta[property] = new Expression(metaJson[property], defines);
|
|
@@ -133,10 +133,7 @@ function setup(that, styleJson) {
|
|
|
133
133
|
}
|
|
134
134
|
|
|
135
135
|
function getExpression(tileStyle, value) {
|
|
136
|
-
const defines =
|
|
137
|
-
tileStyle._style,
|
|
138
|
-
defaultValue.EMPTY_OBJECT,
|
|
139
|
-
).defines;
|
|
136
|
+
const defines = (tileStyle._style ?? Frozen.EMPTY_OBJECT).defines;
|
|
140
137
|
|
|
141
138
|
if (!defined(value)) {
|
|
142
139
|
return undefined;
|