mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-18 09:12:18 +00:00
Merge origin/main: shipwrecks, news, transit fronts, signal-lost trails and uncredited photos on the renderer's ports
Upstream's layers and changes are carried onto the ports, with no Cesium outside src/render and no reach into the viewer: - Shipwrecks draw as one icon set, clicked through the input dispatcher. - News draws through draw sets, the camera port and the input dispatcher; its beacons pulse each frame through the frame port. - The scene occlusion probe moves into src/render/cesium and reaches detection through a new application hook, createOcclusionProbe; its private Cesium reads go through internals.js. - Flight and military trails, the stale and SIGNAL LOST cue, coasting and following the world clock run on the draw and frame ports. GPU icons follow the scene clock while the world clock is followed, and fade when stale. A report that holds is not planned again every tick. - Vessels are keyed by their record id. The stub boot now enables military, shipwrecks and news as well.
This commit is contained in:
commit
a755f63638
331 files changed
+40654
-1666
No files matched your search
@@ -21,6 +21,7 @@ import { vesselCockpitInfo } from '../layers/vessels/cockpitSubject.js';
|
||||
import { VesselRecords } from '../layers/vessels/records.js';
|
||||
|
||||
const RECORD = Object.freeze({
|
||||
id: '211000000',
|
||||
mmsi: '211000000',
|
||||
name: 'NORDIC STAR',
|
||||
type: '70',
|
||||
@@ -71,9 +72,9 @@ function vesselLayer(record) {
|
||||
enabled && selected
|
||||
? { ...vesselCockpitInfo(selected), seaSurfaceHeightM: 0 }
|
||||
: null,
|
||||
setCockpitSubject(mmsi) {
|
||||
calls.push(['subject', mmsi]);
|
||||
subject = mmsi;
|
||||
setCockpitSubject(id) {
|
||||
calls.push(['subject', id]);
|
||||
subject = id;
|
||||
return true;
|
||||
},
|
||||
// Like the layer, leaves out the ship whose bridge the Cockpit rides.
|
||||
@@ -81,7 +82,7 @@ function vesselLayer(record) {
|
||||
radarQueries.push({ lat, lon, rangeM, maxCount });
|
||||
const own = {
|
||||
...NEIGHBOUR,
|
||||
id: record.mmsi,
|
||||
id: record.id,
|
||||
latitude: record.lat,
|
||||
longitude: record.lon,
|
||||
};
|
||||
@@ -310,7 +311,7 @@ test('entering the bridge hides the vessel and shows bridge readouts', async (t)
|
||||
await settle();
|
||||
assert.equal(cockpit.active, true);
|
||||
assert.equal(cockpit.subjectKind, 'vessel');
|
||||
assert.deepEqual(vessels.calls, [['subject', RECORD.mmsi]]);
|
||||
assert.deepEqual(vessels.calls, [['subject', RECORD.id]]);
|
||||
assert.equal(document.body.classList.contains('cockpit-mode'), true);
|
||||
|
||||
assert.equal(
|
||||
@@ -356,7 +357,7 @@ test('exiting the bridge releases the vessel and returns to its map view', async
|
||||
assert.equal(cockpit.active, false);
|
||||
assert.equal(cockpit.subjectKind, null);
|
||||
assert.deepEqual(vessels.calls, [
|
||||
['subject', RECORD.mmsi],
|
||||
['subject', RECORD.id],
|
||||
['subject', null],
|
||||
['focus'],
|
||||
]);
|
||||
@@ -427,7 +428,7 @@ test('tracking an aircraft from the bridge ends it without refocusing the vessel
|
||||
assert.equal(followedEntity(viewer), aircraft, 'the aircraft keeps tracking');
|
||||
assert.equal(aircraft.show, true, 'the aircraft was never adopted');
|
||||
assert.deepEqual(vessels.calls, [
|
||||
['subject', RECORD.mmsi],
|
||||
['subject', RECORD.id],
|
||||
['subject', null],
|
||||
]);
|
||||
});
|
||||
@@ -1539,7 +1540,7 @@ test('a fix the feed keeps re-serving goes on ageing into a stale feed', async (
|
||||
effects,
|
||||
);
|
||||
poll();
|
||||
const record = records.byMmsi.get(RECORD.mmsi);
|
||||
const record = records.byId.get(RECORD.id);
|
||||
const { $, cockpit, shots } = fixture(t, { record });
|
||||
cockpit.enter();
|
||||
await settle();
|
||||
@@ -1605,7 +1606,12 @@ test("a ship's double-click memory does not carry over to another ship", async (
|
||||
heightSensitiveProjection(viewer);
|
||||
cockpit.onScenePointerDown(1000);
|
||||
// Within the memory another ship is selected, drawn elsewhere.
|
||||
vessels.select({ ...RECORD, mmsi: '211000009', name: 'OTHER' });
|
||||
vessels.select({
|
||||
...RECORD,
|
||||
id: '211000009',
|
||||
mmsi: '211000009',
|
||||
name: 'OTHER',
|
||||
});
|
||||
heightSensitiveProjection(viewer, { x: 900 });
|
||||
assert.equal(cockpit.onSceneDoubleClick({ x: 400, y: 300 }, 1250), false);
|
||||
assert.equal(cockpit.active, false);
|
||||
|
||||
Reference in new issue
Block a user