From 3199808c19e41fa52c6090740155b88c4a482285 Mon Sep 17 00:00:00 2001 From: jfayot Date: Mon, 14 Apr 2025 14:56:09 +0200 Subject: [PATCH 1/3] added @cesium/utils --- Specs/BadGeometry.js | 3 +- Specs/Cesium3DTilesTester.js | 8 +- Specs/DomEventSimulator.js | 3 +- Specs/ImplicitTilingTester.js | 2 +- Specs/MetadataTester.js | 6 +- Specs/MockDataSource.js | 2 +- Specs/MockImageryProvider.js | 8 +- Specs/MockTerrainProvider.js | 7 +- Specs/TerrainTileProcessor.js | 2 +- Specs/ViewportPrimitive.js | 3 +- Specs/addDefaultMatchers.js | 10 +- Specs/createCamera.js | 4 +- Specs/createDynamicGeometryUpdaterSpecs.js | 4 +- Specs/createFrameState.js | 4 +- ...reateGeometryUpdaterGroundGeometrySpecs.js | 8 +- Specs/createGeometryUpdaterSpecs.js | 12 +- Specs/createPackableSpecs.js | 3 +- Specs/createScene.js | 3 +- Specs/createTileKey.js | 2 +- Specs/equals.js | 2 +- Specs/equalsMethodEqualityTester.js | 2 +- Specs/getWebGLStub.js | 3 +- Specs/pick.js | 6 +- Specs/render.js | 3 +- Specs/spec-main.js | 3 +- Tools/jsdoc/conf.json | 14 +- gulpfile.js | 45 +- package.json | 8 +- .../Source/Core/ApproximateTerrainHeights.js | 4 +- .../ArcGISTiledElevationTerrainProvider.js | 6 +- .../engine/Source/Core/AssociativeArray.js | 3 +- .../Source/Core/AttributeCompression.js | 6 +- .../Source/Core/AxisAlignedBoundingBox.js | 3 +- .../Source/Core/BingMapsGeocoderService.js | 4 +- .../engine/Source/Core/BoundingRectangle.js | 3 +- packages/engine/Source/Core/BoundingSphere.js | 3 +- packages/engine/Source/Core/BoxGeometry.js | 4 +- .../engine/Source/Core/BoxOutlineGeometry.js | 4 +- packages/engine/Source/Core/Cartesian2.js | 4 +- packages/engine/Source/Core/Cartesian3.js | 4 +- packages/engine/Source/Core/Cartesian4.js | 4 +- packages/engine/Source/Core/Cartographic.js | 3 +- .../Core/CartographicGeocoderService.js | 2 +- .../engine/Source/Core/CatmullRomSpline.js | 3 +- .../Source/Core/CesiumTerrainProvider.js | 8 +- packages/engine/Source/Core/Check.d.ts | 131 ------ packages/engine/Source/Core/Check.js | 212 --------- packages/engine/Source/Core/CircleGeometry.js | 5 +- .../Source/Core/CircleOutlineGeometry.js | 5 +- packages/engine/Source/Core/Clock.js | 5 +- packages/engine/Source/Core/Color.js | 4 +- .../Core/ColorGeometryInstanceAttribute.js | 3 +- .../engine/Source/Core/ComponentDatatype.js | 3 +- .../Source/Core/CompressedTextureBuffer.js | 2 +- packages/engine/Source/Core/ConstantSpline.js | 3 +- .../Source/Core/CoplanarPolygonGeometry.js | 5 +- .../Core/CoplanarPolygonGeometryLibrary.js | 2 +- .../Core/CoplanarPolygonOutlineGeometry.js | 3 +- .../engine/Source/Core/CorridorGeometry.js | 5 +- .../Source/Core/CorridorGeometryLibrary.js | 2 +- .../Source/Core/CorridorOutlineGeometry.js | 5 +- packages/engine/Source/Core/Credit.js | 3 +- .../engine/Source/Core/CubicRealPolynomial.js | 2 +- packages/engine/Source/Core/CullingVolume.js | 3 +- .../Core/CustomHeightmapTerrainProvider.js | 5 +- .../engine/Source/Core/CylinderGeometry.js | 3 +- .../Source/Core/CylinderOutlineGeometry.js | 4 +- packages/engine/Source/Core/DeveloperError.js | 75 --- .../Source/Core/DistanceDisplayCondition.js | 3 +- ...splayConditionGeometryInstanceAttribute.js | 3 +- .../Source/Core/DoubleEndedPriorityQueue.js | 3 +- .../engine/Source/Core/DoublyLinkedList.js | 2 +- .../Source/Core/EarthOrientationParameters.js | 6 +- .../engine/Source/Core/EllipseGeometry.js | 6 +- .../Source/Core/EllipseOutlineGeometry.js | 5 +- packages/engine/Source/Core/Ellipsoid.js | 4 +- .../engine/Source/Core/EllipsoidGeodesic.js | 3 +- .../engine/Source/Core/EllipsoidGeometry.js | 5 +- .../Source/Core/EllipsoidOutlineGeometry.js | 5 +- .../engine/Source/Core/EllipsoidRhumbLine.js | 4 +- .../Source/Core/EllipsoidTangentPlane.js | 4 +- .../Source/Core/EllipsoidTerrainProvider.js | 4 +- .../engine/Source/Core/EllipsoidalOccluder.js | 3 +- .../engine/Source/Core/EncodedCartesian3.js | 3 +- packages/engine/Source/Core/Event.js | 3 +- packages/engine/Source/Core/EventHelper.js | 3 +- .../engine/Source/Core/FeatureDetection.js | 437 ----------------- .../engine/Source/Core/FrustumGeometry.js | 3 +- .../Source/Core/FrustumOutlineGeometry.js | 3 +- .../engine/Source/Core/GeocoderService.js | 3 +- .../Source/Core/GeographicProjection.js | 3 +- .../Source/Core/GeographicTilingScheme.js | 5 +- packages/engine/Source/Core/Geometry.js | 4 +- .../engine/Source/Core/GeometryAttribute.js | 3 +- .../engine/Source/Core/GeometryFactory.js | 2 +- .../engine/Source/Core/GeometryInstance.js | 3 +- .../Source/Core/GeometryInstanceAttribute.js | 3 +- .../engine/Source/Core/GeometryPipeline.js | 3 +- .../Core/GoogleEarthEnterpriseMetadata.js | 4 +- .../Core/GoogleEarthEnterpriseTerrainData.js | 4 +- .../GoogleEarthEnterpriseTerrainProvider.js | 6 +- .../GoogleEarthEnterpriseTileInformation.js | 2 +- .../Source/Core/GoogleGeocoderService.js | 5 +- packages/engine/Source/Core/GregorianDate.js | 3 +- .../Source/Core/GroundPolylineGeometry.js | 6 +- .../engine/Source/Core/HeadingPitchRange.js | 2 +- .../engine/Source/Core/HeadingPitchRoll.js | 3 +- packages/engine/Source/Core/Heap.js | 3 +- .../Source/Core/HeightmapTerrainData.js | 4 +- .../Source/Core/HeightmapTessellator.js | 3 +- .../Core/HermitePolynomialApproximation.js | 3 +- packages/engine/Source/Core/HermiteSpline.js | 3 +- packages/engine/Source/Core/HilbertOrder.js | 3 +- packages/engine/Source/Core/ITwinPlatform.js | 5 +- .../engine/Source/Core/Iau2000Orientation.js | 2 +- packages/engine/Source/Core/Iau2006XysData.js | 2 +- .../engine/Source/Core/IauOrientationAxes.js | 2 +- packages/engine/Source/Core/IndexDatatype.js | 3 +- .../Source/Core/InterpolationAlgorithm.js | 2 +- .../engine/Source/Core/IntersectionTests.js | 3 +- .../engine/Source/Core/Intersections2D.js | 4 +- packages/engine/Source/Core/Ion.js | 2 +- .../engine/Source/Core/IonGeocoderService.js | 4 +- packages/engine/Source/Core/IonResource.js | 4 +- packages/engine/Source/Core/JulianDate.js | 3 +- packages/engine/Source/Core/KTX2Transcoder.js | 4 +- .../Core/LagrangePolynomialApproximation.js | 2 +- .../engine/Source/Core/LinearApproximation.js | 3 +- packages/engine/Source/Core/LinearSpline.js | 3 +- packages/engine/Source/Core/ManagedArray.js | 2 +- packages/engine/Source/Core/MapProjection.js | 2 +- packages/engine/Source/Core/Math.js | 4 +- packages/engine/Source/Core/Matrix2.js | 4 +- packages/engine/Source/Core/Matrix3.js | 4 +- packages/engine/Source/Core/Matrix4.js | 5 +- .../engine/Source/Core/MorphWeightSpline.js | 4 +- packages/engine/Source/Core/MortonOrder.js | 4 +- packages/engine/Source/Core/NearFarScalar.js | 3 +- packages/engine/Source/Core/Occluder.js | 3 +- .../Core/OffsetGeometryInstanceAttribute.js | 3 +- .../Source/Core/OpenCageGeocoderService.js | 3 +- .../engine/Source/Core/OrientedBoundingBox.js | 4 +- .../engine/Source/Core/OrthographicFrustum.js | 4 +- .../Core/OrthographicOffCenterFrustum.js | 3 +- packages/engine/Source/Core/Packable.js | 2 +- .../Source/Core/PackableForInterpolation.js | 2 +- .../Source/Core/PeliasGeocoderService.js | 3 +- .../engine/Source/Core/PerspectiveFrustum.js | 4 +- .../Core/PerspectiveOffCenterFrustum.js | 3 +- packages/engine/Source/Core/PinBuilder.js | 3 +- packages/engine/Source/Core/Plane.js | 4 +- packages/engine/Source/Core/PlaneGeometry.js | 3 +- .../Source/Core/PlaneOutlineGeometry.js | 3 +- .../engine/Source/Core/PolygonGeometry.js | 6 +- .../Source/Core/PolygonGeometryLibrary.js | 2 +- .../engine/Source/Core/PolygonHierarchy.js | 2 +- .../Source/Core/PolygonOutlineGeometry.js | 6 +- .../engine/Source/Core/PolygonPipeline.js | 3 +- .../engine/Source/Core/PolylineGeometry.js | 5 +- .../engine/Source/Core/PolylinePipeline.js | 3 +- .../Source/Core/PolylineVolumeGeometry.js | 5 +- .../Core/PolylineVolumeGeometryLibrary.js | 2 +- .../Core/PolylineVolumeOutlineGeometry.js | 5 +- packages/engine/Source/Core/Proxy.js | 2 +- .../Source/Core/QuadraticRealPolynomial.js | 2 +- .../Source/Core/QuantizedMeshTerrainData.js | 4 +- .../Source/Core/QuarticRealPolynomial.js | 2 +- packages/engine/Source/Core/Quaternion.js | 4 +- .../engine/Source/Core/QuaternionSpline.js | 3 +- packages/engine/Source/Core/Ray.js | 3 +- packages/engine/Source/Core/Rectangle.js | 5 +- .../Source/Core/RectangleCollisionChecker.js | 2 +- .../engine/Source/Core/RectangleGeometry.js | 6 +- .../Source/Core/RectangleGeometryLibrary.js | 3 +- .../Source/Core/RectangleOutlineGeometry.js | 5 +- packages/engine/Source/Core/Request.js | 2 +- .../engine/Source/Core/RequestErrorEvent.js | 2 +- .../engine/Source/Core/RequestScheduler.js | 4 +- packages/engine/Source/Core/Resource.js | 12 +- packages/engine/Source/Core/RuntimeError.js | 65 --- packages/engine/Source/Core/S2Cell.js | 12 +- .../Source/Core/ScreenSpaceEventHandler.js | 4 +- .../Core/ShowGeometryInstanceAttribute.js | 3 +- .../Core/Simon1994PlanetaryPositions.js | 3 +- .../Source/Core/SimplePolylineGeometry.js | 5 +- packages/engine/Source/Core/SphereGeometry.js | 3 +- .../Source/Core/SphereOutlineGeometry.js | 3 +- packages/engine/Source/Core/Spherical.js | 3 +- packages/engine/Source/Core/Spline.js | 3 +- packages/engine/Source/Core/SteppedSpline.js | 3 +- packages/engine/Source/Core/Stereographic.js | 3 +- packages/engine/Source/Core/TaskProcessor.js | 10 +- packages/engine/Source/Core/TerrainData.js | 2 +- .../engine/Source/Core/TerrainEncoding.js | 4 +- .../engine/Source/Core/TerrainProvider.js | 3 +- packages/engine/Source/Core/TexturePacker.js | 3 +- .../engine/Source/Core/TileAvailability.js | 2 +- .../engine/Source/Core/TileProviderError.js | 2 +- packages/engine/Source/Core/TilingScheme.js | 2 +- packages/engine/Source/Core/TimeInterval.js | 4 +- .../Source/Core/TimeIntervalCollection.js | 5 +- packages/engine/Source/Core/Tipsify.js | 3 +- packages/engine/Source/Core/Transforms.js | 4 +- .../Source/Core/TranslationRotationScale.js | 2 +- .../Source/Core/TridiagonalSystemSolver.js | 3 +- packages/engine/Source/Core/TrustedServers.js | 3 +- .../Source/Core/VRTheWorldTerrainProvider.js | 6 +- packages/engine/Source/Core/VertexFormat.js | 3 +- .../Source/Core/VerticalExaggeration.js | 3 +- .../engine/Source/Core/VideoSynchronizer.js | 4 +- packages/engine/Source/Core/WallGeometry.js | 5 +- .../engine/Source/Core/WallGeometryLibrary.js | 2 +- .../engine/Source/Core/WallOutlineGeometry.js | 5 +- .../Source/Core/WebMercatorProjection.js | 3 +- .../Source/Core/WebMercatorTilingScheme.js | 4 +- .../Source/Core/WireframeIndexGenerator.js | 2 +- .../Source/Core/arrayRemoveDuplicates.js | 3 +- .../Source/Core/barycentricCoordinates.js | 3 +- packages/engine/Source/Core/binarySearch.js | 2 +- packages/engine/Source/Core/buildModuleUrl.js | 3 +- packages/engine/Source/Core/combine.js | 2 +- .../Source/Core/createWorldTerrainAsync.js | 2 +- .../Core/decodeGoogleEarthEnterpriseData.js | 3 +- packages/engine/Source/Core/defer.js | 44 -- packages/engine/Source/Core/defined.d.ts | 11 - .../engine/Source/Core/deprecationWarning.js | 3 +- packages/engine/Source/Core/destroyObject.js | 2 +- packages/engine/Source/Core/formatError.js | 2 +- packages/engine/Source/Core/getAbsoluteUri.js | 3 +- packages/engine/Source/Core/getBaseUri.js | 3 +- .../engine/Source/Core/getExtensionFromUri.js | 3 +- .../engine/Source/Core/getFilenameFromUri.js | 3 +- packages/engine/Source/Core/getImagePixels.js | 2 +- .../Source/Core/getStringFromTypedArray.js | 4 +- packages/engine/Source/Core/isBlobUri.js | 2 +- .../engine/Source/Core/isCrossOriginUrl.js | 2 +- packages/engine/Source/Core/isDataUri.js | 2 +- packages/engine/Source/Core/isLeapYear.js | 2 +- .../Source/Core/loadImageFromTypedArray.js | 3 +- packages/engine/Source/Core/loadKTX2.js | 4 +- packages/engine/Source/Core/mergeSort.js | 3 +- packages/engine/Source/Core/objectToQuery.js | 3 +- packages/engine/Source/Core/oneTimeWarning.js | 3 +- .../engine/Source/Core/pointInsideTriangle.js | 2 +- packages/engine/Source/Core/queryToObject.js | 3 +- packages/engine/Source/Core/sampleTerrain.js | 3 +- .../Source/Core/sampleTerrainMostDetailed.js | 3 +- .../Source/Core/scaleToGeodeticSurface.js | 3 +- packages/engine/Source/Core/srgbToLinear.js | 2 +- packages/engine/Source/Core/subdivideArray.js | 3 +- packages/engine/Source/Core/wrapFunction.js | 2 +- .../engine/Source/Core/writeTextToCanvas.js | 3 +- .../Source/DataSources/BillboardGraphics.js | 5 +- .../Source/DataSources/BillboardVisualizer.js | 5 +- .../Source/DataSources/BoxGeometryUpdater.js | 4 +- .../engine/Source/DataSources/BoxGraphics.js | 5 +- .../DataSources/CallbackPositionProperty.js | 3 +- .../Source/DataSources/CallbackProperty.js | 3 +- .../DataSources/Cesium3DTilesetGraphics.js | 5 +- .../DataSources/Cesium3DTilesetVisualizer.js | 3 +- .../CheckerboardMaterialProperty.js | 4 +- .../DataSources/ColorMaterialProperty.js | 2 +- .../DataSources/CompositeEntityCollection.js | 3 +- .../DataSources/CompositeMaterialProperty.js | 3 +- .../DataSources/CompositePositionProperty.js | 3 +- .../Source/DataSources/CompositeProperty.js | 2 +- .../DataSources/ConstantPositionProperty.js | 3 +- .../Source/DataSources/ConstantProperty.js | 2 +- .../DataSources/CorridorGeometryUpdater.js | 4 +- .../Source/DataSources/CorridorGraphics.js | 5 +- .../Source/DataSources/CustomDataSource.js | 3 +- .../DataSources/CylinderGeometryUpdater.js | 4 +- .../Source/DataSources/CylinderGraphics.js | 5 +- .../Source/DataSources/CzmlDataSource.js | 14 +- .../engine/Source/DataSources/DataSource.js | 2 +- .../Source/DataSources/DataSourceClock.js | 3 +- .../DataSources/DataSourceCollection.js | 3 +- .../Source/DataSources/DataSourceDisplay.js | 5 +- .../DataSources/DynamicGeometryBatch.js | 2 +- .../DataSources/DynamicGeometryUpdater.js | 4 +- .../DataSources/EllipseGeometryUpdater.js | 4 +- .../Source/DataSources/EllipseGraphics.js | 5 +- .../DataSources/EllipsoidGeometryUpdater.js | 3 +- .../Source/DataSources/EllipsoidGraphics.js | 5 +- packages/engine/Source/DataSources/Entity.js | 8 +- .../Source/DataSources/EntityCluster.js | 6 +- .../Source/DataSources/EntityCollection.js | 3 +- .../engine/Source/DataSources/EntityView.js | 3 +- .../Source/DataSources/GeoJsonDataSource.js | 8 +- .../Source/DataSources/GeometryUpdater.js | 4 +- .../Source/DataSources/GeometryVisualizer.js | 3 +- .../Source/DataSources/GpxDataSource.js | 8 +- .../DataSources/GridMaterialProperty.js | 4 +- .../DataSources/GroundGeometryUpdater.js | 4 +- .../DataSources/ImageMaterialProperty.js | 4 +- .../Source/DataSources/KmlDataSource.js | 15 +- packages/engine/Source/DataSources/KmlTour.js | 2 +- .../engine/Source/DataSources/KmlTourFlyTo.js | 2 +- .../engine/Source/DataSources/KmlTourWait.js | 2 +- .../Source/DataSources/LabelGraphics.js | 5 +- .../Source/DataSources/LabelVisualizer.js | 3 +- .../Source/DataSources/MaterialProperty.js | 3 +- .../Source/DataSources/ModelGraphics.js | 5 +- .../Source/DataSources/ModelVisualizer.js | 6 +- .../DataSources/NodeTransformationProperty.js | 4 +- .../engine/Source/DataSources/PathGraphics.js | 5 +- .../Source/DataSources/PathVisualizer.js | 3 +- .../DataSources/PlaneGeometryUpdater.js | 4 +- .../Source/DataSources/PlaneGraphics.js | 5 +- .../Source/DataSources/PointGraphics.js | 5 +- .../Source/DataSources/PointVisualizer.js | 5 +- .../DataSources/PolygonGeometryUpdater.js | 4 +- .../Source/DataSources/PolygonGraphics.js | 5 +- .../PolylineArrowMaterialProperty.js | 2 +- .../PolylineDashMaterialProperty.js | 4 +- .../DataSources/PolylineGeometryUpdater.js | 4 +- .../PolylineGlowMaterialProperty.js | 4 +- .../Source/DataSources/PolylineGraphics.js | 5 +- .../PolylineOutlineMaterialProperty.js | 4 +- .../Source/DataSources/PolylineVisualizer.js | 3 +- .../PolylineVolumeGeometryUpdater.js | 4 +- .../DataSources/PolylineVolumeGraphics.js | 5 +- .../Source/DataSources/PositionProperty.js | 3 +- .../DataSources/PositionPropertyArray.js | 3 +- .../engine/Source/DataSources/Property.js | 3 +- .../Source/DataSources/PropertyArray.js | 2 +- .../engine/Source/DataSources/PropertyBag.js | 3 +- .../DataSources/RectangleGeometryUpdater.js | 4 +- .../Source/DataSources/RectangleGraphics.js | 5 +- .../Source/DataSources/ReferenceProperty.js | 3 +- .../engine/Source/DataSources/Rotation.js | 3 +- .../DataSources/SampledPositionProperty.js | 4 +- .../Source/DataSources/SampledProperty.js | 4 +- .../DataSources/ScaledPositionProperty.js | 3 +- .../DataSources/StaticGeometryColorBatch.js | 2 +- .../StaticGeometryPerMaterialBatch.js | 2 +- .../StaticGroundGeometryColorBatch.js | 4 +- .../StaticGroundGeometryPerMaterialBatch.js | 2 +- .../StaticGroundPolylinePerMaterialBatch.js | 2 +- .../DataSources/StaticOutlineGeometryBatch.js | 2 +- .../DataSources/StripeMaterialProperty.js | 4 +- .../DataSources/TerrainOffsetProperty.js | 3 +- .../TimeIntervalCollectionPositionProperty.js | 3 +- .../TimeIntervalCollectionProperty.js | 2 +- .../VelocityOrientationProperty.js | 2 +- .../DataSources/VelocityVectorProperty.js | 2 +- .../engine/Source/DataSources/Visualizer.js | 2 +- .../Source/DataSources/WallGeometryUpdater.js | 4 +- .../engine/Source/DataSources/WallGraphics.js | 5 +- .../createMaterialPropertyDescriptor.js | 2 +- .../DataSources/createPropertyDescriptor.js | 2 +- .../engine/Source/DataSources/exportKml.js | 8 +- .../engine/Source/DataSources/getElement.js | 2 +- .../heightReferenceOnEntityPropertyChanged.js | 2 +- packages/engine/Source/Renderer/Buffer.js | 6 +- .../engine/Source/Renderer/ComputeEngine.js | 4 +- packages/engine/Source/Renderer/Context.js | 7 +- packages/engine/Source/Renderer/CubeMap.js | 6 +- .../engine/Source/Renderer/CubeMapFace.js | 4 +- .../engine/Source/Renderer/DrawCommand.js | 2 +- .../engine/Source/Renderer/Framebuffer.js | 6 +- .../Source/Renderer/FramebufferManager.js | 7 +- .../Source/Renderer/MultisampleFramebuffer.js | 6 +- .../engine/Source/Renderer/RenderState.js | 3 +- .../engine/Source/Renderer/Renderbuffer.js | 6 +- packages/engine/Source/Renderer/Sampler.js | 4 +- .../engine/Source/Renderer/ShaderBuilder.js | 6 +- .../engine/Source/Renderer/ShaderCache.js | 2 +- .../Source/Renderer/ShaderDestination.js | 2 +- .../engine/Source/Renderer/ShaderFunction.js | 2 +- .../engine/Source/Renderer/ShaderProgram.js | 7 +- .../engine/Source/Renderer/ShaderSource.js | 3 +- packages/engine/Source/Renderer/Texture.js | 6 +- .../engine/Source/Renderer/TextureAtlas.js | 6 +- .../engine/Source/Renderer/TextureCache.js | 2 +- .../engine/Source/Renderer/UniformState.js | 2 +- .../engine/Source/Renderer/VertexArray.js | 7 +- .../Source/Renderer/VertexArrayFacade.js | 4 +- .../engine/Source/Renderer/createUniform.js | 4 +- .../Source/Renderer/createUniformArray.js | 4 +- .../engine/Source/Renderer/loadCubeMap.js | 4 +- packages/engine/Source/Scene/Appearance.js | 2 +- .../Scene/ArcGisMapServerImageryProvider.js | 9 +- .../engine/Source/Scene/ArcGisMapService.js | 2 +- packages/engine/Source/Scene/AttributeType.js | 3 +- packages/engine/Source/Scene/AutoExposure.js | 2 +- packages/engine/Source/Scene/Axis.js | 2 +- packages/engine/Source/Scene/B3dmParser.js | 3 +- packages/engine/Source/Scene/BatchTable.js | 3 +- .../Source/Scene/BatchTableHierarchy.js | 7 +- packages/engine/Source/Scene/BatchTexture.js | 4 +- packages/engine/Source/Scene/Billboard.js | 8 +- .../Source/Scene/BillboardCollection.js | 7 +- .../engine/Source/Scene/BillboardTexture.js | 3 +- .../Source/Scene/BingMapsImageryProvider.js | 6 +- .../Source/Scene/BoundingVolumeSemantics.js | 4 +- packages/engine/Source/Scene/BoxEmitter.js | 2 +- .../engine/Source/Scene/BrdfLutGenerator.js | 2 +- packages/engine/Source/Scene/BufferLoader.js | 3 +- packages/engine/Source/Scene/Camera.js | 5 +- .../Source/Scene/CameraEventAggregator.js | 3 +- .../engine/Source/Scene/CameraFlightPath.js | 5 +- .../Source/Scene/Cesium3DContentGroup.js | 2 +- packages/engine/Source/Scene/Cesium3DTile.js | 11 +- .../Source/Scene/Cesium3DTileBatchTable.js | 7 +- .../Source/Scene/Cesium3DTileContent.js | 2 +- .../Scene/Cesium3DTileContentFactory.js | 2 +- .../Source/Scene/Cesium3DTileFeature.js | 2 +- .../Source/Scene/Cesium3DTileFeatureTable.js | 2 +- .../Source/Scene/Cesium3DTileOptimizations.js | 2 +- .../Source/Scene/Cesium3DTilePassState.js | 2 +- .../Source/Scene/Cesium3DTilePointFeature.js | 2 +- .../engine/Source/Scene/Cesium3DTileStyle.js | 3 +- .../Source/Scene/Cesium3DTileStyleEngine.js | 2 +- .../Scene/Cesium3DTilesVoxelProvider.js | 20 +- .../engine/Source/Scene/Cesium3DTileset.js | 26 +- .../Scene/Cesium3DTilesetBaseTraversal.js | 2 +- .../Source/Scene/Cesium3DTilesetCache.js | 2 +- .../Source/Scene/Cesium3DTilesetHeatmap.js | 2 +- .../Source/Scene/Cesium3DTilesetMetadata.js | 3 +- .../Scene/Cesium3DTilesetSkipTraversal.js | 2 +- .../Source/Scene/Cesium3DTilesetStatistics.js | 2 +- .../Source/Scene/Cesium3DTilesetTraversal.js | 3 +- packages/engine/Source/Scene/CircleEmitter.js | 2 +- .../Source/Scene/ClassificationPrimitive.js | 5 +- packages/engine/Source/Scene/ClippingPlane.js | 3 +- .../Source/Scene/ClippingPlaneCollection.js | 6 +- .../engine/Source/Scene/ClippingPolygon.js | 3 +- .../Source/Scene/ClippingPolygonCollection.js | 13 +- .../engine/Source/Scene/CloudCollection.js | 34 +- .../Source/Scene/Composite3DTileContent.js | 3 +- .../Source/Scene/ConditionsExpression.js | 2 +- packages/engine/Source/Scene/ConeEmitter.js | 2 +- .../engine/Source/Scene/ContentMetadata.js | 2 +- packages/engine/Source/Scene/CreditDisplay.js | 5 +- packages/engine/Source/Scene/CumulusCloud.js | 3 +- .../engine/Source/Scene/DebugAppearance.js | 3 +- .../Source/Scene/DebugCameraPrimitive.js | 5 +- .../engine/Source/Scene/DebugInspector.js | 4 +- .../Source/Scene/DebugModelMatrixPrimitive.js | 4 +- packages/engine/Source/Scene/DepthPlane.js | 5 +- .../engine/Source/Scene/DerivedCommand.js | 2 +- .../DeviceOrientationCameraController.js | 3 +- .../engine/Source/Scene/DirectionalLight.js | 3 +- .../Scene/DiscardEmptyTileImagePolicy.js | 2 +- .../Scene/DiscardMissingTileImagePolicy.js | 3 +- packages/engine/Source/Scene/DracoLoader.js | 4 +- .../Scene/DynamicEnvironmentMapManager.js | 13 +- .../engine/Source/Scene/EllipsoidPrimitive.js | 5 +- .../Scene/EllipsoidSurfaceAppearance.js | 2 +- .../engine/Source/Scene/Empty3DTileContent.js | 2 +- packages/engine/Source/Scene/Expression.js | 7 +- packages/engine/Source/Scene/Fog.js | 3 +- .../engine/Source/Scene/FrameRateMonitor.js | 3 +- .../Source/Scene/Geometry3DTileContent.js | 4 +- .../Source/Scene/GetFeatureInfoFormat.js | 4 +- packages/engine/Source/Scene/Globe.js | 7 +- packages/engine/Source/Scene/GlobeDepth.js | 2 +- .../Source/Scene/GlobeSurfaceShaderSet.js | 2 +- .../engine/Source/Scene/GlobeSurfaceTile.js | 2 +- .../Source/Scene/GlobeSurfaceTileProvider.js | 5 +- .../engine/Source/Scene/GlobeTranslucency.js | 4 +- .../Scene/GlobeTranslucencyFramebuffer.js | 2 +- .../Source/Scene/GlobeTranslucencyState.js | 2 +- .../Source/Scene/GltfBufferViewLoader.js | 5 +- .../engine/Source/Scene/GltfDracoLoader.js | 3 +- .../engine/Source/Scene/GltfImageLoader.js | 4 +- .../Source/Scene/GltfIndexBufferLoader.js | 6 +- .../engine/Source/Scene/GltfJsonLoader.js | 6 +- packages/engine/Source/Scene/GltfLoader.js | 17 +- .../engine/Source/Scene/GltfLoaderUtil.js | 3 +- .../Source/Scene/GltfPipeline/ForEach.js | 2 +- .../Source/Scene/GltfPipeline/addDefaults.js | 6 +- .../GltfPipeline/addExtensionsRequired.js | 2 +- .../Scene/GltfPipeline/addExtensionsUsed.js | 2 +- .../Scene/GltfPipeline/addPipelineExtras.js | 2 +- .../Scene/GltfPipeline/findAccessorMinMax.js | 4 +- .../GltfPipeline/forEachTextureInMaterial.js | 3 +- .../GltfPipeline/getAccessorByteStride.js | 4 +- .../GltfPipeline/moveTechniqueRenderStates.js | 4 +- .../GltfPipeline/moveTechniquesToExtension.js | 4 +- .../Source/Scene/GltfPipeline/parseGlb.js | 7 +- .../Scene/GltfPipeline/readAccessorPacked.js | 4 +- .../Scene/GltfPipeline/removeExtension.js | 2 +- .../GltfPipeline/removeExtensionsRequired.js | 2 +- .../GltfPipeline/removeExtensionsUsed.js | 2 +- .../GltfPipeline/removePipelineExtras.js | 2 +- .../GltfPipeline/removeUnusedElements.js | 2 +- .../updateAccessorComponentTypes.js | 4 +- .../Scene/GltfPipeline/updateVersion.js | 22 +- .../Scene/GltfPipeline/usesExtension.js | 2 +- .../Scene/GltfStructuralMetadataLoader.js | 6 +- .../engine/Source/Scene/GltfTextureLoader.js | 7 +- .../Source/Scene/GltfVertexBufferLoader.js | 4 +- .../GoogleEarthEnterpriseImageryProvider.js | 8 +- .../GoogleEarthEnterpriseMapsProvider.js | 4 +- .../Source/Scene/GridImageryProvider.js | 4 +- .../Source/Scene/GroundPolylinePrimitive.js | 5 +- .../engine/Source/Scene/GroundPrimitive.js | 6 +- packages/engine/Source/Scene/GroupMetadata.js | 3 +- .../engine/Source/Scene/I3SDataProvider.js | 10 +- packages/engine/Source/Scene/I3SDecoder.js | 5 +- packages/engine/Source/Scene/I3SFeature.js | 2 +- packages/engine/Source/Scene/I3SField.js | 3 +- packages/engine/Source/Scene/I3SGeometry.js | 2 +- packages/engine/Source/Scene/I3SLayer.js | 3 +- packages/engine/Source/Scene/I3SNode.js | 5 +- packages/engine/Source/Scene/I3SStatistics.js | 4 +- packages/engine/Source/Scene/I3SSublayer.js | 5 +- packages/engine/Source/Scene/I3SSymbology.js | 2 +- packages/engine/Source/Scene/I3dmParser.js | 3 +- packages/engine/Source/Scene/ITwinData.js | 11 +- .../engine/Source/Scene/ImageBasedLighting.js | 6 +- packages/engine/Source/Scene/Imagery.js | 2 +- packages/engine/Source/Scene/ImageryLayer.js | 14 +- .../Source/Scene/ImageryLayerCollection.js | 3 +- .../Source/Scene/ImageryLayerFeatureInfo.js | 2 +- .../engine/Source/Scene/ImageryProvider.js | 4 +- .../Source/Scene/Implicit3DTileContent.js | 10 +- .../Scene/ImplicitAvailabilityBitstream.js | 5 +- .../Source/Scene/ImplicitMetadataView.js | 2 +- .../Source/Scene/ImplicitSubdivisionScheme.js | 2 +- .../engine/Source/Scene/ImplicitSubtree.js | 5 +- .../Source/Scene/ImplicitSubtreeCache.js | 4 +- .../Source/Scene/ImplicitSubtreeMetadata.js | 3 +- .../Source/Scene/ImplicitTileCoordinates.js | 3 +- .../engine/Source/Scene/ImplicitTileset.js | 4 +- .../Source/Scene/InstanceAttributeSemantic.js | 2 +- .../Source/Scene/InvertClassification.js | 2 +- .../engine/Source/Scene/IonImageryProvider.js | 8 +- packages/engine/Source/Scene/JobScheduler.js | 3 +- .../engine/Source/Scene/JsonMetadataTable.js | 4 +- packages/engine/Source/Scene/Label.js | 6 +- .../engine/Source/Scene/LabelCollection.js | 11 +- packages/engine/Source/Scene/Light.js | 2 +- .../Source/Scene/MapboxImageryProvider.js | 3 +- .../Scene/MapboxStyleImageryProvider.js | 3 +- packages/engine/Source/Scene/Material.js | 13 +- .../engine/Source/Scene/MaterialAppearance.js | 2 +- packages/engine/Source/Scene/Megatexture.js | 10 +- packages/engine/Source/Scene/MetadataClass.js | 3 +- .../Source/Scene/MetadataClassProperty.js | 6 +- .../Source/Scene/MetadataComponentType.js | 6 +- .../engine/Source/Scene/MetadataEntity.js | 4 +- packages/engine/Source/Scene/MetadataEnum.js | 4 +- .../engine/Source/Scene/MetadataEnumValue.js | 2 +- .../engine/Source/Scene/MetadataPicking.js | 3 +- .../engine/Source/Scene/MetadataSchema.js | 3 +- .../Source/Scene/MetadataSchemaLoader.js | 3 +- packages/engine/Source/Scene/MetadataTable.js | 3 +- .../Source/Scene/MetadataTableProperty.js | 12 +- packages/engine/Source/Scene/MetadataType.js | 3 +- .../Source/Scene/Model/AlphaPipelineStage.js | 4 +- .../engine/Source/Scene/Model/B3dmLoader.js | 15 +- .../Scene/Model/CPUStylingPipelineStage.js | 10 +- .../Model/ClassificationModelDrawCommand.js | 2 +- .../Model/ClassificationPipelineStage.js | 3 +- .../engine/Source/Scene/Model/CustomShader.js | 10 +- .../Scene/Model/CustomShaderPipelineStage.js | 8 +- .../Model/DequantizationPipelineStage.js | 4 +- .../Model/Extensions/Gpm/AnchorPointDirect.js | 2 +- .../Extensions/Gpm/AnchorPointIndirect.js | 2 +- .../Model/Extensions/Gpm/CorrelationGroup.js | 2 +- .../Model/Extensions/Gpm/GltfGpmLoader.js | 3 +- .../Model/Extensions/Gpm/GltfGpmLocal.js | 4 +- .../Gpm/GltfMeshPrimitiveGpmLoader.js | 11 +- .../Scene/Model/Extensions/Gpm/PpeMetadata.js | 2 +- .../Scene/Model/Extensions/Gpm/PpeTexture.js | 2 +- .../Scene/Model/Extensions/Gpm/Spdcf.js | 2 +- .../Scene/Model/FeatureIdPipelineStage.js | 6 +- .../Source/Scene/Model/GeoJsonLoader.js | 10 +- .../Scene/Model/GeometryPipelineStage.js | 5 +- .../engine/Source/Scene/Model/I3dmLoader.js | 8 +- .../Model/ImageBasedLightingPipelineStage.js | 6 +- .../Scene/Model/InstancingPipelineStage.js | 2 +- .../Scene/Model/LightingPipelineStage.js | 2 +- .../Scene/Model/MaterialPipelineStage.js | 4 +- .../Scene/Model/MetadataPipelineStage.js | 2 +- packages/engine/Source/Scene/Model/Model.js | 15 +- .../Source/Scene/Model/Model3DTileContent.js | 3 +- .../Source/Scene/Model/ModelAnimation.js | 2 +- .../Scene/Model/ModelAnimationChannel.js | 7 +- .../Scene/Model/ModelAnimationCollection.js | 7 +- .../Source/Scene/Model/ModelArticulation.js | 3 +- .../Scene/Model/ModelArticulationStage.js | 4 +- .../Model/ModelClippingPlanesPipelineStage.js | 6 +- .../ModelClippingPolygonsPipelineStage.js | 4 +- .../Scene/Model/ModelColorPipelineStage.js | 4 +- .../Source/Scene/Model/ModelDrawCommand.js | 5 +- .../Source/Scene/Model/ModelDrawCommands.js | 9 +- .../engine/Source/Scene/Model/ModelFeature.js | 2 +- .../Source/Scene/Model/ModelFeatureTable.js | 9 +- .../Scene/Model/ModelMatrixUpdateStage.js | 2 +- .../engine/Source/Scene/Model/ModelNode.js | 3 +- .../Scene/Model/ModelRenderResources.js | 4 +- .../Source/Scene/Model/ModelRuntimeNode.js | 6 +- .../Scene/Model/ModelRuntimePrimitive.js | 3 +- .../Source/Scene/Model/ModelSceneGraph.js | 15 +- .../Model/ModelSilhouettePipelineStage.js | 2 +- .../engine/Source/Scene/Model/ModelSkin.js | 4 +- .../Scene/Model/ModelSplitterPipelineStage.js | 2 +- .../Source/Scene/Model/ModelStatistics.js | 2 +- .../engine/Source/Scene/Model/ModelType.js | 3 +- .../engine/Source/Scene/Model/ModelUtility.js | 11 +- .../Scene/Model/MorphTargetsPipelineStage.js | 4 +- .../Source/Scene/Model/NodeRenderResources.js | 2 +- .../Model/NodeStatisticsPipelineStage.js | 2 +- .../Scene/Model/PickingPipelineStage.js | 6 +- .../engine/Source/Scene/Model/PntsLoader.js | 12 +- .../Model/PointCloudStylingPipelineStage.js | 13 +- .../Scene/Model/PrimitiveOutlineGenerator.js | 3 +- .../Model/PrimitiveOutlinePipelineStage.js | 6 +- .../Scene/Model/PrimitiveRenderResources.js | 5 +- .../Model/PrimitiveStatisticsPipelineStage.js | 2 +- .../Scene/Model/SceneMode2DPipelineStage.js | 12 +- .../Model/SelectedFeatureIdPipelineStage.js | 2 +- .../Source/Scene/Model/TextureManager.js | 2 +- .../Source/Scene/Model/TextureUniform.js | 5 +- .../Scene/Model/TilesetPipelineStage.js | 2 +- .../Scene/Model/WireframePipelineStage.js | 10 +- .../engine/Source/Scene/Model/pickModel.js | 5 +- .../engine/Source/Scene/ModelComponents.js | 2 +- packages/engine/Source/Scene/Moon.js | 4 +- .../Source/Scene/Multiple3DTileContent.js | 5 +- packages/engine/Source/Scene/OIT.js | 2 +- .../Scene/OpenStreetMapImageryProvider.js | 3 +- .../Scene/OrderedGroundPrimitiveCollection.js | 3 +- packages/engine/Source/Scene/Particle.js | 2 +- .../engine/Source/Scene/ParticleEmitter.js | 2 +- .../engine/Source/Scene/ParticleSystem.js | 5 +- .../engine/Source/Scene/PerformanceDisplay.js | 5 +- packages/engine/Source/Scene/PickDepth.js | 2 +- .../engine/Source/Scene/PickFramebuffer.js | 2 +- packages/engine/Source/Scene/Picking.js | 4 +- packages/engine/Source/Scene/PntsParser.js | 4 +- packages/engine/Source/Scene/PointCloud.js | 6 +- .../Source/Scene/PointCloudEyeDomeLighting.js | 2 +- .../engine/Source/Scene/PointPrimitive.js | 5 +- .../Source/Scene/PointPrimitiveCollection.js | 5 +- packages/engine/Source/Scene/Polyline.js | 5 +- .../engine/Source/Scene/PolylineCollection.js | 12 +- .../Source/Scene/PolylineColorAppearance.js | 2 +- .../Scene/PolylineMaterialAppearance.js | 3 +- .../engine/Source/Scene/PostProcessStage.js | 6 +- .../Scene/PostProcessStageCollection.js | 4 +- .../Source/Scene/PostProcessStageComposite.js | 5 +- .../Source/Scene/PostProcessStageLibrary.js | 6 +- .../Scene/PostProcessStageTextureCache.js | 2 +- packages/engine/Source/Scene/Primitive.js | 12 +- .../Source/Scene/PrimitiveCollection.js | 5 +- .../engine/Source/Scene/PrimitiveLoadPlan.js | 5 +- .../engine/Source/Scene/PrimitivePipeline.js | 3 +- .../engine/Source/Scene/PropertyAttribute.js | 3 +- .../Source/Scene/PropertyAttributeProperty.js | 3 +- packages/engine/Source/Scene/PropertyTable.js | 4 +- .../engine/Source/Scene/PropertyTexture.js | 3 +- .../Source/Scene/PropertyTextureProperty.js | 7 +- .../engine/Source/Scene/QuadtreePrimitive.js | 3 +- packages/engine/Source/Scene/QuadtreeTile.js | 3 +- .../Source/Scene/QuadtreeTileProvider.js | 2 +- packages/engine/Source/Scene/ResourceCache.js | 4 +- .../engine/Source/Scene/ResourceCacheKey.js | 4 +- .../Source/Scene/ResourceCacheStatistics.js | 3 +- .../engine/Source/Scene/ResourceLoader.js | 5 +- packages/engine/Source/Scene/Scene.js | 16 +- .../engine/Source/Scene/SceneTransforms.js | 3 +- .../engine/Source/Scene/SceneTransitioner.js | 3 +- .../Scene/ScreenSpaceCameraController.js | 5 +- .../Scene/SensorVolumePortionToDisplay.js | 2 +- packages/engine/Source/Scene/ShadowMap.js | 6 +- .../engine/Source/Scene/ShadowMapShader.js | 2 +- .../Source/Scene/ShadowVolumeAppearance.js | 3 +- .../Source/Scene/SingleTileImageryProvider.js | 6 +- packages/engine/Source/Scene/SkyAtmosphere.js | 2 +- packages/engine/Source/Scene/SkyBox.js | 6 +- packages/engine/Source/Scene/SpatialNode.js | 5 +- .../Scene/SpecularEnvironmentCubeMap.js | 2 +- packages/engine/Source/Scene/SphereEmitter.js | 2 +- .../engine/Source/Scene/StructuralMetadata.js | 3 +- .../engine/Source/Scene/StyleExpression.js | 2 +- packages/engine/Source/Scene/Sun.js | 2 +- .../engine/Source/Scene/SunPostProcess.js | 2 +- packages/engine/Source/Scene/Terrain.js | 4 +- .../engine/Source/Scene/TerrainFillMesh.js | 3 +- .../engine/Source/Scene/TileBoundingRegion.js | 3 +- .../engine/Source/Scene/TileBoundingS2Cell.js | 15 +- .../engine/Source/Scene/TileBoundingSphere.js | 2 +- .../engine/Source/Scene/TileBoundingVolume.js | 2 +- .../Scene/TileCoordinatesImageryProvider.js | 4 +- .../engine/Source/Scene/TileDiscardPolicy.js | 2 +- packages/engine/Source/Scene/TileImagery.js | 2 +- .../Scene/TileMapServiceImageryProvider.js | 4 +- packages/engine/Source/Scene/TileMetadata.js | 2 +- .../Source/Scene/TileOrientedBoundingBox.js | 4 +- .../Source/Scene/TileReplacementQueue.js | 2 +- .../engine/Source/Scene/TilesetMetadata.js | 3 +- .../engine/Source/Scene/TimeDynamicImagery.js | 4 +- .../Source/Scene/TimeDynamicPointCloud.js | 5 +- .../Scene/TranslucentTileClassification.js | 2 +- .../engine/Source/Scene/TweenCollection.js | 7 +- .../Scene/UrlTemplateImageryProvider.js | 5 +- .../Scene/Vector3DTileClampedPolylines.js | 7 +- .../Source/Scene/Vector3DTileContent.js | 10 +- .../Source/Scene/Vector3DTileGeometry.js | 2 +- .../engine/Source/Scene/Vector3DTilePoints.js | 2 +- .../Source/Scene/Vector3DTilePolygons.js | 2 +- .../Source/Scene/Vector3DTilePolylines.js | 3 +- .../Source/Scene/Vector3DTilePrimitive.js | 4 +- .../Source/Scene/VertexAttributeSemantic.js | 4 +- packages/engine/Source/Scene/View.js | 2 +- packages/engine/Source/Scene/ViewportQuad.js | 3 +- packages/engine/Source/Scene/VoxelBoxShape.js | 2 +- packages/engine/Source/Scene/VoxelCell.js | 5 +- packages/engine/Source/Scene/VoxelContent.js | 4 +- .../engine/Source/Scene/VoxelCylinderShape.js | 1 + .../Source/Scene/VoxelEllipsoidShape.js | 2 +- .../engine/Source/Scene/VoxelPrimitive.js | 25 +- packages/engine/Source/Scene/VoxelProvider.js | 2 +- .../Source/Scene/VoxelRenderResources.js | 24 +- packages/engine/Source/Scene/VoxelShape.js | 2 +- .../engine/Source/Scene/VoxelShapeType.js | 2 +- .../engine/Source/Scene/VoxelTraversal.js | 12 +- .../Scene/WebMapServiceImageryProvider.js | 3 +- .../Scene/WebMapTileServiceImageryProvider.js | 5 +- .../Source/Scene/buildVoxelDrawCommands.js | 10 +- .../Scene/computeFlyToLocationForRectangle.js | 2 +- .../Scene/createElevationBandMaterial.js | 6 +- .../createGooglePhotorealistic3DTileset.js | 9 +- .../Source/Scene/createOsmBuildingsAsync.js | 2 +- .../Scene/createTangentSpaceDebugPrimitive.js | 3 +- .../Source/Scene/findContentMetadata.js | 6 +- .../engine/Source/Scene/findGroupMetadata.js | 2 +- .../engine/Source/Scene/findTileMetadata.js | 4 +- .../Source/Scene/getClipAndStyleCode.js | 2 +- .../Source/Scene/getClippingFunction.js | 2 +- .../Source/Scene/getMetadataClassProperty.js | 2 +- .../Source/Scene/getMetadataProperty.js | 2 +- packages/engine/Source/Scene/hasExtension.js | 2 +- .../engine/Source/Scene/parseBatchTable.js | 15 +- .../Scene/parseFeatureMetadataLegacy.js | 5 +- .../Source/Scene/parseStructuralMetadata.js | 7 +- .../Source/Scene/preprocess3DTileContent.js | 3 +- .../Source/Scene/processVoxelProperties.js | 4 +- packages/engine/Source/Widget/CesiumWidget.js | 8 +- .../Source/Workers/createBoxGeometry.js | 2 +- .../Workers/createBoxOutlineGeometry.js | 2 +- .../Source/Workers/createCircleGeometry.js | 2 +- .../Workers/createCircleOutlineGeometry.js | 2 +- .../Workers/createCoplanarPolygonGeometry.js | 2 +- .../createCoplanarPolygonOutlineGeometry.js | 2 +- .../Source/Workers/createCorridorGeometry.js | 2 +- .../Workers/createCorridorOutlineGeometry.js | 2 +- .../Source/Workers/createCylinderGeometry.js | 2 +- .../Workers/createCylinderOutlineGeometry.js | 2 +- .../Source/Workers/createEllipseGeometry.js | 2 +- .../Workers/createEllipseOutlineGeometry.js | 2 +- .../Source/Workers/createEllipsoidGeometry.js | 2 +- .../Workers/createEllipsoidOutlineGeometry.js | 2 +- .../Source/Workers/createFrustumGeometry.js | 2 +- .../Workers/createFrustumOutlineGeometry.js | 2 +- .../engine/Source/Workers/createGeometry.js | 3 +- .../Workers/createGroundPolylineGeometry.js | 2 +- .../Source/Workers/createPlaneGeometry.js | 2 +- .../Workers/createPlaneOutlineGeometry.js | 2 +- .../Source/Workers/createPolygonGeometry.js | 2 +- .../Workers/createPolygonOutlineGeometry.js | 2 +- .../Source/Workers/createPolylineGeometry.js | 2 +- .../Workers/createPolylineVolumeGeometry.js | 2 +- .../createPolylineVolumeOutlineGeometry.js | 2 +- .../Source/Workers/createRectangleGeometry.js | 2 +- .../Workers/createRectangleOutlineGeometry.js | 2 +- .../Workers/createSimplePolylineGeometry.js | 2 +- .../Source/Workers/createSphereGeometry.js | 2 +- .../Workers/createSphereOutlineGeometry.js | 2 +- .../Workers/createVectorTileGeometries.js | 2 +- .../Workers/createVectorTilePolygons.js | 2 +- ...VerticesFromGoogleEarthEnterpriseBuffer.js | 3 +- .../Workers/createVerticesFromHeightmap.js | 4 +- .../createVerticesFromQuantizedTerrainMesh.js | 2 +- .../Source/Workers/createWallGeometry.js | 2 +- .../Workers/createWallOutlineGeometry.js | 2 +- packages/engine/Source/Workers/decodeDraco.js | 5 +- .../decodeGoogleEarthEnterprisePacket.js | 4 +- packages/engine/Source/Workers/decodeI3S.js | 14 +- .../engine/Source/Workers/transcodeKTX2.js | 10 +- .../Workers/upsampleQuantizedTerrainMesh.js | 2 +- .../Core/ApproximateTerrainHeightsSpec.js | 2 +- ...ArcGISTiledElevationTerrainProviderSpec.js | 4 +- .../Specs/Core/AttributeCompressionSpec.js | 4 +- .../engine/Specs/Core/BoundingSphereSpec.js | 2 +- .../Specs/Core/CesiumTerrainProviderSpec.js | 2 +- packages/engine/Specs/Core/ClockSpec.js | 9 +- .../Specs/Core/CoplanarPolygonGeometrySpec.js | 4 +- .../Core/DistanceDisplayConditionSpec.js | 2 +- .../Core/EarthOrientationParametersSpec.js | 3 +- packages/engine/Specs/Core/EllipsoidSpec.js | 2 +- .../Core/GoogleEarthEnterpriseMetadataSpec.js | 2 +- ...oogleEarthEnterpriseTerrainProviderSpec.js | 2 +- .../Specs/Core/GoogleGeocoderServicesSpec.js | 2 +- .../Specs/Core/HeightmapTerrainDataSpec.js | 2 +- .../engine/Specs/Core/HilbertOrderSpec.js | 3 +- .../engine/Specs/Core/ITwinPlatformSpec.js | 8 +- .../engine/Specs/Core/Iau2006XysDataSpec.js | 2 +- .../Specs/Core/IauOrientationAxesSpec.js | 2 +- .../Specs/Core/IonGeocoderServiceSpec.js | 2 +- packages/engine/Specs/Core/IonResourceSpec.js | 10 +- packages/engine/Specs/Core/Matrix2Spec.js | 2 +- packages/engine/Specs/Core/Matrix3Spec.js | 2 +- packages/engine/Specs/Core/Matrix4Spec.js | 4 +- .../engine/Specs/Core/NearFarScalarSpec.js | 2 +- .../Specs/Core/PlaneOutlineGeometrySpec.js | 2 +- .../Core/PolylineVolumeGeometryLibrarySpec.js | 6 +- .../Core/QuantizedMeshTerrainDataSpec.js | 2 +- packages/engine/Specs/Core/RectangleSpec.js | 2 +- .../engine/Specs/Core/RequestSchedulerSpec.js | 3 +- packages/engine/Specs/Core/ResourceSpec.js | 9 +- packages/engine/Specs/Core/S2CellSpec.js | 8 +- .../Specs/Core/ScreenSpaceEventHandlerSpec.js | 3 +- .../Core/Simon1994PlanetaryPositionsSpec.js | 4 +- packages/engine/Specs/Core/SplineSpec.js | 2 +- .../engine/Specs/Core/SteppedSplineSpec.js | 2 +- .../engine/Specs/Core/TaskProcessorSpec.js | 8 +- .../engine/Specs/Core/TerrainEncodingSpec.js | 2 +- .../engine/Specs/Core/TileAvailabilitySpec.js | 2 +- packages/engine/Specs/Core/TransformsSpec.js | 3 +- .../Core/VRTheWorldTerrainProviderSpec.js | 2 +- .../engine/Specs/Core/VertexFormatSpec.js | 2 +- .../Specs/Core/VerticalExaggerationSpec.js | 2 +- .../Specs/Core/VideoSynchronizerSpec.js | 2 +- .../Core/createWorldBathymetryAsyncSpec.js | 2 +- .../Specs/Core/createWorldTerrainAsyncSpec.js | 2 +- packages/engine/Specs/Core/loadKTX2Spec.js | 4 +- .../engine/Specs/Core/sampleTerrainSpec.js | 2 +- .../DataSources/BillboardGraphicsSpec.js | 8 +- .../DataSources/BillboardVisualizerSpec.js | 16 +- .../DataSources/BoxGeometryUpdaterSpec.js | 10 +- .../Specs/DataSources/BoxGraphicsSpec.js | 4 +- .../CallbackPositionPropertySpec.js | 2 +- .../Specs/DataSources/CallbackPropertySpec.js | 2 +- .../Cesium3DTilesetGraphicsSpec.js | 2 +- .../Cesium3DTilesetVisualizerSpec.js | 14 +- .../CheckerboardMaterialPropertySpec.js | 4 +- .../DataSources/ColorMaterialPropertySpec.js | 4 +- .../CompositeEntityCollectionSpec.js | 8 +- .../CompositeMaterialPropertySpec.js | 6 +- .../CompositePositionPropertySpec.js | 6 +- .../DataSources/CompositePropertySpec.js | 4 +- .../ConstantPositionPropertySpec.js | 4 +- .../Specs/DataSources/ConstantPropertySpec.js | 2 +- .../CorridorGeometryUpdaterSpec.js | 12 +- .../Specs/DataSources/CorridorGraphicsSpec.js | 6 +- .../Specs/DataSources/CustomDataSourceSpec.js | 2 +- .../CylinderGeometryUpdaterSpec.js | 12 +- .../Specs/DataSources/CylinderGraphicsSpec.js | 2 +- .../Specs/DataSources/CzmlDataSourceSpec.js | 42 +- .../Specs/DataSources/DataSourceClockSpec.js | 2 +- .../DataSources/DataSourceCollectionSpec.js | 2 +- .../DataSources/DataSourceDisplaySpec.js | 14 +- .../DataSources/EllipseGeometryUpdaterSpec.js | 6 +- .../Specs/DataSources/EllipseGraphicsSpec.js | 4 +- .../EllipsoidGeometryUpdaterSpec.js | 14 +- .../DataSources/EllipsoidGraphicsSpec.js | 2 +- .../Specs/DataSources/EntityClusterSpec.js | 6 +- .../Specs/DataSources/EntityCollectionSpec.js | 4 +- .../engine/Specs/DataSources/EntitySpec.js | 18 +- .../Specs/DataSources/EntityViewSpec.js | 4 +- .../DataSources/GeoJsonDataSourceSpec.js | 12 +- .../DataSources/GeometryVisualizerSpec.js | 14 +- .../Specs/DataSources/GpxDataSourceSpec.js | 3 +- .../DataSources/GridMaterialPropertySpec.js | 4 +- .../DataSources/ImageMaterialPropertySpec.js | 4 +- .../Specs/DataSources/KmlDataSourceSpec.js | 27 +- .../Specs/DataSources/LabelGraphicsSpec.js | 6 +- .../Specs/DataSources/LabelVisualizerSpec.js | 14 +- .../Specs/DataSources/ModelGraphicsSpec.js | 10 +- .../Specs/DataSources/ModelVisualizerSpec.js | 32 +- .../NodeTransformationPropertySpec.js | 4 +- .../Specs/DataSources/PathGraphicsSpec.js | 2 +- .../Specs/DataSources/PathVisualizerSpec.js | 16 +- .../DataSources/PlaneGeometryUpdaterSpec.js | 6 +- .../Specs/DataSources/PlaneGraphicsSpec.js | 4 +- .../Specs/DataSources/PointGraphicsSpec.js | 4 +- .../Specs/DataSources/PointVisualizerSpec.js | 16 +- .../DataSources/PolygonGeometryUpdaterSpec.js | 16 +- .../Specs/DataSources/PolygonGraphicsSpec.js | 6 +- .../PolylineArrowMaterialPropertySpec.js | 4 +- .../PolylineDashMaterialPropertySpec.js | 4 +- .../PolylineGeometryUpdaterSpec.js | 28 +- .../PolylineGlowMaterialPropertySpec.js | 4 +- .../Specs/DataSources/PolylineGraphicsSpec.js | 4 +- .../PolylineOutlineMaterialPropertySpec.js | 4 +- .../DataSources/PolylineVisualizerSpec.js | 14 +- .../PolylineVolumeGeometryUpdaterSpec.js | 10 +- .../DataSources/PolylineVolumeGraphicsSpec.js | 4 +- .../DataSources/PositionPropertyArraySpec.js | 4 +- .../Specs/DataSources/PropertyArraySpec.js | 2 +- .../Specs/DataSources/PropertyBagSpec.js | 2 +- .../RectangleGeometryUpdaterSpec.js | 8 +- .../DataSources/RectangleGraphicsSpec.js | 6 +- .../DataSources/ReferencePropertySpec.js | 6 +- .../SampledPositionPropertySpec.js | 4 +- .../Specs/DataSources/SampledPropertySpec.js | 4 +- .../StaticGeometryColorBatchSpec.js | 18 +- .../StaticGeometryPerMaterialBatchSpec.js | 22 +- .../StaticGroundGeometryColorBatchSpec.js | 12 +- ...taticGroundGeometryPerMaterialBatchSpec.js | 16 +- ...taticGroundPolylinePerMaterialBatchSpec.js | 18 +- .../StaticOutlineGeometryBatchSpec.js | 10 +- .../DataSources/StripeMaterialPropertySpec.js | 4 +- .../DataSources/TerrainOffsetPropertySpec.js | 4 +- ...eIntervalCollectionPositionPropertySpec.js | 2 +- .../VelocityOrientationPropertySpec.js | 4 +- .../DataSources/VelocityVectorPropertySpec.js | 4 +- .../DataSources/WallGeometryUpdaterSpec.js | 8 +- .../Specs/DataSources/WallGraphicsSpec.js | 4 +- .../createMaterialPropertyDescriptorSpec.js | 2 +- .../engine/Specs/DataSources/exportKmlSpec.js | 20 +- .../Specs/Renderer/AutomaticUniformSpec.js | 2 +- packages/engine/Specs/Renderer/BufferSpec.js | 4 +- .../engine/Specs/Renderer/ClearCommandSpec.js | 2 +- packages/engine/Specs/Renderer/ClearSpec.js | 2 +- .../Specs/Renderer/ComputeCommandSpec.js | 4 +- packages/engine/Specs/Renderer/ContextSpec.js | 4 +- packages/engine/Specs/Renderer/CubeMapSpec.js | 8 +- .../engine/Specs/Renderer/DrawCommandSpec.js | 2 +- packages/engine/Specs/Renderer/DrawSpec.js | 14 +- .../Specs/Renderer/FramebufferManagerSpec.js | 4 +- .../engine/Specs/Renderer/FramebufferSpec.js | 8 +- .../Renderer/MultisampleFramebufferSpec.js | 8 +- .../engine/Specs/Renderer/RenderStateSpec.js | 4 +- .../Specs/Renderer/ShaderBuilderSpec.js | 2 +- .../engine/Specs/Renderer/ShaderCacheSpec.js | 2 +- .../Specs/Renderer/ShaderProgramSpec.js | 8 +- packages/engine/Specs/Renderer/TextureSpec.js | 8 +- .../Specs/Renderer/VertexArrayFacadeSpec.js | 2 +- .../Specs/Renderer/VertexArrayFactorySpec.js | 8 +- .../engine/Specs/Renderer/VertexArraySpec.js | 4 +- .../engine/Specs/Renderer/loadCubeMapSpec.js | 4 +- packages/engine/Specs/Scene/AppearanceSpec.js | 2 +- .../ArcGisMapServerImageryProviderSpec.js | 4 +- packages/engine/Specs/Scene/AxisSpec.js | 2 +- packages/engine/Specs/Scene/B3dmParserSpec.js | 8 +- .../Specs/Scene/BatchTableHierarchySpec.js | 8 +- packages/engine/Specs/Scene/BatchTableSpec.js | 2 +- .../Specs/Scene/BillboardCollectionSpec.js | 12 +- .../Scene/BingMapsImageryProviderSpec.js | 3 +- .../Scene/BoundingVolumeSemanticsSpec.js | 4 +- .../engine/Specs/Scene/BufferLoaderSpec.js | 8 +- .../Specs/Scene/CameraEventAggregatorSpec.js | 6 +- .../Specs/Scene/CameraFlightPathSpec.js | 2 +- packages/engine/Specs/Scene/CameraSpec.js | 10 +- .../Specs/Scene/Cesium3DTileBatchTableSpec.js | 14 +- .../Specs/Scene/Cesium3DTileFeatureSpec.js | 4 +- .../Scene/Cesium3DTileFeatureTableSpec.js | 2 +- .../engine/Specs/Scene/Cesium3DTileSpec.js | 16 +- .../Specs/Scene/Cesium3DTileStyleSpec.js | 4 +- .../Scene/Cesium3DTilesVoxelProviderSpec.js | 4 +- .../Scene/Cesium3DTilesetBaseTraversalSpec.js | 2 +- .../Specs/Scene/Cesium3DTilesetHeatmapSpec.js | 6 +- ...esium3DTilesetMostDetailedTraversalSpec.js | 2 +- .../Scene/Cesium3DTilesetSkipTraversalSpec.js | 2 +- .../engine/Specs/Scene/Cesium3DTilesetSpec.js | 14 +- .../Scene/ClassificationPrimitiveSpec.js | 18 +- .../Scene/ClippingPlaneCollectionSpec.js | 6 +- .../engine/Specs/Scene/ClippingPlaneSpec.js | 2 +- .../Scene/ClippingPolygonCollectionSpec.js | 4 +- .../engine/Specs/Scene/CloudCollectionSpec.js | 2 +- .../Specs/Scene/Composite3DTileContentSpec.js | 10 +- .../engine/Specs/Scene/ContentMetadataSpec.js | 2 +- .../engine/Specs/Scene/CreditDisplaySpec.js | 3 +- .../engine/Specs/Scene/DebugAppearanceSpec.js | 6 +- .../Specs/Scene/DebugCameraPrimitiveSpec.js | 2 +- .../Scene/DebugModelMatrixPrimitiveSpec.js | 2 +- packages/engine/Specs/Scene/DepthPlaneSpec.js | 2 +- .../Scene/DiscardEmptyTileImagePolicySpec.js | 2 +- .../DiscardMissingTileImagePolicySpec.js | 2 +- .../Scene/DynamicEnvironmentMapManagerSpec.js | 2 +- .../Specs/Scene/EllipsoidPrimitiveSpec.js | 4 +- .../Scene/EllipsoidSurfaceAppearanceSpec.js | 8 +- packages/engine/Specs/Scene/ExpressionSpec.js | 2 +- packages/engine/Specs/Scene/FogSpec.js | 2 +- .../Specs/Scene/FrameRateMonitorSpec.js | 3 +- .../engine/Specs/Scene/FrustumCommandsSpec.js | 2 +- .../Specs/Scene/Geometry3DTileContentSpec.js | 8 +- .../Specs/Scene/GeometryRenderingSpec.js | 14 +- packages/engine/Specs/Scene/GlobeSpec.js | 12 +- .../Scene/GlobeSurfaceTileProviderSpec.js | 26 +- .../Specs/Scene/GlobeSurfaceTileSpec.js | 8 +- .../Specs/Scene/GltfBufferViewLoaderSpec.js | 2 +- packages/engine/Specs/Scene/GltfBuilder.js | 2 +- .../engine/Specs/Scene/GltfDracoLoaderSpec.js | 8 +- .../engine/Specs/Scene/GltfImageLoaderSpec.js | 7 +- .../Specs/Scene/GltfIndexBufferLoaderSpec.js | 10 +- .../engine/Specs/Scene/GltfJsonLoaderSpec.js | 4 +- packages/engine/Specs/Scene/GltfLoaderSpec.js | 20 +- .../engine/Specs/Scene/GltfLoaderUtilSpec.js | 4 +- .../Scene/GltfStructuralMetadataLoaderSpec.js | 10 +- .../Specs/Scene/GltfTextureLoaderSpec.js | 10 +- .../Specs/Scene/GltfVertexBufferLoaderSpec.js | 10 +- ...oogleEarthEnterpriseImageryProviderSpec.js | 3 +- .../GoogleEarthEnterpriseMapsProviderSpec.js | 6 +- .../Specs/Scene/GridImageryProviderSpec.js | 2 +- .../Scene/GroundPolylinePrimitiveSpec.js | 8 +- .../engine/Specs/Scene/GroundPrimitiveSpec.js | 18 +- .../engine/Specs/Scene/GroupMetadataSpec.js | 2 +- .../engine/Specs/Scene/I3SDataProviderSpec.js | 2 +- packages/engine/Specs/Scene/I3SDecoderSpec.js | 3 +- packages/engine/Specs/Scene/I3SFieldSpec.js | 2 +- packages/engine/Specs/Scene/I3SLayerSpec.js | 2 +- packages/engine/Specs/Scene/I3SNodeSpec.js | 4 +- packages/engine/Specs/Scene/I3dmParserSpec.js | 7 +- packages/engine/Specs/Scene/ITwinDataSpec.js | 6 +- .../Specs/Scene/ImageryLayerCollectionSpec.js | 10 +- .../engine/Specs/Scene/ImageryLayerSpec.js | 18 +- .../Specs/Scene/Implicit3DTileContentSpec.js | 8 +- .../ImplicitAvailabilityBitstreamSpec.js | 3 +- .../Specs/Scene/ImplicitMetadataViewSpec.js | 4 +- .../Specs/Scene/ImplicitSubtreeCacheSpec.js | 2 +- .../Scene/ImplicitSubtreeMetadataSpec.js | 2 +- .../engine/Specs/Scene/ImplicitSubtreeSpec.js | 6 +- .../engine/Specs/Scene/ImplicitTilesetSpec.js | 2 +- .../Specs/Scene/IonImageryProviderSpec.js | 10 +- .../engine/Specs/Scene/LabelCollectionSpec.js | 8 +- .../Specs/Scene/MapboxImageryProviderSpec.js | 10 +- .../Scene/MapboxStyleImageryProviderSpec.js | 10 +- .../Specs/Scene/MaterialAppearanceSpec.js | 6 +- packages/engine/Specs/Scene/MaterialSpec.js | 9 +- .../engine/Specs/Scene/MegatextureSpec.js | 8 +- .../Specs/Scene/MetadataClassPropertySpec.js | 2 +- .../Specs/Scene/MetadataComponentTypeSpec.js | 7 +- .../Specs/Scene/MetadataSchemaLoaderSpec.js | 4 +- .../Specs/Scene/MetadataTablePropertySpec.js | 4 +- .../engine/Specs/Scene/MetadataTableSpec.js | 2 +- .../engine/Specs/Scene/MetadataTypeSpec.js | 2 +- .../Scene/Model/AlphaPipelineStageSpec.js | 2 +- .../Model/AtmospherePipelineStageSpec.js | 10 +- .../Specs/Scene/Model/B3dmLoaderSpec.js | 8 +- .../Model/BatchTexturePipelineStageSpec.js | 2 +- .../Model/CPUStylingPipelineStageSpec.js | 2 +- .../Model/ClassificationPipelineStageSpec.js | 4 +- .../Model/CustomShaderPipelineStageSpec.js | 4 +- .../Specs/Scene/Model/CustomShaderSpec.js | 6 +- .../Model/DequantizationPipelineStageSpec.js | 6 +- .../Model/Extensions/Gpm/GltfGpmLoaderSpec.js | 4 +- .../Gpm/GltfMeshPrimitiveGpmLoaderSpec.js | 6 +- .../Scene/Model/FeatureIdPipelineStageSpec.js | 8 +- .../Specs/Scene/Model/GeoJsonLoaderSpec.js | 4 +- .../Scene/Model/GeometryPipelineStageSpec.js | 8 +- .../Specs/Scene/Model/I3dmLoaderSpec.js | 8 +- .../ImageBasedLightingPipelineStageSpec.js | 2 +- .../Model/InstancingPipelineStageSpec.js | 10 +- .../Scene/Model/LightingPipelineStageSpec.js | 6 +- .../Scene/Model/MaterialPipelineStageSpec.js | 16 +- .../Scene/Model/MetadataPipelineStageSpec.js | 12 +- .../Scene/Model/Model3DTileContentSpec.js | 8 +- .../Scene/Model/ModelAnimationChannelSpec.js | 6 +- .../Model/ModelAnimationCollectionSpec.js | 6 +- .../Specs/Scene/Model/ModelAnimationSpec.js | 2 +- .../ModelClippingPlanesPipelineStageSpec.js | 2 +- .../ModelClippingPolygonsPipelineStageSpec.js | 4 +- .../Model/ModelColorPipelineStageSpec.js | 2 +- .../Specs/Scene/Model/ModelDrawCommandSpec.js | 4 +- .../Specs/Scene/Model/ModelFeatureSpec.js | 4 +- .../Scene/Model/ModelFeatureTableSpec.js | 6 +- .../Scene/Model/ModelMatrixUpdateStageSpec.js | 6 +- .../Scene/Model/ModelRenderResourcesSpec.js | 2 +- .../Specs/Scene/Model/ModelRuntimeNodeSpec.js | 2 +- .../Scene/Model/ModelRuntimePrimitiveSpec.js | 8 +- .../Specs/Scene/Model/ModelSceneGraphSpec.js | 4 +- .../Model/ModelSilhouettePipelineStageSpec.js | 2 +- .../engine/Specs/Scene/Model/ModelSpec.js | 12 +- .../Model/ModelSplitterPipelineStageSpec.js | 4 +- .../Model/MorphTargetsPipelineStageSpec.js | 6 +- .../Scene/Model/NodeRenderResourcesSpec.js | 4 +- .../Model/NodeStatisticsPipelineStageSpec.js | 4 +- .../Scene/Model/PickingPipelineStageSpec.js | 6 +- .../Specs/Scene/Model/PntsLoaderSpec.js | 12 +- .../PointCloudStylingPipelineStageSpec.js | 10 +- .../Scene/Model/PrimitiveLoadPlanSpec.js | 4 +- .../Model/PrimitiveOutlineGeneratorSpec.js | 7 +- .../PrimitiveOutlinePipelineStageSpec.js | 12 +- .../Model/PrimitiveRenderResourcesSpec.js | 6 +- .../PrimitiveStatisticsPipelineStageSpec.js | 4 +- .../Model/SceneMode2DPipelineStageSpec.js | 6 +- .../SelectedFeatureIdPipelineStageSpec.js | 10 +- .../Scene/Model/SkinningPipelineStageSpec.js | 8 +- .../Specs/Scene/Model/TextureManagerSpec.js | 4 +- .../Scene/Model/TilesetPipelineStageSpec.js | 2 +- .../VerticalExaggerationPipelineStageSpec.js | 4 +- .../Scene/Model/WireframePipelineStageSpec.js | 6 +- .../Scene/Model/loadAndZoomToModelAsync.js | 2 +- .../engine/Specs/Scene/Model/pickModelSpec.js | 4 +- packages/engine/Specs/Scene/MoonSpec.js | 4 +- .../engine/Specs/Scene/MultifrustumSpec.js | 14 +- .../Specs/Scene/Multiple3DTileContentSpec.js | 10 +- .../Scene/OpenStreetMapImageryProviderSpec.js | 10 +- .../engine/Specs/Scene/ParticleSystemSpec.js | 4 +- .../Scene/PerInstanceColorAppearanceSpec.js | 6 +- packages/engine/Specs/Scene/PickingSpec.js | 12 +- packages/engine/Specs/Scene/PntsParserSpec.js | 3 +- .../Specs/Scene/PointCloudShadingSpec.js | 2 +- .../Scene/PointPrimitiveCollectionSpec.js | 4 +- .../Specs/Scene/PolylineCollectionSpec.js | 4 +- .../Scene/PolylineColorAppearanceSpec.js | 4 +- .../Scene/PolylineMaterialAppearanceSpec.js | 4 +- .../Scene/PostProcessStageCompositeSpec.js | 2 +- .../Scene/PostProcessStageLibrarySpec.js | 4 +- .../Specs/Scene/PostProcessStageSpec.js | 4 +- .../Specs/Scene/PrimitiveCollectionSpec.js | 6 +- .../Specs/Scene/PrimitiveCullingSpec.js | 14 +- .../Specs/Scene/PrimitivePipelineSpec.js | 2 +- packages/engine/Specs/Scene/PrimitiveSpec.js | 12 +- .../Scene/PropertyAttributePropertySpec.js | 2 +- .../Specs/Scene/PropertyAttributeSpec.js | 2 +- .../engine/Specs/Scene/PropertyTableSpec.js | 6 +- .../Scene/PropertyTexturePropertySpec.js | 4 +- .../engine/Specs/Scene/PropertyTextureSpec.js | 4 +- .../Specs/Scene/QuadtreePrimitiveSpec.js | 16 +- .../engine/Specs/Scene/QuadtreeTileSpec.js | 4 +- .../engine/Specs/Scene/ResourceCacheSpec.js | 4 +- packages/engine/Specs/Scene/SceneSpec.js | 57 ++- .../engine/Specs/Scene/SceneTransformsSpec.js | 2 +- .../Scene/ScreenSpaceCameraControllerSpec.js | 10 +- packages/engine/Specs/Scene/ShadowMapSpec.js | 24 +- .../Specs/Scene/ShadowVolumeAppearanceSpec.js | 8 +- .../Scene/SingleTileImageryProviderSpec.js | 8 +- packages/engine/Specs/Scene/SkyBoxSpec.js | 3 +- .../Scene/SpecularEnvironmentCubeMapSpec.js | 2 +- .../Specs/Scene/StructuralMetadataSpec.js | 2 +- .../engine/Specs/Scene/TerrainFillMeshSpec.js | 10 +- packages/engine/Specs/Scene/TerrainSpec.js | 2 +- .../TileCoordinatesImageryProviderSpec.js | 2 +- .../TileMapServiceImageryProviderSpec.js | 12 +- .../Specs/Scene/TileReplacementQueueSpec.js | 2 +- .../Specs/Scene/Tileset3DTileContentSpec.js | 8 +- .../Specs/Scene/TimeDynamicImagerySpec.js | 2 +- .../Specs/Scene/TimeDynamicPointCloudSpec.js | 16 +- .../TranslucentTileClassificationSpec.js | 22 +- .../Scene/UrlTemplateImageryProviderSpec.js | 12 +- .../Scene/Vector3DTileClampedPolylinesSpec.js | 4 +- .../Specs/Scene/Vector3DTileContentSpec.js | 4 +- .../Specs/Scene/Vector3DTileGeometrySpec.js | 16 +- .../Specs/Scene/Vector3DTilePointsSpec.js | 12 +- .../Specs/Scene/Vector3DTilePolygonsSpec.js | 12 +- .../Specs/Scene/Vector3DTilePolylinesSpec.js | 4 +- .../engine/Specs/Scene/ViewportQuadSpec.js | 2 +- .../engine/Specs/Scene/VoxelBoxShapeSpec.js | 2 +- packages/engine/Specs/Scene/VoxelCellSpec.js | 2 +- .../Specs/Scene/VoxelCylinderShapeSpec.js | 2 +- .../Specs/Scene/VoxelEllipsoidShapeSpec.js | 4 +- .../engine/Specs/Scene/VoxelPrimitiveSpec.js | 4 +- .../Specs/Scene/VoxelRenderResourcesSpec.js | 2 +- .../engine/Specs/Scene/VoxelTraversalSpec.js | 6 +- .../Specs/Scene/buildVoxelDrawCommandsSpec.js | 4 +- .../computeFlyToLocationForRectangleSpec.js | 2 +- .../createTangentSpaceDebugPrimitiveSpec.js | 2 +- .../Scene/createWorldImageryAsyncSpec.js | 2 +- .../Specs/Scene/findGroupMetadataSpec.js | 2 +- .../engine/Specs/Scene/parseBatchTableSpec.js | 4 +- .../Scene/parseFeatureMetadataLegacySpec.js | 4 +- .../Scene/parseStructuralMetadataSpec.js | 4 +- .../Scene/preprocess3DTileContentSpec.js | 2 +- .../Specs/Scene/processVoxelPropertiesSpec.js | 6 +- .../engine/Specs/Widget/CesiumWidgetSpec.js | 18 +- packages/engine/package.json | 1 + packages/utils/.gitignore | 2 + packages/utils/Source/Check.ts | 274 +++++++++++ packages/utils/Source/DeveloperError.ts | 85 ++++ packages/utils/Source/FeatureDetection.ts | 444 ++++++++++++++++++ .../Source/Fullscreen.ts} | 86 ++-- packages/utils/Source/RuntimeError.ts | 74 +++ packages/utils/Source/defer.ts | 52 ++ .../defined.js => utils/Source/defined.ts} | 8 +- packages/utils/Source/index.ts | 8 + .../CheckSpec.js => utils/Specs/CheckSpec.ts} | 8 +- .../Specs/DeveloperErrorSpec.ts} | 8 +- .../Specs/FeatureDetectionSpec.ts} | 73 +-- .../Specs/FullscreenSpec.ts} | 21 +- .../Specs/RuntimeErrorSpec.ts} | 8 +- .../Specs/definedSpec.ts} | 4 +- packages/utils/jest.config.ts | 15 + packages/utils/jest.d.ts | 15 + packages/utils/package.json | 31 ++ packages/utils/tsconfig.json | 26 + packages/utils/vite.config.ts | 21 + .../widgets/Source/Animation/Animation.js | 9 +- .../Source/Animation/AnimationViewModel.js | 5 +- .../Source/BaseLayerPicker/BaseLayerPicker.js | 9 +- .../BaseLayerPickerViewModel.js | 7 +- .../BaseLayerPicker/ProviderViewModel.js | 4 +- .../createDefaultImageryProviderViewModels.js | 2 +- .../Cesium3DTilesInspector.js | 5 +- .../Cesium3DTilesInspectorViewModel.js | 7 +- .../Source/CesiumInspector/CesiumInspector.js | 10 +- .../CesiumInspectorViewModel.js | 7 +- packages/widgets/Source/ClockViewModel.js | 9 +- packages/widgets/Source/Command.js | 2 +- .../FullscreenButton/FullscreenButton.js | 8 +- .../FullscreenButtonViewModel.js | 11 +- packages/widgets/Source/Geocoder/Geocoder.js | 9 +- .../Source/Geocoder/GeocoderViewModel.js | 5 +- .../widgets/Source/HomeButton/HomeButton.js | 8 +- .../Source/HomeButton/HomeButtonViewModel.js | 4 +- .../I3SBuildingSceneLayerExplorer.js | 2 +- .../I3SBuildingSceneLayerExplorerViewModel.js | 2 +- packages/widgets/Source/InfoBox/InfoBox.js | 5 +- .../Source/InfoBox/InfoBoxViewModel.js | 3 +- packages/widgets/Source/InspectorShared.js | 2 +- .../NavigationHelpButton.js | 10 +- .../NavigationHelpButtonViewModel.js | 2 +- .../PerformanceWatchdog.js | 8 +- .../PerformanceWatchdogViewModel.js | 10 +- .../ProjectionPicker/ProjectionPicker.js | 9 +- .../ProjectionPickerViewModel.js | 5 +- .../Source/SceneModePicker/SceneModePicker.js | 9 +- .../SceneModePickerViewModel.js | 11 +- .../SelectionIndicator/SelectionIndicator.js | 8 +- .../SelectionIndicatorViewModel.js | 9 +- .../widgets/Source/ThirdParty/knockout.js | 2 +- packages/widgets/Source/Timeline/Timeline.js | 3 +- .../widgets/Source/Timeline/TimelineTrack.js | 3 +- .../widgets/Source/ToggleButtonViewModel.js | 3 +- packages/widgets/Source/VRButton/VRButton.js | 8 +- .../Source/VRButton/VRButtonViewModel.js | 6 +- packages/widgets/Source/Viewer/Viewer.js | 9 +- .../viewerCesium3DTilesInspectorMixin.js | 2 +- .../Viewer/viewerCesiumInspectorMixin.js | 2 +- .../Source/Viewer/viewerDragDropMixin.js | 5 +- .../Viewer/viewerPerformanceWatchdogMixin.js | 3 +- .../Viewer/viewerVoxelInspectorMixin.js | 2 +- .../Source/VoxelInspector/VoxelInspector.js | 4 +- .../VoxelInspector/VoxelInspectorViewModel.js | 5 +- packages/widgets/Source/createCommand.js | 3 +- .../widgets/Specs/Animation/AnimationSpec.js | 2 +- .../BaseLayerPicker/BaseLayerPickerSpec.js | 2 +- .../BaseLayerPickerViewModelSpec.js | 2 +- .../BaseLayerPicker/ProviderViewModelSpec.js | 2 +- .../Cesium3DTilesInspectorViewModelSpec.js | 2 +- .../CesiumInspectorViewModelSpec.js | 12 +- .../FullscreenButtonViewModelSpec.js | 2 +- .../Specs/Geocoder/GeocoderViewModelSpec.js | 2 +- .../I3SBSLExplorer/I3SBSLExplorerSpec.js | 2 +- packages/widgets/Specs/InfoBox/InfoBoxSpec.js | 2 +- .../NavigationHelpButtonSpec.js | 2 +- .../PerformanceWatchdogViewModelSpec.js | 3 +- .../ProjectionPicker/ProjectionPickerSpec.js | 2 +- .../SceneModePicker/SceneModePickerSpec.js | 2 +- .../Specs/VRButton/VRButtonViewModelSpec.js | 2 +- packages/widgets/Specs/Viewer/ViewerSpec.js | 20 +- .../Specs/Viewer/viewerDragDropMixinSpec.js | 5 +- packages/widgets/Specs/createCommandSpec.js | 2 +- packages/widgets/package.json | 1 + scripts/build.js | 29 +- scripts/createRoute.js | 2 +- server.js | 6 +- 1255 files changed, 3816 insertions(+), 4450 deletions(-) delete mode 100644 packages/engine/Source/Core/Check.d.ts delete mode 100644 packages/engine/Source/Core/Check.js delete mode 100644 packages/engine/Source/Core/DeveloperError.js delete mode 100644 packages/engine/Source/Core/FeatureDetection.js delete mode 100644 packages/engine/Source/Core/RuntimeError.js delete mode 100644 packages/engine/Source/Core/defer.js delete mode 100644 packages/engine/Source/Core/defined.d.ts create mode 100644 packages/utils/.gitignore create mode 100644 packages/utils/Source/Check.ts create mode 100644 packages/utils/Source/DeveloperError.ts create mode 100644 packages/utils/Source/FeatureDetection.ts rename packages/{engine/Source/Core/Fullscreen.js => utils/Source/Fullscreen.ts} (76%) create mode 100644 packages/utils/Source/RuntimeError.ts create mode 100644 packages/utils/Source/defer.ts rename packages/{engine/Source/Core/defined.js => utils/Source/defined.ts} (65%) create mode 100644 packages/utils/Source/index.ts rename packages/{engine/Specs/Core/CheckSpec.js => utils/Specs/CheckSpec.ts} (97%) rename packages/{engine/Specs/Core/DeveloperErrorSpec.js => utils/Specs/DeveloperErrorSpec.ts} (85%) rename packages/{engine/Specs/Core/FeatureDetectionSpec.js => utils/Specs/FeatureDetectionSpec.ts} (75%) rename packages/{engine/Specs/Core/FullscreenSpec.js => utils/Specs/FullscreenSpec.ts} (75%) rename packages/{engine/Specs/Core/RuntimeErrorSpec.js => utils/Specs/RuntimeErrorSpec.ts} (84%) rename packages/{engine/Specs/Core/definedSpec.js => utils/Specs/definedSpec.ts} (78%) create mode 100644 packages/utils/jest.config.ts create mode 100644 packages/utils/jest.d.ts create mode 100644 packages/utils/package.json create mode 100644 packages/utils/tsconfig.json create mode 100644 packages/utils/vite.config.ts diff --git a/Specs/BadGeometry.js b/Specs/BadGeometry.js index d38dae9168b4..ed97ffef7801 100644 --- a/Specs/BadGeometry.js +++ b/Specs/BadGeometry.js @@ -1,4 +1,5 @@ -import { queryToObject, RuntimeError } from "@cesium/engine"; +import { queryToObject } from "@cesium/engine"; +import { RuntimeError } from "@cesium/utils"; function BadGeometry() { this._workerName = "../../Build/Specs/TestWorkers/createBadGeometry"; diff --git a/Specs/Cesium3DTilesTester.js b/Specs/Cesium3DTilesTester.js index f037f175f897..2141887dadba 100644 --- a/Specs/Cesium3DTilesTester.js +++ b/Specs/Cesium3DTilesTester.js @@ -1,15 +1,15 @@ import { Cartesian3, + Cesium3DTileContentFactory, + Cesium3DTileset, Color, Frozen, - defined, - JulianDate, ImageBasedLighting, + JulianDate, Resource, - Cesium3DTileContentFactory, - Cesium3DTileset, TileBoundingSphere, } from "@cesium/engine"; +import { defined } from "@cesium/utils"; import pollToPromise from "./pollToPromise.js"; diff --git a/Specs/DomEventSimulator.js b/Specs/DomEventSimulator.js index 52a69719fdae..dcf7e5eb3c39 100644 --- a/Specs/DomEventSimulator.js +++ b/Specs/DomEventSimulator.js @@ -1,4 +1,5 @@ -import { Frozen, FeatureDetection } from "@cesium/engine"; +import { Frozen } from "@cesium/engine"; +import { FeatureDetection } from "@cesium/utils"; function createMouseEvent(type, options) { options = options ?? Frozen.EMPTY_OBJECT; diff --git a/Specs/ImplicitTilingTester.js b/Specs/ImplicitTilingTester.js index 70ad97361392..89c97c8169ab 100644 --- a/Specs/ImplicitTilingTester.js +++ b/Specs/ImplicitTilingTester.js @@ -1,4 +1,4 @@ -import { defined } from "@cesium/engine"; +import { defined } from "@cesium/utils"; import concatTypedArrays from "./concatTypedArrays.js"; import MetadataTester from "./MetadataTester.js"; diff --git a/Specs/MetadataTester.js b/Specs/MetadataTester.js index 490f4f4e6aa2..362a71766044 100644 --- a/Specs/MetadataTester.js +++ b/Specs/MetadataTester.js @@ -1,15 +1,13 @@ import { - defined, Frozen, - DeveloperError, - FeatureDetection, - PropertyTable, MetadataClass, MetadataComponentType, MetadataEnum, MetadataTable, MetadataType, + PropertyTable, } from "@cesium/engine"; +import { defined, DeveloperError, FeatureDetection } from "@cesium/utils"; function MetadataTester() {} diff --git a/Specs/MockDataSource.js b/Specs/MockDataSource.js index 80f4a5644ae5..281c28e0a772 100644 --- a/Specs/MockDataSource.js +++ b/Specs/MockDataSource.js @@ -1,4 +1,4 @@ -import { Event, EntityCluster, EntityCollection } from "@cesium/engine"; +import { EntityCluster, EntityCollection, Event } from "@cesium/engine"; function MockDataSource() { //Values to be fiddled with by the test diff --git a/Specs/MockImageryProvider.js b/Specs/MockImageryProvider.js index 8d7b1b035464..bf05d5d7aa96 100644 --- a/Specs/MockImageryProvider.js +++ b/Specs/MockImageryProvider.js @@ -1,11 +1,7 @@ +import { Event, GeographicTilingScheme, Resource } from "@cesium/engine"; +import { RuntimeError } from "@cesium/utils"; import createTileKey from "./createTileKey.js"; import runLater from "./runLater.js"; -import { - Event, - GeographicTilingScheme, - Resource, - RuntimeError, -} from "@cesium/engine"; function MockImageryProvider() { this.tilingScheme = new GeographicTilingScheme(); diff --git a/Specs/MockTerrainProvider.js b/Specs/MockTerrainProvider.js index 7adfe37b1cd9..7378855238f1 100644 --- a/Specs/MockTerrainProvider.js +++ b/Specs/MockTerrainProvider.js @@ -1,13 +1,12 @@ -import createTileKey from "./createTileKey.js"; -import runLater from "./runLater.js"; import { - defined, Event, GeographicTilingScheme, HeightmapTerrainData, - RuntimeError, TerrainProvider, } from "@cesium/engine"; +import { defined, RuntimeError } from "@cesium/utils"; +import createTileKey from "./createTileKey.js"; +import runLater from "./runLater.js"; function MockTerrainProvider() { this.tilingScheme = new GeographicTilingScheme(); diff --git a/Specs/TerrainTileProcessor.js b/Specs/TerrainTileProcessor.js index 35e2aac381aa..d5eec89a8927 100644 --- a/Specs/TerrainTileProcessor.js +++ b/Specs/TerrainTileProcessor.js @@ -1,7 +1,7 @@ import { clone, - ImageryLayer, GlobeSurfaceTile, + ImageryLayer, TerrainState, Texture, } from "@cesium/engine"; diff --git a/Specs/ViewportPrimitive.js b/Specs/ViewportPrimitive.js index 1f3aa2ce326b..0f57822a64f0 100644 --- a/Specs/ViewportPrimitive.js +++ b/Specs/ViewportPrimitive.js @@ -1,4 +1,5 @@ -import { defined, destroyObject, Pass, RenderState } from "@cesium/engine"; +import { destroyObject, Pass, RenderState } from "@cesium/engine"; +import { defined } from "@cesium/utils"; const ViewportPrimitive = function (fragmentShader) { this._fs = fragmentShader; diff --git a/Specs/addDefaultMatchers.js b/Specs/addDefaultMatchers.js index 0f5ffa6b3773..c0e387f4e542 100644 --- a/Specs/addDefaultMatchers.js +++ b/Specs/addDefaultMatchers.js @@ -1,17 +1,15 @@ import { - Cartesian2, - defined, - DeveloperError, - FeatureDetection, - PrimitiveType, Buffer, BufferUsage, + Cartesian2, ClearCommand, DrawCommand, + Math as CesiumMath, + PrimitiveType, ShaderProgram, VertexArray, - Math as CesiumMath, } from "@cesium/engine"; +import { defined, DeveloperError, FeatureDetection } from "@cesium/utils"; import equals from "./equals.js"; function createMissingFunctionMessageFunction( diff --git a/Specs/createCamera.js b/Specs/createCamera.js index 058ece8595ac..bd81c3427ee4 100644 --- a/Specs/createCamera.js +++ b/Specs/createCamera.js @@ -1,11 +1,11 @@ import { + Camera, Cartesian3, Frozen, - defined, GeographicProjection, Matrix4, - Camera, } from "@cesium/engine"; +import { defined } from "@cesium/utils"; function MockScene(canvas) { canvas = canvas ?? { diff --git a/Specs/createDynamicGeometryUpdaterSpecs.js b/Specs/createDynamicGeometryUpdaterSpecs.js index 20d0b1737bab..6aa5c6dc7151 100644 --- a/Specs/createDynamicGeometryUpdaterSpecs.js +++ b/Specs/createDynamicGeometryUpdaterSpecs.js @@ -1,10 +1,10 @@ import { BoundingSphere, - JulianDate, BoundingSphereState, EllipsoidGeometryUpdater, - PrimitiveCollection, + JulianDate, Math as CesiumMath, + PrimitiveCollection, } from "@cesium/engine"; import createDynamicProperty from "./createDynamicProperty.js"; diff --git a/Specs/createFrameState.js b/Specs/createFrameState.js index ab4ff3d111a4..e62578328931 100644 --- a/Specs/createFrameState.js +++ b/Specs/createFrameState.js @@ -1,11 +1,11 @@ import { Atmosphere, - GeographicProjection, - JulianDate, Camera, CreditDisplay, FrameState, + GeographicProjection, JobScheduler, + JulianDate, } from "@cesium/engine"; function createFrameState(context, camera, frameNumber, time) { diff --git a/Specs/createGeometryUpdaterGroundGeometrySpecs.js b/Specs/createGeometryUpdaterGroundGeometrySpecs.js index 60df92fc25da..b38d9a76351d 100644 --- a/Specs/createGeometryUpdaterGroundGeometrySpecs.js +++ b/Specs/createGeometryUpdaterGroundGeometrySpecs.js @@ -1,14 +1,14 @@ import { + ClassificationType, Color, - GeometryOffsetAttribute, - JulianDate, ColorMaterialProperty, ConstantProperty, - SampledProperty, - ClassificationType, + GeometryOffsetAttribute, GroundPrimitive, HeightReference, + JulianDate, PrimitiveCollection, + SampledProperty, } from "@cesium/engine"; function createGeometryUpdaterGroundGeometrySpecs( diff --git a/Specs/createGeometryUpdaterSpecs.js b/Specs/createGeometryUpdaterSpecs.js index 52fe5cb28f2c..3379f43b2360 100644 --- a/Specs/createGeometryUpdaterSpecs.js +++ b/Specs/createGeometryUpdaterSpecs.js @@ -1,19 +1,19 @@ import { Color, ColorGeometryInstanceAttribute, - DistanceDisplayCondition, - DistanceDisplayConditionGeometryInstanceAttribute, - JulianDate, - ShowGeometryInstanceAttribute, - TimeInterval, ColorMaterialProperty, ConstantProperty, + DistanceDisplayCondition, + DistanceDisplayConditionGeometryInstanceAttribute, EllipsoidGeometryUpdater, Entity, GridMaterialProperty, + JulianDate, SampledProperty, - TimeIntervalCollectionProperty, ShadowMode, + ShowGeometryInstanceAttribute, + TimeInterval, + TimeIntervalCollectionProperty, } from "@cesium/engine"; function createGeometryUpdaterSpecs( diff --git a/Specs/createPackableSpecs.js b/Specs/createPackableSpecs.js index 98f83863f162..2213fb1f2ed7 100644 --- a/Specs/createPackableSpecs.js +++ b/Specs/createPackableSpecs.js @@ -1,4 +1,5 @@ -import { defined, Math as CesiumMath } from "@cesium/engine"; +import { Math as CesiumMath } from "@cesium/engine"; +import { defined } from "@cesium/utils"; function createPackableSpecs(packable, instance, packedInstance, namePrefix) { namePrefix = namePrefix ?? ""; diff --git a/Specs/createScene.js b/Specs/createScene.js index f3b1a501a309..8145ee56117b 100644 --- a/Specs/createScene.js +++ b/Specs/createScene.js @@ -1,4 +1,5 @@ -import { Cartesian2, clone, defined, Scene } from "@cesium/engine"; +import { Cartesian2, clone, Scene } from "@cesium/engine"; +import { defined } from "@cesium/utils"; import createCanvas from "./createCanvas.js"; import getWebGLStub from "./getWebGLStub.js"; diff --git a/Specs/createTileKey.js b/Specs/createTileKey.js index 876c5e37cae9..1e9d742306cb 100644 --- a/Specs/createTileKey.js +++ b/Specs/createTileKey.js @@ -1,4 +1,4 @@ -import { defined, DeveloperError } from "@cesium/engine"; +import { defined, DeveloperError } from "@cesium/utils"; function createTileKey(xOrTile, y, level) { if (!defined(xOrTile)) { diff --git a/Specs/equals.js b/Specs/equals.js index 16cbafbdf020..3c4830fd6bf7 100644 --- a/Specs/equals.js +++ b/Specs/equals.js @@ -1,4 +1,4 @@ -import { FeatureDetection } from "@cesium/engine"; +import { FeatureDetection } from "@cesium/utils"; function isTypedArray(o) { return FeatureDetection.typedArrayTypes.some(function (type) { diff --git a/Specs/equalsMethodEqualityTester.js b/Specs/equalsMethodEqualityTester.js index 074841499f57..88be27257fcf 100644 --- a/Specs/equalsMethodEqualityTester.js +++ b/Specs/equalsMethodEqualityTester.js @@ -1,4 +1,4 @@ -import { defined } from "@cesium/engine"; +import { defined } from "@cesium/utils"; function equalsMethodEqualityTester(a, b) { let to_run; diff --git a/Specs/getWebGLStub.js b/Specs/getWebGLStub.js index d66ea6a9384b..8940457dad3a 100644 --- a/Specs/getWebGLStub.js +++ b/Specs/getWebGLStub.js @@ -1,4 +1,5 @@ -import { clone, defined, DeveloperError, WebGLConstants } from "@cesium/engine"; +import { clone, WebGLConstants } from "@cesium/engine"; +import { defined, DeveloperError } from "@cesium/utils"; function getWebGLStub(canvas, options) { const stub = clone(WebGLConstants); diff --git a/Specs/pick.js b/Specs/pick.js index ca5e29874caa..26c68cb0a8e7 100644 --- a/Specs/pick.js +++ b/Specs/pick.js @@ -1,14 +1,14 @@ import { BoundingRectangle, - Color, - defined, ClearCommand, - Pass, + Color, CreditDisplay, FrameState, JobScheduler, + Pass, PickFramebuffer, } from "@cesium/engine"; +import { defined } from "@cesium/utils"; function executeCommands(context, passState, commands) { const length = commands.length; diff --git a/Specs/render.js b/Specs/render.js index 860f4a29057f..fa1c58e1a5a2 100644 --- a/Specs/render.js +++ b/Specs/render.js @@ -1,4 +1,5 @@ -import { defined, Intersect, Pass, SceneMode } from "@cesium/engine"; +import { Intersect, Pass, SceneMode } from "@cesium/engine"; +import { defined } from "@cesium/utils"; function executeCommands(frameState, commands) { let commandsExecuted = 0; diff --git a/Specs/spec-main.js b/Specs/spec-main.js index b08c0ce1dad9..40d5e8eac901 100644 --- a/Specs/spec-main.js +++ b/Specs/spec-main.js @@ -1,5 +1,6 @@ +import { defined } from "@cesium/utils"; +import { queryToObject } from "../packages/engine/index.js"; import customizeJasmine from "./customizeJasmine.js"; -import { defined, queryToObject } from "../packages/engine/index.js"; const queryString = queryToObject(window.location.search.substring(1)); diff --git a/Tools/jsdoc/conf.json b/Tools/jsdoc/conf.json index 840e70cb8714..e90970411f97 100644 --- a/Tools/jsdoc/conf.json +++ b/Tools/jsdoc/conf.json @@ -5,19 +5,25 @@ "source": { "include": [ "packages/engine/Source", - "packages/widgets/Source" + "packages/widgets/Source", + "packages/utils/Source" ], "exclude": [ "packages/engine/Source/ThirdParty", "packages/engine/Source/Workers", "packages/widgets/Source/ThirdParty" ], - "includePattern": ".+\\.js(doc)?$", + "includePattern": ".+\\.(js(doc)?|ts)$", "excludePattern": "(^|\\/|\\\\)_" }, "plugins": [ - "./Tools/jsdoc/cesiumTags" + "./node_modules/jsdoc-babel", + "./Tools/jsdoc/cesiumTags" ], + "babel": { + "extensions": ["ts"], + "presets": ["@babel/preset-typescript"] + }, "templates": { "cleverLinks": true, "default": { @@ -30,4 +36,4 @@ "template": "./Tools/jsdoc/cesium_template", "recurse": true } -} \ No newline at end of file +} diff --git a/gulpfile.js b/gulpfile.js index b1518b0d6258..6639f943249d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -23,6 +23,7 @@ import { createInstrumenter } from "istanbul-lib-instrument"; import { buildCesium, + buildUtils, buildEngine, buildWidgets, bundleWorkers, @@ -135,6 +136,7 @@ export async function build() { return buildWidgets(buildOptions); } + await buildUtils(); await buildEngine(buildOptions); await buildWidgets(buildOptions); await buildCesium(buildOptions); @@ -253,6 +255,9 @@ export async function buildTs() { // Generate types for passed packages in order. const importModules = {}; for (const workspace of workspaces) { + if (workspace.includes("utils")) { + continue; + } const directory = workspace .replace(`@${scope}/`, "") .replace(`packages/`, ""); @@ -427,6 +432,7 @@ function combineForSandcastle() { } export const websiteRelease = gulp.series( + buildUtils, buildEngine, buildWidgets, function websiteReleaseBuild() { @@ -442,6 +448,7 @@ export const websiteRelease = gulp.series( ); export const buildRelease = gulp.series( + buildUtils, buildEngine, buildWidgets, // Generate Build/CesiumUnminified @@ -1196,22 +1203,6 @@ function generateTypeScriptDefinitions( ) // Strip const enums which can cause errors - https://www.typescriptlang.org/docs/handbook/enums.html#const-enum-pitfalls .replace(/^(\s*)(export )?const enum (\S+) {(\s*)$/gm, "$1$2enum $3 {$4") - // Replace JSDoc generation version of defined with an improved version using TS type predicates - .replace( - /\n?export function defined\(value: any\): boolean;/gm, - `\n${readFileSync("./packages/engine/Source/Core/defined.d.ts") - .toString() - .replace(/\n*\/\*.*?\*\/\n*/gms, "") - .replace("export default", "export")}`, - ) - // Replace JSDoc generation version of Check with one that asserts the type of variables after called - .replace( - /\/\*\*[\*\s\w]*?\*\/\nexport const Check: any;/m, - `\n${readFileSync("./packages/engine/Source/Core/Check.d.ts") - .toString() - .replace(/export default.*\n?/, "") - .replace("const Check", "export const Check")}`, - ) // Fix https://github.com/CesiumGS/cesium/issues/10498 so we can use the rest parameter expand tuple .replace( "raiseEvent(...arguments: Parameters[]): void;", @@ -1410,28 +1401,17 @@ function createTypeScriptDefinitions() { ) // Strip const enums which can cause errors - https://www.typescriptlang.org/docs/handbook/enums.html#const-enum-pitfalls .replace(/^(\s*)(export )?const enum (\S+) {(\s*)$/gm, "$1$2enum $3 {$4") - // Replace JSDoc generation version of defined with an improved version using TS type predicates - .replace( - /\n?export function defined\(value: any\): boolean;/gm, - `\n${readFileSync("./packages/engine/Source/Core/defined.d.ts") - .toString() - .replace(/\n*\/\*.*?\*\/\n*/gms, "") - .replace("export default", "export")}`, - ) - // Replace JSDoc generation version of Check with one that asserts the type of variables after called - .replace( - /\/\*\*[\*\s\w]*?\*\/\nexport const Check: any;/m, - `\n${readFileSync("./packages/engine/Source/Core/Check.d.ts") - .toString() - .replace(/export default.*\n?/, "") - .replace("const Check", "export const Check")}`, - ) // Fix https://github.com/CesiumGS/cesium/issues/10498 to have rest parameter expand tuple .replace( "raiseEvent(...arguments: Parameters[]): void;", "raiseEvent(...arguments: Parameters): void;", ); + let utilsTypes = readFileSync("packages/utils/Build/utils.d.ts").toString(); + utilsTypes = utilsTypes.replace(/declare /gm, "").replace("export { }", ""); + source = `${source} +${utilsTypes}`; + // Wrap the source to actually be inside of a declared cesium module // and add any workaround and private utility types. source = `declare module "cesium" { @@ -1725,6 +1705,7 @@ async function buildSandcastle() { } async function buildCesiumViewer() { + await buildUtils(); const cesiumViewerOutputDirectory = isProduction ? "Build/CesiumViewer" : "Build/Apps/CesiumViewer"; diff --git a/package.json b/package.json index 93ec4e85d671..82a083185840 100644 --- a/package.json +++ b/package.json @@ -52,9 +52,12 @@ ], "dependencies": { "@cesium/engine": "^17.0.0", + "@cesium/utils": "^1.0.0", "@cesium/widgets": "^12.0.0" }, "devDependencies": { + "@babel/core": "^7.26.10", + "@babel/preset-typescript": "^7.27.0", "@cesium/eslint-config": "^12.0.0", "@playwright/test": "^1.41.1", "chokidar": "^4.0.1", @@ -78,6 +81,7 @@ "istanbul-lib-instrument": "^6.0.0", "jasmine-core": "^5.0.1", "jsdoc": "^3.6.7", + "jsdoc-babel": "^0.5.0", "karma": "^6.3.20", "karma-chrome-launcher": "^3.1.0", "karma-coverage": "^2.0.3", @@ -101,6 +105,7 @@ "rimraf": "^5.0.0", "tsd-jsdoc": "^2.5.0", "typescript": "^5.3.2", + "vite": "^6.3.2", "yargs": "^17.0.1" }, "scripts": { @@ -157,6 +162,7 @@ }, "workspaces": [ "packages/engine", - "packages/widgets" + "packages/widgets", + "packages/utils" ] } diff --git a/packages/engine/Source/Core/ApproximateTerrainHeights.js b/packages/engine/Source/Core/ApproximateTerrainHeights.js index 55c917b2e1d6..39032310617e 100644 --- a/packages/engine/Source/Core/ApproximateTerrainHeights.js +++ b/packages/engine/Source/Core/ApproximateTerrainHeights.js @@ -1,11 +1,9 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import buildModuleUrl from "./buildModuleUrl.js"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; import GeographicTilingScheme from "./GeographicTilingScheme.js"; import Rectangle from "./Rectangle.js"; diff --git a/packages/engine/Source/Core/ArcGISTiledElevationTerrainProvider.js b/packages/engine/Source/Core/ArcGISTiledElevationTerrainProvider.js index d5ad88eed814..053b028b0f0b 100644 --- a/packages/engine/Source/Core/ArcGISTiledElevationTerrainProvider.js +++ b/packages/engine/Source/Core/ArcGISTiledElevationTerrainProvider.js @@ -1,10 +1,9 @@ +import { Check, defined, RuntimeError } from "@cesium/utils"; import Cartesian2 from "./Cartesian2.js"; -import Check from "./Check.js"; import Credit from "./Credit.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; import Ellipsoid from "./Ellipsoid.js"; import Event from "./Event.js"; +import Frozen from "./Frozen.js"; import GeographicTilingScheme from "./GeographicTilingScheme.js"; import HeightmapEncoding from "./HeightmapEncoding.js"; import HeightmapTerrainData from "./HeightmapTerrainData.js"; @@ -13,7 +12,6 @@ import Request from "./Request.js"; import RequestState from "./RequestState.js"; import RequestType from "./RequestType.js"; import Resource from "./Resource.js"; -import RuntimeError from "./RuntimeError.js"; import TerrainProvider from "./TerrainProvider.js"; import TileAvailability from "./TileAvailability.js"; import TileProviderError from "./TileProviderError.js"; diff --git a/packages/engine/Source/Core/AssociativeArray.js b/packages/engine/Source/Core/AssociativeArray.js index 1012807e8c09..b286481f628f 100644 --- a/packages/engine/Source/Core/AssociativeArray.js +++ b/packages/engine/Source/Core/AssociativeArray.js @@ -1,5 +1,4 @@ -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; /** * A collection of key-value pairs that is stored as a hash for easy diff --git a/packages/engine/Source/Core/AttributeCompression.js b/packages/engine/Source/Core/AttributeCompression.js index aa390cbcdb70..982f82ce06ba 100644 --- a/packages/engine/Source/Core/AttributeCompression.js +++ b/packages/engine/Source/Core/AttributeCompression.js @@ -1,11 +1,9 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; +import AttributeType from "../Scene/AttributeType.js"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import CesiumMath from "./Math.js"; -import AttributeType from "../Scene/AttributeType.js"; const RIGHT_SHIFT = 1.0 / 256.0; const LEFT_SHIFT = 256.0; diff --git a/packages/engine/Source/Core/AxisAlignedBoundingBox.js b/packages/engine/Source/Core/AxisAlignedBoundingBox.js index 92e48b9a9183..43b46f4d815f 100644 --- a/packages/engine/Source/Core/AxisAlignedBoundingBox.js +++ b/packages/engine/Source/Core/AxisAlignedBoundingBox.js @@ -1,6 +1,5 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; import Intersect from "./Intersect.js"; /** diff --git a/packages/engine/Source/Core/BingMapsGeocoderService.js b/packages/engine/Source/Core/BingMapsGeocoderService.js index 6a82e988b338..cdaa21998c20 100644 --- a/packages/engine/Source/Core/BingMapsGeocoderService.js +++ b/packages/engine/Source/Core/BingMapsGeocoderService.js @@ -1,10 +1,8 @@ -import Check from "./Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import Credit from "./Credit.js"; import Frozen from "./Frozen.js"; import Rectangle from "./Rectangle.js"; import Resource from "./Resource.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; const url = "https://dev.virtualearth.net/REST/v1/Locations"; diff --git a/packages/engine/Source/Core/BoundingRectangle.js b/packages/engine/Source/Core/BoundingRectangle.js index 0f4039505c0d..b37e84911cb8 100644 --- a/packages/engine/Source/Core/BoundingRectangle.js +++ b/packages/engine/Source/Core/BoundingRectangle.js @@ -1,7 +1,6 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian2 from "./Cartesian2.js"; import Cartographic from "./Cartographic.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; import Ellipsoid from "./Ellipsoid.js"; import GeographicProjection from "./GeographicProjection.js"; import Intersect from "./Intersect.js"; diff --git a/packages/engine/Source/Core/BoundingSphere.js b/packages/engine/Source/Core/BoundingSphere.js index b1e0a738c18f..176ce4b409f9 100644 --- a/packages/engine/Source/Core/BoundingSphere.js +++ b/packages/engine/Source/Core/BoundingSphere.js @@ -1,7 +1,6 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; import Ellipsoid from "./Ellipsoid.js"; import GeographicProjection from "./GeographicProjection.js"; import Intersect from "./Intersect.js"; diff --git a/packages/engine/Source/Core/BoxGeometry.js b/packages/engine/Source/Core/BoxGeometry.js index d4bd542215ae..e2f6b6d0cc28 100644 --- a/packages/engine/Source/Core/BoxGeometry.js +++ b/packages/engine/Source/Core/BoxGeometry.js @@ -1,10 +1,8 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; import ComponentDatatype from "./ComponentDatatype.js"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/BoxOutlineGeometry.js b/packages/engine/Source/Core/BoxOutlineGeometry.js index 89b991530b19..e82f90b6e298 100644 --- a/packages/engine/Source/Core/BoxOutlineGeometry.js +++ b/packages/engine/Source/Core/BoxOutlineGeometry.js @@ -1,10 +1,8 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; import ComponentDatatype from "./ComponentDatatype.js"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/Cartesian2.js b/packages/engine/Source/Core/Cartesian2.js index bd7d21ad931f..d7900b680506 100644 --- a/packages/engine/Source/Core/Cartesian2.js +++ b/packages/engine/Source/Core/Cartesian2.js @@ -1,6 +1,4 @@ -import Check from "./Check.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import CesiumMath from "./Math.js"; /** diff --git a/packages/engine/Source/Core/Cartesian3.js b/packages/engine/Source/Core/Cartesian3.js index 56e7e99fb50e..02dbb66dd01b 100644 --- a/packages/engine/Source/Core/Cartesian3.js +++ b/packages/engine/Source/Core/Cartesian3.js @@ -1,6 +1,4 @@ -import Check from "./Check.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import CesiumMath from "./Math.js"; /** diff --git a/packages/engine/Source/Core/Cartesian4.js b/packages/engine/Source/Core/Cartesian4.js index 4cb9112d951a..40930a03c9c5 100644 --- a/packages/engine/Source/Core/Cartesian4.js +++ b/packages/engine/Source/Core/Cartesian4.js @@ -1,6 +1,4 @@ -import Check from "./Check.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import CesiumMath from "./Math.js"; /** diff --git a/packages/engine/Source/Core/Cartographic.js b/packages/engine/Source/Core/Cartographic.js index 6e57bf57d7bf..5abc7308e7bf 100644 --- a/packages/engine/Source/Core/Cartographic.js +++ b/packages/engine/Source/Core/Cartographic.js @@ -1,6 +1,5 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; import CesiumMath from "./Math.js"; import scaleToGeodeticSurface from "./scaleToGeodeticSurface.js"; diff --git a/packages/engine/Source/Core/CartographicGeocoderService.js b/packages/engine/Source/Core/CartographicGeocoderService.js index 149edc6270c7..e2cf2f857f10 100644 --- a/packages/engine/Source/Core/CartographicGeocoderService.js +++ b/packages/engine/Source/Core/CartographicGeocoderService.js @@ -1,5 +1,5 @@ +import { Check } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; /** * Geocodes queries containing longitude and latitude coordinates and an optional height. diff --git a/packages/engine/Source/Core/CatmullRomSpline.js b/packages/engine/Source/Core/CatmullRomSpline.js index d9c29f1dae80..80e3ac9eaff5 100644 --- a/packages/engine/Source/Core/CatmullRomSpline.js +++ b/packages/engine/Source/Core/CatmullRomSpline.js @@ -1,8 +1,7 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; import Cartesian4 from "./Cartesian4.js"; -import Check from "./Check.js"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; import HermiteSpline from "./HermiteSpline.js"; import Matrix4 from "./Matrix4.js"; import Spline from "./Spline.js"; diff --git a/packages/engine/Source/Core/CesiumTerrainProvider.js b/packages/engine/Source/Core/CesiumTerrainProvider.js index e6418af825c6..62b2549b5ba2 100644 --- a/packages/engine/Source/Core/CesiumTerrainProvider.js +++ b/packages/engine/Source/Core/CesiumTerrainProvider.js @@ -1,14 +1,12 @@ +import { Check, defined, RuntimeError } from "@cesium/utils"; import AttributeCompression from "./AttributeCompression.js"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; import Credit from "./Credit.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; import Ellipsoid from "./Ellipsoid.js"; import Event from "./Event.js"; +import Frozen from "./Frozen.js"; import GeographicTilingScheme from "./GeographicTilingScheme.js"; -import WebMercatorTilingScheme from "./WebMercatorTilingScheme.js"; import getJsonFromTypedArray from "./getJsonFromTypedArray.js"; import HeightmapTerrainData from "./HeightmapTerrainData.js"; import IndexDatatype from "./IndexDatatype.js"; @@ -18,10 +16,10 @@ import QuantizedMeshTerrainData from "./QuantizedMeshTerrainData.js"; import Request from "./Request.js"; import RequestType from "./RequestType.js"; import Resource from "./Resource.js"; -import RuntimeError from "./RuntimeError.js"; import TerrainProvider from "./TerrainProvider.js"; import TileAvailability from "./TileAvailability.js"; import TileProviderError from "./TileProviderError.js"; +import WebMercatorTilingScheme from "./WebMercatorTilingScheme.js"; function LayerInformation(layer) { this.resource = layer.resource; diff --git a/packages/engine/Source/Core/Check.d.ts b/packages/engine/Source/Core/Check.d.ts deleted file mode 100644 index 9b9d1009a32c..000000000000 --- a/packages/engine/Source/Core/Check.d.ts +++ /dev/null @@ -1,131 +0,0 @@ -/** - * Contains functions for checking that supplied arguments are of a specified type - * or meet specified conditions - */ -const Check: { - /** - * Throws if test is not defined - * - * @param {string} name The name of the variable being tested - * @param {*} test The value that is to be checked - * @exception {DeveloperError} test must be defined - */ - defined(name: string, test: T): asserts test is NonNullable; - /** - * Contains type checking functions, all using the typeof operator - */ - typeOf: { - /** - * Throws if test is not typeof 'string' - * - * @param {string} name The name of the variable being tested - * @param {*} test The value to test - * @exception {DeveloperError} test must be typeof 'string' - */ - string(name: string, test: any): asserts test is string; - /** - * Throws if test is not typeof 'function' - * - * @param {string} name The name of the variable being tested - * @param {*} test The value to test - * @exception {DeveloperError} test must be typeof 'function' - */ - func(name: string, test: any): asserts test is Function; - /** - * Throws if test is not typeof 'object' - * - * @param {string} name The name of the variable being tested - * @param {*} test The value to test - * @exception {DeveloperError} test must be typeof 'object' - */ - object( - name: string, - test: any, - ): asserts test is Record; - /** - * Throws if test is not typeof 'boolean' - * - * @param {string} name The name of the variable being tested - * @param {*} test The value to test - * @exception {DeveloperError} test must be typeof 'boolean' - */ - bool(name: string, test: any): asserts test is boolean; - /** - * Throws if test is not typeof 'bigint' - * - * @param {string} name The name of the variable being tested - * @param {*} test The value to test - * @exception {DeveloperError} test must be typeof 'bigint' - */ - bigint(name: string, test: any): asserts test is bigint; - /** - * Throws if test is not typeof 'number' - * - * @param {string} name The name of the variable being tested - * @param {*} test The value to test - * @exception {DeveloperError} test must be typeof 'number' - */ - number: { - (name: string, test: any): void; - /** - * Throws if test is not typeof 'number' and less than limit - * - * @param {string} name The name of the variable being tested - * @param {*} test The value to test - * @param {number} limit The limit value to compare against - * @exception {DeveloperError} test must be typeof 'number' and less than limit - */ - lessThan(name: string, test: any, limit: number): asserts test is number; - /** - * Throws if test is not typeof 'number' and less than or equal to limit - * - * @param {string} name The name of the variable being tested - * @param {*} test The value to test - * @param {number} limit The limit value to compare against - * @exception {DeveloperError} test must be typeof 'number' and less than or equal to limit - */ - lessThanOrEquals( - name: string, - test: any, - limit: number, - ): asserts test is number; - /** - * Throws if test is not typeof 'number' and greater than limit - * - * @param {string} name The name of the variable being tested - * @param {*} test The value to test - * @param {number} limit The limit value to compare against - * @exception {DeveloperError} test must be typeof 'number' and greater than limit - */ - greaterThan( - name: string, - test: any, - limit: number, - ): asserts test is number; - /** - * Throws if test is not typeof 'number' and greater than or equal to limit - * - * @param {string} name The name of the variable being tested - * @param {*} test The value to test - * @param {number} limit The limit value to compare against - * @exception {DeveloperError} test must be typeof 'number' and greater than or equal to limit - */ - greaterThanOrEquals( - name: string, - test: any, - limit: number, - ): asserts test is number; - /** - * Throws if test1 and test2 is not typeof 'number' and not equal in value - * - * @param {string} name1 The name of the first variable being tested - * @param {string} name2 The name of the second variable being tested against - * @param {*} test1 The value to test - * @param {*} test2 The value to test against - * @exception {DeveloperError} test1 and test2 should be type of 'number' and be equal in value - */ - equals(name1: string, name2: string, test1: any, test2: any): void; - }; - }; -}; -export default Check; diff --git a/packages/engine/Source/Core/Check.js b/packages/engine/Source/Core/Check.js deleted file mode 100644 index 7fced35d2b39..000000000000 --- a/packages/engine/Source/Core/Check.js +++ /dev/null @@ -1,212 +0,0 @@ -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; - -/** - * Contains functions for checking that supplied arguments are of a specified type - * or meet specified conditions - */ -const Check = {}; - -/** - * Contains type checking functions, all using the typeof operator - */ -Check.typeOf = {}; - -function getUndefinedErrorMessage(name) { - return `${name} is required, actual value was undefined`; -} - -function getFailedTypeErrorMessage(actual, expected, name) { - return `Expected ${name} to be typeof ${expected}, actual typeof was ${actual}`; -} - -/** - * Throws if test is not defined - * - * @param {string} name The name of the variable being tested - * @param {*} test The value that is to be checked - * @exception {DeveloperError} test must be defined - */ -Check.defined = function (name, test) { - if (!defined(test)) { - throw new DeveloperError(getUndefinedErrorMessage(name)); - } -}; - -/** - * Throws if test is not typeof 'function' - * - * @param {string} name The name of the variable being tested - * @param {*} test The value to test - * @exception {DeveloperError} test must be typeof 'function' - */ -Check.typeOf.func = function (name, test) { - if (typeof test !== "function") { - throw new DeveloperError( - getFailedTypeErrorMessage(typeof test, "function", name), - ); - } -}; - -/** - * Throws if test is not typeof 'string' - * - * @param {string} name The name of the variable being tested - * @param {*} test The value to test - * @exception {DeveloperError} test must be typeof 'string' - */ -Check.typeOf.string = function (name, test) { - if (typeof test !== "string") { - throw new DeveloperError( - getFailedTypeErrorMessage(typeof test, "string", name), - ); - } -}; - -/** - * Throws if test is not typeof 'number' - * - * @param {string} name The name of the variable being tested - * @param {*} test The value to test - * @exception {DeveloperError} test must be typeof 'number' - */ -Check.typeOf.number = function (name, test) { - if (typeof test !== "number") { - throw new DeveloperError( - getFailedTypeErrorMessage(typeof test, "number", name), - ); - } -}; - -/** - * Throws if test is not typeof 'number' and less than limit - * - * @param {string} name The name of the variable being tested - * @param {*} test The value to test - * @param {number} limit The limit value to compare against - * @exception {DeveloperError} test must be typeof 'number' and less than limit - */ -Check.typeOf.number.lessThan = function (name, test, limit) { - Check.typeOf.number(name, test); - if (test >= limit) { - throw new DeveloperError( - `Expected ${name} to be less than ${limit}, actual value was ${test}`, - ); - } -}; - -/** - * Throws if test is not typeof 'number' and less than or equal to limit - * - * @param {string} name The name of the variable being tested - * @param {*} test The value to test - * @param {number} limit The limit value to compare against - * @exception {DeveloperError} test must be typeof 'number' and less than or equal to limit - */ -Check.typeOf.number.lessThanOrEquals = function (name, test, limit) { - Check.typeOf.number(name, test); - if (test > limit) { - throw new DeveloperError( - `Expected ${name} to be less than or equal to ${limit}, actual value was ${test}`, - ); - } -}; - -/** - * Throws if test is not typeof 'number' and greater than limit - * - * @param {string} name The name of the variable being tested - * @param {*} test The value to test - * @param {number} limit The limit value to compare against - * @exception {DeveloperError} test must be typeof 'number' and greater than limit - */ -Check.typeOf.number.greaterThan = function (name, test, limit) { - Check.typeOf.number(name, test); - if (test <= limit) { - throw new DeveloperError( - `Expected ${name} to be greater than ${limit}, actual value was ${test}`, - ); - } -}; - -/** - * Throws if test is not typeof 'number' and greater than or equal to limit - * - * @param {string} name The name of the variable being tested - * @param {*} test The value to test - * @param {number} limit The limit value to compare against - * @exception {DeveloperError} test must be typeof 'number' and greater than or equal to limit - */ -Check.typeOf.number.greaterThanOrEquals = function (name, test, limit) { - Check.typeOf.number(name, test); - if (test < limit) { - throw new DeveloperError( - `Expected ${name} to be greater than or equal to ${limit}, actual value was ${test}`, - ); - } -}; - -/** - * Throws if test is not typeof 'object' - * - * @param {string} name The name of the variable being tested - * @param {*} test The value to test - * @exception {DeveloperError} test must be typeof 'object' - */ -Check.typeOf.object = function (name, test) { - if (typeof test !== "object") { - throw new DeveloperError( - getFailedTypeErrorMessage(typeof test, "object", name), - ); - } -}; - -/** - * Throws if test is not typeof 'boolean' - * - * @param {string} name The name of the variable being tested - * @param {*} test The value to test - * @exception {DeveloperError} test must be typeof 'boolean' - */ -Check.typeOf.bool = function (name, test) { - if (typeof test !== "boolean") { - throw new DeveloperError( - getFailedTypeErrorMessage(typeof test, "boolean", name), - ); - } -}; - -/** - * Throws if test is not typeof 'bigint' - * - * @param {string} name The name of the variable being tested - * @param {*} test The value to test - * @exception {DeveloperError} test must be typeof 'bigint' - */ -Check.typeOf.bigint = function (name, test) { - if (typeof test !== "bigint") { - throw new DeveloperError( - getFailedTypeErrorMessage(typeof test, "bigint", name), - ); - } -}; - -/** - * Throws if test1 and test2 is not typeof 'number' and not equal in value - * - * @param {string} name1 The name of the first variable being tested - * @param {string} name2 The name of the second variable being tested against - * @param {*} test1 The value to test - * @param {*} test2 The value to test against - * @exception {DeveloperError} test1 and test2 should be type of 'number' and be equal in value - */ -Check.typeOf.number.equals = function (name1, name2, test1, test2) { - Check.typeOf.number(name1, test1); - Check.typeOf.number(name2, test2); - if (test1 !== test2) { - throw new DeveloperError( - `${name1} must be equal to ${name2}, the actual values are ${test1} and ${test2}`, - ); - } -}; -export default Check; diff --git a/packages/engine/Source/Core/CircleGeometry.js b/packages/engine/Source/Core/CircleGeometry.js index c789255088f0..175d778a8fa3 100644 --- a/packages/engine/Source/Core/CircleGeometry.js +++ b/packages/engine/Source/Core/CircleGeometry.js @@ -1,9 +1,8 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; import EllipseGeometry from "./EllipseGeometry.js"; import Ellipsoid from "./Ellipsoid.js"; +import Frozen from "./Frozen.js"; import VertexFormat from "./VertexFormat.js"; /** diff --git a/packages/engine/Source/Core/CircleOutlineGeometry.js b/packages/engine/Source/Core/CircleOutlineGeometry.js index 4571ad005ca3..d66c081bce49 100644 --- a/packages/engine/Source/Core/CircleOutlineGeometry.js +++ b/packages/engine/Source/Core/CircleOutlineGeometry.js @@ -1,9 +1,8 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; import EllipseOutlineGeometry from "./EllipseOutlineGeometry.js"; import Ellipsoid from "./Ellipsoid.js"; +import Frozen from "./Frozen.js"; /** * A description of the outline of a circle on the ellipsoid. diff --git a/packages/engine/Source/Core/Clock.js b/packages/engine/Source/Core/Clock.js index 9e75f5692ee1..12a9a2f7af71 100644 --- a/packages/engine/Source/Core/Clock.js +++ b/packages/engine/Source/Core/Clock.js @@ -1,9 +1,8 @@ +import { defined, DeveloperError } from "@cesium/utils"; import ClockRange from "./ClockRange.js"; import ClockStep from "./ClockStep.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Event from "./Event.js"; +import Frozen from "./Frozen.js"; import getTimestamp from "./getTimestamp.js"; import JulianDate from "./JulianDate.js"; diff --git a/packages/engine/Source/Core/Color.js b/packages/engine/Source/Core/Color.js index c9a433d1eebd..91e408febe4f 100644 --- a/packages/engine/Source/Core/Color.js +++ b/packages/engine/Source/Core/Color.js @@ -1,7 +1,5 @@ -import Check from "./Check.js"; +import { Check, defined, FeatureDetection } from "@cesium/utils"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import FeatureDetection from "./FeatureDetection.js"; import CesiumMath from "./Math.js"; function hue2rgb(m1, m2, h) { diff --git a/packages/engine/Source/Core/ColorGeometryInstanceAttribute.js b/packages/engine/Source/Core/ColorGeometryInstanceAttribute.js index 41983e91f29f..a180affa77b5 100644 --- a/packages/engine/Source/Core/ColorGeometryInstanceAttribute.js +++ b/packages/engine/Source/Core/ColorGeometryInstanceAttribute.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Color from "./Color.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; /** * Value and type information for per-instance geometry color. diff --git a/packages/engine/Source/Core/ComponentDatatype.js b/packages/engine/Source/Core/ComponentDatatype.js index d6b3c1faa0f2..b45047f2979c 100644 --- a/packages/engine/Source/Core/ComponentDatatype.js +++ b/packages/engine/Source/Core/ComponentDatatype.js @@ -1,5 +1,4 @@ -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import WebGLConstants from "./WebGLConstants.js"; /** diff --git a/packages/engine/Source/Core/CompressedTextureBuffer.js b/packages/engine/Source/Core/CompressedTextureBuffer.js index f9f3fe7d76d6..a454f8376595 100644 --- a/packages/engine/Source/Core/CompressedTextureBuffer.js +++ b/packages/engine/Source/Core/CompressedTextureBuffer.js @@ -1,4 +1,4 @@ -import defined from "./defined.js"; +import { defined } from "@cesium/utils"; /** * Describes a compressed texture and contains a compressed texture buffer. diff --git a/packages/engine/Source/Core/ConstantSpline.js b/packages/engine/Source/Core/ConstantSpline.js index 858330ec09ac..3fb7d4f5b3e0 100644 --- a/packages/engine/Source/Core/ConstantSpline.js +++ b/packages/engine/Source/Core/ConstantSpline.js @@ -1,5 +1,4 @@ -import Check from "./Check.js"; -import DeveloperError from "./DeveloperError.js"; +import { Check, DeveloperError } from "@cesium/utils"; import Spline from "./Spline.js"; /** diff --git a/packages/engine/Source/Core/CoplanarPolygonGeometry.js b/packages/engine/Source/Core/CoplanarPolygonGeometry.js index 21432c91fba0..89a29b90e8d7 100644 --- a/packages/engine/Source/Core/CoplanarPolygonGeometry.js +++ b/packages/engine/Source/Core/CoplanarPolygonGeometry.js @@ -1,14 +1,13 @@ +import { Check, defined } from "@cesium/utils"; import arrayRemoveDuplicates from "./arrayRemoveDuplicates.js"; import BoundingRectangle from "./BoundingRectangle.js"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; import ComponentDatatype from "./ComponentDatatype.js"; import CoplanarPolygonGeometryLibrary from "./CoplanarPolygonGeometryLibrary.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; import Ellipsoid from "./Ellipsoid.js"; +import Frozen from "./Frozen.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/CoplanarPolygonGeometryLibrary.js b/packages/engine/Source/Core/CoplanarPolygonGeometryLibrary.js index 7445eb60a38a..465ef5782b45 100644 --- a/packages/engine/Source/Core/CoplanarPolygonGeometryLibrary.js +++ b/packages/engine/Source/Core/CoplanarPolygonGeometryLibrary.js @@ -1,6 +1,6 @@ +import { Check } from "@cesium/utils"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; import Matrix3 from "./Matrix3.js"; import OrientedBoundingBox from "./OrientedBoundingBox.js"; diff --git a/packages/engine/Source/Core/CoplanarPolygonOutlineGeometry.js b/packages/engine/Source/Core/CoplanarPolygonOutlineGeometry.js index 000f4fd6cd67..39a2becb58e2 100644 --- a/packages/engine/Source/Core/CoplanarPolygonOutlineGeometry.js +++ b/packages/engine/Source/Core/CoplanarPolygonOutlineGeometry.js @@ -1,11 +1,10 @@ +import { Check, defined } from "@cesium/utils"; import arrayRemoveDuplicates from "./arrayRemoveDuplicates.js"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; import ComponentDatatype from "./ComponentDatatype.js"; import CoplanarPolygonGeometryLibrary from "./CoplanarPolygonGeometryLibrary.js"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/CorridorGeometry.js b/packages/engine/Source/Core/CorridorGeometry.js index cb65ca87d1a9..8c17528af9b1 100644 --- a/packages/engine/Source/Core/CorridorGeometry.js +++ b/packages/engine/Source/Core/CorridorGeometry.js @@ -1,14 +1,13 @@ +import { Check, defined } from "@cesium/utils"; import arrayRemoveDuplicates from "./arrayRemoveDuplicates.js"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import Check from "./Check.js"; import ComponentDatatype from "./ComponentDatatype.js"; import CornerType from "./CornerType.js"; import CorridorGeometryLibrary from "./CorridorGeometryLibrary.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; import Ellipsoid from "./Ellipsoid.js"; +import Frozen from "./Frozen.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/CorridorGeometryLibrary.js b/packages/engine/Source/Core/CorridorGeometryLibrary.js index 0b72e825e1f8..3f7cd0a44621 100644 --- a/packages/engine/Source/Core/CorridorGeometryLibrary.js +++ b/packages/engine/Source/Core/CorridorGeometryLibrary.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; import CornerType from "./CornerType.js"; -import defined from "./defined.js"; import CesiumMath from "./Math.js"; import Matrix3 from "./Matrix3.js"; import PolylinePipeline from "./PolylinePipeline.js"; diff --git a/packages/engine/Source/Core/CorridorOutlineGeometry.js b/packages/engine/Source/Core/CorridorOutlineGeometry.js index d95d798a5cfb..b23110a5d651 100644 --- a/packages/engine/Source/Core/CorridorOutlineGeometry.js +++ b/packages/engine/Source/Core/CorridorOutlineGeometry.js @@ -1,13 +1,12 @@ +import { Check, defined } from "@cesium/utils"; import arrayRemoveDuplicates from "./arrayRemoveDuplicates.js"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; import ComponentDatatype from "./ComponentDatatype.js"; import CornerType from "./CornerType.js"; import CorridorGeometryLibrary from "./CorridorGeometryLibrary.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; import Ellipsoid from "./Ellipsoid.js"; +import Frozen from "./Frozen.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/Credit.js b/packages/engine/Source/Core/Credit.js index 98525c04c799..fab77ee9658c 100644 --- a/packages/engine/Source/Core/Credit.js +++ b/packages/engine/Source/Core/Credit.js @@ -1,6 +1,5 @@ +import { Check, defined } from "@cesium/utils"; import DOMPurify from "dompurify"; -import Check from "./Check.js"; -import defined from "./defined.js"; let nextCreditId = 0; const creditToId = {}; diff --git a/packages/engine/Source/Core/CubicRealPolynomial.js b/packages/engine/Source/Core/CubicRealPolynomial.js index b199a322dcb4..f5a41c262747 100644 --- a/packages/engine/Source/Core/CubicRealPolynomial.js +++ b/packages/engine/Source/Core/CubicRealPolynomial.js @@ -1,4 +1,4 @@ -import DeveloperError from "./DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; import QuadraticRealPolynomial from "./QuadraticRealPolynomial.js"; /** diff --git a/packages/engine/Source/Core/CullingVolume.js b/packages/engine/Source/Core/CullingVolume.js index 57017a271884..ad107201299d 100644 --- a/packages/engine/Source/Core/CullingVolume.js +++ b/packages/engine/Source/Core/CullingVolume.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; import Cartesian4 from "./Cartesian4.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Intersect from "./Intersect.js"; import Plane from "./Plane.js"; diff --git a/packages/engine/Source/Core/CustomHeightmapTerrainProvider.js b/packages/engine/Source/Core/CustomHeightmapTerrainProvider.js index 30799c4f81c2..2a8c133ecaba 100644 --- a/packages/engine/Source/Core/CustomHeightmapTerrainProvider.js +++ b/packages/engine/Source/Core/CustomHeightmapTerrainProvider.js @@ -1,9 +1,8 @@ -import Check from "./Check.js"; +import { Check, defined } from "@cesium/utils"; import Credit from "./Credit.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; import Ellipsoid from "./Ellipsoid.js"; import Event from "./Event.js"; +import Frozen from "./Frozen.js"; import GeographicTilingScheme from "./GeographicTilingScheme.js"; import HeightmapTerrainData from "./HeightmapTerrainData.js"; import TerrainProvider from "./TerrainProvider.js"; diff --git a/packages/engine/Source/Core/CylinderGeometry.js b/packages/engine/Source/Core/CylinderGeometry.js index 5c958b944446..34fcc3ccca70 100644 --- a/packages/engine/Source/Core/CylinderGeometry.js +++ b/packages/engine/Source/Core/CylinderGeometry.js @@ -1,11 +1,10 @@ +import { defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; import ComponentDatatype from "./ComponentDatatype.js"; import CylinderGeometryLibrary from "./CylinderGeometryLibrary.js"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/CylinderOutlineGeometry.js b/packages/engine/Source/Core/CylinderOutlineGeometry.js index fdbed3cf8bf2..f1697eae2a81 100644 --- a/packages/engine/Source/Core/CylinderOutlineGeometry.js +++ b/packages/engine/Source/Core/CylinderOutlineGeometry.js @@ -1,12 +1,10 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; import ComponentDatatype from "./ComponentDatatype.js"; import CylinderGeometryLibrary from "./CylinderGeometryLibrary.js"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/DeveloperError.js b/packages/engine/Source/Core/DeveloperError.js deleted file mode 100644 index 9094cdc3e5a8..000000000000 --- a/packages/engine/Source/Core/DeveloperError.js +++ /dev/null @@ -1,75 +0,0 @@ -import defined from "./defined.js"; - -/** - * Constructs an exception object that is thrown due to a developer error, e.g., invalid argument, - * argument out of range, etc. This exception should only be thrown during development; - * it usually indicates a bug in the calling code. This exception should never be - * caught; instead the calling code should strive not to generate it. - *

- * On the other hand, a {@link RuntimeError} indicates an exception that may - * be thrown at runtime, e.g., out of memory, that the calling code should be prepared - * to catch. - * - * @alias DeveloperError - * @constructor - * @extends Error - * - * @param {string} [message] The error message for this exception. - * - * @see RuntimeError - */ -function DeveloperError(message) { - /** - * 'DeveloperError' indicating that this exception was thrown due to a developer error. - * @type {string} - * @readonly - */ - this.name = "DeveloperError"; - - /** - * The explanation for why this exception was thrown. - * @type {string} - * @readonly - */ - this.message = message; - - //Browsers such as IE don't have a stack property until you actually throw the error. - let stack; - try { - throw new Error(); - } catch (e) { - stack = e.stack; - } - - /** - * The stack trace of this exception, if available. - * @type {string} - * @readonly - */ - this.stack = stack; -} - -if (defined(Object.create)) { - DeveloperError.prototype = Object.create(Error.prototype); - DeveloperError.prototype.constructor = DeveloperError; -} - -DeveloperError.prototype.toString = function () { - let str = `${this.name}: ${this.message}`; - - if (defined(this.stack)) { - str += `\n${this.stack.toString()}`; - } - - return str; -}; - -/** - * @private - */ -DeveloperError.throwInstantiationError = function () { - throw new DeveloperError( - "This function defines an interface and should not be called directly.", - ); -}; -export default DeveloperError; diff --git a/packages/engine/Source/Core/DistanceDisplayCondition.js b/packages/engine/Source/Core/DistanceDisplayCondition.js index 37ef9e4eb3a8..b863064cdced 100644 --- a/packages/engine/Source/Core/DistanceDisplayCondition.js +++ b/packages/engine/Source/Core/DistanceDisplayCondition.js @@ -1,5 +1,4 @@ -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; /** * Determines visibility based on the distance to the camera. diff --git a/packages/engine/Source/Core/DistanceDisplayConditionGeometryInstanceAttribute.js b/packages/engine/Source/Core/DistanceDisplayConditionGeometryInstanceAttribute.js index ce0495253759..6f4d6e0d2a2f 100644 --- a/packages/engine/Source/Core/DistanceDisplayConditionGeometryInstanceAttribute.js +++ b/packages/engine/Source/Core/DistanceDisplayConditionGeometryInstanceAttribute.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import ComponentDatatype from "./ComponentDatatype.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; /** * Value and type information for per-instance geometry attribute that determines if the geometry instance has a distance display condition. diff --git a/packages/engine/Source/Core/DoubleEndedPriorityQueue.js b/packages/engine/Source/Core/DoubleEndedPriorityQueue.js index d87eb287c582..6a0abb29e4fa 100644 --- a/packages/engine/Source/Core/DoubleEndedPriorityQueue.js +++ b/packages/engine/Source/Core/DoubleEndedPriorityQueue.js @@ -1,6 +1,5 @@ +import { Check, defined } from "@cesium/utils"; import CesiumMath from "./Math.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; /** * Array-backed min-max heap implementation of a double-ended priority queue. diff --git a/packages/engine/Source/Core/DoublyLinkedList.js b/packages/engine/Source/Core/DoublyLinkedList.js index a8f17a7b0e93..3c33bf6e60c4 100644 --- a/packages/engine/Source/Core/DoublyLinkedList.js +++ b/packages/engine/Source/Core/DoublyLinkedList.js @@ -1,4 +1,4 @@ -import defined from "./defined.js"; +import { defined } from "@cesium/utils"; /** * @private diff --git a/packages/engine/Source/Core/EarthOrientationParameters.js b/packages/engine/Source/Core/EarthOrientationParameters.js index b8540662aabb..55d82d5615de 100644 --- a/packages/engine/Source/Core/EarthOrientationParameters.js +++ b/packages/engine/Source/Core/EarthOrientationParameters.js @@ -1,12 +1,10 @@ +import { Check, defined, RuntimeError } from "@cesium/utils"; import binarySearch from "./binarySearch.js"; -import Check from "./Check.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; import EarthOrientationParametersSample from "./EarthOrientationParametersSample.js"; +import Frozen from "./Frozen.js"; import JulianDate from "./JulianDate.js"; import LeapSecond from "./LeapSecond.js"; import Resource from "./Resource.js"; -import RuntimeError from "./RuntimeError.js"; import TimeConstants from "./TimeConstants.js"; import TimeStandard from "./TimeStandard.js"; diff --git a/packages/engine/Source/Core/EllipseGeometry.js b/packages/engine/Source/Core/EllipseGeometry.js index c141862112f3..753145d0c145 100644 --- a/packages/engine/Source/Core/EllipseGeometry.js +++ b/packages/engine/Source/Core/EllipseGeometry.js @@ -1,14 +1,12 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import Check from "./Check.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import EllipseGeometryLibrary from "./EllipseGeometryLibrary.js"; import Ellipsoid from "./Ellipsoid.js"; +import Frozen from "./Frozen.js"; import GeographicProjection from "./GeographicProjection.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; diff --git a/packages/engine/Source/Core/EllipseOutlineGeometry.js b/packages/engine/Source/Core/EllipseOutlineGeometry.js index 79a16afc4fec..5cd08f9ddbe8 100644 --- a/packages/engine/Source/Core/EllipseOutlineGeometry.js +++ b/packages/engine/Source/Core/EllipseOutlineGeometry.js @@ -1,11 +1,10 @@ +import { defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import EllipseGeometryLibrary from "./EllipseGeometryLibrary.js"; import Ellipsoid from "./Ellipsoid.js"; +import Frozen from "./Frozen.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/Ellipsoid.js b/packages/engine/Source/Core/Ellipsoid.js index c96cd65c3f73..4434f058b3b0 100644 --- a/packages/engine/Source/Core/Ellipsoid.js +++ b/packages/engine/Source/Core/Ellipsoid.js @@ -1,9 +1,7 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import CesiumMath from "./Math.js"; import scaleToGeodeticSurface from "./scaleToGeodeticSurface.js"; diff --git a/packages/engine/Source/Core/EllipsoidGeodesic.js b/packages/engine/Source/Core/EllipsoidGeodesic.js index 37a0335ad7d6..0c08513d9f7c 100644 --- a/packages/engine/Source/Core/EllipsoidGeodesic.js +++ b/packages/engine/Source/Core/EllipsoidGeodesic.js @@ -1,7 +1,6 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; import Ellipsoid from "./Ellipsoid.js"; import CesiumMath from "./Math.js"; diff --git a/packages/engine/Source/Core/EllipsoidGeometry.js b/packages/engine/Source/Core/EllipsoidGeometry.js index d6c967e91e8e..a5eec736970c 100644 --- a/packages/engine/Source/Core/EllipsoidGeometry.js +++ b/packages/engine/Source/Core/EllipsoidGeometry.js @@ -1,11 +1,10 @@ +import { defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; +import Frozen from "./Frozen.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/EllipsoidOutlineGeometry.js b/packages/engine/Source/Core/EllipsoidOutlineGeometry.js index 5fc1b7e47ff9..21d53457d3a0 100644 --- a/packages/engine/Source/Core/EllipsoidOutlineGeometry.js +++ b/packages/engine/Source/Core/EllipsoidOutlineGeometry.js @@ -1,10 +1,9 @@ +import { defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; +import Frozen from "./Frozen.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/EllipsoidRhumbLine.js b/packages/engine/Source/Core/EllipsoidRhumbLine.js index 44111220e891..f0f608fb72d9 100644 --- a/packages/engine/Source/Core/EllipsoidRhumbLine.js +++ b/packages/engine/Source/Core/EllipsoidRhumbLine.js @@ -1,8 +1,6 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; import CesiumMath from "./Math.js"; diff --git a/packages/engine/Source/Core/EllipsoidTangentPlane.js b/packages/engine/Source/Core/EllipsoidTangentPlane.js index 8133963d8383..707d26ade2d7 100644 --- a/packages/engine/Source/Core/EllipsoidTangentPlane.js +++ b/packages/engine/Source/Core/EllipsoidTangentPlane.js @@ -1,10 +1,8 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import AxisAlignedBoundingBox from "./AxisAlignedBoundingBox.js"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; import Cartesian4 from "./Cartesian4.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; import IntersectionTests from "./IntersectionTests.js"; import Matrix4 from "./Matrix4.js"; diff --git a/packages/engine/Source/Core/EllipsoidTerrainProvider.js b/packages/engine/Source/Core/EllipsoidTerrainProvider.js index 79dd1db6e602..229493ba9a7b 100644 --- a/packages/engine/Source/Core/EllipsoidTerrainProvider.js +++ b/packages/engine/Source/Core/EllipsoidTerrainProvider.js @@ -1,7 +1,7 @@ -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; +import { defined } from "@cesium/utils"; import Ellipsoid from "./Ellipsoid.js"; import Event from "./Event.js"; +import Frozen from "./Frozen.js"; import GeographicTilingScheme from "./GeographicTilingScheme.js"; import HeightmapTerrainData from "./HeightmapTerrainData.js"; import TerrainProvider from "./TerrainProvider.js"; diff --git a/packages/engine/Source/Core/EllipsoidalOccluder.js b/packages/engine/Source/Core/EllipsoidalOccluder.js index e60f9ccbf70a..50859b6d1c6e 100644 --- a/packages/engine/Source/Core/EllipsoidalOccluder.js +++ b/packages/engine/Source/Core/EllipsoidalOccluder.js @@ -1,7 +1,6 @@ +import { Check, defined } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; import Ellipsoid from "./Ellipsoid.js"; import Rectangle from "./Rectangle.js"; diff --git a/packages/engine/Source/Core/EncodedCartesian3.js b/packages/engine/Source/Core/EncodedCartesian3.js index b6df42a5ffd4..e361c1a70455 100644 --- a/packages/engine/Source/Core/EncodedCartesian3.js +++ b/packages/engine/Source/Core/EncodedCartesian3.js @@ -1,6 +1,5 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; /** * A fixed-point encoding of a {@link Cartesian3} with 64-bit floating-point components, as two {@link Cartesian3} diff --git a/packages/engine/Source/Core/Event.js b/packages/engine/Source/Core/Event.js index cf53ef966052..4e8c26b4df8c 100644 --- a/packages/engine/Source/Core/Event.js +++ b/packages/engine/Source/Core/Event.js @@ -1,5 +1,4 @@ -import Check from "./Check.js"; -import defined from "./defined.js"; +import { Check, defined } from "@cesium/utils"; /** * A generic utility class for managing subscribers for a particular event. diff --git a/packages/engine/Source/Core/EventHelper.js b/packages/engine/Source/Core/EventHelper.js index e9a024c64597..c1dc6afbff8c 100644 --- a/packages/engine/Source/Core/EventHelper.js +++ b/packages/engine/Source/Core/EventHelper.js @@ -1,5 +1,4 @@ -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; /** * A convenience object that simplifies the common pattern of attaching event listeners diff --git a/packages/engine/Source/Core/FeatureDetection.js b/packages/engine/Source/Core/FeatureDetection.js deleted file mode 100644 index 31fb350852cd..000000000000 --- a/packages/engine/Source/Core/FeatureDetection.js +++ /dev/null @@ -1,437 +0,0 @@ -import Check from "./Check.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; -import Fullscreen from "./Fullscreen.js"; - -let theNavigator; -if (typeof navigator !== "undefined") { - theNavigator = navigator; -} else { - theNavigator = {}; -} - -function extractVersion(versionString) { - const parts = versionString.split("."); - for (let i = 0, len = parts.length; i < len; ++i) { - parts[i] = parseInt(parts[i], 10); - } - return parts; -} - -let isChromeResult; -let chromeVersionResult; -function isChrome() { - if (!defined(isChromeResult)) { - isChromeResult = false; - // Edge contains Chrome in the user agent too - if (!isEdge()) { - const fields = / Chrome\/([\.0-9]+)/.exec(theNavigator.userAgent); - if (fields !== null) { - isChromeResult = true; - chromeVersionResult = extractVersion(fields[1]); - } - } - } - - return isChromeResult; -} - -function chromeVersion() { - return isChrome() && chromeVersionResult; -} - -let isSafariResult; -let safariVersionResult; -function isSafari() { - if (!defined(isSafariResult)) { - isSafariResult = false; - - // Chrome and Edge contain Safari in the user agent too - if ( - !isChrome() && - !isEdge() && - / Safari\/[\.0-9]+/.test(theNavigator.userAgent) - ) { - const fields = / Version\/([\.0-9]+)/.exec(theNavigator.userAgent); - if (fields !== null) { - isSafariResult = true; - safariVersionResult = extractVersion(fields[1]); - } - } - } - - return isSafariResult; -} - -function safariVersion() { - return isSafari() && safariVersionResult; -} - -let isWebkitResult; -let webkitVersionResult; -function isWebkit() { - if (!defined(isWebkitResult)) { - isWebkitResult = false; - - const fields = / AppleWebKit\/([\.0-9]+)(\+?)/.exec(theNavigator.userAgent); - if (fields !== null) { - isWebkitResult = true; - webkitVersionResult = extractVersion(fields[1]); - webkitVersionResult.isNightly = !!fields[2]; - } - } - - return isWebkitResult; -} - -function webkitVersion() { - return isWebkit() && webkitVersionResult; -} - -let isInternetExplorerResult; -let internetExplorerVersionResult; -function isInternetExplorer() { - if (!defined(isInternetExplorerResult)) { - isInternetExplorerResult = false; - - let fields; - if (theNavigator.appName === "Microsoft Internet Explorer") { - fields = /MSIE ([0-9]{1,}[\.0-9]{0,})/.exec(theNavigator.userAgent); - if (fields !== null) { - isInternetExplorerResult = true; - internetExplorerVersionResult = extractVersion(fields[1]); - } - } else if (theNavigator.appName === "Netscape") { - fields = /Trident\/.*rv:([0-9]{1,}[\.0-9]{0,})/.exec( - theNavigator.userAgent, - ); - if (fields !== null) { - isInternetExplorerResult = true; - internetExplorerVersionResult = extractVersion(fields[1]); - } - } - } - return isInternetExplorerResult; -} - -function internetExplorerVersion() { - return isInternetExplorer() && internetExplorerVersionResult; -} - -let isEdgeResult; -let edgeVersionResult; -function isEdge() { - if (!defined(isEdgeResult)) { - isEdgeResult = false; - const fields = / Edg\/([\.0-9]+)/.exec(theNavigator.userAgent); - if (fields !== null) { - isEdgeResult = true; - edgeVersionResult = extractVersion(fields[1]); - } - } - return isEdgeResult; -} - -function edgeVersion() { - return isEdge() && edgeVersionResult; -} - -let isFirefoxResult; -let firefoxVersionResult; -function isFirefox() { - if (!defined(isFirefoxResult)) { - isFirefoxResult = false; - - const fields = /Firefox\/([\.0-9]+)/.exec(theNavigator.userAgent); - if (fields !== null) { - isFirefoxResult = true; - firefoxVersionResult = extractVersion(fields[1]); - } - } - return isFirefoxResult; -} - -let isWindowsResult; -function isWindows() { - if (!defined(isWindowsResult)) { - isWindowsResult = /Windows/i.test(theNavigator.appVersion); - } - return isWindowsResult; -} - -let isIPadOrIOSResult; -function isIPadOrIOS() { - if (!defined(isIPadOrIOSResult)) { - isIPadOrIOSResult = - navigator.platform === "iPhone" || - navigator.platform === "iPod" || - navigator.platform === "iPad"; - } - - return isIPadOrIOSResult; -} - -function firefoxVersion() { - return isFirefox() && firefoxVersionResult; -} - -let hasPointerEvents; -function supportsPointerEvents() { - if (!defined(hasPointerEvents)) { - //While navigator.pointerEnabled is deprecated in the W3C specification - //we still need to use it if it exists in order to support browsers - //that rely on it, such as the Windows WebBrowser control which defines - //PointerEvent but sets navigator.pointerEnabled to false. - - //Firefox disabled because of https://github.com/CesiumGS/cesium/issues/6372 - hasPointerEvents = - !isFirefox() && - typeof PointerEvent !== "undefined" && - (!defined(theNavigator.pointerEnabled) || theNavigator.pointerEnabled); - } - return hasPointerEvents; -} - -let imageRenderingValueResult; -let supportsImageRenderingPixelatedResult; -function supportsImageRenderingPixelated() { - if (!defined(supportsImageRenderingPixelatedResult)) { - const canvas = document.createElement("canvas"); - canvas.setAttribute( - "style", - "image-rendering: -moz-crisp-edges;" + "image-rendering: pixelated;", - ); - //canvas.style.imageRendering will be undefined, null or an empty string on unsupported browsers. - const tmp = canvas.style.imageRendering; - supportsImageRenderingPixelatedResult = defined(tmp) && tmp !== ""; - if (supportsImageRenderingPixelatedResult) { - imageRenderingValueResult = tmp; - } - } - return supportsImageRenderingPixelatedResult; -} - -function imageRenderingValue() { - return supportsImageRenderingPixelated() - ? imageRenderingValueResult - : undefined; -} - -function supportsWebP() { - //>>includeStart('debug', pragmas.debug); - if (!supportsWebP.initialized) { - throw new DeveloperError( - "You must call FeatureDetection.supportsWebP.initialize and wait for the promise to resolve before calling FeatureDetection.supportsWebP", - ); - } - //>>includeEnd('debug'); - return supportsWebP._result; -} -supportsWebP._promise = undefined; -supportsWebP._result = undefined; -supportsWebP.initialize = function () { - // From https://developers.google.com/speed/webp/faq#how_can_i_detect_browser_support_for_webp - if (defined(supportsWebP._promise)) { - return supportsWebP._promise; - } - - supportsWebP._promise = new Promise((resolve) => { - const image = new Image(); - image.onload = function () { - supportsWebP._result = image.width > 0 && image.height > 0; - resolve(supportsWebP._result); - }; - - image.onerror = function () { - supportsWebP._result = false; - resolve(supportsWebP._result); - }; - image.src = - "data:image/webp;base64,UklGRiIAAABXRUJQVlA4IBYAAAAwAQCdASoBAAEADsD+JaQAA3AAAAAA"; - }); - - return supportsWebP._promise; -}; -Object.defineProperties(supportsWebP, { - initialized: { - get: function () { - return defined(supportsWebP._result); - }, - }, -}); - -const typedArrayTypes = []; -if (typeof ArrayBuffer !== "undefined") { - typedArrayTypes.push( - Int8Array, - Uint8Array, - Int16Array, - Uint16Array, - Int32Array, - Uint32Array, - Float32Array, - Float64Array, - ); - - if (typeof Uint8ClampedArray !== "undefined") { - typedArrayTypes.push(Uint8ClampedArray); - } - - if (typeof Uint8ClampedArray !== "undefined") { - typedArrayTypes.push(Uint8ClampedArray); - } - - if (typeof BigInt64Array !== "undefined") { - // eslint-disable-next-line no-undef - typedArrayTypes.push(BigInt64Array); - } - - if (typeof BigUint64Array !== "undefined") { - // eslint-disable-next-line no-undef - typedArrayTypes.push(BigUint64Array); - } -} - -/** - * A set of functions to detect whether the current browser supports - * various features. - * - * @namespace FeatureDetection - */ -const FeatureDetection = { - isChrome: isChrome, - chromeVersion: chromeVersion, - isSafari: isSafari, - safariVersion: safariVersion, - isWebkit: isWebkit, - webkitVersion: webkitVersion, - isInternetExplorer: isInternetExplorer, - internetExplorerVersion: internetExplorerVersion, - isEdge: isEdge, - edgeVersion: edgeVersion, - isFirefox: isFirefox, - firefoxVersion: firefoxVersion, - isWindows: isWindows, - isIPadOrIOS: isIPadOrIOS, - hardwareConcurrency: theNavigator.hardwareConcurrency ?? 3, - supportsPointerEvents: supportsPointerEvents, - supportsImageRenderingPixelated: supportsImageRenderingPixelated, - supportsWebP: supportsWebP, - imageRenderingValue: imageRenderingValue, - typedArrayTypes: typedArrayTypes, -}; - -/** - * Detects whether the current browser supports Basis Universal textures and the web assembly modules needed to transcode them. - * - * @param {Scene} scene - * @returns {boolean} true if the browser supports web assembly modules and the scene supports Basis Universal textures, false if not. - */ -FeatureDetection.supportsBasis = function (scene) { - return FeatureDetection.supportsWebAssembly() && scene.context.supportsBasis; -}; - -/** - * Detects whether the current browser supports the full screen standard. - * - * @returns {boolean} true if the browser supports the full screen standard, false if not. - * - * @see Fullscreen - * @see {@link http://dvcs.w3.org/hg/fullscreen/raw-file/tip/Overview.html|W3C Fullscreen Living Specification} - */ -FeatureDetection.supportsFullscreen = function () { - return Fullscreen.supportsFullscreen(); -}; - -/** - * Detects whether the current browser supports typed arrays. - * - * @returns {boolean} true if the browser supports typed arrays, false if not. - * - * @see {@link https://tc39.es/ecma262/#sec-typedarray-objects|Typed Array Specification} - */ -FeatureDetection.supportsTypedArrays = function () { - return typeof ArrayBuffer !== "undefined"; -}; - -/** - * Detects whether the current browser supports BigInt64Array typed arrays. - * - * @returns {boolean} true if the browser supports BigInt64Array typed arrays, false if not. - * - * @see {@link https://tc39.es/ecma262/#sec-typedarray-objects|Typed Array Specification} - */ -FeatureDetection.supportsBigInt64Array = function () { - return typeof BigInt64Array !== "undefined"; -}; - -/** - * Detects whether the current browser supports BigUint64Array typed arrays. - * - * @returns {boolean} true if the browser supports BigUint64Array typed arrays, false if not. - * - * @see {@link https://tc39.es/ecma262/#sec-typedarray-objects|Typed Array Specification} - */ -FeatureDetection.supportsBigUint64Array = function () { - return typeof BigUint64Array !== "undefined"; -}; - -/** - * Detects whether the current browser supports BigInt. - * - * @returns {boolean} true if the browser supports BigInt, false if not. - * - * @see {@link https://tc39.es/ecma262/#sec-bigint-objects|BigInt Specification} - */ -FeatureDetection.supportsBigInt = function () { - return typeof BigInt !== "undefined"; -}; - -/** - * Detects whether the current browser supports Web Workers. - * - * @returns {boolean} true if the browsers supports Web Workers, false if not. - * - * @see {@link http://www.w3.org/TR/workers/} - */ -FeatureDetection.supportsWebWorkers = function () { - return typeof Worker !== "undefined"; -}; - -/** - * Detects whether the current browser supports Web Assembly. - * - * @returns {boolean} true if the browsers supports Web Assembly, false if not. - * - * @see {@link https://developer.mozilla.org/en-US/docs/WebAssembly} - */ -FeatureDetection.supportsWebAssembly = function () { - return typeof WebAssembly !== "undefined"; -}; - -/** - * Detects whether the current browser supports a WebGL2 rendering context for the specified scene. - * - * @param {Scene} scene the Cesium scene specifying the rendering context - * @returns {boolean} true if the browser supports a WebGL2 rendering context, false if not. - * - * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/WebGL2RenderingContext|WebGL2RenderingContext} - */ -FeatureDetection.supportsWebgl2 = function (scene) { - //>>includeStart('debug', pragmas.debug); - Check.defined("scene", scene); - //>>includeEnd('debug'); - - return scene.context.webgl2; -}; - -/** - * Detects whether the current browser supports ECMAScript modules in web workers. - * @returns {boolean} true if the browser supports ECMAScript modules in web workers. - * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/Worker|Worker} - */ -FeatureDetection.supportsEsmWebWorkers = function () { - return !isFirefox() || parseInt(firefoxVersionResult) >= 114; -}; - -export default FeatureDetection; diff --git a/packages/engine/Source/Core/FrustumGeometry.js b/packages/engine/Source/Core/FrustumGeometry.js index 9c777ef1ea3a..6ef56fc93eb5 100644 --- a/packages/engine/Source/Core/FrustumGeometry.js +++ b/packages/engine/Source/Core/FrustumGeometry.js @@ -1,9 +1,8 @@ +import { Check, defined } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; import Cartesian4 from "./Cartesian4.js"; -import Check from "./Check.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import defined from "./defined.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/FrustumOutlineGeometry.js b/packages/engine/Source/Core/FrustumOutlineGeometry.js index ffb512d8fdbb..40a7b2fcc9cb 100644 --- a/packages/engine/Source/Core/FrustumOutlineGeometry.js +++ b/packages/engine/Source/Core/FrustumOutlineGeometry.js @@ -1,8 +1,7 @@ +import { Check, defined } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import defined from "./defined.js"; import FrustumGeometry from "./FrustumGeometry.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; diff --git a/packages/engine/Source/Core/GeocoderService.js b/packages/engine/Source/Core/GeocoderService.js index 5c02ec2bdff8..788f77328040 100644 --- a/packages/engine/Source/Core/GeocoderService.js +++ b/packages/engine/Source/Core/GeocoderService.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Credit from "./Credit.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; /** * @typedef {object} GeocoderService.Result diff --git a/packages/engine/Source/Core/GeographicProjection.js b/packages/engine/Source/Core/GeographicProjection.js index 2246276c1b2d..a6f3d0d69a53 100644 --- a/packages/engine/Source/Core/GeographicProjection.js +++ b/packages/engine/Source/Core/GeographicProjection.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; /** diff --git a/packages/engine/Source/Core/GeographicTilingScheme.js b/packages/engine/Source/Core/GeographicTilingScheme.js index c69d9c39d3b2..ec0180504819 100644 --- a/packages/engine/Source/Core/GeographicTilingScheme.js +++ b/packages/engine/Source/Core/GeographicTilingScheme.js @@ -1,8 +1,7 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian2 from "./Cartesian2.js"; -import Check from "./Check.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; import Ellipsoid from "./Ellipsoid.js"; +import Frozen from "./Frozen.js"; import GeographicProjection from "./GeographicProjection.js"; import CesiumMath from "./Math.js"; import Rectangle from "./Rectangle.js"; diff --git a/packages/engine/Source/Core/Geometry.js b/packages/engine/Source/Core/Geometry.js index c2589a268f5f..1b5d52049df7 100644 --- a/packages/engine/Source/Core/Geometry.js +++ b/packages/engine/Source/Core/Geometry.js @@ -1,10 +1,8 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import Check from "./Check.js"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import GeometryType from "./GeometryType.js"; import Matrix2 from "./Matrix2.js"; import Matrix3 from "./Matrix3.js"; diff --git a/packages/engine/Source/Core/GeometryAttribute.js b/packages/engine/Source/Core/GeometryAttribute.js index a7fa202d4a9a..3f762489de26 100644 --- a/packages/engine/Source/Core/GeometryAttribute.js +++ b/packages/engine/Source/Core/GeometryAttribute.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; /** * Values and type information for geometry attributes. A {@link Geometry} diff --git a/packages/engine/Source/Core/GeometryFactory.js b/packages/engine/Source/Core/GeometryFactory.js index 10ee22d3cf1e..66cad5e2a284 100644 --- a/packages/engine/Source/Core/GeometryFactory.js +++ b/packages/engine/Source/Core/GeometryFactory.js @@ -1,4 +1,4 @@ -import DeveloperError from "../Core/DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * Base class for all geometry creation utility classes that can be passed to {@link GeometryInstance} diff --git a/packages/engine/Source/Core/GeometryInstance.js b/packages/engine/Source/Core/GeometryInstance.js index d5316efdc7cb..c93b72cc1437 100644 --- a/packages/engine/Source/Core/GeometryInstance.js +++ b/packages/engine/Source/Core/GeometryInstance.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Matrix4 from "./Matrix4.js"; /** diff --git a/packages/engine/Source/Core/GeometryInstanceAttribute.js b/packages/engine/Source/Core/GeometryInstanceAttribute.js index 3acd663eccb7..2b9bd8bab0ae 100644 --- a/packages/engine/Source/Core/GeometryInstanceAttribute.js +++ b/packages/engine/Source/Core/GeometryInstanceAttribute.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; /** * Values and type information for per-instance geometry attributes. diff --git a/packages/engine/Source/Core/GeometryPipeline.js b/packages/engine/Source/Core/GeometryPipeline.js index 5adb20597596..864499742342 100644 --- a/packages/engine/Source/Core/GeometryPipeline.js +++ b/packages/engine/Source/Core/GeometryPipeline.js @@ -1,3 +1,4 @@ +import { defined, DeveloperError } from "@cesium/utils"; import AttributeCompression from "./AttributeCompression.js"; import barycentricCoordinates from "./barycentricCoordinates.js"; import BoundingSphere from "./BoundingSphere.js"; @@ -6,8 +7,6 @@ import Cartesian3 from "./Cartesian3.js"; import Cartesian4 from "./Cartesian4.js"; import Cartographic from "./Cartographic.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import EncodedCartesian3 from "./EncodedCartesian3.js"; import GeographicProjection from "./GeographicProjection.js"; import Geometry from "./Geometry.js"; diff --git a/packages/engine/Source/Core/GoogleEarthEnterpriseMetadata.js b/packages/engine/Source/Core/GoogleEarthEnterpriseMetadata.js index f4a30def0e71..7d80a482027b 100644 --- a/packages/engine/Source/Core/GoogleEarthEnterpriseMetadata.js +++ b/packages/engine/Source/Core/GoogleEarthEnterpriseMetadata.js @@ -1,15 +1,13 @@ +import { Check, defined, RuntimeError } from "@cesium/utils"; import * as protobuf from "protobufjs/dist/minimal/protobuf.js"; import buildModuleUrl from "./buildModuleUrl.js"; -import Check from "./Check.js"; import Credit from "./Credit.js"; -import defined from "./defined.js"; import GoogleEarthEnterpriseTileInformation from "./GoogleEarthEnterpriseTileInformation.js"; import isBitSet from "./isBitSet.js"; import loadAndExecuteScript from "./loadAndExecuteScript.js"; import CesiumMath from "./Math.js"; import Request from "./Request.js"; import Resource from "./Resource.js"; -import RuntimeError from "./RuntimeError.js"; import TaskProcessor from "./TaskProcessor.js"; function stringToBuffer(str) { diff --git a/packages/engine/Source/Core/GoogleEarthEnterpriseTerrainData.js b/packages/engine/Source/Core/GoogleEarthEnterpriseTerrainData.js index 87ba2592d9ef..7cb6349a3355 100644 --- a/packages/engine/Source/Core/GoogleEarthEnterpriseTerrainData.js +++ b/packages/engine/Source/Core/GoogleEarthEnterpriseTerrainData.js @@ -1,10 +1,8 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import IndexDatatype from "./IndexDatatype.js"; import Intersections2D from "./Intersections2D.js"; import CesiumMath from "./Math.js"; diff --git a/packages/engine/Source/Core/GoogleEarthEnterpriseTerrainProvider.js b/packages/engine/Source/Core/GoogleEarthEnterpriseTerrainProvider.js index 64866a522e11..6554c6105ca9 100644 --- a/packages/engine/Source/Core/GoogleEarthEnterpriseTerrainProvider.js +++ b/packages/engine/Source/Core/GoogleEarthEnterpriseTerrainProvider.js @@ -1,8 +1,7 @@ -import Check from "./Check.js"; +import { Check, defined, RuntimeError } from "@cesium/utils"; import Credit from "./Credit.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; import Event from "./Event.js"; +import Frozen from "./Frozen.js"; import GeographicTilingScheme from "./GeographicTilingScheme.js"; import GoogleEarthEnterpriseMetadata from "./GoogleEarthEnterpriseMetadata.js"; import GoogleEarthEnterpriseTerrainData from "./GoogleEarthEnterpriseTerrainData.js"; @@ -13,7 +12,6 @@ import Rectangle from "./Rectangle.js"; import Request from "./Request.js"; import RequestState from "./RequestState.js"; import RequestType from "./RequestType.js"; -import RuntimeError from "./RuntimeError.js"; import TaskProcessor from "./TaskProcessor.js"; const TerrainState = { diff --git a/packages/engine/Source/Core/GoogleEarthEnterpriseTileInformation.js b/packages/engine/Source/Core/GoogleEarthEnterpriseTileInformation.js index 72eeb54b2953..d793ed3a6c54 100644 --- a/packages/engine/Source/Core/GoogleEarthEnterpriseTileInformation.js +++ b/packages/engine/Source/Core/GoogleEarthEnterpriseTileInformation.js @@ -1,4 +1,4 @@ -import defined from "./defined.js"; +import { defined } from "@cesium/utils"; import isBitSet from "./isBitSet.js"; // Bitmask for checking tile properties diff --git a/packages/engine/Source/Core/GoogleGeocoderService.js b/packages/engine/Source/Core/GoogleGeocoderService.js index e971ea2684ba..90dbf27cf19b 100644 --- a/packages/engine/Source/Core/GoogleGeocoderService.js +++ b/packages/engine/Source/Core/GoogleGeocoderService.js @@ -1,11 +1,8 @@ -import Check from "./Check.js"; +import { Check, defined, DeveloperError, RuntimeError } from "@cesium/utils"; import Credit from "./Credit.js"; import Frozen from "./Frozen.js"; import Rectangle from "./Rectangle.js"; import Resource from "./Resource.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; -import RuntimeError from "./RuntimeError.js"; const API_URL = "https://maps.googleapis.com/maps/api/geocode/json"; const CREDIT_HTML = `Google`; diff --git a/packages/engine/Source/Core/GregorianDate.js b/packages/engine/Source/Core/GregorianDate.js index d853e17897e7..83b55488f24e 100644 --- a/packages/engine/Source/Core/GregorianDate.js +++ b/packages/engine/Source/Core/GregorianDate.js @@ -1,5 +1,4 @@ -import Check from "./Check.js"; -import DeveloperError from "./DeveloperError.js"; +import { Check, DeveloperError } from "@cesium/utils"; import isLeapYear from "./isLeapYear.js"; const daysInYear = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; diff --git a/packages/engine/Source/Core/GroundPolylineGeometry.js b/packages/engine/Source/Core/GroundPolylineGeometry.js index c2ffc7a1ae91..ee2357db1d16 100644 --- a/packages/engine/Source/Core/GroundPolylineGeometry.js +++ b/packages/engine/Source/Core/GroundPolylineGeometry.js @@ -1,18 +1,16 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import ApproximateTerrainHeights from "./ApproximateTerrainHeights.js"; import ArcType from "./ArcType.js"; import arrayRemoveDuplicates from "./arrayRemoveDuplicates.js"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import Check from "./Check.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; import EllipsoidGeodesic from "./EllipsoidGeodesic.js"; import EllipsoidRhumbLine from "./EllipsoidRhumbLine.js"; import EncodedCartesian3 from "./EncodedCartesian3.js"; +import Frozen from "./Frozen.js"; import GeographicProjection from "./GeographicProjection.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; diff --git a/packages/engine/Source/Core/HeadingPitchRange.js b/packages/engine/Source/Core/HeadingPitchRange.js index 6dc891de079f..77c1085c351e 100644 --- a/packages/engine/Source/Core/HeadingPitchRange.js +++ b/packages/engine/Source/Core/HeadingPitchRange.js @@ -1,4 +1,4 @@ -import defined from "./defined.js"; +import { defined } from "@cesium/utils"; /** * Defines a heading angle, pitch angle, and range in a local frame. diff --git a/packages/engine/Source/Core/HeadingPitchRoll.js b/packages/engine/Source/Core/HeadingPitchRoll.js index 39192d66c194..659a36fa0781 100644 --- a/packages/engine/Source/Core/HeadingPitchRoll.js +++ b/packages/engine/Source/Core/HeadingPitchRoll.js @@ -1,5 +1,4 @@ -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import CesiumMath from "./Math.js"; /** diff --git a/packages/engine/Source/Core/Heap.js b/packages/engine/Source/Core/Heap.js index 2d4cd2496432..6803d8413ca0 100644 --- a/packages/engine/Source/Core/Heap.js +++ b/packages/engine/Source/Core/Heap.js @@ -1,5 +1,4 @@ -import Check from "./Check.js"; -import defined from "./defined.js"; +import { Check, defined } from "@cesium/utils"; /** * Array implementation of a heap. diff --git a/packages/engine/Source/Core/HeightmapTerrainData.js b/packages/engine/Source/Core/HeightmapTerrainData.js index 3f08f662dafe..84c79cd474ed 100644 --- a/packages/engine/Source/Core/HeightmapTerrainData.js +++ b/packages/engine/Source/Core/HeightmapTerrainData.js @@ -1,9 +1,7 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import GeographicProjection from "./GeographicProjection.js"; import HeightmapEncoding from "./HeightmapEncoding.js"; import HeightmapTessellator from "./HeightmapTessellator.js"; diff --git a/packages/engine/Source/Core/HeightmapTessellator.js b/packages/engine/Source/Core/HeightmapTessellator.js index 91b48d6aeeca..87b5b9b3bd35 100644 --- a/packages/engine/Source/Core/HeightmapTessellator.js +++ b/packages/engine/Source/Core/HeightmapTessellator.js @@ -1,9 +1,8 @@ +import { defined, DeveloperError } from "@cesium/utils"; import AxisAlignedBoundingBox from "./AxisAlignedBoundingBox.js"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; import EllipsoidalOccluder from "./EllipsoidalOccluder.js"; import CesiumMath from "./Math.js"; diff --git a/packages/engine/Source/Core/HermitePolynomialApproximation.js b/packages/engine/Source/Core/HermitePolynomialApproximation.js index 3bcec6b518ce..bf1f849c5350 100644 --- a/packages/engine/Source/Core/HermitePolynomialApproximation.js +++ b/packages/engine/Source/Core/HermitePolynomialApproximation.js @@ -1,5 +1,4 @@ -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import CesiumMath from "./Math.js"; const factorial = CesiumMath.factorial; diff --git a/packages/engine/Source/Core/HermiteSpline.js b/packages/engine/Source/Core/HermiteSpline.js index c302c8c20f0e..b43ea410f5e8 100644 --- a/packages/engine/Source/Core/HermiteSpline.js +++ b/packages/engine/Source/Core/HermiteSpline.js @@ -1,8 +1,7 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; import Cartesian4 from "./Cartesian4.js"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import LinearSpline from "./LinearSpline.js"; import Matrix4 from "./Matrix4.js"; import Spline from "./Spline.js"; diff --git a/packages/engine/Source/Core/HilbertOrder.js b/packages/engine/Source/Core/HilbertOrder.js index 768ad47e23d0..d374d43ad3fb 100644 --- a/packages/engine/Source/Core/HilbertOrder.js +++ b/packages/engine/Source/Core/HilbertOrder.js @@ -1,5 +1,4 @@ -import Check from "./Check.js"; -import DeveloperError from "./DeveloperError.js"; +import { Check, DeveloperError } from "@cesium/utils"; /** * Hilbert Order helper functions. diff --git a/packages/engine/Source/Core/ITwinPlatform.js b/packages/engine/Source/Core/ITwinPlatform.js index 269cb192c1fb..8a4e20b10450 100644 --- a/packages/engine/Source/Core/ITwinPlatform.js +++ b/packages/engine/Source/Core/ITwinPlatform.js @@ -1,8 +1,5 @@ -import Check from "./Check.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { Check, defined, DeveloperError, RuntimeError } from "@cesium/utils"; import Resource from "./Resource.js"; -import RuntimeError from "./RuntimeError.js"; /** * Default settings for accessing the iTwin platform. diff --git a/packages/engine/Source/Core/Iau2000Orientation.js b/packages/engine/Source/Core/Iau2000Orientation.js index e9595a481194..a3dd56b6551f 100644 --- a/packages/engine/Source/Core/Iau2000Orientation.js +++ b/packages/engine/Source/Core/Iau2000Orientation.js @@ -1,4 +1,4 @@ -import defined from "./defined.js"; +import { defined } from "@cesium/utils"; import IauOrientationParameters from "./IauOrientationParameters.js"; import JulianDate from "./JulianDate.js"; import CesiumMath from "./Math.js"; diff --git a/packages/engine/Source/Core/Iau2006XysData.js b/packages/engine/Source/Core/Iau2006XysData.js index 754235ea9432..d2510ce04ee9 100644 --- a/packages/engine/Source/Core/Iau2006XysData.js +++ b/packages/engine/Source/Core/Iau2006XysData.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import buildModuleUrl from "./buildModuleUrl.js"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; import Iau2006XysSample from "./Iau2006XysSample.js"; import JulianDate from "./JulianDate.js"; import Resource from "./Resource.js"; diff --git a/packages/engine/Source/Core/IauOrientationAxes.js b/packages/engine/Source/Core/IauOrientationAxes.js index 7c590f89b10e..ba6693f9a25b 100644 --- a/packages/engine/Source/Core/IauOrientationAxes.js +++ b/packages/engine/Source/Core/IauOrientationAxes.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; -import defined from "./defined.js"; import Iau2000Orientation from "./Iau2000Orientation.js"; import JulianDate from "./JulianDate.js"; import CesiumMath from "./Math.js"; diff --git a/packages/engine/Source/Core/IndexDatatype.js b/packages/engine/Source/Core/IndexDatatype.js index ccd8373f9033..dd7b6f9ee8ba 100644 --- a/packages/engine/Source/Core/IndexDatatype.js +++ b/packages/engine/Source/Core/IndexDatatype.js @@ -1,5 +1,4 @@ -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import CesiumMath from "./Math.js"; import WebGLConstants from "./WebGLConstants.js"; diff --git a/packages/engine/Source/Core/InterpolationAlgorithm.js b/packages/engine/Source/Core/InterpolationAlgorithm.js index b050eda4ddb8..00800ba98694 100644 --- a/packages/engine/Source/Core/InterpolationAlgorithm.js +++ b/packages/engine/Source/Core/InterpolationAlgorithm.js @@ -1,4 +1,4 @@ -import DeveloperError from "./DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * The interface for interpolation algorithms. diff --git a/packages/engine/Source/Core/IntersectionTests.js b/packages/engine/Source/Core/IntersectionTests.js index 99d3a2ed3321..00ea03a034a3 100644 --- a/packages/engine/Source/Core/IntersectionTests.js +++ b/packages/engine/Source/Core/IntersectionTests.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Interval from "./Interval.js"; import CesiumMath from "./Math.js"; import Matrix3 from "./Matrix3.js"; diff --git a/packages/engine/Source/Core/Intersections2D.js b/packages/engine/Source/Core/Intersections2D.js index aabc0cd5561d..4b36fc992092 100644 --- a/packages/engine/Source/Core/Intersections2D.js +++ b/packages/engine/Source/Core/Intersections2D.js @@ -1,8 +1,6 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; /** * Contains functions for operating on 2D triangles. diff --git a/packages/engine/Source/Core/Ion.js b/packages/engine/Source/Core/Ion.js index b77715265b84..9476ba82e860 100644 --- a/packages/engine/Source/Core/Ion.js +++ b/packages/engine/Source/Core/Ion.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Credit from "./Credit.js"; -import defined from "./defined.js"; import Resource from "./Resource.js"; let defaultTokenCredit; diff --git a/packages/engine/Source/Core/IonGeocoderService.js b/packages/engine/Source/Core/IonGeocoderService.js index b0200a0d9355..f19be6d9d02c 100644 --- a/packages/engine/Source/Core/IonGeocoderService.js +++ b/packages/engine/Source/Core/IonGeocoderService.js @@ -1,8 +1,6 @@ -import Check from "./Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import Credit from "./Credit.js"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ion from "./Ion.js"; import IonGeocodeProviderType from "./IonGeocodeProviderType.js"; import PeliasGeocoderService from "./PeliasGeocoderService.js"; diff --git a/packages/engine/Source/Core/IonResource.js b/packages/engine/Source/Core/IonResource.js index 0c4b508d5627..4db74fbf8857 100644 --- a/packages/engine/Source/Core/IonResource.js +++ b/packages/engine/Source/Core/IonResource.js @@ -1,11 +1,9 @@ +import { Check, defined, RuntimeError } from "@cesium/utils"; import Uri from "urijs"; -import Check from "./Check.js"; import Credit from "./Credit.js"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; import Ion from "./Ion.js"; import Resource from "./Resource.js"; -import RuntimeError from "./RuntimeError.js"; /** * A {@link Resource} instance that encapsulates Cesium ion asset access. diff --git a/packages/engine/Source/Core/JulianDate.js b/packages/engine/Source/Core/JulianDate.js index a2df136f0f69..93b95733342b 100644 --- a/packages/engine/Source/Core/JulianDate.js +++ b/packages/engine/Source/Core/JulianDate.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import binarySearch from "./binarySearch.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import GregorianDate from "./GregorianDate.js"; import isLeapYear from "./isLeapYear.js"; import LeapSecond from "./LeapSecond.js"; diff --git a/packages/engine/Source/Core/KTX2Transcoder.js b/packages/engine/Source/Core/KTX2Transcoder.js index 4e4aff9465df..86289bf38550 100644 --- a/packages/engine/Source/Core/KTX2Transcoder.js +++ b/packages/engine/Source/Core/KTX2Transcoder.js @@ -1,7 +1,5 @@ -import Check from "./Check.js"; +import { Check, defined, RuntimeError } from "@cesium/utils"; import CompressedTextureBuffer from "./CompressedTextureBuffer.js"; -import defined from "./defined.js"; -import RuntimeError from "./RuntimeError.js"; import TaskProcessor from "./TaskProcessor.js"; /** diff --git a/packages/engine/Source/Core/LagrangePolynomialApproximation.js b/packages/engine/Source/Core/LagrangePolynomialApproximation.js index 7863ae49b2a5..153ea87fb839 100644 --- a/packages/engine/Source/Core/LagrangePolynomialApproximation.js +++ b/packages/engine/Source/Core/LagrangePolynomialApproximation.js @@ -1,4 +1,4 @@ -import defined from "./defined.js"; +import { defined } from "@cesium/utils"; /** * An {@link InterpolationAlgorithm} for performing Lagrange interpolation. diff --git a/packages/engine/Source/Core/LinearApproximation.js b/packages/engine/Source/Core/LinearApproximation.js index 0e46bdbca726..5df918cb6564 100644 --- a/packages/engine/Source/Core/LinearApproximation.js +++ b/packages/engine/Source/Core/LinearApproximation.js @@ -1,5 +1,4 @@ -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; /** * An {@link InterpolationAlgorithm} for performing linear interpolation. diff --git a/packages/engine/Source/Core/LinearSpline.js b/packages/engine/Source/Core/LinearSpline.js index fbb329b90498..a27f62379277 100644 --- a/packages/engine/Source/Core/LinearSpline.js +++ b/packages/engine/Source/Core/LinearSpline.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Spline from "./Spline.js"; /** diff --git a/packages/engine/Source/Core/ManagedArray.js b/packages/engine/Source/Core/ManagedArray.js index 70b8da3b488e..5104306d7b23 100644 --- a/packages/engine/Source/Core/ManagedArray.js +++ b/packages/engine/Source/Core/ManagedArray.js @@ -1,4 +1,4 @@ -import Check from "./Check.js"; +import { Check } from "@cesium/utils"; /** * A wrapper around arrays so that the internal length of the array can be manually managed. diff --git a/packages/engine/Source/Core/MapProjection.js b/packages/engine/Source/Core/MapProjection.js index f630e69575d8..daae6611254b 100644 --- a/packages/engine/Source/Core/MapProjection.js +++ b/packages/engine/Source/Core/MapProjection.js @@ -1,4 +1,4 @@ -import DeveloperError from "./DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * Defines how geodetic ellipsoid coordinates ({@link Cartographic}) project to a diff --git a/packages/engine/Source/Core/Math.js b/packages/engine/Source/Core/Math.js index 2ea709c7d076..a377d35e0997 100644 --- a/packages/engine/Source/Core/Math.js +++ b/packages/engine/Source/Core/Math.js @@ -1,7 +1,5 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import MersenneTwister from "mersenne-twister"; -import Check from "./Check.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; /** * Math functions. diff --git a/packages/engine/Source/Core/Matrix2.js b/packages/engine/Source/Core/Matrix2.js index 814ce010101c..9c89659eb3d5 100644 --- a/packages/engine/Source/Core/Matrix2.js +++ b/packages/engine/Source/Core/Matrix2.js @@ -1,7 +1,5 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import Cartesian2 from "./Cartesian2.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; /** * A 2x2 matrix, indexable as a column-major order array. diff --git a/packages/engine/Source/Core/Matrix3.js b/packages/engine/Source/Core/Matrix3.js index 7a7ab6c3213e..ee1e68ffcaca 100644 --- a/packages/engine/Source/Core/Matrix3.js +++ b/packages/engine/Source/Core/Matrix3.js @@ -1,7 +1,5 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import CesiumMath from "./Math.js"; /** diff --git a/packages/engine/Source/Core/Matrix4.js b/packages/engine/Source/Core/Matrix4.js index f30b8a733905..09848e724374 100644 --- a/packages/engine/Source/Core/Matrix4.js +++ b/packages/engine/Source/Core/Matrix4.js @@ -1,12 +1,9 @@ +import { Check, defined, DeveloperError, RuntimeError } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; import Cartesian4 from "./Cartesian4.js"; -import Check from "./Check.js"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import CesiumMath from "./Math.js"; import Matrix3 from "./Matrix3.js"; -import RuntimeError from "./RuntimeError.js"; /** * A 4x4 matrix, indexable as a column-major order array. diff --git a/packages/engine/Source/Core/MorphWeightSpline.js b/packages/engine/Source/Core/MorphWeightSpline.js index b531f17b9740..9830a53e3687 100644 --- a/packages/engine/Source/Core/MorphWeightSpline.js +++ b/packages/engine/Source/Core/MorphWeightSpline.js @@ -1,7 +1,5 @@ -import Check from "./Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Spline from "./Spline.js"; /** diff --git a/packages/engine/Source/Core/MortonOrder.js b/packages/engine/Source/Core/MortonOrder.js index 390abf913957..6b2b4ea8c184 100644 --- a/packages/engine/Source/Core/MortonOrder.js +++ b/packages/engine/Source/Core/MortonOrder.js @@ -1,6 +1,4 @@ -import Check from "./Check.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; /** * Morton Order (aka Z-Order Curve) helper functions. diff --git a/packages/engine/Source/Core/NearFarScalar.js b/packages/engine/Source/Core/NearFarScalar.js index cfc4253b1fa0..60fa41d99abb 100644 --- a/packages/engine/Source/Core/NearFarScalar.js +++ b/packages/engine/Source/Core/NearFarScalar.js @@ -1,5 +1,4 @@ -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; /** * Represents a scalar value's lower and upper bound at a near distance and far distance in eye space. diff --git a/packages/engine/Source/Core/Occluder.js b/packages/engine/Source/Core/Occluder.js index ba7553d4408c..5d5831bea7b6 100644 --- a/packages/engine/Source/Core/Occluder.js +++ b/packages/engine/Source/Core/Occluder.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; import CesiumMath from "./Math.js"; import Rectangle from "./Rectangle.js"; diff --git a/packages/engine/Source/Core/OffsetGeometryInstanceAttribute.js b/packages/engine/Source/Core/OffsetGeometryInstanceAttribute.js index 16d7e61571cb..56733cd828c0 100644 --- a/packages/engine/Source/Core/OffsetGeometryInstanceAttribute.js +++ b/packages/engine/Source/Core/OffsetGeometryInstanceAttribute.js @@ -1,6 +1,5 @@ -import Check from "./Check.js"; +import { Check, defined } from "@cesium/utils"; import ComponentDatatype from "./ComponentDatatype.js"; -import defined from "./defined.js"; /** * Value and type information for per-instance geometry attribute that determines the geometry instance offset diff --git a/packages/engine/Source/Core/OpenCageGeocoderService.js b/packages/engine/Source/Core/OpenCageGeocoderService.js index f3162d2459eb..a19c06aa2d36 100644 --- a/packages/engine/Source/Core/OpenCageGeocoderService.js +++ b/packages/engine/Source/Core/OpenCageGeocoderService.js @@ -1,8 +1,7 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; import combine from "./combine.js"; import Credit from "./Credit.js"; -import defined from "./defined.js"; import Rectangle from "./Rectangle.js"; import Resource from "./Resource.js"; diff --git a/packages/engine/Source/Core/OrientedBoundingBox.js b/packages/engine/Source/Core/OrientedBoundingBox.js index c02b80c76373..6e8899cc162e 100644 --- a/packages/engine/Source/Core/OrientedBoundingBox.js +++ b/packages/engine/Source/Core/OrientedBoundingBox.js @@ -1,10 +1,8 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; import EllipsoidTangentPlane from "./EllipsoidTangentPlane.js"; import Intersect from "./Intersect.js"; diff --git a/packages/engine/Source/Core/OrthographicFrustum.js b/packages/engine/Source/Core/OrthographicFrustum.js index 27ee8fb90470..458518f9ba7a 100644 --- a/packages/engine/Source/Core/OrthographicFrustum.js +++ b/packages/engine/Source/Core/OrthographicFrustum.js @@ -1,7 +1,5 @@ -import Check from "./Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import CesiumMath from "./Math.js"; import OrthographicOffCenterFrustum from "./OrthographicOffCenterFrustum.js"; diff --git a/packages/engine/Source/Core/OrthographicOffCenterFrustum.js b/packages/engine/Source/Core/OrthographicOffCenterFrustum.js index d5cf7e6a19aa..35b1d12fd991 100644 --- a/packages/engine/Source/Core/OrthographicOffCenterFrustum.js +++ b/packages/engine/Source/Core/OrthographicOffCenterFrustum.js @@ -1,9 +1,8 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; import Cartesian4 from "./Cartesian4.js"; import CullingVolume from "./CullingVolume.js"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import CesiumMath from "./Math.js"; import Matrix4 from "./Matrix4.js"; diff --git a/packages/engine/Source/Core/Packable.js b/packages/engine/Source/Core/Packable.js index ef167bed20d1..d5094a63b534 100644 --- a/packages/engine/Source/Core/Packable.js +++ b/packages/engine/Source/Core/Packable.js @@ -1,4 +1,4 @@ -import DeveloperError from "./DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * Static interface for types which can store their values as packed diff --git a/packages/engine/Source/Core/PackableForInterpolation.js b/packages/engine/Source/Core/PackableForInterpolation.js index 11e4a3885884..4a9e0938bd70 100644 --- a/packages/engine/Source/Core/PackableForInterpolation.js +++ b/packages/engine/Source/Core/PackableForInterpolation.js @@ -1,4 +1,4 @@ -import DeveloperError from "./DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * Static interface for {@link Packable} types which are interpolated in a diff --git a/packages/engine/Source/Core/PeliasGeocoderService.js b/packages/engine/Source/Core/PeliasGeocoderService.js index 2df428627bc0..48be0e7105f0 100644 --- a/packages/engine/Source/Core/PeliasGeocoderService.js +++ b/packages/engine/Source/Core/PeliasGeocoderService.js @@ -1,6 +1,5 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; import GeocodeType from "./GeocodeType.js"; import Rectangle from "./Rectangle.js"; import Resource from "./Resource.js"; diff --git a/packages/engine/Source/Core/PerspectiveFrustum.js b/packages/engine/Source/Core/PerspectiveFrustum.js index 7fd5467a0c7c..56aa75d0590d 100644 --- a/packages/engine/Source/Core/PerspectiveFrustum.js +++ b/packages/engine/Source/Core/PerspectiveFrustum.js @@ -1,7 +1,5 @@ -import Check from "./Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import CesiumMath from "./Math.js"; import PerspectiveOffCenterFrustum from "./PerspectiveOffCenterFrustum.js"; diff --git a/packages/engine/Source/Core/PerspectiveOffCenterFrustum.js b/packages/engine/Source/Core/PerspectiveOffCenterFrustum.js index b08e8099ec42..6f96167e6ecd 100644 --- a/packages/engine/Source/Core/PerspectiveOffCenterFrustum.js +++ b/packages/engine/Source/Core/PerspectiveOffCenterFrustum.js @@ -1,9 +1,8 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; import Cartesian4 from "./Cartesian4.js"; import CullingVolume from "./CullingVolume.js"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import CesiumMath from "./Math.js"; import Matrix4 from "./Matrix4.js"; diff --git a/packages/engine/Source/Core/PinBuilder.js b/packages/engine/Source/Core/PinBuilder.js index 85671c2771e8..9b11e96c691f 100644 --- a/packages/engine/Source/Core/PinBuilder.js +++ b/packages/engine/Source/Core/PinBuilder.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import buildModuleUrl from "./buildModuleUrl.js"; import Color from "./Color.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Resource from "./Resource.js"; import writeTextToCanvas from "./writeTextToCanvas.js"; diff --git a/packages/engine/Source/Core/Plane.js b/packages/engine/Source/Core/Plane.js index 9344486e9d2c..d8f5306bc38b 100644 --- a/packages/engine/Source/Core/Plane.js +++ b/packages/engine/Source/Core/Plane.js @@ -1,8 +1,6 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; import Cartesian4 from "./Cartesian4.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import CesiumMath from "./Math.js"; import Matrix4 from "./Matrix4.js"; diff --git a/packages/engine/Source/Core/PlaneGeometry.js b/packages/engine/Source/Core/PlaneGeometry.js index 313e4e762151..6d93404265b5 100644 --- a/packages/engine/Source/Core/PlaneGeometry.js +++ b/packages/engine/Source/Core/PlaneGeometry.js @@ -1,9 +1,8 @@ +import { Check, defined } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; import ComponentDatatype from "./ComponentDatatype.js"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/PlaneOutlineGeometry.js b/packages/engine/Source/Core/PlaneOutlineGeometry.js index e116db3d6fe2..68754cc1e6e5 100644 --- a/packages/engine/Source/Core/PlaneOutlineGeometry.js +++ b/packages/engine/Source/Core/PlaneOutlineGeometry.js @@ -1,8 +1,7 @@ +import { Check, defined } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import defined from "./defined.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/PolygonGeometry.js b/packages/engine/Source/Core/PolygonGeometry.js index f775283abb75..5981f79d67a0 100644 --- a/packages/engine/Source/Core/PolygonGeometry.js +++ b/packages/engine/Source/Core/PolygonGeometry.js @@ -1,16 +1,14 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import ArcType from "./ArcType.js"; import BoundingRectangle from "./BoundingRectangle.js"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import Check from "./Check.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; import EllipsoidTangentPlane from "./EllipsoidTangentPlane.js"; +import Frozen from "./Frozen.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryInstance from "./GeometryInstance.js"; diff --git a/packages/engine/Source/Core/PolygonGeometryLibrary.js b/packages/engine/Source/Core/PolygonGeometryLibrary.js index 2203e9a249af..5f5c5d3a5a80 100644 --- a/packages/engine/Source/Core/PolygonGeometryLibrary.js +++ b/packages/engine/Source/Core/PolygonGeometryLibrary.js @@ -1,10 +1,10 @@ +import { defined } from "@cesium/utils"; import ArcType from "./ArcType.js"; import arrayRemoveDuplicates from "./arrayRemoveDuplicates.js"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import defined from "./defined.js"; import Ellipsoid from "./Ellipsoid.js"; import EllipsoidRhumbLine from "./EllipsoidRhumbLine.js"; import Geometry from "./Geometry.js"; diff --git a/packages/engine/Source/Core/PolygonHierarchy.js b/packages/engine/Source/Core/PolygonHierarchy.js index a1751f6f7284..8ef1d275a1c5 100644 --- a/packages/engine/Source/Core/PolygonHierarchy.js +++ b/packages/engine/Source/Core/PolygonHierarchy.js @@ -1,4 +1,4 @@ -import defined from "./defined.js"; +import { defined } from "@cesium/utils"; /** * An hierarchy of linear rings which define a polygon and its holes. diff --git a/packages/engine/Source/Core/PolygonOutlineGeometry.js b/packages/engine/Source/Core/PolygonOutlineGeometry.js index f22650f92c3d..0bec41f0a8d3 100644 --- a/packages/engine/Source/Core/PolygonOutlineGeometry.js +++ b/packages/engine/Source/Core/PolygonOutlineGeometry.js @@ -1,13 +1,11 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import ArcType from "./ArcType.js"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; import EllipsoidTangentPlane from "./EllipsoidTangentPlane.js"; +import Frozen from "./Frozen.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/PolygonPipeline.js b/packages/engine/Source/Core/PolygonPipeline.js index 4e703d240a85..14515ba0ff67 100644 --- a/packages/engine/Source/Core/PolygonPipeline.js +++ b/packages/engine/Source/Core/PolygonPipeline.js @@ -1,10 +1,9 @@ +import { Check, defined } from "@cesium/utils"; import earcut from "earcut"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import Check from "./Check.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import defined from "./defined.js"; import Ellipsoid from "./Ellipsoid.js"; import EllipsoidRhumbLine from "./EllipsoidRhumbLine.js"; import Geometry from "./Geometry.js"; diff --git a/packages/engine/Source/Core/PolylineGeometry.js b/packages/engine/Source/Core/PolylineGeometry.js index 1353008e5ed5..35ca91bd2174 100644 --- a/packages/engine/Source/Core/PolylineGeometry.js +++ b/packages/engine/Source/Core/PolylineGeometry.js @@ -1,13 +1,12 @@ +import { defined, DeveloperError } from "@cesium/utils"; import ArcType from "./ArcType.js"; import arrayRemoveDuplicates from "./arrayRemoveDuplicates.js"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; import Color from "./Color.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; +import Frozen from "./Frozen.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/PolylinePipeline.js b/packages/engine/Source/Core/PolylinePipeline.js index b00e60291c87..e6b476ea1424 100644 --- a/packages/engine/Source/Core/PolylinePipeline.js +++ b/packages/engine/Source/Core/PolylinePipeline.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; import EllipsoidGeodesic from "./EllipsoidGeodesic.js"; import EllipsoidRhumbLine from "./EllipsoidRhumbLine.js"; diff --git a/packages/engine/Source/Core/PolylineVolumeGeometry.js b/packages/engine/Source/Core/PolylineVolumeGeometry.js index b1840e8fab8a..7f30fdf73767 100644 --- a/packages/engine/Source/Core/PolylineVolumeGeometry.js +++ b/packages/engine/Source/Core/PolylineVolumeGeometry.js @@ -1,3 +1,4 @@ +import { defined, DeveloperError } from "@cesium/utils"; import arrayRemoveDuplicates from "./arrayRemoveDuplicates.js"; import BoundingRectangle from "./BoundingRectangle.js"; import BoundingSphere from "./BoundingSphere.js"; @@ -5,10 +6,8 @@ import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; import ComponentDatatype from "./ComponentDatatype.js"; import CornerType from "./CornerType.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; +import Frozen from "./Frozen.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/PolylineVolumeGeometryLibrary.js b/packages/engine/Source/Core/PolylineVolumeGeometryLibrary.js index 1509263eec81..a6591a2216c2 100644 --- a/packages/engine/Source/Core/PolylineVolumeGeometryLibrary.js +++ b/packages/engine/Source/Core/PolylineVolumeGeometryLibrary.js @@ -1,3 +1,4 @@ +import oneTimeWarning from "../Core/oneTimeWarning.js"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; import Cartesian4 from "./Cartesian4.js"; @@ -10,7 +11,6 @@ import Matrix4 from "./Matrix4.js"; import PolylinePipeline from "./PolylinePipeline.js"; import Quaternion from "./Quaternion.js"; import Transforms from "./Transforms.js"; -import oneTimeWarning from "../Core/oneTimeWarning.js"; const scratch2Array = [new Cartesian3(), new Cartesian3()]; const scratchCartesian1 = new Cartesian3(); diff --git a/packages/engine/Source/Core/PolylineVolumeOutlineGeometry.js b/packages/engine/Source/Core/PolylineVolumeOutlineGeometry.js index 8e619a4486dc..8c04d1acd9b6 100644 --- a/packages/engine/Source/Core/PolylineVolumeOutlineGeometry.js +++ b/packages/engine/Source/Core/PolylineVolumeOutlineGeometry.js @@ -1,3 +1,4 @@ +import { defined, DeveloperError } from "@cesium/utils"; import arrayRemoveDuplicates from "./arrayRemoveDuplicates.js"; import BoundingRectangle from "./BoundingRectangle.js"; import BoundingSphere from "./BoundingSphere.js"; @@ -5,10 +6,8 @@ import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; import ComponentDatatype from "./ComponentDatatype.js"; import CornerType from "./CornerType.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; +import Frozen from "./Frozen.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/Proxy.js b/packages/engine/Source/Core/Proxy.js index c16a27f1ad1f..26d503c2d701 100644 --- a/packages/engine/Source/Core/Proxy.js +++ b/packages/engine/Source/Core/Proxy.js @@ -1,4 +1,4 @@ -import DeveloperError from "./DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * Base class for proxying requested made by {@link Resource}. diff --git a/packages/engine/Source/Core/QuadraticRealPolynomial.js b/packages/engine/Source/Core/QuadraticRealPolynomial.js index 799ce4637a1d..a886db189f11 100644 --- a/packages/engine/Source/Core/QuadraticRealPolynomial.js +++ b/packages/engine/Source/Core/QuadraticRealPolynomial.js @@ -1,4 +1,4 @@ -import DeveloperError from "./DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; import CesiumMath from "./Math.js"; /** diff --git a/packages/engine/Source/Core/QuantizedMeshTerrainData.js b/packages/engine/Source/Core/QuantizedMeshTerrainData.js index 626dfb4e6b9c..4e93d3f2776d 100644 --- a/packages/engine/Source/Core/QuantizedMeshTerrainData.js +++ b/packages/engine/Source/Core/QuantizedMeshTerrainData.js @@ -1,10 +1,8 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import IndexDatatype from "./IndexDatatype.js"; import Intersections2D from "./Intersections2D.js"; import CesiumMath from "./Math.js"; diff --git a/packages/engine/Source/Core/QuarticRealPolynomial.js b/packages/engine/Source/Core/QuarticRealPolynomial.js index 487caa48e5e8..39c6d18fe9b9 100644 --- a/packages/engine/Source/Core/QuarticRealPolynomial.js +++ b/packages/engine/Source/Core/QuarticRealPolynomial.js @@ -1,5 +1,5 @@ +import { DeveloperError } from "@cesium/utils"; import CubicRealPolynomial from "./CubicRealPolynomial.js"; -import DeveloperError from "./DeveloperError.js"; import CesiumMath from "./Math.js"; import QuadraticRealPolynomial from "./QuadraticRealPolynomial.js"; diff --git a/packages/engine/Source/Core/Quaternion.js b/packages/engine/Source/Core/Quaternion.js index ef8ccbcdbff5..65a046b176be 100644 --- a/packages/engine/Source/Core/Quaternion.js +++ b/packages/engine/Source/Core/Quaternion.js @@ -1,7 +1,5 @@ +import { Check, defined, FeatureDetection } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; -import FeatureDetection from "./FeatureDetection.js"; import CesiumMath from "./Math.js"; import Matrix3 from "./Matrix3.js"; diff --git a/packages/engine/Source/Core/QuaternionSpline.js b/packages/engine/Source/Core/QuaternionSpline.js index 9bb9b759dd9f..e184624cf535 100644 --- a/packages/engine/Source/Core/QuaternionSpline.js +++ b/packages/engine/Source/Core/QuaternionSpline.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Quaternion from "./Quaternion.js"; import Spline from "./Spline.js"; diff --git a/packages/engine/Source/Core/Ray.js b/packages/engine/Source/Core/Ray.js index acff1c4e86d4..aa7afbf82726 100644 --- a/packages/engine/Source/Core/Ray.js +++ b/packages/engine/Source/Core/Ray.js @@ -1,6 +1,5 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; /** * Represents a ray that extends infinitely from the provided origin in the provided direction. diff --git a/packages/engine/Source/Core/Rectangle.js b/packages/engine/Source/Core/Rectangle.js index eedaa97df6c5..17ebe7a468dd 100644 --- a/packages/engine/Source/Core/Rectangle.js +++ b/packages/engine/Source/Core/Rectangle.js @@ -1,11 +1,10 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; import Ellipsoid from "./Ellipsoid.js"; import CesiumMath from "./Math.js"; -import Transforms from "./Transforms.js"; import Matrix4 from "./Matrix4.js"; +import Transforms from "./Transforms.js"; /** * A two dimensional region specified as longitude and latitude coordinates. diff --git a/packages/engine/Source/Core/RectangleCollisionChecker.js b/packages/engine/Source/Core/RectangleCollisionChecker.js index 2c7d5720e7eb..6e7afbf7b16a 100644 --- a/packages/engine/Source/Core/RectangleCollisionChecker.js +++ b/packages/engine/Source/Core/RectangleCollisionChecker.js @@ -1,5 +1,5 @@ +import { Check } from "@cesium/utils"; import RBush from "rbush"; -import Check from "./Check.js"; /** * Wrapper around rbush for use with Rectangle types. diff --git a/packages/engine/Source/Core/RectangleGeometry.js b/packages/engine/Source/Core/RectangleGeometry.js index 865e992d9179..d4c7d4fd56dc 100644 --- a/packages/engine/Source/Core/RectangleGeometry.js +++ b/packages/engine/Source/Core/RectangleGeometry.js @@ -1,13 +1,11 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import Check from "./Check.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; +import Frozen from "./Frozen.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/RectangleGeometryLibrary.js b/packages/engine/Source/Core/RectangleGeometryLibrary.js index bb241c54915b..85be44876fe1 100644 --- a/packages/engine/Source/Core/RectangleGeometryLibrary.js +++ b/packages/engine/Source/Core/RectangleGeometryLibrary.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; import GeographicProjection from "./GeographicProjection.js"; import CesiumMath from "./Math.js"; diff --git a/packages/engine/Source/Core/RectangleOutlineGeometry.js b/packages/engine/Source/Core/RectangleOutlineGeometry.js index 7af6460dfe9c..43c14d86730c 100644 --- a/packages/engine/Source/Core/RectangleOutlineGeometry.js +++ b/packages/engine/Source/Core/RectangleOutlineGeometry.js @@ -1,11 +1,10 @@ +import { defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; +import Frozen from "./Frozen.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/Request.js b/packages/engine/Source/Core/Request.js index 5fb5433da204..557e9b9ee793 100644 --- a/packages/engine/Source/Core/Request.js +++ b/packages/engine/Source/Core/Request.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; import RequestState from "./RequestState.js"; import RequestType from "./RequestType.js"; diff --git a/packages/engine/Source/Core/RequestErrorEvent.js b/packages/engine/Source/Core/RequestErrorEvent.js index 41f0e685e550..b53d711384d4 100644 --- a/packages/engine/Source/Core/RequestErrorEvent.js +++ b/packages/engine/Source/Core/RequestErrorEvent.js @@ -1,4 +1,4 @@ -import defined from "./defined.js"; +import { defined } from "@cesium/utils"; import parseResponseHeaders from "./parseResponseHeaders.js"; /** diff --git a/packages/engine/Source/Core/RequestScheduler.js b/packages/engine/Source/Core/RequestScheduler.js index 1734325d6b29..7e22b5dcdec8 100644 --- a/packages/engine/Source/Core/RequestScheduler.js +++ b/packages/engine/Source/Core/RequestScheduler.js @@ -1,7 +1,5 @@ +import { Check, defer, defined } from "@cesium/utils"; import Uri from "urijs"; -import Check from "./Check.js"; -import defer from "./defer.js"; -import defined from "./defined.js"; import Event from "./Event.js"; import Heap from "./Heap.js"; import isBlobUri from "./isBlobUri.js"; diff --git a/packages/engine/Source/Core/Resource.js b/packages/engine/Source/Core/Resource.js index 8f71f0c3b073..b630e2052ba4 100644 --- a/packages/engine/Source/Core/Resource.js +++ b/packages/engine/Source/Core/Resource.js @@ -1,12 +1,15 @@ +import { + Check, + defer, + defined, + DeveloperError, + RuntimeError, +} from "@cesium/utils"; import Uri from "urijs"; import appendForwardSlash from "./appendForwardSlash.js"; -import Check from "./Check.js"; import clone from "./clone.js"; import combine from "./combine.js"; import Frozen from "./Frozen.js"; -import defer from "./defer.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import getAbsoluteUri from "./getAbsoluteUri.js"; import getBaseUri from "./getBaseUri.js"; import getExtensionFromUri from "./getExtensionFromUri.js"; @@ -22,7 +25,6 @@ import Request from "./Request.js"; import RequestErrorEvent from "./RequestErrorEvent.js"; import RequestScheduler from "./RequestScheduler.js"; import RequestState from "./RequestState.js"; -import RuntimeError from "./RuntimeError.js"; import TrustedServers from "./TrustedServers.js"; const xhrBlobSupported = (function () { diff --git a/packages/engine/Source/Core/RuntimeError.js b/packages/engine/Source/Core/RuntimeError.js deleted file mode 100644 index 8bbd56d74efe..000000000000 --- a/packages/engine/Source/Core/RuntimeError.js +++ /dev/null @@ -1,65 +0,0 @@ -import defined from "./defined.js"; - -/** - * Constructs an exception object that is thrown due to an error that can occur at runtime, e.g., - * out of memory, could not compile shader, etc. If a function may throw this - * exception, the calling code should be prepared to catch it. - *

- * On the other hand, a {@link DeveloperError} indicates an exception due - * to a developer error, e.g., invalid argument, that usually indicates a bug in the - * calling code. - * - * @alias RuntimeError - * @constructor - * @extends Error - * - * @param {string} [message] The error message for this exception. - * - * @see DeveloperError - */ -function RuntimeError(message) { - /** - * 'RuntimeError' indicating that this exception was thrown due to a runtime error. - * @type {string} - * @readonly - */ - this.name = "RuntimeError"; - - /** - * The explanation for why this exception was thrown. - * @type {string} - * @readonly - */ - this.message = message; - - //Browsers such as IE don't have a stack property until you actually throw the error. - let stack; - try { - throw new Error(); - } catch (e) { - stack = e.stack; - } - - /** - * The stack trace of this exception, if available. - * @type {string} - * @readonly - */ - this.stack = stack; -} - -if (defined(Object.create)) { - RuntimeError.prototype = Object.create(Error.prototype); - RuntimeError.prototype.constructor = RuntimeError; -} - -RuntimeError.prototype.toString = function () { - let str = `${this.name}: ${this.message}`; - - if (defined(this.stack)) { - str += `\n${this.stack.toString()}`; - } - - return str; -}; -export default RuntimeError; diff --git a/packages/engine/Source/Core/S2Cell.js b/packages/engine/Source/Core/S2Cell.js index c721cbb23af4..1ae1f37d2f98 100644 --- a/packages/engine/Source/Core/S2Cell.js +++ b/packages/engine/Source/Core/S2Cell.js @@ -1,12 +1,14 @@ /* eslint-disable new-cap */ +import { + Check, + defined, + DeveloperError, + FeatureDetection, + RuntimeError, +} from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; -import FeatureDetection from "./FeatureDetection.js"; -import RuntimeError from "./RuntimeError.js"; /** * S2 diff --git a/packages/engine/Source/Core/ScreenSpaceEventHandler.js b/packages/engine/Source/Core/ScreenSpaceEventHandler.js index eef1725fb547..a237c5e915f8 100644 --- a/packages/engine/Source/Core/ScreenSpaceEventHandler.js +++ b/packages/engine/Source/Core/ScreenSpaceEventHandler.js @@ -1,9 +1,7 @@ +import { defined, DeveloperError, FeatureDetection } from "@cesium/utils"; import AssociativeArray from "./AssociativeArray.js"; import Cartesian2 from "./Cartesian2.js"; -import defined from "./defined.js"; import destroyObject from "./destroyObject.js"; -import DeveloperError from "./DeveloperError.js"; -import FeatureDetection from "./FeatureDetection.js"; import getTimestamp from "./getTimestamp.js"; import KeyboardEventModifier from "./KeyboardEventModifier.js"; import ScreenSpaceEventType from "./ScreenSpaceEventType.js"; diff --git a/packages/engine/Source/Core/ShowGeometryInstanceAttribute.js b/packages/engine/Source/Core/ShowGeometryInstanceAttribute.js index 197d65a5b281..efff1467c519 100644 --- a/packages/engine/Source/Core/ShowGeometryInstanceAttribute.js +++ b/packages/engine/Source/Core/ShowGeometryInstanceAttribute.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import ComponentDatatype from "./ComponentDatatype.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; /** * Value and type information for per-instance geometry attribute that determines if the geometry instance will be shown. diff --git a/packages/engine/Source/Core/Simon1994PlanetaryPositions.js b/packages/engine/Source/Core/Simon1994PlanetaryPositions.js index 0d70fc6833d1..7746eeb2f8f5 100644 --- a/packages/engine/Source/Core/Simon1994PlanetaryPositions.js +++ b/packages/engine/Source/Core/Simon1994PlanetaryPositions.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import JulianDate from "./JulianDate.js"; import CesiumMath from "./Math.js"; import Matrix3 from "./Matrix3.js"; diff --git a/packages/engine/Source/Core/SimplePolylineGeometry.js b/packages/engine/Source/Core/SimplePolylineGeometry.js index cbfb05faf400..25b8b7cf30c8 100644 --- a/packages/engine/Source/Core/SimplePolylineGeometry.js +++ b/packages/engine/Source/Core/SimplePolylineGeometry.js @@ -1,12 +1,11 @@ +import { defined, DeveloperError } from "@cesium/utils"; import ArcType from "./ArcType.js"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; import Color from "./Color.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; +import Frozen from "./Frozen.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/SphereGeometry.js b/packages/engine/Source/Core/SphereGeometry.js index e8e9b03c1592..e6ae8602168c 100644 --- a/packages/engine/Source/Core/SphereGeometry.js +++ b/packages/engine/Source/Core/SphereGeometry.js @@ -1,6 +1,5 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; import EllipsoidGeometry from "./EllipsoidGeometry.js"; import VertexFormat from "./VertexFormat.js"; diff --git a/packages/engine/Source/Core/SphereOutlineGeometry.js b/packages/engine/Source/Core/SphereOutlineGeometry.js index 5c328ff63813..751e2e1cc07f 100644 --- a/packages/engine/Source/Core/SphereOutlineGeometry.js +++ b/packages/engine/Source/Core/SphereOutlineGeometry.js @@ -1,6 +1,5 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; import EllipsoidOutlineGeometry from "./EllipsoidOutlineGeometry.js"; /** diff --git a/packages/engine/Source/Core/Spherical.js b/packages/engine/Source/Core/Spherical.js index 7ad2e66d9084..d52a24162490 100644 --- a/packages/engine/Source/Core/Spherical.js +++ b/packages/engine/Source/Core/Spherical.js @@ -1,5 +1,4 @@ -import Check from "./Check.js"; -import defined from "./defined.js"; +import { Check, defined } from "@cesium/utils"; /** * A set of curvilinear 3-dimensional coordinates. diff --git a/packages/engine/Source/Core/Spline.js b/packages/engine/Source/Core/Spline.js index 3d7086a824dc..9d3d0197b445 100644 --- a/packages/engine/Source/Core/Spline.js +++ b/packages/engine/Source/Core/Spline.js @@ -1,7 +1,6 @@ +import { Check, DeveloperError } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; import CesiumMath from "./Math.js"; -import DeveloperError from "./DeveloperError.js"; import Quaternion from "./Quaternion.js"; /** diff --git a/packages/engine/Source/Core/SteppedSpline.js b/packages/engine/Source/Core/SteppedSpline.js index ad12c0497e0c..8048048995a5 100644 --- a/packages/engine/Source/Core/SteppedSpline.js +++ b/packages/engine/Source/Core/SteppedSpline.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Spline from "./Spline.js"; /** diff --git a/packages/engine/Source/Core/Stereographic.js b/packages/engine/Source/Core/Stereographic.js index a130630f6083..4e3a8808ad17 100644 --- a/packages/engine/Source/Core/Stereographic.js +++ b/packages/engine/Source/Core/Stereographic.js @@ -1,8 +1,7 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; import Ellipsoid from "./Ellipsoid.js"; import EllipsoidTangentPlane from "./EllipsoidTangentPlane.js"; import IntersectionTests from "./IntersectionTests.js"; diff --git a/packages/engine/Source/Core/TaskProcessor.js b/packages/engine/Source/Core/TaskProcessor.js index 34adf5695606..a52f210e457f 100644 --- a/packages/engine/Source/Core/TaskProcessor.js +++ b/packages/engine/Source/Core/TaskProcessor.js @@ -1,13 +1,15 @@ +import { + defined, + DeveloperError, + FeatureDetection, + RuntimeError, +} from "@cesium/utils"; import Uri from "urijs"; import buildModuleUrl from "./buildModuleUrl.js"; -import defined from "./defined.js"; import destroyObject from "./destroyObject.js"; -import DeveloperError from "./DeveloperError.js"; import Event from "./Event.js"; -import FeatureDetection from "./FeatureDetection.js"; import isCrossOriginUrl from "./isCrossOriginUrl.js"; import Resource from "./Resource.js"; -import RuntimeError from "./RuntimeError.js"; function canTransferArrayBuffer() { if (!defined(TaskProcessor._canTransferArrayBuffer)) { diff --git a/packages/engine/Source/Core/TerrainData.js b/packages/engine/Source/Core/TerrainData.js index 63ecb9a51ce3..15051b58391a 100644 --- a/packages/engine/Source/Core/TerrainData.js +++ b/packages/engine/Source/Core/TerrainData.js @@ -1,4 +1,4 @@ -import DeveloperError from "./DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * Terrain data for a single tile. This type describes an diff --git a/packages/engine/Source/Core/TerrainEncoding.js b/packages/engine/Source/Core/TerrainEncoding.js index 69d5455e508d..d3e29470ad22 100644 --- a/packages/engine/Source/Core/TerrainEncoding.js +++ b/packages/engine/Source/Core/TerrainEncoding.js @@ -1,12 +1,12 @@ +import { defined } from "@cesium/utils"; import AttributeCompression from "./AttributeCompression.js"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import defined from "./defined.js"; import CesiumMath from "./Math.js"; import Matrix4 from "./Matrix4.js"; -import VerticalExaggeration from "./VerticalExaggeration.js"; import TerrainQuantization from "./TerrainQuantization.js"; +import VerticalExaggeration from "./VerticalExaggeration.js"; const cartesian3Scratch = new Cartesian3(); const cartesian3DimScratch = new Cartesian3(); diff --git a/packages/engine/Source/Core/TerrainProvider.js b/packages/engine/Source/Core/TerrainProvider.js index 8963baa19273..396d569553dd 100644 --- a/packages/engine/Source/Core/TerrainProvider.js +++ b/packages/engine/Source/Core/TerrainProvider.js @@ -1,5 +1,4 @@ -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import IndexDatatype from "./IndexDatatype.js"; import CesiumMath from "./Math.js"; diff --git a/packages/engine/Source/Core/TexturePacker.js b/packages/engine/Source/Core/TexturePacker.js index 6547a742bb9a..b31e0da27398 100644 --- a/packages/engine/Source/Core/TexturePacker.js +++ b/packages/engine/Source/Core/TexturePacker.js @@ -1,6 +1,5 @@ +import { Check, defined } from "@cesium/utils"; import BoundingRectangle from "./BoundingRectangle.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; /** * @typedef {object} TexturePacker.PackableObject diff --git a/packages/engine/Source/Core/TileAvailability.js b/packages/engine/Source/Core/TileAvailability.js index 09c58979775c..ca3fe61a4c26 100644 --- a/packages/engine/Source/Core/TileAvailability.js +++ b/packages/engine/Source/Core/TileAvailability.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import binarySearch from "./binarySearch.js"; import Cartographic from "./Cartographic.js"; -import defined from "./defined.js"; import Rectangle from "./Rectangle.js"; /** diff --git a/packages/engine/Source/Core/TileProviderError.js b/packages/engine/Source/Core/TileProviderError.js index 218749f06978..79ad437d9e9e 100644 --- a/packages/engine/Source/Core/TileProviderError.js +++ b/packages/engine/Source/Core/TileProviderError.js @@ -1,4 +1,4 @@ -import defined from "./defined.js"; +import { defined } from "@cesium/utils"; import formatError from "./formatError.js"; /** diff --git a/packages/engine/Source/Core/TilingScheme.js b/packages/engine/Source/Core/TilingScheme.js index f9bc9fb07f04..882b8566573c 100644 --- a/packages/engine/Source/Core/TilingScheme.js +++ b/packages/engine/Source/Core/TilingScheme.js @@ -1,4 +1,4 @@ -import DeveloperError from "./DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * A tiling scheme for geometry or imagery on the surface of an ellipsoid. At level-of-detail zero, diff --git a/packages/engine/Source/Core/TimeInterval.js b/packages/engine/Source/Core/TimeInterval.js index ee3becc6bb08..2034278f74cf 100644 --- a/packages/engine/Source/Core/TimeInterval.js +++ b/packages/engine/Source/Core/TimeInterval.js @@ -1,7 +1,5 @@ -import Check from "./Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import JulianDate from "./JulianDate.js"; /** diff --git a/packages/engine/Source/Core/TimeIntervalCollection.js b/packages/engine/Source/Core/TimeIntervalCollection.js index eb59cdbc5103..b072f21f6d7c 100644 --- a/packages/engine/Source/Core/TimeIntervalCollection.js +++ b/packages/engine/Source/Core/TimeIntervalCollection.js @@ -1,8 +1,7 @@ +import { defined, DeveloperError } from "@cesium/utils"; import binarySearch from "./binarySearch.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Event from "./Event.js"; +import Frozen from "./Frozen.js"; import GregorianDate from "./GregorianDate.js"; import isLeapYear from "./isLeapYear.js"; import Iso8601 from "./Iso8601.js"; diff --git a/packages/engine/Source/Core/Tipsify.js b/packages/engine/Source/Core/Tipsify.js index 1da4b85004dd..94e109bd6cdd 100644 --- a/packages/engine/Source/Core/Tipsify.js +++ b/packages/engine/Source/Core/Tipsify.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; /** * Encapsulates an algorithm to optimize triangles for the post diff --git a/packages/engine/Source/Core/Transforms.js b/packages/engine/Source/Core/Transforms.js index 282726bec75b..bba0084e6e15 100644 --- a/packages/engine/Source/Core/Transforms.js +++ b/packages/engine/Source/Core/Transforms.js @@ -1,10 +1,8 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; import Cartesian4 from "./Cartesian4.js"; import Cartographic from "./Cartographic.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import EarthOrientationParameters from "./EarthOrientationParameters.js"; import EarthOrientationParametersSample from "./EarthOrientationParametersSample.js"; import Ellipsoid from "./Ellipsoid.js"; diff --git a/packages/engine/Source/Core/TranslationRotationScale.js b/packages/engine/Source/Core/TranslationRotationScale.js index 508cebdee9dc..cf2abf92f973 100644 --- a/packages/engine/Source/Core/TranslationRotationScale.js +++ b/packages/engine/Source/Core/TranslationRotationScale.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; -import defined from "./defined.js"; import Quaternion from "./Quaternion.js"; const defaultScale = new Cartesian3(1.0, 1.0, 1.0); diff --git a/packages/engine/Source/Core/TridiagonalSystemSolver.js b/packages/engine/Source/Core/TridiagonalSystemSolver.js index 9291b96c0e8b..3a105feb67c8 100644 --- a/packages/engine/Source/Core/TridiagonalSystemSolver.js +++ b/packages/engine/Source/Core/TridiagonalSystemSolver.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; /** * Uses the Tridiagonal Matrix Algorithm, also known as the Thomas Algorithm, to solve diff --git a/packages/engine/Source/Core/TrustedServers.js b/packages/engine/Source/Core/TrustedServers.js index 92b24ae7cef5..01e3ab785dd5 100644 --- a/packages/engine/Source/Core/TrustedServers.js +++ b/packages/engine/Source/Core/TrustedServers.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Uri from "urijs"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; /** * A singleton that contains all of the servers that are trusted. Credentials will be sent with diff --git a/packages/engine/Source/Core/VRTheWorldTerrainProvider.js b/packages/engine/Source/Core/VRTheWorldTerrainProvider.js index c3b8cf1fae17..66a6e355b314 100644 --- a/packages/engine/Source/Core/VRTheWorldTerrainProvider.js +++ b/packages/engine/Source/Core/VRTheWorldTerrainProvider.js @@ -1,16 +1,14 @@ -import Check from "./Check.js"; +import { Check, defined, RuntimeError } from "@cesium/utils"; import Credit from "./Credit.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; import Ellipsoid from "./Ellipsoid.js"; import Event from "./Event.js"; +import Frozen from "./Frozen.js"; import GeographicTilingScheme from "./GeographicTilingScheme.js"; import getImagePixels from "./getImagePixels.js"; import HeightmapTerrainData from "./HeightmapTerrainData.js"; import CesiumMath from "./Math.js"; import Rectangle from "./Rectangle.js"; import Resource from "./Resource.js"; -import RuntimeError from "./RuntimeError.js"; import TerrainProvider from "./TerrainProvider.js"; import TileProviderError from "./TileProviderError.js"; diff --git a/packages/engine/Source/Core/VertexFormat.js b/packages/engine/Source/Core/VertexFormat.js index 71146dbcec87..3526e01cfb5d 100644 --- a/packages/engine/Source/Core/VertexFormat.js +++ b/packages/engine/Source/Core/VertexFormat.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; /** * A vertex format defines what attributes make up a vertex. A VertexFormat can be provided diff --git a/packages/engine/Source/Core/VerticalExaggeration.js b/packages/engine/Source/Core/VerticalExaggeration.js index e2208071eacc..fa5da8ab87ad 100644 --- a/packages/engine/Source/Core/VerticalExaggeration.js +++ b/packages/engine/Source/Core/VerticalExaggeration.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import DeveloperError from "./DeveloperError.js"; -import defined from "./defined.js"; /** * @private diff --git a/packages/engine/Source/Core/VideoSynchronizer.js b/packages/engine/Source/Core/VideoSynchronizer.js index 3e8e19aaac43..50365ab8ed6f 100644 --- a/packages/engine/Source/Core/VideoSynchronizer.js +++ b/packages/engine/Source/Core/VideoSynchronizer.js @@ -1,6 +1,6 @@ -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; +import { defined } from "@cesium/utils"; import destroyObject from "./destroyObject.js"; +import Frozen from "./Frozen.js"; import Iso8601 from "./Iso8601.js"; import JulianDate from "./JulianDate.js"; diff --git a/packages/engine/Source/Core/WallGeometry.js b/packages/engine/Source/Core/WallGeometry.js index 53b27d09a699..9ec1109d76d7 100644 --- a/packages/engine/Source/Core/WallGeometry.js +++ b/packages/engine/Source/Core/WallGeometry.js @@ -1,10 +1,9 @@ +import { defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; +import Frozen from "./Frozen.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/WallGeometryLibrary.js b/packages/engine/Source/Core/WallGeometryLibrary.js index cc64fe836d74..b4d1d29aed7e 100644 --- a/packages/engine/Source/Core/WallGeometryLibrary.js +++ b/packages/engine/Source/Core/WallGeometryLibrary.js @@ -1,7 +1,7 @@ +import { defined } from "@cesium/utils"; import arrayRemoveDuplicates from "./arrayRemoveDuplicates.js"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import defined from "./defined.js"; import CesiumMath from "./Math.js"; import PolylinePipeline from "./PolylinePipeline.js"; diff --git a/packages/engine/Source/Core/WallOutlineGeometry.js b/packages/engine/Source/Core/WallOutlineGeometry.js index afef9cb6e6d2..5eced9791ecb 100644 --- a/packages/engine/Source/Core/WallOutlineGeometry.js +++ b/packages/engine/Source/Core/WallOutlineGeometry.js @@ -1,10 +1,9 @@ +import { defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "./BoundingSphere.js"; import Cartesian3 from "./Cartesian3.js"; import ComponentDatatype from "./ComponentDatatype.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; +import Frozen from "./Frozen.js"; import Geometry from "./Geometry.js"; import GeometryAttribute from "./GeometryAttribute.js"; import GeometryAttributes from "./GeometryAttributes.js"; diff --git a/packages/engine/Source/Core/WebMercatorProjection.js b/packages/engine/Source/Core/WebMercatorProjection.js index 866bdf07e3ca..36f25b31e8e1 100644 --- a/packages/engine/Source/Core/WebMercatorProjection.js +++ b/packages/engine/Source/Core/WebMercatorProjection.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; import Cartographic from "./Cartographic.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import Ellipsoid from "./Ellipsoid.js"; import CesiumMath from "./Math.js"; diff --git a/packages/engine/Source/Core/WebMercatorTilingScheme.js b/packages/engine/Source/Core/WebMercatorTilingScheme.js index d3a89a590350..9b4390143b18 100644 --- a/packages/engine/Source/Core/WebMercatorTilingScheme.js +++ b/packages/engine/Source/Core/WebMercatorTilingScheme.js @@ -1,7 +1,7 @@ +import { defined } from "@cesium/utils"; import Cartesian2 from "./Cartesian2.js"; -import Frozen from "./Frozen.js"; -import defined from "./defined.js"; import Ellipsoid from "./Ellipsoid.js"; +import Frozen from "./Frozen.js"; import Rectangle from "./Rectangle.js"; import WebMercatorProjection from "./WebMercatorProjection.js"; diff --git a/packages/engine/Source/Core/WireframeIndexGenerator.js b/packages/engine/Source/Core/WireframeIndexGenerator.js index 2ad790353286..221ef822308e 100644 --- a/packages/engine/Source/Core/WireframeIndexGenerator.js +++ b/packages/engine/Source/Core/WireframeIndexGenerator.js @@ -1,4 +1,4 @@ -import defined from "./defined.js"; +import { defined } from "@cesium/utils"; import IndexDatatype from "./IndexDatatype.js"; import PrimitiveType from "./PrimitiveType.js"; diff --git a/packages/engine/Source/Core/arrayRemoveDuplicates.js b/packages/engine/Source/Core/arrayRemoveDuplicates.js index 30fcf6371783..a27560fe6a5a 100644 --- a/packages/engine/Source/Core/arrayRemoveDuplicates.js +++ b/packages/engine/Source/Core/arrayRemoveDuplicates.js @@ -1,5 +1,4 @@ -import Check from "./Check.js"; -import defined from "./defined.js"; +import { Check, defined } from "@cesium/utils"; import CesiumMath from "./Math.js"; const removeDuplicatesEpsilon = CesiumMath.EPSILON10; diff --git a/packages/engine/Source/Core/barycentricCoordinates.js b/packages/engine/Source/Core/barycentricCoordinates.js index 0e8f7930cb17..41cfd7eae9a1 100644 --- a/packages/engine/Source/Core/barycentricCoordinates.js +++ b/packages/engine/Source/Core/barycentricCoordinates.js @@ -1,7 +1,6 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian2 from "./Cartesian2.js"; import Cartesian3 from "./Cartesian3.js"; -import Check from "./Check.js"; -import defined from "./defined.js"; import CesiumMath from "./Math.js"; const scratchCartesian1 = new Cartesian3(); diff --git a/packages/engine/Source/Core/binarySearch.js b/packages/engine/Source/Core/binarySearch.js index 5cbb2890b96a..c5744f32731c 100644 --- a/packages/engine/Source/Core/binarySearch.js +++ b/packages/engine/Source/Core/binarySearch.js @@ -1,4 +1,4 @@ -import Check from "./Check.js"; +import { Check } from "@cesium/utils"; /** * Finds an item in a sorted array. diff --git a/packages/engine/Source/Core/buildModuleUrl.js b/packages/engine/Source/Core/buildModuleUrl.js index c992d6115ab1..28f0bb0ac342 100644 --- a/packages/engine/Source/Core/buildModuleUrl.js +++ b/packages/engine/Source/Core/buildModuleUrl.js @@ -1,5 +1,4 @@ -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import getAbsoluteUri from "./getAbsoluteUri.js"; import Resource from "./Resource.js"; diff --git a/packages/engine/Source/Core/combine.js b/packages/engine/Source/Core/combine.js index 75ea5bca65d0..4baa440c9879 100644 --- a/packages/engine/Source/Core/combine.js +++ b/packages/engine/Source/Core/combine.js @@ -1,4 +1,4 @@ -import defined from "./defined.js"; +import { defined } from "@cesium/utils"; /** * Merges two objects, copying their properties onto a new combined object. When two objects have the same diff --git a/packages/engine/Source/Core/createWorldTerrainAsync.js b/packages/engine/Source/Core/createWorldTerrainAsync.js index 19ce686e62fa..eee69d7bb6fb 100644 --- a/packages/engine/Source/Core/createWorldTerrainAsync.js +++ b/packages/engine/Source/Core/createWorldTerrainAsync.js @@ -1,6 +1,6 @@ import CesiumTerrainProvider from "./CesiumTerrainProvider.js"; -import Frozen from "./Frozen.js"; import Ellipsoid from "./Ellipsoid.js"; +import Frozen from "./Frozen.js"; /** * Creates a {@link CesiumTerrainProvider} instance for the {@link https://cesium.com/content/#cesium-world-terrain|Cesium World Terrain}. diff --git a/packages/engine/Source/Core/decodeGoogleEarthEnterpriseData.js b/packages/engine/Source/Core/decodeGoogleEarthEnterpriseData.js index f8549189211d..defa8fa8e043 100644 --- a/packages/engine/Source/Core/decodeGoogleEarthEnterpriseData.js +++ b/packages/engine/Source/Core/decodeGoogleEarthEnterpriseData.js @@ -1,5 +1,4 @@ -import Check from "./Check.js"; -import RuntimeError from "./RuntimeError.js"; +import { Check, RuntimeError } from "@cesium/utils"; const compressedMagic = 0x7468dead; const compressedMagicSwap = 0xadde6874; diff --git a/packages/engine/Source/Core/defer.js b/packages/engine/Source/Core/defer.js deleted file mode 100644 index 2e6c510fc22c..000000000000 --- a/packages/engine/Source/Core/defer.js +++ /dev/null @@ -1,44 +0,0 @@ -/** - * A function used to resolve a promise upon completion . - * @callback defer.resolve - * - * @param {*} value The resulting value. - */ - -/** - * A function used to reject a promise upon failure. - * @callback defer.reject - * - * @param {*} error The error. - */ - -/** - * An object which contains a promise object, and functions to resolve or reject the promise. - * - * @typedef {object} defer.deferred - * @property {defer.resolve} resolve Resolves the promise when called. - * @property {defer.reject} reject Rejects the promise when called. - * @property {Promise} promise Promise object. - */ - -/** - * Creates a deferred object, containing a promise object, and functions to resolve or reject the promise. - * @returns {defer.deferred} - * @private - */ -function defer() { - let resolve; - let reject; - const promise = new Promise(function (res, rej) { - resolve = res; - reject = rej; - }); - - return { - resolve: resolve, - reject: reject, - promise: promise, - }; -} - -export default defer; diff --git a/packages/engine/Source/Core/defined.d.ts b/packages/engine/Source/Core/defined.d.ts deleted file mode 100644 index d4cfc604b352..000000000000 --- a/packages/engine/Source/Core/defined.d.ts +++ /dev/null @@ -1,11 +0,0 @@ -/** - * @example - * if (Cesium.defined(positions)) { - * doSomething(); - * } else { - * doSomethingElse(); - * } - * @param value - The object. - * @returns Returns true if the object is defined, returns false otherwise. - */ -export default function defined(value: Type): value is NonNullable; diff --git a/packages/engine/Source/Core/deprecationWarning.js b/packages/engine/Source/Core/deprecationWarning.js index 0b9c727b8290..cf3a36e924be 100644 --- a/packages/engine/Source/Core/deprecationWarning.js +++ b/packages/engine/Source/Core/deprecationWarning.js @@ -1,5 +1,4 @@ -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import oneTimeWarning from "./oneTimeWarning.js"; /** diff --git a/packages/engine/Source/Core/destroyObject.js b/packages/engine/Source/Core/destroyObject.js index bf9bf0153a69..2e20c0438407 100644 --- a/packages/engine/Source/Core/destroyObject.js +++ b/packages/engine/Source/Core/destroyObject.js @@ -1,4 +1,4 @@ -import DeveloperError from "./DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; function returnTrue() { return true; diff --git a/packages/engine/Source/Core/formatError.js b/packages/engine/Source/Core/formatError.js index 3ef17614f97a..d6f500125bb8 100644 --- a/packages/engine/Source/Core/formatError.js +++ b/packages/engine/Source/Core/formatError.js @@ -1,4 +1,4 @@ -import defined from "./defined.js"; +import { defined } from "@cesium/utils"; /** * Formats an error object into a String. If available, uses name, message, and stack diff --git a/packages/engine/Source/Core/getAbsoluteUri.js b/packages/engine/Source/Core/getAbsoluteUri.js index 3818b0de6ad2..f63b0cc69ce3 100644 --- a/packages/engine/Source/Core/getAbsoluteUri.js +++ b/packages/engine/Source/Core/getAbsoluteUri.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Uri from "urijs"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; /** * Given a relative Uri and a base Uri, returns the absolute Uri of the relative Uri. diff --git a/packages/engine/Source/Core/getBaseUri.js b/packages/engine/Source/Core/getBaseUri.js index 78c600cafbcb..668662e5e058 100644 --- a/packages/engine/Source/Core/getBaseUri.js +++ b/packages/engine/Source/Core/getBaseUri.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Uri from "urijs"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; /** * Given a URI, returns the base path of the URI. diff --git a/packages/engine/Source/Core/getExtensionFromUri.js b/packages/engine/Source/Core/getExtensionFromUri.js index f51ea912d353..3d22adb35e25 100644 --- a/packages/engine/Source/Core/getExtensionFromUri.js +++ b/packages/engine/Source/Core/getExtensionFromUri.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Uri from "urijs"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; /** * Given a URI, returns the extension of the URI. diff --git a/packages/engine/Source/Core/getFilenameFromUri.js b/packages/engine/Source/Core/getFilenameFromUri.js index ee250c0173ec..d1237e6c93e6 100644 --- a/packages/engine/Source/Core/getFilenameFromUri.js +++ b/packages/engine/Source/Core/getFilenameFromUri.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Uri from "urijs"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; /** * Given a URI, returns the last segment of the URI, removing any path or query information. diff --git a/packages/engine/Source/Core/getImagePixels.js b/packages/engine/Source/Core/getImagePixels.js index 055ab47c85bd..b9fb5249c508 100644 --- a/packages/engine/Source/Core/getImagePixels.js +++ b/packages/engine/Source/Core/getImagePixels.js @@ -1,4 +1,4 @@ -import defined from "./defined.js"; +import { defined } from "@cesium/utils"; const context2DsByWidthAndHeight = {}; diff --git a/packages/engine/Source/Core/getStringFromTypedArray.js b/packages/engine/Source/Core/getStringFromTypedArray.js index 011714f3683f..c595e0ad3ff7 100644 --- a/packages/engine/Source/Core/getStringFromTypedArray.js +++ b/packages/engine/Source/Core/getStringFromTypedArray.js @@ -1,6 +1,4 @@ -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; -import RuntimeError from "./RuntimeError.js"; +import { defined, DeveloperError, RuntimeError } from "@cesium/utils"; /** * Reads a string from a Uint8Array. diff --git a/packages/engine/Source/Core/isBlobUri.js b/packages/engine/Source/Core/isBlobUri.js index 9e3f6c384599..95d26ec60eeb 100644 --- a/packages/engine/Source/Core/isBlobUri.js +++ b/packages/engine/Source/Core/isBlobUri.js @@ -1,4 +1,4 @@ -import Check from "./Check.js"; +import { Check } from "@cesium/utils"; const blobUriRegex = /^blob:/i; diff --git a/packages/engine/Source/Core/isCrossOriginUrl.js b/packages/engine/Source/Core/isCrossOriginUrl.js index 45570389c956..763bc5c16d57 100644 --- a/packages/engine/Source/Core/isCrossOriginUrl.js +++ b/packages/engine/Source/Core/isCrossOriginUrl.js @@ -1,4 +1,4 @@ -import defined from "./defined.js"; +import { defined } from "@cesium/utils"; let a; diff --git a/packages/engine/Source/Core/isDataUri.js b/packages/engine/Source/Core/isDataUri.js index bb5ef14bef0f..a0608b2d92c5 100644 --- a/packages/engine/Source/Core/isDataUri.js +++ b/packages/engine/Source/Core/isDataUri.js @@ -1,4 +1,4 @@ -import Check from "./Check.js"; +import { Check } from "@cesium/utils"; const dataUriRegex = /^data:/i; diff --git a/packages/engine/Source/Core/isLeapYear.js b/packages/engine/Source/Core/isLeapYear.js index 404b3725b9e8..be1cfbd13a43 100644 --- a/packages/engine/Source/Core/isLeapYear.js +++ b/packages/engine/Source/Core/isLeapYear.js @@ -1,4 +1,4 @@ -import DeveloperError from "./DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * Determines if a given date is a leap year. diff --git a/packages/engine/Source/Core/loadImageFromTypedArray.js b/packages/engine/Source/Core/loadImageFromTypedArray.js index ad843360d5ff..8b440aaf717e 100644 --- a/packages/engine/Source/Core/loadImageFromTypedArray.js +++ b/packages/engine/Source/Core/loadImageFromTypedArray.js @@ -1,5 +1,4 @@ -import Check from "./Check.js"; -import defined from "./defined.js"; +import { Check, defined } from "@cesium/utils"; import Resource from "./Resource.js"; /** diff --git a/packages/engine/Source/Core/loadKTX2.js b/packages/engine/Source/Core/loadKTX2.js index a4cee9d0f9bd..52ac63cb2376 100644 --- a/packages/engine/Source/Core/loadKTX2.js +++ b/packages/engine/Source/Core/loadKTX2.js @@ -1,6 +1,6 @@ -import Check from "./Check.js"; -import Resource from "./Resource.js"; +import { Check } from "@cesium/utils"; import KTX2Transcoder from "./KTX2Transcoder.js"; +import Resource from "./Resource.js"; /** * Stores the supported formats that KTX2 can transcode to. Called during context creation. diff --git a/packages/engine/Source/Core/mergeSort.js b/packages/engine/Source/Core/mergeSort.js index ea60bd763811..d7441c4e9c7d 100644 --- a/packages/engine/Source/Core/mergeSort.js +++ b/packages/engine/Source/Core/mergeSort.js @@ -1,5 +1,4 @@ -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; const leftScratchArray = []; const rightScratchArray = []; diff --git a/packages/engine/Source/Core/objectToQuery.js b/packages/engine/Source/Core/objectToQuery.js index c9a6e960f338..1871d76e82a4 100644 --- a/packages/engine/Source/Core/objectToQuery.js +++ b/packages/engine/Source/Core/objectToQuery.js @@ -1,5 +1,4 @@ -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; /** * Converts an object representing a set of name/value pairs into a query string, diff --git a/packages/engine/Source/Core/oneTimeWarning.js b/packages/engine/Source/Core/oneTimeWarning.js index 8315f00fb0f0..d7ecabd567f5 100644 --- a/packages/engine/Source/Core/oneTimeWarning.js +++ b/packages/engine/Source/Core/oneTimeWarning.js @@ -1,5 +1,4 @@ -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; const warnings = {}; diff --git a/packages/engine/Source/Core/pointInsideTriangle.js b/packages/engine/Source/Core/pointInsideTriangle.js index 1ebaa09d7dee..4a5b8bdbc4f4 100644 --- a/packages/engine/Source/Core/pointInsideTriangle.js +++ b/packages/engine/Source/Core/pointInsideTriangle.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import barycentricCoordinates from "./barycentricCoordinates.js"; import Cartesian3 from "./Cartesian3.js"; -import defined from "./defined.js"; const scratchBarycentricCoords = new Cartesian3(); diff --git a/packages/engine/Source/Core/queryToObject.js b/packages/engine/Source/Core/queryToObject.js index 0aa374bab876..2a09976fa439 100644 --- a/packages/engine/Source/Core/queryToObject.js +++ b/packages/engine/Source/Core/queryToObject.js @@ -1,5 +1,4 @@ -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; /** * Parses a query string into an object, where the keys and values of the object are the diff --git a/packages/engine/Source/Core/sampleTerrain.js b/packages/engine/Source/Core/sampleTerrain.js index 747dc4bef8a6..5eac9fc6f53f 100644 --- a/packages/engine/Source/Core/sampleTerrain.js +++ b/packages/engine/Source/Core/sampleTerrain.js @@ -1,5 +1,4 @@ -import Check from "./Check.js"; -import defined from "./defined.js"; +import { Check, defined } from "@cesium/utils"; /** * Initiates a terrain height query for an array of {@link Cartographic} positions by diff --git a/packages/engine/Source/Core/sampleTerrainMostDetailed.js b/packages/engine/Source/Core/sampleTerrainMostDetailed.js index b2eec762b5a9..cdf41fd3b316 100644 --- a/packages/engine/Source/Core/sampleTerrainMostDetailed.js +++ b/packages/engine/Source/Core/sampleTerrainMostDetailed.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian2 from "./Cartesian2.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import sampleTerrain from "./sampleTerrain.js"; const scratchCartesian2 = new Cartesian2(); diff --git a/packages/engine/Source/Core/scaleToGeodeticSurface.js b/packages/engine/Source/Core/scaleToGeodeticSurface.js index 040972d14f74..071a7b47f222 100644 --- a/packages/engine/Source/Core/scaleToGeodeticSurface.js +++ b/packages/engine/Source/Core/scaleToGeodeticSurface.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "./Cartesian3.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; import CesiumMath from "./Math.js"; const scaleToGeodeticSurfaceIntersection = new Cartesian3(); diff --git a/packages/engine/Source/Core/srgbToLinear.js b/packages/engine/Source/Core/srgbToLinear.js index 454b2ec2ae89..9b4e8e9de0c1 100644 --- a/packages/engine/Source/Core/srgbToLinear.js +++ b/packages/engine/Source/Core/srgbToLinear.js @@ -1,4 +1,4 @@ -import Check from "./Check.js"; +import { Check } from "@cesium/utils"; /** * Converts the value from sRGB color space to linear color space. diff --git a/packages/engine/Source/Core/subdivideArray.js b/packages/engine/Source/Core/subdivideArray.js index 9404c76f43c4..56c6ed658747 100644 --- a/packages/engine/Source/Core/subdivideArray.js +++ b/packages/engine/Source/Core/subdivideArray.js @@ -1,5 +1,4 @@ -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; /** * Subdivides an array into a number of smaller, equal sized arrays. diff --git a/packages/engine/Source/Core/wrapFunction.js b/packages/engine/Source/Core/wrapFunction.js index 56781e037ae4..1d69f8128418 100644 --- a/packages/engine/Source/Core/wrapFunction.js +++ b/packages/engine/Source/Core/wrapFunction.js @@ -1,4 +1,4 @@ -import DeveloperError from "./DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * Wraps a function on the provided objects with another function called in the diff --git a/packages/engine/Source/Core/writeTextToCanvas.js b/packages/engine/Source/Core/writeTextToCanvas.js index 9e62e1255878..7071c824bc4a 100644 --- a/packages/engine/Source/Core/writeTextToCanvas.js +++ b/packages/engine/Source/Core/writeTextToCanvas.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Color from "./Color.js"; import Frozen from "./Frozen.js"; -import defined from "./defined.js"; -import DeveloperError from "./DeveloperError.js"; function measureText(context2D, textString, font, stroke, fill) { const metrics = context2D.measureText(textString); diff --git a/packages/engine/Source/DataSources/BillboardGraphics.js b/packages/engine/Source/DataSources/BillboardGraphics.js index 8bca227f76e1..ae2c3d91a11a 100644 --- a/packages/engine/Source/DataSources/BillboardGraphics.js +++ b/packages/engine/Source/DataSources/BillboardGraphics.js @@ -1,7 +1,6 @@ -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; /** diff --git a/packages/engine/Source/DataSources/BillboardVisualizer.js b/packages/engine/Source/DataSources/BillboardVisualizer.js index f01ca3220cf1..c4cd6c99169b 100644 --- a/packages/engine/Source/DataSources/BillboardVisualizer.js +++ b/packages/engine/Source/DataSources/BillboardVisualizer.js @@ -1,19 +1,18 @@ +import { defined, DeveloperError } from "@cesium/utils"; import AssociativeArray from "../Core/AssociativeArray.js"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import DistanceDisplayCondition from "../Core/DistanceDisplayCondition.js"; import NearFarScalar from "../Core/NearFarScalar.js"; import HeightReference from "../Scene/HeightReference.js"; import HorizontalOrigin from "../Scene/HorizontalOrigin.js"; +import SplitDirection from "../Scene/SplitDirection.js"; import VerticalOrigin from "../Scene/VerticalOrigin.js"; import BoundingSphereState from "./BoundingSphereState.js"; import Property from "./Property.js"; -import SplitDirection from "../Scene/SplitDirection.js"; const defaultColor = Color.WHITE; const defaultEyeOffset = Cartesian3.ZERO; diff --git a/packages/engine/Source/DataSources/BoxGeometryUpdater.js b/packages/engine/Source/DataSources/BoxGeometryUpdater.js index f534f841d03f..ccd0d2741fef 100644 --- a/packages/engine/Source/DataSources/BoxGeometryUpdater.js +++ b/packages/engine/Source/DataSources/BoxGeometryUpdater.js @@ -1,11 +1,9 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import BoxGeometry from "../Core/BoxGeometry.js"; import BoxOutlineGeometry from "../Core/BoxOutlineGeometry.js"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import DistanceDisplayConditionGeometryInstanceAttribute from "../Core/DistanceDisplayConditionGeometryInstanceAttribute.js"; import GeometryInstance from "../Core/GeometryInstance.js"; import GeometryOffsetAttribute from "../Core/GeometryOffsetAttribute.js"; diff --git a/packages/engine/Source/DataSources/BoxGraphics.js b/packages/engine/Source/DataSources/BoxGraphics.js index 520f823fd854..8e05e0ffc342 100644 --- a/packages/engine/Source/DataSources/BoxGraphics.js +++ b/packages/engine/Source/DataSources/BoxGraphics.js @@ -1,7 +1,6 @@ -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import createMaterialPropertyDescriptor from "./createMaterialPropertyDescriptor.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; diff --git a/packages/engine/Source/DataSources/CallbackPositionProperty.js b/packages/engine/Source/DataSources/CallbackPositionProperty.js index 99efe9eb795f..2cd5d3335638 100644 --- a/packages/engine/Source/DataSources/CallbackPositionProperty.js +++ b/packages/engine/Source/DataSources/CallbackPositionProperty.js @@ -1,5 +1,4 @@ -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; import JulianDate from "../Core/JulianDate.js"; import ReferenceFrame from "../Core/ReferenceFrame.js"; diff --git a/packages/engine/Source/DataSources/CallbackProperty.js b/packages/engine/Source/DataSources/CallbackProperty.js index 3611241ed407..f79e221a3038 100644 --- a/packages/engine/Source/DataSources/CallbackProperty.js +++ b/packages/engine/Source/DataSources/CallbackProperty.js @@ -1,5 +1,4 @@ -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; import JulianDate from "../Core/JulianDate.js"; diff --git a/packages/engine/Source/DataSources/Cesium3DTilesetGraphics.js b/packages/engine/Source/DataSources/Cesium3DTilesetGraphics.js index 91dbd2fea567..133cd690de9c 100644 --- a/packages/engine/Source/DataSources/Cesium3DTilesetGraphics.js +++ b/packages/engine/Source/DataSources/Cesium3DTilesetGraphics.js @@ -1,7 +1,6 @@ -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; /** diff --git a/packages/engine/Source/DataSources/Cesium3DTilesetVisualizer.js b/packages/engine/Source/DataSources/Cesium3DTilesetVisualizer.js index 314edf37e1c1..b722dbd039b7 100644 --- a/packages/engine/Source/DataSources/Cesium3DTilesetVisualizer.js +++ b/packages/engine/Source/DataSources/Cesium3DTilesetVisualizer.js @@ -1,8 +1,7 @@ +import { defined, DeveloperError } from "@cesium/utils"; import AssociativeArray from "../Core/AssociativeArray.js"; import BoundingSphere from "../Core/BoundingSphere.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Matrix4 from "../Core/Matrix4.js"; import Resource from "../Core/Resource.js"; import Cesium3DTileset from "../Scene/Cesium3DTileset.js"; diff --git a/packages/engine/Source/DataSources/CheckerboardMaterialProperty.js b/packages/engine/Source/DataSources/CheckerboardMaterialProperty.js index 1a56c8c87480..9feb9b0d0cc0 100644 --- a/packages/engine/Source/DataSources/CheckerboardMaterialProperty.js +++ b/packages/engine/Source/DataSources/CheckerboardMaterialProperty.js @@ -1,8 +1,8 @@ +import { defined } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Color from "../Core/Color.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import JulianDate from "../Core/JulianDate.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; import Property from "./Property.js"; diff --git a/packages/engine/Source/DataSources/ColorMaterialProperty.js b/packages/engine/Source/DataSources/ColorMaterialProperty.js index 6ed511ca4ace..2b9b5d2500f7 100644 --- a/packages/engine/Source/DataSources/ColorMaterialProperty.js +++ b/packages/engine/Source/DataSources/ColorMaterialProperty.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import Event from "../Core/Event.js"; import JulianDate from "../Core/JulianDate.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; diff --git a/packages/engine/Source/DataSources/CompositeEntityCollection.js b/packages/engine/Source/DataSources/CompositeEntityCollection.js index aca6e2e61b82..4f2de46c83b0 100644 --- a/packages/engine/Source/DataSources/CompositeEntityCollection.js +++ b/packages/engine/Source/DataSources/CompositeEntityCollection.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import createGuid from "../Core/createGuid.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import CesiumMath from "../Core/Math.js"; import Entity from "./Entity.js"; import EntityCollection from "./EntityCollection.js"; diff --git a/packages/engine/Source/DataSources/CompositeMaterialProperty.js b/packages/engine/Source/DataSources/CompositeMaterialProperty.js index 93b16ab7aecf..6b7720e28538 100644 --- a/packages/engine/Source/DataSources/CompositeMaterialProperty.js +++ b/packages/engine/Source/DataSources/CompositeMaterialProperty.js @@ -1,5 +1,4 @@ -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; import JulianDate from "../Core/JulianDate.js"; import CompositeProperty from "./CompositeProperty.js"; diff --git a/packages/engine/Source/DataSources/CompositePositionProperty.js b/packages/engine/Source/DataSources/CompositePositionProperty.js index eb20e0fce51a..c5017b38ba95 100644 --- a/packages/engine/Source/DataSources/CompositePositionProperty.js +++ b/packages/engine/Source/DataSources/CompositePositionProperty.js @@ -1,5 +1,4 @@ -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; import JulianDate from "../Core/JulianDate.js"; import ReferenceFrame from "../Core/ReferenceFrame.js"; diff --git a/packages/engine/Source/DataSources/CompositeProperty.js b/packages/engine/Source/DataSources/CompositeProperty.js index fa90f54ffa6e..a291d765a10a 100644 --- a/packages/engine/Source/DataSources/CompositeProperty.js +++ b/packages/engine/Source/DataSources/CompositeProperty.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import Event from "../Core/Event.js"; import EventHelper from "../Core/EventHelper.js"; import JulianDate from "../Core/JulianDate.js"; diff --git a/packages/engine/Source/DataSources/ConstantPositionProperty.js b/packages/engine/Source/DataSources/ConstantPositionProperty.js index 3069f8750fc3..35b172b13f4f 100644 --- a/packages/engine/Source/DataSources/ConstantPositionProperty.js +++ b/packages/engine/Source/DataSources/ConstantPositionProperty.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Event from "../Core/Event.js"; import JulianDate from "../Core/JulianDate.js"; import ReferenceFrame from "../Core/ReferenceFrame.js"; diff --git a/packages/engine/Source/DataSources/ConstantProperty.js b/packages/engine/Source/DataSources/ConstantProperty.js index 79cbec143a33..02e169692e66 100644 --- a/packages/engine/Source/DataSources/ConstantProperty.js +++ b/packages/engine/Source/DataSources/ConstantProperty.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import Event from "../Core/Event.js"; /** diff --git a/packages/engine/Source/DataSources/CorridorGeometryUpdater.js b/packages/engine/Source/DataSources/CorridorGeometryUpdater.js index b0ae56966580..029c630704a3 100644 --- a/packages/engine/Source/DataSources/CorridorGeometryUpdater.js +++ b/packages/engine/Source/DataSources/CorridorGeometryUpdater.js @@ -1,12 +1,10 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import ApproximateTerrainHeights from "../Core/ApproximateTerrainHeights.js"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; import CorridorGeometry from "../Core/CorridorGeometry.js"; import CorridorOutlineGeometry from "../Core/CorridorOutlineGeometry.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import DistanceDisplayConditionGeometryInstanceAttribute from "../Core/DistanceDisplayConditionGeometryInstanceAttribute.js"; import GeometryInstance from "../Core/GeometryInstance.js"; import Iso8601 from "../Core/Iso8601.js"; diff --git a/packages/engine/Source/DataSources/CorridorGraphics.js b/packages/engine/Source/DataSources/CorridorGraphics.js index 88e318c0081e..87451b86e208 100644 --- a/packages/engine/Source/DataSources/CorridorGraphics.js +++ b/packages/engine/Source/DataSources/CorridorGraphics.js @@ -1,7 +1,6 @@ -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import createMaterialPropertyDescriptor from "./createMaterialPropertyDescriptor.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; diff --git a/packages/engine/Source/DataSources/CustomDataSource.js b/packages/engine/Source/DataSources/CustomDataSource.js index a853be4c438a..bbfe0b420dcd 100644 --- a/packages/engine/Source/DataSources/CustomDataSource.js +++ b/packages/engine/Source/DataSources/CustomDataSource.js @@ -1,5 +1,4 @@ -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; import DataSource from "./DataSource.js"; import EntityCluster from "./EntityCluster.js"; diff --git a/packages/engine/Source/DataSources/CylinderGeometryUpdater.js b/packages/engine/Source/DataSources/CylinderGeometryUpdater.js index 086d74834dd5..b4ad2180b2c7 100644 --- a/packages/engine/Source/DataSources/CylinderGeometryUpdater.js +++ b/packages/engine/Source/DataSources/CylinderGeometryUpdater.js @@ -1,11 +1,9 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; import CylinderGeometry from "../Core/CylinderGeometry.js"; import CylinderOutlineGeometry from "../Core/CylinderOutlineGeometry.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import DistanceDisplayConditionGeometryInstanceAttribute from "../Core/DistanceDisplayConditionGeometryInstanceAttribute.js"; import GeometryInstance from "../Core/GeometryInstance.js"; import GeometryOffsetAttribute from "../Core/GeometryOffsetAttribute.js"; diff --git a/packages/engine/Source/DataSources/CylinderGraphics.js b/packages/engine/Source/DataSources/CylinderGraphics.js index 5046b51c6347..be1e255cba03 100644 --- a/packages/engine/Source/DataSources/CylinderGraphics.js +++ b/packages/engine/Source/DataSources/CylinderGraphics.js @@ -1,7 +1,6 @@ -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import createMaterialPropertyDescriptor from "./createMaterialPropertyDescriptor.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; diff --git a/packages/engine/Source/DataSources/CzmlDataSource.js b/packages/engine/Source/DataSources/CzmlDataSource.js index 4f08f5d28af2..365ea931f6b3 100644 --- a/packages/engine/Source/DataSources/CzmlDataSource.js +++ b/packages/engine/Source/DataSources/CzmlDataSource.js @@ -1,3 +1,5 @@ +import { defined, DeveloperError, RuntimeError } from "@cesium/utils"; +import Uri from "urijs"; import ArcType from "../Core/ArcType.js"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import Cartesian2 from "../Core/Cartesian2.js"; @@ -7,15 +9,13 @@ import ClockRange from "../Core/ClockRange.js"; import ClockStep from "../Core/ClockStep.js"; import Color from "../Core/Color.js"; import CornerType from "../Core/CornerType.js"; -import Credit from "../Core/Credit.js"; import createGuid from "../Core/createGuid.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Credit from "../Core/Credit.js"; import DistanceDisplayCondition from "../Core/DistanceDisplayCondition.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import Event from "../Core/Event.js"; import ExtrapolationType from "../Core/ExtrapolationType.js"; +import Frozen from "../Core/Frozen.js"; import getFilenameFromUri from "../Core/getFilenameFromUri.js"; import HermitePolynomialApproximation from "../Core/HermitePolynomialApproximation.js"; import Iso8601 from "../Core/Iso8601.js"; @@ -29,7 +29,6 @@ import Quaternion from "../Core/Quaternion.js"; import Rectangle from "../Core/Rectangle.js"; import ReferenceFrame from "../Core/ReferenceFrame.js"; import Resource from "../Core/Resource.js"; -import RuntimeError from "../Core/RuntimeError.js"; import Spherical from "../Core/Spherical.js"; import TimeInterval from "../Core/TimeInterval.js"; import TimeIntervalCollection from "../Core/TimeIntervalCollection.js"; @@ -38,12 +37,13 @@ import ColorBlendMode from "../Scene/ColorBlendMode.js"; import HeightReference from "../Scene/HeightReference.js"; import HorizontalOrigin from "../Scene/HorizontalOrigin.js"; import LabelStyle from "../Scene/LabelStyle.js"; +import SensorVolumePortionToDisplay from "../Scene/SensorVolumePortionToDisplay.js"; import ShadowMode from "../Scene/ShadowMode.js"; import VerticalOrigin from "../Scene/VerticalOrigin.js"; -import Uri from "urijs"; import BillboardGraphics from "./BillboardGraphics.js"; import BoxGraphics from "./BoxGraphics.js"; import CallbackProperty from "./CallbackProperty.js"; +import Cesium3DTilesetGraphics from "./Cesium3DTilesetGraphics.js"; import CheckerboardMaterialProperty from "./CheckerboardMaterialProperty.js"; import ColorMaterialProperty from "./ColorMaterialProperty.js"; import CompositeMaterialProperty from "./CompositeMaterialProperty.js"; @@ -89,8 +89,6 @@ import TimeIntervalCollectionProperty from "./TimeIntervalCollectionProperty.js" import VelocityOrientationProperty from "./VelocityOrientationProperty.js"; import VelocityVectorProperty from "./VelocityVectorProperty.js"; import WallGraphics from "./WallGraphics.js"; -import Cesium3DTilesetGraphics from "./Cesium3DTilesetGraphics.js"; -import SensorVolumePortionToDisplay from "../Scene/SensorVolumePortionToDisplay.js"; // A marker type to distinguish CZML properties where we need to end up with a unit vector. // The data is still loaded into Cartesian3 objects but they are normalized. diff --git a/packages/engine/Source/DataSources/DataSource.js b/packages/engine/Source/DataSources/DataSource.js index 8f72f258ae59..e48f0c551591 100644 --- a/packages/engine/Source/DataSources/DataSource.js +++ b/packages/engine/Source/DataSources/DataSource.js @@ -1,4 +1,4 @@ -import DeveloperError from "../Core/DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * Defines the interface for data sources, which turn arbitrary data into a diff --git a/packages/engine/Source/DataSources/DataSourceClock.js b/packages/engine/Source/DataSources/DataSourceClock.js index 8252750f907f..462284f47631 100644 --- a/packages/engine/Source/DataSources/DataSourceClock.js +++ b/packages/engine/Source/DataSources/DataSourceClock.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Clock from "../Core/Clock.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Event from "../Core/Event.js"; import JulianDate from "../Core/JulianDate.js"; import createRawPropertyDescriptor from "./createRawPropertyDescriptor.js"; diff --git a/packages/engine/Source/DataSources/DataSourceCollection.js b/packages/engine/Source/DataSources/DataSourceCollection.js index 88df04ac9898..1645c160d8e1 100644 --- a/packages/engine/Source/DataSources/DataSourceCollection.js +++ b/packages/engine/Source/DataSources/DataSourceCollection.js @@ -1,6 +1,5 @@ -import defined from "../Core/defined.js"; +import { defined, DeveloperError } from "@cesium/utils"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Event from "../Core/Event.js"; import CesiumMath from "../Core/Math.js"; diff --git a/packages/engine/Source/DataSources/DataSourceDisplay.js b/packages/engine/Source/DataSources/DataSourceDisplay.js index eb540fee3d28..17dd3f8e7cc7 100644 --- a/packages/engine/Source/DataSources/DataSourceDisplay.js +++ b/packages/engine/Source/DataSources/DataSourceDisplay.js @@ -1,7 +1,6 @@ +import { Check, defined } from "@cesium/utils"; import ApproximateTerrainHeights from "../Core/ApproximateTerrainHeights.js"; import BoundingSphere from "../Core/BoundingSphere.js"; -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import EventHelper from "../Core/EventHelper.js"; import GroundPolylinePrimitive from "../Scene/GroundPolylinePrimitive.js"; @@ -10,11 +9,11 @@ import OrderedGroundPrimitiveCollection from "../Scene/OrderedGroundPrimitiveCol import PrimitiveCollection from "../Scene/PrimitiveCollection.js"; import BillboardVisualizer from "./BillboardVisualizer.js"; import BoundingSphereState from "./BoundingSphereState.js"; +import Cesium3DTilesetVisualizer from "./Cesium3DTilesetVisualizer.js"; import CustomDataSource from "./CustomDataSource.js"; import GeometryVisualizer from "./GeometryVisualizer.js"; import LabelVisualizer from "./LabelVisualizer.js"; import ModelVisualizer from "./ModelVisualizer.js"; -import Cesium3DTilesetVisualizer from "./Cesium3DTilesetVisualizer.js"; import PathVisualizer from "./PathVisualizer.js"; import PointVisualizer from "./PointVisualizer.js"; import PolylineVisualizer from "./PolylineVisualizer.js"; diff --git a/packages/engine/Source/DataSources/DynamicGeometryBatch.js b/packages/engine/Source/DataSources/DynamicGeometryBatch.js index 4540cf5a58a5..2b52cd10912e 100644 --- a/packages/engine/Source/DataSources/DynamicGeometryBatch.js +++ b/packages/engine/Source/DataSources/DynamicGeometryBatch.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import AssociativeArray from "../Core/AssociativeArray.js"; -import defined from "../Core/defined.js"; import BoundingSphereState from "./BoundingSphereState.js"; /** diff --git a/packages/engine/Source/DataSources/DynamicGeometryUpdater.js b/packages/engine/Source/DataSources/DynamicGeometryUpdater.js index e8f8af767684..b3bb66fedb0d 100644 --- a/packages/engine/Source/DataSources/DynamicGeometryUpdater.js +++ b/packages/engine/Source/DataSources/DynamicGeometryUpdater.js @@ -1,8 +1,6 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import GroundPrimitive from "../Scene/GroundPrimitive.js"; import MaterialAppearance from "../Scene/MaterialAppearance.js"; import PerInstanceColorAppearance from "../Scene/PerInstanceColorAppearance.js"; diff --git a/packages/engine/Source/DataSources/EllipseGeometryUpdater.js b/packages/engine/Source/DataSources/EllipseGeometryUpdater.js index b266277298c6..53e58eec5cec 100644 --- a/packages/engine/Source/DataSources/EllipseGeometryUpdater.js +++ b/packages/engine/Source/DataSources/EllipseGeometryUpdater.js @@ -1,10 +1,8 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import ApproximateTerrainHeights from "../Core/ApproximateTerrainHeights.js"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import DistanceDisplayConditionGeometryInstanceAttribute from "../Core/DistanceDisplayConditionGeometryInstanceAttribute.js"; import EllipseGeometry from "../Core/EllipseGeometry.js"; import EllipseOutlineGeometry from "../Core/EllipseOutlineGeometry.js"; diff --git a/packages/engine/Source/DataSources/EllipseGraphics.js b/packages/engine/Source/DataSources/EllipseGraphics.js index 7cbd30690e73..4d41f5f6718c 100644 --- a/packages/engine/Source/DataSources/EllipseGraphics.js +++ b/packages/engine/Source/DataSources/EllipseGraphics.js @@ -1,7 +1,6 @@ -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import createMaterialPropertyDescriptor from "./createMaterialPropertyDescriptor.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; diff --git a/packages/engine/Source/DataSources/EllipsoidGeometryUpdater.js b/packages/engine/Source/DataSources/EllipsoidGeometryUpdater.js index b7a86fe88740..6ee2a2211888 100644 --- a/packages/engine/Source/DataSources/EllipsoidGeometryUpdater.js +++ b/packages/engine/Source/DataSources/EllipsoidGeometryUpdater.js @@ -1,8 +1,7 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; -import defined from "../Core/defined.js"; import DistanceDisplayCondition from "../Core/DistanceDisplayCondition.js"; import DistanceDisplayConditionGeometryInstanceAttribute from "../Core/DistanceDisplayConditionGeometryInstanceAttribute.js"; import EllipsoidGeometry from "../Core/EllipsoidGeometry.js"; diff --git a/packages/engine/Source/DataSources/EllipsoidGraphics.js b/packages/engine/Source/DataSources/EllipsoidGraphics.js index e981c7ee3e10..1728d5c529d8 100644 --- a/packages/engine/Source/DataSources/EllipsoidGraphics.js +++ b/packages/engine/Source/DataSources/EllipsoidGraphics.js @@ -1,7 +1,6 @@ -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import createMaterialPropertyDescriptor from "./createMaterialPropertyDescriptor.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; diff --git a/packages/engine/Source/DataSources/Entity.js b/packages/engine/Source/DataSources/Entity.js index f07f1d5b3d0c..ceee21e783c7 100644 --- a/packages/engine/Source/DataSources/Entity.js +++ b/packages/engine/Source/DataSources/Entity.js @@ -1,11 +1,9 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; -import Check from "../Core/Check.js"; import createGuid from "../Core/createGuid.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import CesiumMath from "../Core/Math.js"; import Matrix3 from "../Core/Matrix3.js"; import Matrix4 from "../Core/Matrix4.js"; @@ -19,6 +17,7 @@ import HeightReference, { } from "../Scene/HeightReference.js"; import BillboardGraphics from "./BillboardGraphics.js"; import BoxGraphics from "./BoxGraphics.js"; +import Cesium3DTilesetGraphics from "./Cesium3DTilesetGraphics.js"; import ConstantPositionProperty from "./ConstantPositionProperty.js"; import CorridorGraphics from "./CorridorGraphics.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; @@ -28,7 +27,6 @@ import EllipseGraphics from "./EllipseGraphics.js"; import EllipsoidGraphics from "./EllipsoidGraphics.js"; import LabelGraphics from "./LabelGraphics.js"; import ModelGraphics from "./ModelGraphics.js"; -import Cesium3DTilesetGraphics from "./Cesium3DTilesetGraphics.js"; import PathGraphics from "./PathGraphics.js"; import PlaneGraphics from "./PlaneGraphics.js"; import PointGraphics from "./PointGraphics.js"; diff --git a/packages/engine/Source/DataSources/EntityCluster.js b/packages/engine/Source/DataSources/EntityCluster.js index ff572aaa975e..78ab0022013c 100644 --- a/packages/engine/Source/DataSources/EntityCluster.js +++ b/packages/engine/Source/DataSources/EntityCluster.js @@ -1,10 +1,11 @@ +import { defined } from "@cesium/utils"; +import KDBush from "kdbush"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import EllipsoidalOccluder from "../Core/EllipsoidalOccluder.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import Matrix4 from "../Core/Matrix4.js"; import Billboard from "../Scene/Billboard.js"; import BillboardCollection from "../Scene/BillboardCollection.js"; @@ -13,7 +14,6 @@ import LabelCollection from "../Scene/LabelCollection.js"; import PointPrimitive from "../Scene/PointPrimitive.js"; import PointPrimitiveCollection from "../Scene/PointPrimitiveCollection.js"; import SceneMode from "../Scene/SceneMode.js"; -import KDBush from "kdbush"; /** * Defines how screen space objects (billboards, points, labels) are clustered. diff --git a/packages/engine/Source/DataSources/EntityCollection.js b/packages/engine/Source/DataSources/EntityCollection.js index 48fffe489df3..645731266d61 100644 --- a/packages/engine/Source/DataSources/EntityCollection.js +++ b/packages/engine/Source/DataSources/EntityCollection.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import AssociativeArray from "../Core/AssociativeArray.js"; import createGuid from "../Core/createGuid.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Event from "../Core/Event.js"; import Iso8601 from "../Core/Iso8601.js"; import JulianDate from "../Core/JulianDate.js"; diff --git a/packages/engine/Source/DataSources/EntityView.js b/packages/engine/Source/DataSources/EntityView.js index f86c605d74a8..d500cd30ec5f 100644 --- a/packages/engine/Source/DataSources/EntityView.js +++ b/packages/engine/Source/DataSources/EntityView.js @@ -1,6 +1,5 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import HeadingPitchRange from "../Core/HeadingPitchRange.js"; import JulianDate from "../Core/JulianDate.js"; diff --git a/packages/engine/Source/DataSources/GeoJsonDataSource.js b/packages/engine/Source/DataSources/GeoJsonDataSource.js index f4cac5160af0..db77f0d82ea0 100644 --- a/packages/engine/Source/DataSources/GeoJsonDataSource.js +++ b/packages/engine/Source/DataSources/GeoJsonDataSource.js @@ -1,20 +1,18 @@ +import { defined, DeveloperError, RuntimeError } from "@cesium/utils"; +import * as topojson from "topojson-client"; import ArcType from "../Core/ArcType.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Color from "../Core/Color.js"; import createGuid from "../Core/createGuid.js"; import Credit from "../Core/Credit.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import getFilenameFromUri from "../Core/getFilenameFromUri.js"; import PinBuilder from "../Core/PinBuilder.js"; import PolygonHierarchy from "../Core/PolygonHierarchy.js"; import Resource from "../Core/Resource.js"; -import RuntimeError from "../Core/RuntimeError.js"; import HeightReference from "../Scene/HeightReference.js"; import VerticalOrigin from "../Scene/VerticalOrigin.js"; -import * as topojson from "topojson-client"; import BillboardGraphics from "./BillboardGraphics.js"; import CallbackProperty from "./CallbackProperty.js"; import ColorMaterialProperty from "./ColorMaterialProperty.js"; diff --git a/packages/engine/Source/DataSources/GeometryUpdater.js b/packages/engine/Source/DataSources/GeometryUpdater.js index 9062fc9ed09a..d10b6c512b18 100644 --- a/packages/engine/Source/DataSources/GeometryUpdater.js +++ b/packages/engine/Source/DataSources/GeometryUpdater.js @@ -1,8 +1,6 @@ -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import DistanceDisplayCondition from "../Core/DistanceDisplayCondition.js"; import Event from "../Core/Event.js"; import Iso8601 from "../Core/Iso8601.js"; diff --git a/packages/engine/Source/DataSources/GeometryVisualizer.js b/packages/engine/Source/DataSources/GeometryVisualizer.js index 668663b2039e..574b8db86219 100644 --- a/packages/engine/Source/DataSources/GeometryVisualizer.js +++ b/packages/engine/Source/DataSources/GeometryVisualizer.js @@ -1,7 +1,6 @@ +import { Check, defined } from "@cesium/utils"; import AssociativeArray from "../Core/AssociativeArray.js"; import BoundingSphere from "../Core/BoundingSphere.js"; -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import ClassificationType from "../Scene/ClassificationType.js"; import MaterialAppearance from "../Scene/MaterialAppearance.js"; diff --git a/packages/engine/Source/DataSources/GpxDataSource.js b/packages/engine/Source/DataSources/GpxDataSource.js index 717ded69ca3c..d76edbd55ce0 100644 --- a/packages/engine/Source/DataSources/GpxDataSource.js +++ b/packages/engine/Source/DataSources/GpxDataSource.js @@ -1,26 +1,24 @@ +import { defined, DeveloperError, RuntimeError } from "@cesium/utils"; +import Autolinker from "autolinker"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import ClockRange from "../Core/ClockRange.js"; import ClockStep from "../Core/ClockStep.js"; import Color from "../Core/Color.js"; import createGuid from "../Core/createGuid.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import Iso8601 from "../Core/Iso8601.js"; import JulianDate from "../Core/JulianDate.js"; import NearFarScalar from "../Core/NearFarScalar.js"; import PinBuilder from "../Core/PinBuilder.js"; import Resource from "../Core/Resource.js"; -import RuntimeError from "../Core/RuntimeError.js"; import TimeInterval from "../Core/TimeInterval.js"; import TimeIntervalCollection from "../Core/TimeIntervalCollection.js"; import HeightReference from "../Scene/HeightReference.js"; import HorizontalOrigin from "../Scene/HorizontalOrigin.js"; import LabelStyle from "../Scene/LabelStyle.js"; import VerticalOrigin from "../Scene/VerticalOrigin.js"; -import Autolinker from "autolinker"; import BillboardGraphics from "./BillboardGraphics.js"; import ConstantProperty from "./ConstantProperty.js"; import DataSource from "./DataSource.js"; diff --git a/packages/engine/Source/DataSources/GridMaterialProperty.js b/packages/engine/Source/DataSources/GridMaterialProperty.js index c766a5b50f0d..73a77f59e134 100644 --- a/packages/engine/Source/DataSources/GridMaterialProperty.js +++ b/packages/engine/Source/DataSources/GridMaterialProperty.js @@ -1,8 +1,8 @@ +import { defined } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Color from "../Core/Color.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import JulianDate from "../Core/JulianDate.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; import Property from "./Property.js"; diff --git a/packages/engine/Source/DataSources/GroundGeometryUpdater.js b/packages/engine/Source/DataSources/GroundGeometryUpdater.js index 75c12bd02662..a3cce1a3f971 100644 --- a/packages/engine/Source/DataSources/GroundGeometryUpdater.js +++ b/packages/engine/Source/DataSources/GroundGeometryUpdater.js @@ -1,6 +1,4 @@ -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import GeometryOffsetAttribute from "../Core/GeometryOffsetAttribute.js"; import oneTimeWarning from "../Core/oneTimeWarning.js"; import GroundPrimitive from "../Scene/GroundPrimitive.js"; diff --git a/packages/engine/Source/DataSources/ImageMaterialProperty.js b/packages/engine/Source/DataSources/ImageMaterialProperty.js index 82b8da8b6e47..5f348985de12 100644 --- a/packages/engine/Source/DataSources/ImageMaterialProperty.js +++ b/packages/engine/Source/DataSources/ImageMaterialProperty.js @@ -1,8 +1,8 @@ +import { defined } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Color from "../Core/Color.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import JulianDate from "../Core/JulianDate.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; import Property from "./Property.js"; diff --git a/packages/engine/Source/DataSources/KmlDataSource.js b/packages/engine/Source/DataSources/KmlDataSource.js index e3765b087c70..7fbb930f1cc1 100644 --- a/packages/engine/Source/DataSources/KmlDataSource.js +++ b/packages/engine/Source/DataSources/KmlDataSource.js @@ -1,3 +1,7 @@ +import { defer, defined, DeveloperError, RuntimeError } from "@cesium/utils"; +import * as zip from "@zip.js/zip.js/lib/zip-no-worker.js"; +import Autolinker from "autolinker"; +import Uri from "urijs"; import ArcType from "../Core/ArcType.js"; import AssociativeArray from "../Core/AssociativeArray.js"; import BoundingRectangle from "../Core/BoundingRectangle.js"; @@ -11,12 +15,9 @@ import clone from "../Core/clone.js"; import Color from "../Core/Color.js"; import createGuid from "../Core/createGuid.js"; import Credit from "../Core/Credit.js"; -import Frozen from "../Core/Frozen.js"; -import defer from "../Core/defer.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import getExtensionFromUri from "../Core/getExtensionFromUri.js"; import getFilenameFromUri from "../Core/getFilenameFromUri.js"; import getTimestamp from "../Core/getTimestamp.js"; @@ -33,17 +34,12 @@ import PolygonHierarchy from "../Core/PolygonHierarchy.js"; import queryToObject from "../Core/queryToObject.js"; import Rectangle from "../Core/Rectangle.js"; import Resource from "../Core/Resource.js"; -import RuntimeError from "../Core/RuntimeError.js"; import TimeInterval from "../Core/TimeInterval.js"; import TimeIntervalCollection from "../Core/TimeIntervalCollection.js"; import HeightReference from "../Scene/HeightReference.js"; import HorizontalOrigin from "../Scene/HorizontalOrigin.js"; import LabelStyle from "../Scene/LabelStyle.js"; import SceneMode from "../Scene/SceneMode.js"; -import Autolinker from "autolinker"; -import Uri from "urijs"; -import * as zip from "@zip.js/zip.js/lib/zip-no-worker.js"; -import getElement from "./getElement.js"; import BillboardGraphics from "./BillboardGraphics.js"; import CompositePositionProperty from "./CompositePositionProperty.js"; import DataSource from "./DataSource.js"; @@ -51,6 +47,7 @@ import DataSourceClock from "./DataSourceClock.js"; import Entity from "./Entity.js"; import EntityCluster from "./EntityCluster.js"; import EntityCollection from "./EntityCollection.js"; +import getElement from "./getElement.js"; import KmlCamera from "./KmlCamera.js"; import KmlLookAt from "./KmlLookAt.js"; import KmlTour from "./KmlTour.js"; diff --git a/packages/engine/Source/DataSources/KmlTour.js b/packages/engine/Source/DataSources/KmlTour.js index 80aa7ad4678e..0a34e3fd3ada 100644 --- a/packages/engine/Source/DataSources/KmlTour.js +++ b/packages/engine/Source/DataSources/KmlTour.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import Event from "../Core/Event.js"; /** * Describes a KmlTour, which uses KmlTourFlyTo, and KmlTourWait to diff --git a/packages/engine/Source/DataSources/KmlTourFlyTo.js b/packages/engine/Source/DataSources/KmlTourFlyTo.js index 405279eb5668..9c18d9bf5fd4 100644 --- a/packages/engine/Source/DataSources/KmlTourFlyTo.js +++ b/packages/engine/Source/DataSources/KmlTourFlyTo.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import combine from "../Core/combine.js"; -import defined from "../Core/defined.js"; import EasingFunction from "../Core/EasingFunction.js"; /** * Transitions the KmlTour to the next destination. This transition is facilitated diff --git a/packages/engine/Source/DataSources/KmlTourWait.js b/packages/engine/Source/DataSources/KmlTourWait.js index d59da1e50557..2a0dab187782 100644 --- a/packages/engine/Source/DataSources/KmlTourWait.js +++ b/packages/engine/Source/DataSources/KmlTourWait.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; /** * Pauses the KmlTour for a given number of seconds. * diff --git a/packages/engine/Source/DataSources/LabelGraphics.js b/packages/engine/Source/DataSources/LabelGraphics.js index 3f44412240ee..977891beab90 100644 --- a/packages/engine/Source/DataSources/LabelGraphics.js +++ b/packages/engine/Source/DataSources/LabelGraphics.js @@ -1,7 +1,6 @@ -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; /** diff --git a/packages/engine/Source/DataSources/LabelVisualizer.js b/packages/engine/Source/DataSources/LabelVisualizer.js index 14bcf0a5331b..37afb65de171 100644 --- a/packages/engine/Source/DataSources/LabelVisualizer.js +++ b/packages/engine/Source/DataSources/LabelVisualizer.js @@ -1,10 +1,9 @@ +import { defined, DeveloperError } from "@cesium/utils"; import AssociativeArray from "../Core/AssociativeArray.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import DistanceDisplayCondition from "../Core/DistanceDisplayCondition.js"; import NearFarScalar from "../Core/NearFarScalar.js"; import HeightReference from "../Scene/HeightReference.js"; diff --git a/packages/engine/Source/DataSources/MaterialProperty.js b/packages/engine/Source/DataSources/MaterialProperty.js index 0c2ec6f866a5..c068aeca44c6 100644 --- a/packages/engine/Source/DataSources/MaterialProperty.js +++ b/packages/engine/Source/DataSources/MaterialProperty.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import JulianDate from "../Core/JulianDate.js"; import Material from "../Scene/Material.js"; diff --git a/packages/engine/Source/DataSources/ModelGraphics.js b/packages/engine/Source/DataSources/ModelGraphics.js index 6a0904c0a6f5..db46131d181f 100644 --- a/packages/engine/Source/DataSources/ModelGraphics.js +++ b/packages/engine/Source/DataSources/ModelGraphics.js @@ -1,7 +1,6 @@ -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; import NodeTransformationProperty from "./NodeTransformationProperty.js"; import PropertyBag from "./PropertyBag.js"; diff --git a/packages/engine/Source/DataSources/ModelVisualizer.js b/packages/engine/Source/DataSources/ModelVisualizer.js index 1584ea7d182e..ba9532270968 100644 --- a/packages/engine/Source/DataSources/ModelVisualizer.js +++ b/packages/engine/Source/DataSources/ModelVisualizer.js @@ -1,12 +1,11 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import AssociativeArray from "../Core/AssociativeArray.js"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; +import Cartographic from "../Core/Cartographic.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import Matrix4 from "../Core/Matrix4.js"; import Resource from "../Core/Resource.js"; @@ -19,7 +18,6 @@ import ModelAnimationLoop from "../Scene/ModelAnimationLoop.js"; import ShadowMode from "../Scene/ShadowMode.js"; import BoundingSphereState from "./BoundingSphereState.js"; import Property from "./Property.js"; -import Cartographic from "../Core/Cartographic.js"; const defaultScale = 1.0; const defaultEnableVerticalExaggeration = true; diff --git a/packages/engine/Source/DataSources/NodeTransformationProperty.js b/packages/engine/Source/DataSources/NodeTransformationProperty.js index 867009c21c26..78ed2bab4920 100644 --- a/packages/engine/Source/DataSources/NodeTransformationProperty.js +++ b/packages/engine/Source/DataSources/NodeTransformationProperty.js @@ -1,6 +1,6 @@ -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import JulianDate from "../Core/JulianDate.js"; import TranslationRotationScale from "../Core/TranslationRotationScale.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; diff --git a/packages/engine/Source/DataSources/PathGraphics.js b/packages/engine/Source/DataSources/PathGraphics.js index 91f4f3a7d938..c26a8d387df2 100644 --- a/packages/engine/Source/DataSources/PathGraphics.js +++ b/packages/engine/Source/DataSources/PathGraphics.js @@ -1,7 +1,6 @@ -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import createMaterialPropertyDescriptor from "./createMaterialPropertyDescriptor.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; diff --git a/packages/engine/Source/DataSources/PathVisualizer.js b/packages/engine/Source/DataSources/PathVisualizer.js index fd5f63d6947f..dc8379181abc 100644 --- a/packages/engine/Source/DataSources/PathVisualizer.js +++ b/packages/engine/Source/DataSources/PathVisualizer.js @@ -1,8 +1,7 @@ +import { defined, DeveloperError } from "@cesium/utils"; import AssociativeArray from "../Core/AssociativeArray.js"; import Cartesian3 from "../Core/Cartesian3.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import JulianDate from "../Core/JulianDate.js"; import Matrix3 from "../Core/Matrix3.js"; import Matrix4 from "../Core/Matrix4.js"; diff --git a/packages/engine/Source/DataSources/PlaneGeometryUpdater.js b/packages/engine/Source/DataSources/PlaneGeometryUpdater.js index 204face996e1..89250e071c91 100644 --- a/packages/engine/Source/DataSources/PlaneGeometryUpdater.js +++ b/packages/engine/Source/DataSources/PlaneGeometryUpdater.js @@ -1,9 +1,7 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import DistanceDisplayConditionGeometryInstanceAttribute from "../Core/DistanceDisplayConditionGeometryInstanceAttribute.js"; import GeometryInstance from "../Core/GeometryInstance.js"; import Iso8601 from "../Core/Iso8601.js"; diff --git a/packages/engine/Source/DataSources/PlaneGraphics.js b/packages/engine/Source/DataSources/PlaneGraphics.js index 8b4b92a4a0ef..2ea531b57706 100644 --- a/packages/engine/Source/DataSources/PlaneGraphics.js +++ b/packages/engine/Source/DataSources/PlaneGraphics.js @@ -1,7 +1,6 @@ -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import createMaterialPropertyDescriptor from "./createMaterialPropertyDescriptor.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; diff --git a/packages/engine/Source/DataSources/PointGraphics.js b/packages/engine/Source/DataSources/PointGraphics.js index 9aa053f92f77..c26f30e63669 100644 --- a/packages/engine/Source/DataSources/PointGraphics.js +++ b/packages/engine/Source/DataSources/PointGraphics.js @@ -1,7 +1,6 @@ -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; /** diff --git a/packages/engine/Source/DataSources/PointVisualizer.js b/packages/engine/Source/DataSources/PointVisualizer.js index 26b5404fca8e..33aa0a17ea42 100644 --- a/packages/engine/Source/DataSources/PointVisualizer.js +++ b/packages/engine/Source/DataSources/PointVisualizer.js @@ -1,16 +1,15 @@ +import { defined, DeveloperError } from "@cesium/utils"; import AssociativeArray from "../Core/AssociativeArray.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import DistanceDisplayCondition from "../Core/DistanceDisplayCondition.js"; import NearFarScalar from "../Core/NearFarScalar.js"; import createBillboardPointCallback from "../Scene/createBillboardPointCallback.js"; import HeightReference from "../Scene/HeightReference.js"; +import SplitDirection from "../Scene/SplitDirection.js"; import BoundingSphereState from "./BoundingSphereState.js"; import Property from "./Property.js"; -import SplitDirection from "../Scene/SplitDirection.js"; const defaultColor = Color.WHITE; const defaultOutlineColor = Color.BLACK; diff --git a/packages/engine/Source/DataSources/PolygonGeometryUpdater.js b/packages/engine/Source/DataSources/PolygonGeometryUpdater.js index 72899f1672ac..5ed9b112a6f7 100644 --- a/packages/engine/Source/DataSources/PolygonGeometryUpdater.js +++ b/packages/engine/Source/DataSources/PolygonGeometryUpdater.js @@ -1,14 +1,12 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import ApproximateTerrainHeights from "../Core/ApproximateTerrainHeights.js"; import ArcType from "../Core/ArcType.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; import CoplanarPolygonGeometry from "../Core/CoplanarPolygonGeometry.js"; import CoplanarPolygonOutlineGeometry from "../Core/CoplanarPolygonOutlineGeometry.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import DistanceDisplayConditionGeometryInstanceAttribute from "../Core/DistanceDisplayConditionGeometryInstanceAttribute.js"; import EllipsoidTangentPlane from "../Core/EllipsoidTangentPlane.js"; import GeometryInstance from "../Core/GeometryInstance.js"; diff --git a/packages/engine/Source/DataSources/PolygonGraphics.js b/packages/engine/Source/DataSources/PolygonGraphics.js index ea7b809a91ca..254a33ee64ea 100644 --- a/packages/engine/Source/DataSources/PolygonGraphics.js +++ b/packages/engine/Source/DataSources/PolygonGraphics.js @@ -1,7 +1,6 @@ -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import PolygonHierarchy from "../Core/PolygonHierarchy.js"; import ConstantProperty from "./ConstantProperty.js"; import createMaterialPropertyDescriptor from "./createMaterialPropertyDescriptor.js"; diff --git a/packages/engine/Source/DataSources/PolylineArrowMaterialProperty.js b/packages/engine/Source/DataSources/PolylineArrowMaterialProperty.js index 9f203546db9a..1f585677bdd3 100644 --- a/packages/engine/Source/DataSources/PolylineArrowMaterialProperty.js +++ b/packages/engine/Source/DataSources/PolylineArrowMaterialProperty.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import Event from "../Core/Event.js"; import JulianDate from "../Core/JulianDate.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; diff --git a/packages/engine/Source/DataSources/PolylineDashMaterialProperty.js b/packages/engine/Source/DataSources/PolylineDashMaterialProperty.js index f7822d5367bf..6e81cebfb872 100644 --- a/packages/engine/Source/DataSources/PolylineDashMaterialProperty.js +++ b/packages/engine/Source/DataSources/PolylineDashMaterialProperty.js @@ -1,7 +1,7 @@ +import { defined } from "@cesium/utils"; import Color from "../Core/Color.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import JulianDate from "../Core/JulianDate.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; import Property from "./Property.js"; diff --git a/packages/engine/Source/DataSources/PolylineGeometryUpdater.js b/packages/engine/Source/DataSources/PolylineGeometryUpdater.js index ee2734001752..474bfd3b5e9e 100644 --- a/packages/engine/Source/DataSources/PolylineGeometryUpdater.js +++ b/packages/engine/Source/DataSources/PolylineGeometryUpdater.js @@ -1,11 +1,9 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import ArcType from "../Core/ArcType.js"; import BoundingSphere from "../Core/BoundingSphere.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import DistanceDisplayCondition from "../Core/DistanceDisplayCondition.js"; import DistanceDisplayConditionGeometryInstanceAttribute from "../Core/DistanceDisplayConditionGeometryInstanceAttribute.js"; import Event from "../Core/Event.js"; diff --git a/packages/engine/Source/DataSources/PolylineGlowMaterialProperty.js b/packages/engine/Source/DataSources/PolylineGlowMaterialProperty.js index ffa299c4f995..fdaa1b82cbf4 100644 --- a/packages/engine/Source/DataSources/PolylineGlowMaterialProperty.js +++ b/packages/engine/Source/DataSources/PolylineGlowMaterialProperty.js @@ -1,7 +1,7 @@ +import { defined } from "@cesium/utils"; import Color from "../Core/Color.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import JulianDate from "../Core/JulianDate.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; import Property from "./Property.js"; diff --git a/packages/engine/Source/DataSources/PolylineGraphics.js b/packages/engine/Source/DataSources/PolylineGraphics.js index 2998083ec8d4..1c27ec4a17f6 100644 --- a/packages/engine/Source/DataSources/PolylineGraphics.js +++ b/packages/engine/Source/DataSources/PolylineGraphics.js @@ -1,7 +1,6 @@ -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import createMaterialPropertyDescriptor from "./createMaterialPropertyDescriptor.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; diff --git a/packages/engine/Source/DataSources/PolylineOutlineMaterialProperty.js b/packages/engine/Source/DataSources/PolylineOutlineMaterialProperty.js index 860e9dbacc59..7d420f35ec60 100644 --- a/packages/engine/Source/DataSources/PolylineOutlineMaterialProperty.js +++ b/packages/engine/Source/DataSources/PolylineOutlineMaterialProperty.js @@ -1,7 +1,7 @@ +import { defined } from "@cesium/utils"; import Color from "../Core/Color.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import JulianDate from "../Core/JulianDate.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; import Property from "./Property.js"; diff --git a/packages/engine/Source/DataSources/PolylineVisualizer.js b/packages/engine/Source/DataSources/PolylineVisualizer.js index 99c96065337d..e0c029a124c3 100644 --- a/packages/engine/Source/DataSources/PolylineVisualizer.js +++ b/packages/engine/Source/DataSources/PolylineVisualizer.js @@ -1,7 +1,6 @@ +import { Check, defined } from "@cesium/utils"; import AssociativeArray from "../Core/AssociativeArray.js"; import BoundingSphere from "../Core/BoundingSphere.js"; -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import ClassificationType from "../Scene/ClassificationType.js"; import PolylineColorAppearance from "../Scene/PolylineColorAppearance.js"; diff --git a/packages/engine/Source/DataSources/PolylineVolumeGeometryUpdater.js b/packages/engine/Source/DataSources/PolylineVolumeGeometryUpdater.js index a9ed1192c34a..23626b62387a 100644 --- a/packages/engine/Source/DataSources/PolylineVolumeGeometryUpdater.js +++ b/packages/engine/Source/DataSources/PolylineVolumeGeometryUpdater.js @@ -1,8 +1,6 @@ -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import DistanceDisplayConditionGeometryInstanceAttribute from "../Core/DistanceDisplayConditionGeometryInstanceAttribute.js"; import GeometryInstance from "../Core/GeometryInstance.js"; import Iso8601 from "../Core/Iso8601.js"; diff --git a/packages/engine/Source/DataSources/PolylineVolumeGraphics.js b/packages/engine/Source/DataSources/PolylineVolumeGraphics.js index fafc43a0d785..935135bb4b32 100644 --- a/packages/engine/Source/DataSources/PolylineVolumeGraphics.js +++ b/packages/engine/Source/DataSources/PolylineVolumeGraphics.js @@ -1,7 +1,6 @@ -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import createMaterialPropertyDescriptor from "./createMaterialPropertyDescriptor.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; diff --git a/packages/engine/Source/DataSources/PositionProperty.js b/packages/engine/Source/DataSources/PositionProperty.js index d49308ca6a0e..8818c34a715a 100644 --- a/packages/engine/Source/DataSources/PositionProperty.js +++ b/packages/engine/Source/DataSources/PositionProperty.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Matrix3 from "../Core/Matrix3.js"; import ReferenceFrame from "../Core/ReferenceFrame.js"; import Transforms from "../Core/Transforms.js"; diff --git a/packages/engine/Source/DataSources/PositionPropertyArray.js b/packages/engine/Source/DataSources/PositionPropertyArray.js index 13ffe88103df..7fb2125d4147 100644 --- a/packages/engine/Source/DataSources/PositionPropertyArray.js +++ b/packages/engine/Source/DataSources/PositionPropertyArray.js @@ -1,5 +1,4 @@ -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; import EventHelper from "../Core/EventHelper.js"; import JulianDate from "../Core/JulianDate.js"; diff --git a/packages/engine/Source/DataSources/Property.js b/packages/engine/Source/DataSources/Property.js index dadc855e963b..08782bfe5658 100644 --- a/packages/engine/Source/DataSources/Property.js +++ b/packages/engine/Source/DataSources/Property.js @@ -1,5 +1,4 @@ -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; /** * The interface for all properties, which represent a value that can optionally vary over time. diff --git a/packages/engine/Source/DataSources/PropertyArray.js b/packages/engine/Source/DataSources/PropertyArray.js index 2dbbad4c9494..ed88035ebf3d 100644 --- a/packages/engine/Source/DataSources/PropertyArray.js +++ b/packages/engine/Source/DataSources/PropertyArray.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import Event from "../Core/Event.js"; import EventHelper from "../Core/EventHelper.js"; import JulianDate from "../Core/JulianDate.js"; diff --git a/packages/engine/Source/DataSources/PropertyBag.js b/packages/engine/Source/DataSources/PropertyBag.js index 1dff6f3fa838..b51e3078ed0d 100644 --- a/packages/engine/Source/DataSources/PropertyBag.js +++ b/packages/engine/Source/DataSources/PropertyBag.js @@ -1,5 +1,4 @@ -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; import JulianDate from "../Core/JulianDate.js"; import ConstantProperty from "./ConstantProperty.js"; diff --git a/packages/engine/Source/DataSources/RectangleGeometryUpdater.js b/packages/engine/Source/DataSources/RectangleGeometryUpdater.js index e9821d061702..99e00ed07cb3 100644 --- a/packages/engine/Source/DataSources/RectangleGeometryUpdater.js +++ b/packages/engine/Source/DataSources/RectangleGeometryUpdater.js @@ -1,11 +1,9 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import ApproximateTerrainHeights from "../Core/ApproximateTerrainHeights.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import DistanceDisplayConditionGeometryInstanceAttribute from "../Core/DistanceDisplayConditionGeometryInstanceAttribute.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import GeometryInstance from "../Core/GeometryInstance.js"; diff --git a/packages/engine/Source/DataSources/RectangleGraphics.js b/packages/engine/Source/DataSources/RectangleGraphics.js index cc0478fb4044..91ec8c1c8a38 100644 --- a/packages/engine/Source/DataSources/RectangleGraphics.js +++ b/packages/engine/Source/DataSources/RectangleGraphics.js @@ -1,7 +1,6 @@ -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import createMaterialPropertyDescriptor from "./createMaterialPropertyDescriptor.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; diff --git a/packages/engine/Source/DataSources/ReferenceProperty.js b/packages/engine/Source/DataSources/ReferenceProperty.js index 9e9f3dd73712..fcec44ab9319 100644 --- a/packages/engine/Source/DataSources/ReferenceProperty.js +++ b/packages/engine/Source/DataSources/ReferenceProperty.js @@ -1,5 +1,4 @@ -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; import JulianDate from "../Core/JulianDate.js"; import Property from "./Property.js"; diff --git a/packages/engine/Source/DataSources/Rotation.js b/packages/engine/Source/DataSources/Rotation.js index 96260e83b313..08d10f91c43f 100644 --- a/packages/engine/Source/DataSources/Rotation.js +++ b/packages/engine/Source/DataSources/Rotation.js @@ -1,5 +1,4 @@ -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import CesiumMath from "../Core/Math.js"; /** diff --git a/packages/engine/Source/DataSources/SampledPositionProperty.js b/packages/engine/Source/DataSources/SampledPositionProperty.js index 84857990adc1..e554f9ba557c 100644 --- a/packages/engine/Source/DataSources/SampledPositionProperty.js +++ b/packages/engine/Source/DataSources/SampledPositionProperty.js @@ -1,7 +1,5 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Event from "../Core/Event.js"; import JulianDate from "../Core/JulianDate.js"; import ReferenceFrame from "../Core/ReferenceFrame.js"; diff --git a/packages/engine/Source/DataSources/SampledProperty.js b/packages/engine/Source/DataSources/SampledProperty.js index 0c689df69a03..02e2aee03034 100644 --- a/packages/engine/Source/DataSources/SampledProperty.js +++ b/packages/engine/Source/DataSources/SampledProperty.js @@ -1,7 +1,5 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import binarySearch from "../Core/binarySearch.js"; -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Event from "../Core/Event.js"; import ExtrapolationType from "../Core/ExtrapolationType.js"; import JulianDate from "../Core/JulianDate.js"; diff --git a/packages/engine/Source/DataSources/ScaledPositionProperty.js b/packages/engine/Source/DataSources/ScaledPositionProperty.js index 3fd1926d931d..11c517d0f482 100644 --- a/packages/engine/Source/DataSources/ScaledPositionProperty.js +++ b/packages/engine/Source/DataSources/ScaledPositionProperty.js @@ -1,5 +1,4 @@ -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Ellipsoid from "../Core/Ellipsoid.js"; import Event from "../Core/Event.js"; import JulianDate from "../Core/JulianDate.js"; diff --git a/packages/engine/Source/DataSources/StaticGeometryColorBatch.js b/packages/engine/Source/DataSources/StaticGeometryColorBatch.js index 4d65ea05dd8a..885f702bfd80 100644 --- a/packages/engine/Source/DataSources/StaticGeometryColorBatch.js +++ b/packages/engine/Source/DataSources/StaticGeometryColorBatch.js @@ -1,8 +1,8 @@ +import { defined } from "@cesium/utils"; import AssociativeArray from "../Core/AssociativeArray.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; -import defined from "../Core/defined.js"; import DistanceDisplayCondition from "../Core/DistanceDisplayCondition.js"; import DistanceDisplayConditionGeometryInstanceAttribute from "../Core/DistanceDisplayConditionGeometryInstanceAttribute.js"; import OffsetGeometryInstanceAttribute from "../Core/OffsetGeometryInstanceAttribute.js"; diff --git a/packages/engine/Source/DataSources/StaticGeometryPerMaterialBatch.js b/packages/engine/Source/DataSources/StaticGeometryPerMaterialBatch.js index 32c078c123fc..828e8d2b856b 100644 --- a/packages/engine/Source/DataSources/StaticGeometryPerMaterialBatch.js +++ b/packages/engine/Source/DataSources/StaticGeometryPerMaterialBatch.js @@ -1,8 +1,8 @@ +import { defined } from "@cesium/utils"; import AssociativeArray from "../Core/AssociativeArray.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; -import defined from "../Core/defined.js"; import DistanceDisplayCondition from "../Core/DistanceDisplayCondition.js"; import DistanceDisplayConditionGeometryInstanceAttribute from "../Core/DistanceDisplayConditionGeometryInstanceAttribute.js"; import OffsetGeometryInstanceAttribute from "../Core/OffsetGeometryInstanceAttribute.js"; diff --git a/packages/engine/Source/DataSources/StaticGroundGeometryColorBatch.js b/packages/engine/Source/DataSources/StaticGroundGeometryColorBatch.js index 4bde462f4505..179fb3d1de15 100644 --- a/packages/engine/Source/DataSources/StaticGroundGeometryColorBatch.js +++ b/packages/engine/Source/DataSources/StaticGroundGeometryColorBatch.js @@ -1,14 +1,14 @@ +import { defined } from "@cesium/utils"; import AssociativeArray from "../Core/AssociativeArray.js"; import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; -import defined from "../Core/defined.js"; import DistanceDisplayCondition from "../Core/DistanceDisplayCondition.js"; import DistanceDisplayConditionGeometryInstanceAttribute from "../Core/DistanceDisplayConditionGeometryInstanceAttribute.js"; +import RectangleCollisionChecker from "../Core/RectangleCollisionChecker.js"; import ShowGeometryInstanceAttribute from "../Core/ShowGeometryInstanceAttribute.js"; import GroundPrimitive from "../Scene/GroundPrimitive.js"; import BoundingSphereState from "./BoundingSphereState.js"; import Property from "./Property.js"; -import RectangleCollisionChecker from "../Core/RectangleCollisionChecker.js"; const colorScratch = new Color(); const distanceDisplayConditionScratch = new DistanceDisplayCondition(); diff --git a/packages/engine/Source/DataSources/StaticGroundGeometryPerMaterialBatch.js b/packages/engine/Source/DataSources/StaticGroundGeometryPerMaterialBatch.js index 2d2757fc3b77..f310cac0bcc5 100644 --- a/packages/engine/Source/DataSources/StaticGroundGeometryPerMaterialBatch.js +++ b/packages/engine/Source/DataSources/StaticGroundGeometryPerMaterialBatch.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import AssociativeArray from "../Core/AssociativeArray.js"; -import defined from "../Core/defined.js"; import DistanceDisplayCondition from "../Core/DistanceDisplayCondition.js"; import DistanceDisplayConditionGeometryInstanceAttribute from "../Core/DistanceDisplayConditionGeometryInstanceAttribute.js"; import RectangleCollisionChecker from "../Core/RectangleCollisionChecker.js"; diff --git a/packages/engine/Source/DataSources/StaticGroundPolylinePerMaterialBatch.js b/packages/engine/Source/DataSources/StaticGroundPolylinePerMaterialBatch.js index 9b946b750542..2ebc9e0d7efe 100644 --- a/packages/engine/Source/DataSources/StaticGroundPolylinePerMaterialBatch.js +++ b/packages/engine/Source/DataSources/StaticGroundPolylinePerMaterialBatch.js @@ -1,7 +1,7 @@ +import { defined } from "@cesium/utils"; import AssociativeArray from "../Core/AssociativeArray.js"; import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; -import defined from "../Core/defined.js"; import DistanceDisplayCondition from "../Core/DistanceDisplayCondition.js"; import DistanceDisplayConditionGeometryInstanceAttribute from "../Core/DistanceDisplayConditionGeometryInstanceAttribute.js"; import ShowGeometryInstanceAttribute from "../Core/ShowGeometryInstanceAttribute.js"; diff --git a/packages/engine/Source/DataSources/StaticOutlineGeometryBatch.js b/packages/engine/Source/DataSources/StaticOutlineGeometryBatch.js index 17132917ba5d..f2167af6f156 100644 --- a/packages/engine/Source/DataSources/StaticOutlineGeometryBatch.js +++ b/packages/engine/Source/DataSources/StaticOutlineGeometryBatch.js @@ -1,8 +1,8 @@ +import { defined } from "@cesium/utils"; import AssociativeArray from "../Core/AssociativeArray.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; -import defined from "../Core/defined.js"; import DistanceDisplayCondition from "../Core/DistanceDisplayCondition.js"; import DistanceDisplayConditionGeometryInstanceAttribute from "../Core/DistanceDisplayConditionGeometryInstanceAttribute.js"; import OffsetGeometryInstanceAttribute from "../Core/OffsetGeometryInstanceAttribute.js"; diff --git a/packages/engine/Source/DataSources/StripeMaterialProperty.js b/packages/engine/Source/DataSources/StripeMaterialProperty.js index 067ad48019a5..1c2e6e898b85 100644 --- a/packages/engine/Source/DataSources/StripeMaterialProperty.js +++ b/packages/engine/Source/DataSources/StripeMaterialProperty.js @@ -1,7 +1,7 @@ +import { defined } from "@cesium/utils"; import Color from "../Core/Color.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import JulianDate from "../Core/JulianDate.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; import Property from "./Property.js"; diff --git a/packages/engine/Source/DataSources/TerrainOffsetProperty.js b/packages/engine/Source/DataSources/TerrainOffsetProperty.js index d4012b1d34f5..16a6df387b00 100644 --- a/packages/engine/Source/DataSources/TerrainOffsetProperty.js +++ b/packages/engine/Source/DataSources/TerrainOffsetProperty.js @@ -1,7 +1,6 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import Event from "../Core/Event.js"; import Iso8601 from "../Core/Iso8601.js"; diff --git a/packages/engine/Source/DataSources/TimeIntervalCollectionPositionProperty.js b/packages/engine/Source/DataSources/TimeIntervalCollectionPositionProperty.js index 09b547b3e095..aef0528b655f 100644 --- a/packages/engine/Source/DataSources/TimeIntervalCollectionPositionProperty.js +++ b/packages/engine/Source/DataSources/TimeIntervalCollectionPositionProperty.js @@ -1,5 +1,4 @@ -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; import JulianDate from "../Core/JulianDate.js"; import ReferenceFrame from "../Core/ReferenceFrame.js"; diff --git a/packages/engine/Source/DataSources/TimeIntervalCollectionProperty.js b/packages/engine/Source/DataSources/TimeIntervalCollectionProperty.js index 925d95376251..79cb4643c05c 100644 --- a/packages/engine/Source/DataSources/TimeIntervalCollectionProperty.js +++ b/packages/engine/Source/DataSources/TimeIntervalCollectionProperty.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import Event from "../Core/Event.js"; import JulianDate from "../Core/JulianDate.js"; import TimeIntervalCollection from "../Core/TimeIntervalCollection.js"; diff --git a/packages/engine/Source/DataSources/VelocityOrientationProperty.js b/packages/engine/Source/DataSources/VelocityOrientationProperty.js index 3f60f74a7413..b04aaf855da5 100644 --- a/packages/engine/Source/DataSources/VelocityOrientationProperty.js +++ b/packages/engine/Source/DataSources/VelocityOrientationProperty.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import defined from "../Core/defined.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import Event from "../Core/Event.js"; import JulianDate from "../Core/JulianDate.js"; diff --git a/packages/engine/Source/DataSources/VelocityVectorProperty.js b/packages/engine/Source/DataSources/VelocityVectorProperty.js index 8562a5e5f06c..87fcd93d1186 100644 --- a/packages/engine/Source/DataSources/VelocityVectorProperty.js +++ b/packages/engine/Source/DataSources/VelocityVectorProperty.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import defined from "../Core/defined.js"; import Event from "../Core/Event.js"; import JulianDate from "../Core/JulianDate.js"; import Property from "./Property.js"; diff --git a/packages/engine/Source/DataSources/Visualizer.js b/packages/engine/Source/DataSources/Visualizer.js index fc9331513f97..e5af430eb6ad 100644 --- a/packages/engine/Source/DataSources/Visualizer.js +++ b/packages/engine/Source/DataSources/Visualizer.js @@ -1,4 +1,4 @@ -import DeveloperError from "../Core/DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * Defines the interface for visualizers. Visualizers are plug-ins to diff --git a/packages/engine/Source/DataSources/WallGeometryUpdater.js b/packages/engine/Source/DataSources/WallGeometryUpdater.js index a205426a14c6..689491d5a1bc 100644 --- a/packages/engine/Source/DataSources/WallGeometryUpdater.js +++ b/packages/engine/Source/DataSources/WallGeometryUpdater.js @@ -1,8 +1,6 @@ -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import DistanceDisplayConditionGeometryInstanceAttribute from "../Core/DistanceDisplayConditionGeometryInstanceAttribute.js"; import GeometryInstance from "../Core/GeometryInstance.js"; import Iso8601 from "../Core/Iso8601.js"; diff --git a/packages/engine/Source/DataSources/WallGraphics.js b/packages/engine/Source/DataSources/WallGraphics.js index d458d3b4a17e..948515aa1e4b 100644 --- a/packages/engine/Source/DataSources/WallGraphics.js +++ b/packages/engine/Source/DataSources/WallGraphics.js @@ -1,7 +1,6 @@ -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import createMaterialPropertyDescriptor from "./createMaterialPropertyDescriptor.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; diff --git a/packages/engine/Source/DataSources/createMaterialPropertyDescriptor.js b/packages/engine/Source/DataSources/createMaterialPropertyDescriptor.js index 59273a451682..33ec875bb7b1 100644 --- a/packages/engine/Source/DataSources/createMaterialPropertyDescriptor.js +++ b/packages/engine/Source/DataSources/createMaterialPropertyDescriptor.js @@ -1,5 +1,5 @@ +import { DeveloperError } from "@cesium/utils"; import Color from "../Core/Color.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Resource from "../Core/Resource.js"; import ColorMaterialProperty from "./ColorMaterialProperty.js"; import createPropertyDescriptor from "./createPropertyDescriptor.js"; diff --git a/packages/engine/Source/DataSources/createPropertyDescriptor.js b/packages/engine/Source/DataSources/createPropertyDescriptor.js index 5f3051593690..6c402e5eabd0 100644 --- a/packages/engine/Source/DataSources/createPropertyDescriptor.js +++ b/packages/engine/Source/DataSources/createPropertyDescriptor.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import ConstantProperty from "./ConstantProperty.js"; function createProperty( diff --git a/packages/engine/Source/DataSources/exportKml.js b/packages/engine/Source/DataSources/exportKml.js index af64fac5af37..0eb86565b71c 100644 --- a/packages/engine/Source/DataSources/exportKml.js +++ b/packages/engine/Source/DataSources/exportKml.js @@ -1,26 +1,24 @@ +import { defined, DeveloperError, RuntimeError } from "@cesium/utils"; +import * as zip from "@zip.js/zip.js/lib/zip-no-worker.js"; import buildModuleUrl from "../Core/buildModuleUrl.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; import Color from "../Core/Color.js"; import createGuid from "../Core/createGuid.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Ellipsoid from "../Core/Ellipsoid.js"; +import Frozen from "../Core/Frozen.js"; import Iso8601 from "../Core/Iso8601.js"; import JulianDate from "../Core/JulianDate.js"; import CesiumMath from "../Core/Math.js"; import Rectangle from "../Core/Rectangle.js"; import ReferenceFrame from "../Core/ReferenceFrame.js"; import Resource from "../Core/Resource.js"; -import RuntimeError from "../Core/RuntimeError.js"; import TimeInterval from "../Core/TimeInterval.js"; import TimeIntervalCollection from "../Core/TimeIntervalCollection.js"; import HeightReference from "../Scene/HeightReference.js"; import HorizontalOrigin from "../Scene/HorizontalOrigin.js"; import VerticalOrigin from "../Scene/VerticalOrigin.js"; -import * as zip from "@zip.js/zip.js/lib/zip-no-worker.js"; import BillboardGraphics from "./BillboardGraphics.js"; import CompositePositionProperty from "./CompositePositionProperty.js"; import ModelGraphics from "./ModelGraphics.js"; diff --git a/packages/engine/Source/DataSources/getElement.js b/packages/engine/Source/DataSources/getElement.js index fdfaf462b70f..adb6e03dc790 100644 --- a/packages/engine/Source/DataSources/getElement.js +++ b/packages/engine/Source/DataSources/getElement.js @@ -1,4 +1,4 @@ -import DeveloperError from "../Core/DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * If element is a string, look up the element in the DOM by ID. Otherwise return element. diff --git a/packages/engine/Source/DataSources/heightReferenceOnEntityPropertyChanged.js b/packages/engine/Source/DataSources/heightReferenceOnEntityPropertyChanged.js index 73e1ab26b623..4be8e1d31eec 100644 --- a/packages/engine/Source/DataSources/heightReferenceOnEntityPropertyChanged.js +++ b/packages/engine/Source/DataSources/heightReferenceOnEntityPropertyChanged.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import CallbackProperty from "./CallbackProperty.js"; import GeometryUpdater from "./GeometryUpdater.js"; import TerrainOffsetProperty from "./TerrainOffsetProperty.js"; diff --git a/packages/engine/Source/Renderer/Buffer.js b/packages/engine/Source/Renderer/Buffer.js index 039650950ccb..d37b7beb3659 100644 --- a/packages/engine/Source/Renderer/Buffer.js +++ b/packages/engine/Source/Renderer/Buffer.js @@ -1,9 +1,7 @@ -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import createGuid from "../Core/createGuid.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Frozen from "../Core/Frozen.js"; import IndexDatatype from "../Core/IndexDatatype.js"; import WebGLConstants from "../Core/WebGLConstants.js"; import BufferUsage from "./BufferUsage.js"; diff --git a/packages/engine/Source/Renderer/ComputeEngine.js b/packages/engine/Source/Renderer/ComputeEngine.js index 8bb6d0da2ace..61acc8f92852 100644 --- a/packages/engine/Source/Renderer/ComputeEngine.js +++ b/packages/engine/Source/Renderer/ComputeEngine.js @@ -1,9 +1,7 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import BoundingRectangle from "../Core/BoundingRectangle.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import PrimitiveType from "../Core/PrimitiveType.js"; import ViewportQuadVS from "../Shaders/ViewportQuadVS.js"; import ClearCommand from "./ClearCommand.js"; diff --git a/packages/engine/Source/Renderer/Context.js b/packages/engine/Source/Renderer/Context.js index 61cd5ad55f6f..fcead0bf5e1b 100644 --- a/packages/engine/Source/Renderer/Context.js +++ b/packages/engine/Source/Renderer/Context.js @@ -1,18 +1,15 @@ -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError, RuntimeError } from "@cesium/utils"; import Color from "../Core/Color.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; import createGuid from "../Core/createGuid.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Frozen from "../Core/Frozen.js"; import Geometry from "../Core/Geometry.js"; import GeometryAttribute from "../Core/GeometryAttribute.js"; import loadKTX2 from "../Core/loadKTX2.js"; import Matrix4 from "../Core/Matrix4.js"; import PixelFormat from "../Core/PixelFormat.js"; import PrimitiveType from "../Core/PrimitiveType.js"; -import RuntimeError from "../Core/RuntimeError.js"; import WebGLConstants from "../Core/WebGLConstants.js"; import ViewportQuadVS from "../Shaders/ViewportQuadVS.js"; import BufferUsage from "./BufferUsage.js"; diff --git a/packages/engine/Source/Renderer/CubeMap.js b/packages/engine/Source/Renderer/CubeMap.js index f298db29953b..2e89d7dfffd2 100644 --- a/packages/engine/Source/Renderer/CubeMap.js +++ b/packages/engine/Source/Renderer/CubeMap.js @@ -1,10 +1,8 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import BoxGeometry from "../Core/BoxGeometry.js"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Frozen from "../Core/Frozen.js"; import GeometryPipeline from "../Core/GeometryPipeline.js"; import CesiumMath from "../Core/Math.js"; import PixelFormat from "../Core/PixelFormat.js"; diff --git a/packages/engine/Source/Renderer/CubeMapFace.js b/packages/engine/Source/Renderer/CubeMapFace.js index 671c218ae7f6..fc2a8b814743 100644 --- a/packages/engine/Source/Renderer/CubeMapFace.js +++ b/packages/engine/Source/Renderer/CubeMapFace.js @@ -1,6 +1,4 @@ -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import PixelFormat from "../Core/PixelFormat.js"; import PixelDatatype from "./PixelDatatype.js"; diff --git a/packages/engine/Source/Renderer/DrawCommand.js b/packages/engine/Source/Renderer/DrawCommand.js index 1c946338d272..93a77dba503c 100644 --- a/packages/engine/Source/Renderer/DrawCommand.js +++ b/packages/engine/Source/Renderer/DrawCommand.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import PrimitiveType from "../Core/PrimitiveType.js"; const Flags = { diff --git a/packages/engine/Source/Renderer/Framebuffer.js b/packages/engine/Source/Renderer/Framebuffer.js index 0c4d9c72e968..75823c43efa6 100644 --- a/packages/engine/Source/Renderer/Framebuffer.js +++ b/packages/engine/Source/Renderer/Framebuffer.js @@ -1,8 +1,6 @@ -import Check from "../Core/Check.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Frozen from "../Core/Frozen.js"; import PixelFormat from "../Core/PixelFormat.js"; import ContextLimits from "./ContextLimits.js"; import PixelDatatype from "./PixelDatatype.js"; diff --git a/packages/engine/Source/Renderer/FramebufferManager.js b/packages/engine/Source/Renderer/FramebufferManager.js index d70578b441c3..adc7164755ac 100644 --- a/packages/engine/Source/Renderer/FramebufferManager.js +++ b/packages/engine/Source/Renderer/FramebufferManager.js @@ -1,3 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; +import Frozen from "../Core/Frozen.js"; +import PixelFormat from "../Core/PixelFormat.js"; import Framebuffer from "./Framebuffer.js"; import MultisampleFramebuffer from "./MultisampleFramebuffer.js"; import PixelDatatype from "./PixelDatatype.js"; @@ -5,10 +8,6 @@ import Renderbuffer from "./Renderbuffer.js"; import RenderbufferFormat from "./RenderbufferFormat.js"; import Sampler from "./Sampler.js"; import Texture from "./Texture.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; -import PixelFormat from "../Core/PixelFormat.js"; /** * Creates a wrapper object around a framebuffer and its resources. diff --git a/packages/engine/Source/Renderer/MultisampleFramebuffer.js b/packages/engine/Source/Renderer/MultisampleFramebuffer.js index 980041e668eb..0be88f13c380 100644 --- a/packages/engine/Source/Renderer/MultisampleFramebuffer.js +++ b/packages/engine/Source/Renderer/MultisampleFramebuffer.js @@ -1,8 +1,6 @@ -import Check from "../Core/Check.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Frozen from "../Core/Frozen.js"; import Framebuffer from "./Framebuffer.js"; /** diff --git a/packages/engine/Source/Renderer/RenderState.js b/packages/engine/Source/Renderer/RenderState.js index fe0591e86cbe..b9e1bbc563ab 100644 --- a/packages/engine/Source/Renderer/RenderState.js +++ b/packages/engine/Source/Renderer/RenderState.js @@ -1,8 +1,7 @@ +import { defined, DeveloperError } from "@cesium/utils"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import Color from "../Core/Color.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import WebGLConstants from "../Core/WebGLConstants.js"; import WindingOrder from "../Core/WindingOrder.js"; import ContextLimits from "./ContextLimits.js"; diff --git a/packages/engine/Source/Renderer/Renderbuffer.js b/packages/engine/Source/Renderer/Renderbuffer.js index 3f518b4e1277..1dfd7773410c 100644 --- a/packages/engine/Source/Renderer/Renderbuffer.js +++ b/packages/engine/Source/Renderer/Renderbuffer.js @@ -1,8 +1,6 @@ -import Check from "../Core/Check.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Frozen from "../Core/Frozen.js"; import ContextLimits from "./ContextLimits.js"; import RenderbufferFormat from "./RenderbufferFormat.js"; diff --git a/packages/engine/Source/Renderer/Sampler.js b/packages/engine/Source/Renderer/Sampler.js index e5d2ab9295a4..eec1e2ef58d9 100644 --- a/packages/engine/Source/Renderer/Sampler.js +++ b/packages/engine/Source/Renderer/Sampler.js @@ -1,7 +1,5 @@ -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import TextureMagnificationFilter from "./TextureMagnificationFilter.js"; import TextureMinificationFilter from "./TextureMinificationFilter.js"; import TextureWrap from "./TextureWrap.js"; diff --git a/packages/engine/Source/Renderer/ShaderBuilder.js b/packages/engine/Source/Renderer/ShaderBuilder.js index 3f6469258d91..e5c053e0d6c6 100644 --- a/packages/engine/Source/Renderer/ShaderBuilder.js +++ b/packages/engine/Source/Renderer/ShaderBuilder.js @@ -1,12 +1,10 @@ -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import clone from "../Core/clone.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import ShaderDestination from "./ShaderDestination.js"; +import ShaderFunction from "./ShaderFunction.js"; import ShaderProgram from "./ShaderProgram.js"; import ShaderSource from "./ShaderSource.js"; import ShaderStruct from "./ShaderStruct.js"; -import ShaderFunction from "./ShaderFunction.js"; /** * An object that makes it easier to build the text of a {@link ShaderProgram}. This tracks GLSL code for both the vertex shader and the fragment shader. diff --git a/packages/engine/Source/Renderer/ShaderCache.js b/packages/engine/Source/Renderer/ShaderCache.js index dc297dd86f44..f3c154bc023a 100644 --- a/packages/engine/Source/Renderer/ShaderCache.js +++ b/packages/engine/Source/Renderer/ShaderCache.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import destroyObject from "../Core/destroyObject.js"; import ShaderProgram from "./ShaderProgram.js"; import ShaderSource from "./ShaderSource.js"; diff --git a/packages/engine/Source/Renderer/ShaderDestination.js b/packages/engine/Source/Renderer/ShaderDestination.js index eb3a9af3c318..77f7e2e42918 100644 --- a/packages/engine/Source/Renderer/ShaderDestination.js +++ b/packages/engine/Source/Renderer/ShaderDestination.js @@ -1,4 +1,4 @@ -import Check from "../Core/Check.js"; +import { Check } from "@cesium/utils"; /** * An enum describing whether a variable should be added to the diff --git a/packages/engine/Source/Renderer/ShaderFunction.js b/packages/engine/Source/Renderer/ShaderFunction.js index 00d1ca4ea39b..2fcd2e142268 100644 --- a/packages/engine/Source/Renderer/ShaderFunction.js +++ b/packages/engine/Source/Renderer/ShaderFunction.js @@ -1,4 +1,4 @@ -import DeveloperError from "../Core/DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * A utility for dynamically-generating a GLSL function diff --git a/packages/engine/Source/Renderer/ShaderProgram.js b/packages/engine/Source/Renderer/ShaderProgram.js index 0912489b171a..418fd9494646 100644 --- a/packages/engine/Source/Renderer/ShaderProgram.js +++ b/packages/engine/Source/Renderer/ShaderProgram.js @@ -1,9 +1,6 @@ -import Check from "../Core/Check.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; +import { Check, defined, DeveloperError, RuntimeError } from "@cesium/utils"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; -import RuntimeError from "../Core/RuntimeError.js"; +import Frozen from "../Core/Frozen.js"; import AutomaticUniforms from "./AutomaticUniforms.js"; import ContextLimits from "./ContextLimits.js"; import createUniform from "./createUniform.js"; diff --git a/packages/engine/Source/Renderer/ShaderSource.js b/packages/engine/Source/Renderer/ShaderSource.js index 16d405fae149..c8744ad2ae36 100644 --- a/packages/engine/Source/Renderer/ShaderSource.js +++ b/packages/engine/Source/Renderer/ShaderSource.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import CzmBuiltins from "../Shaders/Builtin/CzmBuiltins.js"; import AutomaticUniforms from "./AutomaticUniforms.js"; import demodernizeShader from "./demodernizeShader.js"; diff --git a/packages/engine/Source/Renderer/Texture.js b/packages/engine/Source/Renderer/Texture.js index 38f80021b375..60f58766b480 100644 --- a/packages/engine/Source/Renderer/Texture.js +++ b/packages/engine/Source/Renderer/Texture.js @@ -1,10 +1,8 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; -import Check from "../Core/Check.js"; import createGuid from "../Core/createGuid.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Frozen from "../Core/Frozen.js"; import CesiumMath from "../Core/Math.js"; import PixelFormat from "../Core/PixelFormat.js"; import ContextLimits from "./ContextLimits.js"; diff --git a/packages/engine/Source/Renderer/TextureAtlas.js b/packages/engine/Source/Renderer/TextureAtlas.js index 9fa62b646e3e..a6ee83bcfedf 100644 --- a/packages/engine/Source/Renderer/TextureAtlas.js +++ b/packages/engine/Source/Renderer/TextureAtlas.js @@ -1,14 +1,12 @@ +import { Check, defined, RuntimeError } from "@cesium/utils"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import Cartesian2 from "../Core/Cartesian2.js"; -import Check from "../Core/Check.js"; import createGuid from "../Core/createGuid.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; +import Frozen from "../Core/Frozen.js"; import CesiumMath from "../Core/Math.js"; import PixelFormat from "../Core/PixelFormat.js"; import Resource from "../Core/Resource.js"; -import RuntimeError from "../Core/RuntimeError.js"; import TexturePacker from "../Core/TexturePacker.js"; import Framebuffer from "./Framebuffer.js"; import Texture from "./Texture.js"; diff --git a/packages/engine/Source/Renderer/TextureCache.js b/packages/engine/Source/Renderer/TextureCache.js index bd5a78e6d3b2..3a69315ac280 100644 --- a/packages/engine/Source/Renderer/TextureCache.js +++ b/packages/engine/Source/Renderer/TextureCache.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import destroyObject from "../Core/destroyObject.js"; /** diff --git a/packages/engine/Source/Renderer/UniformState.js b/packages/engine/Source/Renderer/UniformState.js index 6a72cc180c99..d02295530f00 100644 --- a/packages/engine/Source/Renderer/UniformState.js +++ b/packages/engine/Source/Renderer/UniformState.js @@ -1,10 +1,10 @@ +import { defined } from "@cesium/utils"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; import Cartographic from "../Core/Cartographic.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import EncodedCartesian3 from "../Core/EncodedCartesian3.js"; import CesiumMath from "../Core/Math.js"; diff --git a/packages/engine/Source/Renderer/VertexArray.js b/packages/engine/Source/Renderer/VertexArray.js index 582389bd80f8..094d560bf40d 100644 --- a/packages/engine/Source/Renderer/VertexArray.js +++ b/packages/engine/Source/Renderer/VertexArray.js @@ -1,13 +1,10 @@ -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError, RuntimeError } from "@cesium/utils"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Frozen from "../Core/Frozen.js"; import Geometry from "../Core/Geometry.js"; import IndexDatatype from "../Core/IndexDatatype.js"; import CesiumMath from "../Core/Math.js"; -import RuntimeError from "../Core/RuntimeError.js"; import Buffer from "./Buffer.js"; import BufferUsage from "./BufferUsage.js"; import ContextLimits from "./ContextLimits.js"; diff --git a/packages/engine/Source/Renderer/VertexArrayFacade.js b/packages/engine/Source/Renderer/VertexArrayFacade.js index 120f9006dd5e..6115a514dc9c 100644 --- a/packages/engine/Source/Renderer/VertexArrayFacade.js +++ b/packages/engine/Source/Renderer/VertexArrayFacade.js @@ -1,8 +1,6 @@ -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import CesiumMath from "../Core/Math.js"; import Buffer from "./Buffer.js"; import BufferUsage from "./BufferUsage.js"; diff --git a/packages/engine/Source/Renderer/createUniform.js b/packages/engine/Source/Renderer/createUniform.js index 912c11d9d2e8..f9d752b89af7 100644 --- a/packages/engine/Source/Renderer/createUniform.js +++ b/packages/engine/Source/Renderer/createUniform.js @@ -1,13 +1,11 @@ +import { defined, DeveloperError, RuntimeError } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Matrix2 from "../Core/Matrix2.js"; import Matrix3 from "../Core/Matrix3.js"; import Matrix4 from "../Core/Matrix4.js"; -import RuntimeError from "../Core/RuntimeError.js"; /** * @private diff --git a/packages/engine/Source/Renderer/createUniformArray.js b/packages/engine/Source/Renderer/createUniformArray.js index 9b38fca15b6b..6ecf42cf3f17 100644 --- a/packages/engine/Source/Renderer/createUniformArray.js +++ b/packages/engine/Source/Renderer/createUniformArray.js @@ -1,13 +1,11 @@ +import { defined, DeveloperError, RuntimeError } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Matrix2 from "../Core/Matrix2.js"; import Matrix3 from "../Core/Matrix3.js"; import Matrix4 from "../Core/Matrix4.js"; -import RuntimeError from "../Core/RuntimeError.js"; /** * @private diff --git a/packages/engine/Source/Renderer/loadCubeMap.js b/packages/engine/Source/Renderer/loadCubeMap.js index 06312734bb27..dae9261808bb 100644 --- a/packages/engine/Source/Renderer/loadCubeMap.js +++ b/packages/engine/Source/Renderer/loadCubeMap.js @@ -1,6 +1,4 @@ -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import Resource from "../Core/Resource.js"; import CubeMap from "./CubeMap.js"; diff --git a/packages/engine/Source/Scene/Appearance.js b/packages/engine/Source/Scene/Appearance.js index f150ec363284..56445896e67f 100644 --- a/packages/engine/Source/Scene/Appearance.js +++ b/packages/engine/Source/Scene/Appearance.js @@ -1,7 +1,7 @@ +import { defined } from "@cesium/utils"; import clone from "../Core/clone.js"; import combine from "../Core/combine.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import BlendingState from "./BlendingState.js"; import CullFace from "./CullFace.js"; diff --git a/packages/engine/Source/Scene/ArcGisMapServerImageryProvider.js b/packages/engine/Source/Scene/ArcGisMapServerImageryProvider.js index 94fa4c03e02e..3faa4659c706 100644 --- a/packages/engine/Source/Scene/ArcGisMapServerImageryProvider.js +++ b/packages/engine/Source/Scene/ArcGisMapServerImageryProvider.js @@ -1,25 +1,22 @@ +import { Check, defined, DeveloperError, RuntimeError } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; -import Check from "../Core/Check.js"; import Credit from "../Core/Credit.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import GeographicProjection from "../Core/GeographicProjection.js"; import GeographicTilingScheme from "../Core/GeographicTilingScheme.js"; import CesiumMath from "../Core/Math.js"; import Rectangle from "../Core/Rectangle.js"; import Resource from "../Core/Resource.js"; -import RuntimeError from "../Core/RuntimeError.js"; import WebMercatorProjection from "../Core/WebMercatorProjection.js"; import WebMercatorTilingScheme from "../Core/WebMercatorTilingScheme.js"; +import ArcGisBaseMapType from "./ArcGisBaseMapType.js"; import ArcGisMapService from "./ArcGisMapService.js"; import DiscardMissingTileImagePolicy from "./DiscardMissingTileImagePolicy.js"; import ImageryLayerFeatureInfo from "./ImageryLayerFeatureInfo.js"; import ImageryProvider from "./ImageryProvider.js"; -import ArcGisBaseMapType from "./ArcGisBaseMapType.js"; -import DeveloperError from "../Core/DeveloperError.js"; /** * @typedef {object} ArcGisMapServerImageryProvider.ConstructorOptions diff --git a/packages/engine/Source/Scene/ArcGisMapService.js b/packages/engine/Source/Scene/ArcGisMapService.js index 420a80160326..18b7fd6fd3da 100644 --- a/packages/engine/Source/Scene/ArcGisMapService.js +++ b/packages/engine/Source/Scene/ArcGisMapService.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Credit from "../Core/Credit.js"; -import defined from "../Core/defined.js"; import Resource from "../Core/Resource.js"; let defaultTokenCredit; diff --git a/packages/engine/Source/Scene/AttributeType.js b/packages/engine/Source/Scene/AttributeType.js index 5ba4d4f2e5c7..d42d362976b5 100644 --- a/packages/engine/Source/Scene/AttributeType.js +++ b/packages/engine/Source/Scene/AttributeType.js @@ -1,8 +1,7 @@ +import { Check, DeveloperError } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; -import Check from "../Core/Check.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Matrix2 from "../Core/Matrix2.js"; import Matrix3 from "../Core/Matrix3.js"; import Matrix4 from "../Core/Matrix4.js"; diff --git a/packages/engine/Source/Scene/AutoExposure.js b/packages/engine/Source/Scene/AutoExposure.js index 9d2032cff6e1..10efd237f586 100644 --- a/packages/engine/Source/Scene/AutoExposure.js +++ b/packages/engine/Source/Scene/AutoExposure.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import ClearCommand from "../Renderer/ClearCommand.js"; import FramebufferManager from "../Renderer/FramebufferManager.js"; diff --git a/packages/engine/Source/Scene/Axis.js b/packages/engine/Source/Scene/Axis.js index 6ce33ac5aeb9..6301593e9df5 100644 --- a/packages/engine/Source/Scene/Axis.js +++ b/packages/engine/Source/Scene/Axis.js @@ -1,4 +1,4 @@ -import Check from "../Core/Check.js"; +import { Check } from "@cesium/utils"; import Matrix3 from "../Core/Matrix3.js"; import Matrix4 from "../Core/Matrix4.js"; diff --git a/packages/engine/Source/Scene/B3dmParser.js b/packages/engine/Source/Scene/B3dmParser.js index e76e6e21ee0d..bba0093149f0 100644 --- a/packages/engine/Source/Scene/B3dmParser.js +++ b/packages/engine/Source/Scene/B3dmParser.js @@ -1,7 +1,6 @@ -import Check from "../Core/Check.js"; +import { Check, RuntimeError } from "@cesium/utils"; import deprecationWarning from "../Core/deprecationWarning.js"; import getJsonFromTypedArray from "../Core/getJsonFromTypedArray.js"; -import RuntimeError from "../Core/RuntimeError.js"; /** * Handles parsing of a Batched 3D Model. diff --git a/packages/engine/Source/Scene/BatchTable.js b/packages/engine/Source/Scene/BatchTable.js index d8d0580b6a2b..325f7465fb5e 100644 --- a/packages/engine/Source/Scene/BatchTable.js +++ b/packages/engine/Source/Scene/BatchTable.js @@ -1,11 +1,10 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; import combine from "../Core/combine.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import PixelFormat from "../Core/PixelFormat.js"; import ContextLimits from "../Renderer/ContextLimits.js"; import PixelDatatype from "../Renderer/PixelDatatype.js"; diff --git a/packages/engine/Source/Scene/BatchTableHierarchy.js b/packages/engine/Source/Scene/BatchTableHierarchy.js index 037e339ef72c..0732805c984e 100644 --- a/packages/engine/Source/Scene/BatchTableHierarchy.js +++ b/packages/engine/Source/Scene/BatchTableHierarchy.js @@ -1,12 +1,9 @@ -import AttributeType from "./AttributeType.js"; -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError, RuntimeError } from "@cesium/utils"; import clone from "../Core/clone.js"; import combine from "../Core/combine.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import AttributeType from "./AttributeType.js"; import getBinaryAccessor from "./getBinaryAccessor.js"; -import RuntimeError from "../Core/RuntimeError.js"; /** * Object for handling the 3DTILES_batch_table_hierarchy extension diff --git a/packages/engine/Source/Scene/BatchTexture.js b/packages/engine/Source/Scene/BatchTexture.js index 8cc3484b95b8..2f9874ce4cfc 100644 --- a/packages/engine/Source/Scene/BatchTexture.js +++ b/packages/engine/Source/Scene/BatchTexture.js @@ -1,11 +1,9 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian4 from "../Core/Cartesian4.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; import createGuid from "../Core/createGuid.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import PixelFormat from "../Core/PixelFormat.js"; import ContextLimits from "../Renderer/ContextLimits.js"; import PixelDatatype from "../Renderer/PixelDatatype.js"; diff --git a/packages/engine/Source/Scene/Billboard.js b/packages/engine/Source/Scene/Billboard.js index 58053d7f9a05..2c492851590b 100644 --- a/packages/engine/Source/Scene/Billboard.js +++ b/packages/engine/Source/Scene/Billboard.js @@ -1,16 +1,14 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; import Cartographic from "../Core/Cartographic.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; import createGuid from "../Core/createGuid.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import DistanceDisplayCondition from "../Core/DistanceDisplayCondition.js"; import Ellipsoid from "../Core/Ellipsoid.js"; +import Frozen from "../Core/Frozen.js"; import Matrix4 from "../Core/Matrix4.js"; import NearFarScalar from "../Core/NearFarScalar.js"; import Resource from "../Core/Resource.js"; @@ -21,8 +19,8 @@ import HeightReference, { import HorizontalOrigin from "./HorizontalOrigin.js"; import SceneMode from "./SceneMode.js"; import SceneTransforms from "./SceneTransforms.js"; -import VerticalOrigin from "./VerticalOrigin.js"; import SplitDirection from "./SplitDirection.js"; +import VerticalOrigin from "./VerticalOrigin.js"; /** * @typedef {object} Billboard.ConstructorOptions diff --git a/packages/engine/Source/Scene/BillboardCollection.js b/packages/engine/Source/Scene/BillboardCollection.js index f5434d95176b..1469bc4df3e1 100644 --- a/packages/engine/Source/Scene/BillboardCollection.js +++ b/packages/engine/Source/Scene/BillboardCollection.js @@ -1,15 +1,14 @@ +import { Check, defined } from "@cesium/utils"; import AttributeCompression from "../Core/AttributeCompression.js"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import EncodedCartesian3 from "../Core/EncodedCartesian3.js"; +import Frozen from "../Core/Frozen.js"; import IndexDatatype from "../Core/IndexDatatype.js"; import CesiumMath from "../Core/Math.js"; import Matrix4 from "../Core/Matrix4.js"; @@ -22,6 +21,7 @@ import Pass from "../Renderer/Pass.js"; import RenderState from "../Renderer/RenderState.js"; import ShaderProgram from "../Renderer/ShaderProgram.js"; import ShaderSource from "../Renderer/ShaderSource.js"; +import TextureAtlas from "../Renderer/TextureAtlas.js"; import VertexArrayFacade from "../Renderer/VertexArrayFacade.js"; import BillboardCollectionFS from "../Shaders/BillboardCollectionFS.js"; import BillboardCollectionVS from "../Shaders/BillboardCollectionVS.js"; @@ -32,7 +32,6 @@ import HeightReference, { isHeightReferenceClamp } from "./HeightReference.js"; import HorizontalOrigin from "./HorizontalOrigin.js"; import SceneMode from "./SceneMode.js"; import SDFSettings from "./SDFSettings.js"; -import TextureAtlas from "../Renderer/TextureAtlas.js"; import VerticalOrigin from "./VerticalOrigin.js"; const SHOW_INDEX = Billboard.SHOW_INDEX; diff --git a/packages/engine/Source/Scene/BillboardTexture.js b/packages/engine/Source/Scene/BillboardTexture.js index 80903fdff05d..d0ae95e9187f 100644 --- a/packages/engine/Source/Scene/BillboardTexture.js +++ b/packages/engine/Source/Scene/BillboardTexture.js @@ -1,5 +1,4 @@ -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; +import { Check, defined } from "@cesium/utils"; import BillboardLoadState from "./BillboardLoadState.js"; /** diff --git a/packages/engine/Source/Scene/BingMapsImageryProvider.js b/packages/engine/Source/Scene/BingMapsImageryProvider.js index e1c9221ddd2b..c2aee58086d8 100644 --- a/packages/engine/Source/Scene/BingMapsImageryProvider.js +++ b/packages/engine/Source/Scene/BingMapsImageryProvider.js @@ -1,13 +1,11 @@ +import { Check, defined, RuntimeError } from "@cesium/utils"; import buildModuleUrl from "../Core/buildModuleUrl.js"; -import Check from "../Core/Check.js"; import Credit from "../Core/Credit.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import CesiumMath from "../Core/Math.js"; import Rectangle from "../Core/Rectangle.js"; import Resource from "../Core/Resource.js"; -import RuntimeError from "../Core/RuntimeError.js"; import TileProviderError from "../Core/TileProviderError.js"; import WebMercatorTilingScheme from "../Core/WebMercatorTilingScheme.js"; import BingMapsStyle from "./BingMapsStyle.js"; diff --git a/packages/engine/Source/Scene/BoundingVolumeSemantics.js b/packages/engine/Source/Scene/BoundingVolumeSemantics.js index 8bfb24ed38b6..da1ebbbc65e4 100644 --- a/packages/engine/Source/Scene/BoundingVolumeSemantics.js +++ b/packages/engine/Source/Scene/BoundingVolumeSemantics.js @@ -1,6 +1,4 @@ -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; /** * Utilities for parsing bounding volume semantics from 3D Tiles 1.1 metadata. diff --git a/packages/engine/Source/Scene/BoxEmitter.js b/packages/engine/Source/Scene/BoxEmitter.js index c37291da3236..5c8b7ddb07eb 100644 --- a/packages/engine/Source/Scene/BoxEmitter.js +++ b/packages/engine/Source/Scene/BoxEmitter.js @@ -1,5 +1,5 @@ +import { Check } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import CesiumMath from "../Core/Math.js"; const defaultDimensions = new Cartesian3(1.0, 1.0, 1.0); diff --git a/packages/engine/Source/Scene/BrdfLutGenerator.js b/packages/engine/Source/Scene/BrdfLutGenerator.js index d48551401288..839cac54012e 100644 --- a/packages/engine/Source/Scene/BrdfLutGenerator.js +++ b/packages/engine/Source/Scene/BrdfLutGenerator.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import BoundingRectangle from "../Core/BoundingRectangle.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import PixelFormat from "../Core/PixelFormat.js"; import Framebuffer from "../Renderer/Framebuffer.js"; diff --git a/packages/engine/Source/Scene/BufferLoader.js b/packages/engine/Source/Scene/BufferLoader.js index 7dad54d0d9f1..04b2d4dba16e 100644 --- a/packages/engine/Source/Scene/BufferLoader.js +++ b/packages/engine/Source/Scene/BufferLoader.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import ResourceLoader from "./ResourceLoader.js"; import ResourceLoaderState from "./ResourceLoaderState.js"; diff --git a/packages/engine/Source/Scene/Camera.js b/packages/engine/Source/Scene/Camera.js index 0cd1235f7c69..4b96ce0ddd9b 100644 --- a/packages/engine/Source/Scene/Camera.js +++ b/packages/engine/Source/Scene/Camera.js @@ -1,15 +1,14 @@ +import { defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; import Cartographic from "../Core/Cartographic.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import EasingFunction from "../Core/EasingFunction.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import EllipsoidGeodesic from "../Core/EllipsoidGeodesic.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import getTimestamp from "../Core/getTimestamp.js"; import HeadingPitchRange from "../Core/HeadingPitchRange.js"; import HeadingPitchRoll from "../Core/HeadingPitchRoll.js"; diff --git a/packages/engine/Source/Scene/CameraEventAggregator.js b/packages/engine/Source/Scene/CameraEventAggregator.js index 24a0be753884..213b0db95d00 100644 --- a/packages/engine/Source/Scene/CameraEventAggregator.js +++ b/packages/engine/Source/Scene/CameraEventAggregator.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import KeyboardEventModifier from "../Core/KeyboardEventModifier.js"; import CesiumMath from "../Core/Math.js"; import ScreenSpaceEventHandler from "../Core/ScreenSpaceEventHandler.js"; diff --git a/packages/engine/Source/Scene/CameraFlightPath.js b/packages/engine/Source/Scene/CameraFlightPath.js index f5a7c2e3fd7d..6afc4bae6da9 100644 --- a/packages/engine/Source/Scene/CameraFlightPath.js +++ b/packages/engine/Source/Scene/CameraFlightPath.js @@ -1,10 +1,9 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import EasingFunction from "../Core/EasingFunction.js"; +import Frozen from "../Core/Frozen.js"; import CesiumMath from "../Core/Math.js"; import PerspectiveFrustum from "../Core/PerspectiveFrustum.js"; import PerspectiveOffCenterFrustum from "../Core/PerspectiveOffCenterFrustum.js"; diff --git a/packages/engine/Source/Scene/Cesium3DContentGroup.js b/packages/engine/Source/Scene/Cesium3DContentGroup.js index b3b6e3e0b09d..d8122b7e55c0 100644 --- a/packages/engine/Source/Scene/Cesium3DContentGroup.js +++ b/packages/engine/Source/Scene/Cesium3DContentGroup.js @@ -1,4 +1,4 @@ -import Check from "../Core/Check.js"; +import { Check } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; /** diff --git a/packages/engine/Source/Scene/Cesium3DTile.js b/packages/engine/Source/Scene/Cesium3DTile.js index f06b3b97acd5..567e325f6b5a 100644 --- a/packages/engine/Source/Scene/Cesium3DTile.js +++ b/packages/engine/Source/Scene/Cesium3DTile.js @@ -1,9 +1,9 @@ +import { defined, RuntimeError } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; import CullingVolume from "../Core/CullingVolume.js"; -import defined from "../Core/defined.js"; import deprecationWarning from "../Core/deprecationWarning.js"; import destroyObject from "../Core/destroyObject.js"; import Ellipsoid from "../Core/Ellipsoid.js"; @@ -20,7 +20,9 @@ import RequestScheduler from "../Core/RequestScheduler.js"; import RequestState from "../Core/RequestState.js"; import RequestType from "../Core/RequestType.js"; import Resource from "../Core/Resource.js"; -import RuntimeError from "../Core/RuntimeError.js"; +import VerticalExaggeration from "../Core/VerticalExaggeration.js"; +import Pass from "../Renderer/Pass.js"; +import BoundingVolumeSemantics from "./BoundingVolumeSemantics.js"; import Cesium3DContentGroup from "./Cesium3DContentGroup.js"; import Cesium3DTileContentFactory from "./Cesium3DTileContentFactory.js"; import Cesium3DTileContentState from "./Cesium3DTileContentState.js"; @@ -34,15 +36,12 @@ import findGroupMetadata from "./findGroupMetadata.js"; import findTileMetadata from "./findTileMetadata.js"; import hasExtension from "./hasExtension.js"; import Multiple3DTileContent from "./Multiple3DTileContent.js"; -import BoundingVolumeSemantics from "./BoundingVolumeSemantics.js"; import preprocess3DTileContent from "./preprocess3DTileContent.js"; import SceneMode from "./SceneMode.js"; import TileBoundingRegion from "./TileBoundingRegion.js"; import TileBoundingS2Cell from "./TileBoundingS2Cell.js"; import TileBoundingSphere from "./TileBoundingSphere.js"; import TileOrientedBoundingBox from "./TileOrientedBoundingBox.js"; -import Pass from "../Renderer/Pass.js"; -import VerticalExaggeration from "../Core/VerticalExaggeration.js"; /** * A tile in a {@link Cesium3DTileset}. When a tile is first created, its content is not loaded; @@ -122,7 +121,7 @@ function Cesium3DTile(tileset, baseResource, header, parent) { this._verticalExaggeration = 1.0; this._verticalExaggerationRelativeHeight = 0.0; - // Important: tile metadata must be parsed before this line so that the + // important: tile metadata must be parsed before this line so that the // metadata semantics TILE_BOUNDING_BOX, TILE_BOUNDING_REGION, or TILE_BOUNDING_SPHERE // can override header.boundingVolume (if necessary) this._boundingVolume = this.createBoundingVolume( diff --git a/packages/engine/Source/Scene/Cesium3DTileBatchTable.js b/packages/engine/Source/Scene/Cesium3DTileBatchTable.js index 07b153cece2f..961f9d87e5e8 100644 --- a/packages/engine/Source/Scene/Cesium3DTileBatchTable.js +++ b/packages/engine/Source/Scene/Cesium3DTileBatchTable.js @@ -1,21 +1,18 @@ +import { Check, defined, DeveloperError, RuntimeError } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; -import Check from "../Core/Check.js"; import clone from "../Core/clone.js"; import Color from "../Core/Color.js"; import combine from "../Core/combine.js"; -import defined from "../Core/defined.js"; import deprecationWarning from "../Core/deprecationWarning.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import CesiumMath from "../Core/Math.js"; -import RuntimeError from "../Core/RuntimeError.js"; import ContextLimits from "../Renderer/ContextLimits.js"; import DrawCommand from "../Renderer/DrawCommand.js"; import Pass from "../Renderer/Pass.js"; import RenderState from "../Renderer/RenderState.js"; import ShaderSource from "../Renderer/ShaderSource.js"; -import BatchTexture from "./BatchTexture.js"; import BatchTableHierarchy from "./BatchTableHierarchy.js"; +import BatchTexture from "./BatchTexture.js"; import BlendingState from "./BlendingState.js"; import Cesium3DTileColorBlendMode from "./Cesium3DTileColorBlendMode.js"; import CullFace from "./CullFace.js"; diff --git a/packages/engine/Source/Scene/Cesium3DTileContent.js b/packages/engine/Source/Scene/Cesium3DTileContent.js index 945242881b42..63fb1d634e28 100644 --- a/packages/engine/Source/Scene/Cesium3DTileContent.js +++ b/packages/engine/Source/Scene/Cesium3DTileContent.js @@ -1,4 +1,4 @@ -import DeveloperError from "../Core/DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * The content of a tile in a {@link Cesium3DTileset}. diff --git a/packages/engine/Source/Scene/Cesium3DTileContentFactory.js b/packages/engine/Source/Scene/Cesium3DTileContentFactory.js index 7c18fdb7a19f..ef5d897334df 100644 --- a/packages/engine/Source/Scene/Cesium3DTileContentFactory.js +++ b/packages/engine/Source/Scene/Cesium3DTileContentFactory.js @@ -1,10 +1,10 @@ +import { RuntimeError } from "@cesium/utils"; import Composite3DTileContent from "./Composite3DTileContent.js"; import Geometry3DTileContent from "./Geometry3DTileContent.js"; import Implicit3DTileContent from "./Implicit3DTileContent.js"; import Model3DTileContent from "./Model/Model3DTileContent.js"; import Tileset3DTileContent from "./Tileset3DTileContent.js"; import Vector3DTileContent from "./Vector3DTileContent.js"; -import RuntimeError from "../Core/RuntimeError.js"; /** * Maps a tile's magic field in its header to a new content object for the tile's payload. diff --git a/packages/engine/Source/Scene/Cesium3DTileFeature.js b/packages/engine/Source/Scene/Cesium3DTileFeature.js index 037de779ad92..b2ac9f0f918f 100644 --- a/packages/engine/Source/Scene/Cesium3DTileFeature.js +++ b/packages/engine/Source/Scene/Cesium3DTileFeature.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; /** * A feature of a {@link Cesium3DTileset}. diff --git a/packages/engine/Source/Scene/Cesium3DTileFeatureTable.js b/packages/engine/Source/Scene/Cesium3DTileFeatureTable.js index 1a1714dc956a..44cd313e09bf 100644 --- a/packages/engine/Source/Scene/Cesium3DTileFeatureTable.js +++ b/packages/engine/Source/Scene/Cesium3DTileFeatureTable.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import defined from "../Core/defined.js"; /** * @private diff --git a/packages/engine/Source/Scene/Cesium3DTileOptimizations.js b/packages/engine/Source/Scene/Cesium3DTileOptimizations.js index d4a5d1c9dafd..e6db18038306 100644 --- a/packages/engine/Source/Scene/Cesium3DTileOptimizations.js +++ b/packages/engine/Source/Scene/Cesium3DTileOptimizations.js @@ -1,5 +1,5 @@ +import { Check } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import Cesium3DTileOptimizationHint from "./Cesium3DTileOptimizationHint.js"; import TileBoundingRegion from "./TileBoundingRegion.js"; import TileOrientedBoundingBox from "./TileOrientedBoundingBox.js"; diff --git a/packages/engine/Source/Scene/Cesium3DTilePassState.js b/packages/engine/Source/Scene/Cesium3DTilePassState.js index d86c774faf51..0f983205b3be 100644 --- a/packages/engine/Source/Scene/Cesium3DTilePassState.js +++ b/packages/engine/Source/Scene/Cesium3DTilePassState.js @@ -1,4 +1,4 @@ -import Check from "../Core/Check.js"; +import { Check } from "@cesium/utils"; /** * The state for a 3D Tiles update pass. diff --git a/packages/engine/Source/Scene/Cesium3DTilePointFeature.js b/packages/engine/Source/Scene/Cesium3DTilePointFeature.js index 027ec0e690e2..c9fcaee8553c 100644 --- a/packages/engine/Source/Scene/Cesium3DTilePointFeature.js +++ b/packages/engine/Source/Scene/Cesium3DTilePointFeature.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import Cartographic from "../Core/Cartographic.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import Cesium3DTileFeature from "./Cesium3DTileFeature.js"; import createBillboardPointCallback from "./createBillboardPointCallback.js"; diff --git a/packages/engine/Source/Scene/Cesium3DTileStyle.js b/packages/engine/Source/Scene/Cesium3DTileStyle.js index 3415886134cd..97da6f987b90 100644 --- a/packages/engine/Source/Scene/Cesium3DTileStyle.js +++ b/packages/engine/Source/Scene/Cesium3DTileStyle.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import clone from "../Core/clone.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Resource from "../Core/Resource.js"; import ConditionsExpression from "./ConditionsExpression.js"; import Expression from "./Expression.js"; diff --git a/packages/engine/Source/Scene/Cesium3DTileStyleEngine.js b/packages/engine/Source/Scene/Cesium3DTileStyleEngine.js index bd6eac5a1136..9077cfeea576 100644 --- a/packages/engine/Source/Scene/Cesium3DTileStyleEngine.js +++ b/packages/engine/Source/Scene/Cesium3DTileStyleEngine.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; /** * @private diff --git a/packages/engine/Source/Scene/Cesium3DTilesVoxelProvider.js b/packages/engine/Source/Scene/Cesium3DTilesVoxelProvider.js index 503d17b6a812..ba824780d807 100644 --- a/packages/engine/Source/Scene/Cesium3DTilesVoxelProvider.js +++ b/packages/engine/Source/Scene/Cesium3DTilesVoxelProvider.js @@ -1,28 +1,26 @@ +import { Check, defined, RuntimeError } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import Cesium3DTilesetMetadata from "./Cesium3DTilesetMetadata.js"; -import Check from "../Core/Check.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import Ellipsoid from "../Core/Ellipsoid.js"; +import Frozen from "../Core/Frozen.js"; +import CesiumMath from "../Core/Math.js"; +import Matrix3 from "../Core/Matrix3.js"; +import Matrix4 from "../Core/Matrix4.js"; +import OrientedBoundingBox from "../Core/OrientedBoundingBox.js"; +import Quaternion from "../Core/Quaternion.js"; +import Resource from "../Core/Resource.js"; +import Cesium3DTilesetMetadata from "./Cesium3DTilesetMetadata.js"; import hasExtension from "./hasExtension.js"; import ImplicitSubtree from "./ImplicitSubtree.js"; import ImplicitSubtreeCache from "./ImplicitSubtreeCache.js"; import ImplicitTileCoordinates from "./ImplicitTileCoordinates.js"; import ImplicitTileset from "./ImplicitTileset.js"; -import Matrix3 from "../Core/Matrix3.js"; -import Matrix4 from "../Core/Matrix4.js"; import MetadataSemantic from "./MetadataSemantic.js"; import MetadataType from "./MetadataType.js"; -import OrientedBoundingBox from "../Core/OrientedBoundingBox.js"; import preprocess3DTileContent from "./preprocess3DTileContent.js"; -import Resource from "../Core/Resource.js"; import ResourceCache from "./ResourceCache.js"; -import RuntimeError from "../Core/RuntimeError.js"; import VoxelContent from "./VoxelContent.js"; import VoxelMetadataOrder from "./VoxelMetadataOrder.js"; import VoxelShapeType from "./VoxelShapeType.js"; -import CesiumMath from "../Core/Math.js"; -import Quaternion from "../Core/Quaternion.js"; /** * @typedef {Object} Cesium3DTilesVoxelProvider.ConstructorOptions diff --git a/packages/engine/Source/Scene/Cesium3DTileset.js b/packages/engine/Source/Scene/Cesium3DTileset.js index 6da82b200797..85570eff2034 100644 --- a/packages/engine/Source/Scene/Cesium3DTileset.js +++ b/packages/engine/Source/Scene/Cesium3DTileset.js @@ -1,29 +1,28 @@ +import { Check, defined, RuntimeError } from "@cesium/utils"; import ApproximateTerrainHeights from "../Core/ApproximateTerrainHeights.js"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; -import Check from "../Core/Check.js"; import clone from "../Core/clone.js"; import Color from "../Core/Color.js"; import Credit from "../Core/Credit.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import deprecationWarning from "../Core/deprecationWarning.js"; import destroyObject from "../Core/destroyObject.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import Event from "../Core/Event.js"; -import ImageBasedLighting from "./ImageBasedLighting.js"; -import Interval from "../Core/Interval.js"; +import Frozen from "../Core/Frozen.js"; import IntersectionTests from "../Core/IntersectionTests.js"; +import Interval from "../Core/Interval.js"; import IonResource from "../Core/IonResource.js"; import JulianDate from "../Core/JulianDate.js"; import ManagedArray from "../Core/ManagedArray.js"; import CesiumMath from "../Core/Math.js"; import Matrix3 from "../Core/Matrix3.js"; import Matrix4 from "../Core/Matrix4.js"; +import oneTimeWarning from "../Core/oneTimeWarning.js"; +import Ray from "../Core/Ray.js"; import Resource from "../Core/Resource.js"; -import RuntimeError from "../Core/RuntimeError.js"; import Transforms from "../Core/Transforms.js"; import ClearCommand from "../Renderer/ClearCommand.js"; import Pass from "../Renderer/Pass.js"; @@ -32,21 +31,25 @@ import Axis from "./Axis.js"; import Cesium3DTile from "./Cesium3DTile.js"; import Cesium3DTileColorBlendMode from "./Cesium3DTileColorBlendMode.js"; import Cesium3DTileContentState from "./Cesium3DTileContentState.js"; -import Cesium3DTilesetMetadata from "./Cesium3DTilesetMetadata.js"; import Cesium3DTileOptimizations from "./Cesium3DTileOptimizations.js"; import Cesium3DTilePass from "./Cesium3DTilePass.js"; import Cesium3DTileRefine from "./Cesium3DTileRefine.js"; +import Cesium3DTilesetBaseTraversal from "./Cesium3DTilesetBaseTraversal.js"; import Cesium3DTilesetCache from "./Cesium3DTilesetCache.js"; import Cesium3DTilesetHeatmap from "./Cesium3DTilesetHeatmap.js"; +import Cesium3DTilesetMetadata from "./Cesium3DTilesetMetadata.js"; +import Cesium3DTilesetMostDetailedTraversal from "./Cesium3DTilesetMostDetailedTraversal.js"; +import Cesium3DTilesetSkipTraversal from "./Cesium3DTilesetSkipTraversal.js"; import Cesium3DTilesetStatistics from "./Cesium3DTilesetStatistics.js"; import Cesium3DTileStyleEngine from "./Cesium3DTileStyleEngine.js"; import ClippingPlaneCollection from "./ClippingPlaneCollection.js"; import ClippingPolygonCollection from "./ClippingPolygonCollection.js"; +import DynamicEnvironmentMapManager from "./DynamicEnvironmentMapManager.js"; import hasExtension from "./hasExtension.js"; -import ImplicitTileset from "./ImplicitTileset.js"; +import ImageBasedLighting from "./ImageBasedLighting.js"; import ImplicitTileCoordinates from "./ImplicitTileCoordinates.js"; +import ImplicitTileset from "./ImplicitTileset.js"; import LabelCollection from "./LabelCollection.js"; -import oneTimeWarning from "../Core/oneTimeWarning.js"; import PointCloudEyeDomeLighting from "./PointCloudEyeDomeLighting.js"; import PointCloudShading from "./PointCloudShading.js"; import ResourceCache from "./ResourceCache.js"; @@ -57,11 +60,6 @@ import StencilConstants from "./StencilConstants.js"; import TileBoundingRegion from "./TileBoundingRegion.js"; import TileBoundingSphere from "./TileBoundingSphere.js"; import TileOrientedBoundingBox from "./TileOrientedBoundingBox.js"; -import Cesium3DTilesetMostDetailedTraversal from "./Cesium3DTilesetMostDetailedTraversal.js"; -import Cesium3DTilesetBaseTraversal from "./Cesium3DTilesetBaseTraversal.js"; -import Cesium3DTilesetSkipTraversal from "./Cesium3DTilesetSkipTraversal.js"; -import Ray from "../Core/Ray.js"; -import DynamicEnvironmentMapManager from "./DynamicEnvironmentMapManager.js"; /** * @typedef {Object} Cesium3DTileset.ConstructorOptions diff --git a/packages/engine/Source/Scene/Cesium3DTilesetBaseTraversal.js b/packages/engine/Source/Scene/Cesium3DTilesetBaseTraversal.js index bd48b939cdae..1559358da63f 100644 --- a/packages/engine/Source/Scene/Cesium3DTilesetBaseTraversal.js +++ b/packages/engine/Source/Scene/Cesium3DTilesetBaseTraversal.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import ManagedArray from "../Core/ManagedArray.js"; import Cesium3DTileRefine from "./Cesium3DTileRefine.js"; import Cesium3DTilesetTraversal from "./Cesium3DTilesetTraversal.js"; diff --git a/packages/engine/Source/Scene/Cesium3DTilesetCache.js b/packages/engine/Source/Scene/Cesium3DTilesetCache.js index 7c09edcbfa41..4ee1d75f88ce 100644 --- a/packages/engine/Source/Scene/Cesium3DTilesetCache.js +++ b/packages/engine/Source/Scene/Cesium3DTilesetCache.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import DoublyLinkedList from "../Core/DoublyLinkedList.js"; /** diff --git a/packages/engine/Source/Scene/Cesium3DTilesetHeatmap.js b/packages/engine/Source/Scene/Cesium3DTilesetHeatmap.js index 6378a5ebcf7d..fe5a9ddfd680 100644 --- a/packages/engine/Source/Scene/Cesium3DTilesetHeatmap.js +++ b/packages/engine/Source/Scene/Cesium3DTilesetHeatmap.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import JulianDate from "../Core/JulianDate.js"; import CesiumMath from "../Core/Math.js"; diff --git a/packages/engine/Source/Scene/Cesium3DTilesetMetadata.js b/packages/engine/Source/Scene/Cesium3DTilesetMetadata.js index 1d99f9bde60c..7f7d76ab0351 100644 --- a/packages/engine/Source/Scene/Cesium3DTilesetMetadata.js +++ b/packages/engine/Source/Scene/Cesium3DTilesetMetadata.js @@ -1,6 +1,5 @@ -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import GroupMetadata from "./GroupMetadata.js"; import TilesetMetadata from "./TilesetMetadata.js"; diff --git a/packages/engine/Source/Scene/Cesium3DTilesetSkipTraversal.js b/packages/engine/Source/Scene/Cesium3DTilesetSkipTraversal.js index eebcff5bc987..3fa4651dab89 100644 --- a/packages/engine/Source/Scene/Cesium3DTilesetSkipTraversal.js +++ b/packages/engine/Source/Scene/Cesium3DTilesetSkipTraversal.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import ManagedArray from "../Core/ManagedArray.js"; import Cesium3DTileRefine from "./Cesium3DTileRefine.js"; import Cesium3DTilesetTraversal from "./Cesium3DTilesetTraversal.js"; diff --git a/packages/engine/Source/Scene/Cesium3DTilesetStatistics.js b/packages/engine/Source/Scene/Cesium3DTilesetStatistics.js index 17b094f33ad0..c0198838cd3a 100644 --- a/packages/engine/Source/Scene/Cesium3DTilesetStatistics.js +++ b/packages/engine/Source/Scene/Cesium3DTilesetStatistics.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import Model3DTileContent from "./Model/Model3DTileContent.js"; /** diff --git a/packages/engine/Source/Scene/Cesium3DTilesetTraversal.js b/packages/engine/Source/Scene/Cesium3DTilesetTraversal.js index fd13b76d9d4a..81e8e328a9ec 100644 --- a/packages/engine/Source/Scene/Cesium3DTilesetTraversal.js +++ b/packages/engine/Source/Scene/Cesium3DTilesetTraversal.js @@ -1,5 +1,4 @@ -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Intersect from "../Core/Intersect.js"; import Cesium3DTileOptimizationHint from "./Cesium3DTileOptimizationHint.js"; import Cesium3DTileRefine from "./Cesium3DTileRefine.js"; diff --git a/packages/engine/Source/Scene/CircleEmitter.js b/packages/engine/Source/Scene/CircleEmitter.js index 4857b0eec776..f6262cea0d82 100644 --- a/packages/engine/Source/Scene/CircleEmitter.js +++ b/packages/engine/Source/Scene/CircleEmitter.js @@ -1,5 +1,5 @@ +import { Check } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import CesiumMath from "../Core/Math.js"; /** diff --git a/packages/engine/Source/Scene/ClassificationPrimitive.js b/packages/engine/Source/Scene/ClassificationPrimitive.js index cb3f31eb39a0..cd81f4b137e9 100644 --- a/packages/engine/Source/Scene/ClassificationPrimitive.js +++ b/packages/engine/Source/Scene/ClassificationPrimitive.js @@ -1,9 +1,8 @@ +import { defined, DeveloperError } from "@cesium/utils"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; import combine from "../Core/combine.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Frozen from "../Core/Frozen.js"; import GeometryInstance from "../Core/GeometryInstance.js"; import DrawCommand from "../Renderer/DrawCommand.js"; import Pass from "../Renderer/Pass.js"; diff --git a/packages/engine/Source/Scene/ClippingPlane.js b/packages/engine/Source/Scene/ClippingPlane.js index 603ba0309a02..34f4e4ef5616 100644 --- a/packages/engine/Source/Scene/ClippingPlane.js +++ b/packages/engine/Source/Scene/ClippingPlane.js @@ -1,6 +1,5 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; /** * A Plane in Hessian Normal form to be used with {@link ClippingPlaneCollection}. diff --git a/packages/engine/Source/Scene/ClippingPlaneCollection.js b/packages/engine/Source/Scene/ClippingPlaneCollection.js index 53faf8d9c2ef..1b870850631c 100644 --- a/packages/engine/Source/Scene/ClippingPlaneCollection.js +++ b/packages/engine/Source/Scene/ClippingPlaneCollection.js @@ -1,14 +1,12 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import AttributeCompression from "../Core/AttributeCompression.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import Intersect from "../Core/Intersect.js"; import Matrix4 from "../Core/Matrix4.js"; import PixelFormat from "../Core/PixelFormat.js"; diff --git a/packages/engine/Source/Scene/ClippingPolygon.js b/packages/engine/Source/Scene/ClippingPolygon.js index c9497a2a700a..6c6d0437e6cd 100644 --- a/packages/engine/Source/Scene/ClippingPolygon.js +++ b/packages/engine/Source/Scene/ClippingPolygon.js @@ -1,7 +1,6 @@ -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; -import defined from "../Core/defined.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import CesiumMath from "../Core/Math.js"; import PolygonGeometry from "../Core/PolygonGeometry.js"; diff --git a/packages/engine/Source/Scene/ClippingPolygonCollection.js b/packages/engine/Source/Scene/ClippingPolygonCollection.js index b01e26f61433..e3775cf5f856 100644 --- a/packages/engine/Source/Scene/ClippingPolygonCollection.js +++ b/packages/engine/Source/Scene/ClippingPolygonCollection.js @@ -1,25 +1,22 @@ +import { Check, defined, DeveloperError, RuntimeError } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; -import CesiumMath from "../Core/Math.js"; -import Check from "../Core/Check.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import Intersect from "../Core/Intersect.js"; +import CesiumMath from "../Core/Math.js"; import PixelFormat from "../Core/PixelFormat.js"; import Rectangle from "../Core/Rectangle.js"; +import ComputeCommand from "../Renderer/ComputeCommand.js"; import ContextLimits from "../Renderer/ContextLimits.js"; import PixelDatatype from "../Renderer/PixelDatatype.js"; -import RuntimeError from "../Core/RuntimeError.js"; import Sampler from "../Renderer/Sampler.js"; import Texture from "../Renderer/Texture.js"; import TextureMagnificationFilter from "../Renderer/TextureMagnificationFilter.js"; import TextureMinificationFilter from "../Renderer/TextureMinificationFilter.js"; import TextureWrap from "../Renderer/TextureWrap.js"; -import ClippingPolygon from "./ClippingPolygon.js"; -import ComputeCommand from "../Renderer/ComputeCommand.js"; import PolygonSignedDistanceFS from "../Shaders/PolygonSignedDistanceFS.js"; +import ClippingPolygon from "./ClippingPolygon.js"; /** * Specifies a set of clipping polygons. Clipping polygons selectively disable rendering in a region diff --git a/packages/engine/Source/Scene/CloudCollection.js b/packages/engine/Source/Scene/CloudCollection.js index 2ef0076e72ea..501abb652ce7 100644 --- a/packages/engine/Source/Scene/CloudCollection.js +++ b/packages/engine/Source/Scene/CloudCollection.js @@ -1,38 +1,36 @@ -import BlendingState from "./BlendingState.js"; -import Buffer from "../Renderer/Buffer.js"; -import BufferUsage from "../Renderer/BufferUsage.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; -import ComputeCommand from "../Renderer/ComputeCommand.js"; -import CloudType from "./CloudType.js"; -import CloudCollectionFS from "../Shaders/CloudCollectionFS.js"; -import CloudCollectionVS from "../Shaders/CloudCollectionVS.js"; -import CloudNoiseFS from "../Shaders/CloudNoiseFS.js"; -import CloudNoiseVS from "../Shaders/CloudNoiseVS.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import CumulusCloud from "./CumulusCloud.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; -import DrawCommand from "../Renderer/DrawCommand.js"; import EncodedCartesian3 from "../Core/EncodedCartesian3.js"; +import Frozen from "../Core/Frozen.js"; import IndexDatatype from "../Core/IndexDatatype.js"; +import PixelFormat from "../Core/PixelFormat.js"; +import WebGLConstants from "../Core/WebGLConstants.js"; +import Buffer from "../Renderer/Buffer.js"; +import BufferUsage from "../Renderer/BufferUsage.js"; +import ComputeCommand from "../Renderer/ComputeCommand.js"; +import DrawCommand from "../Renderer/DrawCommand.js"; import Pass from "../Renderer/Pass.js"; import PixelDatatype from "../Renderer/PixelDatatype.js"; -import PixelFormat from "../Core/PixelFormat.js"; import RenderState from "../Renderer/RenderState.js"; import Sampler from "../Renderer/Sampler.js"; -import ShaderSource from "../Renderer/ShaderSource.js"; import ShaderProgram from "../Renderer/ShaderProgram.js"; +import ShaderSource from "../Renderer/ShaderSource.js"; import Texture from "../Renderer/Texture.js"; import TextureMagnificationFilter from "../Renderer/TextureMagnificationFilter.js"; import TextureMinificationFilter from "../Renderer/TextureMinificationFilter.js"; import TextureWrap from "../Renderer/TextureWrap.js"; import VertexArray from "../Renderer/VertexArray.js"; import VertexArrayFacade from "../Renderer/VertexArrayFacade.js"; -import WebGLConstants from "../Core/WebGLConstants.js"; +import CloudCollectionFS from "../Shaders/CloudCollectionFS.js"; +import CloudCollectionVS from "../Shaders/CloudCollectionVS.js"; +import CloudNoiseFS from "../Shaders/CloudNoiseFS.js"; +import CloudNoiseVS from "../Shaders/CloudNoiseVS.js"; +import BlendingState from "./BlendingState.js"; +import CloudType from "./CloudType.js"; +import CumulusCloud from "./CumulusCloud.js"; let attributeLocations; const scratchTextureDimensions = new Cartesian3(); diff --git a/packages/engine/Source/Scene/Composite3DTileContent.js b/packages/engine/Source/Scene/Composite3DTileContent.js index 23e4c64bceb3..0f62f3009242 100644 --- a/packages/engine/Source/Scene/Composite3DTileContent.js +++ b/packages/engine/Source/Scene/Composite3DTileContent.js @@ -1,8 +1,7 @@ +import { defined, RuntimeError } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import getMagic from "../Core/getMagic.js"; -import RuntimeError from "../Core/RuntimeError.js"; /** * Represents the contents of a diff --git a/packages/engine/Source/Scene/ConditionsExpression.js b/packages/engine/Source/Scene/ConditionsExpression.js index b88e01cc2053..7b641094cc40 100644 --- a/packages/engine/Source/Scene/ConditionsExpression.js +++ b/packages/engine/Source/Scene/ConditionsExpression.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import clone from "../Core/clone.js"; -import defined from "../Core/defined.js"; import Expression from "./Expression.js"; /** diff --git a/packages/engine/Source/Scene/ConeEmitter.js b/packages/engine/Source/Scene/ConeEmitter.js index f1ad406eede3..e71fcb93d4ea 100644 --- a/packages/engine/Source/Scene/ConeEmitter.js +++ b/packages/engine/Source/Scene/ConeEmitter.js @@ -1,5 +1,5 @@ +import { Check } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import CesiumMath from "../Core/Math.js"; const defaultAngle = CesiumMath.toRadians(30.0); diff --git a/packages/engine/Source/Scene/ContentMetadata.js b/packages/engine/Source/Scene/ContentMetadata.js index adc88ca41a95..bebad792d0b5 100644 --- a/packages/engine/Source/Scene/ContentMetadata.js +++ b/packages/engine/Source/Scene/ContentMetadata.js @@ -1,4 +1,4 @@ -import Check from "../Core/Check.js"; +import { Check } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; import MetadataEntity from "./MetadataEntity.js"; diff --git a/packages/engine/Source/Scene/CreditDisplay.js b/packages/engine/Source/Scene/CreditDisplay.js index 249cc76d66f2..0fe6aa3426b4 100644 --- a/packages/engine/Source/Scene/CreditDisplay.js +++ b/packages/engine/Source/Scene/CreditDisplay.js @@ -1,10 +1,9 @@ +import { Check, defined } from "@cesium/utils"; +import Uri from "urijs"; import AssociativeArray from "../Core/AssociativeArray.js"; import buildModuleUrl from "../Core/buildModuleUrl.js"; -import Check from "../Core/Check.js"; import Credit from "../Core/Credit.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import Uri from "urijs"; const mobileWidth = 576; const lightboxHeight = 100; diff --git a/packages/engine/Source/Scene/CumulusCloud.js b/packages/engine/Source/Scene/CumulusCloud.js index 3f47dcf7a345..e364a4617791 100644 --- a/packages/engine/Source/Scene/CumulusCloud.js +++ b/packages/engine/Source/Scene/CumulusCloud.js @@ -1,9 +1,8 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; /** *
diff --git a/packages/engine/Source/Scene/DebugAppearance.js b/packages/engine/Source/Scene/DebugAppearance.js index d681f3ad5384..a1ddf18caa59 100644 --- a/packages/engine/Source/Scene/DebugAppearance.js +++ b/packages/engine/Source/Scene/DebugAppearance.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Appearance from "./Appearance.js"; /** diff --git a/packages/engine/Source/Scene/DebugCameraPrimitive.js b/packages/engine/Source/Scene/DebugCameraPrimitive.js index 1c7871ce9cac..1303ba4c0a7d 100644 --- a/packages/engine/Source/Scene/DebugCameraPrimitive.js +++ b/packages/engine/Source/Scene/DebugCameraPrimitive.js @@ -1,10 +1,9 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Frozen from "../Core/Frozen.js"; import FrustumGeometry from "../Core/FrustumGeometry.js"; import FrustumOutlineGeometry from "../Core/FrustumOutlineGeometry.js"; import GeometryInstance from "../Core/GeometryInstance.js"; diff --git a/packages/engine/Source/Scene/DebugInspector.js b/packages/engine/Source/Scene/DebugInspector.js index e95de9ccb8f6..e0708280525a 100644 --- a/packages/engine/Source/Scene/DebugInspector.js +++ b/packages/engine/Source/Scene/DebugInspector.js @@ -1,8 +1,8 @@ +import { defined } from "@cesium/utils"; import Color from "../Core/Color.js"; import DrawCommand from "../Renderer/DrawCommand.js"; -import ShaderSource from "../Renderer/ShaderSource.js"; import ShaderProgram from "../Renderer/ShaderProgram.js"; -import defined from "../Core/defined.js"; +import ShaderSource from "../Renderer/ShaderSource.js"; /** * @private diff --git a/packages/engine/Source/Scene/DebugModelMatrixPrimitive.js b/packages/engine/Source/Scene/DebugModelMatrixPrimitive.js index 49e5722de4c0..83a30ec5e75c 100644 --- a/packages/engine/Source/Scene/DebugModelMatrixPrimitive.js +++ b/packages/engine/Source/Scene/DebugModelMatrixPrimitive.js @@ -1,9 +1,9 @@ +import { defined } from "@cesium/utils"; import ArcType from "../Core/ArcType.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Color from "../Core/Color.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; +import Frozen from "../Core/Frozen.js"; import GeometryInstance from "../Core/GeometryInstance.js"; import Matrix4 from "../Core/Matrix4.js"; import PolylineGeometry from "../Core/PolylineGeometry.js"; diff --git a/packages/engine/Source/Scene/DepthPlane.js b/packages/engine/Source/Scene/DepthPlane.js index c85d0e62227e..54f42a54c2f4 100644 --- a/packages/engine/Source/Scene/DepthPlane.js +++ b/packages/engine/Source/Scene/DepthPlane.js @@ -1,8 +1,8 @@ +import { defined, FeatureDetection } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian3 from "../Core/Cartesian3.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import defined from "../Core/defined.js"; -import FeatureDetection from "../Core/FeatureDetection.js"; +import Ellipsoid from "../Core/Ellipsoid.js"; import Geometry from "../Core/Geometry.js"; import GeometryAttribute from "../Core/GeometryAttribute.js"; import OrthographicFrustum from "../Core/OrthographicFrustum.js"; @@ -17,7 +17,6 @@ import VertexArray from "../Renderer/VertexArray.js"; import DepthPlaneFS from "../Shaders/DepthPlaneFS.js"; import DepthPlaneVS from "../Shaders/DepthPlaneVS.js"; import SceneMode from "./SceneMode.js"; -import Ellipsoid from "../Core/Ellipsoid.js"; /** * @private diff --git a/packages/engine/Source/Scene/DerivedCommand.js b/packages/engine/Source/Scene/DerivedCommand.js index 8e3478fc65f3..0d03096d00df 100644 --- a/packages/engine/Source/Scene/DerivedCommand.js +++ b/packages/engine/Source/Scene/DerivedCommand.js @@ -1,5 +1,5 @@ import { MetadataComponentType } from "@cesium/engine"; -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import DrawCommand from "../Renderer/DrawCommand.js"; import RenderState from "../Renderer/RenderState.js"; import ShaderSource from "../Renderer/ShaderSource.js"; diff --git a/packages/engine/Source/Scene/DeviceOrientationCameraController.js b/packages/engine/Source/Scene/DeviceOrientationCameraController.js index 986c524300b3..786c89ba3eaf 100644 --- a/packages/engine/Source/Scene/DeviceOrientationCameraController.js +++ b/packages/engine/Source/Scene/DeviceOrientationCameraController.js @@ -1,6 +1,5 @@ -import defined from "../Core/defined.js"; +import { defined, DeveloperError } from "@cesium/utils"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import CesiumMath from "../Core/Math.js"; import Matrix3 from "../Core/Matrix3.js"; import Quaternion from "../Core/Quaternion.js"; diff --git a/packages/engine/Source/Scene/DirectionalLight.js b/packages/engine/Source/Scene/DirectionalLight.js index 856d022b4d48..465c414db45e 100644 --- a/packages/engine/Source/Scene/DirectionalLight.js +++ b/packages/engine/Source/Scene/DirectionalLight.js @@ -1,7 +1,6 @@ +import { Check, DeveloperError } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; -import DeveloperError from "../Core/DeveloperError.js"; /** * A light that gets emitted in a single direction from infinitely far away. diff --git a/packages/engine/Source/Scene/DiscardEmptyTileImagePolicy.js b/packages/engine/Source/Scene/DiscardEmptyTileImagePolicy.js index 1a57765a3aca..a8003d49deb6 100644 --- a/packages/engine/Source/Scene/DiscardEmptyTileImagePolicy.js +++ b/packages/engine/Source/Scene/DiscardEmptyTileImagePolicy.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; /** * A policy for discarding tile images that contain no data (and so aren't actually images). diff --git a/packages/engine/Source/Scene/DiscardMissingTileImagePolicy.js b/packages/engine/Source/Scene/DiscardMissingTileImagePolicy.js index 1076fc153f1a..2b7829a295d6 100644 --- a/packages/engine/Source/Scene/DiscardMissingTileImagePolicy.js +++ b/packages/engine/Source/Scene/DiscardMissingTileImagePolicy.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import getImagePixels from "../Core/getImagePixels.js"; import Resource from "../Core/Resource.js"; diff --git a/packages/engine/Source/Scene/DracoLoader.js b/packages/engine/Source/Scene/DracoLoader.js index 74a517504992..076ea8c7c581 100644 --- a/packages/engine/Source/Scene/DracoLoader.js +++ b/packages/engine/Source/Scene/DracoLoader.js @@ -1,6 +1,4 @@ -import defined from "../Core/defined.js"; -import FeatureDetection from "../Core/FeatureDetection.js"; -import RuntimeError from "../Core/RuntimeError.js"; +import { defined, FeatureDetection, RuntimeError } from "@cesium/utils"; import TaskProcessor from "../Core/TaskProcessor.js"; /** diff --git a/packages/engine/Source/Scene/DynamicEnvironmentMapManager.js b/packages/engine/Source/Scene/DynamicEnvironmentMapManager.js index f9ed550e6cb0..438177e0765c 100644 --- a/packages/engine/Source/Scene/DynamicEnvironmentMapManager.js +++ b/packages/engine/Source/Scene/DynamicEnvironmentMapManager.js @@ -1,33 +1,32 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; import Color from "../Core/Color.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Frozen from "../Core/Frozen.js"; import JulianDate from "../Core/JulianDate.js"; import Matrix4 from "../Core/Matrix4.js"; import PixelFormat from "../Core/PixelFormat.js"; -import SceneMode from "./SceneMode.js"; import Transforms from "../Core/Transforms.js"; import ComputeCommand from "../Renderer/ComputeCommand.js"; import ContextLimits from "../Renderer/ContextLimits.js"; import CubeMap from "../Renderer/CubeMap.js"; import Framebuffer from "../Renderer/Framebuffer.js"; -import Texture from "../Renderer/Texture.js"; import PixelDatatype from "../Renderer/PixelDatatype.js"; import Sampler from "../Renderer/Sampler.js"; import ShaderProgram from "../Renderer/ShaderProgram.js"; import ShaderSource from "../Renderer/ShaderSource.js"; +import Texture from "../Renderer/Texture.js"; import TextureMinificationFilter from "../Renderer/TextureMinificationFilter.js"; -import Atmosphere from "./Atmosphere.js"; -import DynamicAtmosphereLightingType from "./DynamicAtmosphereLightingType.js"; import AtmosphereCommon from "../Shaders/AtmosphereCommon.js"; import ComputeIrradianceFS from "../Shaders/ComputeIrradianceFS.js"; import ComputeRadianceMapFS from "../Shaders/ComputeRadianceMapFS.js"; import ConvolveSpecularMapFS from "../Shaders/ConvolveSpecularMapFS.js"; import ConvolveSpecularMapVS from "../Shaders/ConvolveSpecularMapVS.js"; +import Atmosphere from "./Atmosphere.js"; +import DynamicAtmosphereLightingType from "./DynamicAtmosphereLightingType.js"; +import SceneMode from "./SceneMode.js"; /** * @typedef {object} DynamicEnvironmentMapManager.ConstructorOptions diff --git a/packages/engine/Source/Scene/EllipsoidPrimitive.js b/packages/engine/Source/Scene/EllipsoidPrimitive.js index 3c640f752ea9..65d377ea4396 100644 --- a/packages/engine/Source/Scene/EllipsoidPrimitive.js +++ b/packages/engine/Source/Scene/EllipsoidPrimitive.js @@ -1,11 +1,10 @@ +import { defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import BoxGeometry from "../Core/BoxGeometry.js"; import Cartesian3 from "../Core/Cartesian3.js"; import combine from "../Core/combine.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Frozen from "../Core/Frozen.js"; import Matrix4 from "../Core/Matrix4.js"; import VertexFormat from "../Core/VertexFormat.js"; import BufferUsage from "../Renderer/BufferUsage.js"; diff --git a/packages/engine/Source/Scene/EllipsoidSurfaceAppearance.js b/packages/engine/Source/Scene/EllipsoidSurfaceAppearance.js index 88dda1516c28..cb08bf25ac18 100644 --- a/packages/engine/Source/Scene/EllipsoidSurfaceAppearance.js +++ b/packages/engine/Source/Scene/EllipsoidSurfaceAppearance.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import VertexFormat from "../Core/VertexFormat.js"; import EllipsoidSurfaceAppearanceFS from "../Shaders/Appearances/EllipsoidSurfaceAppearanceFS.js"; import EllipsoidSurfaceAppearanceVS from "../Shaders/Appearances/EllipsoidSurfaceAppearanceVS.js"; diff --git a/packages/engine/Source/Scene/Empty3DTileContent.js b/packages/engine/Source/Scene/Empty3DTileContent.js index 2479baefb211..c18f797b4ce1 100644 --- a/packages/engine/Source/Scene/Empty3DTileContent.js +++ b/packages/engine/Source/Scene/Empty3DTileContent.js @@ -1,5 +1,5 @@ +import { DeveloperError } from "@cesium/utils"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; /** * Represents empty content for tiles in a diff --git a/packages/engine/Source/Scene/Expression.js b/packages/engine/Source/Scene/Expression.js index 7d685304286f..b4f1f1bd1233 100644 --- a/packages/engine/Source/Scene/Expression.js +++ b/packages/engine/Source/Scene/Expression.js @@ -1,13 +1,10 @@ +import { Check, defined, DeveloperError, RuntimeError } from "@cesium/utils"; +import jsep from "jsep"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import CesiumMath from "../Core/Math.js"; -import RuntimeError from "../Core/RuntimeError.js"; -import jsep from "jsep"; import ExpressionNodeType from "./ExpressionNodeType.js"; /** diff --git a/packages/engine/Source/Scene/Fog.js b/packages/engine/Source/Scene/Fog.js index 013bd79f8bc4..8a1922db4879 100644 --- a/packages/engine/Source/Scene/Fog.js +++ b/packages/engine/Source/Scene/Fog.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import CesiumMath from "../Core/Math.js"; import SceneMode from "./SceneMode.js"; diff --git a/packages/engine/Source/Scene/FrameRateMonitor.js b/packages/engine/Source/Scene/FrameRateMonitor.js index 2a874566262e..b0898c42f8e2 100644 --- a/packages/engine/Source/Scene/FrameRateMonitor.js +++ b/packages/engine/Source/Scene/FrameRateMonitor.js @@ -1,6 +1,5 @@ -import defined from "../Core/defined.js"; +import { defined, DeveloperError } from "@cesium/utils"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Event from "../Core/Event.js"; import getTimestamp from "../Core/getTimestamp.js"; import TimeConstants from "../Core/TimeConstants.js"; diff --git a/packages/engine/Source/Scene/Geometry3DTileContent.js b/packages/engine/Source/Scene/Geometry3DTileContent.js index b17f7463251b..8dc64f5a62ff 100644 --- a/packages/engine/Source/Scene/Geometry3DTileContent.js +++ b/packages/engine/Source/Scene/Geometry3DTileContent.js @@ -1,10 +1,8 @@ +import { defined, DeveloperError, RuntimeError } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import getJsonFromTypedArray from "../Core/getJsonFromTypedArray.js"; import Matrix4 from "../Core/Matrix4.js"; -import RuntimeError from "../Core/RuntimeError.js"; import Cesium3DTileBatchTable from "./Cesium3DTileBatchTable.js"; import Vector3DTileGeometry from "./Vector3DTileGeometry.js"; diff --git a/packages/engine/Source/Scene/GetFeatureInfoFormat.js b/packages/engine/Source/Scene/GetFeatureInfoFormat.js index 0d9b392bae22..7cf8b7a9c8f8 100644 --- a/packages/engine/Source/Scene/GetFeatureInfoFormat.js +++ b/packages/engine/Source/Scene/GetFeatureInfoFormat.js @@ -1,7 +1,5 @@ +import { defined, DeveloperError, RuntimeError } from "@cesium/utils"; import Cartographic from "../Core/Cartographic.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; -import RuntimeError from "../Core/RuntimeError.js"; import ImageryLayerFeatureInfo from "./ImageryLayerFeatureInfo.js"; /** diff --git a/packages/engine/Source/Scene/Globe.js b/packages/engine/Source/Scene/Globe.js index d659f993c385..192338eea0dc 100644 --- a/packages/engine/Source/Scene/Globe.js +++ b/packages/engine/Source/Scene/Globe.js @@ -1,24 +1,24 @@ +import { defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import buildModuleUrl from "../Core/buildModuleUrl.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import EllipsoidTerrainProvider from "../Core/EllipsoidTerrainProvider.js"; import Event from "../Core/Event.js"; import IntersectionTests from "../Core/IntersectionTests.js"; +import CesiumMath from "../Core/Math.js"; import NearFarScalar from "../Core/NearFarScalar.js"; import Ray from "../Core/Ray.js"; import Rectangle from "../Core/Rectangle.js"; import Resource from "../Core/Resource.js"; import ShaderSource from "../Renderer/ShaderSource.js"; import Texture from "../Renderer/Texture.js"; +import AtmosphereCommon from "../Shaders/AtmosphereCommon.js"; import GlobeFS from "../Shaders/GlobeFS.js"; import GlobeVS from "../Shaders/GlobeVS.js"; -import AtmosphereCommon from "../Shaders/AtmosphereCommon.js"; import GroundAtmosphere from "../Shaders/GroundAtmosphere.js"; import GlobeSurfaceShaderSet from "./GlobeSurfaceShaderSet.js"; import GlobeSurfaceTileProvider from "./GlobeSurfaceTileProvider.js"; @@ -27,7 +27,6 @@ import ImageryLayerCollection from "./ImageryLayerCollection.js"; import QuadtreePrimitive from "./QuadtreePrimitive.js"; import SceneMode from "./SceneMode.js"; import ShadowMode from "./ShadowMode.js"; -import CesiumMath from "../Core/Math.js"; /** * The globe rendered in the scene, including its terrain ({@link Globe#terrainProvider}) diff --git a/packages/engine/Source/Scene/GlobeDepth.js b/packages/engine/Source/Scene/GlobeDepth.js index 6058642edb36..1fbb1d484b0f 100644 --- a/packages/engine/Source/Scene/GlobeDepth.js +++ b/packages/engine/Source/Scene/GlobeDepth.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import ClearCommand from "../Renderer/ClearCommand.js"; import FramebufferManager from "../Renderer/FramebufferManager.js"; diff --git a/packages/engine/Source/Scene/GlobeSurfaceShaderSet.js b/packages/engine/Source/Scene/GlobeSurfaceShaderSet.js index c89625c50ffa..be85a12cb9c6 100644 --- a/packages/engine/Source/Scene/GlobeSurfaceShaderSet.js +++ b/packages/engine/Source/Scene/GlobeSurfaceShaderSet.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import destroyObject from "../Core/destroyObject.js"; import TerrainQuantization from "../Core/TerrainQuantization.js"; import ShaderProgram from "../Renderer/ShaderProgram.js"; diff --git a/packages/engine/Source/Scene/GlobeSurfaceTile.js b/packages/engine/Source/Scene/GlobeSurfaceTile.js index 0571b9e363ee..6e2b76a533c6 100644 --- a/packages/engine/Source/Scene/GlobeSurfaceTile.js +++ b/packages/engine/Source/Scene/GlobeSurfaceTile.js @@ -1,8 +1,8 @@ +import { defined } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; import Cartographic from "../Core/Cartographic.js"; -import defined from "../Core/defined.js"; import IndexDatatype from "../Core/IndexDatatype.js"; import IntersectionTests from "../Core/IntersectionTests.js"; import PixelFormat from "../Core/PixelFormat.js"; diff --git a/packages/engine/Source/Scene/GlobeSurfaceTileProvider.js b/packages/engine/Source/Scene/GlobeSurfaceTileProvider.js index 41e4ecaac4a2..6b1962ad48a2 100644 --- a/packages/engine/Source/Scene/GlobeSurfaceTileProvider.js +++ b/packages/engine/Source/Scene/GlobeSurfaceTileProvider.js @@ -1,3 +1,4 @@ +import { defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import BoxOutlineGeometry from "../Core/BoxOutlineGeometry.js"; import Cartesian2 from "../Core/Cartesian2.js"; @@ -8,9 +9,7 @@ import clone from "../Core/clone.js"; import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; import combine from "../Core/combine.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Event from "../Core/Event.js"; import GeometryInstance from "../Core/GeometryInstance.js"; import GeometryPipeline from "../Core/GeometryPipeline.js"; @@ -24,8 +23,8 @@ import OrthographicFrustum from "../Core/OrthographicFrustum.js"; import PrimitiveType from "../Core/PrimitiveType.js"; import Rectangle from "../Core/Rectangle.js"; import SphereOutlineGeometry from "../Core/SphereOutlineGeometry.js"; -import VerticalExaggeration from "../Core/VerticalExaggeration.js"; import TerrainQuantization from "../Core/TerrainQuantization.js"; +import VerticalExaggeration from "../Core/VerticalExaggeration.js"; import Visibility from "../Core/Visibility.js"; import WebMercatorProjection from "../Core/WebMercatorProjection.js"; import Buffer from "../Renderer/Buffer.js"; diff --git a/packages/engine/Source/Scene/GlobeTranslucency.js b/packages/engine/Source/Scene/GlobeTranslucency.js index 1b31e1768eb4..cf9281ef00dd 100644 --- a/packages/engine/Source/Scene/GlobeTranslucency.js +++ b/packages/engine/Source/Scene/GlobeTranslucency.js @@ -1,6 +1,4 @@ -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import NearFarScalar from "../Core/NearFarScalar.js"; import Rectangle from "../Core/Rectangle.js"; diff --git a/packages/engine/Source/Scene/GlobeTranslucencyFramebuffer.js b/packages/engine/Source/Scene/GlobeTranslucencyFramebuffer.js index c97297854ab7..ab1f6fdec94c 100644 --- a/packages/engine/Source/Scene/GlobeTranslucencyFramebuffer.js +++ b/packages/engine/Source/Scene/GlobeTranslucencyFramebuffer.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import ClearCommand from "../Renderer/ClearCommand.js"; import FramebufferManager from "../Renderer/FramebufferManager.js"; diff --git a/packages/engine/Source/Scene/GlobeTranslucencyState.js b/packages/engine/Source/Scene/GlobeTranslucencyState.js index d0300696840d..9085c947b4c7 100644 --- a/packages/engine/Source/Scene/GlobeTranslucencyState.js +++ b/packages/engine/Source/Scene/GlobeTranslucencyState.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import combine from "../Core/combine.js"; -import defined from "../Core/defined.js"; import NearFarScalar from "../Core/NearFarScalar.js"; import Rectangle from "../Core/Rectangle.js"; import DrawCommand from "../Renderer/DrawCommand.js"; diff --git a/packages/engine/Source/Scene/GltfBufferViewLoader.js b/packages/engine/Source/Scene/GltfBufferViewLoader.js index 659beefdac4a..3f02fd33bb9a 100644 --- a/packages/engine/Source/Scene/GltfBufferViewLoader.js +++ b/packages/engine/Source/Scene/GltfBufferViewLoader.js @@ -1,8 +1,7 @@ -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; +import { MeshoptDecoder } from "meshoptimizer"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import hasExtension from "./hasExtension.js"; -import { MeshoptDecoder } from "meshoptimizer"; import ResourceLoader from "./ResourceLoader.js"; import ResourceLoaderState from "./ResourceLoaderState.js"; diff --git a/packages/engine/Source/Scene/GltfDracoLoader.js b/packages/engine/Source/Scene/GltfDracoLoader.js index 9e6045167309..b36abdfa4245 100644 --- a/packages/engine/Source/Scene/GltfDracoLoader.js +++ b/packages/engine/Source/Scene/GltfDracoLoader.js @@ -1,7 +1,6 @@ -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import ComponentDatatype from "../Core/ComponentDatatype.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import DracoLoader from "./DracoLoader.js"; import ResourceLoader from "./ResourceLoader.js"; import ResourceLoaderState from "./ResourceLoaderState.js"; diff --git a/packages/engine/Source/Scene/GltfImageLoader.js b/packages/engine/Source/Scene/GltfImageLoader.js index 34cb4f58ac14..3bf5485a7f5c 100644 --- a/packages/engine/Source/Scene/GltfImageLoader.js +++ b/packages/engine/Source/Scene/GltfImageLoader.js @@ -1,9 +1,7 @@ -import Check from "../Core/Check.js"; +import { Check, defined, RuntimeError } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import loadImageFromTypedArray from "../Core/loadImageFromTypedArray.js"; import loadKTX2 from "../Core/loadKTX2.js"; -import RuntimeError from "../Core/RuntimeError.js"; import ResourceLoader from "./ResourceLoader.js"; import ResourceLoaderState from "./ResourceLoaderState.js"; diff --git a/packages/engine/Source/Scene/GltfIndexBufferLoader.js b/packages/engine/Source/Scene/GltfIndexBufferLoader.js index eb04334bc772..934d53859b9b 100644 --- a/packages/engine/Source/Scene/GltfIndexBufferLoader.js +++ b/packages/engine/Source/Scene/GltfIndexBufferLoader.js @@ -1,9 +1,7 @@ -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import deprecationWarning from "../Core/deprecationWarning.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Frozen from "../Core/Frozen.js"; import IndexDatatype from "../Core/IndexDatatype.js"; import Buffer from "../Renderer/Buffer.js"; import BufferUsage from "../Renderer/BufferUsage.js"; diff --git a/packages/engine/Source/Scene/GltfJsonLoader.js b/packages/engine/Source/Scene/GltfJsonLoader.js index 53035ef16375..2e89e69e3483 100644 --- a/packages/engine/Source/Scene/GltfJsonLoader.js +++ b/packages/engine/Source/Scene/GltfJsonLoader.js @@ -1,11 +1,9 @@ -import Check from "../Core/Check.js"; +import { Check, defined, RuntimeError } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import getJsonFromTypedArray from "../Core/getJsonFromTypedArray.js"; import getMagic from "../Core/getMagic.js"; import isDataUri from "../Core/isDataUri.js"; import Resource from "../Core/Resource.js"; -import RuntimeError from "../Core/RuntimeError.js"; import addDefaults from "./GltfPipeline/addDefaults.js"; import addPipelineExtras from "./GltfPipeline/addPipelineExtras.js"; import ForEach from "./GltfPipeline/ForEach.js"; @@ -13,9 +11,9 @@ import parseGlb from "./GltfPipeline/parseGlb.js"; import removePipelineExtras from "./GltfPipeline/removePipelineExtras.js"; import updateVersion from "./GltfPipeline/updateVersion.js"; import usesExtension from "./GltfPipeline/usesExtension.js"; +import ModelUtility from "./Model/ModelUtility.js"; import ResourceLoader from "./ResourceLoader.js"; import ResourceLoaderState from "./ResourceLoaderState.js"; -import ModelUtility from "./Model/ModelUtility.js"; /** * Loads a glTF JSON from a glTF or glb. diff --git a/packages/engine/Source/Scene/GltfLoader.js b/packages/engine/Source/Scene/GltfLoader.js index 9978f5efe93e..ba8287840d42 100644 --- a/packages/engine/Source/Scene/GltfLoader.js +++ b/packages/engine/Source/Scene/GltfLoader.js @@ -1,37 +1,34 @@ +import { Check, defined, FeatureDetection, RuntimeError } from "@cesium/utils"; import ArticulationStageType from "../Core/ArticulationStageType.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; -import Check from "../Core/Check.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; import Credit from "../Core/Credit.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import FeatureDetection from "../Core/FeatureDetection.js"; import InterpolationType from "../Core/InterpolationType.js"; import Matrix4 from "../Core/Matrix4.js"; +import oneTimeWarning from "../Core/oneTimeWarning.js"; import PrimitiveType from "../Core/PrimitiveType.js"; import Quaternion from "../Core/Quaternion.js"; -import RuntimeError from "../Core/RuntimeError.js"; import Sampler from "../Renderer/Sampler.js"; +import AttributeType from "./AttributeType.js"; +import Axis from "./Axis.js"; +import GltfLoaderUtil from "./GltfLoaderUtil.js"; import getAccessorByteStride from "./GltfPipeline/getAccessorByteStride.js"; import getComponentReader from "./GltfPipeline/getComponentReader.js"; import numberOfComponentsForType from "./GltfPipeline/numberOfComponentsForType.js"; import GltfStructuralMetadataLoader from "./GltfStructuralMetadataLoader.js"; -import AttributeType from "./AttributeType.js"; -import Axis from "./Axis.js"; -import GltfLoaderUtil from "./GltfLoaderUtil.js"; import hasExtension from "./hasExtension.js"; import InstanceAttributeSemantic from "./InstanceAttributeSemantic.js"; +import GltfGpmLoader from "./Model/Extensions/Gpm/GltfGpmLoader.js"; +import GltfMeshPrimitiveGpmLoader from "./Model/Extensions/Gpm/GltfMeshPrimitiveGpmLoader.js"; import ModelComponents from "./ModelComponents.js"; import PrimitiveLoadPlan from "./PrimitiveLoadPlan.js"; import ResourceCache from "./ResourceCache.js"; import ResourceLoader from "./ResourceLoader.js"; import SupportedImageFormats from "./SupportedImageFormats.js"; import VertexAttributeSemantic from "./VertexAttributeSemantic.js"; -import GltfGpmLoader from "./Model/Extensions/Gpm/GltfGpmLoader.js"; -import GltfMeshPrimitiveGpmLoader from "./Model/Extensions/Gpm/GltfMeshPrimitiveGpmLoader.js"; -import oneTimeWarning from "../Core/oneTimeWarning.js"; const { Attribute, diff --git a/packages/engine/Source/Scene/GltfLoaderUtil.js b/packages/engine/Source/Scene/GltfLoaderUtil.js index c5834d94da1f..be2fe990997c 100644 --- a/packages/engine/Source/Scene/GltfLoaderUtil.js +++ b/packages/engine/Source/Scene/GltfLoaderUtil.js @@ -1,7 +1,6 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; -import Check from "../Core/Check.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import Matrix3 from "../Core/Matrix3.js"; import Sampler from "../Renderer/Sampler.js"; import TextureMagnificationFilter from "../Renderer/TextureMagnificationFilter.js"; diff --git a/packages/engine/Source/Scene/GltfPipeline/ForEach.js b/packages/engine/Source/Scene/GltfPipeline/ForEach.js index 07623da4926e..e98ba1387a08 100644 --- a/packages/engine/Source/Scene/GltfPipeline/ForEach.js +++ b/packages/engine/Source/Scene/GltfPipeline/ForEach.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import usesExtension from "./usesExtension.js"; -import defined from "../../Core/defined.js"; /** * Contains traversal functions for processing elements of the glTF hierarchy. diff --git a/packages/engine/Source/Scene/GltfPipeline/addDefaults.js b/packages/engine/Source/Scene/GltfPipeline/addDefaults.js index 85106ec7a4ea..721a3634b234 100644 --- a/packages/engine/Source/Scene/GltfPipeline/addDefaults.js +++ b/packages/engine/Source/Scene/GltfPipeline/addDefaults.js @@ -1,9 +1,9 @@ +import { defined } from "@cesium/utils"; +import Frozen from "../../Core/Frozen.js"; +import WebGLConstants from "../../Core/WebGLConstants.js"; import addToArray from "./addToArray.js"; import ForEach from "./ForEach.js"; import getAccessorByteStride from "./getAccessorByteStride.js"; -import Frozen from "../../Core/Frozen.js"; -import defined from "../../Core/defined.js"; -import WebGLConstants from "../../Core/WebGLConstants.js"; /** * Adds default glTF values if they don't exist. diff --git a/packages/engine/Source/Scene/GltfPipeline/addExtensionsRequired.js b/packages/engine/Source/Scene/GltfPipeline/addExtensionsRequired.js index 210de9cc9d91..9fa0b22a1c05 100644 --- a/packages/engine/Source/Scene/GltfPipeline/addExtensionsRequired.js +++ b/packages/engine/Source/Scene/GltfPipeline/addExtensionsRequired.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import addExtensionsUsed from "./addExtensionsUsed.js"; import addToArray from "./addToArray.js"; -import defined from "../../Core/defined.js"; /** * Adds an extension to gltf.extensionsRequired if it does not already exist. diff --git a/packages/engine/Source/Scene/GltfPipeline/addExtensionsUsed.js b/packages/engine/Source/Scene/GltfPipeline/addExtensionsUsed.js index 4975ed248bde..6ce7ef31f9a8 100644 --- a/packages/engine/Source/Scene/GltfPipeline/addExtensionsUsed.js +++ b/packages/engine/Source/Scene/GltfPipeline/addExtensionsUsed.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import addToArray from "./addToArray.js"; -import defined from "../../Core/defined.js"; /** * Adds an extension to gltf.extensionsUsed if it does not already exist. diff --git a/packages/engine/Source/Scene/GltfPipeline/addPipelineExtras.js b/packages/engine/Source/Scene/GltfPipeline/addPipelineExtras.js index 24242a8739b5..8656cd57e3bb 100644 --- a/packages/engine/Source/Scene/GltfPipeline/addPipelineExtras.js +++ b/packages/engine/Source/Scene/GltfPipeline/addPipelineExtras.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import ForEach from "./ForEach.js"; -import defined from "../../Core/defined.js"; /** * Adds extras._pipeline to each object that can have extras in the glTF asset. diff --git a/packages/engine/Source/Scene/GltfPipeline/findAccessorMinMax.js b/packages/engine/Source/Scene/GltfPipeline/findAccessorMinMax.js index 0a276f4981b7..fc48e6ffaee7 100644 --- a/packages/engine/Source/Scene/GltfPipeline/findAccessorMinMax.js +++ b/packages/engine/Source/Scene/GltfPipeline/findAccessorMinMax.js @@ -1,8 +1,8 @@ +import { defined } from "@cesium/utils"; +import ComponentDatatype from "../../Core/ComponentDatatype.js"; import getAccessorByteStride from "./getAccessorByteStride.js"; import getComponentReader from "./getComponentReader.js"; import numberOfComponentsForType from "./numberOfComponentsForType.js"; -import ComponentDatatype from "../../Core/ComponentDatatype.js"; -import defined from "../../Core/defined.js"; /** * Finds the min and max values of the accessor. diff --git a/packages/engine/Source/Scene/GltfPipeline/forEachTextureInMaterial.js b/packages/engine/Source/Scene/GltfPipeline/forEachTextureInMaterial.js index 09ef6ceb2d0d..9f884cc74f41 100644 --- a/packages/engine/Source/Scene/GltfPipeline/forEachTextureInMaterial.js +++ b/packages/engine/Source/Scene/GltfPipeline/forEachTextureInMaterial.js @@ -1,6 +1,5 @@ +import { Check, defined } from "@cesium/utils"; import ForEach from "./ForEach.js"; -import Check from "../../Core/Check.js"; -import defined from "../../Core/defined.js"; /** * Calls the provider handler function on each texture used by the material. diff --git a/packages/engine/Source/Scene/GltfPipeline/getAccessorByteStride.js b/packages/engine/Source/Scene/GltfPipeline/getAccessorByteStride.js index f7239c93f6df..b00398143127 100644 --- a/packages/engine/Source/Scene/GltfPipeline/getAccessorByteStride.js +++ b/packages/engine/Source/Scene/GltfPipeline/getAccessorByteStride.js @@ -1,6 +1,6 @@ -import numberOfComponentsForType from "./numberOfComponentsForType.js"; +import { defined } from "@cesium/utils"; import ComponentDatatype from "../../Core/ComponentDatatype.js"; -import defined from "../../Core/defined.js"; +import numberOfComponentsForType from "./numberOfComponentsForType.js"; /** * Returns the byte stride of the provided accessor. diff --git a/packages/engine/Source/Scene/GltfPipeline/moveTechniqueRenderStates.js b/packages/engine/Source/Scene/GltfPipeline/moveTechniqueRenderStates.js index 98960535938d..e7971ee35856 100644 --- a/packages/engine/Source/Scene/GltfPipeline/moveTechniqueRenderStates.js +++ b/packages/engine/Source/Scene/GltfPipeline/moveTechniqueRenderStates.js @@ -1,7 +1,7 @@ +import { defined } from "@cesium/utils"; +import WebGLConstants from "../../Core/WebGLConstants.js"; import addExtensionsUsed from "./addExtensionsUsed.js"; import ForEach from "./ForEach.js"; -import defined from "../../Core/defined.js"; -import WebGLConstants from "../../Core/WebGLConstants.js"; const defaultBlendEquation = [WebGLConstants.FUNC_ADD, WebGLConstants.FUNC_ADD]; diff --git a/packages/engine/Source/Scene/GltfPipeline/moveTechniquesToExtension.js b/packages/engine/Source/Scene/GltfPipeline/moveTechniquesToExtension.js index 98c7a2938da6..c646b0a4c52d 100644 --- a/packages/engine/Source/Scene/GltfPipeline/moveTechniquesToExtension.js +++ b/packages/engine/Source/Scene/GltfPipeline/moveTechniquesToExtension.js @@ -1,8 +1,8 @@ -import addExtensionsUsed from "./addExtensionsUsed.js"; +import { defined } from "@cesium/utils"; import addExtensionsRequired from "./addExtensionsRequired.js"; +import addExtensionsUsed from "./addExtensionsUsed.js"; import addToArray from "./addToArray.js"; import ForEach from "./ForEach.js"; -import defined from "../../Core/defined.js"; /** * Move glTF 1.0 material techniques to glTF 2.0 KHR_techniques_webgl extension. diff --git a/packages/engine/Source/Scene/GltfPipeline/parseGlb.js b/packages/engine/Source/Scene/GltfPipeline/parseGlb.js index 8ecb9784ab97..4e7990316d01 100644 --- a/packages/engine/Source/Scene/GltfPipeline/parseGlb.js +++ b/packages/engine/Source/Scene/GltfPipeline/parseGlb.js @@ -1,9 +1,8 @@ -import addPipelineExtras from "./addPipelineExtras.js"; -import removeExtensionsUsed from "./removeExtensionsUsed.js"; -import defined from "../../Core/defined.js"; +import { defined, RuntimeError } from "@cesium/utils"; import getMagic from "../../Core/getMagic.js"; import getStringFromTypedArray from "../../Core/getStringFromTypedArray.js"; -import RuntimeError from "../../Core/RuntimeError.js"; +import addPipelineExtras from "./addPipelineExtras.js"; +import removeExtensionsUsed from "./removeExtensionsUsed.js"; const sizeOfUint32 = 4; diff --git a/packages/engine/Source/Scene/GltfPipeline/readAccessorPacked.js b/packages/engine/Source/Scene/GltfPipeline/readAccessorPacked.js index 60b06b6ce136..581a465ce6a1 100644 --- a/packages/engine/Source/Scene/GltfPipeline/readAccessorPacked.js +++ b/packages/engine/Source/Scene/GltfPipeline/readAccessorPacked.js @@ -1,8 +1,8 @@ +import { defined } from "@cesium/utils"; +import ComponentDatatype from "../../Core/ComponentDatatype.js"; import getAccessorByteStride from "./getAccessorByteStride.js"; import getComponentReader from "./getComponentReader.js"; import numberOfComponentsForType from "./numberOfComponentsForType.js"; -import ComponentDatatype from "../../Core/ComponentDatatype.js"; -import defined from "../../Core/defined.js"; /** * Returns the accessor data in a contiguous array. diff --git a/packages/engine/Source/Scene/GltfPipeline/removeExtension.js b/packages/engine/Source/Scene/GltfPipeline/removeExtension.js index 6622ea6ab13a..9acc8eeceb1e 100644 --- a/packages/engine/Source/Scene/GltfPipeline/removeExtension.js +++ b/packages/engine/Source/Scene/GltfPipeline/removeExtension.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import ForEach from "./ForEach.js"; import removeExtensionsUsed from "./removeExtensionsUsed.js"; -import defined from "../../Core/defined.js"; /** * Removes an extension from gltf.extensions, gltf.extensionsUsed, gltf.extensionsRequired, and any other objects in the glTF if it is present. diff --git a/packages/engine/Source/Scene/GltfPipeline/removeExtensionsRequired.js b/packages/engine/Source/Scene/GltfPipeline/removeExtensionsRequired.js index 6ca44926bad3..70fef5af3418 100644 --- a/packages/engine/Source/Scene/GltfPipeline/removeExtensionsRequired.js +++ b/packages/engine/Source/Scene/GltfPipeline/removeExtensionsRequired.js @@ -1,4 +1,4 @@ -import defined from "../../Core/defined.js"; +import { defined } from "@cesium/utils"; /** * Removes an extension from gltf.extensionsRequired if it is present. diff --git a/packages/engine/Source/Scene/GltfPipeline/removeExtensionsUsed.js b/packages/engine/Source/Scene/GltfPipeline/removeExtensionsUsed.js index dff9cf8985a4..071052dd166f 100644 --- a/packages/engine/Source/Scene/GltfPipeline/removeExtensionsUsed.js +++ b/packages/engine/Source/Scene/GltfPipeline/removeExtensionsUsed.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import removeExtensionsRequired from "./removeExtensionsRequired.js"; -import defined from "../../Core/defined.js"; /** * Removes an extension from gltf.extensionsUsed and gltf.extensionsRequired if it is present. diff --git a/packages/engine/Source/Scene/GltfPipeline/removePipelineExtras.js b/packages/engine/Source/Scene/GltfPipeline/removePipelineExtras.js index e9162c6f517e..307a4418e873 100644 --- a/packages/engine/Source/Scene/GltfPipeline/removePipelineExtras.js +++ b/packages/engine/Source/Scene/GltfPipeline/removePipelineExtras.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import ForEach from "./ForEach.js"; -import defined from "../../Core/defined.js"; /** * Iterate through the objects within the glTF and delete their pipeline extras object. diff --git a/packages/engine/Source/Scene/GltfPipeline/removeUnusedElements.js b/packages/engine/Source/Scene/GltfPipeline/removeUnusedElements.js index f02282f67c2f..b06f99c089f6 100644 --- a/packages/engine/Source/Scene/GltfPipeline/removeUnusedElements.js +++ b/packages/engine/Source/Scene/GltfPipeline/removeUnusedElements.js @@ -1,7 +1,7 @@ +import { defined } from "@cesium/utils"; import ForEach from "./ForEach.js"; import forEachTextureInMaterial from "./forEachTextureInMaterial.js"; import usesExtension from "./usesExtension.js"; -import defined from "../../Core/defined.js"; const allElementTypes = [ "mesh", diff --git a/packages/engine/Source/Scene/GltfPipeline/updateAccessorComponentTypes.js b/packages/engine/Source/Scene/GltfPipeline/updateAccessorComponentTypes.js index 1de3059dfd09..29ca02a7da6f 100644 --- a/packages/engine/Source/Scene/GltfPipeline/updateAccessorComponentTypes.js +++ b/packages/engine/Source/Scene/GltfPipeline/updateAccessorComponentTypes.js @@ -1,8 +1,8 @@ +import ComponentDatatype from "../../Core/ComponentDatatype.js"; +import WebGLConstants from "../../Core/WebGLConstants.js"; import addBuffer from "./addBuffer.js"; import ForEach from "./ForEach.js"; import readAccessorPacked from "./readAccessorPacked.js"; -import ComponentDatatype from "../../Core/ComponentDatatype.js"; -import WebGLConstants from "../../Core/WebGLConstants.js"; /** * Update accessors referenced by JOINTS_0 and WEIGHTS_0 attributes to use correct component types. diff --git a/packages/engine/Source/Scene/GltfPipeline/updateVersion.js b/packages/engine/Source/Scene/GltfPipeline/updateVersion.js index 57f79725538e..30c4b3f56368 100644 --- a/packages/engine/Source/Scene/GltfPipeline/updateVersion.js +++ b/packages/engine/Source/Scene/GltfPipeline/updateVersion.js @@ -1,23 +1,23 @@ +import { defined } from "@cesium/utils"; +import Cartesian3 from "../../Core/Cartesian3.js"; +import Cartesian4 from "../../Core/Cartesian4.js"; +import clone from "../../Core/clone.js"; +import ComponentDatatype from "../../Core/ComponentDatatype.js"; +import Frozen from "../../Core/Frozen.js"; +import Matrix4 from "../../Core/Matrix4.js"; +import Quaternion from "../../Core/Quaternion.js"; +import WebGLConstants from "../../Core/WebGLConstants.js"; import addExtensionsUsed from "./addExtensionsUsed.js"; import addToArray from "./addToArray.js"; import findAccessorMinMax from "./findAccessorMinMax.js"; import ForEach from "./ForEach.js"; import getAccessorByteStride from "./getAccessorByteStride.js"; -import numberOfComponentsForType from "./numberOfComponentsForType.js"; import moveTechniqueRenderStates from "./moveTechniqueRenderStates.js"; import moveTechniquesToExtension from "./moveTechniquesToExtension.js"; +import numberOfComponentsForType from "./numberOfComponentsForType.js"; +import removeExtension from "./removeExtension.js"; import removeUnusedElements from "./removeUnusedElements.js"; import updateAccessorComponentTypes from "./updateAccessorComponentTypes.js"; -import removeExtension from "./removeExtension.js"; -import Cartesian3 from "../../Core/Cartesian3.js"; -import Cartesian4 from "../../Core/Cartesian4.js"; -import clone from "../../Core/clone.js"; -import ComponentDatatype from "../../Core/ComponentDatatype.js"; -import Frozen from "../../Core/Frozen.js"; -import defined from "../../Core/defined.js"; -import Matrix4 from "../../Core/Matrix4.js"; -import Quaternion from "../../Core/Quaternion.js"; -import WebGLConstants from "../../Core/WebGLConstants.js"; const updateFunctions = { 0.8: glTF08to10, diff --git a/packages/engine/Source/Scene/GltfPipeline/usesExtension.js b/packages/engine/Source/Scene/GltfPipeline/usesExtension.js index 10815912a821..22f9bd69ca8f 100644 --- a/packages/engine/Source/Scene/GltfPipeline/usesExtension.js +++ b/packages/engine/Source/Scene/GltfPipeline/usesExtension.js @@ -1,4 +1,4 @@ -import defined from "../../Core/defined.js"; +import { defined } from "@cesium/utils"; /** * Checks whether the glTF uses the given extension. diff --git a/packages/engine/Source/Scene/GltfStructuralMetadataLoader.js b/packages/engine/Source/Scene/GltfStructuralMetadataLoader.js index 01b90cf1d616..844bf7d64131 100644 --- a/packages/engine/Source/Scene/GltfStructuralMetadataLoader.js +++ b/packages/engine/Source/Scene/GltfStructuralMetadataLoader.js @@ -1,9 +1,7 @@ -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; -import parseStructuralMetadata from "./parseStructuralMetadata.js"; import parseFeatureMetadataLegacy from "./parseFeatureMetadataLegacy.js"; +import parseStructuralMetadata from "./parseStructuralMetadata.js"; import ResourceCache from "./ResourceCache.js"; import ResourceLoader from "./ResourceLoader.js"; import ResourceLoaderState from "./ResourceLoaderState.js"; diff --git a/packages/engine/Source/Scene/GltfTextureLoader.js b/packages/engine/Source/Scene/GltfTextureLoader.js index 36c3349ace6a..94bd61edb0c6 100644 --- a/packages/engine/Source/Scene/GltfTextureLoader.js +++ b/packages/engine/Source/Scene/GltfTextureLoader.js @@ -1,8 +1,8 @@ -import Check from "../Core/Check.js"; -import CesiumMath from "../Core/Math.js"; +import { Check, defined } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; +import CesiumMath from "../Core/Math.js"; import PixelFormat from "../Core/PixelFormat.js"; +import resizeImageToNextPowerOfTwo from "../Core/resizeImageToNextPowerOfTwo.js"; import Texture from "../Renderer/Texture.js"; import TextureMinificationFilter from "../Renderer/TextureMinificationFilter.js"; import TextureWrap from "../Renderer/TextureWrap.js"; @@ -10,7 +10,6 @@ import GltfLoaderUtil from "./GltfLoaderUtil.js"; import JobType from "./JobType.js"; import ResourceLoader from "./ResourceLoader.js"; import ResourceLoaderState from "./ResourceLoaderState.js"; -import resizeImageToNextPowerOfTwo from "../Core/resizeImageToNextPowerOfTwo.js"; /** * Loads a glTF texture. diff --git a/packages/engine/Source/Scene/GltfVertexBufferLoader.js b/packages/engine/Source/Scene/GltfVertexBufferLoader.js index 7e02fa9e30e5..b53bf8c77d29 100644 --- a/packages/engine/Source/Scene/GltfVertexBufferLoader.js +++ b/packages/engine/Source/Scene/GltfVertexBufferLoader.js @@ -1,7 +1,5 @@ -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Buffer from "../Renderer/Buffer.js"; import BufferUsage from "../Renderer/BufferUsage.js"; import AttributeType from "./AttributeType.js"; diff --git a/packages/engine/Source/Scene/GoogleEarthEnterpriseImageryProvider.js b/packages/engine/Source/Scene/GoogleEarthEnterpriseImageryProvider.js index 706f4c3bad44..fc584d53e9ed 100644 --- a/packages/engine/Source/Scene/GoogleEarthEnterpriseImageryProvider.js +++ b/packages/engine/Source/Scene/GoogleEarthEnterpriseImageryProvider.js @@ -1,17 +1,15 @@ -import Check from "../Core/Check.js"; +import { Check, defined, RuntimeError } from "@cesium/utils"; +import * as protobuf from "protobufjs/dist/minimal/protobuf.js"; import Credit from "../Core/Credit.js"; import decodeGoogleEarthEnterpriseData from "../Core/decodeGoogleEarthEnterpriseData.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import GeographicTilingScheme from "../Core/GeographicTilingScheme.js"; import GoogleEarthEnterpriseMetadata from "../Core/GoogleEarthEnterpriseMetadata.js"; import loadImageFromTypedArray from "../Core/loadImageFromTypedArray.js"; import CesiumMath from "../Core/Math.js"; import Rectangle from "../Core/Rectangle.js"; import Request from "../Core/Request.js"; -import RuntimeError from "../Core/RuntimeError.js"; -import * as protobuf from "protobufjs/dist/minimal/protobuf.js"; /** * @private diff --git a/packages/engine/Source/Scene/GoogleEarthEnterpriseMapsProvider.js b/packages/engine/Source/Scene/GoogleEarthEnterpriseMapsProvider.js index e034a162b259..b150c1fc6afa 100644 --- a/packages/engine/Source/Scene/GoogleEarthEnterpriseMapsProvider.js +++ b/packages/engine/Source/Scene/GoogleEarthEnterpriseMapsProvider.js @@ -1,12 +1,10 @@ +import { Check, defined, RuntimeError } from "@cesium/utils"; import buildModuleUrl from "../Core/buildModuleUrl.js"; -import Check from "../Core/Check.js"; import Credit from "../Core/Credit.js"; -import defined from "../Core/defined.js"; import Event from "../Core/Event.js"; import GeographicTilingScheme from "../Core/GeographicTilingScheme.js"; import Rectangle from "../Core/Rectangle.js"; import Resource from "../Core/Resource.js"; -import RuntimeError from "../Core/RuntimeError.js"; import TileProviderError from "../Core/TileProviderError.js"; import WebMercatorTilingScheme from "../Core/WebMercatorTilingScheme.js"; import ImageryProvider from "./ImageryProvider.js"; diff --git a/packages/engine/Source/Scene/GridImageryProvider.js b/packages/engine/Source/Scene/GridImageryProvider.js index b145c9010d72..a71105f886dd 100644 --- a/packages/engine/Source/Scene/GridImageryProvider.js +++ b/packages/engine/Source/Scene/GridImageryProvider.js @@ -1,7 +1,7 @@ +import { defined } from "@cesium/utils"; import Color from "../Core/Color.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import GeographicTilingScheme from "../Core/GeographicTilingScheme.js"; const defaultColor = new Color(1.0, 1.0, 1.0, 0.4); diff --git a/packages/engine/Source/Scene/GroundPolylinePrimitive.js b/packages/engine/Source/Scene/GroundPolylinePrimitive.js index 300c6cffbb7a..cc0a63d58a32 100644 --- a/packages/engine/Source/Scene/GroundPolylinePrimitive.js +++ b/packages/engine/Source/Scene/GroundPolylinePrimitive.js @@ -1,9 +1,8 @@ +import { defined, DeveloperError } from "@cesium/utils"; import ApproximateTerrainHeights from "../Core/ApproximateTerrainHeights.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Frozen from "../Core/Frozen.js"; import GeometryInstance from "../Core/GeometryInstance.js"; import GeometryInstanceAttribute from "../Core/GeometryInstanceAttribute.js"; import GroundPolylineGeometry from "../Core/GroundPolylineGeometry.js"; diff --git a/packages/engine/Source/Scene/GroundPrimitive.js b/packages/engine/Source/Scene/GroundPrimitive.js index f40a7d78dae5..413d1108a7d4 100644 --- a/packages/engine/Source/Scene/GroundPrimitive.js +++ b/packages/engine/Source/Scene/GroundPrimitive.js @@ -1,12 +1,10 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import ApproximateTerrainHeights from "../Core/ApproximateTerrainHeights.js"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; -import Check from "../Core/Check.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Frozen from "../Core/Frozen.js"; import GeometryInstance from "../Core/GeometryInstance.js"; import OrientedBoundingBox from "../Core/OrientedBoundingBox.js"; import Rectangle from "../Core/Rectangle.js"; diff --git a/packages/engine/Source/Scene/GroupMetadata.js b/packages/engine/Source/Scene/GroupMetadata.js index afd5693ad333..390a5fff4e08 100644 --- a/packages/engine/Source/Scene/GroupMetadata.js +++ b/packages/engine/Source/Scene/GroupMetadata.js @@ -1,6 +1,5 @@ -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import MetadataEntity from "./MetadataEntity.js"; /** diff --git a/packages/engine/Source/Scene/I3SDataProvider.js b/packages/engine/Source/Scene/I3SDataProvider.js index 8bf7ee0f655a..322b1c562baf 100644 --- a/packages/engine/Source/Scene/I3SDataProvider.js +++ b/packages/engine/Source/Scene/I3SDataProvider.js @@ -46,21 +46,19 @@ * to avoid requiring bloated look up files. The source Data used in this transcoding service was compiled from https://earth-info.nga.mil/#tab_wgs84-data and is based on * EGM2008 Gravity Model. The sandcastle examples show how to set the terrain provider service if required. */ +import { Check, defined, RuntimeError } from "@cesium/utils"; +import Lerc from "lerc"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartographic from "../Core/Cartographic.js"; -import Check from "../Core/Check.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; +import Frozen from "../Core/Frozen.js"; import HeightmapEncoding from "../Core/HeightmapEncoding.js"; +import Rectangle from "../Core/Rectangle.js"; import Resource from "../Core/Resource.js"; -import RuntimeError from "../Core/RuntimeError.js"; import WebMercatorProjection from "../Core/WebMercatorProjection.js"; import I3SLayer from "./I3SLayer.js"; import I3SStatistics from "./I3SStatistics.js"; import I3SSublayer from "./I3SSublayer.js"; -import Lerc from "lerc"; -import Rectangle from "../Core/Rectangle.js"; /** * @typedef {Object} I3SDataProvider.ConstructorOptions diff --git a/packages/engine/Source/Scene/I3SDecoder.js b/packages/engine/Source/Scene/I3SDecoder.js index d72218c43a33..a5444755a4d4 100644 --- a/packages/engine/Source/Scene/I3SDecoder.js +++ b/packages/engine/Source/Scene/I3SDecoder.js @@ -1,11 +1,8 @@ +import { Check, defined, FeatureDetection, RuntimeError } from "@cesium/utils"; import Cartographic from "../Core/Cartographic.js"; -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; import Ellipsoid from "../Core/Ellipsoid.js"; -import FeatureDetection from "../Core/FeatureDetection.js"; import CesiumMath from "../Core/Math.js"; import Matrix3 from "../Core/Matrix3.js"; -import RuntimeError from "../Core/RuntimeError.js"; import TaskProcessor from "../Core/TaskProcessor.js"; /** diff --git a/packages/engine/Source/Scene/I3SFeature.js b/packages/engine/Source/Scene/I3SFeature.js index 093ceae5f2d8..b888ea05255f 100644 --- a/packages/engine/Source/Scene/I3SFeature.js +++ b/packages/engine/Source/Scene/I3SFeature.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import I3SDataProvider from "./I3SDataProvider.js"; /** diff --git a/packages/engine/Source/Scene/I3SField.js b/packages/engine/Source/Scene/I3SField.js index 33c040c23b95..07e7778731b9 100644 --- a/packages/engine/Source/Scene/I3SField.js +++ b/packages/engine/Source/Scene/I3SField.js @@ -1,5 +1,4 @@ -import defined from "../Core/defined.js"; -import RuntimeError from "../Core/RuntimeError.js"; +import { defined, RuntimeError } from "@cesium/utils"; /** * This class implements an I3S Field which is custom data attached diff --git a/packages/engine/Source/Scene/I3SGeometry.js b/packages/engine/Source/Scene/I3SGeometry.js index f68e4fc7c5b5..b680c27face5 100644 --- a/packages/engine/Source/Scene/I3SGeometry.js +++ b/packages/engine/Source/Scene/I3SGeometry.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; import clone from "../Core/clone.js"; -import defined from "../Core/defined.js"; import Matrix3 from "../Core/Matrix3.js"; import srgbToLinear from "../Core/srgbToLinear.js"; diff --git a/packages/engine/Source/Scene/I3SLayer.js b/packages/engine/Source/Scene/I3SLayer.js index 0ae1061ea9b5..941fde3e58df 100644 --- a/packages/engine/Source/Scene/I3SLayer.js +++ b/packages/engine/Source/Scene/I3SLayer.js @@ -1,10 +1,9 @@ +import { defined, RuntimeError } from "@cesium/utils"; import Cartesian4 from "../Core/Cartesian4.js"; import clone from "../Core/clone.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import Rectangle from "../Core/Rectangle.js"; import Resource from "../Core/Resource.js"; -import RuntimeError from "../Core/RuntimeError.js"; import Cesium3DTileset from "./Cesium3DTileset.js"; import I3SNode from "./I3SNode.js"; import I3SSymbology from "./I3SSymbology.js"; diff --git a/packages/engine/Source/Scene/I3SNode.js b/packages/engine/Source/Scene/I3SNode.js index c28e9c4c3f48..a7828fdac17c 100644 --- a/packages/engine/Source/Scene/I3SNode.js +++ b/packages/engine/Source/Scene/I3SNode.js @@ -1,12 +1,11 @@ +import { Check, defined } from "@cesium/utils"; import Cartographic from "../Core/Cartographic.js"; -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import HeadingPitchRoll from "../Core/HeadingPitchRoll.js"; import Matrix3 from "../Core/Matrix3.js"; import Matrix4 from "../Core/Matrix4.js"; -import Resource from "../Core/Resource.js"; import Quaternion from "../Core/Quaternion.js"; +import Resource from "../Core/Resource.js"; import Transforms from "../Core/Transforms.js"; import Cesium3DTile from "./Cesium3DTile.js"; import I3SDataProvider from "./I3SDataProvider.js"; diff --git a/packages/engine/Source/Scene/I3SStatistics.js b/packages/engine/Source/Scene/I3SStatistics.js index a5ca15641b6f..82a227988539 100644 --- a/packages/engine/Source/Scene/I3SStatistics.js +++ b/packages/engine/Source/Scene/I3SStatistics.js @@ -1,6 +1,6 @@ -import defined from "../Core/defined.js"; -import I3SDataProvider from "./I3SDataProvider.js"; +import { defined } from "@cesium/utils"; import Resource from "../Core/Resource.js"; +import I3SDataProvider from "./I3SDataProvider.js"; /** * This class implements an I3S statistics for Building Scene Layer. diff --git a/packages/engine/Source/Scene/I3SSublayer.js b/packages/engine/Source/Scene/I3SSublayer.js index f8986fd3b98a..6a5278b6c58c 100644 --- a/packages/engine/Source/Scene/I3SSublayer.js +++ b/packages/engine/Source/Scene/I3SSublayer.js @@ -1,8 +1,7 @@ -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; +import { Check, defined } from "@cesium/utils"; +import Resource from "../Core/Resource.js"; import I3SDataProvider from "./I3SDataProvider.js"; import I3SLayer from "./I3SLayer.js"; -import Resource from "../Core/Resource.js"; /** * This class implements an I3S sublayer for Building Scene Layer. diff --git a/packages/engine/Source/Scene/I3SSymbology.js b/packages/engine/Source/Scene/I3SSymbology.js index 21a218843955..8bd145745f1a 100644 --- a/packages/engine/Source/Scene/I3SSymbology.js +++ b/packages/engine/Source/Scene/I3SSymbology.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import srgbToLinear from "../Core/srgbToLinear.js"; /** diff --git a/packages/engine/Source/Scene/I3dmParser.js b/packages/engine/Source/Scene/I3dmParser.js index cda8bfb68345..9bfca5a34fda 100644 --- a/packages/engine/Source/Scene/I3dmParser.js +++ b/packages/engine/Source/Scene/I3dmParser.js @@ -1,7 +1,6 @@ -import Check from "../Core/Check.js"; +import { Check, RuntimeError } from "@cesium/utils"; import deprecationWarning from "../Core/deprecationWarning.js"; import getJsonFromTypedArray from "../Core/getJsonFromTypedArray.js"; -import RuntimeError from "../Core/RuntimeError.js"; /** * Handles parsing of an Instanced 3D Model. diff --git a/packages/engine/Source/Scene/ITwinData.js b/packages/engine/Source/Scene/ITwinData.js index ff2681ad9e99..1b58ab3e6051 100644 --- a/packages/engine/Source/Scene/ITwinData.js +++ b/packages/engine/Source/Scene/ITwinData.js @@ -1,12 +1,9 @@ -import Cesium3DTileset from "./Cesium3DTileset.js"; -import defined from "../Core/defined.js"; -import Resource from "../Core/Resource.js"; +import { Check, defined, DeveloperError, RuntimeError } from "@cesium/utils"; import ITwinPlatform from "../Core/ITwinPlatform.js"; -import RuntimeError from "../Core/RuntimeError.js"; -import Check from "../Core/Check.js"; -import KmlDataSource from "../DataSources/KmlDataSource.js"; +import Resource from "../Core/Resource.js"; import GeoJsonDataSource from "../DataSources/GeoJsonDataSource.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import KmlDataSource from "../DataSources/KmlDataSource.js"; +import Cesium3DTileset from "./Cesium3DTileset.js"; /** * Methods for loading iTwin platform data into CesiumJS diff --git a/packages/engine/Source/Scene/ImageBasedLighting.js b/packages/engine/Source/Scene/ImageBasedLighting.js index f31b0c35a834..163cd5ea84cd 100644 --- a/packages/engine/Source/Scene/ImageBasedLighting.js +++ b/packages/engine/Source/Scene/ImageBasedLighting.js @@ -1,9 +1,7 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; -import Frozen from "../Core/Frozen.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Frozen from "../Core/Frozen.js"; import SpecularEnvironmentCubeMap from "./SpecularEnvironmentCubeMap.js"; /** diff --git a/packages/engine/Source/Scene/Imagery.js b/packages/engine/Source/Scene/Imagery.js index c71c37261072..3ca880b02d94 100644 --- a/packages/engine/Source/Scene/Imagery.js +++ b/packages/engine/Source/Scene/Imagery.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import destroyObject from "../Core/destroyObject.js"; import ImageryState from "./ImageryState.js"; diff --git a/packages/engine/Source/Scene/ImageryLayer.js b/packages/engine/Source/Scene/ImageryLayer.js index d9e3456f87b5..ed6bd77fb2d2 100644 --- a/packages/engine/Source/Scene/ImageryLayer.js +++ b/packages/engine/Source/Scene/ImageryLayer.js @@ -1,13 +1,14 @@ +import { + Check, + defined, + DeveloperError, + FeatureDetection, +} from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian4 from "../Core/Cartesian4.js"; -import Check from "../Core/Check.js"; -import createWorldImageryAsync from "../Scene/createWorldImageryAsync.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Event from "../Core/Event.js"; -import FeatureDetection from "../Core/FeatureDetection.js"; +import Frozen from "../Core/Frozen.js"; import GeographicProjection from "../Core/GeographicProjection.js"; import IndexDatatype from "../Core/IndexDatatype.js"; import CesiumMath from "../Core/Math.js"; @@ -32,6 +33,7 @@ import TextureMagnificationFilter from "../Renderer/TextureMagnificationFilter.j import TextureMinificationFilter from "../Renderer/TextureMinificationFilter.js"; import TextureWrap from "../Renderer/TextureWrap.js"; import VertexArray from "../Renderer/VertexArray.js"; +import createWorldImageryAsync from "../Scene/createWorldImageryAsync.js"; import ReprojectWebMercatorFS from "../Shaders/ReprojectWebMercatorFS.js"; import ReprojectWebMercatorVS from "../Shaders/ReprojectWebMercatorVS.js"; import Imagery from "./Imagery.js"; diff --git a/packages/engine/Source/Scene/ImageryLayerCollection.js b/packages/engine/Source/Scene/ImageryLayerCollection.js index 299d6ca0b56c..7903a0a71017 100644 --- a/packages/engine/Source/Scene/ImageryLayerCollection.js +++ b/packages/engine/Source/Scene/ImageryLayerCollection.js @@ -1,6 +1,5 @@ -import defined from "../Core/defined.js"; +import { defined, DeveloperError } from "@cesium/utils"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Event from "../Core/Event.js"; import CesiumMath from "../Core/Math.js"; import Rectangle from "../Core/Rectangle.js"; diff --git a/packages/engine/Source/Scene/ImageryLayerFeatureInfo.js b/packages/engine/Source/Scene/ImageryLayerFeatureInfo.js index 99980d2ab054..378817a0aa0d 100644 --- a/packages/engine/Source/Scene/ImageryLayerFeatureInfo.js +++ b/packages/engine/Source/Scene/ImageryLayerFeatureInfo.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; /** * Describes a rasterized feature, such as a point, polygon, polyline, etc., in an imagery layer. diff --git a/packages/engine/Source/Scene/ImageryProvider.js b/packages/engine/Source/Scene/ImageryProvider.js index 0a5d626732aa..7cdd69d2ffcd 100644 --- a/packages/engine/Source/Scene/ImageryProvider.js +++ b/packages/engine/Source/Scene/ImageryProvider.js @@ -1,6 +1,4 @@ -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import loadKTX2 from "../Core/loadKTX2.js"; import Resource from "../Core/Resource.js"; diff --git a/packages/engine/Source/Scene/Implicit3DTileContent.js b/packages/engine/Source/Scene/Implicit3DTileContent.js index e5b4a871c566..7baa6c5a68b0 100644 --- a/packages/engine/Source/Scene/Implicit3DTileContent.js +++ b/packages/engine/Source/Scene/Implicit3DTileContent.js @@ -1,19 +1,17 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import clone from "../Core/clone.js"; import combine from "../Core/combine.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; -import CesiumMath from "../Core/Math.js"; import HilbertOrder from "../Core/HilbertOrder.js"; +import CesiumMath from "../Core/Math.js"; import Matrix3 from "../Core/Matrix3.js"; import Rectangle from "../Core/Rectangle.js"; import S2Cell from "../Core/S2Cell.js"; -import ImplicitSubtree from "./ImplicitSubtree.js"; +import BoundingVolumeSemantics from "./BoundingVolumeSemantics.js"; import hasExtension from "./hasExtension.js"; +import ImplicitSubtree from "./ImplicitSubtree.js"; import MetadataSemantic from "./MetadataSemantic.js"; -import BoundingVolumeSemantics from "./BoundingVolumeSemantics.js"; /** * A specialized {@link Cesium3DTileContent} that lazily evaluates an implicit diff --git a/packages/engine/Source/Scene/ImplicitAvailabilityBitstream.js b/packages/engine/Source/Scene/ImplicitAvailabilityBitstream.js index aa497eac2b87..35139a0943de 100644 --- a/packages/engine/Source/Scene/ImplicitAvailabilityBitstream.js +++ b/packages/engine/Source/Scene/ImplicitAvailabilityBitstream.js @@ -1,7 +1,4 @@ -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; -import RuntimeError from "../Core/RuntimeError.js"; +import { Check, defined, DeveloperError, RuntimeError } from "@cesium/utils"; /** * An availability bitstream for use in an {@link ImplicitSubtree}. This handles diff --git a/packages/engine/Source/Scene/ImplicitMetadataView.js b/packages/engine/Source/Scene/ImplicitMetadataView.js index d6e1c45a090d..3b7e3f817521 100644 --- a/packages/engine/Source/Scene/ImplicitMetadataView.js +++ b/packages/engine/Source/Scene/ImplicitMetadataView.js @@ -1,4 +1,4 @@ -import Check from "../Core/Check.js"; +import { Check } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; /** diff --git a/packages/engine/Source/Scene/ImplicitSubdivisionScheme.js b/packages/engine/Source/Scene/ImplicitSubdivisionScheme.js index 75f5ecde7357..0b820c481d81 100644 --- a/packages/engine/Source/Scene/ImplicitSubdivisionScheme.js +++ b/packages/engine/Source/Scene/ImplicitSubdivisionScheme.js @@ -1,4 +1,4 @@ -import DeveloperError from "../Core/DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * The subdivision scheme for an implicit tileset. diff --git a/packages/engine/Source/Scene/ImplicitSubtree.js b/packages/engine/Source/Scene/ImplicitSubtree.js index 41be94591905..172c3e7deb19 100644 --- a/packages/engine/Source/Scene/ImplicitSubtree.js +++ b/packages/engine/Source/Scene/ImplicitSubtree.js @@ -1,9 +1,6 @@ -import Check from "../Core/Check.js"; -import DeveloperError from "../Core/DeveloperError.js"; -import defined from "../Core/defined.js"; +import { Check, defined, DeveloperError, RuntimeError } from "@cesium/utils"; import destroyObject from "../Core/destroyObject.js"; import getJsonFromTypedArray from "../Core/getJsonFromTypedArray.js"; -import RuntimeError from "../Core/RuntimeError.js"; import hasExtension from "./hasExtension.js"; import ImplicitAvailabilityBitstream from "./ImplicitAvailabilityBitstream.js"; import ImplicitMetadataView from "./ImplicitMetadataView.js"; diff --git a/packages/engine/Source/Scene/ImplicitSubtreeCache.js b/packages/engine/Source/Scene/ImplicitSubtreeCache.js index 78804e8eb848..2ef33c2fd30c 100644 --- a/packages/engine/Source/Scene/ImplicitSubtreeCache.js +++ b/packages/engine/Source/Scene/ImplicitSubtreeCache.js @@ -1,6 +1,6 @@ -import Frozen from "../Core/Frozen.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; import DoubleEndedPriorityQueue from "../Core/DoubleEndedPriorityQueue.js"; +import Frozen from "../Core/Frozen.js"; /** * @alias ImplicitSubtreeCache diff --git a/packages/engine/Source/Scene/ImplicitSubtreeMetadata.js b/packages/engine/Source/Scene/ImplicitSubtreeMetadata.js index 6f318c4c6d80..663a0f40e41d 100644 --- a/packages/engine/Source/Scene/ImplicitSubtreeMetadata.js +++ b/packages/engine/Source/Scene/ImplicitSubtreeMetadata.js @@ -1,6 +1,5 @@ -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import MetadataEntity from "./MetadataEntity.js"; /** diff --git a/packages/engine/Source/Scene/ImplicitTileCoordinates.js b/packages/engine/Source/Scene/ImplicitTileCoordinates.js index 44376c2ab311..f713c658582b 100644 --- a/packages/engine/Source/Scene/ImplicitTileCoordinates.js +++ b/packages/engine/Source/Scene/ImplicitTileCoordinates.js @@ -1,6 +1,5 @@ +import { Check, DeveloperError } from "@cesium/utils"; import CesiumMath from "../Core/Math.js"; -import Check from "../Core/Check.js"; -import DeveloperError from "../Core/DeveloperError.js"; import MortonOrder from "../Core/MortonOrder.js"; import ImplicitSubdivisionScheme from "./ImplicitSubdivisionScheme.js"; diff --git a/packages/engine/Source/Scene/ImplicitTileset.js b/packages/engine/Source/Scene/ImplicitTileset.js index e34f56b9c1e6..489941367453 100644 --- a/packages/engine/Source/Scene/ImplicitTileset.js +++ b/packages/engine/Source/Scene/ImplicitTileset.js @@ -1,8 +1,6 @@ -import Check from "../Core/Check.js"; +import { Check, defined, RuntimeError } from "@cesium/utils"; import clone from "../Core/clone.js"; -import defined from "../Core/defined.js"; import Resource from "../Core/Resource.js"; -import RuntimeError from "../Core/RuntimeError.js"; import hasExtension from "./hasExtension.js"; import ImplicitSubdivisionScheme from "./ImplicitSubdivisionScheme.js"; diff --git a/packages/engine/Source/Scene/InstanceAttributeSemantic.js b/packages/engine/Source/Scene/InstanceAttributeSemantic.js index f28d79008492..bda13fcb6958 100644 --- a/packages/engine/Source/Scene/InstanceAttributeSemantic.js +++ b/packages/engine/Source/Scene/InstanceAttributeSemantic.js @@ -1,4 +1,4 @@ -import Check from "../Core/Check.js"; +import { Check } from "@cesium/utils"; /** * An enum describing the built-in instance attribute semantics. diff --git a/packages/engine/Source/Scene/InvertClassification.js b/packages/engine/Source/Scene/InvertClassification.js index b8d7da84e455..ea9652600ee0 100644 --- a/packages/engine/Source/Scene/InvertClassification.js +++ b/packages/engine/Source/Scene/InvertClassification.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import PixelFormat from "../Core/PixelFormat.js"; import ClearCommand from "../Renderer/ClearCommand.js"; diff --git a/packages/engine/Source/Scene/IonImageryProvider.js b/packages/engine/Source/Scene/IonImageryProvider.js index 0d03a03a84f6..e155aca22dda 100644 --- a/packages/engine/Source/Scene/IonImageryProvider.js +++ b/packages/engine/Source/Scene/IonImageryProvider.js @@ -1,15 +1,13 @@ -import Check from "../Core/Check.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; +import { Check, defined, RuntimeError } from "@cesium/utils"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import IonResource from "../Core/IonResource.js"; -import RuntimeError from "../Core/RuntimeError.js"; import ArcGisMapServerImageryProvider from "./ArcGisMapServerImageryProvider.js"; import BingMapsImageryProvider from "./BingMapsImageryProvider.js"; -import TileMapServiceImageryProvider from "./TileMapServiceImageryProvider.js"; import GoogleEarthEnterpriseMapsProvider from "./GoogleEarthEnterpriseMapsProvider.js"; import MapboxImageryProvider from "./MapboxImageryProvider.js"; import SingleTileImageryProvider from "./SingleTileImageryProvider.js"; +import TileMapServiceImageryProvider from "./TileMapServiceImageryProvider.js"; import UrlTemplateImageryProvider from "./UrlTemplateImageryProvider.js"; import WebMapServiceImageryProvider from "./WebMapServiceImageryProvider.js"; import WebMapTileServiceImageryProvider from "./WebMapTileServiceImageryProvider.js"; diff --git a/packages/engine/Source/Scene/JobScheduler.js b/packages/engine/Source/Scene/JobScheduler.js index e9c03ef4b479..112d3679e5de 100644 --- a/packages/engine/Source/Scene/JobScheduler.js +++ b/packages/engine/Source/Scene/JobScheduler.js @@ -1,5 +1,4 @@ -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import getTimestamp from "../Core/getTimestamp.js"; import JobType from "./JobType.js"; diff --git a/packages/engine/Source/Scene/JsonMetadataTable.js b/packages/engine/Source/Scene/JsonMetadataTable.js index ff6d963f9886..476e5f17d691 100644 --- a/packages/engine/Source/Scene/JsonMetadataTable.js +++ b/packages/engine/Source/Scene/JsonMetadataTable.js @@ -1,7 +1,5 @@ -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import clone from "../Core/clone.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import MetadataEntity from "./MetadataEntity.js"; /** diff --git a/packages/engine/Source/Scene/Label.js b/packages/engine/Source/Scene/Label.js index b36a7a79952e..e62cc131c9c2 100644 --- a/packages/engine/Source/Scene/Label.js +++ b/packages/engine/Source/Scene/Label.js @@ -1,11 +1,10 @@ +import { defined, DeveloperError } from "@cesium/utils"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Color from "../Core/Color.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import DistanceDisplayCondition from "../Core/DistanceDisplayCondition.js"; +import Frozen from "../Core/Frozen.js"; import NearFarScalar from "../Core/NearFarScalar.js"; import Billboard from "./Billboard.js"; import HeightReference from "./HeightReference.js"; @@ -13,7 +12,6 @@ import HorizontalOrigin from "./HorizontalOrigin.js"; import LabelStyle from "./LabelStyle.js"; import SDFSettings from "./SDFSettings.js"; import VerticalOrigin from "./VerticalOrigin.js"; - const fontInfoCache = {}; let fontInfoCacheLength = 0; const fontInfoCacheMaxSize = 256; diff --git a/packages/engine/Source/Scene/LabelCollection.js b/packages/engine/Source/Scene/LabelCollection.js index 173d6a0e709d..55f40505082d 100644 --- a/packages/engine/Source/Scene/LabelCollection.js +++ b/packages/engine/Source/Scene/LabelCollection.js @@ -1,13 +1,14 @@ +import { defined, DeveloperError } from "@cesium/utils"; +import bitmapSDF from "bitmap-sdf"; +import GraphemeSplitter from "grapheme-splitter"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Color from "../Core/Color.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Frozen from "../Core/Frozen.js"; import Matrix4 from "../Core/Matrix4.js"; import writeTextToCanvas from "../Core/writeTextToCanvas.js"; -import bitmapSDF from "bitmap-sdf"; +import TextureAtlas from "../Renderer/TextureAtlas.js"; import BillboardCollection from "./BillboardCollection.js"; import BillboardTexture from "./BillboardTexture.js"; import BlendOption from "./BlendOption.js"; @@ -16,9 +17,7 @@ import HorizontalOrigin from "./HorizontalOrigin.js"; import Label from "./Label.js"; import LabelStyle from "./LabelStyle.js"; import SDFSettings from "./SDFSettings.js"; -import TextureAtlas from "../Renderer/TextureAtlas.js"; import VerticalOrigin from "./VerticalOrigin.js"; -import GraphemeSplitter from "grapheme-splitter"; /** * A glyph represents a single character in label. diff --git a/packages/engine/Source/Scene/Light.js b/packages/engine/Source/Scene/Light.js index 1fd3ac0616da..d822223cecde 100644 --- a/packages/engine/Source/Scene/Light.js +++ b/packages/engine/Source/Scene/Light.js @@ -1,4 +1,4 @@ -import DeveloperError from "../Core/DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * A light source. This type describes an interface and is not intended to be instantiated directly. Together, color and intensity produce a high-dynamic-range light color. intensity can also be used individually to dim or brighten the light without changing the hue. diff --git a/packages/engine/Source/Scene/MapboxImageryProvider.js b/packages/engine/Source/Scene/MapboxImageryProvider.js index e9ee1d357e26..9dacb26d4e9b 100644 --- a/packages/engine/Source/Scene/MapboxImageryProvider.js +++ b/packages/engine/Source/Scene/MapboxImageryProvider.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Credit from "../Core/Credit.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Resource from "../Core/Resource.js"; import UrlTemplateImageryProvider from "./UrlTemplateImageryProvider.js"; diff --git a/packages/engine/Source/Scene/MapboxStyleImageryProvider.js b/packages/engine/Source/Scene/MapboxStyleImageryProvider.js index e0e50feda2de..544c40993b60 100644 --- a/packages/engine/Source/Scene/MapboxStyleImageryProvider.js +++ b/packages/engine/Source/Scene/MapboxStyleImageryProvider.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Credit from "../Core/Credit.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Resource from "../Core/Resource.js"; import UrlTemplateImageryProvider from "./UrlTemplateImageryProvider.js"; diff --git a/packages/engine/Source/Scene/Material.js b/packages/engine/Source/Scene/Material.js index 7d7f9c487ccc..889e45574807 100644 --- a/packages/engine/Source/Scene/Material.js +++ b/packages/engine/Source/Scene/Material.js @@ -1,19 +1,21 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import clone from "../Core/clone.js"; import Color from "../Core/Color.js"; import combine from "../Core/combine.js"; import createGuid from "../Core/createGuid.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Frozen from "../Core/Frozen.js"; import loadKTX2 from "../Core/loadKTX2.js"; import Matrix2 from "../Core/Matrix2.js"; import Matrix3 from "../Core/Matrix3.js"; import Matrix4 from "../Core/Matrix4.js"; import Resource from "../Core/Resource.js"; import CubeMap from "../Renderer/CubeMap.js"; +import Sampler from "../Renderer/Sampler.js"; import Texture from "../Renderer/Texture.js"; +import TextureMagnificationFilter from "../Renderer/TextureMagnificationFilter.js"; +import TextureMinificationFilter from "../Renderer/TextureMinificationFilter.js"; import AspectRampMaterial from "../Shaders/Materials/AspectRampMaterial.js"; import BumpMapMaterial from "../Shaders/Materials/BumpMapMaterial.js"; import CheckerboardMaterial from "../Shaders/Materials/CheckerboardMaterial.js"; @@ -29,13 +31,10 @@ import PolylineDashMaterial from "../Shaders/Materials/PolylineDashMaterial.js"; import PolylineGlowMaterial from "../Shaders/Materials/PolylineGlowMaterial.js"; import PolylineOutlineMaterial from "../Shaders/Materials/PolylineOutlineMaterial.js"; import RimLightingMaterial from "../Shaders/Materials/RimLightingMaterial.js"; -import Sampler from "../Renderer/Sampler.js"; import SlopeRampMaterial from "../Shaders/Materials/SlopeRampMaterial.js"; import StripeMaterial from "../Shaders/Materials/StripeMaterial.js"; -import TextureMagnificationFilter from "../Renderer/TextureMagnificationFilter.js"; -import TextureMinificationFilter from "../Renderer/TextureMinificationFilter.js"; -import WaterMaskMaterial from "../Shaders/Materials/WaterMaskMaterial.js"; import WaterMaterial from "../Shaders/Materials/Water.js"; +import WaterMaskMaterial from "../Shaders/Materials/WaterMaskMaterial.js"; /** * A Material defines surface appearance through a combination of diffuse, specular, diff --git a/packages/engine/Source/Scene/MaterialAppearance.js b/packages/engine/Source/Scene/MaterialAppearance.js index f237cb118604..c99530c19edc 100644 --- a/packages/engine/Source/Scene/MaterialAppearance.js +++ b/packages/engine/Source/Scene/MaterialAppearance.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import VertexFormat from "../Core/VertexFormat.js"; import AllMaterialAppearanceFS from "../Shaders/Appearances/AllMaterialAppearanceFS.js"; import AllMaterialAppearanceVS from "../Shaders/Appearances/AllMaterialAppearanceVS.js"; diff --git a/packages/engine/Source/Scene/Megatexture.js b/packages/engine/Source/Scene/Megatexture.js index 9976f7c0e3ab..676e7ddbfcb9 100644 --- a/packages/engine/Source/Scene/Megatexture.js +++ b/packages/engine/Source/Scene/Megatexture.js @@ -1,20 +1,18 @@ +import { defined, DeveloperError, RuntimeError } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import ContextLimits from "../Renderer/ContextLimits.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import CesiumMath from "../Core/Math.js"; -import MetadataComponentType from "./MetadataComponentType.js"; -import PixelDatatype from "../Renderer/PixelDatatype.js"; import PixelFormat from "../Core/PixelFormat.js"; -import RuntimeError from "../Core/RuntimeError.js"; +import ContextLimits from "../Renderer/ContextLimits.js"; +import PixelDatatype from "../Renderer/PixelDatatype.js"; import Sampler from "../Renderer/Sampler.js"; import Texture from "../Renderer/Texture.js"; import TextureMagnificationFilter from "../Renderer/TextureMagnificationFilter.js"; import TextureMinificationFilter from "../Renderer/TextureMinificationFilter.js"; import TextureWrap from "../Renderer/TextureWrap.js"; +import MetadataComponentType from "./MetadataComponentType.js"; /** * @alias Megatexture diff --git a/packages/engine/Source/Scene/MetadataClass.js b/packages/engine/Source/Scene/MetadataClass.js index 6e7a8ce2aefb..4622256c896a 100644 --- a/packages/engine/Source/Scene/MetadataClass.js +++ b/packages/engine/Source/Scene/MetadataClass.js @@ -1,7 +1,6 @@ -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import clone from "../Core/clone.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import MetadataClassProperty from "./MetadataClassProperty.js"; /** diff --git a/packages/engine/Source/Scene/MetadataClassProperty.js b/packages/engine/Source/Scene/MetadataClassProperty.js index e00955d4ac5b..92d54e93fab6 100644 --- a/packages/engine/Source/Scene/MetadataClassProperty.js +++ b/packages/engine/Source/Scene/MetadataClassProperty.js @@ -1,16 +1,14 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; -import Check from "../Core/Check.js"; import clone from "../Core/clone.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Matrix2 from "../Core/Matrix2.js"; import Matrix3 from "../Core/Matrix3.js"; import Matrix4 from "../Core/Matrix4.js"; -import MetadataType from "./MetadataType.js"; import MetadataComponentType from "./MetadataComponentType.js"; +import MetadataType from "./MetadataType.js"; /** * A metadata property, as part of a {@link MetadataClass}. diff --git a/packages/engine/Source/Scene/MetadataComponentType.js b/packages/engine/Source/Scene/MetadataComponentType.js index 97dfa8ab4a11..58ac3ff4251c 100644 --- a/packages/engine/Source/Scene/MetadataComponentType.js +++ b/packages/engine/Source/Scene/MetadataComponentType.js @@ -1,8 +1,6 @@ -import CesiumMath from "../Core/Math.js"; -import Check from "../Core/Check.js"; +import { Check, DeveloperError, FeatureDetection } from "@cesium/utils"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import DeveloperError from "../Core/DeveloperError.js"; -import FeatureDetection from "../Core/FeatureDetection.js"; +import CesiumMath from "../Core/Math.js"; /** * An enum of metadata component types. diff --git a/packages/engine/Source/Scene/MetadataEntity.js b/packages/engine/Source/Scene/MetadataEntity.js index af5188f6955a..d48dec18d2fe 100644 --- a/packages/engine/Source/Scene/MetadataEntity.js +++ b/packages/engine/Source/Scene/MetadataEntity.js @@ -1,7 +1,5 @@ -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import clone from "../Core/clone.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; /** * An entity containing metadata. diff --git a/packages/engine/Source/Scene/MetadataEnum.js b/packages/engine/Source/Scene/MetadataEnum.js index 656db4728585..8c9da7ff7107 100644 --- a/packages/engine/Source/Scene/MetadataEnum.js +++ b/packages/engine/Source/Scene/MetadataEnum.js @@ -1,8 +1,8 @@ -import Check from "../Core/Check.js"; +import { Check } from "@cesium/utils"; import clone from "../Core/clone.js"; import Frozen from "../Core/Frozen.js"; -import MetadataEnumValue from "./MetadataEnumValue.js"; import MetadataComponentType from "./MetadataComponentType.js"; +import MetadataEnumValue from "./MetadataEnumValue.js"; /** * A metadata enum. diff --git a/packages/engine/Source/Scene/MetadataEnumValue.js b/packages/engine/Source/Scene/MetadataEnumValue.js index d693fed66365..c0b141bd243c 100644 --- a/packages/engine/Source/Scene/MetadataEnumValue.js +++ b/packages/engine/Source/Scene/MetadataEnumValue.js @@ -1,4 +1,4 @@ -import Check from "../Core/Check.js"; +import { Check } from "@cesium/utils"; import clone from "../Core/clone.js"; import Frozen from "../Core/Frozen.js"; diff --git a/packages/engine/Source/Scene/MetadataPicking.js b/packages/engine/Source/Scene/MetadataPicking.js index 1ecbb639a57a..bfe676000781 100644 --- a/packages/engine/Source/Scene/MetadataPicking.js +++ b/packages/engine/Source/Scene/MetadataPicking.js @@ -1,11 +1,10 @@ +import { defined, RuntimeError } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; -import defined from "../Core/defined.js"; import Matrix2 from "../Core/Matrix2.js"; import Matrix3 from "../Core/Matrix3.js"; import Matrix4 from "../Core/Matrix4.js"; -import RuntimeError from "../Core/RuntimeError.js"; import MetadataClassProperty from "./MetadataClassProperty.js"; import MetadataComponentType from "./MetadataComponentType.js"; import MetadataType from "./MetadataType.js"; diff --git a/packages/engine/Source/Scene/MetadataSchema.js b/packages/engine/Source/Scene/MetadataSchema.js index ef0d58fb0a2c..e2847f057be0 100644 --- a/packages/engine/Source/Scene/MetadataSchema.js +++ b/packages/engine/Source/Scene/MetadataSchema.js @@ -1,7 +1,6 @@ -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import clone from "../Core/clone.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import MetadataClass from "./MetadataClass.js"; import MetadataEnum from "./MetadataEnum.js"; diff --git a/packages/engine/Source/Scene/MetadataSchemaLoader.js b/packages/engine/Source/Scene/MetadataSchemaLoader.js index 565a42ab48d9..1a19a0fb6a13 100644 --- a/packages/engine/Source/Scene/MetadataSchemaLoader.js +++ b/packages/engine/Source/Scene/MetadataSchemaLoader.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import MetadataSchema from "./MetadataSchema.js"; import ResourceLoader from "./ResourceLoader.js"; import ResourceLoaderState from "./ResourceLoaderState.js"; diff --git a/packages/engine/Source/Scene/MetadataTable.js b/packages/engine/Source/Scene/MetadataTable.js index 25e531114833..8583916c1569 100644 --- a/packages/engine/Source/Scene/MetadataTable.js +++ b/packages/engine/Source/Scene/MetadataTable.js @@ -1,7 +1,6 @@ -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import clone from "../Core/clone.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import MetadataEntity from "./MetadataEntity.js"; import MetadataTableProperty from "./MetadataTableProperty.js"; diff --git a/packages/engine/Source/Scene/MetadataTableProperty.js b/packages/engine/Source/Scene/MetadataTableProperty.js index f16df4a60ff9..b2195069a37b 100644 --- a/packages/engine/Source/Scene/MetadataTableProperty.js +++ b/packages/engine/Source/Scene/MetadataTableProperty.js @@ -1,14 +1,16 @@ -import Check from "../Core/Check.js"; +import { + Check, + defined, + DeveloperError, + FeatureDetection, +} from "@cesium/utils"; import clone from "../Core/clone.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; -import FeatureDetection from "../Core/FeatureDetection.js"; import getStringFromTypedArray from "../Core/getStringFromTypedArray.js"; import oneTimeWarning from "../Core/oneTimeWarning.js"; -import MetadataComponentType from "./MetadataComponentType.js"; import MetadataClassProperty from "./MetadataClassProperty.js"; +import MetadataComponentType from "./MetadataComponentType.js"; import MetadataType from "./MetadataType.js"; /** diff --git a/packages/engine/Source/Scene/MetadataType.js b/packages/engine/Source/Scene/MetadataType.js index c00e91f2cb1e..e24ff18766d2 100644 --- a/packages/engine/Source/Scene/MetadataType.js +++ b/packages/engine/Source/Scene/MetadataType.js @@ -1,8 +1,7 @@ -import Check from "../Core/Check.js"; +import { Check, DeveloperError } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Matrix2 from "../Core/Matrix2.js"; import Matrix3 from "../Core/Matrix3.js"; import Matrix4 from "../Core/Matrix4.js"; diff --git a/packages/engine/Source/Scene/Model/AlphaPipelineStage.js b/packages/engine/Source/Scene/Model/AlphaPipelineStage.js index 4819d9283991..4e3703768cad 100644 --- a/packages/engine/Source/Scene/Model/AlphaPipelineStage.js +++ b/packages/engine/Source/Scene/Model/AlphaPipelineStage.js @@ -1,7 +1,7 @@ -import defined from "../../Core/defined.js"; +import { defined } from "@cesium/utils"; +import Pass from "../../Renderer/Pass.js"; import ShaderDestination from "../../Renderer/ShaderDestination.js"; import BlendingState from "../BlendingState.js"; -import Pass from "../../Renderer/Pass.js"; /** * A pipeline stage for configuring the alpha options for handling translucency. diff --git a/packages/engine/Source/Scene/Model/B3dmLoader.js b/packages/engine/Source/Scene/Model/B3dmLoader.js index 8687f4cb9011..fc892ad0fd84 100644 --- a/packages/engine/Source/Scene/Model/B3dmLoader.js +++ b/packages/engine/Source/Scene/Model/B3dmLoader.js @@ -1,21 +1,20 @@ -import Axis from "../Axis.js"; -import B3dmParser from "../B3dmParser.js"; +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "../../Core/Cartesian3.js"; -import Cesium3DTileFeatureTable from "../Cesium3DTileFeatureTable.js"; -import Check from "../../Core/Check.js"; import ComponentDatatype from "../../Core/ComponentDatatype.js"; import Frozen from "../../Core/Frozen.js"; -import defined from "../../Core/defined.js"; -import StructuralMetadata from "../StructuralMetadata.js"; -import GltfLoader from "../GltfLoader.js"; import Matrix4 from "../../Core/Matrix4.js"; +import Axis from "../Axis.js"; +import B3dmParser from "../B3dmParser.js"; +import Cesium3DTileFeatureTable from "../Cesium3DTileFeatureTable.js"; +import GltfLoader from "../GltfLoader.js"; import MetadataClass from "../MetadataClass.js"; import ModelComponents from "../ModelComponents.js"; -import ModelUtility from "./ModelUtility.js"; import parseBatchTable from "../parseBatchTable.js"; import PropertyTable from "../PropertyTable.js"; import ResourceLoader from "../ResourceLoader.js"; +import StructuralMetadata from "../StructuralMetadata.js"; import VertexAttributeSemantic from "../VertexAttributeSemantic.js"; +import ModelUtility from "./ModelUtility.js"; const B3dmLoaderState = { UNLOADED: 0, diff --git a/packages/engine/Source/Scene/Model/CPUStylingPipelineStage.js b/packages/engine/Source/Scene/Model/CPUStylingPipelineStage.js index 92497c0271a7..669202576946 100644 --- a/packages/engine/Source/Scene/Model/CPUStylingPipelineStage.js +++ b/packages/engine/Source/Scene/Model/CPUStylingPipelineStage.js @@ -1,10 +1,10 @@ -import ColorBlendMode from "../ColorBlendMode.js"; -import CPUStylingStageVS from "../../Shaders/Model/CPUStylingStageVS.js"; -import CPUStylingStageFS from "../../Shaders/Model/CPUStylingStageFS.js"; -import defined from "../../Core/defined.js"; -import ModelColorPipelineStage from "./ModelColorPipelineStage.js"; +import { defined } from "@cesium/utils"; import Pass from "../../Renderer/Pass.js"; import ShaderDestination from "../../Renderer/ShaderDestination.js"; +import CPUStylingStageFS from "../../Shaders/Model/CPUStylingStageFS.js"; +import CPUStylingStageVS from "../../Shaders/Model/CPUStylingStageVS.js"; +import ColorBlendMode from "../ColorBlendMode.js"; +import ModelColorPipelineStage from "./ModelColorPipelineStage.js"; /** * The CPU styling stage is responsible for ensuring that the feature's color diff --git a/packages/engine/Source/Scene/Model/ClassificationModelDrawCommand.js b/packages/engine/Source/Scene/Model/ClassificationModelDrawCommand.js index ba6b0e22d705..ca555f13a3c5 100644 --- a/packages/engine/Source/Scene/Model/ClassificationModelDrawCommand.js +++ b/packages/engine/Source/Scene/Model/ClassificationModelDrawCommand.js @@ -1,5 +1,5 @@ +import { Check } from "@cesium/utils"; import BoundingSphere from "../../Core/BoundingSphere.js"; -import Check from "../../Core/Check.js"; import Frozen from "../../Core/Frozen.js"; import Matrix4 from "../../Core/Matrix4.js"; import DrawCommand from "../../Renderer/DrawCommand.js"; diff --git a/packages/engine/Source/Scene/Model/ClassificationPipelineStage.js b/packages/engine/Source/Scene/Model/ClassificationPipelineStage.js index 35e476baf99f..9a015472ad4e 100644 --- a/packages/engine/Source/Scene/Model/ClassificationPipelineStage.js +++ b/packages/engine/Source/Scene/Model/ClassificationPipelineStage.js @@ -1,5 +1,4 @@ -import defined from "../../Core/defined.js"; -import RuntimeError from "../../Core/RuntimeError.js"; +import { defined, RuntimeError } from "@cesium/utils"; import ShaderDestination from "../../Renderer/ShaderDestination.js"; import VertexAttributeSemantic from "../VertexAttributeSemantic.js"; import ModelUtility from "./ModelUtility.js"; diff --git a/packages/engine/Source/Scene/Model/CustomShader.js b/packages/engine/Source/Scene/Model/CustomShader.js index 4315aa32b7bf..f09904e7ec19 100644 --- a/packages/engine/Source/Scene/Model/CustomShader.js +++ b/packages/engine/Source/Scene/Model/CustomShader.js @@ -1,12 +1,10 @@ -import Check from "../../Core/Check.js"; -import Frozen from "../../Core/Frozen.js"; -import defined from "../../Core/defined.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import destroyObject from "../../Core/destroyObject.js"; -import DeveloperError from "../../Core/DeveloperError.js"; +import Frozen from "../../Core/Frozen.js"; import CustomShaderMode from "./CustomShaderMode.js"; -import UniformType from "./UniformType.js"; -import TextureManager from "./TextureManager.js"; import CustomShaderTranslucencyMode from "./CustomShaderTranslucencyMode.js"; +import TextureManager from "./TextureManager.js"; +import UniformType from "./UniformType.js"; /** * An object describing a uniform, its type, and an initial value diff --git a/packages/engine/Source/Scene/Model/CustomShaderPipelineStage.js b/packages/engine/Source/Scene/Model/CustomShaderPipelineStage.js index 400a31f4828f..6068c1a6f7c3 100644 --- a/packages/engine/Source/Scene/Model/CustomShaderPipelineStage.js +++ b/packages/engine/Source/Scene/Model/CustomShaderPipelineStage.js @@ -1,15 +1,15 @@ +import { defined } from "@cesium/utils"; import combine from "../../Core/combine.js"; -import defined from "../../Core/defined.js"; import oneTimeWarning from "../../Core/oneTimeWarning.js"; -import ShaderDestination from "../../Renderer/ShaderDestination.js"; import Pass from "../../Renderer/Pass.js"; -import CustomShaderStageVS from "../../Shaders/Model/CustomShaderStageVS.js"; +import ShaderDestination from "../../Renderer/ShaderDestination.js"; import CustomShaderStageFS from "../../Shaders/Model/CustomShaderStageFS.js"; +import CustomShaderStageVS from "../../Shaders/Model/CustomShaderStageVS.js"; import CustomShaderMode from "./CustomShaderMode.js"; +import CustomShaderTranslucencyMode from "./CustomShaderTranslucencyMode.js"; import FeatureIdPipelineStage from "./FeatureIdPipelineStage.js"; import MetadataPipelineStage from "./MetadataPipelineStage.js"; import ModelUtility from "./ModelUtility.js"; -import CustomShaderTranslucencyMode from "./CustomShaderTranslucencyMode.js"; /** * The custom shader pipeline stage takes GLSL callbacks from the diff --git a/packages/engine/Source/Scene/Model/DequantizationPipelineStage.js b/packages/engine/Source/Scene/Model/DequantizationPipelineStage.js index def5ddbbb4e9..746494f54019 100644 --- a/packages/engine/Source/Scene/Model/DequantizationPipelineStage.js +++ b/packages/engine/Source/Scene/Model/DequantizationPipelineStage.js @@ -1,8 +1,8 @@ -import defined from "../../Core/defined.js"; +import { defined } from "@cesium/utils"; import Cartesian4 from "../../Core/Cartesian4.js"; import ShaderDestination from "../../Renderer/ShaderDestination.js"; -import ModelUtility from "./ModelUtility.js"; import VertexAttributeSemantic from "../VertexAttributeSemantic.js"; +import ModelUtility from "./ModelUtility.js"; /** * The dequantization stage generates shader code to dequantize attributes diff --git a/packages/engine/Source/Scene/Model/Extensions/Gpm/AnchorPointDirect.js b/packages/engine/Source/Scene/Model/Extensions/Gpm/AnchorPointDirect.js index 7f20273f7a90..7ffd9bc2325c 100644 --- a/packages/engine/Source/Scene/Model/Extensions/Gpm/AnchorPointDirect.js +++ b/packages/engine/Source/Scene/Model/Extensions/Gpm/AnchorPointDirect.js @@ -1,4 +1,4 @@ -import Check from "../../../../Core/Check.js"; +import { Check } from "@cesium/utils"; /** * @typedef {object} AnchorPointDirect.ConstructorOptions diff --git a/packages/engine/Source/Scene/Model/Extensions/Gpm/AnchorPointIndirect.js b/packages/engine/Source/Scene/Model/Extensions/Gpm/AnchorPointIndirect.js index b7f368b6d859..af3d72c9295b 100644 --- a/packages/engine/Source/Scene/Model/Extensions/Gpm/AnchorPointIndirect.js +++ b/packages/engine/Source/Scene/Model/Extensions/Gpm/AnchorPointIndirect.js @@ -1,4 +1,4 @@ -import Check from "../../../../Core/Check.js"; +import { Check } from "@cesium/utils"; /** * @typedef {object} AnchorPointIndirect.ConstructorOptions diff --git a/packages/engine/Source/Scene/Model/Extensions/Gpm/CorrelationGroup.js b/packages/engine/Source/Scene/Model/Extensions/Gpm/CorrelationGroup.js index 919ef9ed9991..81e92029d9ab 100644 --- a/packages/engine/Source/Scene/Model/Extensions/Gpm/CorrelationGroup.js +++ b/packages/engine/Source/Scene/Model/Extensions/Gpm/CorrelationGroup.js @@ -1,4 +1,4 @@ -import Check from "../../../../Core/Check.js"; +import { Check } from "@cesium/utils"; /** * @typedef {object} CorrelationGroup.ConstructorOptions diff --git a/packages/engine/Source/Scene/Model/Extensions/Gpm/GltfGpmLoader.js b/packages/engine/Source/Scene/Model/Extensions/Gpm/GltfGpmLoader.js index f3cd3e2dd2d7..316f67cfe9fb 100644 --- a/packages/engine/Source/Scene/Model/Extensions/Gpm/GltfGpmLoader.js +++ b/packages/engine/Source/Scene/Model/Extensions/Gpm/GltfGpmLoader.js @@ -1,7 +1,6 @@ +import { Check, RuntimeError } from "@cesium/utils"; import Cartesian3 from "../../../../Core/Cartesian3.js"; -import Check from "../../../../Core/Check.js"; import Matrix3 from "../../../../Core/Matrix3.js"; -import RuntimeError from "../../../../Core/RuntimeError.js"; import AnchorPointDirect from "./AnchorPointDirect.js"; import AnchorPointIndirect from "./AnchorPointIndirect.js"; import CorrelationGroup from "./CorrelationGroup.js"; diff --git a/packages/engine/Source/Scene/Model/Extensions/Gpm/GltfGpmLocal.js b/packages/engine/Source/Scene/Model/Extensions/Gpm/GltfGpmLocal.js index 80339c2247e6..cf23b6631cbc 100644 --- a/packages/engine/Source/Scene/Model/Extensions/Gpm/GltfGpmLocal.js +++ b/packages/engine/Source/Scene/Model/Extensions/Gpm/GltfGpmLocal.js @@ -1,6 +1,4 @@ -import defined from "../../../../Core/defined.js"; -import Check from "../../../../Core/Check.js"; -import RuntimeError from "../../../../Core/RuntimeError.js"; +import { Check, defined, RuntimeError } from "@cesium/utils"; import StorageType from "./StorageType.js"; /** diff --git a/packages/engine/Source/Scene/Model/Extensions/Gpm/GltfMeshPrimitiveGpmLoader.js b/packages/engine/Source/Scene/Model/Extensions/Gpm/GltfMeshPrimitiveGpmLoader.js index 8e7744b2502a..41233607bf3a 100644 --- a/packages/engine/Source/Scene/Model/Extensions/Gpm/GltfMeshPrimitiveGpmLoader.js +++ b/packages/engine/Source/Scene/Model/Extensions/Gpm/GltfMeshPrimitiveGpmLoader.js @@ -1,15 +1,14 @@ -import Check from "../../../../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import Frozen from "../../../../Core/Frozen.js"; -import defined from "../../../../Core/defined.js"; +import MetadataSchema from "../../../MetadataSchema.js"; +import PropertyTexture from "../../../PropertyTexture.js"; import ResourceCache from "../../../ResourceCache.js"; import ResourceLoader from "../../../ResourceLoader.js"; import ResourceLoaderState from "../../../ResourceLoaderState.js"; -import PropertyTexture from "../../../PropertyTexture.js"; import StructuralMetadata from "../../../StructuralMetadata.js"; -import MetadataSchema from "../../../MetadataSchema.js"; -import PpeTexture from "./PpeTexture.js"; -import PpeMetadata from "./PpeMetadata.js"; import MeshPrimitiveGpmLocal from "./MeshPrimitiveGpmLocal.js"; +import PpeMetadata from "./PpeMetadata.js"; +import PpeTexture from "./PpeTexture.js"; /** * Loads glTF NGA_gpm_local from a glTF mesh primitive. diff --git a/packages/engine/Source/Scene/Model/Extensions/Gpm/PpeMetadata.js b/packages/engine/Source/Scene/Model/Extensions/Gpm/PpeMetadata.js index d7c077fe603e..436b63344b5c 100644 --- a/packages/engine/Source/Scene/Model/Extensions/Gpm/PpeMetadata.js +++ b/packages/engine/Source/Scene/Model/Extensions/Gpm/PpeMetadata.js @@ -1,4 +1,4 @@ -import Check from "../../../../Core/Check.js"; +import { Check } from "@cesium/utils"; /** * @typedef {object} PpeMetadata.ConstructorOptions diff --git a/packages/engine/Source/Scene/Model/Extensions/Gpm/PpeTexture.js b/packages/engine/Source/Scene/Model/Extensions/Gpm/PpeTexture.js index e81d7605448f..1f76cd9d7e20 100644 --- a/packages/engine/Source/Scene/Model/Extensions/Gpm/PpeTexture.js +++ b/packages/engine/Source/Scene/Model/Extensions/Gpm/PpeTexture.js @@ -1,4 +1,4 @@ -import Check from "../../../../Core/Check.js"; +import { Check } from "@cesium/utils"; /** * @typedef {object} PpeTexture.ConstructorOptions diff --git a/packages/engine/Source/Scene/Model/Extensions/Gpm/Spdcf.js b/packages/engine/Source/Scene/Model/Extensions/Gpm/Spdcf.js index 1cc01a96b536..63e515769e54 100644 --- a/packages/engine/Source/Scene/Model/Extensions/Gpm/Spdcf.js +++ b/packages/engine/Source/Scene/Model/Extensions/Gpm/Spdcf.js @@ -1,4 +1,4 @@ -import Check from "../../../../Core/Check.js"; +import { Check } from "@cesium/utils"; /** * @typedef {object} Spdcf.ConstructorOptions diff --git a/packages/engine/Source/Scene/Model/FeatureIdPipelineStage.js b/packages/engine/Source/Scene/Model/FeatureIdPipelineStage.js index 33f5e1d8c5ac..2aaa37be9052 100644 --- a/packages/engine/Source/Scene/Model/FeatureIdPipelineStage.js +++ b/packages/engine/Source/Scene/Model/FeatureIdPipelineStage.js @@ -1,14 +1,14 @@ +import { defined } from "@cesium/utils"; import ComponentDatatype from "../../Core/ComponentDatatype.js"; -import defined from "../../Core/defined.js"; -import ShaderDestination from "../../Renderer/ShaderDestination.js"; +import Matrix3 from "../../Core/Matrix3.js"; import Buffer from "../../Renderer/Buffer.js"; import BufferUsage from "../../Renderer/BufferUsage.js"; +import ShaderDestination from "../../Renderer/ShaderDestination.js"; import FeatureIdStageFS from "../../Shaders/Model/FeatureIdStageFS.js"; import FeatureIdStageVS from "../../Shaders/Model/FeatureIdStageVS.js"; import ModelComponents from "../ModelComponents.js"; import VertexAttributeSemantic from "../VertexAttributeSemantic.js"; import ModelUtility from "./ModelUtility.js"; -import Matrix3 from "../../Core/Matrix3.js"; /** * The feature ID pipeline stage is responsible for processing feature IDs diff --git a/packages/engine/Source/Scene/Model/GeoJsonLoader.js b/packages/engine/Source/Scene/Model/GeoJsonLoader.js index 238a477b9b7f..cfcbe06995e7 100644 --- a/packages/engine/Source/Scene/Model/GeoJsonLoader.js +++ b/packages/engine/Source/Scene/Model/GeoJsonLoader.js @@ -1,14 +1,14 @@ +import { Check, defined, RuntimeError } from "@cesium/utils"; import Cartesian3 from "../../Core/Cartesian3.js"; -import Check from "../../Core/Check.js"; import ComponentDatatype from "../../Core/ComponentDatatype.js"; -import Frozen from "../../Core/Frozen.js"; -import defined from "../../Core/defined.js"; import Ellipsoid from "../../Core/Ellipsoid.js"; +import Frozen from "../../Core/Frozen.js"; import IndexDatatype from "../../Core/IndexDatatype.js"; import Matrix4 from "../../Core/Matrix4.js"; import PrimitiveType from "../../Core/PrimitiveType.js"; -import RuntimeError from "../../Core/RuntimeError.js"; import Transforms from "../../Core/Transforms.js"; +import Buffer from "../../Renderer/Buffer.js"; +import BufferUsage from "../../Renderer/BufferUsage.js"; import AttributeType from "../AttributeType.js"; import JsonMetadataTable from "../JsonMetadataTable.js"; import MetadataSchema from "../MetadataSchema.js"; @@ -17,8 +17,6 @@ import PropertyTable from "../PropertyTable.js"; import ResourceLoader from "../ResourceLoader.js"; import StructuralMetadata from "../StructuralMetadata.js"; import VertexAttributeSemantic from "../VertexAttributeSemantic.js"; -import Buffer from "../../Renderer/Buffer.js"; -import BufferUsage from "../../Renderer/BufferUsage.js"; /** * Loads a GeoJson model as part of the MAXAR_content_geojson extension with the following constraints: diff --git a/packages/engine/Source/Scene/Model/GeometryPipelineStage.js b/packages/engine/Source/Scene/Model/GeometryPipelineStage.js index 45a8e2b42c60..f064cf95a7cb 100644 --- a/packages/engine/Source/Scene/Model/GeometryPipelineStage.js +++ b/packages/engine/Source/Scene/Model/GeometryPipelineStage.js @@ -1,16 +1,15 @@ +import { defined, DeveloperError } from "@cesium/utils"; import ComponentDatatype from "../../Core/ComponentDatatype.js"; -import defined from "../../Core/defined.js"; -import DeveloperError from "../../Core/DeveloperError.js"; import PrimitiveType from "../../Core/PrimitiveType.js"; import ShaderDestination from "../../Renderer/ShaderDestination.js"; import GeometryStageFS from "../../Shaders/Model/GeometryStageFS.js"; import GeometryStageVS from "../../Shaders/Model/GeometryStageVS.js"; import AttributeType from "../AttributeType.js"; import SceneMode from "../SceneMode.js"; +import VertexAttributeSemantic from "../VertexAttributeSemantic.js"; import ModelType from "./ModelType.js"; import ModelUtility from "./ModelUtility.js"; import SelectedFeatureIdPipelineStage from "./SelectedFeatureIdPipelineStage.js"; -import VertexAttributeSemantic from "../VertexAttributeSemantic.js"; /** * The geometry pipeline stage processes the vertex attributes of a primitive. diff --git a/packages/engine/Source/Scene/Model/I3dmLoader.js b/packages/engine/Source/Scene/Model/I3dmLoader.js index 6817383b7d84..f475da1cad4d 100644 --- a/packages/engine/Source/Scene/Model/I3dmLoader.js +++ b/packages/engine/Source/Scene/Model/I3dmLoader.js @@ -1,17 +1,15 @@ +import { Check, defined, RuntimeError } from "@cesium/utils"; import AttributeCompression from "../../Core/AttributeCompression.js"; import BoundingSphere from "../../Core/BoundingSphere.js"; import Cartesian3 from "../../Core/Cartesian3.js"; -import Check from "../../Core/Check.js"; import clone from "../../Core/clone.js"; import ComponentDatatype from "../../Core/ComponentDatatype.js"; -import Frozen from "../../Core/Frozen.js"; -import defined from "../../Core/defined.js"; import Ellipsoid from "../../Core/Ellipsoid.js"; +import Frozen from "../../Core/Frozen.js"; import getStringFromTypedArray from "../../Core/getStringFromTypedArray.js"; import Matrix3 from "../../Core/Matrix3.js"; import Matrix4 from "../../Core/Matrix4.js"; import Quaternion from "../../Core/Quaternion.js"; -import RuntimeError from "../../Core/RuntimeError.js"; import Transforms from "../../Core/Transforms.js"; import Buffer from "../../Renderer/Buffer.js"; import BufferUsage from "../../Renderer/BufferUsage.js"; @@ -19,8 +17,8 @@ import AttributeType from "../AttributeType.js"; import Axis from "../Axis.js"; import Cesium3DTileFeatureTable from "../Cesium3DTileFeatureTable.js"; import GltfLoader from "../GltfLoader.js"; -import InstanceAttributeSemantic from "../InstanceAttributeSemantic.js"; import I3dmParser from "../I3dmParser.js"; +import InstanceAttributeSemantic from "../InstanceAttributeSemantic.js"; import MetadataClass from "../MetadataClass.js"; import ModelComponents from "../ModelComponents.js"; import parseBatchTable from "../parseBatchTable.js"; diff --git a/packages/engine/Source/Scene/Model/ImageBasedLightingPipelineStage.js b/packages/engine/Source/Scene/Model/ImageBasedLightingPipelineStage.js index 43e4b52ddd32..b83dea5eaff7 100644 --- a/packages/engine/Source/Scene/Model/ImageBasedLightingPipelineStage.js +++ b/packages/engine/Source/Scene/Model/ImageBasedLightingPipelineStage.js @@ -1,9 +1,9 @@ +import { defined } from "@cesium/utils"; +import Cartesian2 from "../../Core/Cartesian2.js"; import combine from "../../Core/combine.js"; -import defined from "../../Core/defined.js"; -import ImageBasedLightingStageFS from "../../Shaders/Model/ImageBasedLightingStageFS.js"; import ShaderDestination from "../../Renderer/ShaderDestination.js"; +import ImageBasedLightingStageFS from "../../Shaders/Model/ImageBasedLightingStageFS.js"; import SpecularEnvironmentCubeMap from "../SpecularEnvironmentCubeMap.js"; -import Cartesian2 from "../../Core/Cartesian2.js"; const ImageBasedLightingPipelineStage = { name: "ImageBasedLightingPipelineStage", // Helps with debugging diff --git a/packages/engine/Source/Scene/Model/InstancingPipelineStage.js b/packages/engine/Source/Scene/Model/InstancingPipelineStage.js index 682d2904cd5d..717ef9bbe3d1 100644 --- a/packages/engine/Source/Scene/Model/InstancingPipelineStage.js +++ b/packages/engine/Source/Scene/Model/InstancingPipelineStage.js @@ -1,9 +1,9 @@ +import { defined } from "@cesium/utils"; import AttributeCompression from "../../Core/AttributeCompression.js"; import Cartesian3 from "../../Core/Cartesian3.js"; import clone from "../../Core/clone.js"; import combine from "../../Core/combine.js"; import ComponentDatatype from "../../Core/ComponentDatatype.js"; -import defined from "../../Core/defined.js"; import Matrix4 from "../../Core/Matrix4.js"; import Quaternion from "../../Core/Quaternion.js"; import Transforms from "../../Core/Transforms.js"; diff --git a/packages/engine/Source/Scene/Model/LightingPipelineStage.js b/packages/engine/Source/Scene/Model/LightingPipelineStage.js index 97a01eded645..bbf78de1b0aa 100644 --- a/packages/engine/Source/Scene/Model/LightingPipelineStage.js +++ b/packages/engine/Source/Scene/Model/LightingPipelineStage.js @@ -1,4 +1,4 @@ -import defined from "../../Core/defined.js"; +import { defined } from "@cesium/utils"; import ShaderDestination from "../../Renderer/ShaderDestination.js"; import LightingStageFS from "../../Shaders/Model/LightingStageFS.js"; import LightingModel from "./LightingModel.js"; diff --git a/packages/engine/Source/Scene/Model/MaterialPipelineStage.js b/packages/engine/Source/Scene/Model/MaterialPipelineStage.js index ed2812a83bd9..62936d16b738 100644 --- a/packages/engine/Source/Scene/Model/MaterialPipelineStage.js +++ b/packages/engine/Source/Scene/Model/MaterialPipelineStage.js @@ -1,9 +1,9 @@ -import defined from "../../Core/defined.js"; +import { defined } from "@cesium/utils"; import Cartesian3 from "../../Core/Cartesian3.js"; import Cartesian4 from "../../Core/Cartesian4.js"; import Matrix3 from "../../Core/Matrix3.js"; -import ShaderDestination from "../../Renderer/ShaderDestination.js"; import Pass from "../../Renderer/Pass.js"; +import ShaderDestination from "../../Renderer/ShaderDestination.js"; import MaterialStageFS from "../../Shaders/Model/MaterialStageFS.js"; import AlphaMode from "../AlphaMode.js"; import ModelComponents from "../ModelComponents.js"; diff --git a/packages/engine/Source/Scene/Model/MetadataPipelineStage.js b/packages/engine/Source/Scene/Model/MetadataPipelineStage.js index e0e293c2788a..bd8bedeeb010 100644 --- a/packages/engine/Source/Scene/Model/MetadataPipelineStage.js +++ b/packages/engine/Source/Scene/Model/MetadataPipelineStage.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Matrix3 from "../../Core/Matrix3.js"; -import defined from "../../Core/defined.js"; import ShaderDestination from "../../Renderer/ShaderDestination.js"; import MetadataStageFS from "../../Shaders/Model/MetadataStageFS.js"; import MetadataStageVS from "../../Shaders/Model/MetadataStageVS.js"; diff --git a/packages/engine/Source/Scene/Model/Model.js b/packages/engine/Source/Scene/Model/Model.js index b1684c893bce..a6851c14d390 100644 --- a/packages/engine/Source/Scene/Model/Model.js +++ b/packages/engine/Source/Scene/Model/Model.js @@ -1,25 +1,23 @@ +import { Check, defined, DeveloperError, RuntimeError } from "@cesium/utils"; import BoundingSphere from "../../Core/BoundingSphere.js"; import Cartesian3 from "../../Core/Cartesian3.js"; import Cartographic from "../../Core/Cartographic.js"; -import Check from "../../Core/Check.js"; -import Credit from "../../Core/Credit.js"; import Color from "../../Core/Color.js"; -import defined from "../../Core/defined.js"; -import Frozen from "../../Core/Frozen.js"; -import DeveloperError from "../../Core/DeveloperError.js"; +import Credit from "../../Core/Credit.js"; import destroyObject from "../../Core/destroyObject.js"; import DistanceDisplayCondition from "../../Core/DistanceDisplayCondition.js"; import Ellipsoid from "../../Core/Ellipsoid.js"; import Event from "../../Core/Event.js"; +import Frozen from "../../Core/Frozen.js"; import Matrix3 from "../../Core/Matrix3.js"; import Matrix4 from "../../Core/Matrix4.js"; +import oneTimeWarning from "../../Core/oneTimeWarning.js"; import Resource from "../../Core/Resource.js"; -import RuntimeError from "../../Core/RuntimeError.js"; import Pass from "../../Renderer/Pass.js"; import ClippingPlaneCollection from "../ClippingPlaneCollection.js"; import ClippingPolygonCollection from "../ClippingPolygonCollection.js"; -import DynamicEnvironmentMapManager from "../DynamicEnvironmentMapManager.js"; import ColorBlendMode from "../ColorBlendMode.js"; +import DynamicEnvironmentMapManager from "../DynamicEnvironmentMapManager.js"; import GltfLoader from "../GltfLoader.js"; import HeightReference, { isHeightReferenceRelative, @@ -39,10 +37,9 @@ import ModelSceneGraph from "./ModelSceneGraph.js"; import ModelStatistics from "./ModelStatistics.js"; import ModelType from "./ModelType.js"; import ModelUtility from "./ModelUtility.js"; -import oneTimeWarning from "../../Core/oneTimeWarning.js"; +import pickModel from "./pickModel.js"; import PntsLoader from "./PntsLoader.js"; import StyleCommandsNeeded from "./StyleCommandsNeeded.js"; -import pickModel from "./pickModel.js"; /** *
diff --git a/packages/engine/Source/Scene/Model/Model3DTileContent.js b/packages/engine/Source/Scene/Model/Model3DTileContent.js index 143acbe8cb48..9672172d5828 100644 --- a/packages/engine/Source/Scene/Model/Model3DTileContent.js +++ b/packages/engine/Source/Scene/Model/Model3DTileContent.js @@ -1,8 +1,7 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Color from "../../Core/Color.js"; import combine from "../../Core/combine.js"; -import defined from "../../Core/defined.js"; import destroyObject from "../../Core/destroyObject.js"; -import DeveloperError from "../../Core/DeveloperError.js"; import Ellipsoid from "../../Core/Ellipsoid.js"; import Pass from "../../Renderer/Pass.js"; import ModelAnimationLoop from "../ModelAnimationLoop.js"; diff --git a/packages/engine/Source/Scene/Model/ModelAnimation.js b/packages/engine/Source/Scene/Model/ModelAnimation.js index 82ad2c7ad5a0..df01764fe1bf 100644 --- a/packages/engine/Source/Scene/Model/ModelAnimation.js +++ b/packages/engine/Source/Scene/Model/ModelAnimation.js @@ -1,4 +1,4 @@ -import defined from "../../Core/defined.js"; +import { defined } from "@cesium/utils"; import Event from "../../Core/Event.js"; import JulianDate from "../../Core/JulianDate.js"; import ModelAnimationLoop from "../ModelAnimationLoop.js"; diff --git a/packages/engine/Source/Scene/Model/ModelAnimationChannel.js b/packages/engine/Source/Scene/Model/ModelAnimationChannel.js index 41cefb99fc83..2417733c13e7 100644 --- a/packages/engine/Source/Scene/Model/ModelAnimationChannel.js +++ b/packages/engine/Source/Scene/Model/ModelAnimationChannel.js @@ -1,15 +1,14 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "../../Core/Cartesian3.js"; -import Check from "../../Core/Check.js"; import ConstantSpline from "../../Core/ConstantSpline.js"; import Frozen from "../../Core/Frozen.js"; -import defined from "../../Core/defined.js"; import HermiteSpline from "../../Core/HermiteSpline.js"; import InterpolationType from "../../Core/InterpolationType.js"; import LinearSpline from "../../Core/LinearSpline.js"; -import ModelComponents from "../ModelComponents.js"; -import SteppedSpline from "../../Core/SteppedSpline.js"; import Quaternion from "../../Core/Quaternion.js"; import QuaternionSpline from "../../Core/QuaternionSpline.js"; +import SteppedSpline from "../../Core/SteppedSpline.js"; +import ModelComponents from "../ModelComponents.js"; const AnimatedPropertyType = ModelComponents.AnimatedPropertyType; diff --git a/packages/engine/Source/Scene/Model/ModelAnimationCollection.js b/packages/engine/Source/Scene/Model/ModelAnimationCollection.js index fd891fd7a50c..eb641776037c 100644 --- a/packages/engine/Source/Scene/Model/ModelAnimationCollection.js +++ b/packages/engine/Source/Scene/Model/ModelAnimationCollection.js @@ -1,12 +1,11 @@ -import Frozen from "../../Core/Frozen.js"; -import defined from "../../Core/defined.js"; -import DeveloperError from "../../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Event from "../../Core/Event.js"; +import Frozen from "../../Core/Frozen.js"; import JulianDate from "../../Core/JulianDate.js"; import CesiumMath from "../../Core/Math.js"; -import ModelAnimation from "./ModelAnimation.js"; import ModelAnimationLoop from ".././ModelAnimationLoop.js"; import ModelAnimationState from ".././ModelAnimationState.js"; +import ModelAnimation from "./ModelAnimation.js"; /** *
diff --git a/packages/engine/Source/Scene/Model/ModelArticulation.js b/packages/engine/Source/Scene/Model/ModelArticulation.js index cc93ccde7432..58394259fc0e 100644 --- a/packages/engine/Source/Scene/Model/ModelArticulation.js +++ b/packages/engine/Source/Scene/Model/ModelArticulation.js @@ -1,6 +1,5 @@ -import Check from "../../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import Frozen from "../../Core/Frozen.js"; -import defined from "../../Core/defined.js"; import Matrix4 from "../../Core/Matrix4.js"; import ModelArticulationStage from "./ModelArticulationStage.js"; diff --git a/packages/engine/Source/Scene/Model/ModelArticulationStage.js b/packages/engine/Source/Scene/Model/ModelArticulationStage.js index 123e6f04dbaf..464910022bac 100644 --- a/packages/engine/Source/Scene/Model/ModelArticulationStage.js +++ b/packages/engine/Source/Scene/Model/ModelArticulationStage.js @@ -1,8 +1,8 @@ +import { Check } from "@cesium/utils"; import ArticulationStageType from "../../Core/ArticulationStageType.js"; import Cartesian3 from "../../Core/Cartesian3.js"; -import CesiumMath from "../../Core/Math.js"; -import Check from "../../Core/Check.js"; import Frozen from "../../Core/Frozen.js"; +import CesiumMath from "../../Core/Math.js"; import Matrix3 from "../../Core/Matrix3.js"; import Matrix4 from "../../Core/Matrix4.js"; diff --git a/packages/engine/Source/Scene/Model/ModelClippingPlanesPipelineStage.js b/packages/engine/Source/Scene/Model/ModelClippingPlanesPipelineStage.js index f9107a4a9f70..de8fd765dfc6 100644 --- a/packages/engine/Source/Scene/Model/ModelClippingPlanesPipelineStage.js +++ b/packages/engine/Source/Scene/Model/ModelClippingPlanesPipelineStage.js @@ -1,9 +1,9 @@ import Cartesian2 from "../../Core/Cartesian2.js"; -import ClippingPlaneCollection from "../ClippingPlaneCollection.js"; -import combine from "../../Core/combine.js"; import Color from "../../Core/Color.js"; -import ModelClippingPlanesStageFS from "../../Shaders/Model/ModelClippingPlanesStageFS.js"; +import combine from "../../Core/combine.js"; import ShaderDestination from "../../Renderer/ShaderDestination.js"; +import ModelClippingPlanesStageFS from "../../Shaders/Model/ModelClippingPlanesStageFS.js"; +import ClippingPlaneCollection from "../ClippingPlaneCollection.js"; /** * The model clipping planes stage is responsible for applying clipping planes to the model. diff --git a/packages/engine/Source/Scene/Model/ModelClippingPolygonsPipelineStage.js b/packages/engine/Source/Scene/Model/ModelClippingPolygonsPipelineStage.js index 56e9d25c6c8b..b2eb661a7b7d 100644 --- a/packages/engine/Source/Scene/Model/ModelClippingPolygonsPipelineStage.js +++ b/packages/engine/Source/Scene/Model/ModelClippingPolygonsPipelineStage.js @@ -1,7 +1,7 @@ import combine from "../../Core/combine.js"; -import ModelClippingPolygonsStageVS from "../../Shaders/Model/ModelClippingPolygonsStageVS.js"; -import ModelClippingPolygonsStageFS from "../../Shaders/Model/ModelClippingPolygonsStageFS.js"; import ShaderDestination from "../../Renderer/ShaderDestination.js"; +import ModelClippingPolygonsStageFS from "../../Shaders/Model/ModelClippingPolygonsStageFS.js"; +import ModelClippingPolygonsStageVS from "../../Shaders/Model/ModelClippingPolygonsStageVS.js"; /** * The model clipping planes stage is responsible for applying clipping planes to the model. diff --git a/packages/engine/Source/Scene/Model/ModelColorPipelineStage.js b/packages/engine/Source/Scene/Model/ModelColorPipelineStage.js index 04a026f1d140..9d94c269662a 100644 --- a/packages/engine/Source/Scene/Model/ModelColorPipelineStage.js +++ b/packages/engine/Source/Scene/Model/ModelColorPipelineStage.js @@ -1,8 +1,8 @@ -import ColorBlendMode from "../ColorBlendMode.js"; import combine from "../../Core/combine.js"; -import ModelColorStageFS from "../../Shaders/Model/ModelColorStageFS.js"; import Pass from "../../Renderer/Pass.js"; import ShaderDestination from "../../Renderer/ShaderDestination.js"; +import ModelColorStageFS from "../../Shaders/Model/ModelColorStageFS.js"; +import ColorBlendMode from "../ColorBlendMode.js"; /** * The model color pipeline stage is responsible for handling the application of a static color to the model. diff --git a/packages/engine/Source/Scene/Model/ModelDrawCommand.js b/packages/engine/Source/Scene/Model/ModelDrawCommand.js index f858f6620a89..b1f61f6ecd0b 100644 --- a/packages/engine/Source/Scene/Model/ModelDrawCommand.js +++ b/packages/engine/Source/Scene/Model/ModelDrawCommand.js @@ -1,10 +1,9 @@ +import { Check, defined } from "@cesium/utils"; import BoundingSphere from "../../Core/BoundingSphere.js"; import Cartesian2 from "../../Core/Cartesian2.js"; -import CesiumMath from "../../Core/Math.js"; -import Check from "../../Core/Check.js"; import clone from "../../Core/clone.js"; import Frozen from "../../Core/Frozen.js"; -import defined from "../../Core/defined.js"; +import CesiumMath from "../../Core/Math.js"; import Matrix4 from "../../Core/Matrix4.js"; import WebGLConstants from "../../Core/WebGLConstants.js"; import DrawCommand from "../../Renderer/DrawCommand.js"; diff --git a/packages/engine/Source/Scene/Model/ModelDrawCommands.js b/packages/engine/Source/Scene/Model/ModelDrawCommands.js index 7d609ac36c82..756a31dc3dab 100644 --- a/packages/engine/Source/Scene/Model/ModelDrawCommands.js +++ b/packages/engine/Source/Scene/Model/ModelDrawCommands.js @@ -1,18 +1,17 @@ +import { defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "../../Core/BoundingSphere.js"; import clone from "../../Core/clone.js"; -import defined from "../../Core/defined.js"; import Matrix4 from "../../Core/Matrix4.js"; import DrawCommand from "../../Renderer/DrawCommand.js"; import RenderState from "../../Renderer/RenderState.js"; +import VertexArray from "../../Renderer/VertexArray.js"; +import ModelFS from "../../Shaders/Model/ModelFS.js"; +import ModelVS from "../../Shaders/Model/ModelVS.js"; import SceneMode from "../SceneMode.js"; import ShadowMode from "../ShadowMode.js"; import ClassificationModelDrawCommand from "./ClassificationModelDrawCommand.js"; import ModelDrawCommand from "./ModelDrawCommand.js"; -import VertexArray from "../../Renderer/VertexArray.js"; -import ModelVS from "../../Shaders/Model/ModelVS.js"; -import ModelFS from "../../Shaders/Model/ModelFS.js"; import ModelUtility from "./ModelUtility.js"; -import DeveloperError from "../../Core/DeveloperError.js"; /** * Internal functions to build draw commands for models. diff --git a/packages/engine/Source/Scene/Model/ModelFeature.js b/packages/engine/Source/Scene/Model/ModelFeature.js index 7dba22eebb80..c97156d549ad 100644 --- a/packages/engine/Source/Scene/Model/ModelFeature.js +++ b/packages/engine/Source/Scene/Model/ModelFeature.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Color from "../../Core/Color.js"; -import defined from "../../Core/defined.js"; /** * A feature of a {@link Model}. diff --git a/packages/engine/Source/Scene/Model/ModelFeatureTable.js b/packages/engine/Source/Scene/Model/ModelFeatureTable.js index 24dc7ec5c2ee..c950c9f19093 100644 --- a/packages/engine/Source/Scene/Model/ModelFeatureTable.js +++ b/packages/engine/Source/Scene/Model/ModelFeatureTable.js @@ -1,12 +1,11 @@ -import BatchTexture from "../BatchTexture.js"; -import Cesium3DTileFeature from "../Cesium3DTileFeature.js"; -import Check from "../../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import Color from "../../Core/Color.js"; -import defined from "../../Core/defined.js"; import destroyObject from "../../Core/destroyObject.js"; +import BatchTexture from "../BatchTexture.js"; +import Cesium3DTileFeature from "../Cesium3DTileFeature.js"; import ModelFeature from "./ModelFeature.js"; -import StyleCommandsNeeded from "./StyleCommandsNeeded.js"; import ModelType from "./ModelType.js"; +import StyleCommandsNeeded from "./StyleCommandsNeeded.js"; /** * Manages the {@link ModelFeature}s in a {@link Model}. diff --git a/packages/engine/Source/Scene/Model/ModelMatrixUpdateStage.js b/packages/engine/Source/Scene/Model/ModelMatrixUpdateStage.js index dbc23e758d6b..e1a6e3ef9555 100644 --- a/packages/engine/Source/Scene/Model/ModelMatrixUpdateStage.js +++ b/packages/engine/Source/Scene/Model/ModelMatrixUpdateStage.js @@ -1,6 +1,6 @@ import Matrix4 from "../../Core/Matrix4.js"; -import ModelUtility from "./ModelUtility.js"; import SceneMode from "../SceneMode.js"; +import ModelUtility from "./ModelUtility.js"; /** * The model matrix update stage is responsible for updating the model matrices and bounding volumes of the draw commands. diff --git a/packages/engine/Source/Scene/Model/ModelNode.js b/packages/engine/Source/Scene/Model/ModelNode.js index f7035f359e32..536bc5649f34 100644 --- a/packages/engine/Source/Scene/Model/ModelNode.js +++ b/packages/engine/Source/Scene/Model/ModelNode.js @@ -1,5 +1,4 @@ -import Check from "../../Core/Check.js"; -import defined from "../../Core/defined.js"; +import { Check, defined } from "@cesium/utils"; /** *
diff --git a/packages/engine/Source/Scene/Model/ModelRenderResources.js b/packages/engine/Source/Scene/Model/ModelRenderResources.js index 5cab3dc11504..3e6f2e0eda7e 100644 --- a/packages/engine/Source/Scene/Model/ModelRenderResources.js +++ b/packages/engine/Source/Scene/Model/ModelRenderResources.js @@ -1,8 +1,8 @@ -import Check from "../../Core/Check.js"; -import ModelAlphaOptions from "./ModelAlphaOptions.js"; +import { Check } from "@cesium/utils"; import RenderState from "../../Renderer/RenderState.js"; import ShaderBuilder from "../../Renderer/ShaderBuilder.js"; import DepthFunction from "../DepthFunction.js"; +import ModelAlphaOptions from "./ModelAlphaOptions.js"; /** * Model render resources are for setting details that are consistent across diff --git a/packages/engine/Source/Scene/Model/ModelRuntimeNode.js b/packages/engine/Source/Scene/Model/ModelRuntimeNode.js index a821880fa174..3f1fd2866206 100644 --- a/packages/engine/Source/Scene/Model/ModelRuntimeNode.js +++ b/packages/engine/Source/Scene/Model/ModelRuntimeNode.js @@ -1,11 +1,9 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "../../Core/Cartesian3.js"; -import Check from "../../Core/Check.js"; import Frozen from "../../Core/Frozen.js"; -import defined from "../../Core/defined.js"; -import DeveloperError from "../../Core/DeveloperError.js"; import Matrix4 from "../../Core/Matrix4.js"; -import TranslationRotationScale from "../../Core/TranslationRotationScale.js"; import Quaternion from "../../Core/Quaternion.js"; +import TranslationRotationScale from "../../Core/TranslationRotationScale.js"; import InstancingPipelineStage from "./InstancingPipelineStage.js"; import ModelMatrixUpdateStage from "./ModelMatrixUpdateStage.js"; import NodeStatisticsPipelineStage from "./NodeStatisticsPipelineStage.js"; diff --git a/packages/engine/Source/Scene/Model/ModelRuntimePrimitive.js b/packages/engine/Source/Scene/Model/ModelRuntimePrimitive.js index b55755f7913a..852e0b2287cc 100644 --- a/packages/engine/Source/Scene/Model/ModelRuntimePrimitive.js +++ b/packages/engine/Source/Scene/Model/ModelRuntimePrimitive.js @@ -1,6 +1,5 @@ -import Check from "../../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import Frozen from "../../Core/Frozen.js"; -import defined from "../../Core/defined.js"; import PrimitiveType from "../../Core/PrimitiveType.js"; import SceneMode from "../SceneMode.js"; import AlphaPipelineStage from "./AlphaPipelineStage.js"; diff --git a/packages/engine/Source/Scene/Model/ModelSceneGraph.js b/packages/engine/Source/Scene/Model/ModelSceneGraph.js index b93855d17241..6906249c2b22 100644 --- a/packages/engine/Source/Scene/Model/ModelSceneGraph.js +++ b/packages/engine/Source/Scene/Model/ModelSceneGraph.js @@ -1,31 +1,30 @@ +import { Check, defined } from "@cesium/utils"; import BoundingSphere from "../../Core/BoundingSphere.js"; import Cartesian3 from "../../Core/Cartesian3.js"; -import Check from "../../Core/Check.js"; import Frozen from "../../Core/Frozen.js"; -import defined from "../../Core/defined.js"; import Matrix4 from "../../Core/Matrix4.js"; import Transforms from "../../Core/Transforms.js"; import SceneMode from "../SceneMode.js"; import SplitDirection from "../SplitDirection.js"; -import TilesetPipelineStage from "./TilesetPipelineStage.js"; import AtmospherePipelineStage from "./AtmospherePipelineStage.js"; import ImageBasedLightingPipelineStage from "./ImageBasedLightingPipelineStage.js"; import ModelArticulation from "./ModelArticulation.js"; -import ModelColorPipelineStage from "./ModelColorPipelineStage.js"; import ModelClippingPlanesPipelineStage from "./ModelClippingPlanesPipelineStage.js"; import ModelClippingPolygonsPipelineStage from "./ModelClippingPolygonsPipelineStage.js"; +import ModelColorPipelineStage from "./ModelColorPipelineStage.js"; +import ModelDrawCommands from "./ModelDrawCommands.js"; import ModelNode from "./ModelNode.js"; +import ModelRenderResources from "./ModelRenderResources.js"; import ModelRuntimeNode from "./ModelRuntimeNode.js"; import ModelRuntimePrimitive from "./ModelRuntimePrimitive.js"; -import ModelSkin from "./ModelSkin.js"; -import ModelUtility from "./ModelUtility.js"; -import ModelRenderResources from "./ModelRenderResources.js"; import ModelSilhouettePipelineStage from "./ModelSilhouettePipelineStage.js"; +import ModelSkin from "./ModelSkin.js"; import ModelSplitterPipelineStage from "./ModelSplitterPipelineStage.js"; import ModelType from "./ModelType.js"; +import ModelUtility from "./ModelUtility.js"; import NodeRenderResources from "./NodeRenderResources.js"; import PrimitiveRenderResources from "./PrimitiveRenderResources.js"; -import ModelDrawCommands from "./ModelDrawCommands.js"; +import TilesetPipelineStage from "./TilesetPipelineStage.js"; /** * An in memory representation of the scene graph for a {@link Model} diff --git a/packages/engine/Source/Scene/Model/ModelSilhouettePipelineStage.js b/packages/engine/Source/Scene/Model/ModelSilhouettePipelineStage.js index 2a7a0116d9c6..3c19ef1b5dd2 100644 --- a/packages/engine/Source/Scene/Model/ModelSilhouettePipelineStage.js +++ b/packages/engine/Source/Scene/Model/ModelSilhouettePipelineStage.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import combine from "../../Core/combine.js"; -import defined from "../../Core/defined.js"; import ShaderDestination from "../../Renderer/ShaderDestination.js"; import ModelSilhouetteStageFS from "../../Shaders/Model/ModelSilhouetteStageFS.js"; import ModelSilhouetteStageVS from "../../Shaders/Model/ModelSilhouetteStageVS.js"; diff --git a/packages/engine/Source/Scene/Model/ModelSkin.js b/packages/engine/Source/Scene/Model/ModelSkin.js index a3d753041085..58b8bd663303 100644 --- a/packages/engine/Source/Scene/Model/ModelSkin.js +++ b/packages/engine/Source/Scene/Model/ModelSkin.js @@ -1,6 +1,6 @@ -import Matrix4 from "../../Core/Matrix4.js"; -import Check from "../../Core/Check.js"; +import { Check } from "@cesium/utils"; import Frozen from "../../Core/Frozen.js"; +import Matrix4 from "../../Core/Matrix4.js"; /** * An in-memory representation of a skin that affects nodes in the {@link ModelSceneGraph}. diff --git a/packages/engine/Source/Scene/Model/ModelSplitterPipelineStage.js b/packages/engine/Source/Scene/Model/ModelSplitterPipelineStage.js index 5d8130537807..f1705f1527ff 100644 --- a/packages/engine/Source/Scene/Model/ModelSplitterPipelineStage.js +++ b/packages/engine/Source/Scene/Model/ModelSplitterPipelineStage.js @@ -1,6 +1,6 @@ import combine from "../../Core/combine.js"; -import ModelSplitterStageFS from "../../Shaders/Model/ModelSplitterStageFS.js"; import ShaderDestination from "../../Renderer/ShaderDestination.js"; +import ModelSplitterStageFS from "../../Shaders/Model/ModelSplitterStageFS.js"; /** * The model splitting pipeline stage is responsible for discarding fragments on the wrong side of the splitter. diff --git a/packages/engine/Source/Scene/Model/ModelStatistics.js b/packages/engine/Source/Scene/Model/ModelStatistics.js index b8a60af26df0..51918d986a30 100644 --- a/packages/engine/Source/Scene/Model/ModelStatistics.js +++ b/packages/engine/Source/Scene/Model/ModelStatistics.js @@ -1,5 +1,5 @@ +import { Check } from "@cesium/utils"; import AssociativeArray from "../../Core/AssociativeArray.js"; -import Check from "../../Core/Check.js"; /** * Rendering statistics for a single model. diff --git a/packages/engine/Source/Scene/Model/ModelType.js b/packages/engine/Source/Scene/Model/ModelType.js index 56e39db6b383..d05d13d8419e 100644 --- a/packages/engine/Source/Scene/Model/ModelType.js +++ b/packages/engine/Source/Scene/Model/ModelType.js @@ -1,5 +1,4 @@ -import Check from "../../Core/Check.js"; -import DeveloperError from "../../Core/DeveloperError.js"; +import { Check, DeveloperError } from "@cesium/utils"; /** * An enum to distinguish the different uses for {@link Model}, diff --git a/packages/engine/Source/Scene/Model/ModelUtility.js b/packages/engine/Source/Scene/Model/ModelUtility.js index f21a96071eb9..bc78b5c9531f 100644 --- a/packages/engine/Source/Scene/Model/ModelUtility.js +++ b/packages/engine/Source/Scene/Model/ModelUtility.js @@ -1,14 +1,13 @@ +import { defined, RuntimeError } from "@cesium/utils"; import Cartesian3 from "../../Core/Cartesian3.js"; -import defined from "../../Core/defined.js"; +import Matrix3 from "../../Core/Matrix3.js"; import Matrix4 from "../../Core/Matrix4.js"; +import PrimitiveType from "../../Core/PrimitiveType.js"; import Quaternion from "../../Core/Quaternion.js"; -import RuntimeError from "../../Core/RuntimeError.js"; -import Axis from "../Axis.js"; import AttributeType from "../AttributeType.js"; -import VertexAttributeSemantic from "../VertexAttributeSemantic.js"; +import Axis from "../Axis.js"; import CullFace from "../CullFace.js"; -import PrimitiveType from "../../Core/PrimitiveType.js"; -import Matrix3 from "../../Core/Matrix3.js"; +import VertexAttributeSemantic from "../VertexAttributeSemantic.js"; /** * Utility functions for {@link Model}. diff --git a/packages/engine/Source/Scene/Model/MorphTargetsPipelineStage.js b/packages/engine/Source/Scene/Model/MorphTargetsPipelineStage.js index 2e34fa1776d1..e3e6097c70c1 100644 --- a/packages/engine/Source/Scene/Model/MorphTargetsPipelineStage.js +++ b/packages/engine/Source/Scene/Model/MorphTargetsPipelineStage.js @@ -1,8 +1,8 @@ -import AttributeType from "../AttributeType.js"; +import { defined } from "@cesium/utils"; import combine from "../../Core/combine.js"; -import defined from "../../Core/defined.js"; import ShaderDestination from "../../Renderer/ShaderDestination.js"; import MorphTargetsStageVS from "../../Shaders/Model/MorphTargetsStageVS.js"; +import AttributeType from "../AttributeType.js"; import VertexAttributeSemantic from "../VertexAttributeSemantic.js"; /** diff --git a/packages/engine/Source/Scene/Model/NodeRenderResources.js b/packages/engine/Source/Scene/Model/NodeRenderResources.js index 8c3d485850b7..924fa1973227 100644 --- a/packages/engine/Source/Scene/Model/NodeRenderResources.js +++ b/packages/engine/Source/Scene/Model/NodeRenderResources.js @@ -1,4 +1,4 @@ -import Check from "../../Core/Check.js"; +import { Check } from "@cesium/utils"; import clone from "../../Core/clone.js"; /** diff --git a/packages/engine/Source/Scene/Model/NodeStatisticsPipelineStage.js b/packages/engine/Source/Scene/Model/NodeStatisticsPipelineStage.js index acb633bfe64a..21a9d47ca8c8 100644 --- a/packages/engine/Source/Scene/Model/NodeStatisticsPipelineStage.js +++ b/packages/engine/Source/Scene/Model/NodeStatisticsPipelineStage.js @@ -1,4 +1,4 @@ -import defined from "../../Core/defined.js"; +import { defined } from "@cesium/utils"; /** * The node statistics update stage updates memory usage statistics for a Model diff --git a/packages/engine/Source/Scene/Model/PickingPipelineStage.js b/packages/engine/Source/Scene/Model/PickingPipelineStage.js index 44d16d4e8428..d73e31429bff 100644 --- a/packages/engine/Source/Scene/Model/PickingPipelineStage.js +++ b/packages/engine/Source/Scene/Model/PickingPipelineStage.js @@ -1,8 +1,8 @@ -import Buffer from "../../Renderer/Buffer.js"; -import BufferUsage from "../../Renderer/BufferUsage.js"; +import { defined } from "@cesium/utils"; import Color from "../../Core/Color.js"; import ComponentDatatype from "../../Core/ComponentDatatype.js"; -import defined from "../../Core/defined.js"; +import Buffer from "../../Renderer/Buffer.js"; +import BufferUsage from "../../Renderer/BufferUsage.js"; import ShaderDestination from "../../Renderer/ShaderDestination.js"; import ModelType from "./ModelType.js"; import ModelUtility from "./ModelUtility.js"; diff --git a/packages/engine/Source/Scene/Model/PntsLoader.js b/packages/engine/Source/Scene/Model/PntsLoader.js index 000a7fbf6359..fb16e57fbdc7 100644 --- a/packages/engine/Source/Scene/Model/PntsLoader.js +++ b/packages/engine/Source/Scene/Model/PntsLoader.js @@ -1,27 +1,25 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; +import MersenneTwister from "mersenne-twister"; import AttributeCompression from "../../Core/AttributeCompression.js"; import Cartesian3 from "../../Core/Cartesian3.js"; import Color from "../../Core/Color.js"; -import Check from "../../Core/Check.js"; import ComponentDatatype from "../../Core/ComponentDatatype.js"; import Frozen from "../../Core/Frozen.js"; -import defined from "../../Core/defined.js"; -import DeveloperError from "../../Core/DeveloperError.js"; import Matrix4 from "../../Core/Matrix4.js"; import PrimitiveType from "../../Core/PrimitiveType.js"; import WebGLConstants from "../../Core/WebGLConstants.js"; -import MersenneTwister from "mersenne-twister"; import Buffer from "../../Renderer/Buffer.js"; import BufferUsage from "../../Renderer/BufferUsage.js"; import AlphaMode from "../AlphaMode.js"; import AttributeType from "../AttributeType.js"; import Axis from "../Axis.js"; -import parseBatchTable from "../parseBatchTable.js"; import DracoLoader from "../DracoLoader.js"; -import StructuralMetadata from "../StructuralMetadata.js"; -import ResourceLoader from "../ResourceLoader.js"; import ModelComponents from "../ModelComponents.js"; +import parseBatchTable from "../parseBatchTable.js"; import PntsParser from "../PntsParser.js"; +import ResourceLoader from "../ResourceLoader.js"; import ResourceLoaderState from "../ResourceLoaderState.js"; +import StructuralMetadata from "../StructuralMetadata.js"; import VertexAttributeSemantic from "../VertexAttributeSemantic.js"; const Components = ModelComponents.Components; diff --git a/packages/engine/Source/Scene/Model/PointCloudStylingPipelineStage.js b/packages/engine/Source/Scene/Model/PointCloudStylingPipelineStage.js index b904a92dd575..6c7846626b60 100644 --- a/packages/engine/Source/Scene/Model/PointCloudStylingPipelineStage.js +++ b/packages/engine/Source/Scene/Model/PointCloudStylingPipelineStage.js @@ -1,19 +1,18 @@ +import { defined, RuntimeError } from "@cesium/utils"; import Cartesian3 from "../../Core/Cartesian3.js"; import Cartesian4 from "../../Core/Cartesian4.js"; -import CesiumMath from "../../Core/Math.js"; -import Cesium3DTileRefine from "../Cesium3DTileRefine.js"; import clone from "../../Core/clone.js"; -import defined from "../../Core/defined.js"; +import CesiumMath from "../../Core/Math.js"; import Matrix4 from "../../Core/Matrix4.js"; -import ModelType from "./ModelType.js"; -import ModelUtility from "./ModelUtility.js"; import OrthographicFrustum from "../../Core/OrthographicFrustum.js"; import Pass from "../../Renderer/Pass.js"; +import ShaderDestination from "../../Renderer/ShaderDestination.js"; import PointCloudStylingStageVS from "../../Shaders/Model/PointCloudStylingStageVS.js"; -import RuntimeError from "../../Core/RuntimeError.js"; +import Cesium3DTileRefine from "../Cesium3DTileRefine.js"; import SceneMode from "../SceneMode.js"; -import ShaderDestination from "../../Renderer/ShaderDestination.js"; import VertexAttributeSemantic from "../VertexAttributeSemantic.js"; +import ModelType from "./ModelType.js"; +import ModelUtility from "./ModelUtility.js"; const scratchUniform = new Cartesian4(); diff --git a/packages/engine/Source/Scene/Model/PrimitiveOutlineGenerator.js b/packages/engine/Source/Scene/Model/PrimitiveOutlineGenerator.js index 0e32ff1c9b00..83746284ee99 100644 --- a/packages/engine/Source/Scene/Model/PrimitiveOutlineGenerator.js +++ b/packages/engine/Source/Scene/Model/PrimitiveOutlineGenerator.js @@ -1,5 +1,4 @@ -import Check from "../../Core/Check.js"; -import defined from "../../Core/defined.js"; +import { Check, defined } from "@cesium/utils"; import Frozen from "../../Core/Frozen.js"; import PixelFormat from "../../Core/PixelFormat.js"; import ContextLimits from "../../Renderer/ContextLimits.js"; diff --git a/packages/engine/Source/Scene/Model/PrimitiveOutlinePipelineStage.js b/packages/engine/Source/Scene/Model/PrimitiveOutlinePipelineStage.js index f51803984b32..20b8ee7afd92 100644 --- a/packages/engine/Source/Scene/Model/PrimitiveOutlinePipelineStage.js +++ b/packages/engine/Source/Scene/Model/PrimitiveOutlinePipelineStage.js @@ -1,8 +1,8 @@ -import AttributeType from "../AttributeType.js"; import ShaderDestination from "../../Renderer/ShaderDestination.js"; -import PrimitiveOutlineGenerator from "./PrimitiveOutlineGenerator.js"; -import PrimitiveOutlineStageVS from "../../Shaders/Model/PrimitiveOutlineStageVS.js"; import PrimitiveOutlineStageFS from "../../Shaders/Model/PrimitiveOutlineStageFS.js"; +import PrimitiveOutlineStageVS from "../../Shaders/Model/PrimitiveOutlineStageVS.js"; +import AttributeType from "../AttributeType.js"; +import PrimitiveOutlineGenerator from "./PrimitiveOutlineGenerator.js"; /** * The primitive outline pipeline stage configures the shader to render outlines diff --git a/packages/engine/Source/Scene/Model/PrimitiveRenderResources.js b/packages/engine/Source/Scene/Model/PrimitiveRenderResources.js index b354b9b51958..5a1bc79ff3a3 100644 --- a/packages/engine/Source/Scene/Model/PrimitiveRenderResources.js +++ b/packages/engine/Source/Scene/Model/PrimitiveRenderResources.js @@ -1,10 +1,9 @@ +import { Check, defined } from "@cesium/utils"; import BoundingSphere from "../../Core/BoundingSphere.js"; import Cartesian3 from "../../Core/Cartesian3.js"; -import Check from "../../Core/Check.js"; import clone from "../../Core/clone.js"; -import defined from "../../Core/defined.js"; -import ModelUtility from "./ModelUtility.js"; import ModelLightingOptions from "./ModelLightingOptions.js"; +import ModelUtility from "./ModelUtility.js"; /** * Each node may have many mesh primitives. Most model pipeline stages operate diff --git a/packages/engine/Source/Scene/Model/PrimitiveStatisticsPipelineStage.js b/packages/engine/Source/Scene/Model/PrimitiveStatisticsPipelineStage.js index d01e85df5efd..03752ecd4e79 100644 --- a/packages/engine/Source/Scene/Model/PrimitiveStatisticsPipelineStage.js +++ b/packages/engine/Source/Scene/Model/PrimitiveStatisticsPipelineStage.js @@ -1,4 +1,4 @@ -import defined from "../../Core/defined.js"; +import { defined } from "@cesium/utils"; import PrimitiveType from "../../Core/PrimitiveType.js"; import ModelComponents from "../ModelComponents.js"; import ModelUtility from "./ModelUtility.js"; diff --git a/packages/engine/Source/Scene/Model/SceneMode2DPipelineStage.js b/packages/engine/Source/Scene/Model/SceneMode2DPipelineStage.js index d870ca0518d4..0b84a6b729ff 100644 --- a/packages/engine/Source/Scene/Model/SceneMode2DPipelineStage.js +++ b/packages/engine/Source/Scene/Model/SceneMode2DPipelineStage.js @@ -1,16 +1,16 @@ +import { defined } from "@cesium/utils"; import BoundingSphere from "../../Core/BoundingSphere.js"; -import Buffer from "../../Renderer/Buffer.js"; -import BufferUsage from "../../Renderer/BufferUsage.js"; import Cartesian3 from "../../Core/Cartesian3.js"; import clone from "../../Core/clone.js"; import combine from "../../Core/combine.js"; -import defined from "../../Core/defined.js"; import Matrix4 from "../../Core/Matrix4.js"; -import ModelUtility from "./ModelUtility.js"; -import SceneMode from "../SceneMode.js"; +import Buffer from "../../Renderer/Buffer.js"; +import BufferUsage from "../../Renderer/BufferUsage.js"; import ShaderDestination from "../../Renderer/ShaderDestination.js"; -import VertexAttributeSemantic from "../VertexAttributeSemantic.js"; +import SceneMode from "../SceneMode.js"; import SceneTransforms from "../SceneTransforms.js"; +import VertexAttributeSemantic from "../VertexAttributeSemantic.js"; +import ModelUtility from "./ModelUtility.js"; const scratchModelMatrix = new Matrix4(); const scratchModelView2D = new Matrix4(); diff --git a/packages/engine/Source/Scene/Model/SelectedFeatureIdPipelineStage.js b/packages/engine/Source/Scene/Model/SelectedFeatureIdPipelineStage.js index 1ef33614782d..23bbd288bab3 100644 --- a/packages/engine/Source/Scene/Model/SelectedFeatureIdPipelineStage.js +++ b/packages/engine/Source/Scene/Model/SelectedFeatureIdPipelineStage.js @@ -1,4 +1,4 @@ -import defined from "../../Core/defined.js"; +import { defined } from "@cesium/utils"; import ShaderDestination from "../../Renderer/ShaderDestination.js"; import SelectedFeatureIdStageCommon from "../../Shaders/Model/SelectedFeatureIdStageCommon.js"; import ModelComponents from "../ModelComponents.js"; diff --git a/packages/engine/Source/Scene/Model/TextureManager.js b/packages/engine/Source/Scene/Model/TextureManager.js index 683ebaee443d..cc914e26d748 100644 --- a/packages/engine/Source/Scene/Model/TextureManager.js +++ b/packages/engine/Source/Scene/Model/TextureManager.js @@ -1,4 +1,4 @@ -import defined from "../../Core/defined.js"; +import { defined } from "@cesium/utils"; import destroyObject from "../../Core/destroyObject.js"; import getImageFromTypedArray from "../../Core/getImageFromTypedArray.js"; import CesiumMath from "../../Core/Math.js"; diff --git a/packages/engine/Source/Scene/Model/TextureUniform.js b/packages/engine/Source/Scene/Model/TextureUniform.js index 9f082e91a576..6389195bf1fd 100644 --- a/packages/engine/Source/Scene/Model/TextureUniform.js +++ b/packages/engine/Source/Scene/Model/TextureUniform.js @@ -1,8 +1,7 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Frozen from "../../Core/Frozen.js"; -import defined from "../../Core/defined.js"; -import DeveloperError from "../../Core/DeveloperError.js"; -import Resource from "../../Core/Resource.js"; import PixelFormat from "../../Core/PixelFormat.js"; +import Resource from "../../Core/Resource.js"; import PixelDatatype from "../../Renderer/PixelDatatype.js"; import Sampler from "../../Renderer/Sampler.js"; import TextureWrap from "../../Renderer/TextureWrap.js"; diff --git a/packages/engine/Source/Scene/Model/TilesetPipelineStage.js b/packages/engine/Source/Scene/Model/TilesetPipelineStage.js index 33dd3718b2de..297259d42ffc 100644 --- a/packages/engine/Source/Scene/Model/TilesetPipelineStage.js +++ b/packages/engine/Source/Scene/Model/TilesetPipelineStage.js @@ -1,6 +1,6 @@ +import Cartesian2 from "../../Core/Cartesian2.js"; import combine from "../../Core/combine.js"; import ShaderDestination from "../../Renderer/ShaderDestination.js"; -import Cartesian2 from "../../Core/Cartesian2.js"; import StencilConstants from "../StencilConstants.js"; /** diff --git a/packages/engine/Source/Scene/Model/WireframePipelineStage.js b/packages/engine/Source/Scene/Model/WireframePipelineStage.js index 0461597b12fe..5688471411e3 100644 --- a/packages/engine/Source/Scene/Model/WireframePipelineStage.js +++ b/packages/engine/Source/Scene/Model/WireframePipelineStage.js @@ -1,12 +1,12 @@ -import Buffer from "../../Renderer/Buffer.js"; -import BufferUsage from "../../Renderer/BufferUsage.js"; -import defined from "../../Core/defined.js"; +import { defined } from "@cesium/utils"; import IndexDatatype from "../../Core/IndexDatatype.js"; -import ModelUtility from "./ModelUtility.js"; import PrimitiveType from "../../Core/PrimitiveType.js"; +import WireframeIndexGenerator from "../../Core/WireframeIndexGenerator.js"; +import Buffer from "../../Renderer/Buffer.js"; +import BufferUsage from "../../Renderer/BufferUsage.js"; import ShaderDestination from "../../Renderer/ShaderDestination.js"; import VertexAttributeSemantic from "../VertexAttributeSemantic.js"; -import WireframeIndexGenerator from "../../Core/WireframeIndexGenerator.js"; +import ModelUtility from "./ModelUtility.js"; /** * The wireframe pipeline stage generates a new index buffer for rendering the diff --git a/packages/engine/Source/Scene/Model/pickModel.js b/packages/engine/Source/Scene/Model/pickModel.js index 39c19d49c18c..6472ff68d5bb 100644 --- a/packages/engine/Source/Scene/Model/pickModel.js +++ b/packages/engine/Source/Scene/Model/pickModel.js @@ -1,15 +1,14 @@ +import { Check, defined } from "@cesium/utils"; import AttributeCompression from "../../Core/AttributeCompression.js"; import BoundingSphere from "../../Core/BoundingSphere.js"; import Cartesian3 from "../../Core/Cartesian3.js"; import Cartographic from "../../Core/Cartographic.js"; -import Check from "../../Core/Check.js"; import ComponentDatatype from "../../Core/ComponentDatatype.js"; -import defined from "../../Core/defined.js"; import Ellipsoid from "../../Core/Ellipsoid.js"; import IndexDatatype from "../../Core/IndexDatatype.js"; import IntersectionTests from "../../Core/IntersectionTests.js"; -import Ray from "../../Core/Ray.js"; import Matrix4 from "../../Core/Matrix4.js"; +import Ray from "../../Core/Ray.js"; import Transforms from "../../Core/Transforms.js"; import VerticalExaggeration from "../../Core/VerticalExaggeration.js"; import AttributeType from "../AttributeType.js"; diff --git a/packages/engine/Source/Scene/ModelComponents.js b/packages/engine/Source/Scene/ModelComponents.js index fc72bf5baac6..e1b788dede2b 100644 --- a/packages/engine/Source/Scene/ModelComponents.js +++ b/packages/engine/Source/Scene/ModelComponents.js @@ -1,8 +1,8 @@ -import AlphaMode from "./AlphaMode.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; import Matrix3 from "../Core/Matrix3.js"; import Matrix4 from "../Core/Matrix4.js"; +import AlphaMode from "./AlphaMode.js"; /** * Components for building models. diff --git a/packages/engine/Source/Scene/Moon.js b/packages/engine/Source/Scene/Moon.js index f00f600f0e85..ab574d05bdf9 100644 --- a/packages/engine/Source/Scene/Moon.js +++ b/packages/engine/Source/Scene/Moon.js @@ -1,9 +1,9 @@ +import { defined } from "@cesium/utils"; import buildModuleUrl from "../Core/buildModuleUrl.js"; import Cartesian3 from "../Core/Cartesian3.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import Ellipsoid from "../Core/Ellipsoid.js"; +import Frozen from "../Core/Frozen.js"; import IauOrientationAxes from "../Core/IauOrientationAxes.js"; import Matrix3 from "../Core/Matrix3.js"; import Matrix4 from "../Core/Matrix4.js"; diff --git a/packages/engine/Source/Scene/Multiple3DTileContent.js b/packages/engine/Source/Scene/Multiple3DTileContent.js index 16652eb08cde..a7902fb3e7ea 100644 --- a/packages/engine/Source/Scene/Multiple3DTileContent.js +++ b/packages/engine/Source/Scene/Multiple3DTileContent.js @@ -1,14 +1,13 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Request from "../Core/Request.js"; import RequestScheduler from "../Core/RequestScheduler.js"; import RequestState from "../Core/RequestState.js"; import RequestType from "../Core/RequestType.js"; import Cesium3DContentGroup from "./Cesium3DContentGroup.js"; -import Cesium3DTileContentType from "./Cesium3DTileContentType.js"; import Cesium3DTileContentFactory from "./Cesium3DTileContentFactory.js"; +import Cesium3DTileContentType from "./Cesium3DTileContentType.js"; import findContentMetadata from "./findContentMetadata.js"; import findGroupMetadata from "./findGroupMetadata.js"; import preprocess3DTileContent from "./preprocess3DTileContent.js"; diff --git a/packages/engine/Source/Scene/OIT.js b/packages/engine/Source/Scene/OIT.js index 572120d40510..cd4cf12fadc1 100644 --- a/packages/engine/Source/Scene/OIT.js +++ b/packages/engine/Source/Scene/OIT.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import PixelFormat from "../Core/PixelFormat.js"; import WebGLConstants from "../Core/WebGLConstants.js"; diff --git a/packages/engine/Source/Scene/OpenStreetMapImageryProvider.js b/packages/engine/Source/Scene/OpenStreetMapImageryProvider.js index 19f99fc8e987..f715ae80d488 100644 --- a/packages/engine/Source/Scene/OpenStreetMapImageryProvider.js +++ b/packages/engine/Source/Scene/OpenStreetMapImageryProvider.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Credit from "../Core/Credit.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Rectangle from "../Core/Rectangle.js"; import Resource from "../Core/Resource.js"; import WebMercatorTilingScheme from "../Core/WebMercatorTilingScheme.js"; diff --git a/packages/engine/Source/Scene/OrderedGroundPrimitiveCollection.js b/packages/engine/Source/Scene/OrderedGroundPrimitiveCollection.js index 3853530849b7..8f1dbe7f8f3c 100644 --- a/packages/engine/Source/Scene/OrderedGroundPrimitiveCollection.js +++ b/packages/engine/Source/Scene/OrderedGroundPrimitiveCollection.js @@ -1,5 +1,4 @@ -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; +import { Check, defined } from "@cesium/utils"; import destroyObject from "../Core/destroyObject.js"; import PrimitiveCollection from "./PrimitiveCollection.js"; diff --git a/packages/engine/Source/Scene/Particle.js b/packages/engine/Source/Scene/Particle.js index 15329ee0e03c..872e3f093c23 100644 --- a/packages/engine/Source/Scene/Particle.js +++ b/packages/engine/Source/Scene/Particle.js @@ -1,8 +1,8 @@ +import { defined } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Color from "../Core/Color.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; const defaultSize = new Cartesian2(1.0, 1.0); diff --git a/packages/engine/Source/Scene/ParticleEmitter.js b/packages/engine/Source/Scene/ParticleEmitter.js index ef02d378f56e..2f491c5c60e2 100644 --- a/packages/engine/Source/Scene/ParticleEmitter.js +++ b/packages/engine/Source/Scene/ParticleEmitter.js @@ -1,4 +1,4 @@ -import DeveloperError from "../Core/DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** *

diff --git a/packages/engine/Source/Scene/ParticleSystem.js b/packages/engine/Source/Scene/ParticleSystem.js index 0515611e8d36..32f8b135f41c 100644 --- a/packages/engine/Source/Scene/ParticleSystem.js +++ b/packages/engine/Source/Scene/ParticleSystem.js @@ -1,11 +1,10 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import JulianDate from "../Core/JulianDate.js"; import CesiumMath from "../Core/Math.js"; import Matrix4 from "../Core/Matrix4.js"; diff --git a/packages/engine/Source/Scene/PerformanceDisplay.js b/packages/engine/Source/Scene/PerformanceDisplay.js index b2365bcd4f27..e7951b8f4ac6 100644 --- a/packages/engine/Source/Scene/PerformanceDisplay.js +++ b/packages/engine/Source/Scene/PerformanceDisplay.js @@ -1,7 +1,6 @@ -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; +import { defined, DeveloperError } from "@cesium/utils"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Frozen from "../Core/Frozen.js"; import getTimestamp from "../Core/getTimestamp.js"; import getElement from "../DataSources/getElement.js"; diff --git a/packages/engine/Source/Scene/PickDepth.js b/packages/engine/Source/Scene/PickDepth.js index 726ccbc8a6f8..fde1147b2c24 100644 --- a/packages/engine/Source/Scene/PickDepth.js +++ b/packages/engine/Source/Scene/PickDepth.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Cartesian4 from "../Core/Cartesian4.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import FramebufferManager from "../Renderer/FramebufferManager.js"; import RenderState from "../Renderer/RenderState.js"; diff --git a/packages/engine/Source/Scene/PickFramebuffer.js b/packages/engine/Source/Scene/PickFramebuffer.js index bb9cb777d5fd..919cc1b88b04 100644 --- a/packages/engine/Source/Scene/PickFramebuffer.js +++ b/packages/engine/Source/Scene/PickFramebuffer.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import FramebufferManager from "../Renderer/FramebufferManager.js"; import PassState from "../Renderer/PassState.js"; diff --git a/packages/engine/Source/Scene/Picking.js b/packages/engine/Source/Scene/Picking.js index 9f2441ddee9f..70b2a0ad087e 100644 --- a/packages/engine/Source/Scene/Picking.js +++ b/packages/engine/Source/Scene/Picking.js @@ -1,12 +1,10 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import ApproximateTerrainHeights from "../Core/ApproximateTerrainHeights.js"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Matrix4 from "../Core/Matrix4.js"; import OrthographicFrustum from "../Core/OrthographicFrustum.js"; import OrthographicOffCenterFrustum from "../Core/OrthographicOffCenterFrustum.js"; diff --git a/packages/engine/Source/Scene/PntsParser.js b/packages/engine/Source/Scene/PntsParser.js index b1b4c7c622d4..b5aacdb649d7 100644 --- a/packages/engine/Source/Scene/PntsParser.js +++ b/packages/engine/Source/Scene/PntsParser.js @@ -1,11 +1,9 @@ +import { Check, defined, RuntimeError } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; import combine from "../Core/combine.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import defined from "../Core/defined.js"; import getJsonFromTypedArray from "../Core/getJsonFromTypedArray.js"; -import RuntimeError from "../Core/RuntimeError.js"; import AttributeType from "./AttributeType.js"; import Cesium3DTileFeatureTable from "./Cesium3DTileFeatureTable.js"; import VertexAttributeSemantic from "./VertexAttributeSemantic.js"; diff --git a/packages/engine/Source/Scene/PointCloud.js b/packages/engine/Source/Scene/PointCloud.js index 6ddc01a64da6..10b97c09c133 100644 --- a/packages/engine/Source/Scene/PointCloud.js +++ b/packages/engine/Source/Scene/PointCloud.js @@ -1,19 +1,18 @@ +import { Check, defined, RuntimeError } from "@cesium/utils"; +import MersenneTwister from "mersenne-twister"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; -import Check from "../Core/Check.js"; import clone from "../Core/clone.js"; import Color from "../Core/Color.js"; import combine from "../Core/combine.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import CesiumMath from "../Core/Math.js"; import Matrix4 from "../Core/Matrix4.js"; import oneTimeWarning from "../Core/oneTimeWarning.js"; import OrthographicFrustum from "../Core/OrthographicFrustum.js"; import PrimitiveType from "../Core/PrimitiveType.js"; -import RuntimeError from "../Core/RuntimeError.js"; import Transforms from "../Core/Transforms.js"; import Buffer from "../Renderer/Buffer.js"; import BufferUsage from "../Renderer/BufferUsage.js"; @@ -22,7 +21,6 @@ import Pass from "../Renderer/Pass.js"; import RenderState from "../Renderer/RenderState.js"; import ShaderProgram from "../Renderer/ShaderProgram.js"; import VertexArray from "../Renderer/VertexArray.js"; -import MersenneTwister from "mersenne-twister"; import BlendingState from "./BlendingState.js"; import Cesium3DTileBatchTable from "./Cesium3DTileBatchTable.js"; import DracoLoader from "./DracoLoader.js"; diff --git a/packages/engine/Source/Scene/PointCloudEyeDomeLighting.js b/packages/engine/Source/Scene/PointCloudEyeDomeLighting.js index 0b51dca79435..832fcb883a89 100644 --- a/packages/engine/Source/Scene/PointCloudEyeDomeLighting.js +++ b/packages/engine/Source/Scene/PointCloudEyeDomeLighting.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import PrimitiveType from "../Core/PrimitiveType.js"; import ClearCommand from "../Renderer/ClearCommand.js"; diff --git a/packages/engine/Source/Scene/PointPrimitive.js b/packages/engine/Source/Scene/PointPrimitive.js index 5587c05a7d6c..abfcc16952d8 100644 --- a/packages/engine/Source/Scene/PointPrimitive.js +++ b/packages/engine/Source/Scene/PointPrimitive.js @@ -1,12 +1,11 @@ +import { defined, DeveloperError } from "@cesium/utils"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; import Color from "../Core/Color.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import DistanceDisplayCondition from "../Core/DistanceDisplayCondition.js"; +import Frozen from "../Core/Frozen.js"; import Matrix4 from "../Core/Matrix4.js"; import NearFarScalar from "../Core/NearFarScalar.js"; import SceneMode from "./SceneMode.js"; diff --git a/packages/engine/Source/Scene/PointPrimitiveCollection.js b/packages/engine/Source/Scene/PointPrimitiveCollection.js index 402e72135cec..b091ebf6c576 100644 --- a/packages/engine/Source/Scene/PointPrimitiveCollection.js +++ b/packages/engine/Source/Scene/PointPrimitiveCollection.js @@ -1,11 +1,10 @@ +import { defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import Color from "../Core/Color.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import EncodedCartesian3 from "../Core/EncodedCartesian3.js"; +import Frozen from "../Core/Frozen.js"; import CesiumMath from "../Core/Math.js"; import Matrix4 from "../Core/Matrix4.js"; import PrimitiveType from "../Core/PrimitiveType.js"; diff --git a/packages/engine/Source/Scene/Polyline.js b/packages/engine/Source/Scene/Polyline.js index f4a7a420b12c..90af27fce805 100644 --- a/packages/engine/Source/Scene/Polyline.js +++ b/packages/engine/Source/Scene/Polyline.js @@ -1,11 +1,10 @@ +import { defined, DeveloperError } from "@cesium/utils"; import arrayRemoveDuplicates from "../Core/arrayRemoveDuplicates.js"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Color from "../Core/Color.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import DistanceDisplayCondition from "../Core/DistanceDisplayCondition.js"; +import Frozen from "../Core/Frozen.js"; import Matrix4 from "../Core/Matrix4.js"; import PolylinePipeline from "../Core/PolylinePipeline.js"; import Material from "./Material.js"; diff --git a/packages/engine/Source/Scene/PolylineCollection.js b/packages/engine/Source/Scene/PolylineCollection.js index c216bbe30cef..c3b150935230 100644 --- a/packages/engine/Source/Scene/PolylineCollection.js +++ b/packages/engine/Source/Scene/PolylineCollection.js @@ -1,3 +1,9 @@ +import { + defined, + DeveloperError, + FeatureDetection, + RuntimeError, +} from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; @@ -6,18 +12,14 @@ import Cartographic from "../Core/Cartographic.js"; import Color from "../Core/Color.js"; import combine from "../Core/combine.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import EncodedCartesian3 from "../Core/EncodedCartesian3.js"; -import FeatureDetection from "../Core/FeatureDetection.js"; +import Frozen from "../Core/Frozen.js"; import IndexDatatype from "../Core/IndexDatatype.js"; import Intersect from "../Core/Intersect.js"; import CesiumMath from "../Core/Math.js"; import Matrix4 from "../Core/Matrix4.js"; import Plane from "../Core/Plane.js"; -import RuntimeError from "../Core/RuntimeError.js"; import Buffer from "../Renderer/Buffer.js"; import BufferUsage from "../Renderer/BufferUsage.js"; import ContextLimits from "../Renderer/ContextLimits.js"; diff --git a/packages/engine/Source/Scene/PolylineColorAppearance.js b/packages/engine/Source/Scene/PolylineColorAppearance.js index b5d6af27a5d1..d945bfd631c7 100644 --- a/packages/engine/Source/Scene/PolylineColorAppearance.js +++ b/packages/engine/Source/Scene/PolylineColorAppearance.js @@ -1,5 +1,5 @@ +import { FeatureDetection } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import FeatureDetection from "../Core/FeatureDetection.js"; import VertexFormat from "../Core/VertexFormat.js"; import PerInstanceFlatColorAppearanceFS from "../Shaders/Appearances/PerInstanceFlatColorAppearanceFS.js"; import PolylineColorAppearanceVS from "../Shaders/Appearances/PolylineColorAppearanceVS.js"; diff --git a/packages/engine/Source/Scene/PolylineMaterialAppearance.js b/packages/engine/Source/Scene/PolylineMaterialAppearance.js index 4f6a79b6156b..915b939cca66 100644 --- a/packages/engine/Source/Scene/PolylineMaterialAppearance.js +++ b/packages/engine/Source/Scene/PolylineMaterialAppearance.js @@ -1,6 +1,5 @@ +import { defined, FeatureDetection } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import FeatureDetection from "../Core/FeatureDetection.js"; import VertexFormat from "../Core/VertexFormat.js"; import PolylineMaterialAppearanceVS from "../Shaders/Appearances/PolylineMaterialAppearanceVS.js"; import PolylineCommon from "../Shaders/PolylineCommon.js"; diff --git a/packages/engine/Source/Scene/PostProcessStage.js b/packages/engine/Source/Scene/PostProcessStage.js index 23eb8bb46f09..12d6efbe7fa5 100644 --- a/packages/engine/Source/Scene/PostProcessStage.js +++ b/packages/engine/Source/Scene/PostProcessStage.js @@ -1,12 +1,10 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import BoundingRectangle from "../Core/BoundingRectangle.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; import combine from "../Core/combine.js"; import createGuid from "../Core/createGuid.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import Frozen from "../Core/Frozen.js"; import PixelFormat from "../Core/PixelFormat.js"; import Resource from "../Core/Resource.js"; import PassState from "../Renderer/PassState.js"; diff --git a/packages/engine/Source/Scene/PostProcessStageCollection.js b/packages/engine/Source/Scene/PostProcessStageCollection.js index 20019fa840cd..6edfa1460026 100644 --- a/packages/engine/Source/Scene/PostProcessStageCollection.js +++ b/packages/engine/Source/Scene/PostProcessStageCollection.js @@ -1,7 +1,5 @@ -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import PixelFormat from "../Core/PixelFormat.js"; import PixelDatatype from "../Renderer/PixelDatatype.js"; import Sampler from "../Renderer/Sampler.js"; diff --git a/packages/engine/Source/Scene/PostProcessStageComposite.js b/packages/engine/Source/Scene/PostProcessStageComposite.js index 3c37c2ff65f8..a31795e5ba3e 100644 --- a/packages/engine/Source/Scene/PostProcessStageComposite.js +++ b/packages/engine/Source/Scene/PostProcessStageComposite.js @@ -1,8 +1,7 @@ -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import createGuid from "../Core/createGuid.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; +import Frozen from "../Core/Frozen.js"; /** * A collection of {@link PostProcessStage}s or other post-process composite stages that execute together logically. diff --git a/packages/engine/Source/Scene/PostProcessStageLibrary.js b/packages/engine/Source/Scene/PostProcessStageLibrary.js index 9168c068da54..fb300f0db587 100644 --- a/packages/engine/Source/Scene/PostProcessStageLibrary.js +++ b/packages/engine/Source/Scene/PostProcessStageLibrary.js @@ -1,8 +1,9 @@ +import { defined } from "@cesium/utils"; import buildModuleUrl from "../Core/buildModuleUrl.js"; import Color from "../Core/Color.js"; import createGuid from "../Core/createGuid.js"; -import defined from "../Core/defined.js"; import Ellipsoid from "../Core/Ellipsoid.js"; +import FXAA3_11 from "../Shaders/FXAA3_11.js"; import AcesTonemapping from "../Shaders/PostProcessStages/AcesTonemappingStage.js"; import AmbientOcclusionGenerate from "../Shaders/PostProcessStages/AmbientOcclusionGenerate.js"; import AmbientOcclusionModulate from "../Shaders/PostProcessStages/AmbientOcclusionModulate.js"; @@ -14,15 +15,14 @@ import DepthOfField from "../Shaders/PostProcessStages/DepthOfField.js"; import DepthView from "../Shaders/PostProcessStages/DepthView.js"; import EdgeDetection from "../Shaders/PostProcessStages/EdgeDetection.js"; import FilmicTonemapping from "../Shaders/PostProcessStages/FilmicTonemapping.js"; -import PbrNeutralTonemapping from "../Shaders/PostProcessStages/PbrNeutralTonemapping.js"; import FXAA from "../Shaders/PostProcessStages/FXAA.js"; import GaussianBlur1D from "../Shaders/PostProcessStages/GaussianBlur1D.js"; import LensFlare from "../Shaders/PostProcessStages/LensFlare.js"; import ModifiedReinhardTonemapping from "../Shaders/PostProcessStages/ModifiedReinhardTonemapping.js"; import NightVision from "../Shaders/PostProcessStages/NightVision.js"; +import PbrNeutralTonemapping from "../Shaders/PostProcessStages/PbrNeutralTonemapping.js"; import ReinhardTonemapping from "../Shaders/PostProcessStages/ReinhardTonemapping.js"; import Silhouette from "../Shaders/PostProcessStages/Silhouette.js"; -import FXAA3_11 from "../Shaders/FXAA3_11.js"; import AutoExposure from "./AutoExposure.js"; import PostProcessStage from "./PostProcessStage.js"; import PostProcessStageComposite from "./PostProcessStageComposite.js"; diff --git a/packages/engine/Source/Scene/PostProcessStageTextureCache.js b/packages/engine/Source/Scene/PostProcessStageTextureCache.js index 391b7dd3aff6..bc25773b555d 100644 --- a/packages/engine/Source/Scene/PostProcessStageTextureCache.js +++ b/packages/engine/Source/Scene/PostProcessStageTextureCache.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import CesiumMath from "../Core/Math.js"; import ClearCommand from "../Renderer/ClearCommand.js"; diff --git a/packages/engine/Source/Scene/Primitive.js b/packages/engine/Source/Scene/Primitive.js index 8a09a483bcad..e62f374ffffa 100644 --- a/packages/engine/Source/Scene/Primitive.js +++ b/packages/engine/Source/Scene/Primitive.js @@ -1,3 +1,9 @@ +import { + defined, + DeveloperError, + FeatureDetection, + RuntimeError, +} from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; @@ -7,12 +13,9 @@ import clone from "../Core/clone.js"; import Color from "../Core/Color.js"; import combine from "../Core/combine.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import EncodedCartesian3 from "../Core/EncodedCartesian3.js"; -import FeatureDetection from "../Core/FeatureDetection.js"; +import Frozen from "../Core/Frozen.js"; import Geometry from "../Core/Geometry.js"; import GeometryAttribute from "../Core/GeometryAttribute.js"; import GeometryAttributes from "../Core/GeometryAttributes.js"; @@ -20,7 +23,6 @@ import GeometryOffsetAttribute from "../Core/GeometryOffsetAttribute.js"; import Intersect from "../Core/Intersect.js"; import Matrix4 from "../Core/Matrix4.js"; import Plane from "../Core/Plane.js"; -import RuntimeError from "../Core/RuntimeError.js"; import subdivideArray from "../Core/subdivideArray.js"; import TaskProcessor from "../Core/TaskProcessor.js"; import BufferUsage from "../Renderer/BufferUsage.js"; diff --git a/packages/engine/Source/Scene/PrimitiveCollection.js b/packages/engine/Source/Scene/PrimitiveCollection.js index d407251a0830..d70de5af6e7c 100644 --- a/packages/engine/Source/Scene/PrimitiveCollection.js +++ b/packages/engine/Source/Scene/PrimitiveCollection.js @@ -1,9 +1,8 @@ +import { defined, DeveloperError } from "@cesium/utils"; import createGuid from "../Core/createGuid.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; /** * A collection of primitives. This is most often used with {@link Scene#primitives}, diff --git a/packages/engine/Source/Scene/PrimitiveLoadPlan.js b/packages/engine/Source/Scene/PrimitiveLoadPlan.js index 40e7c0e7a4df..469d28000339 100644 --- a/packages/engine/Source/Scene/PrimitiveLoadPlan.js +++ b/packages/engine/Source/Scene/PrimitiveLoadPlan.js @@ -1,12 +1,11 @@ -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import defined from "../Core/defined.js"; import IndexDatatype from "../Core/IndexDatatype.js"; import Buffer from "../Renderer/Buffer.js"; import BufferUsage from "../Renderer/BufferUsage.js"; import AttributeType from "./AttributeType.js"; -import ModelComponents from "./ModelComponents.js"; import PrimitiveOutlineGenerator from "./Model/PrimitiveOutlineGenerator.js"; +import ModelComponents from "./ModelComponents.js"; /** * Simple struct for tracking whether an attribute will be loaded as a buffer diff --git a/packages/engine/Source/Scene/PrimitivePipeline.js b/packages/engine/Source/Scene/PrimitivePipeline.js index a2cf185a9a80..6156e47272d2 100644 --- a/packages/engine/Source/Scene/PrimitivePipeline.js +++ b/packages/engine/Source/Scene/PrimitivePipeline.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import GeographicProjection from "../Core/GeographicProjection.js"; import Geometry from "../Core/Geometry.js"; diff --git a/packages/engine/Source/Scene/PropertyAttribute.js b/packages/engine/Source/Scene/PropertyAttribute.js index 6647135410de..8373fb6943d3 100644 --- a/packages/engine/Source/Scene/PropertyAttribute.js +++ b/packages/engine/Source/Scene/PropertyAttribute.js @@ -1,6 +1,5 @@ -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import PropertyAttributeProperty from "./PropertyAttributeProperty.js"; /** diff --git a/packages/engine/Source/Scene/PropertyAttributeProperty.js b/packages/engine/Source/Scene/PropertyAttributeProperty.js index a7202cb9d441..002a62ac7b30 100644 --- a/packages/engine/Source/Scene/PropertyAttributeProperty.js +++ b/packages/engine/Source/Scene/PropertyAttributeProperty.js @@ -1,6 +1,5 @@ -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; /** * A property in a property attribute from EXT_structural_metadata. diff --git a/packages/engine/Source/Scene/PropertyTable.js b/packages/engine/Source/Scene/PropertyTable.js index 5936c57b0316..1f3f646996bb 100644 --- a/packages/engine/Source/Scene/PropertyTable.js +++ b/packages/engine/Source/Scene/PropertyTable.js @@ -1,7 +1,5 @@ -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import DeveloperError from "../Core/DeveloperError.js"; -import defined from "../Core/defined.js"; import JsonMetadataTable from "./JsonMetadataTable.js"; /** diff --git a/packages/engine/Source/Scene/PropertyTexture.js b/packages/engine/Source/Scene/PropertyTexture.js index d0279d6432e4..b01c5b38c8d4 100644 --- a/packages/engine/Source/Scene/PropertyTexture.js +++ b/packages/engine/Source/Scene/PropertyTexture.js @@ -1,6 +1,5 @@ -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import PropertyTextureProperty from "./PropertyTextureProperty.js"; /** diff --git a/packages/engine/Source/Scene/PropertyTextureProperty.js b/packages/engine/Source/Scene/PropertyTextureProperty.js index 4951f2271aa5..c9992d03144c 100644 --- a/packages/engine/Source/Scene/PropertyTextureProperty.js +++ b/packages/engine/Source/Scene/PropertyTextureProperty.js @@ -1,10 +1,9 @@ -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; +import oneTimeWarning from "../Core/oneTimeWarning.js"; import GltfLoaderUtil from "./GltfLoaderUtil.js"; -import MetadataType from "./MetadataType.js"; import MetadataComponentType from "./MetadataComponentType.js"; -import oneTimeWarning from "../Core/oneTimeWarning.js"; +import MetadataType from "./MetadataType.js"; /** * A property in a property texture. diff --git a/packages/engine/Source/Scene/QuadtreePrimitive.js b/packages/engine/Source/Scene/QuadtreePrimitive.js index fa8930c0baa1..5fd6a2edda58 100644 --- a/packages/engine/Source/Scene/QuadtreePrimitive.js +++ b/packages/engine/Source/Scene/QuadtreePrimitive.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Event from "../Core/Event.js"; import getTimestamp from "../Core/getTimestamp.js"; import CesiumMath from "../Core/Math.js"; diff --git a/packages/engine/Source/Scene/QuadtreeTile.js b/packages/engine/Source/Scene/QuadtreeTile.js index 8caea12b52fd..d4ad1c087d5f 100644 --- a/packages/engine/Source/Scene/QuadtreeTile.js +++ b/packages/engine/Source/Scene/QuadtreeTile.js @@ -1,5 +1,4 @@ -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { defined, DeveloperError } from "@cesium/utils"; import Rectangle from "../Core/Rectangle.js"; import QuadtreeTileLoadState from "./QuadtreeTileLoadState.js"; import TileSelectionResult from "./TileSelectionResult.js"; diff --git a/packages/engine/Source/Scene/QuadtreeTileProvider.js b/packages/engine/Source/Scene/QuadtreeTileProvider.js index 9f1bfee43906..709865553efe 100644 --- a/packages/engine/Source/Scene/QuadtreeTileProvider.js +++ b/packages/engine/Source/Scene/QuadtreeTileProvider.js @@ -1,4 +1,4 @@ -import DeveloperError from "../Core/DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * Provides general quadtree tiles to be displayed on or near the surface of an ellipsoid. It is intended to be diff --git a/packages/engine/Source/Scene/ResourceCache.js b/packages/engine/Source/Scene/ResourceCache.js index 0208284f320c..3c71dda3bb45 100644 --- a/packages/engine/Source/Scene/ResourceCache.js +++ b/packages/engine/Source/Scene/ResourceCache.js @@ -1,7 +1,5 @@ -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import BufferLoader from "./BufferLoader.js"; import GltfBufferViewLoader from "./GltfBufferViewLoader.js"; import GltfDracoLoader from "./GltfDracoLoader.js"; diff --git a/packages/engine/Source/Scene/ResourceCacheKey.js b/packages/engine/Source/Scene/ResourceCacheKey.js index dc06d8232490..3312f3cebebb 100644 --- a/packages/engine/Source/Scene/ResourceCacheKey.js +++ b/packages/engine/Source/Scene/ResourceCacheKey.js @@ -1,7 +1,5 @@ -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import getAbsoluteUri from "../Core/getAbsoluteUri.js"; import GltfLoaderUtil from "./GltfLoaderUtil.js"; import hasExtension from "./hasExtension.js"; diff --git a/packages/engine/Source/Scene/ResourceCacheStatistics.js b/packages/engine/Source/Scene/ResourceCacheStatistics.js index 3492d757be18..ad34a4d94820 100644 --- a/packages/engine/Source/Scene/ResourceCacheStatistics.js +++ b/packages/engine/Source/Scene/ResourceCacheStatistics.js @@ -1,5 +1,4 @@ -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; +import { Check, defined } from "@cesium/utils"; /** * Statistics for the GPU and CPU memory used by the models loaded through the diff --git a/packages/engine/Source/Scene/ResourceLoader.js b/packages/engine/Source/Scene/ResourceLoader.js index d4ca1e4f8e1f..461f64485dcb 100644 --- a/packages/engine/Source/Scene/ResourceLoader.js +++ b/packages/engine/Source/Scene/ResourceLoader.js @@ -1,8 +1,5 @@ -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; +import { Check, defined, DeveloperError, RuntimeError } from "@cesium/utils"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; -import RuntimeError from "../Core/RuntimeError.js"; /** * A cache resource. diff --git a/packages/engine/Source/Scene/Scene.js b/packages/engine/Source/Scene/Scene.js index 59b6c2fc94a8..fd8ff7f009d4 100644 --- a/packages/engine/Source/Scene/Scene.js +++ b/packages/engine/Source/Scene/Scene.js @@ -1,25 +1,22 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import BoundingSphere from "../Core/BoundingSphere.js"; import BoxGeometry from "../Core/BoxGeometry.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; -import Check from "../Core/Check.js"; import clone from "../Core/clone.js"; import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; import createGuid from "../Core/createGuid.js"; import CullingVolume from "../Core/CullingVolume.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import EllipsoidGeometry from "../Core/EllipsoidGeometry.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import GeographicProjection from "../Core/GeographicProjection.js"; import GeometryInstance from "../Core/GeometryInstance.js"; import GeometryPipeline from "../Core/GeometryPipeline.js"; -import HeightReference from "./HeightReference.js"; import Intersect from "../Core/Intersect.js"; import JulianDate from "../Core/JulianDate.js"; import CesiumMath from "../Core/Math.js"; @@ -47,18 +44,23 @@ import Cesium3DTilePass from "./Cesium3DTilePass.js"; import Cesium3DTilePassState from "./Cesium3DTilePassState.js"; import CreditDisplay from "./CreditDisplay.js"; import DebugCameraPrimitive from "./DebugCameraPrimitive.js"; +import DebugInspector from "./DebugInspector.js"; import DepthPlane from "./DepthPlane.js"; import DerivedCommand from "./DerivedCommand.js"; import DeviceOrientationCameraController from "./DeviceOrientationCameraController.js"; import DynamicAtmosphereLightingType from "./DynamicAtmosphereLightingType.js"; import Fog from "./Fog.js"; import FrameState from "./FrameState.js"; +import getMetadataClassProperty from "./getMetadataClassProperty.js"; +import getMetadataProperty from "./getMetadataProperty.js"; import GlobeTranslucencyState from "./GlobeTranslucencyState.js"; +import HeightReference from "./HeightReference.js"; import InvertClassification from "./InvertClassification.js"; import JobScheduler from "./JobScheduler.js"; import MapMode2D from "./MapMode2D.js"; import PerformanceDisplay from "./PerformanceDisplay.js"; import PerInstanceColorAppearance from "./PerInstanceColorAppearance.js"; +import PickedMetadataInfo from "./PickedMetadataInfo.js"; import Picking from "./Picking.js"; import PostProcessStageCollection from "./PostProcessStageCollection.js"; import Primitive from "./Primitive.js"; @@ -74,12 +76,8 @@ import SunLight from "./SunLight.js"; import SunPostProcess from "./SunPostProcess.js"; import TweenCollection from "./TweenCollection.js"; import View from "./View.js"; -import DebugInspector from "./DebugInspector.js"; import VoxelCell from "./VoxelCell.js"; import VoxelPrimitive from "./VoxelPrimitive.js"; -import getMetadataClassProperty from "./getMetadataClassProperty.js"; -import PickedMetadataInfo from "./PickedMetadataInfo.js"; -import getMetadataProperty from "./getMetadataProperty.js"; const requestRenderAfterFrame = function (scene) { return function () { diff --git a/packages/engine/Source/Scene/SceneTransforms.js b/packages/engine/Source/Scene/SceneTransforms.js index d982dbd8308e..7460a2d68018 100644 --- a/packages/engine/Source/Scene/SceneTransforms.js +++ b/packages/engine/Source/Scene/SceneTransforms.js @@ -1,10 +1,9 @@ +import { defined, DeveloperError } from "@cesium/utils"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; import Cartographic from "../Core/Cartographic.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import CesiumMath from "../Core/Math.js"; import Matrix4 from "../Core/Matrix4.js"; import OrthographicFrustum from "../Core/OrthographicFrustum.js"; diff --git a/packages/engine/Source/Scene/SceneTransitioner.js b/packages/engine/Source/Scene/SceneTransitioner.js index 56e177cc08b1..dfbd4c649554 100644 --- a/packages/engine/Source/Scene/SceneTransitioner.js +++ b/packages/engine/Source/Scene/SceneTransitioner.js @@ -1,7 +1,6 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import EasingFunction from "../Core/EasingFunction.js"; import CesiumMath from "../Core/Math.js"; diff --git a/packages/engine/Source/Scene/ScreenSpaceCameraController.js b/packages/engine/Source/Scene/ScreenSpaceCameraController.js index 6b3cf180b7d7..bd657e5134d0 100644 --- a/packages/engine/Source/Scene/ScreenSpaceCameraController.js +++ b/packages/engine/Source/Scene/ScreenSpaceCameraController.js @@ -1,10 +1,9 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; import Cartographic from "../Core/Cartographic.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import HeadingPitchRoll from "../Core/HeadingPitchRoll.js"; import IntersectionTests from "../Core/IntersectionTests.js"; @@ -16,8 +15,8 @@ import OrthographicFrustum from "../Core/OrthographicFrustum.js"; import Plane from "../Core/Plane.js"; import Quaternion from "../Core/Quaternion.js"; import Ray from "../Core/Ray.js"; -import VerticalExaggeration from "../Core/VerticalExaggeration.js"; import Transforms from "../Core/Transforms.js"; +import VerticalExaggeration from "../Core/VerticalExaggeration.js"; import CameraEventAggregator from "./CameraEventAggregator.js"; import CameraEventType from "./CameraEventType.js"; import MapMode2D from "./MapMode2D.js"; diff --git a/packages/engine/Source/Scene/SensorVolumePortionToDisplay.js b/packages/engine/Source/Scene/SensorVolumePortionToDisplay.js index 1a6bd126eece..0fa18da30791 100644 --- a/packages/engine/Source/Scene/SensorVolumePortionToDisplay.js +++ b/packages/engine/Source/Scene/SensorVolumePortionToDisplay.js @@ -1,4 +1,4 @@ -import DeveloperError from "../Core/DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * Constants used to indicated what part of the sensor volume to display. diff --git a/packages/engine/Source/Scene/ShadowMap.js b/packages/engine/Source/Scene/ShadowMap.js index 6b99ad1af271..049d4f66c1ae 100644 --- a/packages/engine/Source/Scene/ShadowMap.js +++ b/packages/engine/Source/Scene/ShadowMap.js @@ -1,3 +1,4 @@ +import { defined, DeveloperError, FeatureDetection } from "@cesium/utils"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import BoundingSphere from "../Core/BoundingSphere.js"; import BoxOutlineGeometry from "../Core/BoxOutlineGeometry.js"; @@ -10,11 +11,8 @@ import Color from "../Core/Color.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; import combine from "../Core/combine.js"; import CullingVolume from "../Core/CullingVolume.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; -import FeatureDetection from "../Core/FeatureDetection.js"; +import Frozen from "../Core/Frozen.js"; import GeometryInstance from "../Core/GeometryInstance.js"; import Intersect from "../Core/Intersect.js"; import CesiumMath from "../Core/Math.js"; diff --git a/packages/engine/Source/Scene/ShadowMapShader.js b/packages/engine/Source/Scene/ShadowMapShader.js index e7e56905787f..73d49c12c918 100644 --- a/packages/engine/Source/Scene/ShadowMapShader.js +++ b/packages/engine/Source/Scene/ShadowMapShader.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import ShaderSource from "../Renderer/ShaderSource.js"; /** diff --git a/packages/engine/Source/Scene/ShadowVolumeAppearance.js b/packages/engine/Source/Scene/ShadowVolumeAppearance.js index be7124557c69..6efdce3cfe4b 100644 --- a/packages/engine/Source/Scene/ShadowVolumeAppearance.js +++ b/packages/engine/Source/Scene/ShadowVolumeAppearance.js @@ -1,9 +1,8 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; -import Check from "../Core/Check.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import defined from "../Core/defined.js"; import EncodedCartesian3 from "../Core/EncodedCartesian3.js"; import GeometryInstanceAttribute from "../Core/GeometryInstanceAttribute.js"; import CesiumMath from "../Core/Math.js"; diff --git a/packages/engine/Source/Scene/SingleTileImageryProvider.js b/packages/engine/Source/Scene/SingleTileImageryProvider.js index 39c1a3321f62..4cd790d0a22d 100644 --- a/packages/engine/Source/Scene/SingleTileImageryProvider.js +++ b/packages/engine/Source/Scene/SingleTileImageryProvider.js @@ -1,12 +1,10 @@ -import Check from "../Core/Check.js"; +import { Check, defined, RuntimeError } from "@cesium/utils"; import Credit from "../Core/Credit.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import GeographicTilingScheme from "../Core/GeographicTilingScheme.js"; import Rectangle from "../Core/Rectangle.js"; import Resource from "../Core/Resource.js"; -import RuntimeError from "../Core/RuntimeError.js"; import TileProviderError from "../Core/TileProviderError.js"; import ImageryProvider from "./ImageryProvider.js"; diff --git a/packages/engine/Source/Scene/SkyAtmosphere.js b/packages/engine/Source/Scene/SkyAtmosphere.js index 9863027c96c8..a053ae1c4353 100644 --- a/packages/engine/Source/Scene/SkyAtmosphere.js +++ b/packages/engine/Source/Scene/SkyAtmosphere.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import EllipsoidGeometry from "../Core/EllipsoidGeometry.js"; diff --git a/packages/engine/Source/Scene/SkyBox.js b/packages/engine/Source/Scene/SkyBox.js index 52a016f7cfc2..157515293ab5 100644 --- a/packages/engine/Source/Scene/SkyBox.js +++ b/packages/engine/Source/Scene/SkyBox.js @@ -1,10 +1,8 @@ -import buildModuleUrl from "../Core/buildModuleUrl.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import BoxGeometry from "../Core/BoxGeometry.js"; +import buildModuleUrl from "../Core/buildModuleUrl.js"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import GeometryPipeline from "../Core/GeometryPipeline.js"; import Matrix4 from "../Core/Matrix4.js"; import VertexFormat from "../Core/VertexFormat.js"; diff --git a/packages/engine/Source/Scene/SpatialNode.js b/packages/engine/Source/Scene/SpatialNode.js index 099777d264c6..207664385079 100644 --- a/packages/engine/Source/Scene/SpatialNode.js +++ b/packages/engine/Source/Scene/SpatialNode.js @@ -1,11 +1,10 @@ +import { defined, DeveloperError } from "@cesium/utils"; import binarySearch from "../Core/binarySearch.js"; import Cartesian3 from "../Core/Cartesian3.js"; import CesiumMath from "../Core/Math.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; -import KeyframeNode from "./KeyframeNode.js"; import Matrix3 from "../Core/Matrix3.js"; import OrientedBoundingBox from "../Core/OrientedBoundingBox.js"; +import KeyframeNode from "./KeyframeNode.js"; /** * @alias SpatialNode diff --git a/packages/engine/Source/Scene/SpecularEnvironmentCubeMap.js b/packages/engine/Source/Scene/SpecularEnvironmentCubeMap.js index b05f0c35367e..b3511fce8c49 100644 --- a/packages/engine/Source/Scene/SpecularEnvironmentCubeMap.js +++ b/packages/engine/Source/Scene/SpecularEnvironmentCubeMap.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import destroyObject from "../Core/destroyObject.js"; import Event from "../Core/Event.js"; import loadKTX2 from "../Core/loadKTX2.js"; diff --git a/packages/engine/Source/Scene/SphereEmitter.js b/packages/engine/Source/Scene/SphereEmitter.js index 5d184603cf13..1ab05fc05c35 100644 --- a/packages/engine/Source/Scene/SphereEmitter.js +++ b/packages/engine/Source/Scene/SphereEmitter.js @@ -1,5 +1,5 @@ +import { Check } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import CesiumMath from "../Core/Math.js"; /** diff --git a/packages/engine/Source/Scene/StructuralMetadata.js b/packages/engine/Source/Scene/StructuralMetadata.js index 1c317cd0fb27..83f8a4bc1736 100644 --- a/packages/engine/Source/Scene/StructuralMetadata.js +++ b/packages/engine/Source/Scene/StructuralMetadata.js @@ -1,6 +1,5 @@ -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; /** * An object containing structural metadata. diff --git a/packages/engine/Source/Scene/StyleExpression.js b/packages/engine/Source/Scene/StyleExpression.js index d8ad4339084d..2c4b9af8dea5 100644 --- a/packages/engine/Source/Scene/StyleExpression.js +++ b/packages/engine/Source/Scene/StyleExpression.js @@ -1,4 +1,4 @@ -import DeveloperError from "../Core/DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * An expression for a style applied to a {@link Cesium3DTileset}. diff --git a/packages/engine/Source/Scene/Sun.js b/packages/engine/Source/Scene/Sun.js index 5a3d9d069b51..e59baf37347c 100644 --- a/packages/engine/Source/Scene/Sun.js +++ b/packages/engine/Source/Scene/Sun.js @@ -1,9 +1,9 @@ +import { defined } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import IndexDatatype from "../Core/IndexDatatype.js"; import CesiumMath from "../Core/Math.js"; diff --git a/packages/engine/Source/Scene/SunPostProcess.js b/packages/engine/Source/Scene/SunPostProcess.js index ab025a5d4889..5799d4a8c18a 100644 --- a/packages/engine/Source/Scene/SunPostProcess.js +++ b/packages/engine/Source/Scene/SunPostProcess.js @@ -1,7 +1,7 @@ +import { defined } from "@cesium/utils"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian4 from "../Core/Cartesian4.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import CesiumMath from "../Core/Math.js"; import Matrix4 from "../Core/Matrix4.js"; diff --git a/packages/engine/Source/Scene/Terrain.js b/packages/engine/Source/Scene/Terrain.js index aa1dedf0c2d3..3485b449c331 100644 --- a/packages/engine/Source/Scene/Terrain.js +++ b/packages/engine/Source/Scene/Terrain.js @@ -1,7 +1,7 @@ -import Check from "../Core/Check.js"; -import Event from "../Core/Event.js"; +import { Check } from "@cesium/utils"; import createWorldBathymetryAsync from "../Core/createWorldBathymetryAsync.js"; import createWorldTerrainAsync from "../Core/createWorldTerrainAsync.js"; +import Event from "../Core/Event.js"; /** * A helper to manage async operations of a terrain provider. diff --git a/packages/engine/Source/Scene/TerrainFillMesh.js b/packages/engine/Source/Scene/TerrainFillMesh.js index a23c50ce30c5..597fefd0a715 100644 --- a/packages/engine/Source/Scene/TerrainFillMesh.js +++ b/packages/engine/Source/Scene/TerrainFillMesh.js @@ -1,3 +1,4 @@ +import { defined, DeveloperError } from "@cesium/utils"; import AttributeCompression from "../Core/AttributeCompression.js"; import binarySearch from "../Core/binarySearch.js"; import BoundingSphere from "../Core/BoundingSphere.js"; @@ -5,8 +6,6 @@ import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; import Cartographic from "../Core/Cartographic.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import HeightmapTerrainData from "../Core/HeightmapTerrainData.js"; import CesiumMath from "../Core/Math.js"; import OrientedBoundingBox from "../Core/OrientedBoundingBox.js"; diff --git a/packages/engine/Source/Scene/TileBoundingRegion.js b/packages/engine/Source/Scene/TileBoundingRegion.js index cf349322d04b..a710dc7c7c16 100644 --- a/packages/engine/Source/Scene/TileBoundingRegion.js +++ b/packages/engine/Source/Scene/TileBoundingRegion.js @@ -1,9 +1,8 @@ +import { Check, defined } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; -import Check from "../Core/Check.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; -import defined from "../Core/defined.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import GeometryInstance from "../Core/GeometryInstance.js"; import IntersectionTests from "../Core/IntersectionTests.js"; diff --git a/packages/engine/Source/Scene/TileBoundingS2Cell.js b/packages/engine/Source/Scene/TileBoundingS2Cell.js index 1d1bccfd1e10..226ec4c6f332 100644 --- a/packages/engine/Source/Scene/TileBoundingS2Cell.js +++ b/packages/engine/Source/Scene/TileBoundingS2Cell.js @@ -1,19 +1,18 @@ +import { Check, defined } from "@cesium/utils"; +import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian3 from "../Core/Cartesian3.js"; -import defined from "../Core/defined.js"; import Cartographic from "../Core/Cartographic.js"; +import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; +import CoplanarPolygonOutlineGeometry from "../Core/CoplanarPolygonOutlineGeometry.js"; import Ellipsoid from "../Core/Ellipsoid.js"; +import GeometryInstance from "../Core/GeometryInstance.js"; import Intersect from "../Core/Intersect.js"; import Matrix3 from "../Core/Matrix3.js"; -import Plane from "../Core/Plane.js"; -import CoplanarPolygonOutlineGeometry from "../Core/CoplanarPolygonOutlineGeometry.js"; -import BoundingSphere from "../Core/BoundingSphere.js"; -import Check from "../Core/Check.js"; -import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; -import GeometryInstance from "../Core/GeometryInstance.js"; import Matrix4 from "../Core/Matrix4.js"; +import Plane from "../Core/Plane.js"; +import S2Cell from "../Core/S2Cell.js"; import PerInstanceColorAppearance from "./PerInstanceColorAppearance.js"; import Primitive from "./Primitive.js"; -import S2Cell from "../Core/S2Cell.js"; let centerCartographicScratch = new Cartographic(); /** * A tile bounding volume specified as an S2 cell token with minimum and maximum heights. diff --git a/packages/engine/Source/Scene/TileBoundingSphere.js b/packages/engine/Source/Scene/TileBoundingSphere.js index 7d6136d28357..81ec03cdee7f 100644 --- a/packages/engine/Source/Scene/TileBoundingSphere.js +++ b/packages/engine/Source/Scene/TileBoundingSphere.js @@ -1,6 +1,6 @@ +import { Check } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; import GeometryInstance from "../Core/GeometryInstance.js"; import CesiumMath from "../Core/Math.js"; diff --git a/packages/engine/Source/Scene/TileBoundingVolume.js b/packages/engine/Source/Scene/TileBoundingVolume.js index f7c027edc16c..bef235b53418 100644 --- a/packages/engine/Source/Scene/TileBoundingVolume.js +++ b/packages/engine/Source/Scene/TileBoundingVolume.js @@ -1,4 +1,4 @@ -import DeveloperError from "../Core/DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * Defines a bounding volume for a tile. This type describes an interface diff --git a/packages/engine/Source/Scene/TileCoordinatesImageryProvider.js b/packages/engine/Source/Scene/TileCoordinatesImageryProvider.js index 8761c5e8b565..99b8319645dc 100644 --- a/packages/engine/Source/Scene/TileCoordinatesImageryProvider.js +++ b/packages/engine/Source/Scene/TileCoordinatesImageryProvider.js @@ -1,7 +1,7 @@ +import { defined } from "@cesium/utils"; import Color from "../Core/Color.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import GeographicTilingScheme from "../Core/GeographicTilingScheme.js"; /** diff --git a/packages/engine/Source/Scene/TileDiscardPolicy.js b/packages/engine/Source/Scene/TileDiscardPolicy.js index b07424eb0b3a..4df99e64da23 100644 --- a/packages/engine/Source/Scene/TileDiscardPolicy.js +++ b/packages/engine/Source/Scene/TileDiscardPolicy.js @@ -1,4 +1,4 @@ -import DeveloperError from "../Core/DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * A policy for discarding tile images according to some criteria. This type describes an diff --git a/packages/engine/Source/Scene/TileImagery.js b/packages/engine/Source/Scene/TileImagery.js index 08e79ac95d9e..0c521eea511b 100644 --- a/packages/engine/Source/Scene/TileImagery.js +++ b/packages/engine/Source/Scene/TileImagery.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import ImageryState from "./ImageryState.js"; /** diff --git a/packages/engine/Source/Scene/TileMapServiceImageryProvider.js b/packages/engine/Source/Scene/TileMapServiceImageryProvider.js index b15eeb761ccf..bbcff8dd5654 100644 --- a/packages/engine/Source/Scene/TileMapServiceImageryProvider.js +++ b/packages/engine/Source/Scene/TileMapServiceImageryProvider.js @@ -1,14 +1,12 @@ +import { Check, defined, RuntimeError } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartographic from "../Core/Cartographic.js"; -import Check from "../Core/Check.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import GeographicProjection from "../Core/GeographicProjection.js"; import GeographicTilingScheme from "../Core/GeographicTilingScheme.js"; import Rectangle from "../Core/Rectangle.js"; import RequestErrorEvent from "../Core/RequestErrorEvent.js"; import Resource from "../Core/Resource.js"; -import RuntimeError from "../Core/RuntimeError.js"; import TileProviderError from "../Core/TileProviderError.js"; import WebMercatorTilingScheme from "../Core/WebMercatorTilingScheme.js"; import UrlTemplateImageryProvider from "./UrlTemplateImageryProvider.js"; diff --git a/packages/engine/Source/Scene/TileMetadata.js b/packages/engine/Source/Scene/TileMetadata.js index ebb822db1242..e43674d29d7d 100644 --- a/packages/engine/Source/Scene/TileMetadata.js +++ b/packages/engine/Source/Scene/TileMetadata.js @@ -1,4 +1,4 @@ -import Check from "../Core/Check.js"; +import { Check } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; import MetadataEntity from "./MetadataEntity.js"; diff --git a/packages/engine/Source/Scene/TileOrientedBoundingBox.js b/packages/engine/Source/Scene/TileOrientedBoundingBox.js index 2fe2b925ce45..e13d6a3c6e4f 100644 --- a/packages/engine/Source/Scene/TileOrientedBoundingBox.js +++ b/packages/engine/Source/Scene/TileOrientedBoundingBox.js @@ -1,12 +1,12 @@ +import { Check } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import BoxOutlineGeometry from "../Core/BoxOutlineGeometry.js"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; import GeometryInstance from "../Core/GeometryInstance.js"; +import CesiumMath from "../Core/Math.js"; import Matrix3 from "../Core/Matrix3.js"; import Matrix4 from "../Core/Matrix4.js"; -import CesiumMath from "../Core/Math.js"; import OrientedBoundingBox from "../Core/OrientedBoundingBox.js"; import PerInstanceColorAppearance from "./PerInstanceColorAppearance.js"; import Primitive from "./Primitive.js"; diff --git a/packages/engine/Source/Scene/TileReplacementQueue.js b/packages/engine/Source/Scene/TileReplacementQueue.js index 1d0ccc73c883..b5b156ee0992 100644 --- a/packages/engine/Source/Scene/TileReplacementQueue.js +++ b/packages/engine/Source/Scene/TileReplacementQueue.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; /** * A priority queue of tiles to be replaced, if necessary, to make room for new tiles. The queue diff --git a/packages/engine/Source/Scene/TilesetMetadata.js b/packages/engine/Source/Scene/TilesetMetadata.js index 60e9f18b19c6..236ee60b3e95 100644 --- a/packages/engine/Source/Scene/TilesetMetadata.js +++ b/packages/engine/Source/Scene/TilesetMetadata.js @@ -1,6 +1,5 @@ -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import MetadataEntity from "./MetadataEntity.js"; /** diff --git a/packages/engine/Source/Scene/TimeDynamicImagery.js b/packages/engine/Source/Scene/TimeDynamicImagery.js index 1ceeede7cd03..647b2efc72c0 100644 --- a/packages/engine/Source/Scene/TimeDynamicImagery.js +++ b/packages/engine/Source/Scene/TimeDynamicImagery.js @@ -1,7 +1,5 @@ -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import JulianDate from "../Core/JulianDate.js"; import Request from "../Core/Request.js"; import RequestType from "../Core/RequestType.js"; diff --git a/packages/engine/Source/Scene/TimeDynamicPointCloud.js b/packages/engine/Source/Scene/TimeDynamicPointCloud.js index 1d4e999004f9..fb412a897e40 100644 --- a/packages/engine/Source/Scene/TimeDynamicPointCloud.js +++ b/packages/engine/Source/Scene/TimeDynamicPointCloud.js @@ -1,9 +1,8 @@ -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import combine from "../Core/combine.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import getTimestamp from "../Core/getTimestamp.js"; import JulianDate from "../Core/JulianDate.js"; import CesiumMath from "../Core/Math.js"; diff --git a/packages/engine/Source/Scene/TranslucentTileClassification.js b/packages/engine/Source/Scene/TranslucentTileClassification.js index c73d3ba732c9..28744a41821b 100644 --- a/packages/engine/Source/Scene/TranslucentTileClassification.js +++ b/packages/engine/Source/Scene/TranslucentTileClassification.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import PixelFormat from "../Core/PixelFormat.js"; import ClearCommand from "../Renderer/ClearCommand.js"; diff --git a/packages/engine/Source/Scene/TweenCollection.js b/packages/engine/Source/Scene/TweenCollection.js index 5c6258b38f28..5a64494d19dc 100644 --- a/packages/engine/Source/Scene/TweenCollection.js +++ b/packages/engine/Source/Scene/TweenCollection.js @@ -1,11 +1,10 @@ +import { defined, DeveloperError } from "@cesium/utils"; +import { Tween as TweenJS } from "@tweenjs/tween.js"; import clone from "../Core/clone.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import EasingFunction from "../Core/EasingFunction.js"; +import Frozen from "../Core/Frozen.js"; import getTimestamp from "../Core/getTimestamp.js"; import TimeConstants from "../Core/TimeConstants.js"; -import { Tween as TweenJS } from "@tweenjs/tween.js"; /** * A tween is an animation that interpolates the properties of two objects using an {@link EasingFunction}. Create diff --git a/packages/engine/Source/Scene/UrlTemplateImageryProvider.js b/packages/engine/Source/Scene/UrlTemplateImageryProvider.js index 09b7dedf5640..924f1e51cb20 100644 --- a/packages/engine/Source/Scene/UrlTemplateImageryProvider.js +++ b/packages/engine/Source/Scene/UrlTemplateImageryProvider.js @@ -1,12 +1,11 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; -import Check from "../Core/Check.js"; import combine from "../Core/combine.js"; import Credit from "../Core/Credit.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import GeographicProjection from "../Core/GeographicProjection.js"; import CesiumMath from "../Core/Math.js"; import Rectangle from "../Core/Rectangle.js"; diff --git a/packages/engine/Source/Scene/Vector3DTileClampedPolylines.js b/packages/engine/Source/Scene/Vector3DTileClampedPolylines.js index e89eb1711f3b..3d116139b5ed 100644 --- a/packages/engine/Source/Scene/Vector3DTileClampedPolylines.js +++ b/packages/engine/Source/Scene/Vector3DTileClampedPolylines.js @@ -1,15 +1,14 @@ +import { defined, FeatureDetection } from "@cesium/utils"; import ApproximateTerrainHeights from "../Core/ApproximateTerrainHeights.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Color from "../Core/Color.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import Ellipsoid from "../Core/Ellipsoid.js"; -import FeatureDetection from "../Core/FeatureDetection.js"; import IndexDatatype from "../Core/IndexDatatype.js"; -import OrientedBoundingBox from "../Core/OrientedBoundingBox.js"; import Matrix4 from "../Core/Matrix4.js"; +import OrientedBoundingBox from "../Core/OrientedBoundingBox.js"; import Rectangle from "../Core/Rectangle.js"; import TaskProcessor from "../Core/TaskProcessor.js"; import Buffer from "../Renderer/Buffer.js"; @@ -21,8 +20,8 @@ import ShaderProgram from "../Renderer/ShaderProgram.js"; import ShaderSource from "../Renderer/ShaderSource.js"; import VertexArray from "../Renderer/VertexArray.js"; import PolylineCommon from "../Shaders/PolylineCommon.js"; -import Vector3DTileClampedPolylinesVS from "../Shaders/Vector3DTileClampedPolylinesVS.js"; import Vector3DTileClampedPolylinesFS from "../Shaders/Vector3DTileClampedPolylinesFS.js"; +import Vector3DTileClampedPolylinesVS from "../Shaders/Vector3DTileClampedPolylinesVS.js"; import BlendingState from "./BlendingState.js"; import Cesium3DTileFeature from "./Cesium3DTileFeature.js"; import ClassificationType from "./ClassificationType.js"; diff --git a/packages/engine/Source/Scene/Vector3DTileContent.js b/packages/engine/Source/Scene/Vector3DTileContent.js index 5906132e94a3..bf0c1e28d9fb 100644 --- a/packages/engine/Source/Scene/Vector3DTileContent.js +++ b/packages/engine/Source/Scene/Vector3DTileContent.js @@ -1,21 +1,19 @@ +import { defined, DeveloperError, RuntimeError } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import defined from "../Core/defined.js"; +import ComponentDatatype from "../Core/ComponentDatatype.js"; +import decodeVectorPolylinePositions from "../Core/decodeVectorPolylinePositions.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import getJsonFromTypedArray from "../Core/getJsonFromTypedArray.js"; -import ComponentDatatype from "../Core/ComponentDatatype.js"; import CesiumMath from "../Core/Math.js"; import Matrix4 from "../Core/Matrix4.js"; import Rectangle from "../Core/Rectangle.js"; -import RuntimeError from "../Core/RuntimeError.js"; import Cesium3DTileBatchTable from "./Cesium3DTileBatchTable.js"; import Cesium3DTileFeatureTable from "./Cesium3DTileFeatureTable.js"; +import Vector3DTileClampedPolylines from "./Vector3DTileClampedPolylines.js"; import Vector3DTilePoints from "./Vector3DTilePoints.js"; import Vector3DTilePolygons from "./Vector3DTilePolygons.js"; import Vector3DTilePolylines from "./Vector3DTilePolylines.js"; -import Vector3DTileClampedPolylines from "./Vector3DTileClampedPolylines.js"; -import decodeVectorPolylinePositions from "../Core/decodeVectorPolylinePositions.js"; /** * Represents the contents of a diff --git a/packages/engine/Source/Scene/Vector3DTileGeometry.js b/packages/engine/Source/Scene/Vector3DTileGeometry.js index af0ff1f12ac0..994742197ad3 100644 --- a/packages/engine/Source/Scene/Vector3DTileGeometry.js +++ b/packages/engine/Source/Scene/Vector3DTileGeometry.js @@ -1,7 +1,7 @@ +import { defined } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import Matrix4 from "../Core/Matrix4.js"; import TaskProcessor from "../Core/TaskProcessor.js"; diff --git a/packages/engine/Source/Scene/Vector3DTilePoints.js b/packages/engine/Source/Scene/Vector3DTilePoints.js index ec2dd1351853..4cea3865683c 100644 --- a/packages/engine/Source/Scene/Vector3DTilePoints.js +++ b/packages/engine/Source/Scene/Vector3DTilePoints.js @@ -1,7 +1,7 @@ +import { defined } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import DistanceDisplayCondition from "../Core/DistanceDisplayCondition.js"; import Ellipsoid from "../Core/Ellipsoid.js"; diff --git a/packages/engine/Source/Scene/Vector3DTilePolygons.js b/packages/engine/Source/Scene/Vector3DTilePolygons.js index bbc853dfc760..1d1fa6c403c5 100644 --- a/packages/engine/Source/Scene/Vector3DTilePolygons.js +++ b/packages/engine/Source/Scene/Vector3DTilePolygons.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import IndexDatatype from "../Core/IndexDatatype.js"; diff --git a/packages/engine/Source/Scene/Vector3DTilePolylines.js b/packages/engine/Source/Scene/Vector3DTilePolylines.js index 1aaedc3b7589..c7b83ff2193f 100644 --- a/packages/engine/Source/Scene/Vector3DTilePolylines.js +++ b/packages/engine/Source/Scene/Vector3DTilePolylines.js @@ -1,10 +1,9 @@ +import { defined, FeatureDetection } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; import Color from "../Core/Color.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import Ellipsoid from "../Core/Ellipsoid.js"; -import FeatureDetection from "../Core/FeatureDetection.js"; import IndexDatatype from "../Core/IndexDatatype.js"; import Matrix4 from "../Core/Matrix4.js"; import Rectangle from "../Core/Rectangle.js"; diff --git a/packages/engine/Source/Scene/Vector3DTilePrimitive.js b/packages/engine/Source/Scene/Vector3DTilePrimitive.js index 7dbaddac9a05..0737ed1dedd4 100644 --- a/packages/engine/Source/Scene/Vector3DTilePrimitive.js +++ b/packages/engine/Source/Scene/Vector3DTilePrimitive.js @@ -1,9 +1,9 @@ +import { defined } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; import Color from "../Core/Color.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; +import Frozen from "../Core/Frozen.js"; import IndexDatatype from "../Core/IndexDatatype.js"; import Matrix4 from "../Core/Matrix4.js"; import PrimitiveType from "../Core/PrimitiveType.js"; diff --git a/packages/engine/Source/Scene/VertexAttributeSemantic.js b/packages/engine/Source/Scene/VertexAttributeSemantic.js index c168997fca27..b2676a7c4168 100644 --- a/packages/engine/Source/Scene/VertexAttributeSemantic.js +++ b/packages/engine/Source/Scene/VertexAttributeSemantic.js @@ -1,6 +1,4 @@ -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; /** * An enum describing the built-in vertex attribute semantics. diff --git a/packages/engine/Source/Scene/View.js b/packages/engine/Source/Scene/View.js index ec8cb870f681..5850a8e8f445 100644 --- a/packages/engine/Source/Scene/View.js +++ b/packages/engine/Source/Scene/View.js @@ -1,7 +1,7 @@ +import { defined } from "@cesium/utils"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import Cartesian3 from "../Core/Cartesian3.js"; import CullingVolume from "../Core/CullingVolume.js"; -import defined from "../Core/defined.js"; import getTimestamp from "../Core/getTimestamp.js"; import Interval from "../Core/Interval.js"; import CesiumMath from "../Core/Math.js"; diff --git a/packages/engine/Source/Scene/ViewportQuad.js b/packages/engine/Source/Scene/ViewportQuad.js index 4d63acdde231..1bc11594d0da 100644 --- a/packages/engine/Source/Scene/ViewportQuad.js +++ b/packages/engine/Source/Scene/ViewportQuad.js @@ -1,8 +1,7 @@ +import { defined, DeveloperError } from "@cesium/utils"; import BoundingRectangle from "../Core/BoundingRectangle.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Pass from "../Renderer/Pass.js"; import RenderState from "../Renderer/RenderState.js"; import ShaderSource from "../Renderer/ShaderSource.js"; diff --git a/packages/engine/Source/Scene/VoxelBoxShape.js b/packages/engine/Source/Scene/VoxelBoxShape.js index 9c1b893c6e5a..16b49d8c11df 100644 --- a/packages/engine/Source/Scene/VoxelBoxShape.js +++ b/packages/engine/Source/Scene/VoxelBoxShape.js @@ -1,7 +1,7 @@ +import { Check } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian3 from "../Core/Cartesian3.js"; import CesiumMath from "../Core/Math.js"; -import Check from "../Core/Check.js"; import Matrix3 from "../Core/Matrix3.js"; import Matrix4 from "../Core/Matrix4.js"; import OrientedBoundingBox from "../Core/OrientedBoundingBox.js"; diff --git a/packages/engine/Source/Scene/VoxelCell.js b/packages/engine/Source/Scene/VoxelCell.js index ead0d793a7c4..4c55288a7e51 100644 --- a/packages/engine/Source/Scene/VoxelCell.js +++ b/packages/engine/Source/Scene/VoxelCell.js @@ -1,8 +1,7 @@ +import { Check, defined } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; -import defined from "../Core/defined.js"; -import MetadataType from "./MetadataType.js"; import OrientedBoundingBox from "../Core/OrientedBoundingBox.js"; +import MetadataType from "./MetadataType.js"; /** * A cell from a {@link VoxelPrimitive}. diff --git a/packages/engine/Source/Scene/VoxelContent.js b/packages/engine/Source/Scene/VoxelContent.js index fd5c2d15a5b6..8084a868cbdf 100644 --- a/packages/engine/Source/Scene/VoxelContent.js +++ b/packages/engine/Source/Scene/VoxelContent.js @@ -1,8 +1,6 @@ import { destroyObject } from "@cesium/engine"; -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError } from "@cesium/utils"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import DeveloperError from "../Core/DeveloperError.js"; -import defined from "../Core/defined.js"; import GltfLoader from "./GltfLoader.js"; import MetadataComponentType from "./MetadataComponentType.js"; import MetadataType from "./MetadataType.js"; diff --git a/packages/engine/Source/Scene/VoxelCylinderShape.js b/packages/engine/Source/Scene/VoxelCylinderShape.js index b19759672570..9c05d159bdb1 100644 --- a/packages/engine/Source/Scene/VoxelCylinderShape.js +++ b/packages/engine/Source/Scene/VoxelCylinderShape.js @@ -1,3 +1,4 @@ +import { Check } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; diff --git a/packages/engine/Source/Scene/VoxelEllipsoidShape.js b/packages/engine/Source/Scene/VoxelEllipsoidShape.js index afb26af661db..0e21c8163cd5 100644 --- a/packages/engine/Source/Scene/VoxelEllipsoidShape.js +++ b/packages/engine/Source/Scene/VoxelEllipsoidShape.js @@ -1,7 +1,7 @@ +import { Check } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; -import Check from "../Core/Check.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import CesiumMath from "../Core/Math.js"; import Matrix3 from "../Core/Matrix3.js"; diff --git a/packages/engine/Source/Scene/VoxelPrimitive.js b/packages/engine/Source/Scene/VoxelPrimitive.js index fb94ed467de2..53c1c837192f 100644 --- a/packages/engine/Source/Scene/VoxelPrimitive.js +++ b/packages/engine/Source/Scene/VoxelPrimitive.js @@ -1,33 +1,32 @@ -import buildVoxelDrawCommands from "./buildVoxelDrawCommands.js"; +import { Check, defined } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; import Cartographic from "../Core/Cartographic.js"; -import Cesium3DTilesetStatistics from "./Cesium3DTilesetStatistics.js"; -import CesiumMath from "../Core/Math.js"; -import Check from "../Core/Check.js"; -import Color from "../Core/Color.js"; -import ClippingPlaneCollection from "./ClippingPlaneCollection.js"; import clone from "../Core/clone.js"; -import CustomShader from "./Model/CustomShader.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; +import Color from "../Core/Color.js"; import destroyObject from "../Core/destroyObject.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import JulianDate from "../Core/JulianDate.js"; -import Material from "./Material.js"; +import CesiumMath from "../Core/Math.js"; import Matrix3 from "../Core/Matrix3.js"; import Matrix4 from "../Core/Matrix4.js"; +import oneTimeWarning from "../Core/oneTimeWarning.js"; +import VerticalExaggeration from "../Core/VerticalExaggeration.js"; +import buildVoxelDrawCommands from "./buildVoxelDrawCommands.js"; +import Cesium3DTilesetStatistics from "./Cesium3DTilesetStatistics.js"; +import ClippingPlaneCollection from "./ClippingPlaneCollection.js"; +import Material from "./Material.js"; import MetadataComponentType from "./MetadataComponentType.js"; import MetadataType from "./MetadataType.js"; -import oneTimeWarning from "../Core/oneTimeWarning.js"; +import CustomShader from "./Model/CustomShader.js"; import PolylineCollection from "./PolylineCollection.js"; -import VerticalExaggeration from "../Core/VerticalExaggeration.js"; import VoxelContent from "./VoxelContent.js"; +import VoxelMetadataOrder from "./VoxelMetadataOrder.js"; import VoxelShapeType from "./VoxelShapeType.js"; import VoxelTraversal from "./VoxelTraversal.js"; -import VoxelMetadataOrder from "./VoxelMetadataOrder.js"; /** * A primitive that renders voxel data from a {@link VoxelProvider}. diff --git a/packages/engine/Source/Scene/VoxelProvider.js b/packages/engine/Source/Scene/VoxelProvider.js index 9b11d992e37b..5d5cb1e1dfa2 100644 --- a/packages/engine/Source/Scene/VoxelProvider.js +++ b/packages/engine/Source/Scene/VoxelProvider.js @@ -1,4 +1,4 @@ -import DeveloperError from "../Core/DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * Provides voxel data. Intended to be used with {@link VoxelPrimitive}. diff --git a/packages/engine/Source/Scene/VoxelRenderResources.js b/packages/engine/Source/Scene/VoxelRenderResources.js index 849a4229efe7..ed499b87618e 100644 --- a/packages/engine/Source/Scene/VoxelRenderResources.js +++ b/packages/engine/Source/Scene/VoxelRenderResources.js @@ -1,24 +1,24 @@ +import { defined } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; import combine from "../Core/combine.js"; -import defined from "../Core/defined.js"; import ShaderBuilder from "../Renderer/ShaderBuilder.js"; import ShaderDestination from "../Renderer/ShaderDestination.js"; -import VoxelUtils from "../Shaders/Voxels/VoxelUtils.js"; -import VoxelFS from "../Shaders/Voxels/VoxelFS.js"; -import VoxelVS from "../Shaders/Voxels/VoxelVS.js"; -import IntersectionUtils from "../Shaders/Voxels/IntersectionUtils.js"; -import IntersectDepth from "../Shaders/Voxels/IntersectDepth.js"; -import IntersectClippingPlanes from "../Shaders/Voxels/IntersectClippingPlanes.js"; -import IntersectLongitude from "../Shaders/Voxels/IntersectLongitude.js"; +import convertUvToBox from "../Shaders/Voxels/convertUvToBox.js"; +import convertUvToCylinder from "../Shaders/Voxels/convertUvToCylinder.js"; +import convertUvToEllipsoid from "../Shaders/Voxels/convertUvToEllipsoid.js"; import IntersectBox from "../Shaders/Voxels/IntersectBox.js"; +import IntersectClippingPlanes from "../Shaders/Voxels/IntersectClippingPlanes.js"; import IntersectCylinder from "../Shaders/Voxels/IntersectCylinder.js"; +import IntersectDepth from "../Shaders/Voxels/IntersectDepth.js"; import IntersectEllipsoid from "../Shaders/Voxels/IntersectEllipsoid.js"; import Intersection from "../Shaders/Voxels/Intersection.js"; -import convertUvToBox from "../Shaders/Voxels/convertUvToBox.js"; -import convertUvToCylinder from "../Shaders/Voxels/convertUvToCylinder.js"; -import convertUvToEllipsoid from "../Shaders/Voxels/convertUvToEllipsoid.js"; -import Octree from "../Shaders/Voxels/Octree.js"; +import IntersectionUtils from "../Shaders/Voxels/IntersectionUtils.js"; +import IntersectLongitude from "../Shaders/Voxels/IntersectLongitude.js"; import Megatexture from "../Shaders/Voxels/Megatexture.js"; +import Octree from "../Shaders/Voxels/Octree.js"; +import VoxelFS from "../Shaders/Voxels/VoxelFS.js"; +import VoxelUtils from "../Shaders/Voxels/VoxelUtils.js"; +import VoxelVS from "../Shaders/Voxels/VoxelVS.js"; import VoxelMetadataOrder from "./VoxelMetadataOrder.js"; /** diff --git a/packages/engine/Source/Scene/VoxelShape.js b/packages/engine/Source/Scene/VoxelShape.js index 14f647dbc1c7..f6d3e4c61e76 100644 --- a/packages/engine/Source/Scene/VoxelShape.js +++ b/packages/engine/Source/Scene/VoxelShape.js @@ -1,4 +1,4 @@ -import DeveloperError from "../Core/DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; /** * Controls per-shape behavior for culling and rendering voxel grids. diff --git a/packages/engine/Source/Scene/VoxelShapeType.js b/packages/engine/Source/Scene/VoxelShapeType.js index 92576dae3898..b3db23b9a237 100644 --- a/packages/engine/Source/Scene/VoxelShapeType.js +++ b/packages/engine/Source/Scene/VoxelShapeType.js @@ -1,4 +1,4 @@ -import DeveloperError from "../Core/DeveloperError.js"; +import { DeveloperError } from "@cesium/utils"; import VoxelBoxShape from "./VoxelBoxShape.js"; import VoxelCylinderShape from "./VoxelCylinderShape.js"; import VoxelEllipsoidShape from "./VoxelEllipsoidShape.js"; diff --git a/packages/engine/Source/Scene/VoxelTraversal.js b/packages/engine/Source/Scene/VoxelTraversal.js index 1a8e971d96f3..56b0cac60113 100644 --- a/packages/engine/Source/Scene/VoxelTraversal.js +++ b/packages/engine/Source/Scene/VoxelTraversal.js @@ -1,21 +1,21 @@ +import { defined } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; -import CesiumMath from "../Core/Math.js"; import CullingVolume from "../Core/CullingVolume.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; import DoubleEndedPriorityQueue from "../Core/DoubleEndedPriorityQueue.js"; import getTimestamp from "../Core/getTimestamp.js"; -import KeyframeNode from "./KeyframeNode.js"; -import MetadataType from "./MetadataType.js"; -import Megatexture from "./Megatexture.js"; +import CesiumMath from "../Core/Math.js"; import PixelFormat from "../Core/PixelFormat.js"; import PixelDatatype from "../Renderer/PixelDatatype.js"; import Sampler from "../Renderer/Sampler.js"; -import SpatialNode from "./SpatialNode.js"; import Texture from "../Renderer/Texture.js"; import TextureMagnificationFilter from "../Renderer/TextureMagnificationFilter.js"; import TextureMinificationFilter from "../Renderer/TextureMinificationFilter.js"; +import KeyframeNode from "./KeyframeNode.js"; +import Megatexture from "./Megatexture.js"; +import MetadataType from "./MetadataType.js"; +import SpatialNode from "./SpatialNode.js"; import VoxelMetadataOrder from "./VoxelMetadataOrder.js"; /** diff --git a/packages/engine/Source/Scene/WebMapServiceImageryProvider.js b/packages/engine/Source/Scene/WebMapServiceImageryProvider.js index ef37ffacea5d..618ce735e415 100644 --- a/packages/engine/Source/Scene/WebMapServiceImageryProvider.js +++ b/packages/engine/Source/Scene/WebMapServiceImageryProvider.js @@ -1,6 +1,5 @@ +import { defined, DeveloperError } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import GeographicTilingScheme from "../Core/GeographicTilingScheme.js"; import Resource from "../Core/Resource.js"; import WebMercatorProjection from "../Core/WebMercatorProjection.js"; diff --git a/packages/engine/Source/Scene/WebMapTileServiceImageryProvider.js b/packages/engine/Source/Scene/WebMapTileServiceImageryProvider.js index 9d248e6e2119..d50f8acc3d9e 100644 --- a/packages/engine/Source/Scene/WebMapTileServiceImageryProvider.js +++ b/packages/engine/Source/Scene/WebMapTileServiceImageryProvider.js @@ -1,9 +1,8 @@ +import { defined, DeveloperError } from "@cesium/utils"; import combine from "../Core/combine.js"; import Credit from "../Core/Credit.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Event from "../Core/Event.js"; +import Frozen from "../Core/Frozen.js"; import Rectangle from "../Core/Rectangle.js"; import Resource from "../Core/Resource.js"; import WebMercatorTilingScheme from "../Core/WebMercatorTilingScheme.js"; diff --git a/packages/engine/Source/Scene/buildVoxelDrawCommands.js b/packages/engine/Source/Scene/buildVoxelDrawCommands.js index 19f67111ccca..0135075b71f9 100644 --- a/packages/engine/Source/Scene/buildVoxelDrawCommands.js +++ b/packages/engine/Source/Scene/buildVoxelDrawCommands.js @@ -1,14 +1,14 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import PrimitiveType from "../Core/PrimitiveType.js"; -import BlendingState from "./BlendingState.js"; -import CullFace from "./CullFace.js"; -import getClippingFunction from "./getClippingFunction.js"; import DrawCommand from "../Renderer/DrawCommand.js"; import Pass from "../Renderer/Pass.js"; import RenderState from "../Renderer/RenderState.js"; import ShaderDestination from "../Renderer/ShaderDestination.js"; -import VoxelRenderResources from "./VoxelRenderResources.js"; +import BlendingState from "./BlendingState.js"; +import CullFace from "./CullFace.js"; +import getClippingFunction from "./getClippingFunction.js"; import processVoxelProperties from "./processVoxelProperties.js"; +import VoxelRenderResources from "./VoxelRenderResources.js"; /** * @function diff --git a/packages/engine/Source/Scene/computeFlyToLocationForRectangle.js b/packages/engine/Source/Scene/computeFlyToLocationForRectangle.js index d77d02a10400..f9b77c44b23e 100644 --- a/packages/engine/Source/Scene/computeFlyToLocationForRectangle.js +++ b/packages/engine/Source/Scene/computeFlyToLocationForRectangle.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import Rectangle from "../Core/Rectangle.js"; import sampleTerrainMostDetailed from "../Core/sampleTerrainMostDetailed.js"; import SceneMode from "./SceneMode.js"; diff --git a/packages/engine/Source/Scene/createElevationBandMaterial.js b/packages/engine/Source/Scene/createElevationBandMaterial.js index 729b97764957..5af7d64f59bf 100644 --- a/packages/engine/Source/Scene/createElevationBandMaterial.js +++ b/packages/engine/Source/Scene/createElevationBandMaterial.js @@ -1,10 +1,8 @@ +import { Check, defined, DeveloperError } from "@cesium/utils"; import Cartesian4 from "../Core/Cartesian4.js"; -import CesiumMath from "../Core/Math.js"; -import Check from "../Core/Check.js"; import Color from "../Core/Color.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; +import CesiumMath from "../Core/Math.js"; import mergeSort from "../Core/mergeSort.js"; import PixelFormat from "../Core/PixelFormat.js"; import PixelDatatype from "../Renderer/PixelDatatype.js"; diff --git a/packages/engine/Source/Scene/createGooglePhotorealistic3DTileset.js b/packages/engine/Source/Scene/createGooglePhotorealistic3DTileset.js index 0217d4cd8a77..c10a241ca441 100644 --- a/packages/engine/Source/Scene/createGooglePhotorealistic3DTileset.js +++ b/packages/engine/Source/Scene/createGooglePhotorealistic3DTileset.js @@ -1,11 +1,10 @@ -import Cesium3DTileset from "./Cesium3DTileset.js"; -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import IonResource from "../Core/IonResource.js"; import GoogleMaps from "../Core/GoogleMaps.js"; -import Resource from "../Core/Resource.js"; +import IonResource from "../Core/IonResource.js"; import oneTimeWarning from "../Core/oneTimeWarning.js"; +import Resource from "../Core/Resource.js"; +import Cesium3DTileset from "./Cesium3DTileset.js"; /** * Creates a {@link Cesium3DTileset} instance for the Google Photorealistic 3D diff --git a/packages/engine/Source/Scene/createOsmBuildingsAsync.js b/packages/engine/Source/Scene/createOsmBuildingsAsync.js index a8b3956b94d7..9818d9cfcf33 100644 --- a/packages/engine/Source/Scene/createOsmBuildingsAsync.js +++ b/packages/engine/Source/Scene/createOsmBuildingsAsync.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import Color from "../Core/Color.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import Cesium3DTileset from "./Cesium3DTileset.js"; import Cesium3DTileStyle from "./Cesium3DTileStyle.js"; diff --git a/packages/engine/Source/Scene/createTangentSpaceDebugPrimitive.js b/packages/engine/Source/Scene/createTangentSpaceDebugPrimitive.js index 6afd428b2334..72f43e9a9323 100644 --- a/packages/engine/Source/Scene/createTangentSpaceDebugPrimitive.js +++ b/packages/engine/Source/Scene/createTangentSpaceDebugPrimitive.js @@ -1,7 +1,6 @@ +import { defined, DeveloperError } from "@cesium/utils"; import ColorGeometryInstanceAttribute from "../Core/ColorGeometryInstanceAttribute.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import DeveloperError from "../Core/DeveloperError.js"; import GeometryInstance from "../Core/GeometryInstance.js"; import GeometryPipeline from "../Core/GeometryPipeline.js"; import Matrix4 from "../Core/Matrix4.js"; diff --git a/packages/engine/Source/Scene/findContentMetadata.js b/packages/engine/Source/Scene/findContentMetadata.js index 1a17b8808bdc..bcbe1426cadd 100644 --- a/packages/engine/Source/Scene/findContentMetadata.js +++ b/packages/engine/Source/Scene/findContentMetadata.js @@ -1,8 +1,8 @@ -import ContentMetadata from "./ContentMetadata.js"; +import { defined } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; -import hasExtension from "./hasExtension.js"; import oneTimeWarning from "../Core/oneTimeWarning.js"; +import ContentMetadata from "./ContentMetadata.js"; +import hasExtension from "./hasExtension.js"; /** * Check if a content has metadata, either defined in its metadata field (3D Tiles 1.1) or in diff --git a/packages/engine/Source/Scene/findGroupMetadata.js b/packages/engine/Source/Scene/findGroupMetadata.js index c19bf0ba3619..4bdb8141418d 100644 --- a/packages/engine/Source/Scene/findGroupMetadata.js +++ b/packages/engine/Source/Scene/findGroupMetadata.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import hasExtension from "./hasExtension.js"; /** diff --git a/packages/engine/Source/Scene/findTileMetadata.js b/packages/engine/Source/Scene/findTileMetadata.js index 8120e9be62ed..77242d0cfcac 100644 --- a/packages/engine/Source/Scene/findTileMetadata.js +++ b/packages/engine/Source/Scene/findTileMetadata.js @@ -1,8 +1,8 @@ +import { defined } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; +import oneTimeWarning from "../Core/oneTimeWarning.js"; import hasExtension from "./hasExtension.js"; import TileMetadata from "./TileMetadata.js"; -import oneTimeWarning from "../Core/oneTimeWarning.js"; /** * Check if a tile has metadata, either defined in its metadata field (3D Tiles 1.1) diff --git a/packages/engine/Source/Scene/getClipAndStyleCode.js b/packages/engine/Source/Scene/getClipAndStyleCode.js index 2dbc355196e6..3d630797e8c4 100644 --- a/packages/engine/Source/Scene/getClipAndStyleCode.js +++ b/packages/engine/Source/Scene/getClipAndStyleCode.js @@ -1,4 +1,4 @@ -import Check from "../Core/Check.js"; +import { Check } from "@cesium/utils"; /** * Gets a GLSL snippet that clips a fragment using the `clip` function from {@link getClippingFunction} and styles it. diff --git a/packages/engine/Source/Scene/getClippingFunction.js b/packages/engine/Source/Scene/getClippingFunction.js index 690d542cf4f5..5b038efaae5d 100644 --- a/packages/engine/Source/Scene/getClippingFunction.js +++ b/packages/engine/Source/Scene/getClippingFunction.js @@ -1,5 +1,5 @@ +import { Check } from "@cesium/utils"; import Cartesian2 from "../Core/Cartesian2.js"; -import Check from "../Core/Check.js"; import ClippingPlaneCollection from "./ClippingPlaneCollection.js"; const textureResolutionScratch = new Cartesian2(); diff --git a/packages/engine/Source/Scene/getMetadataClassProperty.js b/packages/engine/Source/Scene/getMetadataClassProperty.js index 3fb88ad7367e..14e44bb124e0 100644 --- a/packages/engine/Source/Scene/getMetadataClassProperty.js +++ b/packages/engine/Source/Scene/getMetadataClassProperty.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; /** * Return the `MetadataClassProperty` from the given schema that diff --git a/packages/engine/Source/Scene/getMetadataProperty.js b/packages/engine/Source/Scene/getMetadataProperty.js index 291f4f639851..16e8daf47277 100644 --- a/packages/engine/Source/Scene/getMetadataProperty.js +++ b/packages/engine/Source/Scene/getMetadataProperty.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; /** * Return the `PropertyTextureProperty` from the given `StructuralMetadata` diff --git a/packages/engine/Source/Scene/hasExtension.js b/packages/engine/Source/Scene/hasExtension.js index 477f7adf3b2e..8156eb9804bb 100644 --- a/packages/engine/Source/Scene/hasExtension.js +++ b/packages/engine/Source/Scene/hasExtension.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; /** * Check if a specific extension is present on a JSON object. This can be used diff --git a/packages/engine/Source/Scene/parseBatchTable.js b/packages/engine/Source/Scene/parseBatchTable.js index 8d65cccb422a..f7071f71453f 100644 --- a/packages/engine/Source/Scene/parseBatchTable.js +++ b/packages/engine/Source/Scene/parseBatchTable.js @@ -1,21 +1,18 @@ -import Check from "../Core/Check.js"; +import { Check, defined, DeveloperError, RuntimeError } from "@cesium/utils"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import defined from "../Core/defined.js"; import deprecationWarning from "../Core/deprecationWarning.js"; -import DeveloperError from "../Core/DeveloperError.js"; -import RuntimeError from "../Core/RuntimeError.js"; +import oneTimeWarning from "../Core/oneTimeWarning.js"; import BatchTableHierarchy from "./BatchTableHierarchy.js"; -import StructuralMetadata from "./StructuralMetadata.js"; -import PropertyAttribute from "./PropertyAttribute.js"; -import PropertyTable from "./PropertyTable.js"; import getBinaryAccessor from "./getBinaryAccessor.js"; import JsonMetadataTable from "./JsonMetadataTable.js"; import MetadataClass from "./MetadataClass.js"; import MetadataSchema from "./MetadataSchema.js"; import MetadataTable from "./MetadataTable.js"; -import ModelComponents from "./ModelComponents.js"; import ModelUtility from "./Model/ModelUtility.js"; -import oneTimeWarning from "../Core/oneTimeWarning.js"; +import ModelComponents from "./ModelComponents.js"; +import PropertyAttribute from "./PropertyAttribute.js"; +import PropertyTable from "./PropertyTable.js"; +import StructuralMetadata from "./StructuralMetadata.js"; /** * An object that parses the the 3D Tiles 1.0 batch table and transcodes it to diff --git a/packages/engine/Source/Scene/parseFeatureMetadataLegacy.js b/packages/engine/Source/Scene/parseFeatureMetadataLegacy.js index c5d83c248f1a..3de1517f76ed 100644 --- a/packages/engine/Source/Scene/parseFeatureMetadataLegacy.js +++ b/packages/engine/Source/Scene/parseFeatureMetadataLegacy.js @@ -1,11 +1,10 @@ -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import combine from "../Core/combine.js"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; +import MetadataTable from "./MetadataTable.js"; import PropertyTable from "./PropertyTable.js"; import PropertyTexture from "./PropertyTexture.js"; import StructuralMetadata from "./StructuralMetadata.js"; -import MetadataTable from "./MetadataTable.js"; /** * Parse the EXT_feature_metadata glTF extension to create a diff --git a/packages/engine/Source/Scene/parseStructuralMetadata.js b/packages/engine/Source/Scene/parseStructuralMetadata.js index 725237e819c0..d59e5cafc69f 100644 --- a/packages/engine/Source/Scene/parseStructuralMetadata.js +++ b/packages/engine/Source/Scene/parseStructuralMetadata.js @@ -1,11 +1,10 @@ -import Check from "../Core/Check.js"; +import { Check, defined } from "@cesium/utils"; import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; +import MetadataTable from "./MetadataTable.js"; +import PropertyAttribute from "./PropertyAttribute.js"; import PropertyTable from "./PropertyTable.js"; import PropertyTexture from "./PropertyTexture.js"; -import PropertyAttribute from "./PropertyAttribute.js"; import StructuralMetadata from "./StructuralMetadata.js"; -import MetadataTable from "./MetadataTable.js"; /** * Parse the EXT_structural_metadata glTF extension to create a diff --git a/packages/engine/Source/Scene/preprocess3DTileContent.js b/packages/engine/Source/Scene/preprocess3DTileContent.js index 8bb8f76d5c20..54fe5a0b5161 100644 --- a/packages/engine/Source/Scene/preprocess3DTileContent.js +++ b/packages/engine/Source/Scene/preprocess3DTileContent.js @@ -1,7 +1,6 @@ -import defined from "../Core/defined.js"; +import { defined, RuntimeError } from "@cesium/utils"; import getJsonFromTypedArray from "../Core/getJsonFromTypedArray.js"; import getMagic from "../Core/getMagic.js"; -import RuntimeError from "../Core/RuntimeError.js"; import Cesium3DTileContentType from "./Cesium3DTileContentType.js"; /** diff --git a/packages/engine/Source/Scene/processVoxelProperties.js b/packages/engine/Source/Scene/processVoxelProperties.js index d820a9ccf444..1eab3ab10351 100644 --- a/packages/engine/Source/Scene/processVoxelProperties.js +++ b/packages/engine/Source/Scene/processVoxelProperties.js @@ -1,6 +1,6 @@ -import defined from "../Core/defined.js"; -import MetadataType from "./MetadataType.js"; +import { defined } from "@cesium/utils"; import ShaderDestination from "../Renderer/ShaderDestination.js"; +import MetadataType from "./MetadataType.js"; /** * Update the shader with defines, structs, and functions to handle diff --git a/packages/engine/Source/Widget/CesiumWidget.js b/packages/engine/Source/Widget/CesiumWidget.js index f859c6a9ffad..e5886b7856a1 100644 --- a/packages/engine/Source/Widget/CesiumWidget.js +++ b/packages/engine/Source/Widget/CesiumWidget.js @@ -1,18 +1,17 @@ +import { defined, DeveloperError, FeatureDetection } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; import Clock from "../Core/Clock.js"; -import Frozen from "../Core/Frozen.js"; -import defined from "../Core/defined.js"; import destroyObject from "../Core/destroyObject.js"; -import DeveloperError from "../Core/DeveloperError.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import Event from "../Core/Event.js"; import EventHelper from "../Core/EventHelper.js"; -import FeatureDetection from "../Core/FeatureDetection.js"; import formatError from "../Core/formatError.js"; +import Frozen from "../Core/Frozen.js"; import HeadingPitchRange from "../Core/HeadingPitchRange.js"; import Matrix4 from "../Core/Matrix4.js"; +import ScreenSpaceEventHandler from "../Core/ScreenSpaceEventHandler.js"; import BoundingSphereState from "../DataSources/BoundingSphereState.js"; import DataSourceCollection from "../DataSources/DataSourceCollection.js"; import DataSourceDisplay from "../DataSources/DataSourceDisplay.js"; @@ -26,7 +25,6 @@ import ImageryLayer from "../Scene/ImageryLayer.js"; import Moon from "../Scene/Moon.js"; import Scene from "../Scene/Scene.js"; import SceneMode from "../Scene/SceneMode.js"; -import ScreenSpaceEventHandler from "../Core/ScreenSpaceEventHandler.js"; import ShadowMode from "../Scene/ShadowMode.js"; import SkyAtmosphere from "../Scene/SkyAtmosphere.js"; import SkyBox from "../Scene/SkyBox.js"; diff --git a/packages/engine/Source/Workers/createBoxGeometry.js b/packages/engine/Source/Workers/createBoxGeometry.js index e8ce43845e99..1ae05f626f69 100644 --- a/packages/engine/Source/Workers/createBoxGeometry.js +++ b/packages/engine/Source/Workers/createBoxGeometry.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import BoxGeometry from "../Core/BoxGeometry.js"; -import defined from "../Core/defined.js"; function createBoxGeometry(boxGeometry, offset) { if (defined(offset)) { diff --git a/packages/engine/Source/Workers/createBoxOutlineGeometry.js b/packages/engine/Source/Workers/createBoxOutlineGeometry.js index b336dd7038c5..6edf24bdcfc1 100644 --- a/packages/engine/Source/Workers/createBoxOutlineGeometry.js +++ b/packages/engine/Source/Workers/createBoxOutlineGeometry.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import BoxOutlineGeometry from "../Core/BoxOutlineGeometry.js"; -import defined from "../Core/defined.js"; function createBoxOutlineGeometry(boxGeometry, offset) { if (defined(offset)) { diff --git a/packages/engine/Source/Workers/createCircleGeometry.js b/packages/engine/Source/Workers/createCircleGeometry.js index be9f4796a31e..6d4d04a1d887 100644 --- a/packages/engine/Source/Workers/createCircleGeometry.js +++ b/packages/engine/Source/Workers/createCircleGeometry.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; import CircleGeometry from "../Core/CircleGeometry.js"; -import defined from "../Core/defined.js"; import Ellipsoid from "../Core/Ellipsoid.js"; function createCircleGeometry(circleGeometry, offset) { diff --git a/packages/engine/Source/Workers/createCircleOutlineGeometry.js b/packages/engine/Source/Workers/createCircleOutlineGeometry.js index e0522dd0c114..9746960b2719 100644 --- a/packages/engine/Source/Workers/createCircleOutlineGeometry.js +++ b/packages/engine/Source/Workers/createCircleOutlineGeometry.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; import CircleOutlineGeometry from "../Core/CircleOutlineGeometry.js"; -import defined from "../Core/defined.js"; import Ellipsoid from "../Core/Ellipsoid.js"; function createCircleOutlineGeometry(circleGeometry, offset) { diff --git a/packages/engine/Source/Workers/createCoplanarPolygonGeometry.js b/packages/engine/Source/Workers/createCoplanarPolygonGeometry.js index c9f015d08bf9..6c12a39638fe 100644 --- a/packages/engine/Source/Workers/createCoplanarPolygonGeometry.js +++ b/packages/engine/Source/Workers/createCoplanarPolygonGeometry.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import CoplanarPolygonGeometry from "../Core/CoplanarPolygonGeometry.js"; -import defined from "../Core/defined.js"; function createCoplanarPolygonGeometry(polygonGeometry, offset) { if (defined(offset)) { diff --git a/packages/engine/Source/Workers/createCoplanarPolygonOutlineGeometry.js b/packages/engine/Source/Workers/createCoplanarPolygonOutlineGeometry.js index d60c1658397f..30cdfdc116e2 100644 --- a/packages/engine/Source/Workers/createCoplanarPolygonOutlineGeometry.js +++ b/packages/engine/Source/Workers/createCoplanarPolygonOutlineGeometry.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import CoplanarPolygonOutlineGeometry from "../Core/CoplanarPolygonOutlineGeometry.js"; -import defined from "../Core/defined.js"; import Ellipsoid from "../Core/Ellipsoid.js"; function createCoplanarPolygonOutlineGeometry(polygonGeometry, offset) { diff --git a/packages/engine/Source/Workers/createCorridorGeometry.js b/packages/engine/Source/Workers/createCorridorGeometry.js index 078a9345765b..5b1e17060b31 100644 --- a/packages/engine/Source/Workers/createCorridorGeometry.js +++ b/packages/engine/Source/Workers/createCorridorGeometry.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import CorridorGeometry from "../Core/CorridorGeometry.js"; -import defined from "../Core/defined.js"; import Ellipsoid from "../Core/Ellipsoid.js"; function createCorridorGeometry(corridorGeometry, offset) { diff --git a/packages/engine/Source/Workers/createCorridorOutlineGeometry.js b/packages/engine/Source/Workers/createCorridorOutlineGeometry.js index 1967a82d1b7a..e43aef56f0c5 100644 --- a/packages/engine/Source/Workers/createCorridorOutlineGeometry.js +++ b/packages/engine/Source/Workers/createCorridorOutlineGeometry.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import CorridorOutlineGeometry from "../Core/CorridorOutlineGeometry.js"; -import defined from "../Core/defined.js"; import Ellipsoid from "../Core/Ellipsoid.js"; function createCorridorOutlineGeometry(corridorOutlineGeometry, offset) { diff --git a/packages/engine/Source/Workers/createCylinderGeometry.js b/packages/engine/Source/Workers/createCylinderGeometry.js index ca5c95f1d436..f0eb63ff5f47 100644 --- a/packages/engine/Source/Workers/createCylinderGeometry.js +++ b/packages/engine/Source/Workers/createCylinderGeometry.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import CylinderGeometry from "../Core/CylinderGeometry.js"; -import defined from "../Core/defined.js"; function createCylinderGeometry(cylinderGeometry, offset) { if (defined(offset)) { diff --git a/packages/engine/Source/Workers/createCylinderOutlineGeometry.js b/packages/engine/Source/Workers/createCylinderOutlineGeometry.js index 9e0305843693..d001ee86c3b1 100644 --- a/packages/engine/Source/Workers/createCylinderOutlineGeometry.js +++ b/packages/engine/Source/Workers/createCylinderOutlineGeometry.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import CylinderOutlineGeometry from "../Core/CylinderOutlineGeometry.js"; -import defined from "../Core/defined.js"; function createCylinderOutlineGeometry(cylinderGeometry, offset) { if (defined(offset)) { diff --git a/packages/engine/Source/Workers/createEllipseGeometry.js b/packages/engine/Source/Workers/createEllipseGeometry.js index f68896828083..b74163494366 100644 --- a/packages/engine/Source/Workers/createEllipseGeometry.js +++ b/packages/engine/Source/Workers/createEllipseGeometry.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import defined from "../Core/defined.js"; import EllipseGeometry from "../Core/EllipseGeometry.js"; import Ellipsoid from "../Core/Ellipsoid.js"; diff --git a/packages/engine/Source/Workers/createEllipseOutlineGeometry.js b/packages/engine/Source/Workers/createEllipseOutlineGeometry.js index 78d2b09a8fa1..97d49119854d 100644 --- a/packages/engine/Source/Workers/createEllipseOutlineGeometry.js +++ b/packages/engine/Source/Workers/createEllipseOutlineGeometry.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import Cartesian3 from "../Core/Cartesian3.js"; -import defined from "../Core/defined.js"; import EllipseOutlineGeometry from "../Core/EllipseOutlineGeometry.js"; import Ellipsoid from "../Core/Ellipsoid.js"; diff --git a/packages/engine/Source/Workers/createEllipsoidGeometry.js b/packages/engine/Source/Workers/createEllipsoidGeometry.js index d0ef51e972a7..c3ab23997f83 100644 --- a/packages/engine/Source/Workers/createEllipsoidGeometry.js +++ b/packages/engine/Source/Workers/createEllipsoidGeometry.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import EllipsoidGeometry from "../Core/EllipsoidGeometry.js"; function createEllipsoidGeometry(ellipsoidGeometry, offset) { diff --git a/packages/engine/Source/Workers/createEllipsoidOutlineGeometry.js b/packages/engine/Source/Workers/createEllipsoidOutlineGeometry.js index d56e6c225087..49d2fc803314 100644 --- a/packages/engine/Source/Workers/createEllipsoidOutlineGeometry.js +++ b/packages/engine/Source/Workers/createEllipsoidOutlineGeometry.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import EllipsoidOutlineGeometry from "../Core/EllipsoidOutlineGeometry.js"; function createEllipsoidOutlineGeometry(ellipsoidGeometry, offset) { diff --git a/packages/engine/Source/Workers/createFrustumGeometry.js b/packages/engine/Source/Workers/createFrustumGeometry.js index e8d2e294e0d5..3073dbd744d4 100644 --- a/packages/engine/Source/Workers/createFrustumGeometry.js +++ b/packages/engine/Source/Workers/createFrustumGeometry.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import FrustumGeometry from "../Core/FrustumGeometry.js"; function createFrustumGeometry(frustumGeometry, offset) { diff --git a/packages/engine/Source/Workers/createFrustumOutlineGeometry.js b/packages/engine/Source/Workers/createFrustumOutlineGeometry.js index 1b21f747be6c..e02df233f5d3 100644 --- a/packages/engine/Source/Workers/createFrustumOutlineGeometry.js +++ b/packages/engine/Source/Workers/createFrustumOutlineGeometry.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import FrustumOutlineGeometry from "../Core/FrustumOutlineGeometry.js"; function createFrustumOutlineGeometry(frustumGeometry, offset) { diff --git a/packages/engine/Source/Workers/createGeometry.js b/packages/engine/Source/Workers/createGeometry.js index a6abcfd0e3b5..3c47a2002e87 100644 --- a/packages/engine/Source/Workers/createGeometry.js +++ b/packages/engine/Source/Workers/createGeometry.js @@ -1,5 +1,4 @@ -import DeveloperError from "../Core/DeveloperError.js"; -import defined from "../Core/defined.js"; +import { defined, DeveloperError } from "@cesium/utils"; import PrimitivePipeline from "../Scene/PrimitivePipeline.js"; import createTaskProcessorWorker from "./createTaskProcessorWorker.js"; /* global require */ diff --git a/packages/engine/Source/Workers/createGroundPolylineGeometry.js b/packages/engine/Source/Workers/createGroundPolylineGeometry.js index 3884975ce10b..715af0a543bb 100644 --- a/packages/engine/Source/Workers/createGroundPolylineGeometry.js +++ b/packages/engine/Source/Workers/createGroundPolylineGeometry.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import ApproximateTerrainHeights from "../Core/ApproximateTerrainHeights.js"; -import defined from "../Core/defined.js"; import GroundPolylineGeometry from "../Core/GroundPolylineGeometry.js"; function createGroundPolylineGeometry(groundPolylineGeometry, offset) { diff --git a/packages/engine/Source/Workers/createPlaneGeometry.js b/packages/engine/Source/Workers/createPlaneGeometry.js index 0df30077cb5a..ca4f6a749fa2 100644 --- a/packages/engine/Source/Workers/createPlaneGeometry.js +++ b/packages/engine/Source/Workers/createPlaneGeometry.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import PlaneGeometry from "../Core/PlaneGeometry.js"; function createPlaneGeometry(planeGeometry, offset) { diff --git a/packages/engine/Source/Workers/createPlaneOutlineGeometry.js b/packages/engine/Source/Workers/createPlaneOutlineGeometry.js index 4cbcc780c23b..b43527606719 100644 --- a/packages/engine/Source/Workers/createPlaneOutlineGeometry.js +++ b/packages/engine/Source/Workers/createPlaneOutlineGeometry.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import PlaneOutlineGeometry from "../Core/PlaneOutlineGeometry.js"; function createPlaneOutlineGeometry(planeGeometry, offset) { diff --git a/packages/engine/Source/Workers/createPolygonGeometry.js b/packages/engine/Source/Workers/createPolygonGeometry.js index cdd81b8e1a3e..f22e858c54ef 100644 --- a/packages/engine/Source/Workers/createPolygonGeometry.js +++ b/packages/engine/Source/Workers/createPolygonGeometry.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import Ellipsoid from "../Core/Ellipsoid.js"; import PolygonGeometry from "../Core/PolygonGeometry.js"; diff --git a/packages/engine/Source/Workers/createPolygonOutlineGeometry.js b/packages/engine/Source/Workers/createPolygonOutlineGeometry.js index 07dd22ab2e6a..b632ae334fdb 100644 --- a/packages/engine/Source/Workers/createPolygonOutlineGeometry.js +++ b/packages/engine/Source/Workers/createPolygonOutlineGeometry.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import Ellipsoid from "../Core/Ellipsoid.js"; import PolygonOutlineGeometry from "../Core/PolygonOutlineGeometry.js"; diff --git a/packages/engine/Source/Workers/createPolylineGeometry.js b/packages/engine/Source/Workers/createPolylineGeometry.js index 5f971295b533..5e5b77d74706 100644 --- a/packages/engine/Source/Workers/createPolylineGeometry.js +++ b/packages/engine/Source/Workers/createPolylineGeometry.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import Ellipsoid from "../Core/Ellipsoid.js"; import PolylineGeometry from "../Core/PolylineGeometry.js"; diff --git a/packages/engine/Source/Workers/createPolylineVolumeGeometry.js b/packages/engine/Source/Workers/createPolylineVolumeGeometry.js index 804dde7d4c30..46965534f38e 100644 --- a/packages/engine/Source/Workers/createPolylineVolumeGeometry.js +++ b/packages/engine/Source/Workers/createPolylineVolumeGeometry.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import Ellipsoid from "../Core/Ellipsoid.js"; import PolylineVolumeGeometry from "../Core/PolylineVolumeGeometry.js"; diff --git a/packages/engine/Source/Workers/createPolylineVolumeOutlineGeometry.js b/packages/engine/Source/Workers/createPolylineVolumeOutlineGeometry.js index f69ade704988..7c450df489fb 100644 --- a/packages/engine/Source/Workers/createPolylineVolumeOutlineGeometry.js +++ b/packages/engine/Source/Workers/createPolylineVolumeOutlineGeometry.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import Ellipsoid from "../Core/Ellipsoid.js"; import PolylineVolumeOutlineGeometry from "../Core/PolylineVolumeOutlineGeometry.js"; diff --git a/packages/engine/Source/Workers/createRectangleGeometry.js b/packages/engine/Source/Workers/createRectangleGeometry.js index 3b60b8ec39ee..7d2116e0cde3 100644 --- a/packages/engine/Source/Workers/createRectangleGeometry.js +++ b/packages/engine/Source/Workers/createRectangleGeometry.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import Ellipsoid from "../Core/Ellipsoid.js"; import Rectangle from "../Core/Rectangle.js"; import RectangleGeometry from "../Core/RectangleGeometry.js"; diff --git a/packages/engine/Source/Workers/createRectangleOutlineGeometry.js b/packages/engine/Source/Workers/createRectangleOutlineGeometry.js index 269fae5dc3af..c2aeae8ccc45 100644 --- a/packages/engine/Source/Workers/createRectangleOutlineGeometry.js +++ b/packages/engine/Source/Workers/createRectangleOutlineGeometry.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import Ellipsoid from "../Core/Ellipsoid.js"; import Rectangle from "../Core/Rectangle.js"; import RectangleOutlineGeometry from "../Core/RectangleOutlineGeometry.js"; diff --git a/packages/engine/Source/Workers/createSimplePolylineGeometry.js b/packages/engine/Source/Workers/createSimplePolylineGeometry.js index bd77fa8fac90..d460d0198fd6 100644 --- a/packages/engine/Source/Workers/createSimplePolylineGeometry.js +++ b/packages/engine/Source/Workers/createSimplePolylineGeometry.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import Ellipsoid from "../Core/Ellipsoid.js"; import SimplePolylineGeometry from "../Core/SimplePolylineGeometry.js"; diff --git a/packages/engine/Source/Workers/createSphereGeometry.js b/packages/engine/Source/Workers/createSphereGeometry.js index ee4f1bb0ba4e..9231f39fd130 100644 --- a/packages/engine/Source/Workers/createSphereGeometry.js +++ b/packages/engine/Source/Workers/createSphereGeometry.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import SphereGeometry from "../Core/SphereGeometry.js"; function createSphereGeometry(sphereGeometry, offset) { diff --git a/packages/engine/Source/Workers/createSphereOutlineGeometry.js b/packages/engine/Source/Workers/createSphereOutlineGeometry.js index 50f0d1e0bbb5..b8b8cc5e69e6 100644 --- a/packages/engine/Source/Workers/createSphereOutlineGeometry.js +++ b/packages/engine/Source/Workers/createSphereOutlineGeometry.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import SphereOutlineGeometry from "../Core/SphereOutlineGeometry.js"; function createSphereOutlineGeometry(sphereGeometry, offset) { diff --git a/packages/engine/Source/Workers/createVectorTileGeometries.js b/packages/engine/Source/Workers/createVectorTileGeometries.js index 417019747147..c5fbc7e215b9 100644 --- a/packages/engine/Source/Workers/createVectorTileGeometries.js +++ b/packages/engine/Source/Workers/createVectorTileGeometries.js @@ -1,9 +1,9 @@ +import { defined } from "@cesium/utils"; import BoundingSphere from "../Core/BoundingSphere.js"; import BoxGeometry from "../Core/BoxGeometry.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Color from "../Core/Color.js"; import CylinderGeometry from "../Core/CylinderGeometry.js"; -import defined from "../Core/defined.js"; import EllipsoidGeometry from "../Core/EllipsoidGeometry.js"; import IndexDatatype from "../Core/IndexDatatype.js"; import Matrix4 from "../Core/Matrix4.js"; diff --git a/packages/engine/Source/Workers/createVectorTilePolygons.js b/packages/engine/Source/Workers/createVectorTilePolygons.js index 9c64ca79791b..b7688f7e4e0d 100644 --- a/packages/engine/Source/Workers/createVectorTilePolygons.js +++ b/packages/engine/Source/Workers/createVectorTilePolygons.js @@ -1,8 +1,8 @@ +import { defined } from "@cesium/utils"; import AttributeCompression from "../Core/AttributeCompression.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; import Color from "../Core/Color.js"; -import defined from "../Core/defined.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import IndexDatatype from "../Core/IndexDatatype.js"; import CesiumMath from "../Core/Math.js"; diff --git a/packages/engine/Source/Workers/createVerticesFromGoogleEarthEnterpriseBuffer.js b/packages/engine/Source/Workers/createVerticesFromGoogleEarthEnterpriseBuffer.js index 0297a8895ba3..518084f8fe7e 100644 --- a/packages/engine/Source/Workers/createVerticesFromGoogleEarthEnterpriseBuffer.js +++ b/packages/engine/Source/Workers/createVerticesFromGoogleEarthEnterpriseBuffer.js @@ -1,16 +1,15 @@ +import { defined, RuntimeError } from "@cesium/utils"; import AxisAlignedBoundingBox from "../Core/AxisAlignedBoundingBox.js"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; -import defined from "../Core/defined.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import EllipsoidalOccluder from "../Core/EllipsoidalOccluder.js"; import CesiumMath from "../Core/Math.js"; import Matrix4 from "../Core/Matrix4.js"; import OrientedBoundingBox from "../Core/OrientedBoundingBox.js"; import Rectangle from "../Core/Rectangle.js"; -import RuntimeError from "../Core/RuntimeError.js"; import TerrainEncoding from "../Core/TerrainEncoding.js"; import Transforms from "../Core/Transforms.js"; import WebMercatorProjection from "../Core/WebMercatorProjection.js"; diff --git a/packages/engine/Source/Workers/createVerticesFromHeightmap.js b/packages/engine/Source/Workers/createVerticesFromHeightmap.js index 0432132638b0..e02297a69643 100644 --- a/packages/engine/Source/Workers/createVerticesFromHeightmap.js +++ b/packages/engine/Source/Workers/createVerticesFromHeightmap.js @@ -1,9 +1,9 @@ +import { RuntimeError } from "@cesium/utils"; +import Lerc from "lerc"; import Ellipsoid from "../Core/Ellipsoid.js"; import HeightmapEncoding from "../Core/HeightmapEncoding.js"; import HeightmapTessellator from "../Core/HeightmapTessellator.js"; import Rectangle from "../Core/Rectangle.js"; -import RuntimeError from "../Core/RuntimeError.js"; -import Lerc from "lerc"; import createTaskProcessorWorker from "./createTaskProcessorWorker.js"; function createVerticesFromHeightmap(parameters, transferableObjects) { diff --git a/packages/engine/Source/Workers/createVerticesFromQuantizedTerrainMesh.js b/packages/engine/Source/Workers/createVerticesFromQuantizedTerrainMesh.js index feb5eed9b78a..1e7fe80e6f5a 100644 --- a/packages/engine/Source/Workers/createVerticesFromQuantizedTerrainMesh.js +++ b/packages/engine/Source/Workers/createVerticesFromQuantizedTerrainMesh.js @@ -1,8 +1,8 @@ +import { defined } from "@cesium/utils"; import AxisAlignedBoundingBox from "../Core/AxisAlignedBoundingBox.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; -import defined from "../Core/defined.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import EllipsoidalOccluder from "../Core/EllipsoidalOccluder.js"; import IndexDatatype from "../Core/IndexDatatype.js"; diff --git a/packages/engine/Source/Workers/createWallGeometry.js b/packages/engine/Source/Workers/createWallGeometry.js index e52d90d56e6e..6ebb6ca80d87 100644 --- a/packages/engine/Source/Workers/createWallGeometry.js +++ b/packages/engine/Source/Workers/createWallGeometry.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import Ellipsoid from "../Core/Ellipsoid.js"; import WallGeometry from "../Core/WallGeometry.js"; diff --git a/packages/engine/Source/Workers/createWallOutlineGeometry.js b/packages/engine/Source/Workers/createWallOutlineGeometry.js index d8bd8b00aa09..d482ff895b9e 100644 --- a/packages/engine/Source/Workers/createWallOutlineGeometry.js +++ b/packages/engine/Source/Workers/createWallOutlineGeometry.js @@ -1,4 +1,4 @@ -import defined from "../Core/defined.js"; +import { defined } from "@cesium/utils"; import Ellipsoid from "../Core/Ellipsoid.js"; import WallOutlineGeometry from "../Core/WallOutlineGeometry.js"; diff --git a/packages/engine/Source/Workers/decodeDraco.js b/packages/engine/Source/Workers/decodeDraco.js index 5abe00986d1c..0d9a47f11262 100644 --- a/packages/engine/Source/Workers/decodeDraco.js +++ b/packages/engine/Source/Workers/decodeDraco.js @@ -1,9 +1,8 @@ +import { defined, RuntimeError } from "@cesium/utils"; +import dracoModule from "draco3d/draco_decoder_nodejs.js"; import ComponentDatatype from "../Core/ComponentDatatype.js"; -import defined from "../Core/defined.js"; import IndexDatatype from "../Core/IndexDatatype.js"; -import RuntimeError from "../Core/RuntimeError.js"; import createTaskProcessorWorker from "./createTaskProcessorWorker.js"; -import dracoModule from "draco3d/draco_decoder_nodejs.js"; let draco; diff --git a/packages/engine/Source/Workers/decodeGoogleEarthEnterprisePacket.js b/packages/engine/Source/Workers/decodeGoogleEarthEnterprisePacket.js index 2dce4702e2ff..1698c274eaff 100644 --- a/packages/engine/Source/Workers/decodeGoogleEarthEnterprisePacket.js +++ b/packages/engine/Source/Workers/decodeGoogleEarthEnterprisePacket.js @@ -1,7 +1,7 @@ +import { RuntimeError } from "@cesium/utils"; +import pako from "pako/lib/inflate.js"; import decodeGoogleEarthEnterpriseData from "../Core/decodeGoogleEarthEnterpriseData.js"; import GoogleEarthEnterpriseTileInformation from "../Core/GoogleEarthEnterpriseTileInformation.js"; -import RuntimeError from "../Core/RuntimeError.js"; -import pako from "pako/lib/inflate.js"; import createTaskProcessorWorker from "./createTaskProcessorWorker.js"; // Datatype sizes diff --git a/packages/engine/Source/Workers/decodeI3S.js b/packages/engine/Source/Workers/decodeI3S.js index 3d1330e63743..5de73003646e 100644 --- a/packages/engine/Source/Workers/decodeI3S.js +++ b/packages/engine/Source/Workers/decodeI3S.js @@ -1,14 +1,14 @@ -import createTaskProcessorWorker from "./createTaskProcessorWorker.js"; -import defined from "../Core/defined.js"; -import WebMercatorProjection from "../Core/WebMercatorProjection.js"; -import Ellipsoid from "../Core/Ellipsoid.js"; -import Cartographic from "../Core/Cartographic.js"; +import { defined } from "@cesium/utils"; +import dracoModule from "draco3d/draco_decoder_nodejs.js"; import Cartesian3 from "../Core/Cartesian3.js"; +import Cartographic from "../Core/Cartographic.js"; import Color from "../Core/Color.js"; -import Matrix3 from "../Core/Matrix3.js"; +import Ellipsoid from "../Core/Ellipsoid.js"; import CesiumMath from "../Core/Math.js"; -import dracoModule from "draco3d/draco_decoder_nodejs.js"; +import Matrix3 from "../Core/Matrix3.js"; import srgbToLinear from "../Core/srgbToLinear.js"; +import WebMercatorProjection from "../Core/WebMercatorProjection.js"; +import createTaskProcessorWorker from "./createTaskProcessorWorker.js"; let draco; diff --git a/packages/engine/Source/Workers/transcodeKTX2.js b/packages/engine/Source/Workers/transcodeKTX2.js index 4e3836bd8754..f91843961ceb 100644 --- a/packages/engine/Source/Workers/transcodeKTX2.js +++ b/packages/engine/Source/Workers/transcodeKTX2.js @@ -1,12 +1,10 @@ -import defined from "../Core/defined.js"; -import Check from "../Core/Check.js"; -import PixelFormat from "../Core/PixelFormat.js"; -import RuntimeError from "../Core/RuntimeError.js"; +import { Check, defined, RuntimeError } from "@cesium/utils"; +import { read } from "ktx-parse"; import VulkanConstants from "../Core//VulkanConstants.js"; +import PixelFormat from "../Core/PixelFormat.js"; import PixelDatatype from "../Renderer/PixelDatatype.js"; -import createTaskProcessorWorker from "./createTaskProcessorWorker.js"; -import { read } from "ktx-parse"; import basis from "../ThirdParty/Workers/basis_transcoder.js"; +import createTaskProcessorWorker from "./createTaskProcessorWorker.js"; const faceOrder = [ "positiveX", diff --git a/packages/engine/Source/Workers/upsampleQuantizedTerrainMesh.js b/packages/engine/Source/Workers/upsampleQuantizedTerrainMesh.js index fbe235b64a28..085f4005156e 100644 --- a/packages/engine/Source/Workers/upsampleQuantizedTerrainMesh.js +++ b/packages/engine/Source/Workers/upsampleQuantizedTerrainMesh.js @@ -1,9 +1,9 @@ +import { defined } from "@cesium/utils"; import AttributeCompression from "../Core/AttributeCompression.js"; import BoundingSphere from "../Core/BoundingSphere.js"; import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartographic from "../Core/Cartographic.js"; -import defined from "../Core/defined.js"; import Ellipsoid from "../Core/Ellipsoid.js"; import EllipsoidalOccluder from "../Core/EllipsoidalOccluder.js"; import IndexDatatype from "../Core/IndexDatatype.js"; diff --git a/packages/engine/Specs/Core/ApproximateTerrainHeightsSpec.js b/packages/engine/Specs/Core/ApproximateTerrainHeightsSpec.js index 14665fef2327..c12ce98157aa 100644 --- a/packages/engine/Specs/Core/ApproximateTerrainHeightsSpec.js +++ b/packages/engine/Specs/Core/ApproximateTerrainHeightsSpec.js @@ -1,8 +1,8 @@ import { ApproximateTerrainHeights, Cartesian3, - Rectangle, Math as CesiumMath, + Rectangle, } from "../../index.js"; describe("Core/ApproximateTerrainHeights", function () { diff --git a/packages/engine/Specs/Core/ArcGISTiledElevationTerrainProviderSpec.js b/packages/engine/Specs/Core/ArcGISTiledElevationTerrainProviderSpec.js index c59001bc02a8..35ed24c20a73 100644 --- a/packages/engine/Specs/Core/ArcGISTiledElevationTerrainProviderSpec.js +++ b/packages/engine/Specs/Core/ArcGISTiledElevationTerrainProviderSpec.js @@ -1,14 +1,14 @@ +import { RuntimeError } from "@cesium/utils"; import { ArcGISTiledElevationTerrainProvider, GeographicTilingScheme, HeightmapTerrainData, + Math as CesiumMath, Request, RequestScheduler, Resource, - RuntimeError, TerrainProvider, WebMercatorTilingScheme, - Math as CesiumMath, } from "../../index.js"; describe("Core/ArcGISTiledElevationTerrainProvider", function () { diff --git a/packages/engine/Specs/Core/AttributeCompressionSpec.js b/packages/engine/Specs/Core/AttributeCompressionSpec.js index 1a9237e6f8b1..a3d1985d2370 100644 --- a/packages/engine/Specs/Core/AttributeCompressionSpec.js +++ b/packages/engine/Specs/Core/AttributeCompressionSpec.js @@ -1,11 +1,11 @@ +import { defined } from "@cesium/utils"; import { AttributeCompression, AttributeType, - ComponentDatatype, Cartesian2, Cartesian3, Cartesian4, - defined, + ComponentDatatype, Math as CesiumMath, } from "../../index.js"; diff --git a/packages/engine/Specs/Core/BoundingSphereSpec.js b/packages/engine/Specs/Core/BoundingSphereSpec.js index 82283f4a7d60..37375248e467 100644 --- a/packages/engine/Specs/Core/BoundingSphereSpec.js +++ b/packages/engine/Specs/Core/BoundingSphereSpec.js @@ -7,12 +7,12 @@ import { GeographicProjection, Intersect, Interval, + Math as CesiumMath, Matrix4, OrientedBoundingBox, Plane, Quaternion, Rectangle, - Math as CesiumMath, } from "../../index.js"; import createPackableSpecs from "../../../../Specs/createPackableSpecs.js"; diff --git a/packages/engine/Specs/Core/CesiumTerrainProviderSpec.js b/packages/engine/Specs/Core/CesiumTerrainProviderSpec.js index 9422bc626d51..c4c2f173f826 100644 --- a/packages/engine/Specs/Core/CesiumTerrainProviderSpec.js +++ b/packages/engine/Specs/Core/CesiumTerrainProviderSpec.js @@ -1,3 +1,4 @@ +import { RuntimeError } from "@cesium/utils"; import { CesiumTerrainProvider, Ellipsoid, @@ -10,7 +11,6 @@ import { Request, RequestScheduler, Resource, - RuntimeError, TerrainProvider, } from "../../index.js"; diff --git a/packages/engine/Specs/Core/ClockSpec.js b/packages/engine/Specs/Core/ClockSpec.js index be69c6277a6f..6632c5f53cc4 100644 --- a/packages/engine/Specs/Core/ClockSpec.js +++ b/packages/engine/Specs/Core/ClockSpec.js @@ -1,10 +1,5 @@ -import { - Clock, - ClockRange, - ClockStep, - defined, - JulianDate, -} from "../../index.js"; +import { defined } from "@cesium/utils"; +import { Clock, ClockRange, ClockStep, JulianDate } from "../../index.js"; describe("Core/Clock", function () { it("sets default parameters when constructed", function () { diff --git a/packages/engine/Specs/Core/CoplanarPolygonGeometrySpec.js b/packages/engine/Specs/Core/CoplanarPolygonGeometrySpec.js index 3ccf284c23c2..08b7efccea0d 100644 --- a/packages/engine/Specs/Core/CoplanarPolygonGeometrySpec.js +++ b/packages/engine/Specs/Core/CoplanarPolygonGeometrySpec.js @@ -1,9 +1,9 @@ import { - Cartesian3, Cartesian2, + Cartesian3, CoplanarPolygonGeometry, - Math as CesiumMath, Ellipsoid, + Math as CesiumMath, VertexFormat, } from "../../index.js"; diff --git a/packages/engine/Specs/Core/DistanceDisplayConditionSpec.js b/packages/engine/Specs/Core/DistanceDisplayConditionSpec.js index 2eebd13e1b21..d5e1feeebcfe 100644 --- a/packages/engine/Specs/Core/DistanceDisplayConditionSpec.js +++ b/packages/engine/Specs/Core/DistanceDisplayConditionSpec.js @@ -1,5 +1,5 @@ -import { DistanceDisplayCondition } from "../../index.js"; import createPackableSpecs from "../../../../Specs/createPackableSpecs.js"; +import { DistanceDisplayCondition } from "../../index.js"; describe("Core/DistanceDisplayCondition", function () { it("default constructs", function () { diff --git a/packages/engine/Specs/Core/EarthOrientationParametersSpec.js b/packages/engine/Specs/Core/EarthOrientationParametersSpec.js index c93568689067..91ae231bd3e3 100644 --- a/packages/engine/Specs/Core/EarthOrientationParametersSpec.js +++ b/packages/engine/Specs/Core/EarthOrientationParametersSpec.js @@ -1,9 +1,8 @@ +import { defined, RuntimeError } from "@cesium/utils"; import { - defined, EarthOrientationParameters, JulianDate, TimeStandard, - RuntimeError, } from "../../index.js"; describe("Core/EarthOrientationParameters", function () { diff --git a/packages/engine/Specs/Core/EllipsoidSpec.js b/packages/engine/Specs/Core/EllipsoidSpec.js index 40f470cbfed9..ebb5bab75660 100644 --- a/packages/engine/Specs/Core/EllipsoidSpec.js +++ b/packages/engine/Specs/Core/EllipsoidSpec.js @@ -3,8 +3,8 @@ import { Cartesian3, Cartographic, Ellipsoid, - Rectangle, Math as CesiumMath, + Rectangle, } from "../../index.js"; import createPackableSpecs from "../../../../Specs/createPackableSpecs.js"; diff --git a/packages/engine/Specs/Core/GoogleEarthEnterpriseMetadataSpec.js b/packages/engine/Specs/Core/GoogleEarthEnterpriseMetadataSpec.js index 64486d31c634..45cb3db669a2 100644 --- a/packages/engine/Specs/Core/GoogleEarthEnterpriseMetadataSpec.js +++ b/packages/engine/Specs/Core/GoogleEarthEnterpriseMetadataSpec.js @@ -1,3 +1,4 @@ +import { RuntimeError } from "@cesium/utils"; import { decodeGoogleEarthEnterpriseData, GoogleEarthEnterpriseMetadata, @@ -5,7 +6,6 @@ import { Math as CesiumMath, Request, Resource, - RuntimeError, } from "../../index.js"; describe("Core/GoogleEarthEnterpriseMetadata", function () { diff --git a/packages/engine/Specs/Core/GoogleEarthEnterpriseTerrainProviderSpec.js b/packages/engine/Specs/Core/GoogleEarthEnterpriseTerrainProviderSpec.js index 9f59459f2f4a..b7e9d7f1f43c 100644 --- a/packages/engine/Specs/Core/GoogleEarthEnterpriseTerrainProviderSpec.js +++ b/packages/engine/Specs/Core/GoogleEarthEnterpriseTerrainProviderSpec.js @@ -1,3 +1,4 @@ +import { RuntimeError } from "@cesium/utils"; import { Ellipsoid, GeographicTilingScheme, @@ -9,7 +10,6 @@ import { Request, RequestScheduler, Resource, - RuntimeError, TerrainProvider, } from "../../index.js"; diff --git a/packages/engine/Specs/Core/GoogleGeocoderServicesSpec.js b/packages/engine/Specs/Core/GoogleGeocoderServicesSpec.js index 5260dc265742..1a528741e8c6 100644 --- a/packages/engine/Specs/Core/GoogleGeocoderServicesSpec.js +++ b/packages/engine/Specs/Core/GoogleGeocoderServicesSpec.js @@ -2,8 +2,8 @@ import { createGuid, GeocoderService, GoogleGeocoderService, - Resource, Rectangle, + Resource, } from "../../index.js"; describe("Core/GoogleGeocoderService", function () { diff --git a/packages/engine/Specs/Core/HeightmapTerrainDataSpec.js b/packages/engine/Specs/Core/HeightmapTerrainDataSpec.js index 57d0c557da02..3f52e5a88d15 100644 --- a/packages/engine/Specs/Core/HeightmapTerrainDataSpec.js +++ b/packages/engine/Specs/Core/HeightmapTerrainDataSpec.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import { - defined, GeographicTilingScheme, HeightmapEncoding, HeightmapTerrainData, diff --git a/packages/engine/Specs/Core/HilbertOrderSpec.js b/packages/engine/Specs/Core/HilbertOrderSpec.js index bd25f2b05fc9..8a07828d9999 100644 --- a/packages/engine/Specs/Core/HilbertOrderSpec.js +++ b/packages/engine/Specs/Core/HilbertOrderSpec.js @@ -1,4 +1,5 @@ -import { FeatureDetection, HilbertOrder } from "../../index.js"; +import { FeatureDetection } from "@cesium/utils"; +import { HilbertOrder } from "../../index.js"; describe("Core/HilbertOrder", function () { /* eslint-disable no-undef */ diff --git a/packages/engine/Specs/Core/ITwinPlatformSpec.js b/packages/engine/Specs/Core/ITwinPlatformSpec.js index 6e41e9e9b01c..31ed159e90a2 100644 --- a/packages/engine/Specs/Core/ITwinPlatformSpec.js +++ b/packages/engine/Specs/Core/ITwinPlatformSpec.js @@ -1,9 +1,5 @@ -import { - ITwinPlatform, - RequestErrorEvent, - Resource, - RuntimeError, -} from "../../index.js"; +import { RuntimeError } from "@cesium/utils"; +import { ITwinPlatform, RequestErrorEvent, Resource } from "../../index.js"; describe("ITwinPlatform", () => { let previousAccessToken; diff --git a/packages/engine/Specs/Core/Iau2006XysDataSpec.js b/packages/engine/Specs/Core/Iau2006XysDataSpec.js index 86e48b9a1d6b..5cee0152c2b0 100644 --- a/packages/engine/Specs/Core/Iau2006XysDataSpec.js +++ b/packages/engine/Specs/Core/Iau2006XysDataSpec.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import { buildModuleUrl, - defined, Iau2006XysData, Iau2006XysSample, } from "../../index.js"; diff --git a/packages/engine/Specs/Core/IauOrientationAxesSpec.js b/packages/engine/Specs/Core/IauOrientationAxesSpec.js index 77c553f27741..472b6cac2520 100644 --- a/packages/engine/Specs/Core/IauOrientationAxesSpec.js +++ b/packages/engine/Specs/Core/IauOrientationAxesSpec.js @@ -2,8 +2,8 @@ import { Iau2000Orientation, IauOrientationAxes, JulianDate, - Matrix3, Math as CesiumMath, + Matrix3, TimeStandard, } from "../../index.js"; diff --git a/packages/engine/Specs/Core/IonGeocoderServiceSpec.js b/packages/engine/Specs/Core/IonGeocoderServiceSpec.js index 719a762daffc..53d09ba515b2 100644 --- a/packages/engine/Specs/Core/IonGeocoderServiceSpec.js +++ b/packages/engine/Specs/Core/IonGeocoderServiceSpec.js @@ -1,5 +1,5 @@ +import { DeveloperError } from "@cesium/utils"; import { - DeveloperError, GeocoderService, GeocodeType, Ion, diff --git a/packages/engine/Specs/Core/IonResourceSpec.js b/packages/engine/Specs/Core/IonResourceSpec.js index fe073840afc5..2097ccb78b4c 100644 --- a/packages/engine/Specs/Core/IonResourceSpec.js +++ b/packages/engine/Specs/Core/IonResourceSpec.js @@ -1,11 +1,5 @@ -import { - defer, - Ion, - IonResource, - RequestErrorEvent, - Resource, - RuntimeError, -} from "../../index.js"; +import { defer, RuntimeError } from "@cesium/utils"; +import { Ion, IonResource, RequestErrorEvent, Resource } from "../../index.js"; describe("Core/IonResource", function () { const assetId = 123890213; diff --git a/packages/engine/Specs/Core/Matrix2Spec.js b/packages/engine/Specs/Core/Matrix2Spec.js index bfbab21851fb..f687c5bfb47a 100644 --- a/packages/engine/Specs/Core/Matrix2Spec.js +++ b/packages/engine/Specs/Core/Matrix2Spec.js @@ -1,7 +1,7 @@ import { Cartesian2, Math as CesiumMath, Matrix2 } from "../../index.js"; -import createPackableSpecs from "../../../../Specs/createPackableSpecs.js"; import createPackableArraySpecs from "../../../../Specs/createPackableArraySpecs.js"; +import createPackableSpecs from "../../../../Specs/createPackableSpecs.js"; describe("Core/Matrix2", function () { it("default constructor creates values array with all zeros.", function () { diff --git a/packages/engine/Specs/Core/Matrix3Spec.js b/packages/engine/Specs/Core/Matrix3Spec.js index 3d2f4641aeb7..b600e3002c88 100644 --- a/packages/engine/Specs/Core/Matrix3Spec.js +++ b/packages/engine/Specs/Core/Matrix3Spec.js @@ -6,8 +6,8 @@ import { Quaternion, } from "../../index.js"; -import createPackableSpecs from "../../../../Specs/createPackableSpecs.js"; import createPackableArraySpecs from "../../../../Specs/createPackableArraySpecs.js"; +import createPackableSpecs from "../../../../Specs/createPackableSpecs.js"; describe("Core/Matrix3", function () { it("default constructor creates values array with all zeros.", function () { diff --git a/packages/engine/Specs/Core/Matrix4Spec.js b/packages/engine/Specs/Core/Matrix4Spec.js index 375416d0a849..3c837cb0ccd4 100644 --- a/packages/engine/Specs/Core/Matrix4Spec.js +++ b/packages/engine/Specs/Core/Matrix4Spec.js @@ -1,3 +1,4 @@ +import { RuntimeError } from "@cesium/utils"; import { Cartesian3, Cartesian4, @@ -6,11 +7,10 @@ import { Matrix4, Quaternion, TranslationRotationScale, - RuntimeError, } from "../../index.js"; -import createPackableSpecs from "../../../../Specs/createPackableSpecs.js"; import createPackableArraySpecs from "../../../../Specs/createPackableArraySpecs.js"; +import createPackableSpecs from "../../../../Specs/createPackableSpecs.js"; describe("Core/Matrix4", function () { it("default constructor creates values array with all zeros.", function () { diff --git a/packages/engine/Specs/Core/NearFarScalarSpec.js b/packages/engine/Specs/Core/NearFarScalarSpec.js index 1e133af23edb..12391e3be829 100644 --- a/packages/engine/Specs/Core/NearFarScalarSpec.js +++ b/packages/engine/Specs/Core/NearFarScalarSpec.js @@ -1,5 +1,5 @@ -import { NearFarScalar } from "../../index.js"; import createPackableSpecs from "../../../../Specs/createPackableSpecs.js"; +import { NearFarScalar } from "../../index.js"; describe("Core/NearFarScalar", function () { it("constructs without arguments", function () { diff --git a/packages/engine/Specs/Core/PlaneOutlineGeometrySpec.js b/packages/engine/Specs/Core/PlaneOutlineGeometrySpec.js index 34d4019446d9..02b215bd65e9 100644 --- a/packages/engine/Specs/Core/PlaneOutlineGeometrySpec.js +++ b/packages/engine/Specs/Core/PlaneOutlineGeometrySpec.js @@ -1,5 +1,5 @@ -import { PlaneOutlineGeometry } from "../../index.js"; import createPackableSpecs from "../../../../Specs/createPackableSpecs.js"; +import { PlaneOutlineGeometry } from "../../index.js"; describe("Core/PlaneOutlineGeometry", function () { it("constructor creates positions", function () { diff --git a/packages/engine/Specs/Core/PolylineVolumeGeometryLibrarySpec.js b/packages/engine/Specs/Core/PolylineVolumeGeometryLibrarySpec.js index 5e06779d900c..4623b074f9f0 100644 --- a/packages/engine/Specs/Core/PolylineVolumeGeometryLibrarySpec.js +++ b/packages/engine/Specs/Core/PolylineVolumeGeometryLibrarySpec.js @@ -1,9 +1,9 @@ import { - Cartesian3, - Cartesian2, BoundingRectangle, - PolylineVolumeGeometry, + Cartesian2, + Cartesian3, Ellipsoid, + PolylineVolumeGeometry, PolylineVolumeGeometryLibrary, } from "../../index.js"; diff --git a/packages/engine/Specs/Core/QuantizedMeshTerrainDataSpec.js b/packages/engine/Specs/Core/QuantizedMeshTerrainDataSpec.js index d676b23aa588..7e536bc48ba6 100644 --- a/packages/engine/Specs/Core/QuantizedMeshTerrainDataSpec.js +++ b/packages/engine/Specs/Core/QuantizedMeshTerrainDataSpec.js @@ -1,7 +1,7 @@ +import { defined } from "@cesium/utils"; import { BoundingSphere, Cartesian3, - defined, GeographicTilingScheme, Math as CesiumMath, QuantizedMeshTerrainData, diff --git a/packages/engine/Specs/Core/RectangleSpec.js b/packages/engine/Specs/Core/RectangleSpec.js index daf087ae2362..576f2abe629d 100644 --- a/packages/engine/Specs/Core/RectangleSpec.js +++ b/packages/engine/Specs/Core/RectangleSpec.js @@ -1,3 +1,4 @@ +import createPackableSpecs from "../../../../Specs/createPackableSpecs.js"; import { BoundingSphere, Cartesian3, @@ -6,7 +7,6 @@ import { Math as CesiumMath, Rectangle, } from "../../index.js"; -import createPackableSpecs from "../../../../Specs/createPackableSpecs.js"; describe("Core/Rectangle", function () { const west = -0.9; diff --git a/packages/engine/Specs/Core/RequestSchedulerSpec.js b/packages/engine/Specs/Core/RequestSchedulerSpec.js index 71ad16c07887..a9b383040480 100644 --- a/packages/engine/Specs/Core/RequestSchedulerSpec.js +++ b/packages/engine/Specs/Core/RequestSchedulerSpec.js @@ -1,4 +1,5 @@ -import { defer, Request, RequestScheduler, RequestState } from "../../index.js"; +import { defer } from "@cesium/utils"; +import { Request, RequestScheduler, RequestState } from "../../index.js"; describe("Core/RequestScheduler", function () { let originalMaximumRequests; diff --git a/packages/engine/Specs/Core/ResourceSpec.js b/packages/engine/Specs/Core/ResourceSpec.js index 7c3c0a6071c7..f5e0f71c09ee 100644 --- a/packages/engine/Specs/Core/ResourceSpec.js +++ b/packages/engine/Specs/Core/ResourceSpec.js @@ -1,17 +1,16 @@ +import { defer, defined } from "@cesium/utils"; import Uri from "urijs"; +import createCanvas from "../../../../Specs/createCanvas.js"; +import dataUriToBuffer from "../../../../Specs/dataUriToBuffer.js"; +import pollToPromise from "../../../../Specs/pollToPromise.js"; import { DefaultProxy, - defer, - defined, queryToObject, Request, RequestErrorEvent, RequestScheduler, Resource, } from "../../index.js"; -import createCanvas from "../../../../Specs/createCanvas.js"; -import dataUriToBuffer from "../../../../Specs/dataUriToBuffer.js"; -import pollToPromise from "../../../../Specs/pollToPromise.js"; describe("Core/Resource", function () { const dataUri = diff --git a/packages/engine/Specs/Core/S2CellSpec.js b/packages/engine/Specs/Core/S2CellSpec.js index 6bb0947ac748..886c709ae8db 100644 --- a/packages/engine/Specs/Core/S2CellSpec.js +++ b/packages/engine/Specs/Core/S2CellSpec.js @@ -1,9 +1,5 @@ -import { - Cartesian3, - FeatureDetection, - Math as CesiumMath, - S2Cell, -} from "../../index.js"; +import { FeatureDetection } from "@cesium/utils"; +import { Cartesian3, Math as CesiumMath, S2Cell } from "../../index.js"; describe("Core/S2Cell", function () { if (!FeatureDetection.supportsBigInt()) { diff --git a/packages/engine/Specs/Core/ScreenSpaceEventHandlerSpec.js b/packages/engine/Specs/Core/ScreenSpaceEventHandlerSpec.js index 6aa4b9d1ad2a..37ba3aae06fd 100644 --- a/packages/engine/Specs/Core/ScreenSpaceEventHandlerSpec.js +++ b/packages/engine/Specs/Core/ScreenSpaceEventHandlerSpec.js @@ -1,9 +1,8 @@ +import { defined, FeatureDetection } from "@cesium/utils"; import { Cartesian2, clone, combine, - defined, - FeatureDetection, KeyboardEventModifier, ScreenSpaceEventHandler, ScreenSpaceEventType, diff --git a/packages/engine/Specs/Core/Simon1994PlanetaryPositionsSpec.js b/packages/engine/Specs/Core/Simon1994PlanetaryPositionsSpec.js index 51b47155d828..8fd9feade204 100644 --- a/packages/engine/Specs/Core/Simon1994PlanetaryPositionsSpec.js +++ b/packages/engine/Specs/Core/Simon1994PlanetaryPositionsSpec.js @@ -1,10 +1,10 @@ import { JulianDate, - Matrix3, Math as CesiumMath, + Matrix3, + Simon1994PlanetaryPositions as PlanetaryPositions, TimeStandard, Transforms, - Simon1994PlanetaryPositions as PlanetaryPositions, } from "../../index.js"; describe("Core/Simon1994PlanetaryPositions", function () { diff --git a/packages/engine/Specs/Core/SplineSpec.js b/packages/engine/Specs/Core/SplineSpec.js index 94570c49ce62..e41a20b83c53 100644 --- a/packages/engine/Specs/Core/SplineSpec.js +++ b/packages/engine/Specs/Core/SplineSpec.js @@ -1,4 +1,4 @@ -import { Cartesian3, HermiteSpline, Spline, Quaternion } from "../../index.js"; +import { Cartesian3, HermiteSpline, Quaternion, Spline } from "../../index.js"; describe("Core/Spline", function () { it("contructor throws", function () { diff --git a/packages/engine/Specs/Core/SteppedSplineSpec.js b/packages/engine/Specs/Core/SteppedSplineSpec.js index 405be88b8cd0..730df65f7035 100644 --- a/packages/engine/Specs/Core/SteppedSplineSpec.js +++ b/packages/engine/Specs/Core/SteppedSplineSpec.js @@ -1,4 +1,4 @@ -import { Cartesian3, SteppedSpline, Quaternion } from "../../index.js"; +import { Cartesian3, Quaternion, SteppedSpline } from "../../index.js"; describe("Core/SteppedSpline", function () { let times; diff --git a/packages/engine/Specs/Core/TaskProcessorSpec.js b/packages/engine/Specs/Core/TaskProcessorSpec.js index 9279ca0ba673..5395ced11d50 100644 --- a/packages/engine/Specs/Core/TaskProcessorSpec.js +++ b/packages/engine/Specs/Core/TaskProcessorSpec.js @@ -1,9 +1,5 @@ -import { - buildModuleUrl, - FeatureDetection, - RuntimeError, - TaskProcessor, -} from "../../index.js"; +import { FeatureDetection, RuntimeError } from "@cesium/utils"; +import { buildModuleUrl, TaskProcessor } from "../../index.js"; import absolutize from "../../../../Specs/absolutize.js"; diff --git a/packages/engine/Specs/Core/TerrainEncodingSpec.js b/packages/engine/Specs/Core/TerrainEncodingSpec.js index b6a896a3be58..d67f0300351c 100644 --- a/packages/engine/Specs/Core/TerrainEncodingSpec.js +++ b/packages/engine/Specs/Core/TerrainEncodingSpec.js @@ -7,9 +7,9 @@ import { Math as CesiumMath, Matrix4, TerrainEncoding, - VerticalExaggeration, TerrainQuantization, Transforms, + VerticalExaggeration, } from "../../index.js"; describe("Core/TerrainEncoding", function () { diff --git a/packages/engine/Specs/Core/TileAvailabilitySpec.js b/packages/engine/Specs/Core/TileAvailabilitySpec.js index fe4766f80417..4bfcae6404d1 100644 --- a/packages/engine/Specs/Core/TileAvailabilitySpec.js +++ b/packages/engine/Specs/Core/TileAvailabilitySpec.js @@ -1,10 +1,10 @@ +import { defined } from "@cesium/utils"; import { Cartographic, GeographicTilingScheme, Rectangle, TileAvailability, WebMercatorTilingScheme, - defined, } from "../../index.js"; describe("Core/TileAvailability", function () { diff --git a/packages/engine/Specs/Core/TransformsSpec.js b/packages/engine/Specs/Core/TransformsSpec.js index a879b23d9a35..24f103c43f56 100644 --- a/packages/engine/Specs/Core/TransformsSpec.js +++ b/packages/engine/Specs/Core/TransformsSpec.js @@ -1,8 +1,8 @@ +import { defined, RuntimeError } from "@cesium/utils"; import { Cartesian2, Cartesian3, Cartesian4, - defined, EarthOrientationParameters, Ellipsoid, GeographicProjection, @@ -14,7 +14,6 @@ import { Matrix4, Quaternion, Resource, - RuntimeError, TimeInterval, Transforms, } from "../../index.js"; diff --git a/packages/engine/Specs/Core/VRTheWorldTerrainProviderSpec.js b/packages/engine/Specs/Core/VRTheWorldTerrainProviderSpec.js index 900ca48d8131..384c162e8d55 100644 --- a/packages/engine/Specs/Core/VRTheWorldTerrainProviderSpec.js +++ b/packages/engine/Specs/Core/VRTheWorldTerrainProviderSpec.js @@ -1,3 +1,4 @@ +import { RuntimeError } from "@cesium/utils"; import { GeographicTilingScheme, HeightmapTerrainData, @@ -5,7 +6,6 @@ import { Request, RequestScheduler, Resource, - RuntimeError, TerrainProvider, VRTheWorldTerrainProvider, } from "../../index.js"; diff --git a/packages/engine/Specs/Core/VertexFormatSpec.js b/packages/engine/Specs/Core/VertexFormatSpec.js index f14735bc596c..4f87f405cbc6 100644 --- a/packages/engine/Specs/Core/VertexFormatSpec.js +++ b/packages/engine/Specs/Core/VertexFormatSpec.js @@ -1,5 +1,5 @@ -import { VertexFormat } from "../../index.js"; import createPackableSpecs from "../../../../Specs/createPackableSpecs.js"; +import { VertexFormat } from "../../index.js"; describe("Core/VertexFormat", function () { it("clone", function () { diff --git a/packages/engine/Specs/Core/VerticalExaggerationSpec.js b/packages/engine/Specs/Core/VerticalExaggerationSpec.js index e429cf93c09f..f3968a768a5e 100644 --- a/packages/engine/Specs/Core/VerticalExaggerationSpec.js +++ b/packages/engine/Specs/Core/VerticalExaggerationSpec.js @@ -1,8 +1,8 @@ import { Cartesian3, Ellipsoid, - VerticalExaggeration, Math as CesiumMath, + VerticalExaggeration, } from "../../index.js"; describe("Core/VerticalExaggeration", function () { diff --git a/packages/engine/Specs/Core/VideoSynchronizerSpec.js b/packages/engine/Specs/Core/VideoSynchronizerSpec.js index 642011a73da8..8767a8c7254a 100644 --- a/packages/engine/Specs/Core/VideoSynchronizerSpec.js +++ b/packages/engine/Specs/Core/VideoSynchronizerSpec.js @@ -1,6 +1,6 @@ +import { FeatureDetection } from "@cesium/utils"; import { Clock, - FeatureDetection, Iso8601, JulianDate, Math as CesiumMath, diff --git a/packages/engine/Specs/Core/createWorldBathymetryAsyncSpec.js b/packages/engine/Specs/Core/createWorldBathymetryAsyncSpec.js index b2cbae48f80e..72192959680e 100644 --- a/packages/engine/Specs/Core/createWorldBathymetryAsyncSpec.js +++ b/packages/engine/Specs/Core/createWorldBathymetryAsyncSpec.js @@ -1,6 +1,6 @@ import { - createWorldBathymetryAsync, CesiumTerrainProvider, + createWorldBathymetryAsync, } from "../../index.js"; describe("Core/createWorldBathymetryAsync", function () { diff --git a/packages/engine/Specs/Core/createWorldTerrainAsyncSpec.js b/packages/engine/Specs/Core/createWorldTerrainAsyncSpec.js index b4766e0f2335..19e9ad66b72e 100644 --- a/packages/engine/Specs/Core/createWorldTerrainAsyncSpec.js +++ b/packages/engine/Specs/Core/createWorldTerrainAsyncSpec.js @@ -1,4 +1,4 @@ -import { createWorldTerrainAsync, CesiumTerrainProvider } from "../../index.js"; +import { CesiumTerrainProvider, createWorldTerrainAsync } from "../../index.js"; describe("Core/createWorldTerrainAsync", function () { it("resolves to CesiumTerrainProvider instance with default parameters", async function () { diff --git a/packages/engine/Specs/Core/loadKTX2Spec.js b/packages/engine/Specs/Core/loadKTX2Spec.js index 56d9fb783f04..26381c9775ab 100644 --- a/packages/engine/Specs/Core/loadKTX2Spec.js +++ b/packages/engine/Specs/Core/loadKTX2Spec.js @@ -1,9 +1,9 @@ +import { RuntimeError } from "@cesium/utils"; import { - loadKTX2, KTX2Transcoder, + loadKTX2, PixelFormat, Resource, - RuntimeError, } from "../../index.js"; describe("Core/loadKTX2", function () { diff --git a/packages/engine/Specs/Core/sampleTerrainSpec.js b/packages/engine/Specs/Core/sampleTerrainSpec.js index 1c7ef5b2f0cd..c1bac2f936f0 100644 --- a/packages/engine/Specs/Core/sampleTerrainSpec.js +++ b/packages/engine/Specs/Core/sampleTerrainSpec.js @@ -1,9 +1,9 @@ +import { defined } from "@cesium/utils"; import { ArcGISTiledElevationTerrainProvider, Cartographic, CesiumTerrainProvider, createWorldTerrainAsync, - defined, RequestScheduler, Resource, sampleTerrain, diff --git a/packages/engine/Specs/DataSources/BillboardGraphicsSpec.js b/packages/engine/Specs/DataSources/BillboardGraphicsSpec.js index 68fd9c52383c..a6d4928d3d15 100644 --- a/packages/engine/Specs/DataSources/BillboardGraphicsSpec.js +++ b/packages/engine/Specs/DataSources/BillboardGraphicsSpec.js @@ -1,15 +1,15 @@ import { + BillboardGraphics, Cartesian2, Cartesian3, Color, - DistanceDisplayCondition, - NearFarScalar, - BillboardGraphics, ConstantProperty, + DistanceDisplayCondition, HeightReference, HorizontalOrigin, - VerticalOrigin, + NearFarScalar, SplitDirection, + VerticalOrigin, } from "../../index.js"; describe("DataSources/BillboardGraphics", function () { diff --git a/packages/engine/Specs/DataSources/BillboardVisualizerSpec.js b/packages/engine/Specs/DataSources/BillboardVisualizerSpec.js index 4c2f77458828..a76d09221c1b 100644 --- a/packages/engine/Specs/DataSources/BillboardVisualizerSpec.js +++ b/packages/engine/Specs/DataSources/BillboardVisualizerSpec.js @@ -1,23 +1,23 @@ +import { defined } from "@cesium/utils"; import { + BillboardGraphics, + BillboardVisualizer, BoundingRectangle, BoundingSphere, + BoundingSphereState, Cartesian2, Cartesian3, Color, - defined, - DistanceDisplayCondition, - JulianDate, - NearFarScalar, - BillboardGraphics, - BillboardVisualizer, - BoundingSphereState, ConstantProperty, + DistanceDisplayCondition, EntityCluster, EntityCollection, HeightReference, HorizontalOrigin, - VerticalOrigin, + JulianDate, + NearFarScalar, SplitDirection, + VerticalOrigin, } from "../../index.js"; import createGlobe from "../../../../Specs/createGlobe.js"; diff --git a/packages/engine/Specs/DataSources/BoxGeometryUpdaterSpec.js b/packages/engine/Specs/DataSources/BoxGeometryUpdaterSpec.js index 5dd917aeb550..d0b6f364f41f 100644 --- a/packages/engine/Specs/DataSources/BoxGeometryUpdaterSpec.js +++ b/packages/engine/Specs/DataSources/BoxGeometryUpdaterSpec.js @@ -1,16 +1,16 @@ import { - Cartesian3, - Color, - GeometryOffsetAttribute, - JulianDate, - TimeIntervalCollection, BoxGeometryUpdater, BoxGraphics, + Cartesian3, + Color, ConstantPositionProperty, ConstantProperty, Entity, + GeometryOffsetAttribute, HeightReference, + JulianDate, PrimitiveCollection, + TimeIntervalCollection, } from "../../index.js"; import createDynamicGeometryUpdaterSpecs from "../../../../Specs/createDynamicGeometryUpdaterSpecs.js"; diff --git a/packages/engine/Specs/DataSources/BoxGraphicsSpec.js b/packages/engine/Specs/DataSources/BoxGraphicsSpec.js index aa71c78b741d..386831a14c1e 100644 --- a/packages/engine/Specs/DataSources/BoxGraphicsSpec.js +++ b/packages/engine/Specs/DataSources/BoxGraphicsSpec.js @@ -1,10 +1,10 @@ import { + BoxGraphics, Cartesian3, Color, - DistanceDisplayCondition, - BoxGraphics, ColorMaterialProperty, ConstantProperty, + DistanceDisplayCondition, ShadowMode, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/CallbackPositionPropertySpec.js b/packages/engine/Specs/DataSources/CallbackPositionPropertySpec.js index 8b823eb7b7b2..5047f69b544c 100644 --- a/packages/engine/Specs/DataSources/CallbackPositionPropertySpec.js +++ b/packages/engine/Specs/DataSources/CallbackPositionPropertySpec.js @@ -1,7 +1,7 @@ import { - JulianDate, CallbackPositionProperty, Cartesian3, + JulianDate, PositionProperty, ReferenceFrame, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/CallbackPropertySpec.js b/packages/engine/Specs/DataSources/CallbackPropertySpec.js index ec12e91798f4..9cd7d13db7d7 100644 --- a/packages/engine/Specs/DataSources/CallbackPropertySpec.js +++ b/packages/engine/Specs/DataSources/CallbackPropertySpec.js @@ -1,4 +1,4 @@ -import { JulianDate, CallbackProperty } from "../../index.js"; +import { CallbackProperty, JulianDate } from "../../index.js"; describe("DataSources/CallbackProperty", function () { let time; diff --git a/packages/engine/Specs/DataSources/Cesium3DTilesetGraphicsSpec.js b/packages/engine/Specs/DataSources/Cesium3DTilesetGraphicsSpec.js index be59405ccd3c..42f7f199ace1 100644 --- a/packages/engine/Specs/DataSources/Cesium3DTilesetGraphicsSpec.js +++ b/packages/engine/Specs/DataSources/Cesium3DTilesetGraphicsSpec.js @@ -1,4 +1,4 @@ -import { ConstantProperty, Cesium3DTilesetGraphics } from "../../index.js"; +import { Cesium3DTilesetGraphics, ConstantProperty } from "../../index.js"; describe("DataSources/Cesium3DTilesetGraphics", function () { it("creates expected instance from raw assignment and construction", function () { diff --git a/packages/engine/Specs/DataSources/Cesium3DTilesetVisualizerSpec.js b/packages/engine/Specs/DataSources/Cesium3DTilesetVisualizerSpec.js index 0c9ef09da4fe..6ca27d3f3f7f 100644 --- a/packages/engine/Specs/DataSources/Cesium3DTilesetVisualizerSpec.js +++ b/packages/engine/Specs/DataSources/Cesium3DTilesetVisualizerSpec.js @@ -1,18 +1,18 @@ +import { defined } from "@cesium/utils"; import { BoundingSphere, - Cartesian3, - defined, - JulianDate, - Matrix4, - Resource, BoundingSphereState, + Cartesian3, Cesium3DTileset, + Cesium3DTilesetGraphics, + Cesium3DTilesetVisualizer, ConstantPositionProperty, ConstantProperty, EntityCollection, - Cesium3DTilesetGraphics, - Cesium3DTilesetVisualizer, Globe, + JulianDate, + Matrix4, + Resource, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/DataSources/CheckerboardMaterialPropertySpec.js b/packages/engine/Specs/DataSources/CheckerboardMaterialPropertySpec.js index 31f11faea7e0..22e3155a7701 100644 --- a/packages/engine/Specs/DataSources/CheckerboardMaterialPropertySpec.js +++ b/packages/engine/Specs/DataSources/CheckerboardMaterialPropertySpec.js @@ -1,10 +1,10 @@ import { Cartesian2, + CheckerboardMaterialProperty, Color, + ConstantProperty, JulianDate, TimeInterval, - CheckerboardMaterialProperty, - ConstantProperty, TimeIntervalCollectionProperty, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/ColorMaterialPropertySpec.js b/packages/engine/Specs/DataSources/ColorMaterialPropertySpec.js index 47da83aea010..c4415e2e25f2 100644 --- a/packages/engine/Specs/DataSources/ColorMaterialPropertySpec.js +++ b/packages/engine/Specs/DataSources/ColorMaterialPropertySpec.js @@ -1,9 +1,9 @@ import { Color, - JulianDate, - TimeInterval, ColorMaterialProperty, ConstantProperty, + JulianDate, + TimeInterval, TimeIntervalCollectionProperty, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/CompositeEntityCollectionSpec.js b/packages/engine/Specs/DataSources/CompositeEntityCollectionSpec.js index 093e32c15d9d..95161b1107ea 100644 --- a/packages/engine/Specs/DataSources/CompositeEntityCollectionSpec.js +++ b/packages/engine/Specs/DataSources/CompositeEntityCollectionSpec.js @@ -1,8 +1,4 @@ import { - Iso8601, - JulianDate, - TimeInterval, - TimeIntervalCollection, BillboardGraphics, CompositeEntityCollection, CompositePositionProperty, @@ -10,6 +6,10 @@ import { ConstantProperty, Entity, EntityCollection, + Iso8601, + JulianDate, + TimeInterval, + TimeIntervalCollection, } from "../../index.js"; describe("DataSources/CompositeEntityCollection", function () { diff --git a/packages/engine/Specs/DataSources/CompositeMaterialPropertySpec.js b/packages/engine/Specs/DataSources/CompositeMaterialPropertySpec.js index bec339efa7cf..050a07063abf 100644 --- a/packages/engine/Specs/DataSources/CompositeMaterialPropertySpec.js +++ b/packages/engine/Specs/DataSources/CompositeMaterialPropertySpec.js @@ -1,11 +1,11 @@ import { Color, - JulianDate, - TimeInterval, - TimeIntervalCollection, ColorMaterialProperty, CompositeMaterialProperty, GridMaterialProperty, + JulianDate, + TimeInterval, + TimeIntervalCollection, } from "../../index.js"; describe("DataSources/CompositeMaterialProperty", function () { diff --git a/packages/engine/Specs/DataSources/CompositePositionPropertySpec.js b/packages/engine/Specs/DataSources/CompositePositionPropertySpec.js index 703a67111cae..6035f8228e3b 100644 --- a/packages/engine/Specs/DataSources/CompositePositionPropertySpec.js +++ b/packages/engine/Specs/DataSources/CompositePositionPropertySpec.js @@ -1,12 +1,12 @@ import { Cartesian3, + CompositePositionProperty, + ConstantPositionProperty, JulianDate, + PositionProperty, ReferenceFrame, TimeInterval, TimeIntervalCollection, - CompositePositionProperty, - ConstantPositionProperty, - PositionProperty, } from "../../index.js"; describe("DataSources/CompositePositionProperty", function () { diff --git a/packages/engine/Specs/DataSources/CompositePropertySpec.js b/packages/engine/Specs/DataSources/CompositePropertySpec.js index bcf83f966316..2621152e9985 100644 --- a/packages/engine/Specs/DataSources/CompositePropertySpec.js +++ b/packages/engine/Specs/DataSources/CompositePropertySpec.js @@ -1,10 +1,10 @@ import { Cartesian3, + CompositeProperty, + ConstantProperty, JulianDate, TimeInterval, TimeIntervalCollection, - CompositeProperty, - ConstantProperty, } from "../../index.js"; describe("DataSources/CompositeProperty", function () { diff --git a/packages/engine/Specs/DataSources/ConstantPositionPropertySpec.js b/packages/engine/Specs/DataSources/ConstantPositionPropertySpec.js index 4811bf078653..8abe644f3c69 100644 --- a/packages/engine/Specs/DataSources/ConstantPositionPropertySpec.js +++ b/packages/engine/Specs/DataSources/ConstantPositionPropertySpec.js @@ -1,9 +1,9 @@ import { Cartesian3, - JulianDate, - ReferenceFrame, ConstantPositionProperty, + JulianDate, PositionProperty, + ReferenceFrame, } from "../../index.js"; describe("DataSources/ConstantPositionProperty", function () { diff --git a/packages/engine/Specs/DataSources/ConstantPropertySpec.js b/packages/engine/Specs/DataSources/ConstantPropertySpec.js index 329160fc8ae6..22b80ef767f1 100644 --- a/packages/engine/Specs/DataSources/ConstantPropertySpec.js +++ b/packages/engine/Specs/DataSources/ConstantPropertySpec.js @@ -1,4 +1,4 @@ -import { Cartesian3, JulianDate, ConstantProperty } from "../../index.js"; +import { Cartesian3, ConstantProperty, JulianDate } from "../../index.js"; describe("DataSources/ConstantProperty", function () { const time = JulianDate.now(); diff --git a/packages/engine/Specs/DataSources/CorridorGeometryUpdaterSpec.js b/packages/engine/Specs/DataSources/CorridorGeometryUpdaterSpec.js index 599a4446c955..13ae9af1b89e 100644 --- a/packages/engine/Specs/DataSources/CorridorGeometryUpdaterSpec.js +++ b/packages/engine/Specs/DataSources/CorridorGeometryUpdaterSpec.js @@ -1,20 +1,20 @@ import { ApproximateTerrainHeights, Cartesian3, - CornerType, - JulianDate, - Math as CesiumMath, - TimeInterval, - TimeIntervalCollection, ConstantProperty, + CornerType, CorridorGeometryUpdater, CorridorGraphics, Entity, + JulianDate, + Math as CesiumMath, + PrimitiveCollection, PropertyArray, SampledPositionProperty, SampledProperty, + TimeInterval, + TimeIntervalCollection, TimeIntervalCollectionProperty, - PrimitiveCollection, } from "../../index.js"; import createDynamicGeometryUpdaterSpecs from "../../../../Specs/createDynamicGeometryUpdaterSpecs.js"; diff --git a/packages/engine/Specs/DataSources/CorridorGraphicsSpec.js b/packages/engine/Specs/DataSources/CorridorGraphicsSpec.js index a18b4cc398ae..801c1b3fd267 100644 --- a/packages/engine/Specs/DataSources/CorridorGraphicsSpec.js +++ b/packages/engine/Specs/DataSources/CorridorGraphicsSpec.js @@ -1,11 +1,11 @@ import { + ClassificationType, Color, - CornerType, - DistanceDisplayCondition, ColorMaterialProperty, ConstantProperty, + CornerType, CorridorGraphics, - ClassificationType, + DistanceDisplayCondition, ShadowMode, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/CustomDataSourceSpec.js b/packages/engine/Specs/DataSources/CustomDataSourceSpec.js index 26e12a609134..7e1d2e27f3d9 100644 --- a/packages/engine/Specs/DataSources/CustomDataSourceSpec.js +++ b/packages/engine/Specs/DataSources/CustomDataSourceSpec.js @@ -1,8 +1,8 @@ import { - Event, CustomDataSource, DataSourceClock, EntityCollection, + Event, } from "../../index.js"; describe("DataSources/CustomDataSource", function () { diff --git a/packages/engine/Specs/DataSources/CylinderGeometryUpdaterSpec.js b/packages/engine/Specs/DataSources/CylinderGeometryUpdaterSpec.js index b6edf9c6f11c..35e833148d13 100644 --- a/packages/engine/Specs/DataSources/CylinderGeometryUpdaterSpec.js +++ b/packages/engine/Specs/DataSources/CylinderGeometryUpdaterSpec.js @@ -1,19 +1,19 @@ import { Cartesian3, Color, - GeometryOffsetAttribute, - JulianDate, - Quaternion, - TimeIntervalCollection, ConstantPositionProperty, ConstantProperty, CylinderGeometryUpdater, CylinderGraphics, Entity, - SampledPositionProperty, - SampledProperty, + GeometryOffsetAttribute, HeightReference, + JulianDate, PrimitiveCollection, + Quaternion, + SampledPositionProperty, + SampledProperty, + TimeIntervalCollection, } from "../../index.js"; import createDynamicGeometryUpdaterSpecs from "../../../../Specs/createDynamicGeometryUpdaterSpecs.js"; diff --git a/packages/engine/Specs/DataSources/CylinderGraphicsSpec.js b/packages/engine/Specs/DataSources/CylinderGraphicsSpec.js index 75cc56d36cc8..26f8435b305a 100644 --- a/packages/engine/Specs/DataSources/CylinderGraphicsSpec.js +++ b/packages/engine/Specs/DataSources/CylinderGraphicsSpec.js @@ -1,9 +1,9 @@ import { Color, - DistanceDisplayCondition, ColorMaterialProperty, ConstantProperty, CylinderGraphics, + DistanceDisplayCondition, ShadowMode, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/CzmlDataSourceSpec.js b/packages/engine/Specs/DataSources/CzmlDataSourceSpec.js index 735d0e24eb30..d9b82381ed41 100644 --- a/packages/engine/Specs/DataSources/CzmlDataSourceSpec.js +++ b/packages/engine/Specs/DataSources/CzmlDataSourceSpec.js @@ -1,52 +1,52 @@ +import { RuntimeError } from "@cesium/utils"; import { ArcType, BoundingRectangle, Cartesian2, Cartesian3, + ClassificationType, ClockRange, ClockStep, Color, + ColorBlendMode, + CompositeEntityCollection, + CompositeMaterialProperty, + CompositePositionProperty, + CompositeProperty, + ConstantPositionProperty, + ConstantProperty, CornerType, Credit, + CzmlDataSource, DistanceDisplayCondition, + Ellipsoid, + EntityCollection, Event, ExtrapolationType, + HeightReference, + HorizontalOrigin, Iso8601, JulianDate, + LabelStyle, Math as CesiumMath, NearFarScalar, PolygonHierarchy, Quaternion, Rectangle, ReferenceFrame, - Resource, - RuntimeError, - Spherical, - TimeInterval, - Transforms, - TranslationRotationScale, - CompositeEntityCollection, - CompositeMaterialProperty, - CompositePositionProperty, - CompositeProperty, - ConstantPositionProperty, - ConstantProperty, - CzmlDataSource, - EntityCollection, ReferenceProperty, + Resource, SampledPositionProperty, SampledProperty, + ShadowMode, + Spherical, StripeOrientation, + TimeInterval, TimeIntervalCollectionPositionProperty, TimeIntervalCollectionProperty, - ClassificationType, - ColorBlendMode, - HeightReference, - HorizontalOrigin, - LabelStyle, - ShadowMode, + Transforms, + TranslationRotationScale, VerticalOrigin, - Ellipsoid, } from "../../index.js"; describe("DataSources/CzmlDataSource", function () { diff --git a/packages/engine/Specs/DataSources/DataSourceClockSpec.js b/packages/engine/Specs/DataSources/DataSourceClockSpec.js index 74b059269d50..df4446f8a9b2 100644 --- a/packages/engine/Specs/DataSources/DataSourceClockSpec.js +++ b/packages/engine/Specs/DataSources/DataSourceClockSpec.js @@ -1,8 +1,8 @@ import { ClockRange, ClockStep, - JulianDate, DataSourceClock, + JulianDate, } from "../../index.js"; describe("DataSources/DataSourceClock", function () { diff --git a/packages/engine/Specs/DataSources/DataSourceCollectionSpec.js b/packages/engine/Specs/DataSources/DataSourceCollectionSpec.js index 3bb3a4208104..ce7b919b3213 100644 --- a/packages/engine/Specs/DataSources/DataSourceCollectionSpec.js +++ b/packages/engine/Specs/DataSources/DataSourceCollectionSpec.js @@ -1,5 +1,5 @@ -import { DataSourceCollection } from "../../index.js"; import MockDataSource from "../../../../Specs/MockDataSource.js"; +import { DataSourceCollection } from "../../index.js"; describe("DataSources/DataSourceCollection", function () { it("contains, get, getLength, and indexOf work", function () { diff --git a/packages/engine/Specs/DataSources/DataSourceDisplaySpec.js b/packages/engine/Specs/DataSources/DataSourceDisplaySpec.js index 045cf0a57f92..c66f1e85caca 100644 --- a/packages/engine/Specs/DataSources/DataSourceDisplaySpec.js +++ b/packages/engine/Specs/DataSources/DataSourceDisplaySpec.js @@ -1,22 +1,22 @@ +import { defined } from "@cesium/utils"; import { ApproximateTerrainHeights, + BillboardVisualizer, BoundingSphere, - Cartesian3, - Iso8601, BoundingSphereState, + Cartesian3, + Cesium3DTilesetVisualizer, DataSourceCollection, DataSourceDisplay, Entity, + GeometryVisualizer, GroundPolylinePrimitive, GroundPrimitive, - defined, - BillboardVisualizer, - GeometryVisualizer, + Iso8601, LabelVisualizer, ModelVisualizer, - Cesium3DTilesetVisualizer, - PointVisualizer, PathVisualizer, + PointVisualizer, PolylineVisualizer, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/EllipseGeometryUpdaterSpec.js b/packages/engine/Specs/DataSources/EllipseGeometryUpdaterSpec.js index d2549e89b0ca..51bda01241a2 100644 --- a/packages/engine/Specs/DataSources/EllipseGeometryUpdaterSpec.js +++ b/packages/engine/Specs/DataSources/EllipseGeometryUpdaterSpec.js @@ -1,16 +1,16 @@ import { ApproximateTerrainHeights, Cartesian3, - JulianDate, - TimeIntervalCollection, ConstantPositionProperty, ConstantProperty, EllipseGeometryUpdater, EllipseGraphics, Entity, + JulianDate, + PrimitiveCollection, SampledPositionProperty, SampledProperty, - PrimitiveCollection, + TimeIntervalCollection, } from "../../index.js"; import createDynamicGeometryUpdaterSpecs from "../../../../Specs/createDynamicGeometryUpdaterSpecs.js"; diff --git a/packages/engine/Specs/DataSources/EllipseGraphicsSpec.js b/packages/engine/Specs/DataSources/EllipseGraphicsSpec.js index bd88399496ff..fd72294a0324 100644 --- a/packages/engine/Specs/DataSources/EllipseGraphicsSpec.js +++ b/packages/engine/Specs/DataSources/EllipseGraphicsSpec.js @@ -1,10 +1,10 @@ import { + ClassificationType, Color, - DistanceDisplayCondition, ColorMaterialProperty, ConstantProperty, + DistanceDisplayCondition, EllipseGraphics, - ClassificationType, ShadowMode, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/EllipsoidGeometryUpdaterSpec.js b/packages/engine/Specs/DataSources/EllipsoidGeometryUpdaterSpec.js index 767061d8bbba..cc58fdb369f0 100644 --- a/packages/engine/Specs/DataSources/EllipsoidGeometryUpdaterSpec.js +++ b/packages/engine/Specs/DataSources/EllipsoidGeometryUpdaterSpec.js @@ -2,21 +2,21 @@ import { Cartesian3, Color, ColorGeometryInstanceAttribute, - GeometryOffsetAttribute, - JulianDate, - Math as CesiumMath, - Quaternion, - TimeIntervalCollection, ColorMaterialProperty, ConstantPositionProperty, ConstantProperty, EllipsoidGeometryUpdater, EllipsoidGraphics, Entity, - SampledPositionProperty, - SampledProperty, + GeometryOffsetAttribute, HeightReference, + JulianDate, + Math as CesiumMath, PrimitiveCollection, + Quaternion, + SampledPositionProperty, + SampledProperty, + TimeIntervalCollection, } from "../../index.js"; import createDynamicGeometryUpdaterSpecs from "../../../../Specs/createDynamicGeometryUpdaterSpecs.js"; diff --git a/packages/engine/Specs/DataSources/EllipsoidGraphicsSpec.js b/packages/engine/Specs/DataSources/EllipsoidGraphicsSpec.js index 3a31b4213f7e..faeed3ad6e61 100644 --- a/packages/engine/Specs/DataSources/EllipsoidGraphicsSpec.js +++ b/packages/engine/Specs/DataSources/EllipsoidGraphicsSpec.js @@ -1,9 +1,9 @@ import { Cartesian3, Color, - DistanceDisplayCondition, ColorMaterialProperty, ConstantProperty, + DistanceDisplayCondition, EllipsoidGraphics, ShadowMode, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/EntityClusterSpec.js b/packages/engine/Specs/DataSources/EntityClusterSpec.js index ca13f98058b3..48cecbfb8fb0 100644 --- a/packages/engine/Specs/DataSources/EntityClusterSpec.js +++ b/packages/engine/Specs/DataSources/EntityClusterSpec.js @@ -1,13 +1,13 @@ import { Cartesian2, Cartesian3, - Ellipsoid, - Event, - JulianDate, CustomDataSource, DataSourceDisplay, + Ellipsoid, Entity, EntityCluster, + Event, + JulianDate, SceneTransforms, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/EntityCollectionSpec.js b/packages/engine/Specs/DataSources/EntityCollectionSpec.js index a00f5d431079..b7f6b3d9dbc4 100644 --- a/packages/engine/Specs/DataSources/EntityCollectionSpec.js +++ b/packages/engine/Specs/DataSources/EntityCollectionSpec.js @@ -1,10 +1,10 @@ import { + Entity, + EntityCollection, Iso8601, JulianDate, TimeInterval, TimeIntervalCollection, - Entity, - EntityCollection, } from "../../index.js"; describe("DataSources/EntityCollection", function () { diff --git a/packages/engine/Specs/DataSources/EntitySpec.js b/packages/engine/Specs/DataSources/EntitySpec.js index 33ce89a6d98e..948a497111c1 100644 --- a/packages/engine/Specs/DataSources/EntitySpec.js +++ b/packages/engine/Specs/DataSources/EntitySpec.js @@ -1,15 +1,7 @@ import { - Cartesian3, - JulianDate, - Matrix3, - Matrix4, - Quaternion, - TrackingReferenceFrame, - TimeInterval, - TimeIntervalCollection, - Transforms, BillboardGraphics, BoxGraphics, + Cartesian3, ConstantPositionProperty, ConstantProperty, CorridorGraphics, @@ -17,7 +9,10 @@ import { EllipseGraphics, EllipsoidGraphics, Entity, + JulianDate, LabelGraphics, + Matrix3, + Matrix4, ModelGraphics, PathGraphics, PlaneGraphics, @@ -25,7 +20,12 @@ import { PolygonGraphics, PolylineGraphics, PolylineVolumeGraphics, + Quaternion, RectangleGraphics, + TimeInterval, + TimeIntervalCollection, + TrackingReferenceFrame, + Transforms, WallGraphics, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/EntityViewSpec.js b/packages/engine/Specs/DataSources/EntityViewSpec.js index 687e61245884..1b2a3aaef4f5 100644 --- a/packages/engine/Specs/DataSources/EntityViewSpec.js +++ b/packages/engine/Specs/DataSources/EntityViewSpec.js @@ -1,11 +1,11 @@ import { BoundingSphere, Cartesian3, - Ellipsoid, - JulianDate, ConstantPositionProperty, + Ellipsoid, Entity, EntityView, + JulianDate, TrackingReferenceFrame, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/GeoJsonDataSourceSpec.js b/packages/engine/Specs/DataSources/GeoJsonDataSourceSpec.js index c702bea93968..4025dce39856 100644 --- a/packages/engine/Specs/DataSources/GeoJsonDataSourceSpec.js +++ b/packages/engine/Specs/DataSources/GeoJsonDataSourceSpec.js @@ -1,16 +1,16 @@ +import { RuntimeError } from "@cesium/utils"; import { + CallbackProperty, Cartesian3, Color, - Credit, - Event, - JulianDate, - PolygonHierarchy, - RuntimeError, - CallbackProperty, ConstantProperty, + Credit, EntityCollection, + Event, GeoJsonDataSource, HeightReference, + JulianDate, + PolygonHierarchy, } from "../../index.js"; describe("DataSources/GeoJsonDataSource", function () { diff --git a/packages/engine/Specs/DataSources/GeometryVisualizerSpec.js b/packages/engine/Specs/DataSources/GeometryVisualizerSpec.js index 1cea7ceba254..385c0d993a95 100644 --- a/packages/engine/Specs/DataSources/GeometryVisualizerSpec.js +++ b/packages/engine/Specs/DataSources/GeometryVisualizerSpec.js @@ -1,28 +1,28 @@ import { ApproximateTerrainHeights, BoundingSphere, + BoundingSphereState, Cartesian3, + ClassificationType, Color, ColorGeometryInstanceAttribute, - JulianDate, - ShowGeometryInstanceAttribute, - BoundingSphereState, ColorMaterialProperty, ConstantPositionProperty, ConstantProperty, EllipseGraphics, Entity, EntityCollection, + Event, + GeometryUpdaterSet, GeometryVisualizer, GridMaterialProperty, - SampledProperty, - ClassificationType, GroundPrimitive, + JulianDate, MaterialAppearance, PerInstanceColorAppearance, + SampledProperty, ShadowMode, - Event, - GeometryUpdaterSet, + ShowGeometryInstanceAttribute, } from "../../index.js"; import createDynamicProperty from "../../../../Specs/createDynamicProperty.js"; diff --git a/packages/engine/Specs/DataSources/GpxDataSourceSpec.js b/packages/engine/Specs/DataSources/GpxDataSourceSpec.js index 73224a389d60..239362cebdad 100755 --- a/packages/engine/Specs/DataSources/GpxDataSourceSpec.js +++ b/packages/engine/Specs/DataSources/GpxDataSourceSpec.js @@ -1,7 +1,7 @@ +import { DeveloperError, RuntimeError } from "@cesium/utils"; import { Cartesian3, Color, - DeveloperError, EntityCollection, Event, GpxDataSource, @@ -9,7 +9,6 @@ import { Iso8601, JulianDate, RequestErrorEvent, - RuntimeError, VerticalOrigin, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/GridMaterialPropertySpec.js b/packages/engine/Specs/DataSources/GridMaterialPropertySpec.js index 0986d5119394..8e29f9a0b86f 100644 --- a/packages/engine/Specs/DataSources/GridMaterialPropertySpec.js +++ b/packages/engine/Specs/DataSources/GridMaterialPropertySpec.js @@ -1,11 +1,11 @@ import { Cartesian2, Color, - JulianDate, - TimeInterval, ConstantProperty, GridMaterialProperty, + JulianDate, SampledProperty, + TimeInterval, TimeIntervalCollectionProperty, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/ImageMaterialPropertySpec.js b/packages/engine/Specs/DataSources/ImageMaterialPropertySpec.js index aee441645283..980af5283181 100644 --- a/packages/engine/Specs/DataSources/ImageMaterialPropertySpec.js +++ b/packages/engine/Specs/DataSources/ImageMaterialPropertySpec.js @@ -1,10 +1,10 @@ import { Cartesian2, Color, - JulianDate, - TimeInterval, ConstantProperty, ImageMaterialProperty, + JulianDate, + TimeInterval, TimeIntervalCollectionProperty, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/KmlDataSourceSpec.js b/packages/engine/Specs/DataSources/KmlDataSourceSpec.js index ba8b4d048e04..a774e3094553 100644 --- a/packages/engine/Specs/DataSources/KmlDataSourceSpec.js +++ b/packages/engine/Specs/DataSources/KmlDataSourceSpec.js @@ -1,41 +1,40 @@ +import { defer, RuntimeError } from "@cesium/utils"; import { ArcType, BoundingRectangle, + Camera, Cartesian2, Cartesian3, ClockRange, ClockStep, Color, + ColorMaterialProperty, combine, Credit, - defer, Ellipsoid, + EntityCollection, Event, HeadingPitchRange, HeadingPitchRoll, + HeightReference, + HorizontalOrigin, + ImageMaterialProperty, isDataUri, Iso8601, JulianDate, - Math as CesiumMath, - NearFarScalar, - PerspectiveFrustum, - Rectangle, - RequestErrorEvent, - Resource, - RuntimeError, - ColorMaterialProperty, - EntityCollection, - ImageMaterialProperty, KmlCamera, KmlDataSource, KmlLookAt, KmlTour, KmlTourFlyTo, KmlTourWait, - Camera, - HeightReference, - HorizontalOrigin, LabelStyle, + Math as CesiumMath, + NearFarScalar, + PerspectiveFrustum, + Rectangle, + RequestErrorEvent, + Resource, SceneMode, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/LabelGraphicsSpec.js b/packages/engine/Specs/DataSources/LabelGraphicsSpec.js index eed297c88dba..4f31ba62b0c7 100644 --- a/packages/engine/Specs/DataSources/LabelGraphicsSpec.js +++ b/packages/engine/Specs/DataSources/LabelGraphicsSpec.js @@ -2,12 +2,12 @@ import { Cartesian2, Cartesian3, Color, - DistanceDisplayCondition, - NearFarScalar, ConstantProperty, - LabelGraphics, + DistanceDisplayCondition, HorizontalOrigin, + LabelGraphics, LabelStyle, + NearFarScalar, VerticalOrigin, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/LabelVisualizerSpec.js b/packages/engine/Specs/DataSources/LabelVisualizerSpec.js index 2c47034ebcd2..c6ca7b29d936 100644 --- a/packages/engine/Specs/DataSources/LabelVisualizerSpec.js +++ b/packages/engine/Specs/DataSources/LabelVisualizerSpec.js @@ -1,20 +1,20 @@ +import { defined } from "@cesium/utils"; import { BoundingSphere, + BoundingSphereState, Cartesian2, Cartesian3, Color, - defined, - DistanceDisplayCondition, - JulianDate, - NearFarScalar, - BoundingSphereState, ConstantProperty, + DistanceDisplayCondition, EntityCluster, EntityCollection, - LabelGraphics, - LabelVisualizer, HorizontalOrigin, + JulianDate, + LabelGraphics, LabelStyle, + LabelVisualizer, + NearFarScalar, VerticalOrigin, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/ModelGraphicsSpec.js b/packages/engine/Specs/DataSources/ModelGraphicsSpec.js index 3f49259bd9f6..a66eb78ffbbd 100644 --- a/packages/engine/Specs/DataSources/ModelGraphicsSpec.js +++ b/packages/engine/Specs/DataSources/ModelGraphicsSpec.js @@ -1,18 +1,18 @@ import { Cartesian2, Cartesian3, + ClippingPlaneCollection, Color, + ColorBlendMode, + ConstantProperty, CustomShader, DistanceDisplayCondition, + HeightReference, JulianDate, - Quaternion, - ConstantProperty, ModelGraphics, NodeTransformationProperty, PropertyBag, - ClippingPlaneCollection, - ColorBlendMode, - HeightReference, + Quaternion, ShadowMode, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/ModelVisualizerSpec.js b/packages/engine/Specs/DataSources/ModelVisualizerSpec.js index 862380d7c28b..2117e3d12fa5 100644 --- a/packages/engine/Specs/DataSources/ModelVisualizerSpec.js +++ b/packages/engine/Specs/DataSources/ModelVisualizerSpec.js @@ -1,33 +1,33 @@ +import { defined } from "@cesium/utils"; +import createScene from "../../../../Specs/createScene.js"; +import pollToPromise from "../../../../Specs/pollToPromise.js"; import { BoundingSphere, + BoundingSphereState, Cartesian2, Cartesian3, + Cartographic, + Cesium3DTileset, + ClippingPlane, + ClippingPlaneCollection, Color, - defined, + ConstantPositionProperty, + ConstantProperty, + CustomShader, DistanceDisplayCondition, + EntityCollection, + Globe, HeightReference, JulianDate, Math as CesiumMath, Matrix4, - Quaternion, - Resource, - Transforms, - BoundingSphereState, - Cesium3DTileset, - ConstantPositionProperty, - ConstantProperty, - EntityCollection, ModelGraphics, ModelVisualizer, NodeTransformationProperty, - ClippingPlane, - ClippingPlaneCollection, - CustomShader, - Globe, - Cartographic, + Quaternion, + Resource, + Transforms, } from "../../index.js"; -import createScene from "../../../../Specs/createScene.js"; -import pollToPromise from "../../../../Specs/pollToPromise.js"; describe( "DataSources/ModelVisualizer", diff --git a/packages/engine/Specs/DataSources/NodeTransformationPropertySpec.js b/packages/engine/Specs/DataSources/NodeTransformationPropertySpec.js index f0d19cc567a4..8a626e295a8e 100644 --- a/packages/engine/Specs/DataSources/NodeTransformationPropertySpec.js +++ b/packages/engine/Specs/DataSources/NodeTransformationPropertySpec.js @@ -1,10 +1,10 @@ import { Cartesian3, + ConstantProperty, JulianDate, + NodeTransformationProperty, Quaternion, TimeInterval, - ConstantProperty, - NodeTransformationProperty, TimeIntervalCollectionProperty, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/PathGraphicsSpec.js b/packages/engine/Specs/DataSources/PathGraphicsSpec.js index 39a7b6c9adad..08754e91bcee 100644 --- a/packages/engine/Specs/DataSources/PathGraphicsSpec.js +++ b/packages/engine/Specs/DataSources/PathGraphicsSpec.js @@ -1,8 +1,8 @@ import { Color, - DistanceDisplayCondition, ColorMaterialProperty, ConstantProperty, + DistanceDisplayCondition, PathGraphics, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/PathVisualizerSpec.js b/packages/engine/Specs/DataSources/PathVisualizerSpec.js index 0a6c1b78e4ea..cfdc38d520b6 100644 --- a/packages/engine/Specs/DataSources/PathVisualizerSpec.js +++ b/packages/engine/Specs/DataSources/PathVisualizerSpec.js @@ -1,26 +1,26 @@ import { + CallbackPositionProperty, Cartesian3, Color, - DistanceDisplayCondition, - JulianDate, - Matrix4, - ReferenceFrame, - TimeInterval, CompositePositionProperty, ConstantPositionProperty, ConstantProperty, + DistanceDisplayCondition, EntityCollection, + JulianDate, + LinearSpline, + Matrix4, PathGraphics, PathVisualizer, PolylineGlowMaterialProperty, PolylineOutlineMaterialProperty, + ReferenceFrame, ReferenceProperty, SampledPositionProperty, - CallbackPositionProperty, - LinearSpline, ScaledPositionProperty, - TimeIntervalCollectionPositionProperty, SceneMode, + TimeInterval, + TimeIntervalCollectionPositionProperty, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/DataSources/PlaneGeometryUpdaterSpec.js b/packages/engine/Specs/DataSources/PlaneGeometryUpdaterSpec.js index a90e9039abaf..9c2ec7988ddc 100644 --- a/packages/engine/Specs/DataSources/PlaneGeometryUpdaterSpec.js +++ b/packages/engine/Specs/DataSources/PlaneGeometryUpdaterSpec.js @@ -1,15 +1,15 @@ import { Cartesian2, Cartesian3, - JulianDate, - Plane, - TimeIntervalCollection, ConstantPositionProperty, ConstantProperty, Entity, + JulianDate, + Plane, PlaneGeometryUpdater, PlaneGraphics, PrimitiveCollection, + TimeIntervalCollection, } from "../../index.js"; import createDynamicGeometryUpdaterSpecs from "../../../../Specs/createDynamicGeometryUpdaterSpecs.js"; diff --git a/packages/engine/Specs/DataSources/PlaneGraphicsSpec.js b/packages/engine/Specs/DataSources/PlaneGraphicsSpec.js index 657decac19a2..e4ca6afe1e38 100644 --- a/packages/engine/Specs/DataSources/PlaneGraphicsSpec.js +++ b/packages/engine/Specs/DataSources/PlaneGraphicsSpec.js @@ -2,10 +2,10 @@ import { Cartesian2, Cartesian3, Color, - DistanceDisplayCondition, - Plane, ColorMaterialProperty, ConstantProperty, + DistanceDisplayCondition, + Plane, PlaneGraphics, ShadowMode, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/PointGraphicsSpec.js b/packages/engine/Specs/DataSources/PointGraphicsSpec.js index 7178ecc790e6..8bdc3caed3db 100644 --- a/packages/engine/Specs/DataSources/PointGraphicsSpec.js +++ b/packages/engine/Specs/DataSources/PointGraphicsSpec.js @@ -1,10 +1,10 @@ import { Color, + ConstantProperty, DistanceDisplayCondition, + HeightReference, NearFarScalar, - ConstantProperty, PointGraphics, - HeightReference, SplitDirection, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/PointVisualizerSpec.js b/packages/engine/Specs/DataSources/PointVisualizerSpec.js index 1f9577df23dc..87e295c47978 100644 --- a/packages/engine/Specs/DataSources/PointVisualizerSpec.js +++ b/packages/engine/Specs/DataSources/PointVisualizerSpec.js @@ -1,22 +1,22 @@ +import { defined } from "@cesium/utils"; import { + BillboardCollection, BoundingSphere, + BoundingSphereState, Cartesian3, Color, - defined, + ConstantProperty, DistanceDisplayCondition, Ellipsoid, + EntityCluster, + EntityCollection, Event, + HeightReference, JulianDate, NearFarScalar, - BoundingSphereState, - ConstantProperty, - EntityCluster, - EntityCollection, PointGraphics, - PointVisualizer, - BillboardCollection, - HeightReference, PointPrimitiveCollection, + PointVisualizer, SplitDirection, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/PolygonGeometryUpdaterSpec.js b/packages/engine/Specs/DataSources/PolygonGeometryUpdaterSpec.js index 8f48605dcf26..31db048c4622 100644 --- a/packages/engine/Specs/DataSources/PolygonGeometryUpdaterSpec.js +++ b/packages/engine/Specs/DataSources/PolygonGeometryUpdaterSpec.js @@ -4,25 +4,25 @@ import { Cartesian2, Cartesian3, Color, + ConstantProperty, CoplanarPolygonGeometry, CoplanarPolygonOutlineGeometry, Ellipsoid, + Entity, + GroundPrimitive, + HeightReference, JulianDate, Math as CesiumMath, PolygonGeometry, - PolygonHierarchy, - PolygonOutlineGeometry, - TimeIntervalCollection, - ConstantProperty, - Entity, PolygonGeometryUpdater, PolygonGraphics, + PolygonHierarchy, + PolygonOutlineGeometry, + PrimitiveCollection, PropertyArray, SampledPositionProperty, SampledProperty, - GroundPrimitive, - HeightReference, - PrimitiveCollection, + TimeIntervalCollection, } from "../../index.js"; import createDynamicGeometryUpdaterSpecs from "../../../../Specs/createDynamicGeometryUpdaterSpecs.js"; diff --git a/packages/engine/Specs/DataSources/PolygonGraphicsSpec.js b/packages/engine/Specs/DataSources/PolygonGraphicsSpec.js index 4e39288e1607..53d21ec0bcfa 100644 --- a/packages/engine/Specs/DataSources/PolygonGraphicsSpec.js +++ b/packages/engine/Specs/DataSources/PolygonGraphicsSpec.js @@ -1,13 +1,13 @@ import { ArcType, Cartesian3, + ClassificationType, Color, - DistanceDisplayCondition, - PolygonHierarchy, ColorMaterialProperty, ConstantProperty, + DistanceDisplayCondition, PolygonGraphics, - ClassificationType, + PolygonHierarchy, ShadowMode, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/PolylineArrowMaterialPropertySpec.js b/packages/engine/Specs/DataSources/PolylineArrowMaterialPropertySpec.js index 20e8126809a2..d6ebc7a65ae3 100644 --- a/packages/engine/Specs/DataSources/PolylineArrowMaterialPropertySpec.js +++ b/packages/engine/Specs/DataSources/PolylineArrowMaterialPropertySpec.js @@ -1,9 +1,9 @@ import { Color, - JulianDate, - TimeInterval, ConstantProperty, + JulianDate, PolylineArrowMaterialProperty, + TimeInterval, TimeIntervalCollectionProperty, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/PolylineDashMaterialPropertySpec.js b/packages/engine/Specs/DataSources/PolylineDashMaterialPropertySpec.js index 4293d01aea33..a5e4bdd74e55 100644 --- a/packages/engine/Specs/DataSources/PolylineDashMaterialPropertySpec.js +++ b/packages/engine/Specs/DataSources/PolylineDashMaterialPropertySpec.js @@ -1,9 +1,9 @@ import { Color, - JulianDate, - TimeInterval, ConstantProperty, + JulianDate, PolylineDashMaterialProperty, + TimeInterval, TimeIntervalCollectionProperty, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/PolylineGeometryUpdaterSpec.js b/packages/engine/Specs/DataSources/PolylineGeometryUpdaterSpec.js index 285941f48ea0..a677fcba523b 100644 --- a/packages/engine/Specs/DataSources/PolylineGeometryUpdaterSpec.js +++ b/packages/engine/Specs/DataSources/PolylineGeometryUpdaterSpec.js @@ -1,34 +1,34 @@ +import { defined } from "@cesium/utils"; import { ApproximateTerrainHeights, ArcType, BoundingSphere, + BoundingSphereState, + CallbackProperty, Cartesian3, Color, ColorGeometryInstanceAttribute, - defined, - DistanceDisplayCondition, - DistanceDisplayConditionGeometryInstanceAttribute, - GroundPolylineGeometry, - JulianDate, - PolylinePipeline, - ShowGeometryInstanceAttribute, - TimeInterval, - TimeIntervalCollection, - BoundingSphereState, - CallbackProperty, ColorMaterialProperty, ConstantProperty, + DistanceDisplayCondition, + DistanceDisplayConditionGeometryInstanceAttribute, Entity, + Globe, GridMaterialProperty, + GroundPolylineGeometry, + GroundPolylinePrimitive, + JulianDate, PolylineGeometryUpdater, PolylineGraphics, + PolylinePipeline, PropertyArray, SampledPositionProperty, SampledProperty, - TimeIntervalCollectionProperty, - Globe, - GroundPolylinePrimitive, ShadowMode, + ShowGeometryInstanceAttribute, + TimeInterval, + TimeIntervalCollection, + TimeIntervalCollectionProperty, } from "../../index.js"; import createDynamicProperty from "../../../../Specs/createDynamicProperty.js"; diff --git a/packages/engine/Specs/DataSources/PolylineGlowMaterialPropertySpec.js b/packages/engine/Specs/DataSources/PolylineGlowMaterialPropertySpec.js index a881490466bc..684052fdc9ab 100644 --- a/packages/engine/Specs/DataSources/PolylineGlowMaterialPropertySpec.js +++ b/packages/engine/Specs/DataSources/PolylineGlowMaterialPropertySpec.js @@ -1,9 +1,9 @@ import { Color, - JulianDate, - TimeInterval, ConstantProperty, + JulianDate, PolylineGlowMaterialProperty, + TimeInterval, TimeIntervalCollectionProperty, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/PolylineGraphicsSpec.js b/packages/engine/Specs/DataSources/PolylineGraphicsSpec.js index f4db09ea9e8d..d88ad429fea8 100644 --- a/packages/engine/Specs/DataSources/PolylineGraphicsSpec.js +++ b/packages/engine/Specs/DataSources/PolylineGraphicsSpec.js @@ -1,11 +1,11 @@ import { ArcType, + ClassificationType, Color, - DistanceDisplayCondition, ColorMaterialProperty, ConstantProperty, + DistanceDisplayCondition, PolylineGraphics, - ClassificationType, ShadowMode, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/PolylineOutlineMaterialPropertySpec.js b/packages/engine/Specs/DataSources/PolylineOutlineMaterialPropertySpec.js index 0094b3fba685..1895332684d8 100644 --- a/packages/engine/Specs/DataSources/PolylineOutlineMaterialPropertySpec.js +++ b/packages/engine/Specs/DataSources/PolylineOutlineMaterialPropertySpec.js @@ -1,9 +1,9 @@ import { Color, - JulianDate, - TimeInterval, ConstantProperty, + JulianDate, PolylineOutlineMaterialProperty, + TimeInterval, TimeIntervalCollectionProperty, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/PolylineVisualizerSpec.js b/packages/engine/Specs/DataSources/PolylineVisualizerSpec.js index 5f4ba7b32b53..2ee0fa71e0ae 100644 --- a/packages/engine/Specs/DataSources/PolylineVisualizerSpec.js +++ b/packages/engine/Specs/DataSources/PolylineVisualizerSpec.js @@ -1,25 +1,25 @@ import { ApproximateTerrainHeights, BoundingSphere, + BoundingSphereState, + CallbackProperty, Cartesian3, + ClassificationType, Color, ColorGeometryInstanceAttribute, - JulianDate, - ShowGeometryInstanceAttribute, - BoundingSphereState, - CallbackProperty, ColorMaterialProperty, ConstantPositionProperty, ConstantProperty, Entity, EntityCollection, + JulianDate, PolylineArrowMaterialProperty, - PolylineGraphics, - PolylineVisualizer, - ClassificationType, PolylineColorAppearance, + PolylineGraphics, PolylineMaterialAppearance, + PolylineVisualizer, ShadowMode, + ShowGeometryInstanceAttribute, } from "../../index.js"; import createDynamicProperty from "../../../../Specs/createDynamicProperty.js"; diff --git a/packages/engine/Specs/DataSources/PolylineVolumeGeometryUpdaterSpec.js b/packages/engine/Specs/DataSources/PolylineVolumeGeometryUpdaterSpec.js index 5fc0211935d1..3c27df3d772e 100644 --- a/packages/engine/Specs/DataSources/PolylineVolumeGeometryUpdaterSpec.js +++ b/packages/engine/Specs/DataSources/PolylineVolumeGeometryUpdaterSpec.js @@ -1,16 +1,16 @@ import { Cartesian2, Cartesian3, - CornerType, - JulianDate, - TimeInterval, - TimeIntervalCollection, ConstantProperty, + CornerType, Entity, + JulianDate, PolylineVolumeGeometryUpdater, PolylineVolumeGraphics, - TimeIntervalCollectionProperty, PrimitiveCollection, + TimeInterval, + TimeIntervalCollection, + TimeIntervalCollectionProperty, } from "../../index.js"; import createDynamicGeometryUpdaterSpecs from "../../../../Specs/createDynamicGeometryUpdaterSpecs.js"; diff --git a/packages/engine/Specs/DataSources/PolylineVolumeGraphicsSpec.js b/packages/engine/Specs/DataSources/PolylineVolumeGraphicsSpec.js index 89be9150a5f9..75c916a61877 100644 --- a/packages/engine/Specs/DataSources/PolylineVolumeGraphicsSpec.js +++ b/packages/engine/Specs/DataSources/PolylineVolumeGraphicsSpec.js @@ -1,9 +1,9 @@ import { Color, - CornerType, - DistanceDisplayCondition, ColorMaterialProperty, ConstantProperty, + CornerType, + DistanceDisplayCondition, PolylineVolumeGraphics, ShadowMode, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/PositionPropertyArraySpec.js b/packages/engine/Specs/DataSources/PositionPropertyArraySpec.js index c90dff6d796a..a44c56b385c1 100644 --- a/packages/engine/Specs/DataSources/PositionPropertyArraySpec.js +++ b/packages/engine/Specs/DataSources/PositionPropertyArraySpec.js @@ -1,9 +1,9 @@ import { Cartesian3, - JulianDate, - ReferenceFrame, ConstantPositionProperty, + JulianDate, PositionPropertyArray, + ReferenceFrame, SampledPositionProperty, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/PropertyArraySpec.js b/packages/engine/Specs/DataSources/PropertyArraySpec.js index 0f2dbef2c48e..77812da11ab0 100644 --- a/packages/engine/Specs/DataSources/PropertyArraySpec.js +++ b/packages/engine/Specs/DataSources/PropertyArraySpec.js @@ -1,6 +1,6 @@ import { - JulianDate, ConstantProperty, + JulianDate, PropertyArray, SampledProperty, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/PropertyBagSpec.js b/packages/engine/Specs/DataSources/PropertyBagSpec.js index 8a3da3e739ab..154edc006339 100644 --- a/packages/engine/Specs/DataSources/PropertyBagSpec.js +++ b/packages/engine/Specs/DataSources/PropertyBagSpec.js @@ -1,6 +1,6 @@ import { - JulianDate, ConstantProperty, + JulianDate, PropertyBag, SampledProperty, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/RectangleGeometryUpdaterSpec.js b/packages/engine/Specs/DataSources/RectangleGeometryUpdaterSpec.js index 88f94a0d9fb2..0611bdb1be3b 100644 --- a/packages/engine/Specs/DataSources/RectangleGeometryUpdaterSpec.js +++ b/packages/engine/Specs/DataSources/RectangleGeometryUpdaterSpec.js @@ -1,16 +1,16 @@ import { ApproximateTerrainHeights, Cartesian3, + ConstantProperty, + Entity, JulianDate, Math as CesiumMath, + PrimitiveCollection, Rectangle, - TimeIntervalCollection, - ConstantProperty, - Entity, RectangleGeometryUpdater, RectangleGraphics, SampledProperty, - PrimitiveCollection, + TimeIntervalCollection, } from "../../index.js"; import createDynamicGeometryUpdaterSpecs from "../../../../Specs/createDynamicGeometryUpdaterSpecs.js"; diff --git a/packages/engine/Specs/DataSources/RectangleGraphicsSpec.js b/packages/engine/Specs/DataSources/RectangleGraphicsSpec.js index 75b1cce95003..a6f7eed8cfcc 100644 --- a/packages/engine/Specs/DataSources/RectangleGraphicsSpec.js +++ b/packages/engine/Specs/DataSources/RectangleGraphicsSpec.js @@ -1,11 +1,11 @@ import { + ClassificationType, Color, - DistanceDisplayCondition, - Rectangle, ColorMaterialProperty, ConstantProperty, + DistanceDisplayCondition, + Rectangle, RectangleGraphics, - ClassificationType, ShadowMode, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/ReferencePropertySpec.js b/packages/engine/Specs/DataSources/ReferencePropertySpec.js index 3732e29998c8..8b17ff6e541d 100644 --- a/packages/engine/Specs/DataSources/ReferencePropertySpec.js +++ b/packages/engine/Specs/DataSources/ReferencePropertySpec.js @@ -1,14 +1,14 @@ import { + BillboardGraphics, Cartesian3, Color, - JulianDate, - ReferenceFrame, - BillboardGraphics, ColorMaterialProperty, ConstantPositionProperty, ConstantProperty, Entity, EntityCollection, + JulianDate, + ReferenceFrame, ReferenceProperty, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/SampledPositionPropertySpec.js b/packages/engine/Specs/DataSources/SampledPositionPropertySpec.js index fea9d91a824b..b8718347379b 100644 --- a/packages/engine/Specs/DataSources/SampledPositionPropertySpec.js +++ b/packages/engine/Specs/DataSources/SampledPositionPropertySpec.js @@ -4,10 +4,10 @@ import { JulianDate, LagrangePolynomialApproximation, LinearApproximation, - ReferenceFrame, - TimeInterval, PositionProperty, + ReferenceFrame, SampledPositionProperty, + TimeInterval, } from "../../index.js"; describe("DataSources/SampledPositionProperty", function () { diff --git a/packages/engine/Specs/DataSources/SampledPropertySpec.js b/packages/engine/Specs/DataSources/SampledPropertySpec.js index e6ee6edc9335..5db09fad69a7 100644 --- a/packages/engine/Specs/DataSources/SampledPropertySpec.js +++ b/packages/engine/Specs/DataSources/SampledPropertySpec.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import { Cartesian3, - defined, ExtrapolationType, HermitePolynomialApproximation, JulianDate, @@ -8,8 +8,8 @@ import { LinearApproximation, Math as CesiumMath, Quaternion, - TimeInterval, SampledProperty, + TimeInterval, } from "../../index.js"; describe("DataSources/SampledProperty", function () { diff --git a/packages/engine/Specs/DataSources/StaticGeometryColorBatchSpec.js b/packages/engine/Specs/DataSources/StaticGeometryColorBatchSpec.js index 1f543e7307f4..27b370685421 100644 --- a/packages/engine/Specs/DataSources/StaticGeometryColorBatchSpec.js +++ b/packages/engine/Specs/DataSources/StaticGeometryColorBatchSpec.js @@ -1,21 +1,21 @@ import { + CallbackProperty, Cartesian3, Color, - DistanceDisplayCondition, - JulianDate, - Math as CesiumMath, - TimeInterval, - TimeIntervalCollection, - CallbackProperty, ColorMaterialProperty, + DistanceDisplayCondition, EllipseGeometryUpdater, Entity, - PolylineGeometryUpdater, - StaticGeometryColorBatch, - TimeIntervalCollectionProperty, + JulianDate, + Math as CesiumMath, PerInstanceColorAppearance, PolylineColorAppearance, + PolylineGeometryUpdater, ShadowMode, + StaticGeometryColorBatch, + TimeInterval, + TimeIntervalCollection, + TimeIntervalCollectionProperty, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/DataSources/StaticGeometryPerMaterialBatchSpec.js b/packages/engine/Specs/DataSources/StaticGeometryPerMaterialBatchSpec.js index de2af7f170fa..3f95efa45014 100644 --- a/packages/engine/Specs/DataSources/StaticGeometryPerMaterialBatchSpec.js +++ b/packages/engine/Specs/DataSources/StaticGeometryPerMaterialBatchSpec.js @@ -1,31 +1,31 @@ import { + BoxGeometryUpdater, Cartesian2, Cartesian3, - Color, - DistanceDisplayCondition, - JulianDate, - Math as CesiumMath, - TimeInterval, - TimeIntervalCollection, - BoxGeometryUpdater, CheckerboardMaterialProperty, + Color, ColorMaterialProperty, ConstantPositionProperty, ConstantProperty, + DistanceDisplayCondition, EllipseGeometryUpdater, EllipseGraphics, Entity, GridMaterialProperty, + JulianDate, + MaterialAppearance, + Math as CesiumMath, PolylineArrowMaterialProperty, + PolylineColorAppearance, PolylineGeometryUpdater, PolylineGraphics, + PolylineMaterialAppearance, + ShadowMode, StaticGeometryPerMaterialBatch, StripeMaterialProperty, + TimeInterval, + TimeIntervalCollection, TimeIntervalCollectionProperty, - MaterialAppearance, - PolylineColorAppearance, - PolylineMaterialAppearance, - ShadowMode, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/DataSources/StaticGroundGeometryColorBatchSpec.js b/packages/engine/Specs/DataSources/StaticGroundGeometryColorBatchSpec.js index 7fcd76449690..1a9550e05d38 100644 --- a/packages/engine/Specs/DataSources/StaticGroundGeometryColorBatchSpec.js +++ b/packages/engine/Specs/DataSources/StaticGroundGeometryColorBatchSpec.js @@ -1,19 +1,19 @@ import { ApproximateTerrainHeights, + CallbackProperty, Cartesian3, + ClassificationType, Color, DistanceDisplayCondition, + EllipseGeometryUpdater, + Entity, + GroundPrimitive, JulianDate, Math as CesiumMath, + StaticGroundGeometryColorBatch, TimeInterval, TimeIntervalCollection, - CallbackProperty, - EllipseGeometryUpdater, - Entity, - StaticGroundGeometryColorBatch, TimeIntervalCollectionProperty, - ClassificationType, - GroundPrimitive, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/DataSources/StaticGroundGeometryPerMaterialBatchSpec.js b/packages/engine/Specs/DataSources/StaticGroundGeometryPerMaterialBatchSpec.js index f491e0752398..6d1daefb1376 100644 --- a/packages/engine/Specs/DataSources/StaticGroundGeometryPerMaterialBatchSpec.js +++ b/packages/engine/Specs/DataSources/StaticGroundGeometryPerMaterialBatchSpec.js @@ -2,22 +2,22 @@ import { ApproximateTerrainHeights, Cartesian2, Cartesian3, + ClassificationType, Color, - DistanceDisplayCondition, - JulianDate, - Math as CesiumMath, - TimeInterval, - TimeIntervalCollection, ConstantProperty, + DistanceDisplayCondition, EllipseGeometryUpdater, EllipseGraphics, Entity, GridMaterialProperty, - StaticGroundGeometryPerMaterialBatch, - TimeIntervalCollectionProperty, - ClassificationType, GroundPrimitive, + JulianDate, MaterialAppearance, + Math as CesiumMath, + StaticGroundGeometryPerMaterialBatch, + TimeInterval, + TimeIntervalCollection, + TimeIntervalCollectionProperty, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/DataSources/StaticGroundPolylinePerMaterialBatchSpec.js b/packages/engine/Specs/DataSources/StaticGroundPolylinePerMaterialBatchSpec.js index e3e05bc22f1b..853ac51d52b8 100644 --- a/packages/engine/Specs/DataSources/StaticGroundPolylinePerMaterialBatchSpec.js +++ b/packages/engine/Specs/DataSources/StaticGroundPolylinePerMaterialBatchSpec.js @@ -1,25 +1,25 @@ +import { defined } from "@cesium/utils"; import { ApproximateTerrainHeights, BoundingSphere, + BoundingSphereState, Cartesian3, + ClassificationType, Color, - defined, - DistanceDisplayCondition, - JulianDate, - Math as CesiumMath, - TimeInterval, - TimeIntervalCollection, - BoundingSphereState, ColorMaterialProperty, ConstantProperty, + DistanceDisplayCondition, Entity, + GroundPolylinePrimitive, + JulianDate, + Math as CesiumMath, PolylineGeometryUpdater, PolylineGraphics, PolylineOutlineMaterialProperty, StaticGroundPolylinePerMaterialBatch, + TimeInterval, + TimeIntervalCollection, TimeIntervalCollectionProperty, - ClassificationType, - GroundPolylinePrimitive, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/DataSources/StaticOutlineGeometryBatchSpec.js b/packages/engine/Specs/DataSources/StaticOutlineGeometryBatchSpec.js index a71a1e04c255..1ee9ccd7618f 100644 --- a/packages/engine/Specs/DataSources/StaticOutlineGeometryBatchSpec.js +++ b/packages/engine/Specs/DataSources/StaticOutlineGeometryBatchSpec.js @@ -1,17 +1,17 @@ import { + CallbackProperty, Cartesian3, Color, DistanceDisplayCondition, + EllipseGeometryUpdater, + Entity, JulianDate, Math as CesiumMath, + ShadowMode, + StaticOutlineGeometryBatch, TimeInterval, TimeIntervalCollection, - CallbackProperty, - EllipseGeometryUpdater, - Entity, - StaticOutlineGeometryBatch, TimeIntervalCollectionProperty, - ShadowMode, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/DataSources/StripeMaterialPropertySpec.js b/packages/engine/Specs/DataSources/StripeMaterialPropertySpec.js index 94bdb5505fb0..dcb8b9c364d7 100644 --- a/packages/engine/Specs/DataSources/StripeMaterialPropertySpec.js +++ b/packages/engine/Specs/DataSources/StripeMaterialPropertySpec.js @@ -1,10 +1,10 @@ import { Color, - JulianDate, - TimeInterval, ConstantProperty, + JulianDate, StripeMaterialProperty, StripeOrientation, + TimeInterval, TimeIntervalCollectionProperty, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/TerrainOffsetPropertySpec.js b/packages/engine/Specs/DataSources/TerrainOffsetPropertySpec.js index 8a444e67b524..2e6e1abc2411 100644 --- a/packages/engine/Specs/DataSources/TerrainOffsetPropertySpec.js +++ b/packages/engine/Specs/DataSources/TerrainOffsetPropertySpec.js @@ -1,8 +1,8 @@ import { - Cartesian3, - JulianDate, CallbackProperty, + Cartesian3, ConstantProperty, + JulianDate, TerrainOffsetProperty, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/TimeIntervalCollectionPositionPropertySpec.js b/packages/engine/Specs/DataSources/TimeIntervalCollectionPositionPropertySpec.js index b5d3687b3fc7..2b77dce4b56f 100644 --- a/packages/engine/Specs/DataSources/TimeIntervalCollectionPositionPropertySpec.js +++ b/packages/engine/Specs/DataSources/TimeIntervalCollectionPositionPropertySpec.js @@ -1,10 +1,10 @@ import { Cartesian3, JulianDate, + PositionProperty, ReferenceFrame, TimeInterval, TimeIntervalCollection, - PositionProperty, TimeIntervalCollectionPositionProperty, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/VelocityOrientationPropertySpec.js b/packages/engine/Specs/DataSources/VelocityOrientationPropertySpec.js index ef7951711f3a..0a605280663d 100644 --- a/packages/engine/Specs/DataSources/VelocityOrientationPropertySpec.js +++ b/packages/engine/Specs/DataSources/VelocityOrientationPropertySpec.js @@ -1,13 +1,13 @@ import { + CallbackProperty, Cartesian3, Ellipsoid, Event, ExtrapolationType, JulianDate, Quaternion, - Transforms, - CallbackProperty, SampledPositionProperty, + Transforms, VelocityOrientationProperty, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/VelocityVectorPropertySpec.js b/packages/engine/Specs/DataSources/VelocityVectorPropertySpec.js index 4e059ecad6d0..d19b69ee44b9 100644 --- a/packages/engine/Specs/DataSources/VelocityVectorPropertySpec.js +++ b/packages/engine/Specs/DataSources/VelocityVectorPropertySpec.js @@ -1,11 +1,11 @@ import { + CallbackProperty, Cartesian3, + ConstantPositionProperty, Event, ExtrapolationType, JulianDate, Math as CesiumMath, - CallbackProperty, - ConstantPositionProperty, SampledPositionProperty, VelocityVectorProperty, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/WallGeometryUpdaterSpec.js b/packages/engine/Specs/DataSources/WallGeometryUpdaterSpec.js index dd4249ea0956..8d09c365ad85 100644 --- a/packages/engine/Specs/DataSources/WallGeometryUpdaterSpec.js +++ b/packages/engine/Specs/DataSources/WallGeometryUpdaterSpec.js @@ -1,18 +1,18 @@ import { Cartesian3, Color, - JulianDate, - TimeInterval, - TimeIntervalCollection, ConstantProperty, Entity, + JulianDate, + PrimitiveCollection, PropertyArray, SampledPositionProperty, SampledProperty, + TimeInterval, + TimeIntervalCollection, TimeIntervalCollectionProperty, WallGeometryUpdater, WallGraphics, - PrimitiveCollection, } from "../../index.js"; import createDynamicGeometryUpdaterSpecs from "../../../../Specs/createDynamicGeometryUpdaterSpecs.js"; diff --git a/packages/engine/Specs/DataSources/WallGraphicsSpec.js b/packages/engine/Specs/DataSources/WallGraphicsSpec.js index 78432a7c0615..c887eb1b3157 100644 --- a/packages/engine/Specs/DataSources/WallGraphicsSpec.js +++ b/packages/engine/Specs/DataSources/WallGraphicsSpec.js @@ -1,10 +1,10 @@ import { Color, - DistanceDisplayCondition, ColorMaterialProperty, ConstantProperty, - WallGraphics, + DistanceDisplayCondition, ShadowMode, + WallGraphics, } from "../../index.js"; import testDefinitionChanged from "../../../../Specs/testDefinitionChanged.js"; diff --git a/packages/engine/Specs/DataSources/createMaterialPropertyDescriptorSpec.js b/packages/engine/Specs/DataSources/createMaterialPropertyDescriptorSpec.js index da4a9e7ac33a..713d41b2b487 100644 --- a/packages/engine/Specs/DataSources/createMaterialPropertyDescriptorSpec.js +++ b/packages/engine/Specs/DataSources/createMaterialPropertyDescriptorSpec.js @@ -1,8 +1,8 @@ import { Color, - Event, ColorMaterialProperty, createMaterialPropertyDescriptor, + Event, ImageMaterialProperty, } from "../../index.js"; diff --git a/packages/engine/Specs/DataSources/exportKmlSpec.js b/packages/engine/Specs/DataSources/exportKmlSpec.js index bc3e138438c9..7c8904c484e3 100644 --- a/packages/engine/Specs/DataSources/exportKmlSpec.js +++ b/packages/engine/Specs/DataSources/exportKmlSpec.js @@ -1,26 +1,26 @@ +import { defined } from "@cesium/utils"; import { BoundingRectangle, + CallbackProperty, Cartesian2, Cartesian3, Cartographic, Color, - defined, - Iso8601, - JulianDate, - Math as CesiumMath, - PolygonHierarchy, - Rectangle, - TimeInterval, - CallbackProperty, ColorMaterialProperty, Entity, EntityCollection, exportKml, + HeightReference, + HorizontalOrigin, ImageMaterialProperty, + Iso8601, + JulianDate, + Math as CesiumMath, + PolygonHierarchy, PolylineOutlineMaterialProperty, + Rectangle, SampledPositionProperty, - HeightReference, - HorizontalOrigin, + TimeInterval, VerticalOrigin, } from "../../index.js"; diff --git a/packages/engine/Specs/Renderer/AutomaticUniformSpec.js b/packages/engine/Specs/Renderer/AutomaticUniformSpec.js index 297ae181cbed..84c1d075600b 100644 --- a/packages/engine/Specs/Renderer/AutomaticUniformSpec.js +++ b/packages/engine/Specs/Renderer/AutomaticUniformSpec.js @@ -12,8 +12,8 @@ import { OrthographicFrustum, OrthographicOffCenterFrustum, Pass, - Texture, SceneMode, + Texture, } from "../../index.js"; import createCamera from "../../../../Specs/createCamera.js"; diff --git a/packages/engine/Specs/Renderer/BufferSpec.js b/packages/engine/Specs/Renderer/BufferSpec.js index 9f96253ebf0e..d8390adb3d01 100644 --- a/packages/engine/Specs/Renderer/BufferSpec.js +++ b/packages/engine/Specs/Renderer/BufferSpec.js @@ -1,7 +1,7 @@ -import { IndexDatatype, Buffer, BufferUsage } from "../../index.js"; +import { Buffer, BufferUsage, IndexDatatype } from "../../index.js"; -import createWebglVersionHelper from "../createWebglVersionHelper.js"; import createContext from "../../../../Specs/createContext.js"; +import createWebglVersionHelper from "../createWebglVersionHelper.js"; describe( "Renderer/Buffer", diff --git a/packages/engine/Specs/Renderer/ClearCommandSpec.js b/packages/engine/Specs/Renderer/ClearCommandSpec.js index 6e380f27e8e7..40497a208556 100644 --- a/packages/engine/Specs/Renderer/ClearCommandSpec.js +++ b/packages/engine/Specs/Renderer/ClearCommandSpec.js @@ -1,4 +1,4 @@ -import { Color, ClearCommand } from "../../index.js"; +import { ClearCommand, Color } from "../../index.js"; describe("Renderer/ClearCommand", function () { it("constructs with defaults", function () { diff --git a/packages/engine/Specs/Renderer/ClearSpec.js b/packages/engine/Specs/Renderer/ClearSpec.js index 2a6454ab8b3c..42f88f0d4bfb 100644 --- a/packages/engine/Specs/Renderer/ClearSpec.js +++ b/packages/engine/Specs/Renderer/ClearSpec.js @@ -1,7 +1,7 @@ import { BoundingRectangle, - Color, ClearCommand, + Color, Framebuffer, RenderState, Texture, diff --git a/packages/engine/Specs/Renderer/ComputeCommandSpec.js b/packages/engine/Specs/Renderer/ComputeCommandSpec.js index 51d001526e74..c754f8fbbe30 100644 --- a/packages/engine/Specs/Renderer/ComputeCommandSpec.js +++ b/packages/engine/Specs/Renderer/ComputeCommandSpec.js @@ -1,13 +1,13 @@ import { BoundingRectangle, - PixelFormat, Buffer, BufferUsage, ComputeCommand, + Material, + PixelFormat, ShaderProgram, Texture, VertexArray, - Material, ViewportQuad, } from "../../index.js"; diff --git a/packages/engine/Specs/Renderer/ContextSpec.js b/packages/engine/Specs/Renderer/ContextSpec.js index 7f24b0de96f4..b2773bdf9a7d 100644 --- a/packages/engine/Specs/Renderer/ContextSpec.js +++ b/packages/engine/Specs/Renderer/ContextSpec.js @@ -1,10 +1,10 @@ import { - Color, - IndexDatatype, Buffer, BufferUsage, + Color, Context, ContextLimits, + IndexDatatype, } from "../../index.js"; import createContext from "../../../../Specs/createContext.js"; diff --git a/packages/engine/Specs/Renderer/CubeMapSpec.js b/packages/engine/Specs/Renderer/CubeMapSpec.js index 356c26e4f649..b9d50df4f1e5 100644 --- a/packages/engine/Specs/Renderer/CubeMapSpec.js +++ b/packages/engine/Specs/Renderer/CubeMapSpec.js @@ -1,15 +1,15 @@ +import { defined } from "@cesium/utils"; import { BufferUsage, Cartesian3, + ClearCommand, Color, ComponentDatatype, - defined, - PixelFormat, - Resource, - ClearCommand, ContextLimits, CubeMap, PixelDatatype, + PixelFormat, + Resource, Sampler, Texture, TextureMagnificationFilter, diff --git a/packages/engine/Specs/Renderer/DrawCommandSpec.js b/packages/engine/Specs/Renderer/DrawCommandSpec.js index f24bb49e7be2..35f4cdacc154 100644 --- a/packages/engine/Specs/Renderer/DrawCommandSpec.js +++ b/packages/engine/Specs/Renderer/DrawCommandSpec.js @@ -1,4 +1,4 @@ -import { PrimitiveType, DrawCommand, Pass } from "../../index.js"; +import { DrawCommand, Pass, PrimitiveType } from "../../index.js"; describe("Renderer/DrawCommand", function () { it("constructs", function () { diff --git a/packages/engine/Specs/Renderer/DrawSpec.js b/packages/engine/Specs/Renderer/DrawSpec.js index 3d7ab36a6c02..2f1c5a711990 100644 --- a/packages/engine/Specs/Renderer/DrawSpec.js +++ b/packages/engine/Specs/Renderer/DrawSpec.js @@ -1,20 +1,20 @@ import { + BlendingState, BoundingRectangle, - Color, - ComponentDatatype, - IndexDatatype, - PrimitiveType, - WebGLConstants, - WindingOrder, Buffer, BufferUsage, ClearCommand, + Color, + ComponentDatatype, ContextLimits, DrawCommand, + IndexDatatype, + PrimitiveType, RenderState, ShaderProgram, VertexArray, - BlendingState, + WebGLConstants, + WindingOrder, } from "../../index.js"; import createContext from "../../../../Specs/createContext.js"; diff --git a/packages/engine/Specs/Renderer/FramebufferManagerSpec.js b/packages/engine/Specs/Renderer/FramebufferManagerSpec.js index de1d797048eb..c62437b91506 100644 --- a/packages/engine/Specs/Renderer/FramebufferManagerSpec.js +++ b/packages/engine/Specs/Renderer/FramebufferManagerSpec.js @@ -1,7 +1,7 @@ +import { defined } from "@cesium/utils"; import { - defined, - Color, ClearCommand, + Color, Framebuffer, FramebufferManager, PixelDatatype, diff --git a/packages/engine/Specs/Renderer/FramebufferSpec.js b/packages/engine/Specs/Renderer/FramebufferSpec.js index a963018ac362..7255a66eddfd 100644 --- a/packages/engine/Specs/Renderer/FramebufferSpec.js +++ b/packages/engine/Specs/Renderer/FramebufferSpec.js @@ -1,22 +1,22 @@ import { - Color, - PixelFormat, - PrimitiveType, - WebGLConstants, Buffer, BufferUsage, ClearCommand, + Color, ContextLimits, CubeMap, DrawCommand, Framebuffer, PixelDatatype, + PixelFormat, + PrimitiveType, Renderbuffer, RenderbufferFormat, RenderState, ShaderProgram, Texture, VertexArray, + WebGLConstants, } from "../../index.js"; import createContext from "../../../../Specs/createContext.js"; diff --git a/packages/engine/Specs/Renderer/MultisampleFramebufferSpec.js b/packages/engine/Specs/Renderer/MultisampleFramebufferSpec.js index 7393c123b173..f09d5401ab09 100644 --- a/packages/engine/Specs/Renderer/MultisampleFramebufferSpec.js +++ b/packages/engine/Specs/Renderer/MultisampleFramebufferSpec.js @@ -1,18 +1,18 @@ import { - ClearCommand, - Color, - PrimitiveType, Buffer, BufferUsage, + ClearCommand, + Color, DrawCommand, MultisampleFramebuffer, PixelDatatype, PixelFormat, - Texture, + PrimitiveType, Renderbuffer, RenderbufferFormat, RenderState, ShaderProgram, + Texture, VertexArray, } from "../../index.js"; diff --git a/packages/engine/Specs/Renderer/RenderStateSpec.js b/packages/engine/Specs/Renderer/RenderStateSpec.js index afa5d42d1d41..46bb95319e4f 100644 --- a/packages/engine/Specs/Renderer/RenderStateSpec.js +++ b/packages/engine/Specs/Renderer/RenderStateSpec.js @@ -1,8 +1,8 @@ import { - WebGLConstants, - WindingOrder, ContextLimits, RenderState, + WebGLConstants, + WindingOrder, } from "../../index.js"; import createContext from "../../../../Specs/createContext.js"; diff --git a/packages/engine/Specs/Renderer/ShaderBuilderSpec.js b/packages/engine/Specs/Renderer/ShaderBuilderSpec.js index 9e9fe00e91fb..1ad8fa872c3c 100644 --- a/packages/engine/Specs/Renderer/ShaderBuilderSpec.js +++ b/packages/engine/Specs/Renderer/ShaderBuilderSpec.js @@ -1,5 +1,5 @@ -import { ShaderBuilder, ShaderDestination, ShaderSource } from "../../index.js"; import createContext from "../../../../Specs/createContext.js"; +import { ShaderBuilder, ShaderDestination, ShaderSource } from "../../index.js"; describe( "Renderer/ShaderBuilder", diff --git a/packages/engine/Specs/Renderer/ShaderCacheSpec.js b/packages/engine/Specs/Renderer/ShaderCacheSpec.js index 0636a743e4c9..96568defe335 100644 --- a/packages/engine/Specs/Renderer/ShaderCacheSpec.js +++ b/packages/engine/Specs/Renderer/ShaderCacheSpec.js @@ -1,5 +1,5 @@ -import { ShaderCache, ShaderSource } from "../../index.js"; import createContext from "../../../../Specs/createContext.js"; +import { ShaderCache, ShaderSource } from "../../index.js"; describe( "Renderer/ShaderCache", diff --git a/packages/engine/Specs/Renderer/ShaderProgramSpec.js b/packages/engine/Specs/Renderer/ShaderProgramSpec.js index 9d57cc1346de..33b9798ea779 100644 --- a/packages/engine/Specs/Renderer/ShaderProgramSpec.js +++ b/packages/engine/Specs/Renderer/ShaderProgramSpec.js @@ -1,9 +1,5 @@ -import { - ContextLimits, - ShaderProgram, - ShaderSource, - RuntimeError, -} from "../../index.js"; +import { RuntimeError } from "@cesium/utils"; +import { ContextLimits, ShaderProgram, ShaderSource } from "../../index.js"; import createContext from "../../../../Specs/createContext.js"; diff --git a/packages/engine/Specs/Renderer/TextureSpec.js b/packages/engine/Specs/Renderer/TextureSpec.js index b9cd1b386199..8c966f3539ec 100644 --- a/packages/engine/Specs/Renderer/TextureSpec.js +++ b/packages/engine/Specs/Renderer/TextureSpec.js @@ -1,13 +1,13 @@ import { Cartesian2, + ClearCommand, Color, - loadKTX2, + ContextLimits, KTX2Transcoder, + loadKTX2, + PixelDatatype, PixelFormat, Resource, - ClearCommand, - ContextLimits, - PixelDatatype, Sampler, Texture, TextureMagnificationFilter, diff --git a/packages/engine/Specs/Renderer/VertexArrayFacadeSpec.js b/packages/engine/Specs/Renderer/VertexArrayFacadeSpec.js index 56e7f6fec589..673cff5271ed 100644 --- a/packages/engine/Specs/Renderer/VertexArrayFacadeSpec.js +++ b/packages/engine/Specs/Renderer/VertexArrayFacadeSpec.js @@ -1,6 +1,6 @@ import { - ComponentDatatype, BufferUsage, + ComponentDatatype, VertexArrayFacade, } from "../../index.js"; diff --git a/packages/engine/Specs/Renderer/VertexArrayFactorySpec.js b/packages/engine/Specs/Renderer/VertexArrayFactorySpec.js index 579e735dd04b..4d2bbe80893b 100644 --- a/packages/engine/Specs/Renderer/VertexArrayFactorySpec.js +++ b/packages/engine/Specs/Renderer/VertexArrayFactorySpec.js @@ -1,15 +1,15 @@ +import { RuntimeError } from "@cesium/utils"; import { + BufferUsage, + ClearCommand, ComponentDatatype, + DrawCommand, Geometry, GeometryAttribute, GeometryPipeline, IndexDatatype, PrimitiveType, - BufferUsage, - ClearCommand, - DrawCommand, ShaderProgram, - RuntimeError, VertexArray, } from "../../index.js"; diff --git a/packages/engine/Specs/Renderer/VertexArraySpec.js b/packages/engine/Specs/Renderer/VertexArraySpec.js index bfc5834735e5..0f8a0266d9fa 100644 --- a/packages/engine/Specs/Renderer/VertexArraySpec.js +++ b/packages/engine/Specs/Renderer/VertexArraySpec.js @@ -1,9 +1,9 @@ import { - ComponentDatatype, - PrimitiveType, Buffer, BufferUsage, + ComponentDatatype, DrawCommand, + PrimitiveType, ShaderProgram, VertexArray, } from "../../index.js"; diff --git a/packages/engine/Specs/Renderer/loadCubeMapSpec.js b/packages/engine/Specs/Renderer/loadCubeMapSpec.js index 70ee6f6ad8cd..0c7a0f2f8581 100644 --- a/packages/engine/Specs/Renderer/loadCubeMapSpec.js +++ b/packages/engine/Specs/Renderer/loadCubeMapSpec.js @@ -1,10 +1,10 @@ import { - Cartesian3, - PrimitiveType, Buffer, BufferUsage, + Cartesian3, DrawCommand, loadCubeMap, + PrimitiveType, ShaderProgram, VertexArray, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/AppearanceSpec.js b/packages/engine/Specs/Scene/AppearanceSpec.js index 43fb29cabc60..764d48720283 100644 --- a/packages/engine/Specs/Scene/AppearanceSpec.js +++ b/packages/engine/Specs/Scene/AppearanceSpec.js @@ -1,8 +1,8 @@ import { - WebGLConstants, Appearance, BlendingState, Material, + WebGLConstants, } from "../../index.js"; describe("Scene/Appearance", function () { diff --git a/packages/engine/Specs/Scene/ArcGisMapServerImageryProviderSpec.js b/packages/engine/Specs/Scene/ArcGisMapServerImageryProviderSpec.js index 94000fee5b82..23634ae96499 100644 --- a/packages/engine/Specs/Scene/ArcGisMapServerImageryProviderSpec.js +++ b/packages/engine/Specs/Scene/ArcGisMapServerImageryProviderSpec.js @@ -1,7 +1,8 @@ +import { RuntimeError } from "@cesium/utils"; import Uri from "urijs"; import { - ArcGisMapServerImageryProvider, ArcGisBaseMapType, + ArcGisMapServerImageryProvider, ArcGisMapService, Cartesian2, Cartesian3, @@ -17,7 +18,6 @@ import { Request, RequestScheduler, Resource, - RuntimeError, WebMercatorProjection, WebMercatorTilingScheme, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/AxisSpec.js b/packages/engine/Specs/Scene/AxisSpec.js index 5064e26a594c..b5b5062e7506 100644 --- a/packages/engine/Specs/Scene/AxisSpec.js +++ b/packages/engine/Specs/Scene/AxisSpec.js @@ -1,4 +1,4 @@ -import { Cartesian4, Math as CesiumMath, Matrix4, Axis } from "../../index.js"; +import { Axis, Cartesian4, Math as CesiumMath, Matrix4 } from "../../index.js"; describe("Scene/Axis", function () { function convertUpAxis(upAxis, transformation, expected) { diff --git a/packages/engine/Specs/Scene/B3dmParserSpec.js b/packages/engine/Specs/Scene/B3dmParserSpec.js index 47ca7363d9ca..8b09d2cae87e 100644 --- a/packages/engine/Specs/Scene/B3dmParserSpec.js +++ b/packages/engine/Specs/Scene/B3dmParserSpec.js @@ -1,11 +1,7 @@ -import { - B3dmParser, - Cartesian3, - HeadingPitchRange, - RuntimeError, -} from "../../index.js"; +import { RuntimeError } from "@cesium/utils"; import Cesium3DTilesTester from "../../../../Specs/Cesium3DTilesTester.js"; import createScene from "../../../../Specs/createScene.js"; +import { B3dmParser, Cartesian3, HeadingPitchRange } from "../../index.js"; describe( "Scene/B3dmParser", diff --git a/packages/engine/Specs/Scene/BatchTableHierarchySpec.js b/packages/engine/Specs/Scene/BatchTableHierarchySpec.js index 582e06e72873..29b84780ca3a 100644 --- a/packages/engine/Specs/Scene/BatchTableHierarchySpec.js +++ b/packages/engine/Specs/Scene/BatchTableHierarchySpec.js @@ -1,9 +1,5 @@ -import { - BatchTableHierarchy, - Cartesian2, - clone, - RuntimeError, -} from "../../index.js"; +import { RuntimeError } from "@cesium/utils"; +import { BatchTableHierarchy, Cartesian2, clone } from "../../index.js"; describe("Scene/BatchTableHierarchy", function () { const hierarchyExtension = { diff --git a/packages/engine/Specs/Scene/BatchTableSpec.js b/packages/engine/Specs/Scene/BatchTableSpec.js index a2ad34141e3a..d50d4ee3186a 100644 --- a/packages/engine/Specs/Scene/BatchTableSpec.js +++ b/packages/engine/Specs/Scene/BatchTableSpec.js @@ -1,10 +1,10 @@ import { + BatchTable, Cartesian4, ComponentDatatype, Math as CesiumMath, PixelDatatype, Texture, - BatchTable, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/BillboardCollectionSpec.js b/packages/engine/Specs/Scene/BillboardCollectionSpec.js index 4bca5de7ab01..52665e6325ee 100644 --- a/packages/engine/Specs/Scene/BillboardCollectionSpec.js +++ b/packages/engine/Specs/Scene/BillboardCollectionSpec.js @@ -1,4 +1,7 @@ import { + Billboard, + BillboardCollection, + BlendOption, BoundingRectangle, BoundingSphere, Cartesian2, @@ -9,20 +12,17 @@ import { createGuid, DistanceDisplayCondition, Globe, + HeightReference, + HorizontalOrigin, Math as CesiumMath, NearFarScalar, OrthographicOffCenterFrustum, PerspectiveFrustum, Rectangle, Resource, - Billboard, - BillboardCollection, - BlendOption, - HeightReference, - HorizontalOrigin, + SplitDirection, TextureAtlas, VerticalOrigin, - SplitDirection, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/BingMapsImageryProviderSpec.js b/packages/engine/Specs/Scene/BingMapsImageryProviderSpec.js index 3323376afa7d..d74615e24b4b 100644 --- a/packages/engine/Specs/Scene/BingMapsImageryProviderSpec.js +++ b/packages/engine/Specs/Scene/BingMapsImageryProviderSpec.js @@ -1,9 +1,9 @@ +import { defined, RuntimeError } from "@cesium/utils"; import Uri from "urijs"; import { appendForwardSlash, BingMapsImageryProvider, BingMapsStyle, - defined, DiscardEmptyTileImagePolicy, Imagery, ImageryLayer, @@ -12,7 +12,6 @@ import { queryToObject, RequestScheduler, Resource, - RuntimeError, WebMercatorTilingScheme, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/BoundingVolumeSemanticsSpec.js b/packages/engine/Specs/Scene/BoundingVolumeSemanticsSpec.js index 23858656f5f1..de54d37fd03e 100644 --- a/packages/engine/Specs/Scene/BoundingVolumeSemanticsSpec.js +++ b/packages/engine/Specs/Scene/BoundingVolumeSemanticsSpec.js @@ -1,8 +1,8 @@ import { - TileMetadata, + BoundingVolumeSemantics, Math, MetadataClass, - BoundingVolumeSemantics, + TileMetadata, } from "../../index.js"; describe("Scene/BoundingVolumeSemantics", function () { diff --git a/packages/engine/Specs/Scene/BufferLoaderSpec.js b/packages/engine/Specs/Scene/BufferLoaderSpec.js index 0dc2ac5f9409..c0c855f26093 100644 --- a/packages/engine/Specs/Scene/BufferLoaderSpec.js +++ b/packages/engine/Specs/Scene/BufferLoaderSpec.js @@ -1,9 +1,5 @@ -import { - BufferLoader, - Resource, - ResourceCache, - RuntimeError, -} from "../../index.js"; +import { RuntimeError } from "@cesium/utils"; +import { BufferLoader, Resource, ResourceCache } from "../../index.js"; describe("Scene/BufferLoader", function () { const typedArray = new Uint8Array([1, 3, 7, 15, 31, 63, 127, 255]); diff --git a/packages/engine/Specs/Scene/CameraEventAggregatorSpec.js b/packages/engine/Specs/Scene/CameraEventAggregatorSpec.js index c418e12ef174..08e451a07389 100644 --- a/packages/engine/Specs/Scene/CameraEventAggregatorSpec.js +++ b/packages/engine/Specs/Scene/CameraEventAggregatorSpec.js @@ -1,10 +1,10 @@ +import { FeatureDetection } from "@cesium/utils"; import { + CameraEventAggregator, + CameraEventType, Cartesian2, combine, - FeatureDetection, KeyboardEventModifier, - CameraEventAggregator, - CameraEventType, } from "../../index.js"; import createCanvas from "../../../../Specs/createCanvas.js"; diff --git a/packages/engine/Specs/Scene/CameraFlightPathSpec.js b/packages/engine/Specs/Scene/CameraFlightPathSpec.js index b4cd134bf356..8f4635de8db4 100644 --- a/packages/engine/Specs/Scene/CameraFlightPathSpec.js +++ b/packages/engine/Specs/Scene/CameraFlightPathSpec.js @@ -1,4 +1,5 @@ import { + CameraFlightPath, Cartesian3, Cartographic, Ellipsoid, @@ -6,7 +7,6 @@ import { Globe, Math as CesiumMath, OrthographicOffCenterFrustum, - CameraFlightPath, SceneMode, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/CameraSpec.js b/packages/engine/Specs/Scene/CameraSpec.js index 6cda5632cd20..103bdc72e5ec 100644 --- a/packages/engine/Specs/Scene/CameraSpec.js +++ b/packages/engine/Specs/Scene/CameraSpec.js @@ -1,5 +1,7 @@ import { BoundingSphere, + Camera, + CameraFlightPath, Cartesian2, Cartesian3, Cartesian4, @@ -7,6 +9,7 @@ import { Ellipsoid, GeographicProjection, HeadingPitchRange, + MapMode2D, Math as CesiumMath, Matrix3, Matrix4, @@ -14,13 +17,10 @@ import { OrthographicOffCenterFrustum, PerspectiveFrustum, Rectangle, - Transforms, - WebMercatorProjection, - Camera, - CameraFlightPath, - MapMode2D, SceneMode, + Transforms, TweenCollection, + WebMercatorProjection, } from "../../index.js"; describe("Scene/Camera", function () { diff --git a/packages/engine/Specs/Scene/Cesium3DTileBatchTableSpec.js b/packages/engine/Specs/Scene/Cesium3DTileBatchTableSpec.js index 04b4f5370fc5..1a8f7545930c 100644 --- a/packages/engine/Specs/Scene/Cesium3DTileBatchTableSpec.js +++ b/packages/engine/Specs/Scene/Cesium3DTileBatchTableSpec.js @@ -1,20 +1,20 @@ +import { RuntimeError } from "@cesium/utils"; +import Cesium3DTilesTester from "../../../../Specs/Cesium3DTilesTester.js"; +import concatTypedArrays from "../../../../Specs/concatTypedArrays.js"; +import createScene from "../../../../Specs/createScene.js"; import { Cartesian2, Cartesian3, Cartesian4, + Cesium3DTileBatchTable, + Cesium3DTileStyle, Color, + ContextLimits, HeadingPitchRange, Matrix2, Matrix3, Matrix4, - ContextLimits, - Cesium3DTileBatchTable, - Cesium3DTileStyle, - RuntimeError, } from "../../index.js"; -import Cesium3DTilesTester from "../../../../Specs/Cesium3DTilesTester.js"; -import createScene from "../../../../Specs/createScene.js"; -import concatTypedArrays from "../../../../Specs/concatTypedArrays.js"; // Since b3dm tilesets now use ModelFeatureTable, disabling these tests until Cesium3DTileBatchTable and // ModelFeatureTable can be consolidated diff --git a/packages/engine/Specs/Scene/Cesium3DTileFeatureSpec.js b/packages/engine/Specs/Scene/Cesium3DTileFeatureSpec.js index 2f45ed8cf0d3..bc86ddee4e1f 100644 --- a/packages/engine/Specs/Scene/Cesium3DTileFeatureSpec.js +++ b/packages/engine/Specs/Scene/Cesium3DTileFeatureSpec.js @@ -1,3 +1,5 @@ +import Cesium3DTilesTester from "../../../../Specs/Cesium3DTilesTester.js"; +import createScene from "../../../../Specs/createScene.js"; import { Cartesian3, Cartesian4, @@ -7,8 +9,6 @@ import { Math as CesiumMath, Rectangle, } from "../../index.js"; -import Cesium3DTilesTester from "../../../../Specs/Cesium3DTilesTester.js"; -import createScene from "../../../../Specs/createScene.js"; describe( "Scene/Cesium3DTileFeature", diff --git a/packages/engine/Specs/Scene/Cesium3DTileFeatureTableSpec.js b/packages/engine/Specs/Scene/Cesium3DTileFeatureTableSpec.js index cb814fb32fc9..ae8c635c233d 100644 --- a/packages/engine/Specs/Scene/Cesium3DTileFeatureTableSpec.js +++ b/packages/engine/Specs/Scene/Cesium3DTileFeatureTableSpec.js @@ -1,4 +1,4 @@ -import { ComponentDatatype, Cesium3DTileFeatureTable } from "../../index.js"; +import { Cesium3DTileFeatureTable, ComponentDatatype } from "../../index.js"; describe("Scene/Cesium3DTileFeatureTable", function () { it("loads from JSON", function () { diff --git a/packages/engine/Specs/Scene/Cesium3DTileSpec.js b/packages/engine/Specs/Scene/Cesium3DTileSpec.js index 48f036cef4d8..86c83b9601c8 100644 --- a/packages/engine/Specs/Scene/Cesium3DTileSpec.js +++ b/packages/engine/Specs/Scene/Cesium3DTileSpec.js @@ -1,21 +1,21 @@ +import { RuntimeError } from "@cesium/utils"; import { - clone, Cartesian3, - Empty3DTileContent, - HeadingPitchRoll, - Matrix3, - Matrix4, - Rectangle, - Transforms, Cesium3DTile, Cesium3DTilePass, Cesium3DTileRefine, Cesium3DTilesetHeatmap, + clone, + Empty3DTileContent, + HeadingPitchRoll, Math as CesiumMath, + Matrix3, + Matrix4, MetadataSchema, - RuntimeError, + Rectangle, TileBoundingRegion, TileOrientedBoundingBox, + Transforms, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/Cesium3DTileStyleSpec.js b/packages/engine/Specs/Scene/Cesium3DTileStyleSpec.js index d762d34bfbad..0e407b86493a 100644 --- a/packages/engine/Specs/Scene/Cesium3DTileStyleSpec.js +++ b/packages/engine/Specs/Scene/Cesium3DTileStyleSpec.js @@ -1,11 +1,11 @@ import { Cartesian2, Cartesian4, - Color, - Resource, Cesium3DTileStyle, + Color, ConditionsExpression, Expression, + Resource, } from "../../index.js"; describe("Scene/Cesium3DTileStyle", function () { diff --git a/packages/engine/Specs/Scene/Cesium3DTilesVoxelProviderSpec.js b/packages/engine/Specs/Scene/Cesium3DTilesVoxelProviderSpec.js index efc579e0d9cd..1498467c6990 100644 --- a/packages/engine/Specs/Scene/Cesium3DTilesVoxelProviderSpec.js +++ b/packages/engine/Specs/Scene/Cesium3DTilesVoxelProviderSpec.js @@ -1,3 +1,5 @@ +import createScene from "../../../../Specs/createScene.js"; +import pollToPromise from "../../../../Specs/pollToPromise.js"; import { Cartesian3, Cesium3DTilesVoxelProvider, @@ -10,8 +12,6 @@ import { VoxelProvider, VoxelShapeType, } from "../../index.js"; -import createScene from "../../../../Specs/createScene.js"; -import pollToPromise from "../../../../Specs/pollToPromise.js"; describe("Scene/Cesium3DTilesVoxelProvider", function () { let scene; diff --git a/packages/engine/Specs/Scene/Cesium3DTilesetBaseTraversalSpec.js b/packages/engine/Specs/Scene/Cesium3DTilesetBaseTraversalSpec.js index ceb616fb9c1d..f25e20c92d0a 100644 --- a/packages/engine/Specs/Scene/Cesium3DTilesetBaseTraversalSpec.js +++ b/packages/engine/Specs/Scene/Cesium3DTilesetBaseTraversalSpec.js @@ -1,6 +1,6 @@ import { - Cesium3DTilesetTraversal, Cesium3DTilesetBaseTraversal, + Cesium3DTilesetTraversal, } from "../../index.js"; describe("Scene/Cesium3DTilesetBaseTraversal", function () { diff --git a/packages/engine/Specs/Scene/Cesium3DTilesetHeatmapSpec.js b/packages/engine/Specs/Scene/Cesium3DTilesetHeatmapSpec.js index ebd209c621ab..1ed10f5e59b9 100644 --- a/packages/engine/Specs/Scene/Cesium3DTilesetHeatmapSpec.js +++ b/packages/engine/Specs/Scene/Cesium3DTilesetHeatmapSpec.js @@ -1,10 +1,10 @@ import { - Color, - JulianDate, - Matrix4, Cesium3DTile, Cesium3DTileContentState, Cesium3DTilesetHeatmap, + Color, + JulianDate, + Matrix4, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/Cesium3DTilesetMostDetailedTraversalSpec.js b/packages/engine/Specs/Scene/Cesium3DTilesetMostDetailedTraversalSpec.js index bf41868f39dd..2e7c001ec4e0 100644 --- a/packages/engine/Specs/Scene/Cesium3DTilesetMostDetailedTraversalSpec.js +++ b/packages/engine/Specs/Scene/Cesium3DTilesetMostDetailedTraversalSpec.js @@ -1,6 +1,6 @@ import { - Cesium3DTilesetTraversal, Cesium3DTilesetMostDetailedTraversal, + Cesium3DTilesetTraversal, } from "../../index.js"; describe("Scene/Cesium3DTilesetMostDetailedTraversal", function () { diff --git a/packages/engine/Specs/Scene/Cesium3DTilesetSkipTraversalSpec.js b/packages/engine/Specs/Scene/Cesium3DTilesetSkipTraversalSpec.js index 414a52880562..6512fdacabeb 100644 --- a/packages/engine/Specs/Scene/Cesium3DTilesetSkipTraversalSpec.js +++ b/packages/engine/Specs/Scene/Cesium3DTilesetSkipTraversalSpec.js @@ -1,6 +1,6 @@ import { - Cesium3DTilesetTraversal, Cesium3DTilesetSkipTraversal, + Cesium3DTilesetTraversal, } from "../../index.js"; describe("Scene/Cesium3DTilesetSkipTraversal", function () { diff --git a/packages/engine/Specs/Scene/Cesium3DTilesetSpec.js b/packages/engine/Specs/Scene/Cesium3DTilesetSpec.js index c36548d7263b..04da9ad0e956 100644 --- a/packages/engine/Specs/Scene/Cesium3DTilesetSpec.js +++ b/packages/engine/Specs/Scene/Cesium3DTilesetSpec.js @@ -1,3 +1,8 @@ +import { defer, defined, RuntimeError } from "@cesium/utils"; +import Cesium3DTilesTester from "../../../../Specs/Cesium3DTilesTester.js"; +import createScene from "../../../../Specs/createScene.js"; +import generateJsonBuffer from "../../../../Specs/generateJsonBuffer.js"; +import pollToPromise from "../../../../Specs/pollToPromise.js"; import { Axis, Camera, @@ -23,10 +28,8 @@ import { Credit, CullFace, CullingVolume, - defer, - defined, - findTileMetadata, findContentMetadata, + findTileMetadata, getAbsoluteUri, getJsonFromTypedArray, HeadingPitchRange, @@ -42,15 +45,10 @@ import { RequestScheduler, Resource, ResourceCache, - RuntimeError, TileBoundingRegion, TileOrientedBoundingBox, Transforms, } from "../../index.js"; -import Cesium3DTilesTester from "../../../../Specs/Cesium3DTilesTester.js"; -import createScene from "../../../../Specs/createScene.js"; -import generateJsonBuffer from "../../../../Specs/generateJsonBuffer.js"; -import pollToPromise from "../../../../Specs/pollToPromise.js"; import Ellipsoid from "../../Source/Core/Ellipsoid.js"; describe( diff --git a/packages/engine/Specs/Scene/ClassificationPrimitiveSpec.js b/packages/engine/Specs/Scene/ClassificationPrimitiveSpec.js index 858abb93b31a..fe3ecb7ecdae 100644 --- a/packages/engine/Specs/Scene/ClassificationPrimitiveSpec.js +++ b/packages/engine/Specs/Scene/ClassificationPrimitiveSpec.js @@ -1,25 +1,25 @@ import { BoxGeometry, Cartesian3, + ClassificationPrimitive, + ClassificationType, Color, ColorGeometryInstanceAttribute, destroyObject, Ellipsoid, GeometryInstance, - PolygonGeometry, - Rectangle, - RectangleGeometry, - ShowGeometryInstanceAttribute, - Transforms, - Pass, - RenderState, - ClassificationPrimitive, - ClassificationType, InvertClassification, MaterialAppearance, + Pass, PerInstanceColorAppearance, + PolygonGeometry, Primitive, + Rectangle, + RectangleGeometry, + RenderState, + ShowGeometryInstanceAttribute, StencilConstants, + Transforms, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/ClippingPlaneCollectionSpec.js b/packages/engine/Specs/Scene/ClippingPlaneCollectionSpec.js index 958eaf3bd4ce..e184ddfe6455 100644 --- a/packages/engine/Specs/Scene/ClippingPlaneCollectionSpec.js +++ b/packages/engine/Specs/Scene/ClippingPlaneCollectionSpec.js @@ -4,17 +4,17 @@ import { Cartesian2, Cartesian3, Cartesian4, + ClippingPlane, + ClippingPlaneCollection, Color, Intersect, Math as CesiumMath, Matrix4, + PixelDatatype, PixelFormat, Plane, - PixelDatatype, TextureMinificationFilter, TextureWrap, - ClippingPlane, - ClippingPlaneCollection, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/ClippingPlaneSpec.js b/packages/engine/Specs/Scene/ClippingPlaneSpec.js index 658d1e1e88f5..f19967695b29 100644 --- a/packages/engine/Specs/Scene/ClippingPlaneSpec.js +++ b/packages/engine/Specs/Scene/ClippingPlaneSpec.js @@ -1,10 +1,10 @@ import { Cartesian3, + ClippingPlane, Math as CesiumMath, Matrix3, Matrix4, Plane, - ClippingPlane, } from "../../index.js"; describe("Scene/ClippingPlane", function () { diff --git a/packages/engine/Specs/Scene/ClippingPolygonCollectionSpec.js b/packages/engine/Specs/Scene/ClippingPolygonCollectionSpec.js index 2e13ecb1804d..60c69444c9df 100644 --- a/packages/engine/Specs/Scene/ClippingPolygonCollectionSpec.js +++ b/packages/engine/Specs/Scene/ClippingPolygonCollectionSpec.js @@ -2,11 +2,11 @@ import { BoundingSphere, Cartesian2, Cartesian3, - Math as CesiumMath, - ContextLimits, ClippingPolygon, ClippingPolygonCollection, + ContextLimits, Intersect, + Math as CesiumMath, OrientedBoundingBox, Rectangle, TileBoundingRegion, diff --git a/packages/engine/Specs/Scene/CloudCollectionSpec.js b/packages/engine/Specs/Scene/CloudCollectionSpec.js index 47ec8db78506..838ff6e9be39 100644 --- a/packages/engine/Specs/Scene/CloudCollectionSpec.js +++ b/packages/engine/Specs/Scene/CloudCollectionSpec.js @@ -1,3 +1,4 @@ +import { defined } from "@cesium/utils"; import { Cartesian2, Cartesian3, @@ -6,7 +7,6 @@ import { Color, ComputeCommand, DrawCommand, - defined, Math as CesiumMath, PerspectiveFrustum, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/Composite3DTileContentSpec.js b/packages/engine/Specs/Scene/Composite3DTileContentSpec.js index 42a7f7830e60..4735600f48a6 100644 --- a/packages/engine/Specs/Scene/Composite3DTileContentSpec.js +++ b/packages/engine/Specs/Scene/Composite3DTileContentSpec.js @@ -1,16 +1,16 @@ +import { RuntimeError } from "@cesium/utils"; +import Cesium3DTilesTester from "../../../../Specs/Cesium3DTilesTester.js"; +import createScene from "../../../../Specs/createScene.js"; import { Cartesian3, Cesium3DContentGroup, Color, ContentMetadata, - HeadingPitchRange, - MetadataClass, - RuntimeError, GroupMetadata, + HeadingPitchRange, ImplicitMetadataView, + MetadataClass, } from "../../index.js"; -import Cesium3DTilesTester from "../../../../Specs/Cesium3DTilesTester.js"; -import createScene from "../../../../Specs/createScene.js"; describe( "Scene/Composite3DTileContent", diff --git a/packages/engine/Specs/Scene/ContentMetadataSpec.js b/packages/engine/Specs/Scene/ContentMetadataSpec.js index a08f776bf528..9164efdd0a6a 100644 --- a/packages/engine/Specs/Scene/ContentMetadataSpec.js +++ b/packages/engine/Specs/Scene/ContentMetadataSpec.js @@ -1,4 +1,4 @@ -import { MetadataClass, ContentMetadata } from "../../index.js"; +import { ContentMetadata, MetadataClass } from "../../index.js"; describe("Scene/ContentMetadata", function () { const contentClassWithNoProperties = MetadataClass.fromJson({ diff --git a/packages/engine/Specs/Scene/CreditDisplaySpec.js b/packages/engine/Specs/Scene/CreditDisplaySpec.js index ad5698092150..2c7a1d820731 100644 --- a/packages/engine/Specs/Scene/CreditDisplaySpec.js +++ b/packages/engine/Specs/Scene/CreditDisplaySpec.js @@ -1,4 +1,5 @@ -import { Credit, defined, CreditDisplay } from "../../index.js"; +import { defined } from "@cesium/utils"; +import { Credit, CreditDisplay } from "../../index.js"; import absolutize from "../../../../Specs/absolutize.js"; diff --git a/packages/engine/Specs/Scene/DebugAppearanceSpec.js b/packages/engine/Specs/Scene/DebugAppearanceSpec.js index d0f747bc05c5..f9bd4b5a514e 100644 --- a/packages/engine/Specs/Scene/DebugAppearanceSpec.js +++ b/packages/engine/Specs/Scene/DebugAppearanceSpec.js @@ -1,13 +1,13 @@ import { + Appearance, ComponentDatatype, + DebugAppearance, GeometryInstance, GeometryInstanceAttribute, + Primitive, Rectangle, RectangleGeometry, VertexFormat, - Appearance, - DebugAppearance, - Primitive, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/DebugCameraPrimitiveSpec.js b/packages/engine/Specs/Scene/DebugCameraPrimitiveSpec.js index 824066d4887a..0ecbeb65a1cb 100644 --- a/packages/engine/Specs/Scene/DebugCameraPrimitiveSpec.js +++ b/packages/engine/Specs/Scene/DebugCameraPrimitiveSpec.js @@ -1,7 +1,7 @@ import { + Camera, Cartesian3, Color, - Camera, DebugCameraPrimitive, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/DebugModelMatrixPrimitiveSpec.js b/packages/engine/Specs/Scene/DebugModelMatrixPrimitiveSpec.js index 1ad701b090cd..a52c442e9936 100644 --- a/packages/engine/Specs/Scene/DebugModelMatrixPrimitiveSpec.js +++ b/packages/engine/Specs/Scene/DebugModelMatrixPrimitiveSpec.js @@ -1,4 +1,4 @@ -import { Cartesian3, Matrix4, DebugModelMatrixPrimitive } from "../../index.js"; +import { Cartesian3, DebugModelMatrixPrimitive, Matrix4 } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/DepthPlaneSpec.js b/packages/engine/Specs/Scene/DepthPlaneSpec.js index 3d57d63e0cfc..d162b15b0ec8 100644 --- a/packages/engine/Specs/Scene/DepthPlaneSpec.js +++ b/packages/engine/Specs/Scene/DepthPlaneSpec.js @@ -1,7 +1,7 @@ -import { DepthPlane } from "../../index.js"; import createCamera from "../../../../Specs/createCamera.js"; import createContext from "../../../../Specs/createContext.js"; import createFrameState from "../../../../Specs/createFrameState.js"; +import { DepthPlane } from "../../index.js"; describe("Scene/DepthPlane", function () { let context; diff --git a/packages/engine/Specs/Scene/DiscardEmptyTileImagePolicySpec.js b/packages/engine/Specs/Scene/DiscardEmptyTileImagePolicySpec.js index 6da45e7870a3..c0bc6b227080 100644 --- a/packages/engine/Specs/Scene/DiscardEmptyTileImagePolicySpec.js +++ b/packages/engine/Specs/Scene/DiscardEmptyTileImagePolicySpec.js @@ -1,4 +1,4 @@ -import { Resource, DiscardEmptyTileImagePolicy } from "../../index.js"; +import { DiscardEmptyTileImagePolicy, Resource } from "../../index.js"; import pollToPromise from "../../../../Specs/pollToPromise.js"; diff --git a/packages/engine/Specs/Scene/DiscardMissingTileImagePolicySpec.js b/packages/engine/Specs/Scene/DiscardMissingTileImagePolicySpec.js index 804d5826e59b..a49454435a64 100644 --- a/packages/engine/Specs/Scene/DiscardMissingTileImagePolicySpec.js +++ b/packages/engine/Specs/Scene/DiscardMissingTileImagePolicySpec.js @@ -1,7 +1,7 @@ import { Cartesian2, - Resource, DiscardMissingTileImagePolicy, + Resource, } from "../../index.js"; import pollToPromise from "../../../../Specs/pollToPromise.js"; diff --git a/packages/engine/Specs/Scene/DynamicEnvironmentMapManagerSpec.js b/packages/engine/Specs/Scene/DynamicEnvironmentMapManagerSpec.js index 4e4f3d5ef0e0..8383c1f19860 100644 --- a/packages/engine/Specs/Scene/DynamicEnvironmentMapManagerSpec.js +++ b/packages/engine/Specs/Scene/DynamicEnvironmentMapManagerSpec.js @@ -1,3 +1,4 @@ +import createScene from "../../../../Specs/createScene.js"; import { Cartesian3, Cartographic, @@ -11,7 +12,6 @@ import { Math as CesiumMath, TextureMinificationFilter, } from "../../index.js"; -import createScene from "../../../../Specs/createScene.js"; import Atmosphere from "../../Source/Scene/Atmosphere.js"; describe("Scene/DynamicEnvironmentMapManager", function () { diff --git a/packages/engine/Specs/Scene/EllipsoidPrimitiveSpec.js b/packages/engine/Specs/Scene/EllipsoidPrimitiveSpec.js index 0452391632c9..c9bd305bf837 100644 --- a/packages/engine/Specs/Scene/EllipsoidPrimitiveSpec.js +++ b/packages/engine/Specs/Scene/EllipsoidPrimitiveSpec.js @@ -1,9 +1,9 @@ +import { defined } from "@cesium/utils"; import { Cartesian3, - defined, - Matrix4, EllipsoidPrimitive, Material, + Matrix4, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/EllipsoidSurfaceAppearanceSpec.js b/packages/engine/Specs/Scene/EllipsoidSurfaceAppearanceSpec.js index 4d0f915cb398..8a9c589b9406 100644 --- a/packages/engine/Specs/Scene/EllipsoidSurfaceAppearanceSpec.js +++ b/packages/engine/Specs/Scene/EllipsoidSurfaceAppearanceSpec.js @@ -1,12 +1,12 @@ import { - ColorGeometryInstanceAttribute, - GeometryInstance, - Rectangle, - RectangleGeometry, Appearance, + ColorGeometryInstanceAttribute, EllipsoidSurfaceAppearance, + GeometryInstance, Material, Primitive, + Rectangle, + RectangleGeometry, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/ExpressionSpec.js b/packages/engine/Specs/Scene/ExpressionSpec.js index 4a2f93ab473a..7109073c5fa8 100644 --- a/packages/engine/Specs/Scene/ExpressionSpec.js +++ b/packages/engine/Specs/Scene/ExpressionSpec.js @@ -1,3 +1,4 @@ +import { RuntimeError } from "@cesium/utils"; import { Cartesian2, Cartesian3, @@ -6,7 +7,6 @@ import { Expression, ExpressionNodeType, Math as CesiumMath, - RuntimeError, } from "../../index.js"; describe("Scene/Expression", function () { diff --git a/packages/engine/Specs/Scene/FogSpec.js b/packages/engine/Specs/Scene/FogSpec.js index 936dc25354e8..7a63a5970c13 100644 --- a/packages/engine/Specs/Scene/FogSpec.js +++ b/packages/engine/Specs/Scene/FogSpec.js @@ -1,5 +1,5 @@ -import { Fog, Math as CesiumMath, SceneMode } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; +import { Fog, Math as CesiumMath, SceneMode } from "../../index.js"; describe("Fog", () => { describe("update", () => { diff --git a/packages/engine/Specs/Scene/FrameRateMonitorSpec.js b/packages/engine/Specs/Scene/FrameRateMonitorSpec.js index 3de2f8a5b8d9..4c8d017fecf3 100644 --- a/packages/engine/Specs/Scene/FrameRateMonitorSpec.js +++ b/packages/engine/Specs/Scene/FrameRateMonitorSpec.js @@ -1,4 +1,5 @@ -import { defined, getTimestamp, FrameRateMonitor } from "../../index.js"; +import { defined } from "@cesium/utils"; +import { FrameRateMonitor, getTimestamp } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/FrustumCommandsSpec.js b/packages/engine/Specs/Scene/FrustumCommandsSpec.js index 73350f053277..edb8617119dd 100644 --- a/packages/engine/Specs/Scene/FrustumCommandsSpec.js +++ b/packages/engine/Specs/Scene/FrustumCommandsSpec.js @@ -1,4 +1,4 @@ -import { Pass, FrustumCommands } from "../../index.js"; +import { FrustumCommands, Pass } from "../../index.js"; describe("Scene/FrustumCommands", function () { it("constructs without arguments", function () { diff --git a/packages/engine/Specs/Scene/Geometry3DTileContentSpec.js b/packages/engine/Specs/Scene/Geometry3DTileContentSpec.js index 6516c9ee6ed3..6268f3419de9 100644 --- a/packages/engine/Specs/Scene/Geometry3DTileContentSpec.js +++ b/packages/engine/Specs/Scene/Geometry3DTileContentSpec.js @@ -1,3 +1,6 @@ +import { RuntimeError } from "@cesium/utils"; +import Cesium3DTilesTester from "../../../../Specs/Cesium3DTilesTester.js"; +import createScene from "../../../../Specs/createScene.js"; import { Cartesian3, Cesium3DContentGroup, @@ -9,19 +12,16 @@ import { destroyObject, Ellipsoid, GeometryInstance, - MetadataClass, GroupMetadata, + MetadataClass, Pass, PerInstanceColorAppearance, Primitive, Rectangle, RectangleGeometry, RenderState, - RuntimeError, StencilConstants, } from "../../index.js"; -import Cesium3DTilesTester from "../../../../Specs/Cesium3DTilesTester.js"; -import createScene from "../../../../Specs/createScene.js"; describe( "Scene/Geometry3DTileContent", diff --git a/packages/engine/Specs/Scene/GeometryRenderingSpec.js b/packages/engine/Specs/Scene/GeometryRenderingSpec.js index 8afb4f78b93f..b967724696cf 100644 --- a/packages/engine/Specs/Scene/GeometryRenderingSpec.js +++ b/packages/engine/Specs/Scene/GeometryRenderingSpec.js @@ -1,3 +1,4 @@ +import { defined } from "@cesium/utils"; import { ArcType, BoundingSphere, @@ -12,33 +13,32 @@ import { CornerType, CorridorGeometry, CylinderGeometry, - defined, EllipseGeometry, Ellipsoid, EllipsoidGeometry, + EllipsoidSurfaceAppearance, Geometry, GeometryAttribute, GeometryInstance, + Material, Math as CesiumMath, Matrix4, + PerInstanceColorAppearance, PerspectiveFrustum, PlaneGeometry, PolygonGeometry, + PolylineColorAppearance, PolylineGeometry, PolylineVolumeGeometry, + Primitive, PrimitiveType, Rectangle, RectangleGeometry, + SceneMode, SimplePolylineGeometry, SphereGeometry, Transforms, WallGeometry, - EllipsoidSurfaceAppearance, - Material, - PerInstanceColorAppearance, - PolylineColorAppearance, - Primitive, - SceneMode, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/GlobeSpec.js b/packages/engine/Specs/Scene/GlobeSpec.js index 4a4d25f4ce25..eb89bd40c6bd 100644 --- a/packages/engine/Specs/Scene/GlobeSpec.js +++ b/packages/engine/Specs/Scene/GlobeSpec.js @@ -1,14 +1,14 @@ import { + Cartesian3, CesiumTerrainProvider, - Rectangle, - Resource, - Globe, - SingleTileImageryProvider, Color, - Cartesian3, + Globe, HeadingPitchRoll, - NearFarScalar, JulianDate, + NearFarScalar, + Rectangle, + Resource, + SingleTileImageryProvider, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/GlobeSurfaceTileProviderSpec.js b/packages/engine/Specs/Scene/GlobeSurfaceTileProviderSpec.js index 6e0b5459842b..a1033a382823 100644 --- a/packages/engine/Specs/Scene/GlobeSurfaceTileProviderSpec.js +++ b/packages/engine/Specs/Scene/GlobeSurfaceTileProviderSpec.js @@ -1,37 +1,37 @@ +import { defined } from "@cesium/utils"; import { + BlendingState, Cartesian3, Cartesian4, CesiumTerrainProvider, + ClippingPlane, + ClippingPlaneCollection, + ClippingPolygon, + ClippingPolygonCollection, Color, + ContextLimits, Credit, CreditDisplay, - defined, Ellipsoid, EllipsoidTerrainProvider, - GeographicProjection, - HeadingPitchRoll, - Rectangle, - Resource, - WebMercatorProjection, - ContextLimits, - RenderState, - BlendingState, - ClippingPlane, - ClippingPlaneCollection, - ClippingPolygon, - ClippingPolygonCollection, Fog, + GeographicProjection, Globe, GlobeSurfaceShaderSet, GlobeSurfaceTileProvider, + HeadingPitchRoll, ImageryLayerCollection, Model, QuadtreeTile, QuadtreeTileProvider, + Rectangle, + RenderState, + Resource, SceneMode, SingleTileImageryProvider, SplitDirection, WebMapServiceImageryProvider, + WebMercatorProjection, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/GlobeSurfaceTileSpec.js b/packages/engine/Specs/Scene/GlobeSurfaceTileSpec.js index 3f9f2cf6c013..da1b9c9467e4 100644 --- a/packages/engine/Specs/Scene/GlobeSurfaceTileSpec.js +++ b/packages/engine/Specs/Scene/GlobeSurfaceTileSpec.js @@ -1,3 +1,6 @@ +import MockImageryProvider from "../../../../Specs/MockImageryProvider.js"; +import MockTerrainProvider from "../../../../Specs/MockTerrainProvider.js"; +import TerrainTileProcessor from "../../../../Specs/TerrainTileProcessor.js"; import { Cartesian3, Cartesian4, @@ -5,17 +8,14 @@ import { Ellipsoid, EllipsoidTerrainProvider, GeographicTilingScheme, - Ray, GlobeSurfaceTile, ImageryLayerCollection, QuadtreeTile, QuadtreeTileLoadState, + Ray, TerrainState, TileProviderError, } from "../../index.js"; -import MockImageryProvider from "../../../../Specs/MockImageryProvider.js"; -import MockTerrainProvider from "../../../../Specs/MockTerrainProvider.js"; -import TerrainTileProcessor from "../../../../Specs/TerrainTileProcessor.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/GltfBufferViewLoaderSpec.js b/packages/engine/Specs/Scene/GltfBufferViewLoaderSpec.js index 072d77c113f4..6a48cfaad9ec 100644 --- a/packages/engine/Specs/Scene/GltfBufferViewLoaderSpec.js +++ b/packages/engine/Specs/Scene/GltfBufferViewLoaderSpec.js @@ -1,9 +1,9 @@ +import { RuntimeError } from "@cesium/utils"; import { BufferLoader, GltfBufferViewLoader, Resource, ResourceCache, - RuntimeError, } from "../../index.js"; describe("Scene/GltfBufferViewLoader", function () { diff --git a/packages/engine/Specs/Scene/GltfBuilder.js b/packages/engine/Specs/Scene/GltfBuilder.js index adb10f2f1d89..5c43dd4a25b5 100644 --- a/packages/engine/Specs/Scene/GltfBuilder.js +++ b/packages/engine/Specs/Scene/GltfBuilder.js @@ -1,4 +1,4 @@ -import { defined, RuntimeError } from "../../index.js"; +import { defined, RuntimeError } from "@cesium/utils"; import findAccessorMinMax from "../../Source/Scene/GltfPipeline/findAccessorMinMax.js"; /** diff --git a/packages/engine/Specs/Scene/GltfDracoLoaderSpec.js b/packages/engine/Specs/Scene/GltfDracoLoaderSpec.js index f6d750a82113..2629a1a64058 100644 --- a/packages/engine/Specs/Scene/GltfDracoLoaderSpec.js +++ b/packages/engine/Specs/Scene/GltfDracoLoaderSpec.js @@ -1,3 +1,7 @@ +import { RuntimeError } from "@cesium/utils"; +import createScene from "../../../../Specs/createScene.js"; +import loaderProcess from "../../../../Specs/loaderProcess.js"; +import waitForLoaderProcess from "../../../../Specs/waitForLoaderProcess.js"; import { ComponentDatatype, DracoLoader, @@ -5,11 +9,7 @@ import { GltfDracoLoader, Resource, ResourceCache, - RuntimeError, } from "../../index.js"; -import createScene from "../../../../Specs/createScene.js"; -import loaderProcess from "../../../../Specs/loaderProcess.js"; -import waitForLoaderProcess from "../../../../Specs/waitForLoaderProcess.js"; describe( "Scene/GltfDracoLoader", diff --git a/packages/engine/Specs/Scene/GltfImageLoaderSpec.js b/packages/engine/Specs/Scene/GltfImageLoaderSpec.js index 81cfcd325559..661a0c9d8407 100644 --- a/packages/engine/Specs/Scene/GltfImageLoaderSpec.js +++ b/packages/engine/Specs/Scene/GltfImageLoaderSpec.js @@ -1,16 +1,15 @@ +import { FeatureDetection, RuntimeError } from "@cesium/utils"; +import createContext from "../../../../Specs/createContext.js"; +import dataUriToBuffer from "../../../../Specs/dataUriToBuffer.js"; import { BufferLoader, clone, CompressedTextureBuffer, GltfBufferViewLoader, GltfImageLoader, - FeatureDetection, Resource, ResourceCache, - RuntimeError, } from "../../index.js"; -import createContext from "../../../../Specs/createContext.js"; -import dataUriToBuffer from "../../../../Specs/dataUriToBuffer.js"; describe( "Scene/GltfImageLoader", diff --git a/packages/engine/Specs/Scene/GltfIndexBufferLoaderSpec.js b/packages/engine/Specs/Scene/GltfIndexBufferLoaderSpec.js index 21e2ec796f5f..fddedc02aaf3 100644 --- a/packages/engine/Specs/Scene/GltfIndexBufferLoaderSpec.js +++ b/packages/engine/Specs/Scene/GltfIndexBufferLoaderSpec.js @@ -1,3 +1,8 @@ +import { RuntimeError } from "@cesium/utils"; +import concatTypedArrays from "../../../../Specs/concatTypedArrays.js"; +import createScene from "../../../../Specs/createScene.js"; +import loaderProcess from "../../../../Specs/loaderProcess.js"; +import waitForLoaderProcess from "../../../../Specs/waitForLoaderProcess.js"; import { Buffer, clone, @@ -9,12 +14,7 @@ import { JobScheduler, Resource, ResourceCache, - RuntimeError, } from "../../index.js"; -import concatTypedArrays from "../../../../Specs/concatTypedArrays.js"; -import createScene from "../../../../Specs/createScene.js"; -import loaderProcess from "../../../../Specs/loaderProcess.js"; -import waitForLoaderProcess from "../../../../Specs/waitForLoaderProcess.js"; describe( "Scene/GltfIndexBufferLoader", diff --git a/packages/engine/Specs/Scene/GltfJsonLoaderSpec.js b/packages/engine/Specs/Scene/GltfJsonLoaderSpec.js index 1978618855ae..2fa20b90cb41 100644 --- a/packages/engine/Specs/Scene/GltfJsonLoaderSpec.js +++ b/packages/engine/Specs/Scene/GltfJsonLoaderSpec.js @@ -1,12 +1,12 @@ +import { RuntimeError } from "@cesium/utils"; +import generateJsonBuffer from "../../../../Specs/generateJsonBuffer.js"; import { BufferLoader, clone, GltfJsonLoader, Resource, ResourceCache, - RuntimeError, } from "../../index.js"; -import generateJsonBuffer from "../../../../Specs/generateJsonBuffer.js"; describe("Scene/GltfJsonLoader", function () { const gltfUri = "https://example.com/model.glb"; diff --git a/packages/engine/Specs/Scene/GltfLoaderSpec.js b/packages/engine/Specs/Scene/GltfLoaderSpec.js index 97f16cb47406..1ddef3a0a6ec 100644 --- a/packages/engine/Specs/Scene/GltfLoaderSpec.js +++ b/packages/engine/Specs/Scene/GltfLoaderSpec.js @@ -1,3 +1,9 @@ +import { RuntimeError } from "@cesium/utils"; +import createScene from "../../../../Specs/createScene.js"; +import generateJsonBuffer from "../../../../Specs/generateJsonBuffer.js"; +import loaderProcess from "../../../../Specs/loaderProcess.js"; +import pollToPromise from "../../../../Specs/pollToPromise.js"; +import waitForLoaderProcess from "../../../../Specs/waitForLoaderProcess.js"; import { ArticulationStageType, AttributeType, @@ -8,40 +14,34 @@ import { combine, ComponentDatatype, Frozen, - GltfStructuralMetadataLoader, GltfIndexBufferLoader, GltfJsonLoader, GltfLoader, + GltfStructuralMetadataLoader, GltfTextureLoader, GltfVertexBufferLoader, IndexDatatype, InstanceAttributeSemantic, InterpolationType, JobScheduler, - PrimitiveType, + Math as CesiumMath, Matrix2, Matrix4, - Math as CesiumMath, MetadataComponentType, MetadataType, ModelComponents, + PrimitiveType, + Quaternion, Resource, ResourceCache, ResourceLoaderState, - RuntimeError, Sampler, Texture, TextureMagnificationFilter, TextureMinificationFilter, TextureWrap, VertexAttributeSemantic, - Quaternion, } from "../../index.js"; -import createScene from "../../../../Specs/createScene.js"; -import generateJsonBuffer from "../../../../Specs/generateJsonBuffer.js"; -import loaderProcess from "../../../../Specs/loaderProcess.js"; -import pollToPromise from "../../../../Specs/pollToPromise.js"; -import waitForLoaderProcess from "../../../../Specs/waitForLoaderProcess.js"; describe( "Scene/GltfLoader", diff --git a/packages/engine/Specs/Scene/GltfLoaderUtilSpec.js b/packages/engine/Specs/Scene/GltfLoaderUtilSpec.js index bef2cf665012..b79145b76574 100644 --- a/packages/engine/Specs/Scene/GltfLoaderUtilSpec.js +++ b/packages/engine/Specs/Scene/GltfLoaderUtilSpec.js @@ -1,3 +1,4 @@ +import createContext from "../../../../Specs/createContext.js"; import { GltfLoaderUtil, Matrix3, @@ -5,11 +6,10 @@ import { PixelFormat, SupportedImageFormats, Texture, - TextureWrap, TextureMagnificationFilter, TextureMinificationFilter, + TextureWrap, } from "../../index.js"; -import createContext from "../../../../Specs/createContext.js"; describe( "Scene/GltfLoaderUtil", diff --git a/packages/engine/Specs/Scene/GltfStructuralMetadataLoaderSpec.js b/packages/engine/Specs/Scene/GltfStructuralMetadataLoaderSpec.js index abbc32ae0f9d..91ffa4407c18 100644 --- a/packages/engine/Specs/Scene/GltfStructuralMetadataLoaderSpec.js +++ b/packages/engine/Specs/Scene/GltfStructuralMetadataLoaderSpec.js @@ -1,3 +1,8 @@ +import { RuntimeError } from "@cesium/utils"; +import createScene from "../../../../Specs/createScene.js"; +import loaderProcess from "../../../../Specs/loaderProcess.js"; +import MetadataTester from "../../../../Specs/MetadataTester.js"; +import waitForLoaderProcess from "../../../../Specs/waitForLoaderProcess.js"; import { clone, GltfBufferViewLoader, @@ -6,13 +11,8 @@ import { MetadataSchemaLoader, Resource, ResourceCache, - RuntimeError, SupportedImageFormats, } from "../../index.js"; -import createScene from "../../../../Specs/createScene.js"; -import loaderProcess from "../../../../Specs/loaderProcess.js"; -import MetadataTester from "../../../../Specs/MetadataTester.js"; -import waitForLoaderProcess from "../../../../Specs/waitForLoaderProcess.js"; describe( "Scene/GltfStructuralMetadataLoader", diff --git a/packages/engine/Specs/Scene/GltfTextureLoaderSpec.js b/packages/engine/Specs/Scene/GltfTextureLoaderSpec.js index b6414a5f6182..80c9cee761db 100644 --- a/packages/engine/Specs/Scene/GltfTextureLoaderSpec.js +++ b/packages/engine/Specs/Scene/GltfTextureLoaderSpec.js @@ -1,19 +1,19 @@ +import { RuntimeError } from "@cesium/utils"; +import createScene from "../../../../Specs/createScene.js"; +import loaderProcess from "../../../../Specs/loaderProcess.js"; +import waitForLoaderProcess from "../../../../Specs/waitForLoaderProcess.js"; import { clone, GltfImageLoader, - GltfTextureLoader, GltfLoaderUtil, + GltfTextureLoader, JobScheduler, Resource, ResourceCache, - RuntimeError, SupportedImageFormats, Texture, TextureMinificationFilter, } from "../../index.js"; -import createScene from "../../../../Specs/createScene.js"; -import loaderProcess from "../../../../Specs/loaderProcess.js"; -import waitForLoaderProcess from "../../../../Specs/waitForLoaderProcess.js"; describe( "Scene/GltfTextureLoader", diff --git a/packages/engine/Specs/Scene/GltfVertexBufferLoaderSpec.js b/packages/engine/Specs/Scene/GltfVertexBufferLoaderSpec.js index 59ed582c41b2..64bc0e13f50a 100644 --- a/packages/engine/Specs/Scene/GltfVertexBufferLoaderSpec.js +++ b/packages/engine/Specs/Scene/GltfVertexBufferLoaderSpec.js @@ -1,3 +1,8 @@ +import { RuntimeError } from "@cesium/utils"; +import concatTypedArrays from "../../../../Specs/concatTypedArrays.js"; +import createScene from "../../../../Specs/createScene.js"; +import loaderProcess from "../../../../Specs/loaderProcess.js"; +import waitForLoaderProcess from "../../../../Specs/waitForLoaderProcess.js"; import { Buffer, Cartesian3, @@ -9,12 +14,7 @@ import { JobScheduler, Resource, ResourceCache, - RuntimeError, } from "../../index.js"; -import concatTypedArrays from "../../../../Specs/concatTypedArrays.js"; -import createScene from "../../../../Specs/createScene.js"; -import loaderProcess from "../../../../Specs/loaderProcess.js"; -import waitForLoaderProcess from "../../../../Specs/waitForLoaderProcess.js"; describe( "Scene/GltfVertexBufferLoader", diff --git a/packages/engine/Specs/Scene/GoogleEarthEnterpriseImageryProviderSpec.js b/packages/engine/Specs/Scene/GoogleEarthEnterpriseImageryProviderSpec.js index d2797d1a0aac..23d2a4030d2c 100644 --- a/packages/engine/Specs/Scene/GoogleEarthEnterpriseImageryProviderSpec.js +++ b/packages/engine/Specs/Scene/GoogleEarthEnterpriseImageryProviderSpec.js @@ -1,7 +1,7 @@ +import { defined, RuntimeError } from "@cesium/utils"; import Uri from "urijs"; import { decodeGoogleEarthEnterpriseData, - defined, DiscardMissingTileImagePolicy, GeographicTilingScheme, GoogleEarthEnterpriseImageryProvider, @@ -15,7 +15,6 @@ import { Request, RequestScheduler, Resource, - RuntimeError, } from "../../index.js"; import pollToPromise from "../../../../Specs/pollToPromise.js"; diff --git a/packages/engine/Specs/Scene/GoogleEarthEnterpriseMapsProviderSpec.js b/packages/engine/Specs/Scene/GoogleEarthEnterpriseMapsProviderSpec.js index 987fdde44c41..68fdd518e4ab 100644 --- a/packages/engine/Specs/Scene/GoogleEarthEnterpriseMapsProviderSpec.js +++ b/packages/engine/Specs/Scene/GoogleEarthEnterpriseMapsProviderSpec.js @@ -1,12 +1,12 @@ +import { RuntimeError } from "@cesium/utils"; import { GeographicTilingScheme, + GoogleEarthEnterpriseMapsProvider, + ImageryProvider, Rectangle, Request, Resource, - RuntimeError, WebMercatorTilingScheme, - GoogleEarthEnterpriseMapsProvider, - ImageryProvider, } from "../../index.js"; describe("Scene/GoogleEarthEnterpriseMapsProvider", function () { diff --git a/packages/engine/Specs/Scene/GridImageryProviderSpec.js b/packages/engine/Specs/Scene/GridImageryProviderSpec.js index 745249679cd3..8c70dc4c865c 100644 --- a/packages/engine/Specs/Scene/GridImageryProviderSpec.js +++ b/packages/engine/Specs/Scene/GridImageryProviderSpec.js @@ -1,9 +1,9 @@ import { Ellipsoid, GeographicTilingScheme, - WebMercatorTilingScheme, GridImageryProvider, ImageryProvider, + WebMercatorTilingScheme, } from "../../index.js"; describe("Scene/GridImageryProvider", function () { diff --git a/packages/engine/Specs/Scene/GroundPolylinePrimitiveSpec.js b/packages/engine/Specs/Scene/GroundPolylinePrimitiveSpec.js index 8d71a98f6bb9..f0726fd72855 100644 --- a/packages/engine/Specs/Scene/GroundPolylinePrimitiveSpec.js +++ b/packages/engine/Specs/Scene/GroundPolylinePrimitiveSpec.js @@ -9,17 +9,17 @@ import { Ellipsoid, GeometryInstance, GroundPolylineGeometry, + GroundPolylinePrimitive, HeadingPitchRange, Math as CesiumMath, - Rectangle, - RectangleGeometry, - ShowGeometryInstanceAttribute, Pass, - GroundPolylinePrimitive, PerInstanceColorAppearance, PolylineColorAppearance, PolylineMaterialAppearance, Primitive, + Rectangle, + RectangleGeometry, + ShowGeometryInstanceAttribute, } from "../../index.js"; import createCanvas from "../../../../Specs/createCanvas.js"; diff --git a/packages/engine/Specs/Scene/GroundPrimitiveSpec.js b/packages/engine/Specs/Scene/GroundPrimitiveSpec.js index 1c77f26b5245..42f6d74cf8f8 100644 --- a/packages/engine/Specs/Scene/GroundPrimitiveSpec.js +++ b/packages/engine/Specs/Scene/GroundPrimitiveSpec.js @@ -1,26 +1,26 @@ import { ApproximateTerrainHeights, + ClassificationType, Color, ColorGeometryInstanceAttribute, destroyObject, DistanceDisplayConditionGeometryInstanceAttribute, Ellipsoid, + EllipsoidSurfaceAppearance, GeometryInstance, + GroundPrimitive, HeadingPitchRange, + InvertClassification, + Material, Math as CesiumMath, + Pass, + PerInstanceColorAppearance, PolygonGeometry, + Primitive, Rectangle, RectangleGeometry, - ShowGeometryInstanceAttribute, - Pass, RenderState, - ClassificationType, - EllipsoidSurfaceAppearance, - GroundPrimitive, - InvertClassification, - Material, - PerInstanceColorAppearance, - Primitive, + ShowGeometryInstanceAttribute, StencilConstants, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/GroupMetadataSpec.js b/packages/engine/Specs/Scene/GroupMetadataSpec.js index 883a28517d29..0a5ded257272 100644 --- a/packages/engine/Specs/Scene/GroupMetadataSpec.js +++ b/packages/engine/Specs/Scene/GroupMetadataSpec.js @@ -1,4 +1,4 @@ -import { Cartesian3, MetadataClass, GroupMetadata } from "../../index.js"; +import { Cartesian3, GroupMetadata, MetadataClass } from "../../index.js"; describe("Scene/GroupMetadata", function () { const buildingClassWithNoProperties = MetadataClass.fromJson({ diff --git a/packages/engine/Specs/Scene/I3SDataProviderSpec.js b/packages/engine/Specs/Scene/I3SDataProviderSpec.js index 52efa9ea37d2..5d341307ca47 100644 --- a/packages/engine/Specs/Scene/I3SDataProviderSpec.js +++ b/packages/engine/Specs/Scene/I3SDataProviderSpec.js @@ -1,3 +1,4 @@ +import { RuntimeError } from "@cesium/utils"; import { Cesium3DTileset, GeographicTilingScheme, @@ -7,7 +8,6 @@ import { Math as CesiumMath, Rectangle, Resource, - RuntimeError, } from "../../index.js"; describe("Scene/I3SDataProvider", function () { diff --git a/packages/engine/Specs/Scene/I3SDecoderSpec.js b/packages/engine/Specs/Scene/I3SDecoderSpec.js index 52e3c3b6788f..24946715c7fc 100644 --- a/packages/engine/Specs/Scene/I3SDecoderSpec.js +++ b/packages/engine/Specs/Scene/I3SDecoderSpec.js @@ -1,4 +1,5 @@ -import { I3SDecoder, RuntimeError, TaskProcessor } from "../../index.js"; +import { RuntimeError } from "@cesium/utils"; +import { I3SDecoder, TaskProcessor } from "../../index.js"; describe("Scene/I3SDecoder", function () { const defaultGeometrySchema = { diff --git a/packages/engine/Specs/Scene/I3SFieldSpec.js b/packages/engine/Specs/Scene/I3SFieldSpec.js index 2d1031b287d9..142ffa379e1c 100644 --- a/packages/engine/Specs/Scene/I3SFieldSpec.js +++ b/packages/engine/Specs/Scene/I3SFieldSpec.js @@ -1,10 +1,10 @@ +import { RuntimeError } from "@cesium/utils"; import { Cesium3DTileset, I3SDataProvider, I3SField, I3SNode, Resource, - RuntimeError, } from "../../index.js"; describe("Scene/I3SField", function () { diff --git a/packages/engine/Specs/Scene/I3SLayerSpec.js b/packages/engine/Specs/Scene/I3SLayerSpec.js index 41aab81626af..7fe73c8c476b 100644 --- a/packages/engine/Specs/Scene/I3SLayerSpec.js +++ b/packages/engine/Specs/Scene/I3SLayerSpec.js @@ -1,3 +1,4 @@ +import { RuntimeError } from "@cesium/utils"; import { Cesium3DTileset, Color, @@ -6,7 +7,6 @@ import { I3SNode, Math as CesiumMath, Resource, - RuntimeError, } from "../../index.js"; describe("Scene/I3SLayer", function () { diff --git a/packages/engine/Specs/Scene/I3SNodeSpec.js b/packages/engine/Specs/Scene/I3SNodeSpec.js index bc5e1114c626..53867087e270 100644 --- a/packages/engine/Specs/Scene/I3SNodeSpec.js +++ b/packages/engine/Specs/Scene/I3SNodeSpec.js @@ -4,10 +4,8 @@ import { Cesium3DTileRefine, Cesium3DTileset, clone, - Math as CesiumMath, Ellipsoid, Event, - Matrix4, I3SDataProvider, I3SDecoder, I3SFeature, @@ -15,6 +13,8 @@ import { I3SGeometry, I3SLayer, I3SNode, + Math as CesiumMath, + Matrix4, Rectangle, Resource, WebMercatorProjection, diff --git a/packages/engine/Specs/Scene/I3dmParserSpec.js b/packages/engine/Specs/Scene/I3dmParserSpec.js index 4e4d9f905760..5fd7d91d2dc9 100644 --- a/packages/engine/Specs/Scene/I3dmParserSpec.js +++ b/packages/engine/Specs/Scene/I3dmParserSpec.js @@ -1,9 +1,6 @@ -import { - getStringFromTypedArray, - I3dmParser, - RuntimeError, -} from "../../index.js"; +import { RuntimeError } from "@cesium/utils"; import Cesium3DTilesTester from "../../../../Specs/Cesium3DTilesTester.js"; +import { getStringFromTypedArray, I3dmParser } from "../../index.js"; describe( "Scene/I3dmParser", diff --git a/packages/engine/Specs/Scene/ITwinDataSpec.js b/packages/engine/Specs/Scene/ITwinDataSpec.js index 755d29fedf19..ac9f7a91ba8a 100644 --- a/packages/engine/Specs/Scene/ITwinDataSpec.js +++ b/packages/engine/Specs/Scene/ITwinDataSpec.js @@ -1,9 +1,9 @@ +import { RuntimeError } from "@cesium/utils"; import { - ITwinPlatform, - RuntimeError, Cesium3DTileset, - ITwinData, GeoJsonDataSource, + ITwinData, + ITwinPlatform, KmlDataSource, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/ImageryLayerCollectionSpec.js b/packages/engine/Specs/Scene/ImageryLayerCollectionSpec.js index 88a81e2fa6ac..3659bcca3d91 100644 --- a/packages/engine/Specs/Scene/ImageryLayerCollectionSpec.js +++ b/packages/engine/Specs/Scene/ImageryLayerCollectionSpec.js @@ -3,16 +3,16 @@ import { Ellipsoid, Event, GeographicTilingScheme, - Matrix4, - Ray, - Rectangle, - WebMercatorProjection, - WebMercatorTilingScheme, Globe, ImageryLayer, ImageryLayerCollection, ImageryLayerFeatureInfo, ImageryProvider, + Matrix4, + Ray, + Rectangle, + WebMercatorProjection, + WebMercatorTilingScheme, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/ImageryLayerSpec.js b/packages/engine/Specs/Scene/ImageryLayerSpec.js index 506d3f9ad039..0b6535f3f588 100644 --- a/packages/engine/Specs/Scene/ImageryLayerSpec.js +++ b/packages/engine/Specs/Scene/ImageryLayerSpec.js @@ -1,15 +1,8 @@ import { - EllipsoidTerrainProvider, - Rectangle, - Request, - RequestScheduler, - Resource, - ComputeEngine, - TextureMagnificationFilter, - TextureMinificationFilter, ArcGisMapServerImageryProvider, BingMapsImageryProvider, - TileMapServiceImageryProvider, + ComputeEngine, + EllipsoidTerrainProvider, GlobeSurfaceTile, Imagery, ImageryLayer, @@ -17,8 +10,15 @@ import { ImageryState, NeverTileDiscardPolicy, QuadtreeTile, + Rectangle, + Request, + RequestScheduler, + Resource, SingleTileImageryProvider, + TextureMagnificationFilter, + TextureMinificationFilter, TileCoordinatesImageryProvider, + TileMapServiceImageryProvider, UrlTemplateImageryProvider, WebMapServiceImageryProvider, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/Implicit3DTileContentSpec.js b/packages/engine/Specs/Scene/Implicit3DTileContentSpec.js index 1f743ef08afc..393092049289 100644 --- a/packages/engine/Specs/Scene/Implicit3DTileContentSpec.js +++ b/packages/engine/Specs/Scene/Implicit3DTileContentSpec.js @@ -1,3 +1,6 @@ +import Cesium3DTilesTester from "../../../../Specs/Cesium3DTilesTester.js"; +import createScene from "../../../../Specs/createScene.js"; +import ImplicitTilingTester from "../../../../Specs/ImplicitTilingTester.js"; import { Cartesian3, Cesium3DContentGroup, @@ -20,12 +23,9 @@ import { Multiple3DTileContent, Resource, ResourceCache, - TileBoundingSphere, TileBoundingS2Cell, + TileBoundingSphere, } from "../../index.js"; -import ImplicitTilingTester from "../../../../Specs/ImplicitTilingTester.js"; -import Cesium3DTilesTester from "../../../../Specs/Cesium3DTilesTester.js"; -import createScene from "../../../../Specs/createScene.js"; describe( "Scene/Implicit3DTileContent", diff --git a/packages/engine/Specs/Scene/ImplicitAvailabilityBitstreamSpec.js b/packages/engine/Specs/Scene/ImplicitAvailabilityBitstreamSpec.js index 1dbeb2f2e251..9aeb7209cd69 100644 --- a/packages/engine/Specs/Scene/ImplicitAvailabilityBitstreamSpec.js +++ b/packages/engine/Specs/Scene/ImplicitAvailabilityBitstreamSpec.js @@ -1,4 +1,5 @@ -import { ImplicitAvailabilityBitstream, RuntimeError } from "../../index.js"; +import { RuntimeError } from "@cesium/utils"; +import { ImplicitAvailabilityBitstream } from "../../index.js"; describe("Scene/ImplicitAvailabilityBitstream", function () { it("throws on missing lengthBits", function () { diff --git a/packages/engine/Specs/Scene/ImplicitMetadataViewSpec.js b/packages/engine/Specs/Scene/ImplicitMetadataViewSpec.js index 8df69ce9626a..a6cd798890c3 100644 --- a/packages/engine/Specs/Scene/ImplicitMetadataViewSpec.js +++ b/packages/engine/Specs/Scene/ImplicitMetadataViewSpec.js @@ -1,14 +1,14 @@ +import ImplicitTilingTester from "../../../../Specs/ImplicitTilingTester.js"; import { Cartesian3, + ImplicitMetadataView, ImplicitSubtree, ImplicitTileCoordinates, ImplicitTileset, - ImplicitMetadataView, MetadataClass, MetadataSchema, Resource, } from "../../index.js"; -import ImplicitTilingTester from "../../../../Specs/ImplicitTilingTester.js"; describe("Scene/ImplicitMetadataView", function () { const highlightColors = [ diff --git a/packages/engine/Specs/Scene/ImplicitSubtreeCacheSpec.js b/packages/engine/Specs/Scene/ImplicitSubtreeCacheSpec.js index 8a2ac96aa031..90a47ceb4373 100644 --- a/packages/engine/Specs/Scene/ImplicitSubtreeCacheSpec.js +++ b/packages/engine/Specs/Scene/ImplicitSubtreeCacheSpec.js @@ -1,8 +1,8 @@ import { ImplicitSubtree, ImplicitSubtreeCache, - ImplicitTileset, ImplicitTileCoordinates, + ImplicitTileset, Resource, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/ImplicitSubtreeMetadataSpec.js b/packages/engine/Specs/Scene/ImplicitSubtreeMetadataSpec.js index 2e441cc38a03..f46e4d1cfbf8 100644 --- a/packages/engine/Specs/Scene/ImplicitSubtreeMetadataSpec.js +++ b/packages/engine/Specs/Scene/ImplicitSubtreeMetadataSpec.js @@ -1,4 +1,4 @@ -import { MetadataClass, ImplicitSubtreeMetadata } from "../../index.js"; +import { ImplicitSubtreeMetadata, MetadataClass } from "../../index.js"; describe("Scene/ImplicitSubtreeMetadata", function () { it("creates subtree metadata with default values", function () { diff --git a/packages/engine/Specs/Scene/ImplicitSubtreeSpec.js b/packages/engine/Specs/Scene/ImplicitSubtreeSpec.js index 9843af4215ad..0e19155ef9c3 100644 --- a/packages/engine/Specs/Scene/ImplicitSubtreeSpec.js +++ b/packages/engine/Specs/Scene/ImplicitSubtreeSpec.js @@ -1,3 +1,6 @@ +import { RuntimeError } from "@cesium/utils"; +import ImplicitTilingTester from "../../../../Specs/ImplicitTilingTester.js"; +import MetadataTester from "../../../../Specs/MetadataTester.js"; import { Cartesian3, clone, @@ -7,10 +10,7 @@ import { MetadataSchema, Resource, ResourceCache, - RuntimeError, } from "../../index.js"; -import ImplicitTilingTester from "../../../../Specs/ImplicitTilingTester.js"; -import MetadataTester from "../../../../Specs/MetadataTester.js"; describe("Scene/ImplicitSubtree", function () { function availabilityToBooleanArray(availability) { diff --git a/packages/engine/Specs/Scene/ImplicitTilesetSpec.js b/packages/engine/Specs/Scene/ImplicitTilesetSpec.js index 45684b9170db..8e78d3056029 100644 --- a/packages/engine/Specs/Scene/ImplicitTilesetSpec.js +++ b/packages/engine/Specs/Scene/ImplicitTilesetSpec.js @@ -1,3 +1,4 @@ +import { RuntimeError } from "@cesium/utils"; import { clone, combine, @@ -5,7 +6,6 @@ import { ImplicitTileset, MetadataSchema, Resource, - RuntimeError, } from "../../index.js"; describe("Scene/ImplicitTileset", function () { diff --git a/packages/engine/Specs/Scene/IonImageryProviderSpec.js b/packages/engine/Specs/Scene/IonImageryProviderSpec.js index d5561a092e80..ea91cb043894 100644 --- a/packages/engine/Specs/Scene/IonImageryProviderSpec.js +++ b/packages/engine/Specs/Scene/IonImageryProviderSpec.js @@ -1,15 +1,15 @@ +import { RuntimeError } from "@cesium/utils"; import { - Credit, - IonResource, - RequestScheduler, - Resource, - RuntimeError, ArcGisMapServerImageryProvider, BingMapsImageryProvider, + Credit, GoogleEarthEnterpriseMapsProvider, ImageryProvider, IonImageryProvider, + IonResource, MapboxImageryProvider, + RequestScheduler, + Resource, SingleTileImageryProvider, UrlTemplateImageryProvider, WebMapServiceImageryProvider, diff --git a/packages/engine/Specs/Scene/LabelCollectionSpec.js b/packages/engine/Specs/Scene/LabelCollectionSpec.js index a847fdd2a272..eb444deb9995 100644 --- a/packages/engine/Specs/Scene/LabelCollectionSpec.js +++ b/packages/engine/Specs/Scene/LabelCollectionSpec.js @@ -1,4 +1,5 @@ import { + BlendOption, BoundingRectangle, BoundingSphere, Cartesian2, @@ -6,16 +7,15 @@ import { Cartographic, Color, DistanceDisplayCondition, - Math as CesiumMath, - NearFarScalar, - Rectangle, - BlendOption, Globe, HeightReference, HorizontalOrigin, Label, LabelCollection, LabelStyle, + Math as CesiumMath, + NearFarScalar, + Rectangle, VerticalOrigin, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/MapboxImageryProviderSpec.js b/packages/engine/Specs/Scene/MapboxImageryProviderSpec.js index cba4f0aebf7f..a79d6c504d03 100644 --- a/packages/engine/Specs/Scene/MapboxImageryProviderSpec.js +++ b/packages/engine/Specs/Scene/MapboxImageryProviderSpec.js @@ -1,15 +1,15 @@ import { + Imagery, + ImageryLayer, + ImageryProvider, + ImageryState, + MapboxImageryProvider, Math as CesiumMath, Rectangle, Request, RequestScheduler, Resource, WebMercatorTilingScheme, - Imagery, - ImageryLayer, - ImageryProvider, - ImageryState, - MapboxImageryProvider, } from "../../index.js"; import pollToPromise from "../../../../Specs/pollToPromise.js"; diff --git a/packages/engine/Specs/Scene/MapboxStyleImageryProviderSpec.js b/packages/engine/Specs/Scene/MapboxStyleImageryProviderSpec.js index eb04cd0f84c3..6e44594f3667 100644 --- a/packages/engine/Specs/Scene/MapboxStyleImageryProviderSpec.js +++ b/packages/engine/Specs/Scene/MapboxStyleImageryProviderSpec.js @@ -1,15 +1,15 @@ import { + Imagery, + ImageryLayer, + ImageryProvider, + ImageryState, + MapboxStyleImageryProvider, Math as CesiumMath, Rectangle, Request, RequestScheduler, Resource, WebMercatorTilingScheme, - Imagery, - ImageryLayer, - ImageryProvider, - ImageryState, - MapboxStyleImageryProvider, } from "../../index.js"; import pollToPromise from "../../../../Specs/pollToPromise.js"; diff --git a/packages/engine/Specs/Scene/MaterialAppearanceSpec.js b/packages/engine/Specs/Scene/MaterialAppearanceSpec.js index f5601b483396..e7dcdf6b5460 100644 --- a/packages/engine/Specs/Scene/MaterialAppearanceSpec.js +++ b/packages/engine/Specs/Scene/MaterialAppearanceSpec.js @@ -1,13 +1,13 @@ import { + Appearance, Color, ColorGeometryInstanceAttribute, GeometryInstance, - Rectangle, - RectangleGeometry, - Appearance, Material, MaterialAppearance, Primitive, + Rectangle, + RectangleGeometry, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/MaterialSpec.js b/packages/engine/Specs/Scene/MaterialSpec.js index 17348b402bba..bf04ea9e9b61 100644 --- a/packages/engine/Specs/Scene/MaterialSpec.js +++ b/packages/engine/Specs/Scene/MaterialSpec.js @@ -1,17 +1,16 @@ +import { defined, FeatureDetection } from "@cesium/utils"; import { Cartesian3, Color, - defined, Ellipsoid, GeometryInstance, - Rectangle, - RectangleGeometry, - Resource, Material, MaterialAppearance, PolylineCollection, - FeatureDetection, Primitive, + Rectangle, + RectangleGeometry, + Resource, TextureMagnificationFilter, TextureMinificationFilter, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/MegatextureSpec.js b/packages/engine/Specs/Scene/MegatextureSpec.js index 1e191000f158..6e42b492c08a 100644 --- a/packages/engine/Specs/Scene/MegatextureSpec.js +++ b/packages/engine/Specs/Scene/MegatextureSpec.js @@ -1,10 +1,6 @@ -import { - Cartesian3, - Megatexture, - MetadataComponentType, - RuntimeError, -} from "../../index.js"; +import { RuntimeError } from "@cesium/utils"; import createScene from "../../../../Specs/createScene.js"; +import { Cartesian3, Megatexture, MetadataComponentType } from "../../index.js"; describe("Scene/Megatexture", function () { const scene = createScene(); diff --git a/packages/engine/Specs/Scene/MetadataClassPropertySpec.js b/packages/engine/Specs/Scene/MetadataClassPropertySpec.js index 4f2f2ca37129..1371fc7541ec 100644 --- a/packages/engine/Specs/Scene/MetadataClassPropertySpec.js +++ b/packages/engine/Specs/Scene/MetadataClassPropertySpec.js @@ -1,3 +1,4 @@ +import { FeatureDetection } from "@cesium/utils"; import { Cartesian2, Cartesian3, @@ -6,7 +7,6 @@ import { Matrix2, Matrix3, Matrix4, - FeatureDetection, MetadataClassProperty, MetadataComponentType, MetadataEnum, diff --git a/packages/engine/Specs/Scene/MetadataComponentTypeSpec.js b/packages/engine/Specs/Scene/MetadataComponentTypeSpec.js index 025792cccabb..8993d7830919 100644 --- a/packages/engine/Specs/Scene/MetadataComponentTypeSpec.js +++ b/packages/engine/Specs/Scene/MetadataComponentTypeSpec.js @@ -1,8 +1,5 @@ -import { - ComponentDatatype, - FeatureDetection, - MetadataComponentType, -} from "../../index.js"; +import { FeatureDetection } from "@cesium/utils"; +import { ComponentDatatype, MetadataComponentType } from "../../index.js"; describe("Scene/MetadataComponentType", function () { it("getMinimum", function () { diff --git a/packages/engine/Specs/Scene/MetadataSchemaLoaderSpec.js b/packages/engine/Specs/Scene/MetadataSchemaLoaderSpec.js index 4ead1809dc3f..58c9c6db67ef 100644 --- a/packages/engine/Specs/Scene/MetadataSchemaLoaderSpec.js +++ b/packages/engine/Specs/Scene/MetadataSchemaLoaderSpec.js @@ -1,9 +1,9 @@ +import { RuntimeError } from "@cesium/utils"; import { + MetadataSchemaLoader, Resource, ResourceCache, ResourceLoaderState, - MetadataSchemaLoader, - RuntimeError, } from "../../index.js"; describe("Scene/MetadataSchemaLoader", function () { diff --git a/packages/engine/Specs/Scene/MetadataTablePropertySpec.js b/packages/engine/Specs/Scene/MetadataTablePropertySpec.js index e5177b5b8a26..7e9f177af2bc 100644 --- a/packages/engine/Specs/Scene/MetadataTablePropertySpec.js +++ b/packages/engine/Specs/Scene/MetadataTablePropertySpec.js @@ -1,15 +1,15 @@ +import MetadataTester from "../../../../Specs/MetadataTester.js"; import { - Frozen, Cartesian2, Cartesian3, Cartesian4, + Frozen, Matrix2, Matrix3, MetadataClassProperty, MetadataComponentType, MetadataTableProperty, } from "../../index.js"; -import MetadataTester from "../../../../Specs/MetadataTester.js"; describe("Scene/MetadataTableProperty", function () { if (!MetadataTester.isSupported()) { diff --git a/packages/engine/Specs/Scene/MetadataTableSpec.js b/packages/engine/Specs/Scene/MetadataTableSpec.js index 77f5ec24b80f..8004033a3ea7 100644 --- a/packages/engine/Specs/Scene/MetadataTableSpec.js +++ b/packages/engine/Specs/Scene/MetadataTableSpec.js @@ -1,5 +1,5 @@ -import { Cartesian3, MetadataTable } from "../../index.js"; import MetadataTester from "../../../../Specs/MetadataTester.js"; +import { Cartesian3, MetadataTable } from "../../index.js"; describe("Scene/MetadataTable", function () { if (!MetadataTester.isSupported()) { diff --git a/packages/engine/Specs/Scene/MetadataTypeSpec.js b/packages/engine/Specs/Scene/MetadataTypeSpec.js index fd281239a8fd..a50ea1d34c4f 100644 --- a/packages/engine/Specs/Scene/MetadataTypeSpec.js +++ b/packages/engine/Specs/Scene/MetadataTypeSpec.js @@ -1,11 +1,11 @@ import { - MetadataType, Cartesian2, Cartesian3, Cartesian4, Matrix2, Matrix3, Matrix4, + MetadataType, } from "../../index.js"; describe("Scene/MetadataType", function () { diff --git a/packages/engine/Specs/Scene/Model/AlphaPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/AlphaPipelineStageSpec.js index ff70a04da3f5..41210bd52600 100644 --- a/packages/engine/Specs/Scene/Model/AlphaPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/AlphaPipelineStageSpec.js @@ -1,3 +1,4 @@ +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; import { AlphaPipelineStage, BlendingState, @@ -6,7 +7,6 @@ import { RenderState, ShaderBuilder, } from "../../../index.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe( "Scene/Model/AlphaPipelineStage", diff --git a/packages/engine/Specs/Scene/Model/AtmospherePipelineStageSpec.js b/packages/engine/Specs/Scene/Model/AtmospherePipelineStageSpec.js index a19b1d1f8ed9..adf3062c7482 100644 --- a/packages/engine/Specs/Scene/Model/AtmospherePipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/AtmospherePipelineStageSpec.js @@ -1,13 +1,13 @@ +import createScene from "../../../../../Specs/createScene.js"; +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; import { - _shadersAtmosphereStageFS, - _shadersAtmosphereStageVS, - Cartesian3, AtmospherePipelineStage, + Cartesian3, ModelRenderResources, Transforms, + _shadersAtmosphereStageFS, + _shadersAtmosphereStageVS, } from "../../../index.js"; -import createScene from "../../../../../Specs/createScene.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; import loadAndZoomToModelAsync from "./loadAndZoomToModelAsync.js"; describe( diff --git a/packages/engine/Specs/Scene/Model/B3dmLoaderSpec.js b/packages/engine/Specs/Scene/Model/B3dmLoaderSpec.js index 9267f6a15df6..3c16472905fd 100644 --- a/packages/engine/Specs/Scene/Model/B3dmLoaderSpec.js +++ b/packages/engine/Specs/Scene/Model/B3dmLoaderSpec.js @@ -1,3 +1,7 @@ +import { RuntimeError } from "@cesium/utils"; +import Cesium3DTilesTester from "../../../../../Specs/Cesium3DTilesTester.js"; +import createScene from "../../../../../Specs/createScene.js"; +import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; import { B3dmLoader, B3dmParser, @@ -6,11 +10,7 @@ import { Matrix4, Resource, ResourceCache, - RuntimeError, } from "../../../index.js"; -import Cesium3DTilesTester from "../../../../../Specs/Cesium3DTilesTester.js"; -import createScene from "../../../../../Specs/createScene.js"; -import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; describe( "Scene/Model/B3dmLoader", diff --git a/packages/engine/Specs/Scene/Model/BatchTexturePipelineStageSpec.js b/packages/engine/Specs/Scene/Model/BatchTexturePipelineStageSpec.js index 71d50413c106..fa6713e575af 100644 --- a/packages/engine/Specs/Scene/Model/BatchTexturePipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/BatchTexturePipelineStageSpec.js @@ -1,5 +1,5 @@ -import { BatchTexturePipelineStage, ShaderBuilder } from "../../../index.js"; import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; +import { BatchTexturePipelineStage, ShaderBuilder } from "../../../index.js"; describe("Scene/Model/BatchTexturePipelineStage", function () { function expectUniformMap(uniformMap, expected) { diff --git a/packages/engine/Specs/Scene/Model/CPUStylingPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/CPUStylingPipelineStageSpec.js index ad73f3aa26c8..bd0efc3ddaf1 100644 --- a/packages/engine/Specs/Scene/Model/CPUStylingPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/CPUStylingPipelineStageSpec.js @@ -1,3 +1,4 @@ +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; import { clone, Color, @@ -9,7 +10,6 @@ import { _shadersCPUStylingStageFS, _shadersCPUStylingStageVS, } from "../../../index.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe("Scene/Model/CPUStylingPipelineStage", function () { const defaultRenderResources = { diff --git a/packages/engine/Specs/Scene/Model/ClassificationPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/ClassificationPipelineStageSpec.js index d62b7184c13c..1ec70c09e5c2 100644 --- a/packages/engine/Specs/Scene/Model/ClassificationPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/ClassificationPipelineStageSpec.js @@ -1,11 +1,11 @@ +import { RuntimeError } from "@cesium/utils"; +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; import { ClassificationPipelineStage, PrimitiveType, - RuntimeError, ShaderBuilder, VertexAttributeSemantic, } from "../../../index.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe("Scene/Model/ClassificationPipelineStage", function () { const mockFrameState = {}; diff --git a/packages/engine/Specs/Scene/Model/CustomShaderPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/CustomShaderPipelineStageSpec.js index 05d76eb435ac..7ddb62f36850 100644 --- a/packages/engine/Specs/Scene/Model/CustomShaderPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/CustomShaderPipelineStageSpec.js @@ -1,3 +1,4 @@ +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; import { AttributeType, CustomShader, @@ -10,10 +11,9 @@ import { ShaderBuilder, UniformType, VaryingType, - _shadersCustomShaderStageVS, _shadersCustomShaderStageFS, + _shadersCustomShaderStageVS, } from "../../../index.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe("Scene/Model/CustomShaderPipelineStage", function () { const primitive = { diff --git a/packages/engine/Specs/Scene/Model/CustomShaderSpec.js b/packages/engine/Specs/Scene/Model/CustomShaderSpec.js index 03c8b3698168..998af4e73982 100644 --- a/packages/engine/Specs/Scene/Model/CustomShaderSpec.js +++ b/packages/engine/Specs/Scene/Model/CustomShaderSpec.js @@ -1,17 +1,17 @@ +import createScene from "../../../../../Specs/createScene.js"; +import pollToPromise from "../../../../../Specs/pollToPromise.js"; import { Cartesian2, Cartesian3, - Matrix2, CustomShader, CustomShaderMode, CustomShaderTranslucencyMode, LightingModel, + Matrix2, TextureUniform, UniformType, VaryingType, } from "../../../index.js"; -import createScene from "../../../../../Specs/createScene.js"; -import pollToPromise from "../../../../../Specs/pollToPromise.js"; describe("Scene/Model/CustomShader", function () { const emptyVertexShader = diff --git a/packages/engine/Specs/Scene/Model/DequantizationPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/DequantizationPipelineStageSpec.js index 47cef0858305..fb14eb37c334 100644 --- a/packages/engine/Specs/Scene/Model/DequantizationPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/DequantizationPipelineStageSpec.js @@ -1,3 +1,6 @@ +import createScene from "../../../../../Specs/createScene.js"; +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; +import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; import { Cartesian2, Cartesian3, @@ -11,9 +14,6 @@ import { ResourceCache, ShaderBuilder, } from "../../../index.js"; -import createScene from "../../../../../Specs/createScene.js"; -import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe( "Scene/Model/DequantizationPipelineStage", diff --git a/packages/engine/Specs/Scene/Model/Extensions/Gpm/GltfGpmLoaderSpec.js b/packages/engine/Specs/Scene/Model/Extensions/Gpm/GltfGpmLoaderSpec.js index ddaf8ddfb390..05caa1a3c1ef 100644 --- a/packages/engine/Specs/Scene/Model/Extensions/Gpm/GltfGpmLoaderSpec.js +++ b/packages/engine/Specs/Scene/Model/Extensions/Gpm/GltfGpmLoaderSpec.js @@ -1,8 +1,8 @@ import { - Matrix3, - Math as CesiumMath, Cartesian3, GltfGpmLoader, + Math as CesiumMath, + Matrix3, } from "../../../../../index.js"; describe("Scene/Model/Extensions/Gpm/GltfGpmLoader", function () { diff --git a/packages/engine/Specs/Scene/Model/Extensions/Gpm/GltfMeshPrimitiveGpmLoaderSpec.js b/packages/engine/Specs/Scene/Model/Extensions/Gpm/GltfMeshPrimitiveGpmLoaderSpec.js index b68aa8a9f834..d39ee9eff52e 100644 --- a/packages/engine/Specs/Scene/Model/Extensions/Gpm/GltfMeshPrimitiveGpmLoaderSpec.js +++ b/packages/engine/Specs/Scene/Model/Extensions/Gpm/GltfMeshPrimitiveGpmLoaderSpec.js @@ -1,11 +1,11 @@ import { + GltfMeshPrimitiveGpmLoader, GltfTextureLoader, Resource, ResourceCache, SupportedImageFormats, - defined, - GltfMeshPrimitiveGpmLoader, -} from "../../../../../index.js"; +} from "@cesium/engine"; +import { defined } from "@cesium/utils"; import createScene from "../../../../../../../Specs/createScene.js"; import loaderProcess from "../../../../../../../Specs/loaderProcess.js"; import waitForLoaderProcess from "../../../../../../../Specs/waitForLoaderProcess.js"; diff --git a/packages/engine/Specs/Scene/Model/FeatureIdPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/FeatureIdPipelineStageSpec.js index 91a653a3a154..59fd6b9083c1 100644 --- a/packages/engine/Specs/Scene/Model/FeatureIdPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/FeatureIdPipelineStageSpec.js @@ -1,3 +1,6 @@ +import createScene from "../../../../../Specs/createScene.js"; +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; +import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; import { combine, ComponentDatatype, @@ -7,13 +10,10 @@ import { Resource, ResourceCache, ShaderBuilder, + VertexAttributeSemantic, _shadersFeatureIdStageFS, _shadersFeatureIdStageVS, - VertexAttributeSemantic, } from "../../../index.js"; -import createScene from "../../../../../Specs/createScene.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; -import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; describe( "Scene/Model/FeatureIdPipelineStage", diff --git a/packages/engine/Specs/Scene/Model/GeoJsonLoaderSpec.js b/packages/engine/Specs/Scene/Model/GeoJsonLoaderSpec.js index 5edd68d8acdf..e8082664fc86 100644 --- a/packages/engine/Specs/Scene/Model/GeoJsonLoaderSpec.js +++ b/packages/engine/Specs/Scene/Model/GeoJsonLoaderSpec.js @@ -1,3 +1,5 @@ +import createScene from "../../../../../Specs/createScene.js"; +import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; import { GeoJsonLoader, IndexDatatype, @@ -7,8 +9,6 @@ import { ResourceCache, VertexAttributeSemantic, } from "../../../index.js"; -import createScene from "../../../../../Specs/createScene.js"; -import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; describe( "Scene/Model/GeoJsonLoader", diff --git a/packages/engine/Specs/Scene/Model/GeometryPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/GeometryPipelineStageSpec.js index 57d9e3794a1f..ecbf96ec29d7 100644 --- a/packages/engine/Specs/Scene/Model/GeometryPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/GeometryPipelineStageSpec.js @@ -2,20 +2,20 @@ import { AttributeType, combine, ComponentDatatype, - defined, GeometryPipelineStage, - ModelStatistics, GltfLoader, + ModelStatistics, ModelType, Resource, ResourceCache, SelectedFeatureIdPipelineStage, ShaderBuilder, VertexAttributeSemantic, -} from "../../../index.js"; +} from "@cesium/engine"; +import { defined } from "@cesium/utils"; import createScene from "../../../../../Specs/createScene.js"; -import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; +import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; describe( "Scene/Model/GeometryPipelineStage", diff --git a/packages/engine/Specs/Scene/Model/I3dmLoaderSpec.js b/packages/engine/Specs/Scene/Model/I3dmLoaderSpec.js index 7237c8ae1dc3..04543b90fb82 100644 --- a/packages/engine/Specs/Scene/Model/I3dmLoaderSpec.js +++ b/packages/engine/Specs/Scene/Model/I3dmLoaderSpec.js @@ -1,3 +1,7 @@ +import { RuntimeError } from "@cesium/utils"; +import Cesium3DTilesTester from "../../../../../Specs/Cesium3DTilesTester.js"; +import createScene from "../../../../../Specs/createScene.js"; +import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; import { I3dmLoader, I3dmParser, @@ -6,11 +10,7 @@ import { Matrix4, Resource, ResourceCache, - RuntimeError, } from "../../../index.js"; -import Cesium3DTilesTester from "../../../../../Specs/Cesium3DTilesTester.js"; -import createScene from "../../../../../Specs/createScene.js"; -import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; describe( "Scene/Model/I3dmLoader", diff --git a/packages/engine/Specs/Scene/Model/ImageBasedLightingPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/ImageBasedLightingPipelineStageSpec.js index 9d985bdb7b6e..4ea29d7244b9 100644 --- a/packages/engine/Specs/Scene/Model/ImageBasedLightingPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/ImageBasedLightingPipelineStageSpec.js @@ -1,3 +1,4 @@ +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; import { Cartesian2, Cartesian3, @@ -7,7 +8,6 @@ import { ShaderBuilder, _shadersImageBasedLightingStageFS, } from "../../../index.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe("Scene/Model/ImageBasedLightingPipelineStage", function () { const mockFrameState = { diff --git a/packages/engine/Specs/Scene/Model/InstancingPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/InstancingPipelineStageSpec.js index 73077d44a515..fe9683e2e83e 100644 --- a/packages/engine/Specs/Scene/Model/InstancingPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/InstancingPipelineStageSpec.js @@ -1,3 +1,6 @@ +import createScene from "../../../../../Specs/createScene.js"; +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; +import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; import { Axis, Cartesian3, @@ -6,19 +9,16 @@ import { I3dmLoader, InstanceAttributeSemantic, InstancingPipelineStage, - Matrix4, Math as CesiumMath, - ModelUtility, + Matrix4, ModelStatistics, + ModelUtility, Resource, ResourceCache, ShaderBuilder, _shadersInstancingStageCommon, _shadersLegacyInstancingStageVS, } from "../../../index.js"; -import createScene from "../../../../../Specs/createScene.js"; -import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe( "Scene/Model/InstancingPipelineStage", diff --git a/packages/engine/Specs/Scene/Model/LightingPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/LightingPipelineStageSpec.js index dd546e064b85..8b4eb4aa72d0 100644 --- a/packages/engine/Specs/Scene/Model/LightingPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/LightingPipelineStageSpec.js @@ -1,12 +1,12 @@ +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; import { - _shadersLightingStageFS, + Cartesian3, LightingModel, LightingPipelineStage, ModelLightingOptions, ShaderBuilder, - Cartesian3, + _shadersLightingStageFS, } from "../../../index.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe("Scene/Model/LightingPipelineStage", function () { const mockPrimitive = {}; diff --git a/packages/engine/Specs/Scene/Model/MaterialPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/MaterialPipelineStageSpec.js index 128eef15b282..3ab437228855 100644 --- a/packages/engine/Specs/Scene/Model/MaterialPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/MaterialPipelineStageSpec.js @@ -1,27 +1,27 @@ +import createScene from "../../../../../Specs/createScene.js"; +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; +import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; import { - _shadersMaterialStageFS, AlphaMode, - Cartesian4, Cartesian3, + Cartesian4, ClassificationType, combine, GltfLoader, LightingModel, - Matrix3, MaterialPipelineStage, + Matrix3, ModelAlphaOptions, - ModelStatistics, - ModelLightingOptions, ModelComponents, + ModelLightingOptions, + ModelStatistics, Pass, RenderState, Resource, ResourceCache, ShaderBuilder, + _shadersMaterialStageFS, } from "../../../index.js"; -import createScene from "../../../../../Specs/createScene.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; -import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; describe( "Scene/Model/MaterialPipelineStage", diff --git a/packages/engine/Specs/Scene/Model/MetadataPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/MetadataPipelineStageSpec.js index a873646d0dab..8d13ab4b2f63 100644 --- a/packages/engine/Specs/Scene/Model/MetadataPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/MetadataPipelineStageSpec.js @@ -1,19 +1,19 @@ +import Cesium3DTilesTester from "../../../../../Specs/Cesium3DTilesTester.js"; +import createScene from "../../../../../Specs/createScene.js"; +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; +import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; import { Cartesian2, + Cartesian3, GltfLoader, + HeadingPitchRange, MetadataPipelineStage, ModelStatistics, Resource, ResourceCache, ShaderBuilder, - HeadingPitchRange, - Cartesian3, Transforms, } from "../../../index.js"; -import Cesium3DTilesTester from "../../../../../Specs/Cesium3DTilesTester.js"; -import createScene from "../../../../../Specs/createScene.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; -import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; describe( "Scene/Model/MetadataPipelineStage", diff --git a/packages/engine/Specs/Scene/Model/Model3DTileContentSpec.js b/packages/engine/Specs/Scene/Model/Model3DTileContentSpec.js index 06b047d78b1b..75e216ce0f3a 100644 --- a/packages/engine/Specs/Scene/Model/Model3DTileContentSpec.js +++ b/packages/engine/Specs/Scene/Model/Model3DTileContentSpec.js @@ -1,3 +1,7 @@ +import { RuntimeError } from "@cesium/utils"; +import Cesium3DTilesTester from "../../../../../Specs/Cesium3DTilesTester.js"; +import createCanvas from "../../../../../Specs/createCanvas.js"; +import createScene from "../../../../../Specs/createScene.js"; import { Cartesian3, Cartographic, @@ -29,13 +33,9 @@ import { Rectangle, RectangleGeometry, RenderState, - RuntimeError, StencilConstants, Transforms, } from "../../../index.js"; -import Cesium3DTilesTester from "../../../../../Specs/Cesium3DTilesTester.js"; -import createScene from "../../../../../Specs/createScene.js"; -import createCanvas from "../../../../../Specs/createCanvas.js"; describe( "Scene/Model/Model3DTileContent", diff --git a/packages/engine/Specs/Scene/Model/ModelAnimationChannelSpec.js b/packages/engine/Specs/Scene/Model/ModelAnimationChannelSpec.js index b03ffb438fd1..301a5b245d05 100644 --- a/packages/engine/Specs/Scene/Model/ModelAnimationChannelSpec.js +++ b/packages/engine/Specs/Scene/Model/ModelAnimationChannelSpec.js @@ -1,19 +1,19 @@ import { Axis, Cartesian3, - HermiteSpline, ConstantSpline, + HermiteSpline, InterpolationType, LinearSpline, Math as CesiumMath, Matrix3, Matrix4, - ModelComponents, ModelAnimationChannel, + ModelComponents, ModelRuntimeNode, - SteppedSpline, Quaternion, QuaternionSpline, + SteppedSpline, } from "../../../index.js"; describe("Scene/Model/ModelAnimationChannel", function () { diff --git a/packages/engine/Specs/Scene/Model/ModelAnimationCollectionSpec.js b/packages/engine/Specs/Scene/Model/ModelAnimationCollectionSpec.js index b6c1f392a4e6..1ed0726de7eb 100644 --- a/packages/engine/Specs/Scene/Model/ModelAnimationCollectionSpec.js +++ b/packages/engine/Specs/Scene/Model/ModelAnimationCollectionSpec.js @@ -1,14 +1,14 @@ import { JulianDate, - ModelAnimationLoop, + Math as CesiumMath, Model, + ModelAnimationLoop, ResourceCache, - Math as CesiumMath, } from "../../../index.js"; import createScene from "../../../../../Specs/createScene.js"; -import loadAndZoomToModelAsync from "./loadAndZoomToModelAsync.js"; import pollToPromise from "../../../../../Specs/pollToPromise.js"; +import loadAndZoomToModelAsync from "./loadAndZoomToModelAsync.js"; describe( "Scene/Model/ModelAnimationCollection", diff --git a/packages/engine/Specs/Scene/Model/ModelAnimationSpec.js b/packages/engine/Specs/Scene/Model/ModelAnimationSpec.js index 045d5d33c025..f162f8329c77 100644 --- a/packages/engine/Specs/Scene/Model/ModelAnimationSpec.js +++ b/packages/engine/Specs/Scene/Model/ModelAnimationSpec.js @@ -3,9 +3,9 @@ import { InterpolationType, JulianDate, Matrix4, + ModelAnimation, ModelAnimationLoop, ModelComponents, - ModelAnimation, ModelRuntimeNode, Quaternion, } from "../../../index.js"; diff --git a/packages/engine/Specs/Scene/Model/ModelClippingPlanesPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/ModelClippingPlanesPipelineStageSpec.js index d51edda0f504..3bad8196ebee 100644 --- a/packages/engine/Specs/Scene/Model/ModelClippingPlanesPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/ModelClippingPlanesPipelineStageSpec.js @@ -1,3 +1,4 @@ +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; import { Cartesian3, ClippingPlane, @@ -8,7 +9,6 @@ import { ShaderBuilder, _shadersModelClippingPlanesStageFS, } from "../../../index.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe("Scene/Model/ModelClippingPlanesPipelineStage", function () { let plane; diff --git a/packages/engine/Specs/Scene/Model/ModelClippingPolygonsPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/ModelClippingPolygonsPipelineStageSpec.js index 964c0990130c..e4b830694a5d 100644 --- a/packages/engine/Specs/Scene/Model/ModelClippingPolygonsPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/ModelClippingPolygonsPipelineStageSpec.js @@ -1,3 +1,5 @@ +import createContext from "../../../../../Specs/createContext.js"; +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; import { Cartesian3, ClippingPolygon, @@ -9,8 +11,6 @@ import { _shadersModelClippingPolygonsStageFS, _shadersModelClippingPolygonsStageVS, } from "../../../index.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; -import createContext from "../../../../../Specs/createContext.js"; describe("Scene/Model/ModelClippingPolygonsPipelineStage", function () { const positions = Cartesian3.fromRadiansArray([ diff --git a/packages/engine/Specs/Scene/Model/ModelColorPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/ModelColorPipelineStageSpec.js index 4d1ac96a7d19..49d406055429 100644 --- a/packages/engine/Specs/Scene/Model/ModelColorPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/ModelColorPipelineStageSpec.js @@ -1,3 +1,4 @@ +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; import { Color, ColorBlendMode, @@ -7,7 +8,6 @@ import { RenderState, ShaderBuilder, } from "../../../index.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe( "Scene/Model/ModelColorPipelineStage", diff --git a/packages/engine/Specs/Scene/Model/ModelDrawCommandSpec.js b/packages/engine/Specs/Scene/Model/ModelDrawCommandSpec.js index 66427f28a10e..d9f075129577 100644 --- a/packages/engine/Specs/Scene/Model/ModelDrawCommandSpec.js +++ b/packages/engine/Specs/Scene/Model/ModelDrawCommandSpec.js @@ -9,7 +9,6 @@ import { DepthFunction, DrawCommand, Frozen, - defined, GeographicProjection, Math as CesiumMath, Matrix4, @@ -24,7 +23,8 @@ import { StyleCommandsNeeded, Transforms, WebGLConstants, -} from "../../../index.js"; +} from "@cesium/engine"; +import { defined } from "@cesium/utils"; describe( "Scene/Model/ModelDrawCommand", diff --git a/packages/engine/Specs/Scene/Model/ModelFeatureSpec.js b/packages/engine/Specs/Scene/Model/ModelFeatureSpec.js index 3472e6498557..9fbb3c464ed5 100644 --- a/packages/engine/Specs/Scene/Model/ModelFeatureSpec.js +++ b/packages/engine/Specs/Scene/Model/ModelFeatureSpec.js @@ -1,10 +1,10 @@ +import MetadataTester from "../../../../../Specs/MetadataTester.js"; import { Color, - ModelType, ModelFeature, ModelFeatureTable, + ModelType, } from "../../../index.js"; -import MetadataTester from "../../../../../Specs/MetadataTester.js"; describe("Scene/Model/ModelFeature", function () { const mockModel = { diff --git a/packages/engine/Specs/Scene/Model/ModelFeatureTableSpec.js b/packages/engine/Specs/Scene/Model/ModelFeatureTableSpec.js index d16cd5128f5a..0a4df5c7b3a0 100644 --- a/packages/engine/Specs/Scene/Model/ModelFeatureTableSpec.js +++ b/packages/engine/Specs/Scene/Model/ModelFeatureTableSpec.js @@ -1,10 +1,10 @@ +import MetadataTester from "../../../../../Specs/MetadataTester.js"; import { Cesium3DTileFeature, - ModelType, - ModelFeatureTable, ModelFeature, + ModelFeatureTable, + ModelType, } from "../../../index.js"; -import MetadataTester from "../../../../../Specs/MetadataTester.js"; describe("Scene/Model/ModelFeatureTable", function () { let mockPropertyTable; diff --git a/packages/engine/Specs/Scene/Model/ModelMatrixUpdateStageSpec.js b/packages/engine/Specs/Scene/Model/ModelMatrixUpdateStageSpec.js index 34d699423f47..f3b7665e824e 100644 --- a/packages/engine/Specs/Scene/Model/ModelMatrixUpdateStageSpec.js +++ b/packages/engine/Specs/Scene/Model/ModelMatrixUpdateStageSpec.js @@ -1,16 +1,16 @@ +import createScene from "../../../../../Specs/createScene.js"; import { BoundingSphere, Cartesian3, clone, CullFace, - Matrix4, Math as CesiumMath, + Matrix4, ModelDrawCommand, ModelRuntimePrimitive, - ResourceCache, Quaternion, + ResourceCache, } from "../../../index.js"; -import createScene from "../../../../../Specs/createScene.js"; import loadAndZoomToModelAsync from "./loadAndZoomToModelAsync.js"; describe( diff --git a/packages/engine/Specs/Scene/Model/ModelRenderResourcesSpec.js b/packages/engine/Specs/Scene/Model/ModelRenderResourcesSpec.js index 6fe8cf58d8ed..a1384784e8f6 100644 --- a/packages/engine/Specs/Scene/Model/ModelRenderResourcesSpec.js +++ b/packages/engine/Specs/Scene/Model/ModelRenderResourcesSpec.js @@ -1,9 +1,9 @@ +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; import { DepthFunction, ModelRenderResources, RenderState, } from "../../../index.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe( "Scene/Model/ModelRenderResources", diff --git a/packages/engine/Specs/Scene/Model/ModelRuntimeNodeSpec.js b/packages/engine/Specs/Scene/Model/ModelRuntimeNodeSpec.js index 67bb34860a04..96721f932d78 100644 --- a/packages/engine/Specs/Scene/Model/ModelRuntimeNodeSpec.js +++ b/packages/engine/Specs/Scene/Model/ModelRuntimeNodeSpec.js @@ -4,8 +4,8 @@ import { InstancingPipelineStage, Matrix3, Matrix4, - ModelRuntimeNode, ModelMatrixUpdateStage, + ModelRuntimeNode, NodeStatisticsPipelineStage, Quaternion, } from "../../../index.js"; diff --git a/packages/engine/Specs/Scene/Model/ModelRuntimePrimitiveSpec.js b/packages/engine/Specs/Scene/Model/ModelRuntimePrimitiveSpec.js index 985f7a5f5ad9..f130fdf39a0e 100644 --- a/packages/engine/Specs/Scene/Model/ModelRuntimePrimitiveSpec.js +++ b/packages/engine/Specs/Scene/Model/ModelRuntimePrimitiveSpec.js @@ -3,15 +3,17 @@ import { BatchTexturePipelineStage, Cesium3DTileStyle, ClassificationPipelineStage, + ClassificationType, + CPUStylingPipelineStage, CustomShader, CustomShaderMode, CustomShaderPipelineStage, - FeatureIdPipelineStage, - CPUStylingPipelineStage, DequantizationPipelineStage, + FeatureIdPipelineStage, GeometryPipelineStage, LightingPipelineStage, MaterialPipelineStage, + MetadataPickingPipelineStage, MetadataPipelineStage, ModelRuntimePrimitive, ModelType, @@ -29,8 +31,6 @@ import { VertexAttributeSemantic, VerticalExaggerationPipelineStage, WireframePipelineStage, - ClassificationType, - MetadataPickingPipelineStage, } from "../../../index.js"; import createFrameState from "../../../../../Specs/createFrameState.js"; diff --git a/packages/engine/Specs/Scene/Model/ModelSceneGraphSpec.js b/packages/engine/Specs/Scene/Model/ModelSceneGraphSpec.js index 147536b015b8..4e21162217c4 100644 --- a/packages/engine/Specs/Scene/Model/ModelSceneGraphSpec.js +++ b/packages/engine/Specs/Scene/Model/ModelSceneGraphSpec.js @@ -1,11 +1,12 @@ +import createScene from "../../../../../Specs/createScene.js"; import { + AtmospherePipelineStage, Axis, Cesium3DTileStyle, Color, CustomShader, CustomShaderPipelineStage, Fog, - AtmospherePipelineStage, Math as CesiumMath, Matrix4, ModelColorPipelineStage, @@ -14,7 +15,6 @@ import { Pass, ResourceCache, } from "../../../index.js"; -import createScene from "../../../../../Specs/createScene.js"; import loadAndZoomToModelAsync from "./loadAndZoomToModelAsync.js"; describe( diff --git a/packages/engine/Specs/Scene/Model/ModelSilhouettePipelineStageSpec.js b/packages/engine/Specs/Scene/Model/ModelSilhouettePipelineStageSpec.js index 243c07aff70c..e3e2ba184693 100644 --- a/packages/engine/Specs/Scene/Model/ModelSilhouettePipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/ModelSilhouettePipelineStageSpec.js @@ -1,3 +1,4 @@ +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; import { Color, ModelSilhouettePipelineStage, @@ -5,7 +6,6 @@ import { _shadersModelSilhouetteStageFS, _shadersModelSilhouetteStageVS, } from "../../../index.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe("Scene/Model/ModelSilhouettePipelineStage", function () { beforeEach(function () { diff --git a/packages/engine/Specs/Scene/Model/ModelSpec.js b/packages/engine/Specs/Scene/Model/ModelSpec.js index 0b902d63c605..a14527c8d573 100644 --- a/packages/engine/Specs/Scene/Model/ModelSpec.js +++ b/packages/engine/Specs/Scene/Model/ModelSpec.js @@ -14,16 +14,14 @@ import { ColorBlendMode, Credit, CustomShader, - Frozen, - defined, DirectionalLight, DistanceDisplayCondition, - DynamicAtmosphereLightingType, DracoLoader, + DynamicAtmosphereLightingType, Ellipsoid, - FeatureDetection, - Globe, Fog, + Frozen, + Globe, HeadingPitchRange, HeadingPitchRoll, HeightReference, @@ -41,7 +39,6 @@ import { PrimitiveType, Resource, ResourceCache, - RuntimeError, ShaderProgram, ShadowMode, SpecularEnvironmentCubeMap, @@ -50,7 +47,8 @@ import { SunLight, Transforms, WireframeIndexGenerator, -} from "../../../index.js"; +} from "@cesium/engine"; +import { defined, FeatureDetection, RuntimeError } from "@cesium/utils"; import createScene from "../../../../../Specs/createScene.js"; import pollToPromise from "../../../../../Specs/pollToPromise.js"; import loadAndZoomToModelAsync from "./loadAndZoomToModelAsync.js"; diff --git a/packages/engine/Specs/Scene/Model/ModelSplitterPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/ModelSplitterPipelineStageSpec.js index f3ad98952ca6..a328cafd6b72 100644 --- a/packages/engine/Specs/Scene/Model/ModelSplitterPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/ModelSplitterPipelineStageSpec.js @@ -1,10 +1,10 @@ +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; import { ModelSplitterPipelineStage, - SplitDirection, ShaderBuilder, + SplitDirection, _shadersModelSplitterStageFS, } from "../../../index.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe("Scene/Model/ModelSplitterPipelineStage", function () { const mockFrameState = {}; diff --git a/packages/engine/Specs/Scene/Model/MorphTargetsPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/MorphTargetsPipelineStageSpec.js index e3a9377cf475..fd4f4130bf8a 100644 --- a/packages/engine/Specs/Scene/Model/MorphTargetsPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/MorphTargetsPipelineStageSpec.js @@ -1,3 +1,6 @@ +import createScene from "../../../../../Specs/createScene.js"; +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; +import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; import { combine, ComponentDatatype, @@ -10,9 +13,6 @@ import { ShaderBuilder, _shadersMorphTargetsStageVS, } from "../../../index.js"; -import createScene from "../../../../../Specs/createScene.js"; -import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe( "Scene/Model/MorphTargetsPipelineStage", diff --git a/packages/engine/Specs/Scene/Model/NodeRenderResourcesSpec.js b/packages/engine/Specs/Scene/Model/NodeRenderResourcesSpec.js index 55f1d221e752..3247e611426a 100644 --- a/packages/engine/Specs/Scene/Model/NodeRenderResourcesSpec.js +++ b/packages/engine/Specs/Scene/Model/NodeRenderResourcesSpec.js @@ -1,14 +1,14 @@ +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; import { Axis, Cartesian3, DepthFunction, Matrix4, - ModelRuntimeNode, ModelRenderResources, + ModelRuntimeNode, NodeRenderResources, RenderState, } from "../../../index.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe( "Scene/Model/NodeRenderResources", diff --git a/packages/engine/Specs/Scene/Model/NodeStatisticsPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/NodeStatisticsPipelineStageSpec.js index 704f92620a1d..e58e38973d20 100644 --- a/packages/engine/Specs/Scene/Model/NodeStatisticsPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/NodeStatisticsPipelineStageSpec.js @@ -1,3 +1,5 @@ +import createScene from "../../../../../Specs/createScene.js"; +import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; import { combine, GltfLoader, @@ -7,8 +9,6 @@ import { Resource, ResourceCache, } from "../../../index.js"; -import createScene from "../../../../../Specs/createScene.js"; -import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; describe( "Scene/Model/NodeStatisticsPipelineStage", diff --git a/packages/engine/Specs/Scene/Model/PickingPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/PickingPipelineStageSpec.js index e1a0a7235c96..86b94589ee54 100644 --- a/packages/engine/Specs/Scene/Model/PickingPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/PickingPipelineStageSpec.js @@ -4,11 +4,11 @@ import { ModelStatistics, ModelType, PickingPipelineStage, - ShaderBuilder, Resource, ResourceCache, - defined, -} from "../../../index.js"; + ShaderBuilder, +} from "@cesium/engine"; +import { defined } from "@cesium/utils"; import createScene from "../../../../../Specs/createScene.js"; import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; diff --git a/packages/engine/Specs/Scene/Model/PntsLoaderSpec.js b/packages/engine/Specs/Scene/Model/PntsLoaderSpec.js index e5ad86ce24e9..26bc27cd9a4e 100644 --- a/packages/engine/Specs/Scene/Model/PntsLoaderSpec.js +++ b/packages/engine/Specs/Scene/Model/PntsLoaderSpec.js @@ -1,9 +1,14 @@ +import { RuntimeError } from "@cesium/utils"; +import Cesium3DTilesTester from "../../../../../Specs/Cesium3DTilesTester.js"; +import createScene from "../../../../../Specs/createScene.js"; +import pollToPromise from "../../../../../Specs/pollToPromise.js"; +import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; import { AttributeType, Color, ComponentDatatype, - Frozen, DracoLoader, + Frozen, Matrix4, MetadataClass, MetadataComponentType, @@ -11,13 +16,8 @@ import { PntsLoader, Resource, ResourceCache, - RuntimeError, VertexAttributeSemantic, } from "../../../index.js"; -import createScene from "../../../../../Specs/createScene.js"; -import pollToPromise from "../../../../../Specs/pollToPromise.js"; -import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; -import Cesium3DTilesTester from "../../../../../Specs/Cesium3DTilesTester.js"; describe( "Scene/Model/PntsLoader", diff --git a/packages/engine/Specs/Scene/Model/PointCloudStylingPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/PointCloudStylingPipelineStageSpec.js index 818361c4eb39..6a25a186b2f0 100644 --- a/packages/engine/Specs/Scene/Model/PointCloudStylingPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/PointCloudStylingPipelineStageSpec.js @@ -1,3 +1,6 @@ +import { RuntimeError } from "@cesium/utils"; +import createScene from "../../../../../Specs/createScene.js"; +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; import { Camera, Cartesian3, @@ -8,15 +11,12 @@ import { ModelType, OrthographicFrustum, Pass, - PointCloudStylingPipelineStage, PointCloudShading, - RuntimeError, + PointCloudStylingPipelineStage, ShaderBuilder, - _shadersPointCloudStylingStageVS, VertexAttributeSemantic, + _shadersPointCloudStylingStageVS, } from "../../../index.js"; -import createScene from "../../../../../Specs/createScene.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe( "Scene/Model/PointCloudStylingPipelineStage", diff --git a/packages/engine/Specs/Scene/Model/PrimitiveLoadPlanSpec.js b/packages/engine/Specs/Scene/Model/PrimitiveLoadPlanSpec.js index 30887321fc9d..24e9b7531ede 100644 --- a/packages/engine/Specs/Scene/Model/PrimitiveLoadPlanSpec.js +++ b/packages/engine/Specs/Scene/Model/PrimitiveLoadPlanSpec.js @@ -1,9 +1,9 @@ +import createContext from "../../../../../Specs/createContext.js"; import { AttributeType, - PrimitiveLoadPlan, ModelComponents, + PrimitiveLoadPlan, } from "../../../index.js"; -import createContext from "../../../../../Specs/createContext.js"; describe( "Scene/Model/PrimitiveLoadPlan", diff --git a/packages/engine/Specs/Scene/Model/PrimitiveOutlineGeneratorSpec.js b/packages/engine/Specs/Scene/Model/PrimitiveOutlineGeneratorSpec.js index 1e3a0ace79e9..2dbb2acb4fbc 100644 --- a/packages/engine/Specs/Scene/Model/PrimitiveOutlineGeneratorSpec.js +++ b/packages/engine/Specs/Scene/Model/PrimitiveOutlineGeneratorSpec.js @@ -1,8 +1,5 @@ -import { - Cartesian3, - defined, - PrimitiveOutlineGenerator, -} from "../../../index.js"; +import { Cartesian3, PrimitiveOutlineGenerator } from "@cesium/engine"; +import { defined } from "@cesium/utils"; import createContext from "../../../../../Specs/createContext.js"; describe( diff --git a/packages/engine/Specs/Scene/Model/PrimitiveOutlinePipelineStageSpec.js b/packages/engine/Specs/Scene/Model/PrimitiveOutlinePipelineStageSpec.js index 02244c9a321c..8dc3d338b0d7 100644 --- a/packages/engine/Specs/Scene/Model/PrimitiveOutlinePipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/PrimitiveOutlinePipelineStageSpec.js @@ -1,18 +1,18 @@ +import createScene from "../../../../../Specs/createScene.js"; +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; +import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; import { Color, combine, ComponentDatatype, GltfLoader, PrimitiveOutlinePipelineStage, - ShaderBuilder, - _shadersPrimitiveOutlineStageVS, - _shadersPrimitiveOutlineStageFS, Resource, ResourceCache, + ShaderBuilder, + _shadersPrimitiveOutlineStageFS, + _shadersPrimitiveOutlineStageVS, } from "../../../index.js"; -import createScene from "../../../../../Specs/createScene.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; -import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; describe( "Scene/Model/PrimitiveOutlinePipelineStage", diff --git a/packages/engine/Specs/Scene/Model/PrimitiveRenderResourcesSpec.js b/packages/engine/Specs/Scene/Model/PrimitiveRenderResourcesSpec.js index 740e9218f0c0..f5134ace63c1 100644 --- a/packages/engine/Specs/Scene/Model/PrimitiveRenderResourcesSpec.js +++ b/packages/engine/Specs/Scene/Model/PrimitiveRenderResourcesSpec.js @@ -1,3 +1,4 @@ +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; import { AttributeType, Axis, @@ -8,17 +9,16 @@ import { LightingModel, Math as CesiumMath, Matrix4, + ModelRenderResources, ModelRuntimeNode, ModelRuntimePrimitive, ModelType, - PrimitiveType, - ModelRenderResources, NodeRenderResources, PrimitiveRenderResources, + PrimitiveType, RenderState, VertexAttributeSemantic, } from "../../../index.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe( "Scene/Model/PrimitiveRenderResources", diff --git a/packages/engine/Specs/Scene/Model/PrimitiveStatisticsPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/PrimitiveStatisticsPipelineStageSpec.js index 92bf3249675b..a0e785dc7f60 100644 --- a/packages/engine/Specs/Scene/Model/PrimitiveStatisticsPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/PrimitiveStatisticsPipelineStageSpec.js @@ -1,3 +1,5 @@ +import createScene from "../../../../../Specs/createScene.js"; +import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; import { combine, GltfLoader, @@ -6,8 +8,6 @@ import { Resource, ResourceCache, } from "../../../index.js"; -import createScene from "../../../../../Specs/createScene.js"; -import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; describe( "Scene/Model/PrimitiveStatisticsPipelineStage", diff --git a/packages/engine/Specs/Scene/Model/SceneMode2DPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/SceneMode2DPipelineStageSpec.js index 17ea371b8ea6..23af1d37ecd5 100644 --- a/packages/engine/Specs/Scene/Model/SceneMode2DPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/SceneMode2DPipelineStageSpec.js @@ -1,3 +1,6 @@ +import createScene from "../../../../../Specs/createScene.js"; +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; +import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; import { Cartesian3, combine, @@ -12,9 +15,6 @@ import { ShaderBuilder, VertexAttributeSemantic, } from "../../../index.js"; -import createScene from "../../../../../Specs/createScene.js"; -import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe( "Scene/Model/SceneMode2DPipelineStage", diff --git a/packages/engine/Specs/Scene/Model/SelectedFeatureIdPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/SelectedFeatureIdPipelineStageSpec.js index dae4030ca0fc..d3913d45c69f 100644 --- a/packages/engine/Specs/Scene/Model/SelectedFeatureIdPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/SelectedFeatureIdPipelineStageSpec.js @@ -1,16 +1,16 @@ +import createScene from "../../../../../Specs/createScene.js"; +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; +import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; import { combine, GltfLoader, + Resource, + ResourceCache, SelectedFeatureIdPipelineStage, ShaderBuilder, ShaderDestination, - Resource, - ResourceCache, _shadersSelectedFeatureIdStageCommon, } from "../../../index.js"; -import createScene from "../../../../../Specs/createScene.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; -import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; describe( "Scene/Model/SelectedFeatureIdPipelineStage", diff --git a/packages/engine/Specs/Scene/Model/SkinningPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/SkinningPipelineStageSpec.js index f89b84b59e6e..b7d90aaba0dc 100644 --- a/packages/engine/Specs/Scene/Model/SkinningPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/SkinningPipelineStageSpec.js @@ -1,3 +1,6 @@ +import createScene from "../../../../../Specs/createScene.js"; +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; +import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; import { combine, GltfLoader, @@ -6,12 +9,9 @@ import { Resource, ResourceCache, ShaderBuilder, - _shadersSkinningStageVS, SkinningPipelineStage, + _shadersSkinningStageVS, } from "../../../index.js"; -import createScene from "../../../../../Specs/createScene.js"; -import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe( "Scene/Model/SkinningPipelineStage", diff --git a/packages/engine/Specs/Scene/Model/TextureManagerSpec.js b/packages/engine/Specs/Scene/Model/TextureManagerSpec.js index e5a12e3cf69e..f98758818503 100644 --- a/packages/engine/Specs/Scene/Model/TextureManagerSpec.js +++ b/packages/engine/Specs/Scene/Model/TextureManagerSpec.js @@ -1,7 +1,7 @@ -import { Resource, TextureManager, TextureUniform } from "../../../index.js"; -import TextureMinificationFilter from "../../../Source/Renderer/TextureMinificationFilter.js"; import createScene from "../../../../../Specs/createScene.js"; import pollToPromise from "../../../../../Specs/pollToPromise.js"; +import { Resource, TextureManager, TextureUniform } from "../../../index.js"; +import TextureMinificationFilter from "../../../Source/Renderer/TextureMinificationFilter.js"; describe( "Scene/Model/TextureManager", diff --git a/packages/engine/Specs/Scene/Model/TilesetPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/TilesetPipelineStageSpec.js index aa17f40a821f..7c4b052d33ca 100644 --- a/packages/engine/Specs/Scene/Model/TilesetPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/TilesetPipelineStageSpec.js @@ -1,10 +1,10 @@ +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; import { Cartesian2, ShaderBuilder, StencilConstants, TilesetPipelineStage, } from "../../../index.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe("Scene/Model/TilesetPipelineStage", function () { const mockFrameState = {}; diff --git a/packages/engine/Specs/Scene/Model/VerticalExaggerationPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/VerticalExaggerationPipelineStageSpec.js index 0dc90b162939..21c15cdf0e8d 100644 --- a/packages/engine/Specs/Scene/Model/VerticalExaggerationPipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/VerticalExaggerationPipelineStageSpec.js @@ -1,11 +1,11 @@ +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; import { - _shadersVerticalExaggerationStageVS, Cartesian2, RenderState, ShaderBuilder, VerticalExaggerationPipelineStage, + _shadersVerticalExaggerationStageVS, } from "../../../index.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; describe( "Scene/Model/VerticalExaggerationPipelineStage", diff --git a/packages/engine/Specs/Scene/Model/WireframePipelineStageSpec.js b/packages/engine/Specs/Scene/Model/WireframePipelineStageSpec.js index 9287f87ec935..c73f2c93b42d 100644 --- a/packages/engine/Specs/Scene/Model/WireframePipelineStageSpec.js +++ b/packages/engine/Specs/Scene/Model/WireframePipelineStageSpec.js @@ -1,3 +1,6 @@ +import createScene from "../../../../../Specs/createScene.js"; +import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; +import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; import { combine, GltfLoader, @@ -8,9 +11,6 @@ import { ShaderBuilder, WireframePipelineStage, } from "../../../index.js"; -import createScene from "../../../../../Specs/createScene.js"; -import ShaderBuilderTester from "../../../../../Specs/ShaderBuilderTester.js"; -import waitForLoaderProcess from "../../../../../Specs/waitForLoaderProcess.js"; describe( "Scene/Model/WireframePipelineStage", diff --git a/packages/engine/Specs/Scene/Model/loadAndZoomToModelAsync.js b/packages/engine/Specs/Scene/Model/loadAndZoomToModelAsync.js index 514f53df64f5..044d6340bf4f 100644 --- a/packages/engine/Specs/Scene/Model/loadAndZoomToModelAsync.js +++ b/packages/engine/Specs/Scene/Model/loadAndZoomToModelAsync.js @@ -1,5 +1,5 @@ -import { Model } from "../../../index.js"; import pollToPromise from "../../../../../Specs/pollToPromise.js"; +import { Model } from "../../../index.js"; async function loadAndZoomToModelAsync(options, scene) { options = { diff --git a/packages/engine/Specs/Scene/Model/pickModelSpec.js b/packages/engine/Specs/Scene/Model/pickModelSpec.js index 9a8ad02fab38..67c831f5ba59 100644 --- a/packages/engine/Specs/Scene/Model/pickModelSpec.js +++ b/packages/engine/Specs/Scene/Model/pickModelSpec.js @@ -1,17 +1,17 @@ import { - pickModel, Cartesian2, Cartesian3, Ellipsoid, HeadingPitchRange, Math as CesiumMath, Model, + pickModel, Ray, SceneMode, } from "../../../index.js"; -import loadAndZoomToModelAsync from "./loadAndZoomToModelAsync.js"; import createScene from "../../../../../Specs/createScene.js"; +import loadAndZoomToModelAsync from "./loadAndZoomToModelAsync.js"; describe("Scene/Model/pickModel", function () { const boxTexturedGltfUrl = diff --git a/packages/engine/Specs/Scene/MoonSpec.js b/packages/engine/Specs/Scene/MoonSpec.js index 1da140c7caba..d286dd1f254c 100644 --- a/packages/engine/Specs/Scene/MoonSpec.js +++ b/packages/engine/Specs/Scene/MoonSpec.js @@ -1,12 +1,12 @@ +import { defined } from "@cesium/utils"; import { BoundingSphere, Color, - defined, Ellipsoid, Matrix3, + Moon, Simon1994PlanetaryPositions, Transforms, - Moon, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/MultifrustumSpec.js b/packages/engine/Specs/Scene/MultifrustumSpec.js index 71473298a9a7..9bbc128dc839 100644 --- a/packages/engine/Specs/Scene/MultifrustumSpec.js +++ b/packages/engine/Specs/Scene/MultifrustumSpec.js @@ -1,25 +1,25 @@ +import { defined } from "@cesium/utils"; import { + BillboardCollection, + BlendingState, BoundingSphere, BoxGeometry, + BufferUsage, Cartesian2, Cartesian3, Color, - defined, destroyObject, + DrawCommand, GeometryPipeline, Math as CesiumMath, Matrix4, - Resource, - BufferUsage, - DrawCommand, Pass, RenderState, + Resource, Sampler, ShaderProgram, - VertexArray, - BillboardCollection, - BlendingState, TextureAtlas, + VertexArray, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/Multiple3DTileContentSpec.js b/packages/engine/Specs/Scene/Multiple3DTileContentSpec.js index 5682ba42c43c..39a08973b3cf 100644 --- a/packages/engine/Specs/Scene/Multiple3DTileContentSpec.js +++ b/packages/engine/Specs/Scene/Multiple3DTileContentSpec.js @@ -1,19 +1,19 @@ +import Cesium3DTilesTester from "../../../../Specs/Cesium3DTilesTester.js"; +import createScene from "../../../../Specs/createScene.js"; +import generateJsonBuffer from "../../../../Specs/generateJsonBuffer.js"; import { Cartesian3, Cesium3DContentGroup, Cesium3DTileset, Color, Event, + GroupMetadata, HeadingPitchRange, - Multiple3DTileContent, MetadataClass, - GroupMetadata, + Multiple3DTileContent, RequestScheduler, Resource, } from "../../index.js"; -import Cesium3DTilesTester from "../../../../Specs/Cesium3DTilesTester.js"; -import createScene from "../../../../Specs/createScene.js"; -import generateJsonBuffer from "../../../../Specs/generateJsonBuffer.js"; describe( "Scene/Multiple3DTileContent", diff --git a/packages/engine/Specs/Scene/OpenStreetMapImageryProviderSpec.js b/packages/engine/Specs/Scene/OpenStreetMapImageryProviderSpec.js index 08ae7a5127d9..9b3e2a8a30d8 100644 --- a/packages/engine/Specs/Scene/OpenStreetMapImageryProviderSpec.js +++ b/packages/engine/Specs/Scene/OpenStreetMapImageryProviderSpec.js @@ -1,15 +1,15 @@ import { + Imagery, + ImageryLayer, + ImageryState, Math as CesiumMath, + OpenStreetMapImageryProvider, Rectangle, Request, RequestScheduler, Resource, - WebMercatorTilingScheme, - OpenStreetMapImageryProvider, - Imagery, - ImageryLayer, - ImageryState, UrlTemplateImageryProvider, + WebMercatorTilingScheme, } from "../../index.js"; import pollToPromise from "../../../../Specs/pollToPromise.js"; diff --git a/packages/engine/Specs/Scene/ParticleSystemSpec.js b/packages/engine/Specs/Scene/ParticleSystemSpec.js index fa38951f7125..47f6ebab37bb 100644 --- a/packages/engine/Specs/Scene/ParticleSystemSpec.js +++ b/packages/engine/Specs/Scene/ParticleSystemSpec.js @@ -1,12 +1,12 @@ import { Cartesian2, Cartesian3, + CircleEmitter, Color, Matrix4, - Resource, - CircleEmitter, ParticleBurst, ParticleSystem, + Resource, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/PerInstanceColorAppearanceSpec.js b/packages/engine/Specs/Scene/PerInstanceColorAppearanceSpec.js index 9f9e8207c87e..6ce670a298ae 100644 --- a/packages/engine/Specs/Scene/PerInstanceColorAppearanceSpec.js +++ b/packages/engine/Specs/Scene/PerInstanceColorAppearanceSpec.js @@ -1,11 +1,11 @@ import { + Appearance, ColorGeometryInstanceAttribute, GeometryInstance, - Rectangle, - RectangleGeometry, - Appearance, PerInstanceColorAppearance, Primitive, + Rectangle, + RectangleGeometry, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/PickingSpec.js b/packages/engine/Specs/Scene/PickingSpec.js index 42b4bdc401c7..8651f53d7f43 100644 --- a/packages/engine/Specs/Scene/PickingSpec.js +++ b/packages/engine/Specs/Scene/PickingSpec.js @@ -2,25 +2,25 @@ import { Cartesian2, Cartesian3, Cartographic, + Cesium3DTileStyle, Cesium3DTilesVoxelProvider, Color, Ellipsoid, + EllipsoidSurfaceAppearance, GeometryInstance, + Globe, Math as CesiumMath, Matrix4, OrthographicFrustum, PerspectiveFrustum, + PointPrimitiveCollection, + Primitive, Ray, Rectangle, RectangleGeometry, + SceneMode, ShowGeometryInstanceAttribute, Transforms, - Cesium3DTileStyle, - EllipsoidSurfaceAppearance, - Globe, - PointPrimitiveCollection, - Primitive, - SceneMode, VoxelPrimitive, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/PntsParserSpec.js b/packages/engine/Specs/Scene/PntsParserSpec.js index ff85608afffa..2c38a3c576c0 100644 --- a/packages/engine/Specs/Scene/PntsParserSpec.js +++ b/packages/engine/Specs/Scene/PntsParserSpec.js @@ -1,5 +1,6 @@ -import { PntsParser, RuntimeError } from "../../index.js"; +import { RuntimeError } from "@cesium/utils"; import Cesium3DTilesTester from "../../../../Specs/Cesium3DTilesTester.js"; +import { PntsParser } from "../../index.js"; describe("Scene/PntsParser", function () { it("throws without arrayBuffer", function () { diff --git a/packages/engine/Specs/Scene/PointCloudShadingSpec.js b/packages/engine/Specs/Scene/PointCloudShadingSpec.js index 32b47597051e..963ee76a37f4 100644 --- a/packages/engine/Specs/Scene/PointCloudShadingSpec.js +++ b/packages/engine/Specs/Scene/PointCloudShadingSpec.js @@ -1,5 +1,5 @@ -import { PointCloudShading } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; +import { PointCloudShading } from "../../index.js"; describe("Scene/PointCloudShading", function () { it("creates expected instance from raw assignment and construction", function () { diff --git a/packages/engine/Specs/Scene/PointPrimitiveCollectionSpec.js b/packages/engine/Specs/Scene/PointPrimitiveCollectionSpec.js index 036b44416502..336d93266105 100644 --- a/packages/engine/Specs/Scene/PointPrimitiveCollectionSpec.js +++ b/packages/engine/Specs/Scene/PointPrimitiveCollectionSpec.js @@ -1,4 +1,5 @@ import { + BlendOption, BoundingRectangle, BoundingSphere, Cartesian2, @@ -7,10 +8,9 @@ import { DistanceDisplayCondition, Math as CesiumMath, NearFarScalar, - Rectangle, - BlendOption, PointPrimitive, PointPrimitiveCollection, + Rectangle, SplitDirection, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/PolylineCollectionSpec.js b/packages/engine/Specs/Scene/PolylineCollectionSpec.js index 85c4b026bb8b..7c257268f049 100644 --- a/packages/engine/Specs/Scene/PolylineCollectionSpec.js +++ b/packages/engine/Specs/Scene/PolylineCollectionSpec.js @@ -1,13 +1,13 @@ import { BoundingSphere, + Camera, Cartesian3, Color, DistanceDisplayCondition, HeadingPitchRange, + Material, Math as CesiumMath, Matrix4, - Camera, - Material, PolylineCollection, SceneMode, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/PolylineColorAppearanceSpec.js b/packages/engine/Specs/Scene/PolylineColorAppearanceSpec.js index 234a14376505..58e928964df3 100644 --- a/packages/engine/Specs/Scene/PolylineColorAppearanceSpec.js +++ b/packages/engine/Specs/Scene/PolylineColorAppearanceSpec.js @@ -1,12 +1,12 @@ import { + Appearance, ArcType, Cartesian3, Color, ColorGeometryInstanceAttribute, GeometryInstance, - PolylineGeometry, - Appearance, PolylineColorAppearance, + PolylineGeometry, Primitive, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/PolylineMaterialAppearanceSpec.js b/packages/engine/Specs/Scene/PolylineMaterialAppearanceSpec.js index 93200f8cd4cf..17b66af9999c 100644 --- a/packages/engine/Specs/Scene/PolylineMaterialAppearanceSpec.js +++ b/packages/engine/Specs/Scene/PolylineMaterialAppearanceSpec.js @@ -1,10 +1,10 @@ import { + Appearance, ArcType, Cartesian3, GeometryInstance, - PolylineGeometry, - Appearance, Material, + PolylineGeometry, PolylineMaterialAppearance, Primitive, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/PostProcessStageCompositeSpec.js b/packages/engine/Specs/Scene/PostProcessStageCompositeSpec.js index f5df1b810c52..839525046fa2 100644 --- a/packages/engine/Specs/Scene/PostProcessStageCompositeSpec.js +++ b/packages/engine/Specs/Scene/PostProcessStageCompositeSpec.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import { Color, - defined, PostProcessStage, PostProcessStageComposite, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/PostProcessStageLibrarySpec.js b/packages/engine/Specs/Scene/PostProcessStageLibrarySpec.js index 5b6f4d040389..c9cde49962c3 100644 --- a/packages/engine/Specs/Scene/PostProcessStageLibrarySpec.js +++ b/packages/engine/Specs/Scene/PostProcessStageLibrarySpec.js @@ -1,9 +1,9 @@ import { Cartesian3, - HeadingPitchRoll, HeadingPitchRange, - Transforms, + HeadingPitchRoll, PostProcessStageLibrary, + Transforms, } from "../../index.js"; import createCanvas from "../../../../Specs/createCanvas.js"; diff --git a/packages/engine/Specs/Scene/PostProcessStageSpec.js b/packages/engine/Specs/Scene/PostProcessStageSpec.js index 9d18a7d0e214..ae359a18eb9a 100644 --- a/packages/engine/Specs/Scene/PostProcessStageSpec.js +++ b/packages/engine/Specs/Scene/PostProcessStageSpec.js @@ -1,11 +1,11 @@ +import { defined } from "@cesium/utils"; import { BoundingRectangle, Color, - defined, HeadingPitchRange, Math as CesiumMath, - PixelFormat, PixelDatatype, + PixelFormat, PostProcessStage, PostProcessStageSampleMode, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/PrimitiveCollectionSpec.js b/packages/engine/Specs/Scene/PrimitiveCollectionSpec.js index 960d6f908698..a79cf69bb3cd 100644 --- a/packages/engine/Specs/Scene/PrimitiveCollectionSpec.js +++ b/packages/engine/Specs/Scene/PrimitiveCollectionSpec.js @@ -1,14 +1,14 @@ +import { defined } from "@cesium/utils"; import { ColorGeometryInstanceAttribute, - defined, GeometryInstance, - Rectangle, - RectangleGeometry, HorizontalOrigin, LabelCollection, PerInstanceColorAppearance, Primitive, PrimitiveCollection, + Rectangle, + RectangleGeometry, VerticalOrigin, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/PrimitiveCullingSpec.js b/packages/engine/Specs/Scene/PrimitiveCullingSpec.js index db0e4221ee01..79118c8feea4 100644 --- a/packages/engine/Specs/Scene/PrimitiveCullingSpec.js +++ b/packages/engine/Specs/Scene/PrimitiveCullingSpec.js @@ -1,23 +1,23 @@ import { + BillboardCollection, Cartesian3, Color, ColorGeometryInstanceAttribute, GeometryInstance, - Math as CesiumMath, - PerspectiveFrustum, - Rectangle, - RectangleGeometry, - Resource, - Transforms, - BillboardCollection, Globe, HorizontalOrigin, LabelCollection, Material, + Math as CesiumMath, PerInstanceColorAppearance, + PerspectiveFrustum, PolylineCollection, Primitive, + Rectangle, + RectangleGeometry, + Resource, SceneMode, + Transforms, VerticalOrigin, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/PrimitivePipelineSpec.js b/packages/engine/Specs/Scene/PrimitivePipelineSpec.js index 16b4423b747c..7da4ab95ed16 100644 --- a/packages/engine/Specs/Scene/PrimitivePipelineSpec.js +++ b/packages/engine/Specs/Scene/PrimitivePipelineSpec.js @@ -6,8 +6,8 @@ import { Geometry, GeometryAttribute, GeometryAttributes, - PrimitiveType, PrimitivePipeline, + PrimitiveType, } from "../../index.js"; describe( diff --git a/packages/engine/Specs/Scene/PrimitiveSpec.js b/packages/engine/Specs/Scene/PrimitiveSpec.js index 010108e6905d..f2ef514396af 100644 --- a/packages/engine/Specs/Scene/PrimitiveSpec.js +++ b/packages/engine/Specs/Scene/PrimitiveSpec.js @@ -1,11 +1,12 @@ +import { defined } from "@cesium/utils"; import { BoundingSphere, BoxGeometry, + Camera, Cartesian3, ColorGeometryInstanceAttribute, ComponentDatatype, CylinderGeometry, - defined, DistanceDisplayConditionGeometryInstanceAttribute, Ellipsoid, Geometry, @@ -13,20 +14,19 @@ import { GeometryInstance, GeometryInstanceAttribute, HeadingPitchRange, + MaterialAppearance, Math as CesiumMath, Matrix4, + PerInstanceColorAppearance, PerspectiveFrustum, PolygonGeometry, + Primitive, PrimitiveType, Rectangle, RectangleGeometry, + SceneMode, ShowGeometryInstanceAttribute, Transforms, - Camera, - MaterialAppearance, - PerInstanceColorAppearance, - Primitive, - SceneMode, } from "../../index.js"; import BadGeometry from "../../../../Specs/BadGeometry.js"; diff --git a/packages/engine/Specs/Scene/PropertyAttributePropertySpec.js b/packages/engine/Specs/Scene/PropertyAttributePropertySpec.js index 40c0a5e35e25..20d64ce79015 100644 --- a/packages/engine/Specs/Scene/PropertyAttributePropertySpec.js +++ b/packages/engine/Specs/Scene/PropertyAttributePropertySpec.js @@ -1,8 +1,8 @@ import { Cartesian2, - PropertyAttributeProperty, Matrix2, MetadataClassProperty, + PropertyAttributeProperty, } from "../../index.js"; describe("Scene/PropertyAttributeProperty", function () { diff --git a/packages/engine/Specs/Scene/PropertyAttributeSpec.js b/packages/engine/Specs/Scene/PropertyAttributeSpec.js index d397f452d9b6..8dfae485bca5 100644 --- a/packages/engine/Specs/Scene/PropertyAttributeSpec.js +++ b/packages/engine/Specs/Scene/PropertyAttributeSpec.js @@ -1,4 +1,4 @@ -import { PropertyAttribute, MetadataClass } from "../../index.js"; +import { MetadataClass, PropertyAttribute } from "../../index.js"; describe("Scene/PropertyAttribute", function () { let classDefinition; diff --git a/packages/engine/Specs/Scene/PropertyTableSpec.js b/packages/engine/Specs/Scene/PropertyTableSpec.js index dbad6bc989a9..909815971a86 100644 --- a/packages/engine/Specs/Scene/PropertyTableSpec.js +++ b/packages/engine/Specs/Scene/PropertyTableSpec.js @@ -1,11 +1,11 @@ +import MetadataTester from "../../../../Specs/MetadataTester.js"; import { BatchTableHierarchy, - PropertyTable, + JsonMetadataTable, MetadataSchema, MetadataTable, - JsonMetadataTable, + PropertyTable, } from "../../index.js"; -import MetadataTester from "../../../../Specs/MetadataTester.js"; describe("Scene/PropertyTable", function () { if (!MetadataTester.isSupported()) { diff --git a/packages/engine/Specs/Scene/PropertyTexturePropertySpec.js b/packages/engine/Specs/Scene/PropertyTexturePropertySpec.js index 0bdb4bc5bea5..9bc14ea9f4d9 100644 --- a/packages/engine/Specs/Scene/PropertyTexturePropertySpec.js +++ b/packages/engine/Specs/Scene/PropertyTexturePropertySpec.js @@ -1,12 +1,12 @@ +import createContext from "../../../../Specs/createContext.js"; import { - PropertyTextureProperty, Matrix3, MetadataClassProperty, PixelDatatype, PixelFormat, + PropertyTextureProperty, Texture, } from "../../index.js"; -import createContext from "../../../../Specs/createContext.js"; describe( "Scene/PropertyTextureProperty", diff --git a/packages/engine/Specs/Scene/PropertyTextureSpec.js b/packages/engine/Specs/Scene/PropertyTextureSpec.js index bbcbeca060da..61191a23879b 100644 --- a/packages/engine/Specs/Scene/PropertyTextureSpec.js +++ b/packages/engine/Specs/Scene/PropertyTextureSpec.js @@ -1,11 +1,11 @@ +import createContext from "../../../../Specs/createContext.js"; import { - PropertyTexture, MetadataClass, PixelDatatype, PixelFormat, + PropertyTexture, Texture, } from "../../index.js"; -import createContext from "../../../../Specs/createContext.js"; describe( "Scene/PropertyTexture", diff --git a/packages/engine/Specs/Scene/QuadtreePrimitiveSpec.js b/packages/engine/Specs/Scene/QuadtreePrimitiveSpec.js index 9dd4e5336c54..3dbc342472d7 100644 --- a/packages/engine/Specs/Scene/QuadtreePrimitiveSpec.js +++ b/packages/engine/Specs/Scene/QuadtreePrimitiveSpec.js @@ -1,25 +1,25 @@ +import { defined } from "@cesium/utils"; +import MockTerrainProvider from "../../../../Specs/MockTerrainProvider.js"; +import TerrainTileProcessor from "../../../../Specs/TerrainTileProcessor.js"; import { + Camera, Cartesian3, Cartographic, - defined, Ellipsoid, EventHelper, GeographicProjection, GeographicTilingScheme, - Intersect, - Math as CesiumMath, - Rectangle, - Visibility, - Camera, GlobeSurfaceTileProvider, GlobeTranslucencyState, ImageryLayerCollection, + Intersect, + Math as CesiumMath, QuadtreePrimitive, QuadtreeTileLoadState, + Rectangle, SceneMode, + Visibility, } from "../../index.js"; -import MockTerrainProvider from "../../../../Specs/MockTerrainProvider.js"; -import TerrainTileProcessor from "../../../../Specs/TerrainTileProcessor.js"; import createScene from "../../../../Specs/createScene.js"; import pollToPromise from "../../../../Specs/pollToPromise.js"; diff --git a/packages/engine/Specs/Scene/QuadtreeTileSpec.js b/packages/engine/Specs/Scene/QuadtreeTileSpec.js index 71c1f6949508..746cc35de2ad 100644 --- a/packages/engine/Specs/Scene/QuadtreeTileSpec.js +++ b/packages/engine/Specs/Scene/QuadtreeTileSpec.js @@ -2,10 +2,10 @@ import { Cartesian3, Cartographic, GeographicTilingScheme, - Rectangle, Math as CesiumMath, - WebMercatorTilingScheme, QuadtreeTile, + Rectangle, + WebMercatorTilingScheme, } from "../../index.js"; describe("Scene/QuadtreeTile", function () { diff --git a/packages/engine/Specs/Scene/ResourceCacheSpec.js b/packages/engine/Specs/Scene/ResourceCacheSpec.js index 28ca0b2336b1..8cb03967204c 100644 --- a/packages/engine/Specs/Scene/ResourceCacheSpec.js +++ b/packages/engine/Specs/Scene/ResourceCacheSpec.js @@ -1,3 +1,5 @@ +import concatTypedArrays from "../../../../Specs/concatTypedArrays.js"; +import createScene from "../../../../Specs/createScene.js"; import { BufferLoader, GltfBufferViewLoader, @@ -13,8 +15,6 @@ import { ResourceCacheKey, SupportedImageFormats, } from "../../index.js"; -import concatTypedArrays from "../../../../Specs/concatTypedArrays.js"; -import createScene from "../../../../Specs/createScene.js"; describe("ResourceCache", function () { const schemaResource = new Resource({ diff --git a/packages/engine/Specs/Scene/SceneSpec.js b/packages/engine/Specs/Scene/SceneSpec.js index 38fb67b1e592..9ef50b8831ad 100644 --- a/packages/engine/Specs/Scene/SceneSpec.js +++ b/packages/engine/Specs/Scene/SceneSpec.js @@ -1,60 +1,59 @@ +import { defined, RuntimeError } from "@cesium/utils"; import { Atmosphere, BoundingSphere, + Camera, Cartesian2, Cartesian3, CesiumTerrainProvider, Color, - defined, + ColorGeometryInstanceAttribute, + DirectionalLight, + DrawCommand, Ellipsoid, + EllipsoidSurfaceAppearance, + Framebuffer, + FrameState, GeographicProjection, GeometryInstance, + Globe, + GroundPrimitive, HeadingPitchRoll, + HeightReference, JulianDate, + Material, Math as CesiumMath, - PixelFormat, - Rectangle, - RectangleGeometry, - RequestScheduler, - RuntimeError, - TaskProcessor, - WebGLConstants, - WebMercatorProjection, - DrawCommand, - Framebuffer, Pass, + PerInstanceColorAppearance, PixelDatatype, - RenderState, - ShaderProgram, - ShaderSource, - Texture, - Camera, - DirectionalLight, - EllipsoidSurfaceAppearance, - FrameState, - Globe, - Material, + PixelFormat, Primitive, PrimitiveCollection, + Rectangle, + RectangleGeometry, + RenderState, + RequestScheduler, + Resource, Scene, SceneTransforms, ScreenSpaceCameraController, - SunLight, - TweenCollection, + ShaderProgram, + ShaderSource, Sun, + SunLight, + TaskProcessor, Terrain, - GroundPrimitive, - PerInstanceColorAppearance, - ColorGeometryInstanceAttribute, - Resource, - HeightReference, + Texture, + TweenCollection, + WebGLConstants, + WebMercatorProjection, } from "../../index.js"; +import { Cartesian4, Model } from "@cesium/engine"; import createCanvas from "../../../../Specs/createCanvas.js"; import createScene from "../../../../Specs/createScene.js"; import pollToPromise from "../../../../Specs/pollToPromise.js"; import render from "../../../../Specs/render.js"; -import { Cartesian4, Model } from "@cesium/engine"; // The size of the property texture const textureSizeX = 16; diff --git a/packages/engine/Specs/Scene/SceneTransformsSpec.js b/packages/engine/Specs/Scene/SceneTransformsSpec.js index a9a09c190ec5..878e541f2fcd 100644 --- a/packages/engine/Specs/Scene/SceneTransformsSpec.js +++ b/packages/engine/Specs/Scene/SceneTransformsSpec.js @@ -1,11 +1,11 @@ import { + Camera, Cartesian2, Cartesian3, Ellipsoid, Math as CesiumMath, OrthographicFrustum, Rectangle, - Camera, SceneMode, SceneTransforms, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/ScreenSpaceCameraControllerSpec.js b/packages/engine/Specs/Scene/ScreenSpaceCameraControllerSpec.js index 76c13135e46a..7bb9e7ae5980 100644 --- a/packages/engine/Specs/Scene/ScreenSpaceCameraControllerSpec.js +++ b/packages/engine/Specs/Scene/ScreenSpaceCameraControllerSpec.js @@ -1,22 +1,22 @@ +import { FeatureDetection } from "@cesium/utils"; import { + Camera, + CameraEventType, Cartesian2, Cartesian3, combine, Ellipsoid, - FeatureDetection, GeographicProjection, IntersectionTests, KeyboardEventModifier, + MapMode2D, Math as CesiumMath, OrthographicFrustum, OrthographicOffCenterFrustum, Ray, - Transforms, - Camera, - CameraEventType, - MapMode2D, SceneMode, ScreenSpaceCameraController, + Transforms, } from "../../index.js"; import createCamera from "../../../../Specs/createCamera.js"; diff --git a/packages/engine/Specs/Scene/ShadowMapSpec.js b/packages/engine/Specs/Scene/ShadowMapSpec.js index 1b142d13152b..be8409796e7f 100644 --- a/packages/engine/Specs/Scene/ShadowMapSpec.js +++ b/packages/engine/Specs/Scene/ShadowMapSpec.js @@ -1,35 +1,35 @@ +import { defined } from "@cesium/utils"; import { BoundingSphere, BoxGeometry, + Camera, Cartesian3, Color, ColorGeometryInstanceAttribute, ComponentDatatype, - defined, + Context, + DirectionalLight, EllipsoidTerrainProvider, + Framebuffer, GeometryInstance, + Globe, HeadingPitchRange, HeadingPitchRoll, HeightmapTerrainData, JulianDate, Math as CesiumMath, Matrix4, - OrthographicOffCenterFrustum, - PixelFormat, - Transforms, - WebGLConstants, - Context, - Framebuffer, - PixelDatatype, - Texture, - Camera, - DirectionalLight, - Globe, Model, + OrthographicOffCenterFrustum, PerInstanceColorAppearance, + PixelDatatype, + PixelFormat, Primitive, ShadowMap, ShadowMode, + Texture, + Transforms, + WebGLConstants, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/ShadowVolumeAppearanceSpec.js b/packages/engine/Specs/Scene/ShadowVolumeAppearanceSpec.js index 060940e59475..382b48351157 100644 --- a/packages/engine/Specs/Scene/ShadowVolumeAppearanceSpec.js +++ b/packages/engine/Specs/Scene/ShadowVolumeAppearanceSpec.js @@ -4,15 +4,15 @@ import { ComponentDatatype, Ellipsoid, EncodedCartesian3, + Material, + MaterialAppearance, Math as CesiumMath, Matrix4, + PerInstanceColorAppearance, Rectangle, + ShadowVolumeAppearance, Transforms, WebMercatorProjection, - Material, - MaterialAppearance, - PerInstanceColorAppearance, - ShadowVolumeAppearance, } from "../../index.js"; describe("Scene/ShadowVolumeAppearance", function () { diff --git a/packages/engine/Specs/Scene/SingleTileImageryProviderSpec.js b/packages/engine/Specs/Scene/SingleTileImageryProviderSpec.js index f1cc95c6848f..16b044b1b2b2 100644 --- a/packages/engine/Specs/Scene/SingleTileImageryProviderSpec.js +++ b/packages/engine/Specs/Scene/SingleTileImageryProviderSpec.js @@ -1,14 +1,14 @@ +import { RuntimeError } from "@cesium/utils"; import { Ellipsoid, GeographicTilingScheme, - Rectangle, - Request, - Resource, - RuntimeError, Imagery, ImageryLayer, ImageryProvider, ImageryState, + Rectangle, + Request, + Resource, SingleTileImageryProvider, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/SkyBoxSpec.js b/packages/engine/Specs/Scene/SkyBoxSpec.js index 9691fb035594..5c384c1cacc0 100644 --- a/packages/engine/Specs/Scene/SkyBoxSpec.js +++ b/packages/engine/Specs/Scene/SkyBoxSpec.js @@ -1,4 +1,5 @@ -import { defined, Resource, SceneMode, SkyBox } from "../../index.js"; +import { defined } from "@cesium/utils"; +import { Resource, SceneMode, SkyBox } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; import pollToPromise from "../../../../Specs/pollToPromise.js"; diff --git a/packages/engine/Specs/Scene/SpecularEnvironmentCubeMapSpec.js b/packages/engine/Specs/Scene/SpecularEnvironmentCubeMapSpec.js index e264444a9fd0..7d35254e0d19 100644 --- a/packages/engine/Specs/Scene/SpecularEnvironmentCubeMapSpec.js +++ b/packages/engine/Specs/Scene/SpecularEnvironmentCubeMapSpec.js @@ -1,6 +1,6 @@ +import { defined } from "@cesium/utils"; import { Cartesian3, - defined, ComputeEngine, Pass, SpecularEnvironmentCubeMap, diff --git a/packages/engine/Specs/Scene/StructuralMetadataSpec.js b/packages/engine/Specs/Scene/StructuralMetadataSpec.js index d1853327fa84..b1bee4e7a646 100644 --- a/packages/engine/Specs/Scene/StructuralMetadataSpec.js +++ b/packages/engine/Specs/Scene/StructuralMetadataSpec.js @@ -1,7 +1,7 @@ import { - StructuralMetadata, MetadataSchema, PropertyAttribute, + StructuralMetadata, } from "../../index.js"; describe("Scene/StructuralMetadata", function () { diff --git a/packages/engine/Specs/Scene/TerrainFillMeshSpec.js b/packages/engine/Specs/Scene/TerrainFillMeshSpec.js index 9726006d3c12..7802335b07d1 100644 --- a/packages/engine/Specs/Scene/TerrainFillMeshSpec.js +++ b/packages/engine/Specs/Scene/TerrainFillMeshSpec.js @@ -1,21 +1,21 @@ +import MockTerrainProvider from "../../../../Specs/MockTerrainProvider.js"; +import TerrainTileProcessor from "../../../../Specs/TerrainTileProcessor.js"; import { + Camera, Cartesian2, Cartesian3, GeographicProjection, + GlobeSurfaceTileProvider, HeightmapTerrainData, + ImageryLayerCollection, Intersect, Math as CesiumMath, - Camera, - GlobeSurfaceTileProvider, - ImageryLayerCollection, QuadtreePrimitive, SceneMode, TerrainFillMesh, TileBoundingRegion, TileSelectionResult, } from "../../index.js"; -import MockTerrainProvider from "../../../../Specs/MockTerrainProvider.js"; -import TerrainTileProcessor from "../../../../Specs/TerrainTileProcessor.js"; describe("Scene/TerrainFillMesh", function () { let processor; diff --git a/packages/engine/Specs/Scene/TerrainSpec.js b/packages/engine/Specs/Scene/TerrainSpec.js index 35dfa3a690d9..f2e9748b05e9 100644 --- a/packages/engine/Specs/Scene/TerrainSpec.js +++ b/packages/engine/Specs/Scene/TerrainSpec.js @@ -1,4 +1,4 @@ -import { Terrain, EllipsoidTerrainProvider } from "../../index.js"; +import { EllipsoidTerrainProvider, Terrain } from "../../index.js"; describe("Scene/Terrain", function () { it("constructor throws without terrain promise", function () { diff --git a/packages/engine/Specs/Scene/TileCoordinatesImageryProviderSpec.js b/packages/engine/Specs/Scene/TileCoordinatesImageryProviderSpec.js index 60e793aa9990..5fd61105600f 100644 --- a/packages/engine/Specs/Scene/TileCoordinatesImageryProviderSpec.js +++ b/packages/engine/Specs/Scene/TileCoordinatesImageryProviderSpec.js @@ -1,9 +1,9 @@ import { Ellipsoid, GeographicTilingScheme, - WebMercatorTilingScheme, ImageryProvider, TileCoordinatesImageryProvider, + WebMercatorTilingScheme, } from "../../index.js"; describe("Scene/TileCoordinatesImageryProvider", function () { diff --git a/packages/engine/Specs/Scene/TileMapServiceImageryProviderSpec.js b/packages/engine/Specs/Scene/TileMapServiceImageryProviderSpec.js index 38e3604edc72..c67194975e39 100644 --- a/packages/engine/Specs/Scene/TileMapServiceImageryProviderSpec.js +++ b/packages/engine/Specs/Scene/TileMapServiceImageryProviderSpec.js @@ -1,23 +1,23 @@ +import { RuntimeError } from "@cesium/utils"; import { Cartesian2, Cartographic, GeographicProjection, GeographicTilingScheme, getAbsoluteUri, + Imagery, + ImageryLayer, + ImageryState, Math as CesiumMath, Rectangle, Request, RequestErrorEvent, RequestScheduler, Resource, - RuntimeError, - WebMercatorProjection, - WebMercatorTilingScheme, TileMapServiceImageryProvider, - Imagery, - ImageryLayer, - ImageryState, UrlTemplateImageryProvider, + WebMercatorProjection, + WebMercatorTilingScheme, } from "../../index.js"; import pollToPromise from "../../../../Specs/pollToPromise.js"; diff --git a/packages/engine/Specs/Scene/TileReplacementQueueSpec.js b/packages/engine/Specs/Scene/TileReplacementQueueSpec.js index d0a372639a02..78441d7699a1 100644 --- a/packages/engine/Specs/Scene/TileReplacementQueueSpec.js +++ b/packages/engine/Specs/Scene/TileReplacementQueueSpec.js @@ -1,5 +1,5 @@ +import { defined } from "@cesium/utils"; import { - defined, GeographicTilingScheme, QuadtreeTile, QuadtreeTileLoadState, diff --git a/packages/engine/Specs/Scene/Tileset3DTileContentSpec.js b/packages/engine/Specs/Scene/Tileset3DTileContentSpec.js index 4f3ac5e47abe..0c67c71434a0 100644 --- a/packages/engine/Specs/Scene/Tileset3DTileContentSpec.js +++ b/packages/engine/Specs/Scene/Tileset3DTileContentSpec.js @@ -1,13 +1,13 @@ +import Cesium3DTilesTester from "../../../../Specs/Cesium3DTilesTester.js"; +import createScene from "../../../../Specs/createScene.js"; import { Cartesian3, Cesium3DContentGroup, - HeadingPitchRange, - MetadataClass, ContentMetadata, GroupMetadata, + HeadingPitchRange, + MetadataClass, } from "../../index.js"; -import Cesium3DTilesTester from "../../../../Specs/Cesium3DTilesTester.js"; -import createScene from "../../../../Specs/createScene.js"; describe( "Scene/Tileset3DTileContent", diff --git a/packages/engine/Specs/Scene/TimeDynamicImagerySpec.js b/packages/engine/Specs/Scene/TimeDynamicImagerySpec.js index 96697a41448e..f7b42a9c3ef2 100644 --- a/packages/engine/Specs/Scene/TimeDynamicImagerySpec.js +++ b/packages/engine/Specs/Scene/TimeDynamicImagerySpec.js @@ -5,8 +5,8 @@ import { Request, RequestScheduler, RequestType, - TimeIntervalCollection, TimeDynamicImagery, + TimeIntervalCollection, } from "../../index.js"; describe("Scene/TimeDynamicImagery", function () { diff --git a/packages/engine/Specs/Scene/TimeDynamicPointCloudSpec.js b/packages/engine/Specs/Scene/TimeDynamicPointCloudSpec.js index 0daeb2b35ff5..555a099fc644 100644 --- a/packages/engine/Specs/Scene/TimeDynamicPointCloudSpec.js +++ b/packages/engine/Specs/Scene/TimeDynamicPointCloudSpec.js @@ -1,23 +1,23 @@ +import { defined } from "@cesium/utils"; import { BoundingSphere, Cartesian3, + Cesium3DTileStyle, + ClippingPlane, + ClippingPlaneCollection, Clock, ClockStep, - defined, + DracoLoader, HeadingPitchRange, HeadingPitchRoll, JulianDate, Matrix4, - Resource, - TimeIntervalCollection, - Transforms, - Cesium3DTileStyle, - ClippingPlane, - ClippingPlaneCollection, - DracoLoader, PointCloudEyeDomeLighting, + Resource, ShadowMode, TimeDynamicPointCloud, + TimeIntervalCollection, + Transforms, } from "../../index.js"; import createCanvas from "../../../../Specs/createCanvas.js"; diff --git a/packages/engine/Specs/Scene/TranslucentTileClassificationSpec.js b/packages/engine/Specs/Scene/TranslucentTileClassificationSpec.js index 410234e577c4..de75c62c1c3a 100644 --- a/packages/engine/Specs/Scene/TranslucentTileClassificationSpec.js +++ b/packages/engine/Specs/Scene/TranslucentTileClassificationSpec.js @@ -1,28 +1,28 @@ +import { defined } from "@cesium/utils"; import { - TranslucentTileClassification, ApproximateTerrainHeights, Cartesian3, + ClassificationType, + ClearCommand, Color, ColorGeometryInstanceAttribute, - defined, destroyObject, Ellipsoid, + Framebuffer, GeometryInstance, GroundPolylineGeometry, + GroundPolylinePrimitive, + Pass, + PerInstanceColorAppearance, + PixelDatatype, PixelFormat, + Primitive, Rectangle, RectangleGeometry, - ClearCommand, - Framebuffer, - Pass, - PixelDatatype, RenderState, - Texture, - ClassificationType, - GroundPolylinePrimitive, - PerInstanceColorAppearance, - Primitive, StencilConstants, + Texture, + TranslucentTileClassification, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/UrlTemplateImageryProviderSpec.js b/packages/engine/Specs/Scene/UrlTemplateImageryProviderSpec.js index 1e52aa3b70ef..156417abe80f 100644 --- a/packages/engine/Specs/Scene/UrlTemplateImageryProviderSpec.js +++ b/packages/engine/Specs/Scene/UrlTemplateImageryProviderSpec.js @@ -1,19 +1,19 @@ import { Ellipsoid, GeographicTilingScheme, + GetFeatureInfoFormat, + Imagery, + ImageryLayer, + ImageryProvider, + ImageryState, Math as CesiumMath, Rectangle, Request, RequestScheduler, Resource, + UrlTemplateImageryProvider, WebMercatorProjection, WebMercatorTilingScheme, - GetFeatureInfoFormat, - Imagery, - ImageryLayer, - ImageryProvider, - ImageryState, - UrlTemplateImageryProvider, } from "../../index.js"; import pollToPromise from "../../../../Specs/pollToPromise.js"; diff --git a/packages/engine/Specs/Scene/Vector3DTileClampedPolylinesSpec.js b/packages/engine/Specs/Scene/Vector3DTileClampedPolylinesSpec.js index c5e071e372d2..f135730bb6d4 100644 --- a/packages/engine/Specs/Scene/Vector3DTileClampedPolylinesSpec.js +++ b/packages/engine/Specs/Scene/Vector3DTileClampedPolylinesSpec.js @@ -6,11 +6,11 @@ import { destroyObject, Ellipsoid, GeometryInstance, - Rectangle, - RectangleGeometry, Pass, PerInstanceColorAppearance, Primitive, + Rectangle, + RectangleGeometry, Vector3DTileClampedPolylines, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/Vector3DTileContentSpec.js b/packages/engine/Specs/Scene/Vector3DTileContentSpec.js index 43710059310b..1c3de11d3e89 100644 --- a/packages/engine/Specs/Scene/Vector3DTileContentSpec.js +++ b/packages/engine/Specs/Scene/Vector3DTileContentSpec.js @@ -1,5 +1,6 @@ -import createScene from "../../../../Specs/createScene.js"; +import { RuntimeError } from "@cesium/utils"; import Cesium3DTilesTester from "../../../../Specs/Cesium3DTilesTester.js"; +import createScene from "../../../../Specs/createScene.js"; import { Cartesian3, Cesium3DTileFeature, @@ -19,7 +20,6 @@ import { Rectangle, RectangleGeometry, RenderState, - RuntimeError, StencilConstants, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/Vector3DTileGeometrySpec.js b/packages/engine/Specs/Scene/Vector3DTileGeometrySpec.js index bce78da0c63f..24e67bd3f021 100644 --- a/packages/engine/Specs/Scene/Vector3DTileGeometrySpec.js +++ b/packages/engine/Specs/Scene/Vector3DTileGeometrySpec.js @@ -1,30 +1,30 @@ import { BoundingSphere, Cartesian3, + Cesium3DTileBatchTable, + ClassificationType, Color, + ColorBlendMode, ColorGeometryInstanceAttribute, combine, destroyObject, Ellipsoid, GeometryInstance, Matrix4, - Rectangle, - RectangleGeometry, - Transforms, Pass, - RenderState, - Cesium3DTileBatchTable, - ClassificationType, - ColorBlendMode, PerInstanceColorAppearance, Primitive, + Rectangle, + RectangleGeometry, + RenderState, StencilConstants, + Transforms, Vector3DTileGeometry, } from "../../index.js"; -import createWebglVersionHelper from "../createWebglVersionHelper.js"; import createScene from "../../../../Specs/createScene.js"; import pollToPromise from "../../../../Specs/pollToPromise.js"; +import createWebglVersionHelper from "../createWebglVersionHelper.js"; describe( "Scene/Vector3DTileGeometry", diff --git a/packages/engine/Specs/Scene/Vector3DTilePointsSpec.js b/packages/engine/Specs/Scene/Vector3DTilePointsSpec.js index b171cc95684b..33bf26b2c6d9 100644 --- a/packages/engine/Specs/Scene/Vector3DTilePointsSpec.js +++ b/packages/engine/Specs/Scene/Vector3DTilePointsSpec.js @@ -1,21 +1,21 @@ +import { defined } from "@cesium/utils"; import { Cartesian2, Cartesian3, Cartesian4, Cartographic, + Cesium3DTileBatchTable, + Cesium3DTileStyle, clone, Color, - defined, + ColorBlendMode, DistanceDisplayCondition, Ellipsoid, + HorizontalOrigin, + LabelStyle, Math as CesiumMath, NearFarScalar, Rectangle, - Cesium3DTileBatchTable, - Cesium3DTileStyle, - ColorBlendMode, - HorizontalOrigin, - LabelStyle, Vector3DTilePoints, VerticalOrigin, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/Vector3DTilePolygonsSpec.js b/packages/engine/Specs/Scene/Vector3DTilePolygonsSpec.js index 784e3f383c5e..e1aa6fbe72bb 100644 --- a/packages/engine/Specs/Scene/Vector3DTilePolygonsSpec.js +++ b/packages/engine/Specs/Scene/Vector3DTilePolygonsSpec.js @@ -1,21 +1,21 @@ import { BoundingSphere, + Cesium3DTileBatchTable, + ClassificationType, Color, + ColorBlendMode, ColorGeometryInstanceAttribute, combine, destroyObject, Ellipsoid, GeometryInstance, Math as CesiumMath, - Rectangle, - RectangleGeometry, Pass, - RenderState, - Cesium3DTileBatchTable, - ClassificationType, - ColorBlendMode, PerInstanceColorAppearance, Primitive, + Rectangle, + RectangleGeometry, + RenderState, StencilConstants, Vector3DTilePolygons, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/Vector3DTilePolylinesSpec.js b/packages/engine/Specs/Scene/Vector3DTilePolylinesSpec.js index 7626e6cc86d2..28e80f5c11fd 100644 --- a/packages/engine/Specs/Scene/Vector3DTilePolylinesSpec.js +++ b/packages/engine/Specs/Scene/Vector3DTilePolylinesSpec.js @@ -2,11 +2,11 @@ import { BoundingSphere, Cartesian3, Cartographic, + Cesium3DTileBatchTable, + ColorBlendMode, Ellipsoid, Math as CesiumMath, Rectangle, - Cesium3DTileBatchTable, - ColorBlendMode, Vector3DTilePolylines, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/ViewportQuadSpec.js b/packages/engine/Specs/Scene/ViewportQuadSpec.js index c4ed9d8d417c..04161ed39dea 100644 --- a/packages/engine/Specs/Scene/ViewportQuadSpec.js +++ b/packages/engine/Specs/Scene/ViewportQuadSpec.js @@ -1,9 +1,9 @@ import { BoundingRectangle, Color, + Material, Resource, Texture, - Material, ViewportQuad, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/VoxelBoxShapeSpec.js b/packages/engine/Specs/Scene/VoxelBoxShapeSpec.js index fb52f06ddd46..f4d08c8bede3 100644 --- a/packages/engine/Specs/Scene/VoxelBoxShapeSpec.js +++ b/packages/engine/Specs/Scene/VoxelBoxShapeSpec.js @@ -7,8 +7,8 @@ import { OrientedBoundingBox, Quaternion, SpatialNode, - VoxelShape, VoxelBoxShape, + VoxelShape, } from "../../index.js"; describe("Scene/VoxelBoxShape", function () { diff --git a/packages/engine/Specs/Scene/VoxelCellSpec.js b/packages/engine/Specs/Scene/VoxelCellSpec.js index a18af60b5e2f..267a77757184 100644 --- a/packages/engine/Specs/Scene/VoxelCellSpec.js +++ b/packages/engine/Specs/Scene/VoxelCellSpec.js @@ -4,8 +4,8 @@ import { Math as CesiumMath, Matrix3, OrientedBoundingBox, - VoxelPrimitive, VoxelCell, + VoxelPrimitive, } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/engine/Specs/Scene/VoxelCylinderShapeSpec.js b/packages/engine/Specs/Scene/VoxelCylinderShapeSpec.js index 0e980ad9a2b8..77b5262db175 100644 --- a/packages/engine/Specs/Scene/VoxelCylinderShapeSpec.js +++ b/packages/engine/Specs/Scene/VoxelCylinderShapeSpec.js @@ -7,8 +7,8 @@ import { OrientedBoundingBox, Quaternion, SpatialNode, - VoxelShape, VoxelCylinderShape, + VoxelShape, } from "../../index.js"; describe("Scene/VoxelCylinderShape", function () { diff --git a/packages/engine/Specs/Scene/VoxelEllipsoidShapeSpec.js b/packages/engine/Specs/Scene/VoxelEllipsoidShapeSpec.js index bfd80ac66e58..9bc57ac7a0b4 100644 --- a/packages/engine/Specs/Scene/VoxelEllipsoidShapeSpec.js +++ b/packages/engine/Specs/Scene/VoxelEllipsoidShapeSpec.js @@ -2,13 +2,13 @@ import { BoundingSphere, Cartesian3, Math as CesiumMath, - OrientedBoundingBox, Matrix3, Matrix4, + OrientedBoundingBox, Quaternion, SpatialNode, - VoxelShape, VoxelEllipsoidShape, + VoxelShape, } from "../../index.js"; describe("Scene/VoxelEllipsoidShape", function () { diff --git a/packages/engine/Specs/Scene/VoxelPrimitiveSpec.js b/packages/engine/Specs/Scene/VoxelPrimitiveSpec.js index 453a8a9ac3c7..01fa2b3cd5eb 100644 --- a/packages/engine/Specs/Scene/VoxelPrimitiveSpec.js +++ b/packages/engine/Specs/Scene/VoxelPrimitiveSpec.js @@ -1,3 +1,5 @@ +import createScene from "../../../../Specs/createScene.js"; +import pollToPromise from "../../../../Specs/pollToPromise.js"; import { Cartesian3, Cesium3DTilesVoxelProvider, @@ -5,8 +7,6 @@ import { Matrix4, VoxelPrimitive, } from "../../index.js"; -import createScene from "../../../../Specs/createScene.js"; -import pollToPromise from "../../../../Specs/pollToPromise.js"; describe( "Scene/VoxelPrimitive", diff --git a/packages/engine/Specs/Scene/VoxelRenderResourcesSpec.js b/packages/engine/Specs/Scene/VoxelRenderResourcesSpec.js index 4c5a3ff12d43..19b3a0760684 100644 --- a/packages/engine/Specs/Scene/VoxelRenderResourcesSpec.js +++ b/packages/engine/Specs/Scene/VoxelRenderResourcesSpec.js @@ -1,5 +1,5 @@ -import { VoxelPrimitive, VoxelRenderResources } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; +import { VoxelPrimitive, VoxelRenderResources } from "../../index.js"; describe("Scene/VoxelRenderResources", function () { let scene; diff --git a/packages/engine/Specs/Scene/VoxelTraversalSpec.js b/packages/engine/Specs/Scene/VoxelTraversalSpec.js index d57ceb2ff9bc..d4f83b268f4f 100644 --- a/packages/engine/Specs/Scene/VoxelTraversalSpec.js +++ b/packages/engine/Specs/Scene/VoxelTraversalSpec.js @@ -1,3 +1,5 @@ +import createScene from "../../../../Specs/createScene.js"; +import pollToPromise from "../../../../Specs/pollToPromise.js"; import { Cartesian3, Cesium3DTilesVoxelProvider, @@ -8,11 +10,9 @@ import { MetadataType, OrientedBoundingBox, VoxelEllipsoidShape, - VoxelTraversal, VoxelPrimitive, + VoxelTraversal, } from "../../index.js"; -import createScene from "../../../../Specs/createScene.js"; -import pollToPromise from "../../../../Specs/pollToPromise.js"; const towardPrimitive = Cartesian3.fromElements(1.0, 1.0, 1.0); diff --git a/packages/engine/Specs/Scene/buildVoxelDrawCommandsSpec.js b/packages/engine/Specs/Scene/buildVoxelDrawCommandsSpec.js index d1aea9c50b59..52871230cf79 100644 --- a/packages/engine/Specs/Scene/buildVoxelDrawCommandsSpec.js +++ b/packages/engine/Specs/Scene/buildVoxelDrawCommandsSpec.js @@ -1,12 +1,12 @@ +import createScene from "../../../../Specs/createScene.js"; import { + buildVoxelDrawCommands, Cartesian3, Cesium3DTilesVoxelProvider, ClippingPlane, ClippingPlaneCollection, VoxelPrimitive, - buildVoxelDrawCommands, } from "../../index.js"; -import createScene from "../../../../Specs/createScene.js"; describe("Scene/buildVoxelDrawCommands", function () { let scene; diff --git a/packages/engine/Specs/Scene/computeFlyToLocationForRectangleSpec.js b/packages/engine/Specs/Scene/computeFlyToLocationForRectangleSpec.js index 0786e1f6b4f9..db1d510110d3 100644 --- a/packages/engine/Specs/Scene/computeFlyToLocationForRectangleSpec.js +++ b/packages/engine/Specs/Scene/computeFlyToLocationForRectangleSpec.js @@ -1,7 +1,7 @@ import { - Rectangle, computeFlyToLocationForRectangle, Globe, + Rectangle, SceneMode, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/createTangentSpaceDebugPrimitiveSpec.js b/packages/engine/Specs/Scene/createTangentSpaceDebugPrimitiveSpec.js index 95373c5a6aa5..af6119d288f8 100644 --- a/packages/engine/Specs/Scene/createTangentSpaceDebugPrimitiveSpec.js +++ b/packages/engine/Specs/Scene/createTangentSpaceDebugPrimitiveSpec.js @@ -1,10 +1,10 @@ import { Cartesian3, + createTangentSpaceDebugPrimitive, EllipsoidGeometry, Matrix4, PrimitiveType, VertexFormat, - createTangentSpaceDebugPrimitive, } from "../../index.js"; describe("Scene/createTangentSpaceDebugPrimitive", function () { diff --git a/packages/engine/Specs/Scene/createWorldImageryAsyncSpec.js b/packages/engine/Specs/Scene/createWorldImageryAsyncSpec.js index 83698881426f..0ee1fad37a88 100644 --- a/packages/engine/Specs/Scene/createWorldImageryAsyncSpec.js +++ b/packages/engine/Specs/Scene/createWorldImageryAsyncSpec.js @@ -1,6 +1,6 @@ import { - createWorldImageryAsync, BingMapsStyle, + createWorldImageryAsync, IonImageryProvider, Resource, } from "../../index.js"; diff --git a/packages/engine/Specs/Scene/findGroupMetadataSpec.js b/packages/engine/Specs/Scene/findGroupMetadataSpec.js index eeaf5cbe13b5..1a89f7a69a75 100644 --- a/packages/engine/Specs/Scene/findGroupMetadataSpec.js +++ b/packages/engine/Specs/Scene/findGroupMetadataSpec.js @@ -1,7 +1,7 @@ import { findGroupMetadata, - MetadataClass, GroupMetadata, + MetadataClass, } from "../../index.js"; describe("Scene/findGroupMetadata", function () { diff --git a/packages/engine/Specs/Scene/parseBatchTableSpec.js b/packages/engine/Specs/Scene/parseBatchTableSpec.js index df0e4d0c3502..371b3ba90dac 100644 --- a/packages/engine/Specs/Scene/parseBatchTableSpec.js +++ b/packages/engine/Specs/Scene/parseBatchTableSpec.js @@ -1,13 +1,13 @@ +import { RuntimeError } from "@cesium/utils"; import { Cartesian2, Cartesian3, Cartesian4, ComponentDatatype, - parseBatchTable, MetadataClass, MetadataComponentType, MetadataType, - RuntimeError, + parseBatchTable, } from "../../index.js"; describe("Scene/parseBatchTable", function () { diff --git a/packages/engine/Specs/Scene/parseFeatureMetadataLegacySpec.js b/packages/engine/Specs/Scene/parseFeatureMetadataLegacySpec.js index e0cfb1881cc0..c147806119ac 100644 --- a/packages/engine/Specs/Scene/parseFeatureMetadataLegacySpec.js +++ b/packages/engine/Specs/Scene/parseFeatureMetadataLegacySpec.js @@ -1,3 +1,5 @@ +import createContext from "../../../../Specs/createContext.js"; +import MetadataTester from "../../../../Specs/MetadataTester.js"; import { MetadataSchema, parseFeatureMetadataLegacy, @@ -5,8 +7,6 @@ import { PixelFormat, Texture, } from "../../index.js"; -import createContext from "../../../../Specs/createContext.js"; -import MetadataTester from "../../../../Specs/MetadataTester.js"; describe( "Scene/parseFeatureMetadataLegacy", diff --git a/packages/engine/Specs/Scene/parseStructuralMetadataSpec.js b/packages/engine/Specs/Scene/parseStructuralMetadataSpec.js index e2b8c9383bdc..b14a1380031e 100644 --- a/packages/engine/Specs/Scene/parseStructuralMetadataSpec.js +++ b/packages/engine/Specs/Scene/parseStructuralMetadataSpec.js @@ -1,3 +1,5 @@ +import createContext from "../../../../Specs/createContext.js"; +import MetadataTester from "../../../../Specs/MetadataTester.js"; import { MetadataSchema, parseStructuralMetadata, @@ -5,8 +7,6 @@ import { PixelFormat, Texture, } from "../../index.js"; -import createContext from "../../../../Specs/createContext.js"; -import MetadataTester from "../../../../Specs/MetadataTester.js"; describe( "Scene/parseStructuralMetadata", diff --git a/packages/engine/Specs/Scene/preprocess3DTileContentSpec.js b/packages/engine/Specs/Scene/preprocess3DTileContentSpec.js index 5466aa0d849b..77b845654cfe 100644 --- a/packages/engine/Specs/Scene/preprocess3DTileContentSpec.js +++ b/packages/engine/Specs/Scene/preprocess3DTileContentSpec.js @@ -1,7 +1,7 @@ +import { RuntimeError } from "@cesium/utils"; import { Cesium3DTileContentType, preprocess3DTileContent, - RuntimeError, } from "../../index.js"; describe("Scene/preprocess3DTileContent", function () { diff --git a/packages/engine/Specs/Scene/processVoxelPropertiesSpec.js b/packages/engine/Specs/Scene/processVoxelPropertiesSpec.js index 2e6ea2a90bb5..17313b3cb15a 100644 --- a/packages/engine/Specs/Scene/processVoxelPropertiesSpec.js +++ b/packages/engine/Specs/Scene/processVoxelPropertiesSpec.js @@ -1,11 +1,11 @@ +import createScene from "../../../../Specs/createScene.js"; +import ShaderBuilderTester from "../../../../Specs/ShaderBuilderTester.js"; import { Cesium3DTilesVoxelProvider, + processVoxelProperties, VoxelPrimitive, VoxelRenderResources, - processVoxelProperties, } from "../../index.js"; -import createScene from "../../../../Specs/createScene.js"; -import ShaderBuilderTester from "../../../../Specs/ShaderBuilderTester.js"; describe("Scene/processVoxelProperties", function () { let scene; diff --git a/packages/engine/Specs/Widget/CesiumWidgetSpec.js b/packages/engine/Specs/Widget/CesiumWidgetSpec.js index 1b9680bad78e..c5b23b317f85 100644 --- a/packages/engine/Specs/Widget/CesiumWidgetSpec.js +++ b/packages/engine/Specs/Widget/CesiumWidgetSpec.js @@ -1,5 +1,7 @@ +import { defined } from "@cesium/utils"; import { BoundingSphere, + Camera, Cartesian3, Cesium3DTileset, Cesium3DTilesVoxelProvider, @@ -7,31 +9,29 @@ import { Clock, ClockRange, ClockStep, - CreditDisplay, Color, ConstantPositionProperty, ConstantProperty, + CreditDisplay, DataSourceClock, DataSourceCollection, - defined, EllipsoidTerrainProvider, Entity, HeadingPitchRange, + ImageryLayer, + ImageryLayerCollection, JulianDate, Matrix4, Rectangle, + Scene, + SceneMode, ScreenSpaceEventHandler, + SkyBox, + TileCoordinatesImageryProvider, TimeDynamicPointCloud, TimeIntervalCollection, VoxelPrimitive, WebMercatorProjection, - Camera, - ImageryLayer, - ImageryLayerCollection, - Scene, - SceneMode, - SkyBox, - TileCoordinatesImageryProvider, } from "../../index.js"; import DomEventSimulator from "../../../../Specs/DomEventSimulator.js"; diff --git a/packages/engine/package.json b/packages/engine/package.json index 75421f6675c3..371b99151e89 100644 --- a/packages/engine/package.json +++ b/packages/engine/package.json @@ -32,6 +32,7 @@ "./Specs/**/*" ], "dependencies": { + "@cesium/utils": "^1.0.0", "@tweenjs/tween.js": "^25.0.0", "@zip.js/zip.js": "^2.7.34", "autolinker": "^4.0.0", diff --git a/packages/utils/.gitignore b/packages/utils/.gitignore new file mode 100644 index 000000000000..ae906f6d0620 --- /dev/null +++ b/packages/utils/.gitignore @@ -0,0 +1,2 @@ +/Build + diff --git a/packages/utils/Source/Check.ts b/packages/utils/Source/Check.ts new file mode 100644 index 000000000000..ed7b60087f03 --- /dev/null +++ b/packages/utils/Source/Check.ts @@ -0,0 +1,274 @@ +import { defined, DeveloperError } from "../Source/index"; + +function getUndefinedErrorMessage(name: string) { + return `${name} is required, actual value was undefined`; +} + +function getFailedTypeErrorMessage( + actual: string, + expected: string, + name: string, +) { + return `Expected ${name} to be typeof ${expected}, actual typeof was ${actual}`; +} + +type NumberCheck = { + (name: string, test: any): asserts test is number; + lessThan(name: string, test: any, limit: number): asserts test is number; + lessThanOrEquals( + name: string, + test: any, + limit: number, + ): asserts test is number; + greaterThan(name: string, test: any, limit: number): asserts test is number; + greaterThanOrEquals( + name: string, + test: any, + limit: number, + ): asserts test is number; + equals(name1: string, name2: string, test1: any, test2: any): void; +}; + +const numberCheck: NumberCheck = function ( + name: string, + test: any, +): asserts test is number { + if (typeof test !== "number") { + throw new DeveloperError( + getFailedTypeErrorMessage(typeof test, "number", name), + ); + } +} as NumberCheck; + +/** + * Throws if test is not typeof 'number' and less than limit + * + * @param {string} name The name of the variable being tested + * @param {*} test The value to test + * @param {number} limit The limit value to compare against + * @exception {DeveloperError} test must be typeof 'number' and less than limit + */ +numberCheck.lessThan = function ( + name: string, + test: any, + limit: number, +): asserts test is number { + numberCheck(name, test); + if (test >= limit) { + throw new DeveloperError( + `Expected ${name} to be less than ${limit}, actual value was ${test}`, + ); + } +}; + +/** + * Throws if test is not typeof 'number' and less than or equal to limit + * + * @param {string} name The name of the variable being tested + * @param {*} test The value to test + * @param {number} limit The limit value to compare against + * @exception {DeveloperError} test must be typeof 'number' and less than or equal to limit + */ +numberCheck.lessThanOrEquals = function ( + name: string, + test: any, + limit: number, +): asserts test is number { + numberCheck(name, test); + if (test > limit) { + throw new DeveloperError( + `Expected ${name} to be less than or equal to ${limit}, actual value was ${test}`, + ); + } +}; + +/** + * Throws if test is not typeof 'number' and greater than limit + * + * @param {string} name The name of the variable being tested + * @param {*} test The value to test + * @param {number} limit The limit value to compare against + * @exception {DeveloperError} test must be typeof 'number' and greater than limit + */ +numberCheck.greaterThan = function ( + name: string, + test: any, + limit: number, +): asserts test is number { + numberCheck(name, test); + if (test <= limit) { + throw new DeveloperError( + `Expected ${name} to be greater than ${limit}, actual value was ${test}`, + ); + } +}; + +/** + * Throws if test is not typeof 'number' and greater than or equal to limit + * + * @param {string} name The name of the variable being tested + * @param {*} test The value to test + * @param {number} limit The limit value to compare against + * @exception {DeveloperError} test must be typeof 'number' and greater than or equal to limit + */ +numberCheck.greaterThanOrEquals = function ( + name: string, + test: any, + limit: number, +): asserts test is number { + numberCheck(name, test); + if (test < limit) { + throw new DeveloperError( + `Expected ${name} to be greater than or equal to ${limit}, actual value was ${test}`, + ); + } +}; + +/** + * Throws if test1 and test2 is not typeof 'number' and not equal in value + * + * @param {string} name1 The name of the first variable being tested + * @param {string} name2 The name of the second variable being tested against + * @param {*} test1 The value to test + * @param {*} test2 The value to test against + * @exception {DeveloperError} test1 and test2 should be type of 'number' and be equal in value + */ +numberCheck.equals = function ( + name1: string, + name2: string, + test1: any, + test2: any, +): void { + numberCheck(name1, test1); + numberCheck(name2, test2); + if (test1 !== test2) { + throw new DeveloperError( + `${name1} must be equal to ${name2}, the actual values are ${test1} and ${test2}`, + ); + } +}; + +type CheckType = { + defined(name: string, test: T): asserts test is NonNullable; + typeOf: { + string(name: string, test: any): asserts test is string; + func(name: string, test: any): asserts test is Function; + object(name: string, test: any): asserts test is object; + bool(name: string, test: any): asserts test is boolean; + bigint(name: string, test: any): asserts test is bigint; + number: NumberCheck; + }; +}; + +/** + * Contains functions for checking that supplied arguments are of a specified type + * or meet specified conditions + */ +const Check: CheckType = { + /** + * Throws if test is not defined + * + * @param {string} name The name of the variable being tested + * @param {*} test The value that is to be checked + * @exception {DeveloperError} test must be defined + */ + defined(name: string, test: T): asserts test is NonNullable { + if (!defined(test)) { + throw new DeveloperError(getUndefinedErrorMessage(name)); + } + }, + + /** + * Contains type checking functions, all using the typeof operator + */ + typeOf: { + /** + * Throws if test is not typeof 'string' + * + * @param {string} name The name of the variable being tested + * @param {*} test The value to test + * @exception {DeveloperError} test must be typeof 'string' + */ + string(name: string, test: any): asserts test is string { + if (typeof test !== "string") { + throw new DeveloperError( + getFailedTypeErrorMessage(typeof test, "string", name), + ); + } + }, + + /** + * Throws if test is not typeof 'function' + * + * @param {string} name The name of the variable being tested + * @param {*} test The value to test + * @exception {DeveloperError} test must be typeof 'function' + */ + func(name: string, test: any): asserts test is Function { + if (typeof test !== "function") { + throw new DeveloperError( + getFailedTypeErrorMessage(typeof test, "function", name), + ); + } + }, + + /** + * Throws if test is not typeof 'object' + * + * @param {string} name The name of the variable being tested + * @param {*} test The value to test + * @exception {DeveloperError} test must be typeof 'object' + */ + object( + name: string, + test: any, + ): asserts test is Record { + if (typeof test !== "object" || test === null) { + throw new DeveloperError( + getFailedTypeErrorMessage(typeof test, "object", name), + ); + } + }, + + /** + * Throws if test is not typeof 'boolean' + * + * @param {string} name The name of the variable being tested + * @param {*} test The value to test + * @exception {DeveloperError} test must be typeof 'boolean' + */ + bool(name: string, test: any): asserts test is boolean { + if (typeof test !== "boolean") { + throw new DeveloperError( + getFailedTypeErrorMessage(typeof test, "boolean", name), + ); + } + }, + + /** + * Throws if test is not typeof 'bigint' + * + * @param {string} name The name of the variable being tested + * @param {*} test The value to test + * @exception {DeveloperError} test must be typeof 'bigint' + */ + bigint(name: string, test: any): asserts test is bigint { + if (typeof test !== "bigint") { + throw new DeveloperError( + getFailedTypeErrorMessage(typeof test, "bigint", name), + ); + } + }, + + /** + * Throws if test is not typeof 'number' + * + * @param {string} name The name of the variable being tested + * @param {*} test The value to test + * @exception {DeveloperError} test must be typeof 'number' + */ + number: numberCheck, + }, +}; + +export default Check; diff --git a/packages/utils/Source/DeveloperError.ts b/packages/utils/Source/DeveloperError.ts new file mode 100644 index 000000000000..8a2db5a1a1a3 --- /dev/null +++ b/packages/utils/Source/DeveloperError.ts @@ -0,0 +1,85 @@ +import defined from "./defined"; + +/** + * Constructs an exception object that is thrown due to a developer error, e.g., invalid argument, + * argument out of range, etc. This exception should only be thrown during development; + * it usually indicates a bug in the calling code. This exception should never be + * caught; instead the calling code should strive not to generate it. + *

+ * On the other hand, a {@link RuntimeError} indicates an exception that may + * be thrown at runtime, e.g., out of memory, that the calling code should be prepared + * to catch. + * + * @class DeveloperError + * @extends Error + * + * @param {string} [message] The error message for this exception. + * + * @see RuntimeError + */ +class DeveloperError extends Error { + /** + * 'DeveloperError' indicating that this exception was thrown due to a developer error. + * @member {string} name + * @memberof DeveloperError.prototype + * @readonly + * @override + */ + override readonly name: string = "DeveloperError"; + + /** + * The explanation for why this exception was thrown. + * @member {string} message + * @memberof DeveloperError.prototype + * @readonly + */ + override readonly message: string; + + /** + * The stack trace of this exception, if available. + * @member {string} stack + * @memberof DeveloperError.prototype + * @readonly + */ + override readonly stack?: string; + + constructor(message?: string) { + super(message); + + this.message = message ?? ""; + + // Ensure the prototype chain is correctly set (especially for older environments) + Object.setPrototypeOf(this, DeveloperError.prototype); + + // Capture stack trace if not automatically populated + if (!this.stack) { + //Browsers such as IE don't have a stack property until you actually throw the error. + try { + throw new Error(); + } catch (e) { + if (e instanceof Error && e.stack) { + this.stack = e.stack; + } + } + } + } + + override toString(): string { + let str = `${this.name}: ${this.message}`; + if (defined(this.stack)) { + str += `\n${this.stack.toString()}`; + } + return str; + } + + /** + * @private + */ + static throwInstantiationError(): never { + throw new DeveloperError( + "This function defines an interface and should not be called directly.", + ); + } +} + +export default DeveloperError; diff --git a/packages/utils/Source/FeatureDetection.ts b/packages/utils/Source/FeatureDetection.ts new file mode 100644 index 000000000000..45424d3a48e1 --- /dev/null +++ b/packages/utils/Source/FeatureDetection.ts @@ -0,0 +1,444 @@ +import Check from "./Check"; +import defined from "./defined"; +import DeveloperError from "./DeveloperError"; +import Fullscreen from "./Fullscreen"; + +let theNavigator: Navigator | Record; +if (typeof navigator !== "undefined") { + theNavigator = navigator; +} else { + theNavigator = {}; +} + +function extractVersion( + versionString: string, +): number[] & { isNightly?: boolean } { + const parts = versionString.split(".").map((p) => parseInt(p, 10)); + return parts; +} + +let isChromeResult: boolean | undefined; +let chromeVersionResult: (number[] & { isNightly?: boolean }) | undefined; +function isChrome(): boolean { + if (!defined(isChromeResult)) { + isChromeResult = false; + // Edge contains Chrome in the user agent too + if (!isEdge()) { + const fields = / Chrome\/([\.0-9]+)/.exec(theNavigator.userAgent); + if (fields !== null) { + isChromeResult = true; + chromeVersionResult = extractVersion(fields[1]); + } + } + } + return isChromeResult; +} + +function chromeVersion() { + return isChrome() && chromeVersionResult; +} + +let isSafariResult: boolean | undefined; +let safariVersionResult: (number[] & { isNightly?: boolean }) | undefined; +function isSafari(): boolean { + if (!defined(isSafariResult)) { + isSafariResult = false; + + // Chrome and Edge contain Safari in the user agent too + if ( + !isChrome() && + !isEdge() && + / Safari\/[\.0-9]+/.test(theNavigator.userAgent) + ) { + const fields = / Version\/([\.0-9]+)/.exec(theNavigator.userAgent); + if (fields !== null) { + isSafariResult = true; + safariVersionResult = extractVersion(fields[1]); + } + } + } + return isSafariResult; +} + +function safariVersion() { + return isSafari() && safariVersionResult; +} + +let isWebkitResult: boolean | undefined; +let webkitVersionResult: (number[] & { isNightly?: boolean }) | undefined; +function isWebkit(): boolean { + if (!defined(isWebkitResult)) { + isWebkitResult = false; + const fields = / AppleWebKit\/([\.0-9]+)(\+?)/.exec(theNavigator.userAgent); + if (fields !== null) { + isWebkitResult = true; + webkitVersionResult = extractVersion(fields[1]); + webkitVersionResult.isNightly = !!fields[2]; + } + } + return isWebkitResult; +} + +function webkitVersion() { + return isWebkit() && webkitVersionResult; +} + +let isInternetExplorerResult: boolean | undefined; +let internetExplorerVersionResult: number[] | undefined; +function isInternetExplorer(): boolean { + if (!defined(isInternetExplorerResult)) { + isInternetExplorerResult = false; + let fields: RegExpExecArray | null; + if (theNavigator.appName === "Microsoft Internet Explorer") { + fields = /MSIE ([0-9]{1,}[\.0-9]{0,})/.exec(theNavigator.userAgent); + if (fields !== null) { + isInternetExplorerResult = true; + internetExplorerVersionResult = extractVersion(fields[1]); + } + } else if (theNavigator.appName === "Netscape") { + fields = /Trident\/.*rv:([0-9]{1,}[\.0-9]{0,})/.exec( + theNavigator.userAgent, + ); + if (fields !== null) { + isInternetExplorerResult = true; + internetExplorerVersionResult = extractVersion(fields[1]); + } + } + } + return isInternetExplorerResult; +} + +function internetExplorerVersion() { + return isInternetExplorer() && internetExplorerVersionResult; +} + +let isEdgeResult: boolean | undefined; +let edgeVersionResult: number[] | undefined; +function isEdge(): boolean { + if (!defined(isEdgeResult)) { + isEdgeResult = false; + const fields = / Edg\/([\.0-9]+)/.exec(theNavigator.userAgent); + if (fields !== null) { + isEdgeResult = true; + edgeVersionResult = extractVersion(fields[1]); + } + } + return isEdgeResult; +} + +function edgeVersion() { + return isEdge() && edgeVersionResult; +} + +let isFirefoxResult: boolean | undefined; +let firefoxVersionResult: number[] | undefined; +function isFirefox(): boolean { + if (!defined(isFirefoxResult)) { + isFirefoxResult = false; + const fields = /Firefox\/([\.0-9]+)/.exec(theNavigator.userAgent); + if (fields !== null) { + isFirefoxResult = true; + firefoxVersionResult = extractVersion(fields[1]); + } + } + return isFirefoxResult; +} + +let isWindowsResult: boolean | undefined; +function isWindows(): boolean { + if (!defined(isWindowsResult)) { + isWindowsResult = /Windows/i.test(theNavigator.appVersion); + } + return isWindowsResult; +} + +let isIPadOrIOSResult: boolean | undefined; +function isIPadOrIOS(): boolean { + if (!defined(isIPadOrIOSResult)) { + isIPadOrIOSResult = + navigator.platform === "iPhone" || + navigator.platform === "iPod" || + navigator.platform === "iPad"; + } + return isIPadOrIOSResult; +} + +function firefoxVersion() { + return isFirefox() && firefoxVersionResult; +} + +let hasPointerEvents: boolean | undefined; +function supportsPointerEvents(): boolean | undefined { + if (!defined(hasPointerEvents)) { + //While navigator.pointerEnabled is deprecated in the W3C specification + //we still need to use it if it exists in order to support browsers + //that rely on it, such as the Windows WebBrowser control which defines + //PointerEvent but sets navigator.pointerEnabled to false. + + //Firefox disabled because of https://github.com/CesiumGS/cesium/issues/6372 + hasPointerEvents = + !isFirefox() && + typeof PointerEvent !== "undefined" && + (!defined((theNavigator as any).pointerEnabled) || + (theNavigator as any).pointerEnabled); + } + return hasPointerEvents; +} + +let imageRenderingValueResult: string | undefined; +let supportsImageRenderingPixelatedResult: boolean | undefined; +function supportsImageRenderingPixelated(): boolean { + if (!defined(supportsImageRenderingPixelatedResult)) { + const canvas = document.createElement("canvas"); + canvas.setAttribute( + "style", + "image-rendering: -moz-crisp-edges;" + "image-rendering: pixelated;", + ); + //canvas.style.imageRendering will be undefined, null or an empty string on unsupported browsers. + const tmp = (canvas.style as any).imageRendering; + supportsImageRenderingPixelatedResult = defined(tmp) && tmp !== ""; + if (supportsImageRenderingPixelatedResult) { + imageRenderingValueResult = tmp; + } + } + return supportsImageRenderingPixelatedResult; +} + +function imageRenderingValue(): string | undefined { + return supportsImageRenderingPixelated() + ? imageRenderingValueResult + : undefined; +} + +interface SupportsWebPFunction { + (): boolean; + _promise?: Promise; + _result?: boolean; + initialize: () => Promise; + readonly initialized: boolean; +} + +// Create and type the function +const supportsWebP: SupportsWebPFunction = function () { + //>>includeStart('debug', pragmas.debug); + if (!supportsWebP.initialized) { + throw new DeveloperError( + "You must call FeatureDetection.supportsWebP.initialize and wait for the promise to resolve before calling FeatureDetection.supportsWebP", + ); + } + //>>includeEnd('debug'); + return supportsWebP._result!; +} as SupportsWebPFunction; + +// Add the initialize method +supportsWebP.initialize = function (): Promise { + // From https://developers.google.com/speed/webp/faq#how_can_i_detect_browser_support_for_webp + if (defined(supportsWebP._promise)) { + return supportsWebP._promise; + } + + supportsWebP._promise = new Promise((resolve) => { + const image = new Image(); + image.onload = function () { + supportsWebP._result = image.width > 0 && image.height > 0; + resolve(supportsWebP._result); + }; + image.onerror = function () { + supportsWebP._result = false; + resolve(supportsWebP._result); + }; + image.src = + "data:image/webp;base64,UklGRiIAAABXRUJQVlA4IBYAAAAwAQCdASoBAAEADsD+JaQAA3AAAAAA"; + }); + + return supportsWebP._promise; +}; + +// Define the dynamic getter for `initialized` +Object.defineProperty(supportsWebP, "initialized", { + get: function () { + return defined(supportsWebP._result); + }, +}); + +const typedArrayTypes: Function[] = []; +if (typeof ArrayBuffer !== "undefined") { + typedArrayTypes.push( + Int8Array, + Uint8Array, + Int16Array, + Uint16Array, + Int32Array, + Uint32Array, + Float32Array, + Float64Array, + ); + if (typeof Uint8ClampedArray !== "undefined") { + typedArrayTypes.push(Uint8ClampedArray); + } + if (typeof BigInt64Array !== "undefined") { + typedArrayTypes.push(BigInt64Array); + } + if (typeof BigUint64Array !== "undefined") { + typedArrayTypes.push(BigUint64Array); + } +} + +interface FeatureDetectionInterface { + isChrome: () => boolean; + chromeVersion: () => false | number[] | undefined; + isSafari: () => boolean; + safariVersion: () => false | number[] | undefined; + isWebkit: () => boolean; + webkitVersion: () => false | (number[] & { isNightly?: boolean }) | undefined; + isInternetExplorer: () => boolean; + internetExplorerVersion: () => false | number[] | undefined; + isEdge: () => boolean; + edgeVersion: () => false | number[] | undefined; + isFirefox: () => boolean; + firefoxVersion: () => false | number[] | undefined; + isWindows: () => boolean; + isIPadOrIOS: () => boolean; + hardwareConcurrency: number; + supportsPointerEvents: () => boolean | undefined; + supportsImageRenderingPixelated: () => boolean; + imageRenderingValue: () => string | undefined; + supportsWebP: typeof supportsWebP; + typedArrayTypes: any[]; + + supportsBasis: (scene: any) => boolean; + supportsFullscreen: () => boolean; + supportsTypedArrays: () => boolean; + supportsBigInt64Array: () => boolean; + supportsBigUint64Array: () => boolean; + supportsBigInt: () => boolean; + supportsWebWorkers: () => boolean; + supportsWebAssembly: () => boolean; + supportsWebgl2: (scene: any) => boolean; + supportsEsmWebWorkers: () => boolean; +} + +/** + * A set of functions to detect whether the current browser supports + * various features. + * + * @namespace FeatureDetection + */ +const FeatureDetection: FeatureDetectionInterface = { + isChrome, + chromeVersion, + isSafari, + safariVersion, + isWebkit, + webkitVersion, + isInternetExplorer, + internetExplorerVersion, + isEdge, + edgeVersion, + isFirefox, + firefoxVersion, + isWindows, + isIPadOrIOS, + hardwareConcurrency: theNavigator.hardwareConcurrency ?? 3, + supportsPointerEvents, + supportsImageRenderingPixelated, + imageRenderingValue, + supportsWebP, + typedArrayTypes, + + /** + * Detects whether the current browser supports Basis Universal textures and the web assembly modules needed to transcode them. + * + * @param {Scene} scene + * @returns {boolean} true if the browser supports web assembly modules and the scene supports Basis Universal textures, false if not. + */ + supportsBasis: (scene: any) => + FeatureDetection.supportsWebAssembly() && scene.context.supportsBasis, + + /** + * Detects whether the current browser supports the full screen standard. + * + * @returns {boolean} true if the browser supports the full screen standard, false if not. + * + * @see Fullscreen + * @see {@link http://dvcs.w3.org/hg/fullscreen/raw-file/tip/Overview.html|W3C Fullscreen Living Specification} + */ + supportsFullscreen: () => Fullscreen.supportsFullscreen(), + + /** + * Detects whether the current browser supports typed arrays. + * + * @returns {boolean} true if the browser supports typed arrays, false if not. + * + * @see {@link https://tc39.es/ecma262/#sec-typedarray-objects|Typed Array Specification} + */ + supportsTypedArrays: () => typeof ArrayBuffer !== "undefined", + + /** + * Detects whether the current browser supports BigInt64Array typed arrays. + * + * @returns {boolean} true if the browser supports BigInt64Array typed arrays, false if not. + * + * @see {@link https://tc39.es/ecma262/#sec-typedarray-objects|Typed Array Specification} + */ + supportsBigInt64Array: () => typeof BigInt64Array !== "undefined", + + /** + * Detects whether the current browser supports BigUint64Array typed arrays. + * + * @returns {boolean} true if the browser supports BigUint64Array typed arrays, false if not. + * + * @see {@link https://tc39.es/ecma262/#sec-typedarray-objects|Typed Array Specification} + */ + supportsBigUint64Array: () => typeof BigUint64Array !== "undefined", + + /** + * Detects whether the current browser supports BigInt. + * + * @returns {boolean} true if the browser supports BigInt, false if not. + * + * @see {@link https://tc39.es/ecma262/#sec-bigint-objects|BigInt Specification} + */ + supportsBigInt: () => typeof BigInt !== "undefined", + + /** + * Detects whether the current browser supports Web Workers. + * + * @returns {boolean} true if the browsers supports Web Workers, false if not. + * + * @see {@link http://www.w3.org/TR/workers/} + */ + supportsWebWorkers: () => typeof Worker !== "undefined", + + /** + * Detects whether the current browser supports Web Assembly. + * + * @returns {boolean} true if the browsers supports Web Assembly, false if not. + * + * @see {@link https://developer.mozilla.org/en-US/docs/WebAssembly} + */ + supportsWebAssembly: () => typeof WebAssembly !== "undefined", + + /** + * Detects whether the current browser supports a WebGL2 rendering context for the specified scene. + * + * @param {Scene} scene the Cesium scene specifying the rendering context + * @returns {boolean} true if the browser supports a WebGL2 rendering context, false if not. + * + * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/WebGL2RenderingContext|WebGL2RenderingContext} + */ + supportsWebgl2: (scene: any) => { + Check.defined("scene", scene); + return scene.context.webgl2; + }, + + /** + * Detects whether the current browser supports ECMAScript modules in web workers. + * @returns {boolean} true if the browser supports ECMAScript modules in web workers. + * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/Worker|Worker} + */ + supportsEsmWebWorkers: () => + !isFirefox() || parseInt(firefoxVersionResult as any) >= 114, +}; + +export default FeatureDetection; diff --git a/packages/engine/Source/Core/Fullscreen.js b/packages/utils/Source/Fullscreen.ts similarity index 76% rename from packages/engine/Source/Core/Fullscreen.js rename to packages/utils/Source/Fullscreen.ts index 3b18de25a213..8d5992906d4a 100644 --- a/packages/engine/Source/Core/Fullscreen.js +++ b/packages/utils/Source/Fullscreen.ts @@ -1,7 +1,17 @@ -import defined from "./defined.js"; +import defined from "./defined"; -let _supportsFullscreen; -const _names = { +type FullscreenNames = { + requestFullscreen?: string; + exitFullscreen?: string; + fullscreenEnabled?: string; + fullscreenElement?: string; + fullscreenchange?: string; + fullscreenerror?: string; +}; + +let _supportsFullscreen: boolean | undefined; + +const _names: FullscreenNames = { requestFullscreen: undefined, exitFullscreen: undefined, fullscreenEnabled: undefined, @@ -10,6 +20,18 @@ const _names = { fullscreenerror: undefined, }; +interface FullscreenInterface { + readonly element: Element | undefined; + readonly changeEventName: string | undefined; + readonly errorEventName: string | undefined; + readonly enabled: boolean | undefined; + readonly fullscreen: boolean | undefined; + supportsFullscreen: () => boolean; + requestFullscreen: (element: HTMLElement, vrDevice?: unknown) => void; + exitFullscreen: () => void; + _names: FullscreenNames; +} + /** * Browser-independent functions for working with the standard fullscreen API. * @@ -17,7 +39,7 @@ const _names = { * * @see {@link http://dvcs.w3.org/hg/fullscreen/raw-file/tip/Overview.html|W3C Fullscreen Living Specification} */ -const Fullscreen = {}; +const Fullscreen = {} as FullscreenInterface; Object.defineProperties(Fullscreen, { /** @@ -28,12 +50,11 @@ Object.defineProperties(Fullscreen, { * @readonly */ element: { - get: function () { + get() { if (!Fullscreen.supportsFullscreen()) { return undefined; } - - return document[_names.fullscreenElement]; + return (document as any)[_names.fullscreenElement!]; }, }, @@ -47,11 +68,10 @@ Object.defineProperties(Fullscreen, { * @readonly */ changeEventName: { - get: function () { + get() { if (!Fullscreen.supportsFullscreen()) { return undefined; } - return _names.fullscreenchange; }, }, @@ -64,11 +84,10 @@ Object.defineProperties(Fullscreen, { * @readonly */ errorEventName: { - get: function () { + get() { if (!Fullscreen.supportsFullscreen()) { return undefined; } - return _names.fullscreenerror; }, }, @@ -82,12 +101,11 @@ Object.defineProperties(Fullscreen, { * @readonly */ enabled: { - get: function () { + get() { if (!Fullscreen.supportsFullscreen()) { return undefined; } - - return document[_names.fullscreenEnabled]; + return (document as any)[_names.fullscreenEnabled!]; }, }, @@ -98,11 +116,10 @@ Object.defineProperties(Fullscreen, { * @readonly */ fullscreen: { - get: function () { + get() { if (!Fullscreen.supportsFullscreen()) { return undefined; } - return Fullscreen.element !== null; }, }, @@ -114,14 +131,14 @@ Object.defineProperties(Fullscreen, { * @returns {boolean} true if the browser supports the standard fullscreen API, * false otherwise. */ -Fullscreen.supportsFullscreen = function () { +Fullscreen.supportsFullscreen = function (): boolean { if (defined(_supportsFullscreen)) { return _supportsFullscreen; } _supportsFullscreen = false; + const body = document.body as any; - const body = document.body; if (typeof body.requestFullscreen === "function") { // go with the unprefixed, standard set of names _names.requestFullscreen = "requestFullscreen"; @@ -136,9 +153,8 @@ Fullscreen.supportsFullscreen = function () { //check for the correct combination of prefix plus the various names that browsers use const prefixes = ["webkit", "moz", "o", "ms", "khtml"]; - let name; - for (let i = 0, len = prefixes.length; i < len; ++i) { - const prefix = prefixes[i]; + for (const prefix of prefixes) { + let name: string; // casing of Fullscreen differs across browsers name = `${prefix}RequestFullscreen`; @@ -155,33 +171,33 @@ Fullscreen.supportsFullscreen = function () { // disagreement about whether it's "exit" as per spec, or "cancel" name = `${prefix}ExitFullscreen`; - if (typeof document[name] === "function") { + if (typeof (document as any)[name] === "function") { _names.exitFullscreen = name; } else { name = `${prefix}CancelFullScreen`; - if (typeof document[name] === "function") { + if (typeof (document as any)[name] === "function") { _names.exitFullscreen = name; } } // casing of Fullscreen differs across browsers name = `${prefix}FullscreenEnabled`; - if (document[name] !== undefined) { + if ((document as any)[name] !== undefined) { _names.fullscreenEnabled = name; } else { name = `${prefix}FullScreenEnabled`; - if (document[name] !== undefined) { + if ((document as any)[name] !== undefined) { _names.fullscreenEnabled = name; } } // casing of Fullscreen differs across browsers name = `${prefix}FullscreenElement`; - if (document[name] !== undefined) { + if ((document as any)[name] !== undefined) { _names.fullscreenElement = name; } else { name = `${prefix}FullScreenElement`; - if (document[name] !== undefined) { + if ((document as any)[name] !== undefined) { _names.fullscreenElement = name; } } @@ -189,7 +205,7 @@ Fullscreen.supportsFullscreen = function () { // thankfully, event names are all lowercase per spec name = `${prefix}fullscreenchange`; // event names do not have 'on' in the front, but the property on the document does - if (document[`on${name}`] !== undefined) { + if ((document as any)[`on${name}`] !== undefined) { //except on IE if (prefix === "ms") { name = "MSFullscreenChange"; @@ -198,7 +214,7 @@ Fullscreen.supportsFullscreen = function () { } name = `${prefix}fullscreenerror`; - if (document[`on${name}`] !== undefined) { + if ((document as any)[`on${name}`] !== undefined) { //except on IE if (prefix === "ms") { name = "MSFullscreenError"; @@ -224,26 +240,30 @@ Fullscreen.supportsFullscreen = function () { * // Place only the Cesium canvas into fullscreen. * Cesium.Fullscreen.requestFullscreen(scene.canvas) */ -Fullscreen.requestFullscreen = function (element, vrDevice) { +Fullscreen.requestFullscreen = function ( + element: HTMLElement, + vrDevice?: unknown, +): void { if (!Fullscreen.supportsFullscreen()) { return; } - element[_names.requestFullscreen]({ vrDisplay: vrDevice }); + (element as any)[_names.requestFullscreen!]({ vrDisplay: vrDevice }); }; /** * Asynchronously exits fullscreen mode. If the browser is not currently * in fullscreen, or if fullscreen mode is not supported by the browser, does nothing. */ -Fullscreen.exitFullscreen = function () { +Fullscreen.exitFullscreen = function (): void { if (!Fullscreen.supportsFullscreen()) { return; } - document[_names.exitFullscreen](); + (document as any)[_names.exitFullscreen!](); }; //For unit tests Fullscreen._names = _names; + export default Fullscreen; diff --git a/packages/utils/Source/RuntimeError.ts b/packages/utils/Source/RuntimeError.ts new file mode 100644 index 000000000000..9812c42881c8 --- /dev/null +++ b/packages/utils/Source/RuntimeError.ts @@ -0,0 +1,74 @@ +import defined from "./defined"; + +/** + * + * Constructs an exception object that is thrown due to an error that can occur at runtime, e.g., + * out of memory, could not compile shader, etc. If a function may throw this + * exception, the calling code should be prepared to catch it. + *

+ * On the other hand, a {@link DeveloperError} indicates an exception due + * to a developer error, e.g., invalid argument, that usually indicates a bug in the + * calling code. + * + * @class RuntimeError + * @extends Error + * + * @param {string} [message] The error message for this exception. + * + * @see DeveloperError + */ +class RuntimeError extends Error { + /** + * 'RuntimeError' indicating that this exception was thrown due to a runtime error. + * @member {string} name + * @memberof RuntimeError.prototype + * @readonly + */ + override readonly name: string = "RuntimeError"; + + /** + * The explanation for why this exception was thrown. + * @member {string} message + * @memberof RuntimeError.prototype + * @readonly + */ + override readonly message: string; + + /** + * The stack trace of this exception, if available. + * @member {string} stack + * @memberof RuntimeError.prototype + * @readonly + */ + override readonly stack?: string; + + constructor(message?: string) { + super(message); + + this.message = message ?? ""; + + // Set the prototype explicitly for environments where subclassing Error doesn't work properly + Object.setPrototypeOf(this, RuntimeError.prototype); + + if (!this.stack) { + //Browsers such as IE don't have a stack property until you actually throw the error. + try { + throw new Error(); + } catch (e) { + if (e instanceof Error && e.stack) { + this.stack = e.stack; + } + } + } + } + + override toString(): string { + let str = `${this.name}: ${this.message}`; + if (defined(this.stack)) { + str += `\n${this.stack.toString()}`; + } + return str; + } +} + +export default RuntimeError; diff --git a/packages/utils/Source/defer.ts b/packages/utils/Source/defer.ts new file mode 100644 index 000000000000..5d30b98695a7 --- /dev/null +++ b/packages/utils/Source/defer.ts @@ -0,0 +1,52 @@ +/** + * A function used to reject a promise upon failure. + * @typedef {Function} Reject + * @param {any} [reason] - An optional reason for the rejection. + * @private + */ +export type Reject = (reason?: any) => void; + +/** + * A function used to resolve a promise upon completion . + * @template T The type of the resolved value. + * @typedef {Function} Resolve + * @param {T} value - An optional reason for the rejection. + * @private + */ +export type Resolve = (value: T) => void; + +/** + * Represents a deferred object, which contains a promise along with resolve and reject functions. + * + * @template T The type of the resolved value. + * @typedef {Object} Deferred + * @property {Resolve} resolve - Resolves the promise. + * @property {Reject} reject - Rejects the promise. + * @property {Promise} promise - The associated promise. + * @private + */ +export type Deferred = { + resolve: Resolve; + reject: Reject; + promise: Promise; +}; + +/** + * Creates a deferred object, containing a promise and functions to resolve or reject it. + * + * @function defer + * @template T + * @param {T} value + * @returns {Deferred} - A deferred object with `resolve`, `reject`, and `promise` properties. + * @private + */ +export default function defer(): Deferred { + let resolve!: (value: T) => void; + let reject!: (reason?: any) => void; + const promise = new Promise((res, rej) => { + resolve = res; + reject = rej; + }); + + return { promise, resolve, reject }; +} diff --git a/packages/engine/Source/Core/defined.js b/packages/utils/Source/defined.ts similarity index 65% rename from packages/engine/Source/Core/defined.js rename to packages/utils/Source/defined.ts index 5040c613e7c3..1c1b4e803dda 100644 --- a/packages/engine/Source/Core/defined.js +++ b/packages/utils/Source/defined.ts @@ -1,7 +1,8 @@ /** - * @function + * @function defined + * @template T * - * @param {*} value The object. + * @param {T} value The object. * @returns {boolean} Returns true if the object is defined, returns false otherwise. * * @example @@ -11,7 +12,6 @@ * doSomethingElse(); * } */ -function defined(value) { +export default function defined(value: T): value is NonNullable { return value !== undefined && value !== null; } -export default defined; diff --git a/packages/utils/Source/index.ts b/packages/utils/Source/index.ts new file mode 100644 index 000000000000..c4a78c24828a --- /dev/null +++ b/packages/utils/Source/index.ts @@ -0,0 +1,8 @@ +export { default as Check } from "./Check"; +export * from "./defer"; +export { default as defer } from "./defer"; +export { default as defined } from "./defined"; +export { default as DeveloperError } from "./DeveloperError"; +export { default as FeatureDetection } from "./FeatureDetection"; +export { default as Fullscreen } from "./Fullscreen"; +export { default as RuntimeError } from "./RuntimeError"; diff --git a/packages/engine/Specs/Core/CheckSpec.js b/packages/utils/Specs/CheckSpec.ts similarity index 97% rename from packages/engine/Specs/Core/CheckSpec.js rename to packages/utils/Specs/CheckSpec.ts index b3ba7725e807..c9829ad04428 100644 --- a/packages/engine/Specs/Core/CheckSpec.js +++ b/packages/utils/Specs/CheckSpec.ts @@ -1,9 +1,9 @@ -import { Check, FeatureDetection } from "../../index.js"; +import { Check, FeatureDetection } from "../Source/index"; describe("Core/Check", function () { describe("type checks", function () { it("Check.typeOf.bool does not throw when passed a boolean", function () { - expect(function () { + expect(() => { Check.typeOf.bool("bool", true); }).not.toThrowDeveloperError(); }); @@ -34,7 +34,7 @@ describe("Core/Check", function () { } expect(function () { - Check.typeOf.bigint("bigint", BigInt()); // eslint-disable-line + Check.typeOf.bigint("bigint", BigInt(0)); }).not.toThrowDeveloperError(); }); @@ -256,7 +256,7 @@ describe("Core/Check", function () { it("does not throw if both values are a number and are equal", function () { expect(function () { - Check.typeOf.number.equal("mockName1", "mockName2", 3, 3); + Check.typeOf.number.equals("mockName1", "mockName2", 3, 3); }).not.toThrowDeveloperError(); }); }); diff --git a/packages/engine/Specs/Core/DeveloperErrorSpec.js b/packages/utils/Specs/DeveloperErrorSpec.ts similarity index 85% rename from packages/engine/Specs/Core/DeveloperErrorSpec.js rename to packages/utils/Specs/DeveloperErrorSpec.ts index e16d588fc242..0875c1869c8a 100644 --- a/packages/engine/Specs/Core/DeveloperErrorSpec.js +++ b/packages/utils/Specs/DeveloperErrorSpec.ts @@ -1,10 +1,10 @@ -import { DeveloperError } from "../../index.js"; +import { DeveloperError } from "../Source/index"; describe("Core/DeveloperError", function () { const name = "DeveloperError"; const testMessage = "Testing"; - let e; + let e: DeveloperError; beforeEach(function () { e = new DeveloperError(testMessage); }); @@ -20,7 +20,7 @@ describe("Core/DeveloperError", function () { it("has a stack property", function () { // Since we are using source maps, we won't be able to map to a specific file without help from the browser developer tools. // However, we should know the class if not minified - if (!window.specsUsingRelease) { + if (!(window as any).specsUsingRelease) { expect(e.stack).toContain(name); } }); @@ -28,7 +28,7 @@ describe("Core/DeveloperError", function () { it("has a working toString", function () { const str = new DeveloperError(testMessage).toString(); - if (!window.specsUsingRelease) { + if (!(window as any).specsUsingRelease) { expect(str).toContain(`${name}: ${testMessage}`); } else { // Since source maps are used, there will not be exact filenames diff --git a/packages/engine/Specs/Core/FeatureDetectionSpec.js b/packages/utils/Specs/FeatureDetectionSpec.ts similarity index 75% rename from packages/engine/Specs/Core/FeatureDetectionSpec.js rename to packages/utils/Specs/FeatureDetectionSpec.ts index f6d8fffbd26e..a4d1c9ba8e53 100644 --- a/packages/engine/Specs/Core/FeatureDetectionSpec.js +++ b/packages/utils/Specs/FeatureDetectionSpec.ts @@ -1,5 +1,4 @@ -import { FeatureDetection } from "../../index.js"; -import createScene from "../../../../Specs/createScene.js"; +import { FeatureDetection } from "../Source/index"; describe("Core/FeatureDetection", function () { //generally, these tests just make sure the function runs, the test can't expect a value of true or false @@ -38,7 +37,7 @@ describe("Core/FeatureDetection", function () { expect(typeof supportsWebAssembly).toEqual("boolean"); }); - function checkVersionArray(array) { + function checkVersionArray(array: number[] & { isNightly?: boolean }): void { expect(Array.isArray(array)).toEqual(true); array.forEach(function (d) { expect(typeof d).toEqual("number"); @@ -51,9 +50,10 @@ describe("Core/FeatureDetection", function () { if (isChrome) { const chromeVersion = FeatureDetection.chromeVersion(); - checkVersionArray(chromeVersion); - - console.log(`detected Chrome ${chromeVersion.join(".")}`); + if (chromeVersion) { + checkVersionArray(chromeVersion); + console.log(`detected Chrome ${chromeVersion.join(".")}`); + } } }); @@ -63,9 +63,10 @@ describe("Core/FeatureDetection", function () { if (isSafari) { const safariVersion = FeatureDetection.safariVersion(); - checkVersionArray(safariVersion); - - console.log(`detected Safari ${safariVersion.join(".")}`); + if (safariVersion) { + checkVersionArray(safariVersion); + console.log(`detected Safari ${safariVersion.join(".")}`); + } } }); @@ -75,14 +76,16 @@ describe("Core/FeatureDetection", function () { if (isWebkit) { const webkitVersion = FeatureDetection.webkitVersion(); - checkVersionArray(webkitVersion); - expect(typeof webkitVersion.isNightly).toEqual("boolean"); - - console.log( - `detected Webkit ${webkitVersion.join(".")}${ - webkitVersion.isNightly ? " (Nightly)" : "" - }`, - ); + if (webkitVersion) { + checkVersionArray(webkitVersion); + expect(typeof webkitVersion.isNightly).toEqual("boolean"); + + console.log( + `detected Webkit ${webkitVersion.join(".")}${ + webkitVersion.isNightly ? " (Nightly)" : "" + }`, + ); + } } }); @@ -93,11 +96,13 @@ describe("Core/FeatureDetection", function () { if (isInternetExplorer) { const internetExplorerVersion = FeatureDetection.internetExplorerVersion(); - checkVersionArray(internetExplorerVersion); + if (internetExplorerVersion) { + checkVersionArray(internetExplorerVersion); - console.log( - `detected Internet Explorer ${internetExplorerVersion.join(".")}`, - ); + console.log( + `detected Internet Explorer ${internetExplorerVersion.join(".")}`, + ); + } } }); @@ -107,9 +112,11 @@ describe("Core/FeatureDetection", function () { if (isEdge) { const edgeVersion = FeatureDetection.edgeVersion(); - checkVersionArray(edgeVersion); + if (edgeVersion) { + checkVersionArray(edgeVersion); - console.log(`detected Edge ${edgeVersion.join(".")}`); + console.log(`detected Edge ${edgeVersion.join(".")}`); + } } }); @@ -120,9 +127,11 @@ describe("Core/FeatureDetection", function () { if (isFirefox) { const firefoxVersion = FeatureDetection.firefoxVersion(); - checkVersionArray(firefoxVersion); + if (firefoxVersion) { + checkVersionArray(firefoxVersion); - console.log(`detected Firefox ${firefoxVersion.join(".")}`); + console.log(`detected Firefox ${firefoxVersion.join(".")}`); + } } }); @@ -162,11 +171,11 @@ describe("Core/FeatureDetection", function () { }); }); - it("detects WebGL2 support", function () { - const scene = createScene(); - expect(FeatureDetection.supportsWebgl2(scene)).toEqual( - scene.context.webgl2, - ); - scene.destroyForSpecs(); - }); + // it("detects WebGL2 support", function () { + // const scene = createScene() as any; + // expect(FeatureDetection.supportsWebgl2(scene)).toEqual( + // scene.context.webgl2, + // ); + // scene.destroyForSpecs(); + // }); }); diff --git a/packages/engine/Specs/Core/FullscreenSpec.js b/packages/utils/Specs/FullscreenSpec.ts similarity index 75% rename from packages/engine/Specs/Core/FullscreenSpec.js rename to packages/utils/Specs/FullscreenSpec.ts index f3ddd8945bdf..27bf759bce30 100644 --- a/packages/engine/Specs/Core/FullscreenSpec.js +++ b/packages/utils/Specs/FullscreenSpec.ts @@ -1,4 +1,4 @@ -import { FeatureDetection, Fullscreen } from "../../index.js"; +import { FeatureDetection, Fullscreen } from "../Source/index"; describe("Core/Fullscreen", function () { it("can tell if fullscreen is supported", function () { @@ -33,16 +33,17 @@ describe("Core/Fullscreen", function () { it("can request fullscreen", function () { if (Fullscreen.supportsFullscreen()) { - spyOn(document.body, Fullscreen._names.requestFullscreen); - spyOn(document, Fullscreen._names.exitFullscreen); + const request = Fullscreen._names.requestFullscreen as keyof HTMLElement; + const exit = Fullscreen._names.exitFullscreen as keyof Document; + + spyOn(document.body, request); + spyOn(document, exit); Fullscreen.requestFullscreen(document.body); - expect( - document.body[Fullscreen._names.requestFullscreen], - ).toHaveBeenCalled(); + expect(document.body[request]).toHaveBeenCalled(); Fullscreen.exitFullscreen(); - expect(document[Fullscreen._names.exitFullscreen]).toHaveBeenCalled(); + expect(document[exit]).toHaveBeenCalled(); } else { // These are no-ops if supportsFullscreen is false. Fullscreen.requestFullscreen(document.body); @@ -54,7 +55,8 @@ describe("Core/Fullscreen", function () { it("can get the fullscreen change event name", function () { if (Fullscreen.supportsFullscreen()) { // the property on the document is the event name, prefixed with 'on'. - expect(document[`on${Fullscreen.changeEventName}`]).toBeDefined(); + const eventName = `on${Fullscreen.changeEventName as string}`; + expect((document as any)[eventName]).toBeDefined(); } else { expect(Fullscreen.changeEventName).toBeUndefined(); } @@ -63,7 +65,8 @@ describe("Core/Fullscreen", function () { it("can get the fullscreen error event name", function () { if (Fullscreen.supportsFullscreen()) { // the property on the document is the event name, prefixed with 'on'. - expect(document[`on${Fullscreen.errorEventName}`]).toBeDefined(); + const eventName = `on${Fullscreen.errorEventName as string}`; + expect((document as any)[eventName]).toBeDefined(); } else { expect(Fullscreen.errorEventName).toBeUndefined(); } diff --git a/packages/engine/Specs/Core/RuntimeErrorSpec.js b/packages/utils/Specs/RuntimeErrorSpec.ts similarity index 84% rename from packages/engine/Specs/Core/RuntimeErrorSpec.js rename to packages/utils/Specs/RuntimeErrorSpec.ts index 51c815683b66..45902decf809 100644 --- a/packages/engine/Specs/Core/RuntimeErrorSpec.js +++ b/packages/utils/Specs/RuntimeErrorSpec.ts @@ -1,10 +1,10 @@ -import { RuntimeError } from "../../index.js"; +import { RuntimeError } from "../Source/index"; describe("Core/RuntimeError", function () { const name = "RuntimeError"; const testMessage = "Testing"; - let e; + let e: RuntimeError; beforeEach(function () { e = new RuntimeError(testMessage); }); @@ -20,7 +20,7 @@ describe("Core/RuntimeError", function () { it("has a stack property", function () { // Since we are using source maps, we won't be able to map to a specific file without help from the browser developer tools. // However, we should know the class if not minified - if (!window.specsUsingRelease) { + if (!(window as any).specsUsingRelease) { expect(e.stack).toContain(name); } }); @@ -28,7 +28,7 @@ describe("Core/RuntimeError", function () { it("has a working toString", function () { const str = new RuntimeError(testMessage).toString(); - if (!window.specsUsingRelease) { + if (!(window as any).specsUsingRelease) { expect(e.stack).toContain(name); } diff --git a/packages/engine/Specs/Core/definedSpec.js b/packages/utils/Specs/definedSpec.ts similarity index 78% rename from packages/engine/Specs/Core/definedSpec.js rename to packages/utils/Specs/definedSpec.ts index 242a2f6816a3..09838e98295c 100644 --- a/packages/engine/Specs/Core/definedSpec.js +++ b/packages/utils/Specs/definedSpec.ts @@ -1,6 +1,6 @@ -import { defined } from "../../index.js"; +import { defined } from "../Source/index"; -describe("Core/defined", function () { +describe("defined", function () { it("works for defined value", function () { expect(defined(0)).toEqual(true); }); diff --git a/packages/utils/jest.config.ts b/packages/utils/jest.config.ts new file mode 100644 index 000000000000..ce76ef72a97e --- /dev/null +++ b/packages/utils/jest.config.ts @@ -0,0 +1,15 @@ +import type { JestConfigWithTsJest } from "ts-jest"; +// Sync object +const config: JestConfigWithTsJest = { + verbose: true, + testMatch: ["Specs/*Spec.ts"], + transform: { + "^.+\\.tsx?$": ["ts-jest", { useESM: true }], + }, + extensionsToTreatAsEsm: [".ts"], + moduleNameMapper: { + "^(\\.{1,2}/.*)\\.js$": "$1", + }, +}; + +export default config; diff --git a/packages/utils/jest.d.ts b/packages/utils/jest.d.ts new file mode 100644 index 000000000000..ccf907933aaf --- /dev/null +++ b/packages/utils/jest.d.ts @@ -0,0 +1,15 @@ +import "jest"; + +declare global { + namespace jest { + interface Matchers { + toThrowDeveloperError(): R; + } + } + + namespace NodeJS { + interface Global {} + } +} + +export {}; diff --git a/packages/utils/package.json b/packages/utils/package.json new file mode 100644 index 000000000000..0b207359b7fb --- /dev/null +++ b/packages/utils/package.json @@ -0,0 +1,31 @@ +{ + "name": "@cesium/utils", + "version": "1.0.0", + "type": "module", + "main": "Build/utils.cjs.js", + "module": "Build/utils.es.js", + "browser": "Build/utils.iife.js", + "types": "Build/utils.d.ts", + "exports": { + ".": { + "types": "./Build/utils.d.ts", + "import": "./Build/utils.es.js", + "require": "./Build/utils.cjs.js", + "default": "./Build/utils.iife.js" + } + }, + "files": [ + "Build" + ], + "scripts": { + "build": "vite build && tsc" + }, + "devDependencies": { + "@types/jest": "^29.5.14", + "jest": "^29.7.0", + "ts-jest": "^29.3.2", + "typescript": "^5.8.2", + "vite": "^6.2.6", + "vite-plugin-dts": "^4.5.3" + } +} diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json new file mode 100644 index 000000000000..cc5584787a9d --- /dev/null +++ b/packages/utils/tsconfig.json @@ -0,0 +1,26 @@ +{ + "compilerOptions": { + "outDir": "Build", + "target": "ES2020", + "module": "ESNext", + "moduleResolution": "bundler", + "skipLibCheck": true, + "strict": true, + "allowJs": false, + "resolveJsonModule": true, + "esModuleInterop": true, + "noImplicitAny": true, + "noImplicitThis": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "noImplicitReturns": true, + "removeComments": false, + "forceConsistentCasingInFileNames": true, + "allowSyntheticDefaultImports": true, + "useDefineForClassFields": true, + "isolatedModules": true, + "declaration": false, + "emitDeclarationOnly": false + }, + "include": ["Source", "Specs", "jest.d.ts"] +} diff --git a/packages/utils/vite.config.ts b/packages/utils/vite.config.ts new file mode 100644 index 000000000000..7c4598e02d8b --- /dev/null +++ b/packages/utils/vite.config.ts @@ -0,0 +1,21 @@ +import path from "path"; +import { defineConfig } from "vite"; +import dts from "vite-plugin-dts"; + +export default defineConfig({ + build: { + outDir: "Build", + minify: false, + lib: { + entry: path.resolve(__dirname, "Source/index.ts"), + name: "CesiumUtils", + formats: ["es", "cjs", "iife"], + fileName: (format) => `utils.${format}.js`, + }, + }, + plugins: [ + dts({ + rollupTypes: true, + }), + ], +}); diff --git a/packages/widgets/Source/Animation/Animation.js b/packages/widgets/Source/Animation/Animation.js index 2e9e5d04d0e4..2a862b56ee65 100644 --- a/packages/widgets/Source/Animation/Animation.js +++ b/packages/widgets/Source/Animation/Animation.js @@ -1,10 +1,5 @@ -import { - Color, - defined, - destroyObject, - DeveloperError, - getElement, -} from "@cesium/engine"; +import { Color, destroyObject, getElement } from "@cesium/engine"; +import { defined, DeveloperError } from "@cesium/utils"; import subscribeAndEvaluate from "../subscribeAndEvaluate.js"; const svgNS = "http://www.w3.org/2000/svg"; diff --git a/packages/widgets/Source/Animation/AnimationViewModel.js b/packages/widgets/Source/Animation/AnimationViewModel.js index f00e762cd677..b9d2c029c54c 100644 --- a/packages/widgets/Source/Animation/AnimationViewModel.js +++ b/packages/widgets/Source/Animation/AnimationViewModel.js @@ -2,13 +2,12 @@ import { binarySearch, ClockRange, ClockStep, - defined, - DeveloperError, JulianDate, } from "@cesium/engine"; +import { defined, DeveloperError } from "@cesium/utils"; -import knockout from "../ThirdParty/knockout.js"; import createCommand from "../createCommand.js"; +import knockout from "../ThirdParty/knockout.js"; import ToggleButtonViewModel from "../ToggleButtonViewModel.js"; const monthNames = [ diff --git a/packages/widgets/Source/BaseLayerPicker/BaseLayerPicker.js b/packages/widgets/Source/BaseLayerPicker/BaseLayerPicker.js index 0748df1688d2..95ab84db5aa7 100644 --- a/packages/widgets/Source/BaseLayerPicker/BaseLayerPicker.js +++ b/packages/widgets/Source/BaseLayerPicker/BaseLayerPicker.js @@ -1,10 +1,5 @@ -import { - defined, - destroyObject, - DeveloperError, - FeatureDetection, - getElement, -} from "@cesium/engine"; +import { destroyObject, getElement } from "@cesium/engine"; +import { defined, DeveloperError, FeatureDetection } from "@cesium/utils"; import knockout from "../ThirdParty/knockout.js"; import BaseLayerPickerViewModel from "./BaseLayerPickerViewModel.js"; diff --git a/packages/widgets/Source/BaseLayerPicker/BaseLayerPickerViewModel.js b/packages/widgets/Source/BaseLayerPicker/BaseLayerPickerViewModel.js index eba7419f258a..602c85eed993 100644 --- a/packages/widgets/Source/BaseLayerPicker/BaseLayerPickerViewModel.js +++ b/packages/widgets/Source/BaseLayerPicker/BaseLayerPickerViewModel.js @@ -1,13 +1,12 @@ import { - Frozen, - defined, - DeveloperError, EllipsoidTerrainProvider, + Frozen, ImageryLayer, Terrain, } from "@cesium/engine"; -import knockout from "../ThirdParty/knockout.js"; +import { defined, DeveloperError } from "@cesium/utils"; import createCommand from "../createCommand.js"; +import knockout from "../ThirdParty/knockout.js"; /** * The view model for {@link BaseLayerPicker}. diff --git a/packages/widgets/Source/BaseLayerPicker/ProviderViewModel.js b/packages/widgets/Source/BaseLayerPicker/ProviderViewModel.js index 8ac79343f2db..e86fd359d3ca 100644 --- a/packages/widgets/Source/BaseLayerPicker/ProviderViewModel.js +++ b/packages/widgets/Source/BaseLayerPicker/ProviderViewModel.js @@ -1,6 +1,6 @@ -import { defined, DeveloperError } from "@cesium/engine"; -import knockout from "../ThirdParty/knockout.js"; +import { defined, DeveloperError } from "@cesium/utils"; import createCommand from "../createCommand.js"; +import knockout from "../ThirdParty/knockout.js"; /** * A view model that represents each item in the {@link BaseLayerPicker}. diff --git a/packages/widgets/Source/BaseLayerPicker/createDefaultImageryProviderViewModels.js b/packages/widgets/Source/BaseLayerPicker/createDefaultImageryProviderViewModels.js index 4238fdb61446..821e06ca7d1e 100644 --- a/packages/widgets/Source/BaseLayerPicker/createDefaultImageryProviderViewModels.js +++ b/packages/widgets/Source/BaseLayerPicker/createDefaultImageryProviderViewModels.js @@ -1,4 +1,5 @@ import { + ArcGisBaseMapType, ArcGisMapServerImageryProvider, buildModuleUrl, createWorldImageryAsync, @@ -6,7 +7,6 @@ import { IonWorldImageryStyle, OpenStreetMapImageryProvider, TileMapServiceImageryProvider, - ArcGisBaseMapType, } from "@cesium/engine"; import ProviderViewModel from "./ProviderViewModel.js"; diff --git a/packages/widgets/Source/Cesium3DTilesInspector/Cesium3DTilesInspector.js b/packages/widgets/Source/Cesium3DTilesInspector/Cesium3DTilesInspector.js index 9cd5cacff3bf..ebe47f7d7625 100644 --- a/packages/widgets/Source/Cesium3DTilesInspector/Cesium3DTilesInspector.js +++ b/packages/widgets/Source/Cesium3DTilesInspector/Cesium3DTilesInspector.js @@ -1,6 +1,7 @@ -import { Check, destroyObject, getElement } from "@cesium/engine"; -import knockout from "../ThirdParty/knockout.js"; +import { destroyObject, getElement } from "@cesium/engine"; +import { Check } from "@cesium/utils"; import InspectorShared from "../InspectorShared.js"; +import knockout from "../ThirdParty/knockout.js"; import Cesium3DTilesInspectorViewModel from "./Cesium3DTilesInspectorViewModel.js"; /** diff --git a/packages/widgets/Source/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel.js b/packages/widgets/Source/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel.js index 6c95c7aa9df3..51e9dce90ec8 100644 --- a/packages/widgets/Source/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel.js +++ b/packages/widgets/Source/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel.js @@ -1,18 +1,17 @@ import { - Check, - Color, - defined, - destroyObject, Cesium3DTileColorBlendMode, Cesium3DTileFeature, Cesium3DTilePass, Cesium3DTileset, Cesium3DTileStyle, + Color, + destroyObject, PerformanceDisplay, ResourceCache, ScreenSpaceEventHandler, ScreenSpaceEventType, } from "@cesium/engine"; +import { Check, defined } from "@cesium/utils"; import knockout from "../ThirdParty/knockout.js"; function getPickTileset(viewModel) { diff --git a/packages/widgets/Source/CesiumInspector/CesiumInspector.js b/packages/widgets/Source/CesiumInspector/CesiumInspector.js index 085db17089d3..f82e0b7a5bb7 100644 --- a/packages/widgets/Source/CesiumInspector/CesiumInspector.js +++ b/packages/widgets/Source/CesiumInspector/CesiumInspector.js @@ -1,11 +1,7 @@ -import { - defined, - destroyObject, - DeveloperError, - getElement, -} from "@cesium/engine"; -import knockout from "../ThirdParty/knockout.js"; +import { destroyObject, getElement } from "@cesium/engine"; +import { defined, DeveloperError } from "@cesium/utils"; import InspectorShared from "../InspectorShared.js"; +import knockout from "../ThirdParty/knockout.js"; import CesiumInspectorViewModel from "./CesiumInspectorViewModel.js"; /** diff --git a/packages/widgets/Source/CesiumInspector/CesiumInspectorViewModel.js b/packages/widgets/Source/CesiumInspector/CesiumInspectorViewModel.js index e1c391af3644..f4f2b1a4156b 100644 --- a/packages/widgets/Source/CesiumInspector/CesiumInspectorViewModel.js +++ b/packages/widgets/Source/CesiumInspector/CesiumInspectorViewModel.js @@ -1,9 +1,7 @@ import { Cartesian3, - defined, - destroyObject, DebugModelMatrixPrimitive, - DeveloperError, + destroyObject, PerformanceDisplay, Ray, Rectangle, @@ -11,8 +9,9 @@ import { ScreenSpaceEventType, TileCoordinatesImageryProvider, } from "@cesium/engine"; -import knockout from "../ThirdParty/knockout.js"; +import { defined, DeveloperError } from "@cesium/utils"; import createCommand from "../createCommand.js"; +import knockout from "../ThirdParty/knockout.js"; function frustumStatisticsToString(statistics) { let str; diff --git a/packages/widgets/Source/ClockViewModel.js b/packages/widgets/Source/ClockViewModel.js index 01a7e7e821a3..b9b0d34ba5f2 100644 --- a/packages/widgets/Source/ClockViewModel.js +++ b/packages/widgets/Source/ClockViewModel.js @@ -1,10 +1,5 @@ -import { - Clock, - defined, - destroyObject, - EventHelper, - JulianDate, -} from "@cesium/engine"; +import { Clock, destroyObject, EventHelper, JulianDate } from "@cesium/engine"; +import { defined } from "@cesium/utils"; import knockout from "./ThirdParty/knockout.js"; /** diff --git a/packages/widgets/Source/Command.js b/packages/widgets/Source/Command.js index 67b235125d12..8dd4b26da1a9 100644 --- a/packages/widgets/Source/Command.js +++ b/packages/widgets/Source/Command.js @@ -1,4 +1,4 @@ -import { DeveloperError } from "@cesium/engine"; +import { DeveloperError } from "@cesium/utils"; /** * A Command is a function with an extra canExecute observable property to determine diff --git a/packages/widgets/Source/FullscreenButton/FullscreenButton.js b/packages/widgets/Source/FullscreenButton/FullscreenButton.js index b03b1b49fe2c..370a020d897a 100644 --- a/packages/widgets/Source/FullscreenButton/FullscreenButton.js +++ b/packages/widgets/Source/FullscreenButton/FullscreenButton.js @@ -1,9 +1,5 @@ -import { - defined, - destroyObject, - DeveloperError, - getElement, -} from "@cesium/engine"; +import { destroyObject, getElement } from "@cesium/engine"; +import { defined, DeveloperError } from "@cesium/utils"; import knockout from "../ThirdParty/knockout.js"; import FullscreenButtonViewModel from "./FullscreenButtonViewModel.js"; diff --git a/packages/widgets/Source/FullscreenButton/FullscreenButtonViewModel.js b/packages/widgets/Source/FullscreenButton/FullscreenButtonViewModel.js index 7e4b3e09f414..9e3de8a3b01a 100644 --- a/packages/widgets/Source/FullscreenButton/FullscreenButtonViewModel.js +++ b/packages/widgets/Source/FullscreenButton/FullscreenButtonViewModel.js @@ -1,12 +1,7 @@ -import { - defined, - destroyObject, - DeveloperError, - Fullscreen, - getElement, -} from "@cesium/engine"; -import knockout from "../ThirdParty/knockout.js"; +import { destroyObject, getElement } from "@cesium/engine"; +import { defined, DeveloperError, Fullscreen } from "@cesium/utils"; import createCommand from "../createCommand.js"; +import knockout from "../ThirdParty/knockout.js"; /** * The view model for {@link FullscreenButton}. diff --git a/packages/widgets/Source/Geocoder/Geocoder.js b/packages/widgets/Source/Geocoder/Geocoder.js index 37f438bb37e5..d7af530622e4 100644 --- a/packages/widgets/Source/Geocoder/Geocoder.js +++ b/packages/widgets/Source/Geocoder/Geocoder.js @@ -1,10 +1,5 @@ -import { - defined, - destroyObject, - DeveloperError, - FeatureDetection, - getElement, -} from "@cesium/engine"; +import { destroyObject, getElement } from "@cesium/engine"; +import { defined, DeveloperError, FeatureDetection } from "@cesium/utils"; import knockout from "../ThirdParty/knockout.js"; import GeocoderViewModel from "./GeocoderViewModel.js"; diff --git a/packages/widgets/Source/Geocoder/GeocoderViewModel.js b/packages/widgets/Source/Geocoder/GeocoderViewModel.js index 865b2e0db705..1d4370ddf7bd 100644 --- a/packages/widgets/Source/Geocoder/GeocoderViewModel.js +++ b/packages/widgets/Source/Geocoder/GeocoderViewModel.js @@ -1,7 +1,5 @@ import { computeFlyToLocationForRectangle, - defined, - DeveloperError, destroyObject, Event, GeocoderService, @@ -13,8 +11,9 @@ import { Rectangle, sampleTerrainMostDetailed, } from "@cesium/engine"; -import knockout from "../ThirdParty/knockout.js"; +import { defined, DeveloperError } from "@cesium/utils"; import createCommand from "../createCommand.js"; +import knockout from "../ThirdParty/knockout.js"; // The height we use if geocoding to a specific point instead of an rectangle. const DEFAULT_HEIGHT = 1000; diff --git a/packages/widgets/Source/HomeButton/HomeButton.js b/packages/widgets/Source/HomeButton/HomeButton.js index 0f67ece61c05..26d2be625614 100644 --- a/packages/widgets/Source/HomeButton/HomeButton.js +++ b/packages/widgets/Source/HomeButton/HomeButton.js @@ -1,9 +1,5 @@ -import { - defined, - destroyObject, - DeveloperError, - getElement, -} from "@cesium/engine"; +import { destroyObject, getElement } from "@cesium/engine"; +import { defined, DeveloperError } from "@cesium/utils"; import knockout from "../ThirdParty/knockout.js"; import HomeButtonViewModel from "./HomeButtonViewModel.js"; diff --git a/packages/widgets/Source/HomeButton/HomeButtonViewModel.js b/packages/widgets/Source/HomeButton/HomeButtonViewModel.js index ba030c366078..6274aa7bf97a 100644 --- a/packages/widgets/Source/HomeButton/HomeButtonViewModel.js +++ b/packages/widgets/Source/HomeButton/HomeButtonViewModel.js @@ -1,6 +1,6 @@ -import { defined, DeveloperError } from "@cesium/engine"; -import knockout from "../ThirdParty/knockout.js"; +import { defined, DeveloperError } from "@cesium/utils"; import createCommand from "../createCommand.js"; +import knockout from "../ThirdParty/knockout.js"; /** * The view model for {@link HomeButton}. diff --git a/packages/widgets/Source/I3SBuildingSceneLayerExplorer/I3SBuildingSceneLayerExplorer.js b/packages/widgets/Source/I3SBuildingSceneLayerExplorer/I3SBuildingSceneLayerExplorer.js index 2c0949b0050a..0c4c9d64fe25 100644 --- a/packages/widgets/Source/I3SBuildingSceneLayerExplorer/I3SBuildingSceneLayerExplorer.js +++ b/packages/widgets/Source/I3SBuildingSceneLayerExplorer/I3SBuildingSceneLayerExplorer.js @@ -1,4 +1,4 @@ -import { Check, defined } from "@cesium/engine"; +import { Check, defined } from "@cesium/utils"; import knockout from "../ThirdParty/knockout.js"; import I3SBuildingSceneLayerExplorerViewModel from "./I3SBuildingSceneLayerExplorerViewModel.js"; diff --git a/packages/widgets/Source/I3SBuildingSceneLayerExplorer/I3SBuildingSceneLayerExplorerViewModel.js b/packages/widgets/Source/I3SBuildingSceneLayerExplorer/I3SBuildingSceneLayerExplorerViewModel.js index 47fbc6fd049f..7204e0fc517c 100644 --- a/packages/widgets/Source/I3SBuildingSceneLayerExplorer/I3SBuildingSceneLayerExplorerViewModel.js +++ b/packages/widgets/Source/I3SBuildingSceneLayerExplorer/I3SBuildingSceneLayerExplorerViewModel.js @@ -1,4 +1,4 @@ -import { defined } from "@cesium/engine"; +import { defined } from "@cesium/utils"; import knockout from "../ThirdParty/knockout.js"; function expandItemsHandler(data, event) { diff --git a/packages/widgets/Source/InfoBox/InfoBox.js b/packages/widgets/Source/InfoBox/InfoBox.js index ae2bb4ca256d..2e9fd4f51fca 100644 --- a/packages/widgets/Source/InfoBox/InfoBox.js +++ b/packages/widgets/Source/InfoBox/InfoBox.js @@ -1,13 +1,12 @@ import { buildModuleUrl, - Check, Color, - defined, destroyObject, getElement, } from "@cesium/engine"; -import knockout from "../ThirdParty/knockout.js"; +import { Check, defined } from "@cesium/utils"; import subscribeAndEvaluate from "../subscribeAndEvaluate.js"; +import knockout from "../ThirdParty/knockout.js"; import InfoBoxViewModel from "./InfoBoxViewModel.js"; /** diff --git a/packages/widgets/Source/InfoBox/InfoBoxViewModel.js b/packages/widgets/Source/InfoBox/InfoBoxViewModel.js index 21603e73e896..24bad462e8ae 100644 --- a/packages/widgets/Source/InfoBox/InfoBoxViewModel.js +++ b/packages/widgets/Source/InfoBox/InfoBoxViewModel.js @@ -1,4 +1,5 @@ -import { defined, Event } from "@cesium/engine"; +import { Event } from "@cesium/engine"; +import { defined } from "@cesium/utils"; import knockout from "../ThirdParty/knockout.js"; const cameraEnabledPath = diff --git a/packages/widgets/Source/InspectorShared.js b/packages/widgets/Source/InspectorShared.js index d5d0711c278e..eaf16af44d4b 100644 --- a/packages/widgets/Source/InspectorShared.js +++ b/packages/widgets/Source/InspectorShared.js @@ -1,4 +1,4 @@ -import { Check, defined } from "@cesium/engine"; +import { Check, defined } from "@cesium/utils"; /** * A static class with helper functions used by CesiumInspector, Cesium3DTilesInspector, and VoxelInspector diff --git a/packages/widgets/Source/NavigationHelpButton/NavigationHelpButton.js b/packages/widgets/Source/NavigationHelpButton/NavigationHelpButton.js index b71258cdb5c3..e8cce10cbbaf 100644 --- a/packages/widgets/Source/NavigationHelpButton/NavigationHelpButton.js +++ b/packages/widgets/Source/NavigationHelpButton/NavigationHelpButton.js @@ -1,11 +1,5 @@ -import { - buildModuleUrl, - defined, - destroyObject, - DeveloperError, - FeatureDetection, - getElement, -} from "@cesium/engine"; +import { buildModuleUrl, destroyObject, getElement } from "@cesium/engine"; +import { defined, DeveloperError, FeatureDetection } from "@cesium/utils"; import knockout from "../ThirdParty/knockout.js"; import NavigationHelpButtonViewModel from "./NavigationHelpButtonViewModel.js"; diff --git a/packages/widgets/Source/NavigationHelpButton/NavigationHelpButtonViewModel.js b/packages/widgets/Source/NavigationHelpButton/NavigationHelpButtonViewModel.js index 804eef307748..1fb58b24be79 100644 --- a/packages/widgets/Source/NavigationHelpButton/NavigationHelpButtonViewModel.js +++ b/packages/widgets/Source/NavigationHelpButton/NavigationHelpButtonViewModel.js @@ -1,5 +1,5 @@ -import knockout from "../ThirdParty/knockout.js"; import createCommand from "../createCommand.js"; +import knockout from "../ThirdParty/knockout.js"; /** * The view model for {@link NavigationHelpButton}. diff --git a/packages/widgets/Source/PerformanceWatchdog/PerformanceWatchdog.js b/packages/widgets/Source/PerformanceWatchdog/PerformanceWatchdog.js index 085bb0ebb89d..574995e06380 100644 --- a/packages/widgets/Source/PerformanceWatchdog/PerformanceWatchdog.js +++ b/packages/widgets/Source/PerformanceWatchdog/PerformanceWatchdog.js @@ -1,9 +1,5 @@ -import { - defined, - destroyObject, - DeveloperError, - getElement, -} from "@cesium/engine"; +import { destroyObject, getElement } from "@cesium/engine"; +import { defined, DeveloperError } from "@cesium/utils"; import knockout from "../ThirdParty/knockout.js"; import PerformanceWatchdogViewModel from "./PerformanceWatchdogViewModel.js"; diff --git a/packages/widgets/Source/PerformanceWatchdog/PerformanceWatchdogViewModel.js b/packages/widgets/Source/PerformanceWatchdog/PerformanceWatchdogViewModel.js index 3174eac2c05d..608802ade11b 100644 --- a/packages/widgets/Source/PerformanceWatchdog/PerformanceWatchdogViewModel.js +++ b/packages/widgets/Source/PerformanceWatchdog/PerformanceWatchdogViewModel.js @@ -1,11 +1,7 @@ -import { - defined, - destroyObject, - DeveloperError, - FrameRateMonitor, -} from "@cesium/engine"; -import knockout from "../ThirdParty/knockout.js"; +import { destroyObject, FrameRateMonitor } from "@cesium/engine"; +import { defined, DeveloperError } from "@cesium/utils"; import createCommand from "../createCommand.js"; +import knockout from "../ThirdParty/knockout.js"; /** * The view model for {@link PerformanceWatchdog}. diff --git a/packages/widgets/Source/ProjectionPicker/ProjectionPicker.js b/packages/widgets/Source/ProjectionPicker/ProjectionPicker.js index c596245dc8fb..75b923574d0a 100644 --- a/packages/widgets/Source/ProjectionPicker/ProjectionPicker.js +++ b/packages/widgets/Source/ProjectionPicker/ProjectionPicker.js @@ -1,10 +1,5 @@ -import { - defined, - destroyObject, - DeveloperError, - FeatureDetection, - getElement, -} from "@cesium/engine"; +import { destroyObject, getElement } from "@cesium/engine"; +import { defined, DeveloperError, FeatureDetection } from "@cesium/utils"; import knockout from "../ThirdParty/knockout.js"; import ProjectionPickerViewModel from "./ProjectionPickerViewModel.js"; diff --git a/packages/widgets/Source/ProjectionPicker/ProjectionPickerViewModel.js b/packages/widgets/Source/ProjectionPicker/ProjectionPickerViewModel.js index 7b370939c796..795be04ed397 100644 --- a/packages/widgets/Source/ProjectionPicker/ProjectionPickerViewModel.js +++ b/packages/widgets/Source/ProjectionPicker/ProjectionPickerViewModel.js @@ -1,13 +1,12 @@ import { - defined, destroyObject, - DeveloperError, EventHelper, OrthographicFrustum, SceneMode, } from "@cesium/engine"; -import knockout from "../ThirdParty/knockout.js"; +import { defined, DeveloperError } from "@cesium/utils"; import createCommand from "../createCommand.js"; +import knockout from "../ThirdParty/knockout.js"; /** * The view model for {@link ProjectionPicker}. diff --git a/packages/widgets/Source/SceneModePicker/SceneModePicker.js b/packages/widgets/Source/SceneModePicker/SceneModePicker.js index 83c028afc48a..298f73a14ce3 100644 --- a/packages/widgets/Source/SceneModePicker/SceneModePicker.js +++ b/packages/widgets/Source/SceneModePicker/SceneModePicker.js @@ -1,10 +1,5 @@ -import { - defined, - destroyObject, - DeveloperError, - FeatureDetection, - getElement, -} from "@cesium/engine"; +import { destroyObject, getElement } from "@cesium/engine"; +import { defined, DeveloperError, FeatureDetection } from "@cesium/utils"; import knockout from "../ThirdParty/knockout.js"; import SceneModePickerViewModel from "./SceneModePickerViewModel.js"; diff --git a/packages/widgets/Source/SceneModePicker/SceneModePickerViewModel.js b/packages/widgets/Source/SceneModePicker/SceneModePickerViewModel.js index 84f2a48f954d..1751f1f219d2 100644 --- a/packages/widgets/Source/SceneModePicker/SceneModePickerViewModel.js +++ b/packages/widgets/Source/SceneModePicker/SceneModePickerViewModel.js @@ -1,12 +1,7 @@ -import { - defined, - destroyObject, - DeveloperError, - EventHelper, - SceneMode, -} from "@cesium/engine"; -import knockout from "../ThirdParty/knockout.js"; +import { destroyObject, EventHelper, SceneMode } from "@cesium/engine"; +import { defined, DeveloperError } from "@cesium/utils"; import createCommand from "../createCommand.js"; +import knockout from "../ThirdParty/knockout.js"; /** * The view model for {@link SceneModePicker}. diff --git a/packages/widgets/Source/SelectionIndicator/SelectionIndicator.js b/packages/widgets/Source/SelectionIndicator/SelectionIndicator.js index a366029392d0..629f3d0e16c4 100644 --- a/packages/widgets/Source/SelectionIndicator/SelectionIndicator.js +++ b/packages/widgets/Source/SelectionIndicator/SelectionIndicator.js @@ -1,9 +1,5 @@ -import { - defined, - destroyObject, - DeveloperError, - getElement, -} from "@cesium/engine"; +import { destroyObject, getElement } from "@cesium/engine"; +import { defined, DeveloperError } from "@cesium/utils"; import knockout from "../ThirdParty/knockout.js"; import SelectionIndicatorViewModel from "./SelectionIndicatorViewModel.js"; diff --git a/packages/widgets/Source/SelectionIndicator/SelectionIndicatorViewModel.js b/packages/widgets/Source/SelectionIndicator/SelectionIndicatorViewModel.js index 5d7a9c42d3de..d274a6cb1e32 100644 --- a/packages/widgets/Source/SelectionIndicator/SelectionIndicatorViewModel.js +++ b/packages/widgets/Source/SelectionIndicator/SelectionIndicatorViewModel.js @@ -1,10 +1,5 @@ -import { - Cartesian2, - defined, - DeveloperError, - EasingFunction, - SceneTransforms, -} from "@cesium/engine"; +import { Cartesian2, EasingFunction, SceneTransforms } from "@cesium/engine"; +import { defined, DeveloperError } from "@cesium/utils"; import knockout from "../ThirdParty/knockout.js"; const screenSpacePos = new Cartesian2(); diff --git a/packages/widgets/Source/ThirdParty/knockout.js b/packages/widgets/Source/ThirdParty/knockout.js index 01292dbd6e1a..0639162d2d41 100644 --- a/packages/widgets/Source/ThirdParty/knockout.js +++ b/packages/widgets/Source/ThirdParty/knockout.js @@ -1,6 +1,6 @@ +import SvgPathBindingHandler from '../SvgPathBindingHandler.js'; import knockout from './knockout-3.5.1.js'; import knockout_es5 from './knockout-es5.js'; -import SvgPathBindingHandler from '../SvgPathBindingHandler.js'; // install the Knockout-ES5 plugin knockout_es5.attachToKo(knockout); diff --git a/packages/widgets/Source/Timeline/Timeline.js b/packages/widgets/Source/Timeline/Timeline.js index c2eb1c40d21f..43406b31a68c 100644 --- a/packages/widgets/Source/Timeline/Timeline.js +++ b/packages/widgets/Source/Timeline/Timeline.js @@ -1,11 +1,10 @@ import { ClockRange, - defined, destroyObject, - DeveloperError, getElement, JulianDate, } from "@cesium/engine"; +import { defined, DeveloperError } from "@cesium/utils"; import TimelineHighlightRange from "./TimelineHighlightRange.js"; import TimelineTrack from "./TimelineTrack.js"; diff --git a/packages/widgets/Source/Timeline/TimelineTrack.js b/packages/widgets/Source/Timeline/TimelineTrack.js index f9e0e26e697d..6af01f4db055 100644 --- a/packages/widgets/Source/Timeline/TimelineTrack.js +++ b/packages/widgets/Source/Timeline/TimelineTrack.js @@ -1,4 +1,5 @@ -import { Color, defined, JulianDate } from "@cesium/engine"; +import { Color, JulianDate } from "@cesium/engine"; +import { defined } from "@cesium/utils"; /** * @private diff --git a/packages/widgets/Source/ToggleButtonViewModel.js b/packages/widgets/Source/ToggleButtonViewModel.js index 9031adc0b582..9b4549aefb5f 100644 --- a/packages/widgets/Source/ToggleButtonViewModel.js +++ b/packages/widgets/Source/ToggleButtonViewModel.js @@ -1,4 +1,5 @@ -import { Frozen, defined, DeveloperError } from "@cesium/engine"; +import { Frozen } from "@cesium/engine"; +import { defined, DeveloperError } from "@cesium/utils"; import knockout from "./ThirdParty/knockout.js"; /** diff --git a/packages/widgets/Source/VRButton/VRButton.js b/packages/widgets/Source/VRButton/VRButton.js index 48bc9b9b6e7a..bd90f73ce4a4 100644 --- a/packages/widgets/Source/VRButton/VRButton.js +++ b/packages/widgets/Source/VRButton/VRButton.js @@ -1,9 +1,5 @@ -import { - defined, - destroyObject, - DeveloperError, - getElement, -} from "@cesium/engine"; +import { destroyObject, getElement } from "@cesium/engine"; +import { defined, DeveloperError } from "@cesium/utils"; import knockout from "../ThirdParty/knockout.js"; import VRButtonViewModel from "./VRButtonViewModel.js"; diff --git a/packages/widgets/Source/VRButton/VRButtonViewModel.js b/packages/widgets/Source/VRButton/VRButtonViewModel.js index 55e3e8efb58c..7f1bf9f587a2 100644 --- a/packages/widgets/Source/VRButton/VRButtonViewModel.js +++ b/packages/widgets/Source/VRButton/VRButtonViewModel.js @@ -1,15 +1,13 @@ import { - defined, destroyObject, - DeveloperError, EventHelper, - Fullscreen, getElement, OrthographicFrustum, } from "@cesium/engine"; -import knockout from "../ThirdParty/knockout.js"; +import { defined, DeveloperError, Fullscreen } from "@cesium/utils"; import NoSleep from "nosleep.js"; import createCommand from "../createCommand.js"; +import knockout from "../ThirdParty/knockout.js"; function lockScreen(orientation) { let locked = false; diff --git a/packages/widgets/Source/Viewer/Viewer.js b/packages/widgets/Source/Viewer/Viewer.js index 281b5d977f4e..b1c678b806ef 100644 --- a/packages/widgets/Source/Viewer/Viewer.js +++ b/packages/widgets/Source/Viewer/Viewer.js @@ -2,24 +2,23 @@ import { BoundingSphere, BoundingSphereState, Cartesian3, - CesiumWidget, Cesium3DTileFeature, + CesiumWidget, Clock, ConstantPositionProperty, - Frozen, - defined, destroyObject, - DeveloperError, Entity, Event, EventHelper, + Frozen, getElement, + IonGeocoderService, JulianDate, Math as CesiumMath, Property, ScreenSpaceEventType, - IonGeocoderService, } from "@cesium/engine"; +import { defined, DeveloperError } from "@cesium/utils"; import Animation from "../Animation/Animation.js"; import AnimationViewModel from "../Animation/AnimationViewModel.js"; import BaseLayerPicker from "../BaseLayerPicker/BaseLayerPicker.js"; diff --git a/packages/widgets/Source/Viewer/viewerCesium3DTilesInspectorMixin.js b/packages/widgets/Source/Viewer/viewerCesium3DTilesInspectorMixin.js index c8cf827bdb08..d39aeac9c569 100644 --- a/packages/widgets/Source/Viewer/viewerCesium3DTilesInspectorMixin.js +++ b/packages/widgets/Source/Viewer/viewerCesium3DTilesInspectorMixin.js @@ -1,4 +1,4 @@ -import { Check } from "@cesium/engine"; +import { Check } from "@cesium/utils"; import Cesium3DTilesInspector from "../Cesium3DTilesInspector/Cesium3DTilesInspector.js"; /** diff --git a/packages/widgets/Source/Viewer/viewerCesiumInspectorMixin.js b/packages/widgets/Source/Viewer/viewerCesiumInspectorMixin.js index a5e0afe8c9e6..8af1203af5c9 100644 --- a/packages/widgets/Source/Viewer/viewerCesiumInspectorMixin.js +++ b/packages/widgets/Source/Viewer/viewerCesiumInspectorMixin.js @@ -1,4 +1,4 @@ -import { defined, DeveloperError } from "@cesium/engine"; +import { defined, DeveloperError } from "@cesium/utils"; import CesiumInspector from "../CesiumInspector/CesiumInspector.js"; /** diff --git a/packages/widgets/Source/Viewer/viewerDragDropMixin.js b/packages/widgets/Source/Viewer/viewerDragDropMixin.js index 4ff0ea74821b..722fcb9cd2cc 100644 --- a/packages/widgets/Source/Viewer/viewerDragDropMixin.js +++ b/packages/widgets/Source/Viewer/viewerDragDropMixin.js @@ -1,15 +1,14 @@ import { CzmlDataSource, - Frozen, - defined, - DeveloperError, Event, + Frozen, GeoJsonDataSource, getElement, GpxDataSource, KmlDataSource, wrapFunction, } from "@cesium/engine"; +import { defined, DeveloperError } from "@cesium/utils"; /** * A mixin which adds default drag and drop support for CZML files to the Viewer widget. * Rather than being called directly, this function is normally passed as diff --git a/packages/widgets/Source/Viewer/viewerPerformanceWatchdogMixin.js b/packages/widgets/Source/Viewer/viewerPerformanceWatchdogMixin.js index a313656c7753..cb94ad6b6317 100644 --- a/packages/widgets/Source/Viewer/viewerPerformanceWatchdogMixin.js +++ b/packages/widgets/Source/Viewer/viewerPerformanceWatchdogMixin.js @@ -1,4 +1,5 @@ -import { Frozen, defined, DeveloperError } from "@cesium/engine"; +import { Frozen } from "@cesium/engine"; +import { defined, DeveloperError } from "@cesium/utils"; import PerformanceWatchdog from "../PerformanceWatchdog/PerformanceWatchdog.js"; /** diff --git a/packages/widgets/Source/Viewer/viewerVoxelInspectorMixin.js b/packages/widgets/Source/Viewer/viewerVoxelInspectorMixin.js index 4a0d825cde3b..dbf30c84db17 100644 --- a/packages/widgets/Source/Viewer/viewerVoxelInspectorMixin.js +++ b/packages/widgets/Source/Viewer/viewerVoxelInspectorMixin.js @@ -1,4 +1,4 @@ -import { Check } from "@cesium/engine"; +import { Check } from "@cesium/utils"; import VoxelInspector from "../VoxelInspector/VoxelInspector.js"; /** diff --git a/packages/widgets/Source/VoxelInspector/VoxelInspector.js b/packages/widgets/Source/VoxelInspector/VoxelInspector.js index c9e0a6ad4734..33b23c7e83e0 100644 --- a/packages/widgets/Source/VoxelInspector/VoxelInspector.js +++ b/packages/widgets/Source/VoxelInspector/VoxelInspector.js @@ -1,11 +1,11 @@ import { Math as CesiumMath, - Check, destroyObject, getElement, } from "@cesium/engine"; -import knockout from "../ThirdParty/knockout.js"; +import { Check } from "@cesium/utils"; import InspectorShared from "../InspectorShared.js"; +import knockout from "../ThirdParty/knockout.js"; import VoxelInspectorViewModel from "./VoxelInspectorViewModel.js"; /** diff --git a/packages/widgets/Source/VoxelInspector/VoxelInspectorViewModel.js b/packages/widgets/Source/VoxelInspector/VoxelInspectorViewModel.js index dca7dec09952..219965284ffe 100644 --- a/packages/widgets/Source/VoxelInspector/VoxelInspectorViewModel.js +++ b/packages/widgets/Source/VoxelInspector/VoxelInspectorViewModel.js @@ -1,15 +1,14 @@ import { Cartesian3, - Check, - defined, + CustomShader, destroyObject, HeadingPitchRoll, Math as CesiumMath, Matrix3, Matrix4, - CustomShader, VoxelShapeType, } from "@cesium/engine"; +import { Check, defined } from "@cesium/utils"; import knockout from "../ThirdParty/knockout.js"; function formatShaderString(str) { diff --git a/packages/widgets/Source/createCommand.js b/packages/widgets/Source/createCommand.js index f98d7ecacac9..724484fa3605 100644 --- a/packages/widgets/Source/createCommand.js +++ b/packages/widgets/Source/createCommand.js @@ -1,4 +1,5 @@ -import { defined, DeveloperError, Event } from "@cesium/engine"; +import { Event } from "@cesium/engine"; +import { defined, DeveloperError } from "@cesium/utils"; import knockout from "./ThirdParty/knockout.js"; /** diff --git a/packages/widgets/Specs/Animation/AnimationSpec.js b/packages/widgets/Specs/Animation/AnimationSpec.js index 55363ddfa930..37460a9369ae 100644 --- a/packages/widgets/Specs/Animation/AnimationSpec.js +++ b/packages/widgets/Specs/Animation/AnimationSpec.js @@ -1,4 +1,4 @@ -import { defined } from "@cesium/engine"; +import { defined } from "@cesium/utils"; import { Animation, AnimationViewModel, ClockViewModel } from "../../index.js"; diff --git a/packages/widgets/Specs/BaseLayerPicker/BaseLayerPickerSpec.js b/packages/widgets/Specs/BaseLayerPicker/BaseLayerPickerSpec.js index fe2a28bc7039..4d72679d6c76 100644 --- a/packages/widgets/Specs/BaseLayerPicker/BaseLayerPickerSpec.js +++ b/packages/widgets/Specs/BaseLayerPicker/BaseLayerPickerSpec.js @@ -1,8 +1,8 @@ import { EllipsoidTerrainProvider, - FeatureDetection, ImageryLayerCollection, } from "@cesium/engine"; +import { FeatureDetection } from "@cesium/utils"; import { BaseLayerPicker } from "../../index.js"; diff --git a/packages/widgets/Specs/BaseLayerPicker/BaseLayerPickerViewModelSpec.js b/packages/widgets/Specs/BaseLayerPicker/BaseLayerPickerViewModelSpec.js index 13bcc3ab7eda..029f2f0f6879 100644 --- a/packages/widgets/Specs/BaseLayerPicker/BaseLayerPickerViewModelSpec.js +++ b/packages/widgets/Specs/BaseLayerPicker/BaseLayerPickerViewModelSpec.js @@ -5,8 +5,8 @@ import { ImageryLayerCollection, } from "@cesium/engine"; -import { BaseLayerPickerViewModel, ProviderViewModel } from "../../index.js"; import pollToPromise from "../../../../Specs/pollToPromise.js"; +import { BaseLayerPickerViewModel, ProviderViewModel } from "../../index.js"; describe("Widgets/BaseLayerPicker/BaseLayerPickerViewModel", function () { function MockGlobe() { diff --git a/packages/widgets/Specs/BaseLayerPicker/ProviderViewModelSpec.js b/packages/widgets/Specs/BaseLayerPicker/ProviderViewModelSpec.js index dc581829aad5..ea3f2edcbc16 100644 --- a/packages/widgets/Specs/BaseLayerPicker/ProviderViewModelSpec.js +++ b/packages/widgets/Specs/BaseLayerPicker/ProviderViewModelSpec.js @@ -1,4 +1,4 @@ -import { knockout, ProviderViewModel, createCommand } from "../../index.js"; +import { createCommand, knockout, ProviderViewModel } from "../../index.js"; describe("Widgets/BaseLayerPicker/ProviderViewModel", function () { let spyCreationFunction; diff --git a/packages/widgets/Specs/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModelSpec.js b/packages/widgets/Specs/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModelSpec.js index 0442fde73347..0d1ab178e110 100644 --- a/packages/widgets/Specs/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModelSpec.js +++ b/packages/widgets/Specs/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModelSpec.js @@ -4,8 +4,8 @@ import { Globe, Math as CesiumMath, } from "@cesium/engine"; -import { Cesium3DTilesInspectorViewModel } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; +import { Cesium3DTilesInspectorViewModel } from "../../index.js"; describe( "Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel", diff --git a/packages/widgets/Specs/CesiumInspector/CesiumInspectorViewModelSpec.js b/packages/widgets/Specs/CesiumInspector/CesiumInspectorViewModelSpec.js index 29f535510379..0b54946d5fc1 100644 --- a/packages/widgets/Specs/CesiumInspector/CesiumInspectorViewModelSpec.js +++ b/packages/widgets/Specs/CesiumInspector/CesiumInspectorViewModelSpec.js @@ -1,16 +1,16 @@ import { - defined, - GeometryInstance, - Rectangle, - RectangleGeometry, - WebMercatorTilingScheme, EllipsoidSurfaceAppearance, + GeometryInstance, Globe, GlobeSurfaceTile, + Math as CesiumMath, Primitive, QuadtreeTile, - Math as CesiumMath, + Rectangle, + RectangleGeometry, + WebMercatorTilingScheme, } from "@cesium/engine"; +import { defined } from "@cesium/utils"; import { CesiumInspectorViewModel } from "../../index.js"; diff --git a/packages/widgets/Specs/FullscreenButton/FullscreenButtonViewModelSpec.js b/packages/widgets/Specs/FullscreenButton/FullscreenButtonViewModelSpec.js index e8d188dd1f10..e98f75ea4907 100644 --- a/packages/widgets/Specs/FullscreenButton/FullscreenButtonViewModelSpec.js +++ b/packages/widgets/Specs/FullscreenButton/FullscreenButtonViewModelSpec.js @@ -1,4 +1,4 @@ -import { Fullscreen } from "@cesium/engine"; +import { Fullscreen } from "@cesium/utils"; import { FullscreenButtonViewModel } from "../../index.js"; diff --git a/packages/widgets/Specs/Geocoder/GeocoderViewModelSpec.js b/packages/widgets/Specs/Geocoder/GeocoderViewModelSpec.js index 350e4fd4e7ba..6a8f04f49cfa 100644 --- a/packages/widgets/Specs/Geocoder/GeocoderViewModelSpec.js +++ b/packages/widgets/Specs/Geocoder/GeocoderViewModelSpec.js @@ -1,7 +1,7 @@ import { Cartesian3, Credit, Rectangle } from "@cesium/engine"; -import { GeocoderViewModel } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; import pollToPromise from "../../../../Specs/pollToPromise.js"; +import { GeocoderViewModel } from "../../index.js"; describe( "Widgets/Geocoder/GeocoderViewModel", diff --git a/packages/widgets/Specs/I3SBSLExplorer/I3SBSLExplorerSpec.js b/packages/widgets/Specs/I3SBSLExplorer/I3SBSLExplorerSpec.js index 7bc9ffff6d81..9bb409ee387e 100644 --- a/packages/widgets/Specs/I3SBSLExplorer/I3SBSLExplorerSpec.js +++ b/packages/widgets/Specs/I3SBSLExplorer/I3SBSLExplorerSpec.js @@ -1,5 +1,5 @@ -import { I3SBuildingSceneLayerExplorer } from "../../index.js"; import DomEventSimulator from "../../../../Specs/DomEventSimulator.js"; +import { I3SBuildingSceneLayerExplorer } from "../../index.js"; describe("Widgets/I3SBuildingSceneLayerExplorer/I3SBuildingSceneLayerExplorer", function () { const i3sProvider = { diff --git a/packages/widgets/Specs/InfoBox/InfoBoxSpec.js b/packages/widgets/Specs/InfoBox/InfoBoxSpec.js index 87becab3ad41..fab985f10305 100644 --- a/packages/widgets/Specs/InfoBox/InfoBoxSpec.js +++ b/packages/widgets/Specs/InfoBox/InfoBoxSpec.js @@ -1,4 +1,4 @@ -import { defined } from "@cesium/engine"; +import { defined } from "@cesium/utils"; import { InfoBox } from "../../index.js"; import pollToPromise from "../../../../Specs/pollToPromise.js"; diff --git a/packages/widgets/Specs/NavigationHelpButton/NavigationHelpButtonSpec.js b/packages/widgets/Specs/NavigationHelpButton/NavigationHelpButtonSpec.js index c0eda2e7112b..c148128e1065 100644 --- a/packages/widgets/Specs/NavigationHelpButton/NavigationHelpButtonSpec.js +++ b/packages/widgets/Specs/NavigationHelpButton/NavigationHelpButtonSpec.js @@ -1,4 +1,4 @@ -import { FeatureDetection } from "@cesium/engine"; +import { FeatureDetection } from "@cesium/utils"; import { NavigationHelpButton } from "../../index.js"; diff --git a/packages/widgets/Specs/PerformanceWatchdog/PerformanceWatchdogViewModelSpec.js b/packages/widgets/Specs/PerformanceWatchdog/PerformanceWatchdogViewModelSpec.js index 111844304a47..c5c8ac7d2b7f 100644 --- a/packages/widgets/Specs/PerformanceWatchdog/PerformanceWatchdogViewModelSpec.js +++ b/packages/widgets/Specs/PerformanceWatchdog/PerformanceWatchdogViewModelSpec.js @@ -1,4 +1,5 @@ -import { defined, getTimestamp, FrameRateMonitor } from "@cesium/engine"; +import { FrameRateMonitor, getTimestamp } from "@cesium/engine"; +import { defined } from "@cesium/utils"; import { PerformanceWatchdogViewModel } from "../../index.js"; diff --git a/packages/widgets/Specs/ProjectionPicker/ProjectionPickerSpec.js b/packages/widgets/Specs/ProjectionPicker/ProjectionPickerSpec.js index 5e422e037993..23768c5dbea8 100644 --- a/packages/widgets/Specs/ProjectionPicker/ProjectionPickerSpec.js +++ b/packages/widgets/Specs/ProjectionPicker/ProjectionPickerSpec.js @@ -1,4 +1,4 @@ -import { FeatureDetection } from "@cesium/engine"; +import { FeatureDetection } from "@cesium/utils"; import { ProjectionPicker } from "../../index.js"; diff --git a/packages/widgets/Specs/SceneModePicker/SceneModePickerSpec.js b/packages/widgets/Specs/SceneModePicker/SceneModePickerSpec.js index 123e4a9f217c..590a193ef75d 100644 --- a/packages/widgets/Specs/SceneModePicker/SceneModePickerSpec.js +++ b/packages/widgets/Specs/SceneModePicker/SceneModePickerSpec.js @@ -1,4 +1,4 @@ -import { FeatureDetection } from "@cesium/engine"; +import { FeatureDetection } from "@cesium/utils"; import { SceneModePicker } from "../../index.js"; diff --git a/packages/widgets/Specs/VRButton/VRButtonViewModelSpec.js b/packages/widgets/Specs/VRButton/VRButtonViewModelSpec.js index 66ccd8ceafb8..70ab21e34fd7 100644 --- a/packages/widgets/Specs/VRButton/VRButtonViewModelSpec.js +++ b/packages/widgets/Specs/VRButton/VRButtonViewModelSpec.js @@ -1,4 +1,4 @@ -import { Fullscreen } from "@cesium/engine"; +import { Fullscreen } from "@cesium/utils"; import { VRButtonViewModel } from "../../index.js"; import createScene from "../../../../Specs/createScene.js"; diff --git a/packages/widgets/Specs/Viewer/ViewerSpec.js b/packages/widgets/Specs/Viewer/ViewerSpec.js index 822df41c034b..2ff591e8cf8e 100644 --- a/packages/widgets/Specs/Viewer/ViewerSpec.js +++ b/packages/widgets/Specs/Viewer/ViewerSpec.js @@ -1,45 +1,45 @@ import { + Camera, + CameraFlightPath, Cartesian3, CartographicGeocoderService, CesiumWidget, Clock, - CreditDisplay, - EllipsoidTerrainProvider, - Rectangle, - WebMercatorProjection, ConstantPositionProperty, ConstantProperty, + CreditDisplay, DataSourceCollection, DataSourceDisplay, + EllipsoidTerrainProvider, Entity, - Camera, - CameraFlightPath, ImageryLayer, ImageryLayerCollection, - SceneMode, - ShadowMode, IonGeocodeProviderType, IonGeocoderService, + Rectangle, + SceneMode, + ShadowMode, + WebMercatorProjection, } from "@cesium/engine"; import { Animation, BaseLayerPicker, - ProviderViewModel, ClockViewModel, FullscreenButton, Geocoder, HomeButton, NavigationHelpButton, + ProviderViewModel, SceneModePicker, SelectionIndicator, Timeline, } from "../../index.js"; -import createViewer from "../createViewer.js"; import DomEventSimulator from "../../../../Specs/DomEventSimulator.js"; import MockDataSource from "../../../../Specs/MockDataSource.js"; import pollToPromise from "../../../../Specs/pollToPromise.js"; +import createViewer from "../createViewer.js"; describe( "Widgets/Viewer/Viewer", diff --git a/packages/widgets/Specs/Viewer/viewerDragDropMixinSpec.js b/packages/widgets/Specs/Viewer/viewerDragDropMixinSpec.js index 882900e0b2b4..7e61a2ed9f5c 100644 --- a/packages/widgets/Specs/Viewer/viewerDragDropMixinSpec.js +++ b/packages/widgets/Specs/Viewer/viewerDragDropMixinSpec.js @@ -1,10 +1,11 @@ -import { defined, TimeInterval } from "@cesium/engine"; +import { TimeInterval } from "@cesium/engine"; +import { defined } from "@cesium/utils"; import { viewerDragDropMixin } from "../../index.js"; -import createViewer from "../createViewer.js"; import DomEventSimulator from "../../../../Specs/DomEventSimulator.js"; import pollToPromise from "../../../../Specs/pollToPromise.js"; +import createViewer from "../createViewer.js"; describe( "Widgets/Viewer/viewerDragDropMixin", diff --git a/packages/widgets/Specs/createCommandSpec.js b/packages/widgets/Specs/createCommandSpec.js index 2c271576b96e..7b9af5f94905 100644 --- a/packages/widgets/Specs/createCommandSpec.js +++ b/packages/widgets/Specs/createCommandSpec.js @@ -1,5 +1,5 @@ -import { createCommand, knockout } from "../index.js"; import getArguments from "../../../Specs/getArguments.js"; +import { createCommand, knockout } from "../index.js"; describe("Widgets/createCommand", function () { let spyFunction; diff --git a/packages/widgets/package.json b/packages/widgets/package.json index 87725f5e8618..78720b9c1401 100644 --- a/packages/widgets/package.json +++ b/packages/widgets/package.json @@ -29,6 +29,7 @@ }, "dependencies": { "@cesium/engine": "^17.0.0", + "@cesium/utils": "^1.0.0", "nosleep.js": "^0.12.0" }, "type": "module", diff --git a/scripts/build.js b/scripts/build.js index 80acbd31ddbd..7db4222f5696 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -1,9 +1,9 @@ import child_process from "child_process"; import { existsSync, readFileSync, statSync } from "fs"; import { readFile, writeFile } from "fs/promises"; +import { createRequire } from "module"; import { EOL } from "os"; import path from "path"; -import { createRequire } from "module"; import { finished } from "stream/promises"; import esbuild from "esbuild"; @@ -11,6 +11,8 @@ import { globby } from "globby"; import glslStripComments from "glsl-strip-comments"; import gulp from "gulp"; import { rimraf } from "rimraf"; +import ts from "typescript"; +import { build } from "vite"; import { mkdirp } from "mkdirp"; @@ -261,6 +263,10 @@ const workspaceSourceFiles = { "!packages/engine/Source/ThirdParty/_*", ], widgets: ["packages/widgets/Source/**/*.js"], + utils: [ + "packages/utils/Build/Source/**/*.js", + "!packages/utils/Build/Source/index.js", + ] }; /** @@ -307,6 +313,7 @@ export async function createCesiumJs() { const workspaceSpecFiles = { engine: ["packages/engine/Specs/**/*Spec.js"], widgets: ["packages/widgets/Specs/**/*Spec.js"], + utils: ["packages/utils/Build/Specs/**/*Spec.js"], }; /** @@ -982,6 +989,26 @@ async function bundleSpecs(options) { }); } +export const buildUtils = async () => { + await build({ + root: "./packages/utils", + configFile: "./packages/utils/vite.config.ts" + }); + + const parsed = ts.getParsedCommandLineOfConfigFile( + "./packages/utils/tsconfig.json", + {}, + ts.sys + ); + + const program = ts.createProgram({ + rootNames: parsed.fileNames, + options: parsed.options, + }); + + program.emit(); +} + /** * Builds the engine workspace. * diff --git a/scripts/createRoute.js b/scripts/createRoute.js index 0775ea777f65..6586d2f70e14 100644 --- a/scripts/createRoute.js +++ b/scripts/createRoute.js @@ -1,5 +1,5 @@ -import ContextCache from "./ContextCache.js"; import path from "path"; +import ContextCache from "./ContextCache.js"; function formatTimeSinceInSeconds(start) { return Math.ceil((performance.now() - start) / 100) / 10; diff --git a/server.js b/server.js index f536cd4b5acf..d184c520ee92 100644 --- a/server.js +++ b/server.js @@ -13,12 +13,12 @@ import ContextCache from "./scripts/ContextCache.js"; import createRoute from "./scripts/createRoute.js"; import { + buildCesium, createCesiumJs, - createJsHintOptions, createCombinedSpecList, - glslToJavaScript, createIndexJs, - buildCesium, + createJsHintOptions, + glslToJavaScript, } from "./scripts/build.js"; const argv = yargs(process.argv) From cc9cff0bef540bfd691b819b985e4e06d4af450d Mon Sep 17 00:00:00 2001 From: "jerome.fayot" Date: Wed, 7 May 2025 09:46:41 +0200 Subject: [PATCH 2/3] fixed merge issue --- packages/engine/Source/Scene/VoxelCylinderShape.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/engine/Source/Scene/VoxelCylinderShape.js b/packages/engine/Source/Scene/VoxelCylinderShape.js index 9c05d159bdb1..c1e303941842 100644 --- a/packages/engine/Source/Scene/VoxelCylinderShape.js +++ b/packages/engine/Source/Scene/VoxelCylinderShape.js @@ -4,7 +4,6 @@ import Cartesian2 from "../Core/Cartesian2.js"; import Cartesian3 from "../Core/Cartesian3.js"; import Cartesian4 from "../Core/Cartesian4.js"; import CesiumMath from "../Core/Math.js"; -import Check from "../Core/Check.js"; import Matrix3 from "../Core/Matrix3.js"; import Matrix4 from "../Core/Matrix4.js"; import OrientedBoundingBox from "../Core/OrientedBoundingBox.js"; From 4df7b2928522a792a258dd682384b2851ca58b62 Mon Sep 17 00:00:00 2001 From: "jerome.fayot" Date: Wed, 7 May 2025 09:57:16 +0200 Subject: [PATCH 3/3] fixed prettier issue --- packages/widgets/Source/VoxelInspector/VoxelInspector.js | 6 +----- scripts/build.js | 8 ++++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/widgets/Source/VoxelInspector/VoxelInspector.js b/packages/widgets/Source/VoxelInspector/VoxelInspector.js index 33b23c7e83e0..f240e2deecef 100644 --- a/packages/widgets/Source/VoxelInspector/VoxelInspector.js +++ b/packages/widgets/Source/VoxelInspector/VoxelInspector.js @@ -1,8 +1,4 @@ -import { - Math as CesiumMath, - destroyObject, - getElement, -} from "@cesium/engine"; +import { Math as CesiumMath, destroyObject, getElement } from "@cesium/engine"; import { Check } from "@cesium/utils"; import InspectorShared from "../InspectorShared.js"; import knockout from "../ThirdParty/knockout.js"; diff --git a/scripts/build.js b/scripts/build.js index 7db4222f5696..d6e4f2237f4a 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -266,7 +266,7 @@ const workspaceSourceFiles = { utils: [ "packages/utils/Build/Source/**/*.js", "!packages/utils/Build/Source/index.js", - ] + ], }; /** @@ -992,13 +992,13 @@ async function bundleSpecs(options) { export const buildUtils = async () => { await build({ root: "./packages/utils", - configFile: "./packages/utils/vite.config.ts" + configFile: "./packages/utils/vite.config.ts", }); const parsed = ts.getParsedCommandLineOfConfigFile( "./packages/utils/tsconfig.json", {}, - ts.sys + ts.sys, ); const program = ts.createProgram({ @@ -1007,7 +1007,7 @@ export const buildUtils = async () => { }); program.emit(); -} +}; /** * Builds the engine workspace.