mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
refactor(localAdsb): Cesium rendering behind a renderer interface
Task 12a. The Local ADS-B logic (index.js, models.js) no longer imports
Cesium. src/layers/localAdsb/render/cesium.js holds what it built, one
for one: the CustomDataSource of marker entities (billboard with
per-frame position/rotation/visibility CallbackProperties, the 2,000 km
DistanceDisplayCondition, the 978 MHz UAT ring as a PointGraphics), the
model PrimitiveCollection (models load, pose and leave through the shared
aircraft renderer's model part, adopting that collection), the selected
aircraft's trail (data/trailRenderer, as before) and live head segment,
and the camera reads. Registered for 'local-adsb' in the renderer
registry, created at init(viewer, {engine}).
- Clicks go through the engine's selection dispatcher (drill 8) instead of
the layer's ScreenSpaceEventHandler, with the layer's own rule kept as is
— a new `lookUnder` owner kind: its marker on top, or under picks no
layer owns and under trail lines, is selected (and re-selected);
another layer's contact on top, or empty map, releases only its own
selection; a trail line alone does nothing; no gesture rule. To the
other owners it is another layer, as its pick-owner registration made
it before. (The dispatcher's `drillThrough` would have taken the marker
from under another layer's contact, which the old handler never did.)
- models.js reads the camera through the renderer's view (frustum and
horizon tests, ground snap owner) and draws through renderer.models
(loadFleet/add/remove/destroy/setPose: the same MIX-tinted glTF options,
the same HPR frame with the Flights nose offset). The shared aircraft
renderer gains a loadModel seam (default Cesium.Model.fromGltfAsync).
- Cesium math → src/geo; the model tint is an Rgba equal to the old
Cesium.Color; check-import-directions: src/layers/localAdsb/ joins the
rendered layers.
Tests moved with the code, same meaning:
- index.test: the services fixture creates the layer's Cesium renderer and
the selection dispatcher; the click harness scripts the picks on a fake
engine registered for the fake viewer (was a fake ScreenSpaceEventHandler)
and the app's pick owners (trails, a Flights contact) are registered in
the pick registry (was an injected picking service).
- cockpitModels.test: the GLB loads are the aircraft renderer's loadModel
calls (Cesium.Model.fromGltfAsync by default), each asynchronous:false.
- trackingClickGesture.test: the dispatcher's empty click goes to the
plain owners (filter(plain)).
- renderers.test: local-adsb has an extracted Cesium renderer.
New: the dispatcher's look-under rule beside a plain owner (7 click cases).
W1 replay (flights, military, localAdsb) vs a fresh 7c7422e2 run: counts,
known objects, screen points, tracking poses, requests and every shot's
sha256 identical.
This commit is contained in:
1 parent
941b308c29
commit
0b8cb855fa
15 files changed
+549
-306
No files matched your search
@@ -205,3 +205,54 @@ test('the application has one dispatcher per engine', () => {
|
||||
selectionDispatcherFor(engine).destroy();
|
||||
selectionDispatcherFor(other).destroy();
|
||||
});
|
||||
|
||||
test('a look-under owner (local ADS-B) keeps its own click rule beside the others', () => {
|
||||
// x: what lies under each column, top first.
|
||||
const { dispatcher, click } = setup({
|
||||
10: [{ id: 'local-adsb:a' }], // its own marker
|
||||
20: [{ primitive: { tileset: true } }, { id: 'local-adsb:a' }], // under a tile
|
||||
30: [{ id: 'gev-trail:local-adsb-head-1' }, { id: 'local-adsb:b' }], // under a trail
|
||||
40: [{ id: 'gev-trail:x' }], // a trail alone
|
||||
50: [{ id: 'ae01ce' }, { id: 'local-adsb:a' }], // another layer's on top
|
||||
60: [{ id: 'cctv-1' }, { id: 'local-adsb:a' }], // a registry owner's on top
|
||||
70: [], // empty map
|
||||
});
|
||||
registerPickOwner('trails', (id) => id.startsWith('gev-trail:'));
|
||||
registerPickOwner('cctv', (id) => id.startsWith('cctv'));
|
||||
try {
|
||||
const local = recorder();
|
||||
const flights = recorder();
|
||||
dispatcher.register('local-adsb', {
|
||||
owns: (id) => id.startsWith('local-adsb:'),
|
||||
lookUnder: (id) => id.startsWith('gev-trail:'),
|
||||
...local.handlers,
|
||||
});
|
||||
dispatcher.register('flights', {
|
||||
owns: (id) => id === 'ae01ce',
|
||||
...flights.handlers,
|
||||
});
|
||||
for (const x of [10, 20, 30, 40, 50, 60, 70]) click(x);
|
||||
// A long press on empty map still reaches it (its old LEFT_CLICK rule).
|
||||
click(70, { ms: 900 });
|
||||
assert.deepEqual(local.calls, [
|
||||
['select', 'local-adsb:a', undefined],
|
||||
['select', 'local-adsb:a', undefined],
|
||||
['select', 'local-adsb:b', undefined],
|
||||
// 40: a trail alone is not empty map: nothing.
|
||||
['empty', 0], // 50: another layer's contact releases local's selection
|
||||
['empty', 0], // 60: the same for a registry owner's
|
||||
['empty', 0], // 70
|
||||
['empty', 0], // 70, long press
|
||||
]);
|
||||
// Flights, as before: its own contact at 50 and empty map at 70 (the
|
||||
// long press does not deselect); a local marker (even under a tile), a
|
||||
// trail or another owner's object is not its empty space.
|
||||
assert.deepEqual(flights.calls, [
|
||||
['select', 'ae01ce', undefined],
|
||||
['empty', 0],
|
||||
]);
|
||||
} finally {
|
||||
unregisterPickOwner('trails');
|
||||
unregisterPickOwner('cctv');
|
||||
}
|
||||
});
|
||||
Reference in new issue
Block a user