diff --git a/scripts/package-boundaries.json b/scripts/package-boundaries.json index 172a936cb..b7ff89969 100644 --- a/scripts/package-boundaries.json +++ b/scripts/package-boundaries.json @@ -11,7 +11,7 @@ "src/data/geojsonPins.js", "src/render/cesium/heights.js", "src/render/cesium/camera.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/aircraftRecession.js", "src/data/iconAtlas.js", "src/data/iconSet.js", @@ -894,7 +894,7 @@ "src/ui/cockpitRollingValue.js", "src/ui/cockpitCamera.js", "src/render/cesium/camera.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/aircraftRecession.js", "src/data/motionModel.js", "src/data/iconAtlas.js", @@ -1050,7 +1050,7 @@ "src/sky/stars.js", "src/renderGovernor.js", "src/data/bundledJson.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/aircraftRecession.js", "src/data/motionModel.js", "src/geo/julian.js", @@ -1339,7 +1339,7 @@ "src/scenes/director.js", "src/data/followed.js", "src/render/cesium/camera.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/aircraftRecession.js", "src/data/motionModel.js", "src/data/iconSet.js", @@ -1524,7 +1524,7 @@ "src/render/motion/iconBook.js", "src/data/aircraftModelLayer.js", "src/data/aircraftMotionRegime.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/iconSet.js", "src/geo/horizon.js", "src/data/iconSegment.js", @@ -1637,7 +1637,7 @@ "src/render/motion/iconBook.js", "src/data/aircraftModelLayer.js", "src/data/aircraftMotionRegime.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/iconSet.js", "src/geo/horizon.js", "src/data/iconSegment.js", @@ -1749,7 +1749,7 @@ "src/render/motion/iconBook.js", "src/layers/vessels/iconBook.js", "src/data/entityRecords.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/iconSet.js", "src/geo/horizon.js", "src/data/iconSegment.js", @@ -1821,7 +1821,7 @@ "src/maps/google3d.js", "src/render/cesium/imagery.js", "src/render/cesium/tileRequests.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/aircraftRecession.js", "src/data/motionModel.js", "src/geo/julian.js", @@ -1942,7 +1942,7 @@ "src/layers/firms/queries.js", "src/layers/firms/rendering.js", "src/data/entityRecords.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/iconSet.js", "src/geo/horizon.js", "src/data/iconSegment.js", @@ -2010,7 +2010,7 @@ "src/layers/satellites/testing.js", "src/layers/satellites/tracking.js", "src/render/cesium/camera.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/aircraftRecession.js", "src/data/iconSet.js", "src/geo/horizon.js", @@ -2079,7 +2079,7 @@ "src/layers/launches/controls.js", "src/layers/launches/index.js", "src/render/cesium/camera.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/aircraftRecession.js", "src/data/motionModel.js", "src/geo/julian.js", @@ -2166,7 +2166,7 @@ "src/layers/installations/controls.js", "src/geo/geodesic.js", "src/render/cesium/camera.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/aircraftRecession.js", "src/data/iconAtlas.js", "src/data/motionModel.js", @@ -2363,7 +2363,7 @@ "src/layers/traffic/timing.js", "src/layers/traffic/viewport.js", "src/render/rendererOf.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/iconSet.js", "src/geo/horizon.js", "src/data/aircraftRecession.js", @@ -2539,7 +2539,7 @@ "src/layers/cctv/projection.js", "src/layers/cctv/videoPlayback.js", "src/layers/cctv/rendering.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/iconSet.js", "src/geo/horizon.js", "src/data/iconSegment.js", @@ -2593,7 +2593,7 @@ "modules": [ "src/layers/streetLevel/index.js", "src/render/cesium/credits.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/aircraftRecession.js", "src/data/iconSet.js", "src/geo/horizon.js", @@ -2793,7 +2793,7 @@ "src/layers/radio/navigation.js", "src/data/followed.js", "src/render/cesium/camera.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/aircraftRecession.js", "src/data/iconSet.js", "src/geo/horizon.js", @@ -2967,7 +2967,7 @@ "src/maps/catalog.js", "src/maps/controller.js", "src/render/cesium/globe.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/aircraftRecession.js", "src/data/iconSet.js", "src/geo/horizon.js", @@ -3153,7 +3153,7 @@ "src/hudLayoutPolicy.js", "src/ui/radioPanelPlacement.js", "src/cyberSonarGpu.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/iconSet.js", "src/data/iconSegment.js", "src/data/iconAtlas.js", @@ -4199,7 +4199,7 @@ "src/data/aircraftModelLayer.js", "src/data/aircraftMotionRegime.js", "src/geo/julian.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/iconSet.js", "src/data/iconSegment.js", "src/data/iconAtlas.js", @@ -4892,7 +4892,7 @@ "src/layers/firms/anchors.js", "src/locations.js", "src/render/cesium/camera.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/aircraftRecession.js", "src/data/iconSet.js", "src/geo/horizon.js", @@ -5019,7 +5019,7 @@ "src/geo/index.js", "src/ui/navigationController.js", "src/render/cesium/camera.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/aircraftRecession.js", "src/data/iconSet.js", "src/geo/horizon.js", @@ -5570,7 +5570,7 @@ "src/cyberSonar.js", "src/celestialRing.js", "src/render/cesium/camera.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/aircraftRecession.js", "src/data/iconSet.js", "src/geo/horizon.js", @@ -5713,7 +5713,7 @@ "src/layers/transit/viewport.js", "src/geo/rectangle.js", "src/render/rendererOf.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/aircraftRecession.js", "src/data/iconSet.js", "src/geo/horizon.js", @@ -5974,7 +5974,7 @@ "src/data/pickRegistry.js", "src/input/dispatcher.js", "src/render/cesium/drawHit.js", - "src/data/iconSetPrimitive.js", + "src/render/cesium/iconSetPrimitive.js", "src/data/aircraftRecession.js", "src/data/motionModel.js", "src/data/iconSet.js", diff --git a/src/cyberSonarGpu.js b/src/cyberSonarGpu.js index 9689d534b..70e7e6908 100644 --- a/src/cyberSonarGpu.js +++ b/src/cyberSonarGpu.js @@ -1,5 +1,5 @@ import * as Cesium from 'cesium'; -import { IconSetPrimitive } from './data/iconSetPrimitive.js'; +import { IconSetPrimitive } from './render/cesium/iconSetPrimitive.js'; // Narrow, version-tested engine adapter. Cesium has no public custom shader // option for native point/billboard collections. Do not patch its prototypes or diff --git a/src/layers/cctv/rendering.js b/src/layers/cctv/rendering.js index ea06324a6..72fbd4a49 100644 --- a/src/layers/cctv/rendering.js +++ b/src/layers/cctv/rendering.js @@ -18,7 +18,7 @@ import { } from './policy.js'; import { createIconSet } from '../../data/iconSet.js'; import { writeHoldSegment } from '../../data/iconSegment.js'; -import { IconSetPrimitive } from '../../data/iconSetPrimitive.js'; +import { IconSetPrimitive } from '../../render/cesium/iconSetPrimitive.js'; import { iconAtlas } from '../../data/iconAtlas.js'; import { cctvPicks } from './pickState.js'; import { horizonOccluder } from '../../data/iconOrientation.js'; diff --git a/src/layers/firms/rendering.js b/src/layers/firms/rendering.js index 19d8e7f8d..7a052515c 100644 --- a/src/layers/firms/rendering.js +++ b/src/layers/firms/rendering.js @@ -9,7 +9,7 @@ import { FIRMS_OVERLAY_SOURCE_ID } from '../../data/firmsLabels.js'; import { LOD_LEVELS, CONTEXT_TOP_N, GLOW_SPRITE_PX } from './policy.js'; import { createIconSet, ICON_CULL_LIFT } from '../../data/iconSet.js'; import { writeHoldSegment } from '../../data/iconSegment.js'; -import { IconSetPrimitive } from '../../data/iconSetPrimitive.js'; +import { IconSetPrimitive } from '../../render/cesium/iconSetPrimitive.js'; import { iconAtlas } from '../../data/iconAtlas.js'; export function createRendering({ diff --git a/src/render/cesium/draw.test.mjs b/src/render/cesium/draw.test.mjs index 361e7da7e..98870e9c6 100644 --- a/src/render/cesium/draw.test.mjs +++ b/src/render/cesium/draw.test.mjs @@ -2781,7 +2781,7 @@ async function vesselLayerOver(scene, sprites) { } test('the vessels layer draws its ships as one GPU icon set that holds them on course', async () => { - const { IconSetPrimitive } = await import('../../data/iconSetPrimitive.js'); + const { IconSetPrimitive } = await import('./iconSetPrimitive.js'); const { ICON_CULL_LIFT, ICON_ROTATES } = await import('../../data/iconSet.js'); const spriteOrder = await import('../../data/spriteOrder.js'); @@ -2908,7 +2908,7 @@ test('vessels on a host with no sprite-set registry still draw, and say so once' test('an aircraft layer draws its contacts as one GPU icon set moving on the delayed live clock', async () => { const { createAircraftIcons } = await import('../../data/aircraftIconLayer.js'); - const { IconSetPrimitive } = await import('../../data/iconSetPrimitive.js'); + const { IconSetPrimitive } = await import('./iconSetPrimitive.js'); const { ICON_CULL_LIFT, ICON_RECEDES, ICON_ROTATES } = await import('../../data/iconSet.js'); const { iconAtlas, nearImageSwitchPx } = diff --git a/src/render/cesium/gpuIcons.js b/src/render/cesium/gpuIcons.js index ea7f0af7b..00c45af9c 100644 --- a/src/render/cesium/gpuIcons.js +++ b/src/render/cesium/gpuIcons.js @@ -50,10 +50,7 @@ import { writeHoldSegment, writeLerpSegment, } from '../../data/iconSegment.js'; -import { - contextIconSlots, - IconSetPrimitive, -} from '../../data/iconSetPrimitive.js'; +import { contextIconSlots, IconSetPrimitive } from './iconSetPrimitive.js'; import { iconAtlas, MAX_ICON_SLOTS } from '../../data/iconAtlas.js'; import { glideOffset, diff --git a/src/render/cesium/gpuIcons.test.mjs b/src/render/cesium/gpuIcons.test.mjs index e7823dbca..c5ec4958a 100644 --- a/src/render/cesium/gpuIcons.test.mjs +++ b/src/render/cesium/gpuIcons.test.mjs @@ -3,7 +3,7 @@ import * as Cesium from 'cesium'; import test from 'node:test'; import { createCesiumDraw } from './draw.js'; import { drawHitOf } from './drawHit.js'; -import { IconSetPrimitive } from '../../data/iconSetPrimitive.js'; +import { IconSetPrimitive } from './iconSetPrimitive.js'; import { MAX_ICON_SLOTS } from '../../data/iconAtlas.js'; import { ICON_CULL_LIFT, @@ -791,7 +791,7 @@ test('the atlas holds more than 64 images, every one addressed on WebGL 2', asyn assert.equal(addressableIconSlots(4096), MAX_ICON_SLOTS); assert.equal(addressableIconSlots(128), MIN_ICON_SLOTS, 'WebGL 1’s least'); assert.equal(addressableIconSlots(200), 120); - const { contextIconSlots } = await import('../../data/iconSetPrimitive.js'); + const { contextIconSlots } = await import('./iconSetPrimitive.js'); const limits = Cesium.ContextLimits; const vectors = limits._maximumVertexUniformVectors; try { diff --git a/src/data/iconSetPrimitive.js b/src/render/cesium/iconSetPrimitive.js similarity index 98% rename from src/data/iconSetPrimitive.js rename to src/render/cesium/iconSetPrimitive.js index 88d78d511..8d22f9a12 100644 --- a/src/data/iconSetPrimitive.js +++ b/src/render/cesium/iconSetPrimitive.js @@ -1,5 +1,5 @@ /** - * @module iconSetPrimitive + * @module render/cesium/iconSetPrimitive * @description Draws an {@link module:iconSet} in a Cesium scene: one instanced quad per * row, moved along its segment on the GPU at the set's render time. This replaces a * BillboardCollection for large moving fleets, so the CPU writes rows only when their @@ -15,19 +15,23 @@ * This module is the one place the icon sets touch Cesium's renderer internals. */ import * as Cesium from 'cesium'; -import { ICON_SEGMENT_GLSL, SEGMENT_STRIDE } from './iconSegment.js'; -import { ICON_CULL_HEIGHT_M, ICON_CULL_LIFT, STYLE_STRIDE } from './iconSet.js'; +import { ICON_SEGMENT_GLSL, SEGMENT_STRIDE } from '../../data/iconSegment.js'; +import { + ICON_CULL_HEIGHT_M, + ICON_CULL_LIFT, + STYLE_STRIDE, +} from '../../data/iconSet.js'; import { addressableIconSlots, iconAtlas, MAX_ICON_SLOTS, MIN_ICON_SLOTS, NEAR_IMAGE_DEVICE_PX, -} from './iconAtlas.js'; +} from '../../data/iconAtlas.js'; import { cameraLimbDistanceM, getAircraftRecessionParams, -} from './aircraftRecession.js'; +} from '../../data/aircraftRecession.js'; const ATTRIBUTE_LOCATIONS = Object.freeze({ corner: 0, diff --git a/src/render/cesiumAllowList.json b/src/render/cesiumAllowList.json index 636c8baae..325ffd06c 100644 --- a/src/render/cesiumAllowList.json +++ b/src/render/cesiumAllowList.json @@ -14,7 +14,6 @@ "src/data/iconOrientation.js", "src/data/iconSegment.js", "src/data/iconSet.js", - "src/data/iconSetPrimitive.js", "src/input/dispatcher.js", "src/input/sensorPick.js", "src/layers/cctv/projection.js",