feat(launches): render on Navara

This commit is contained in:
German Khokhlov committed 2026-10-23 01:19:57 +04:00
1 parent 4baefeb8f9
commit 766c786093
20 files changed
+1050 -33

No files matched your search

+1 -2
View File
@@ -33,8 +33,7 @@ export function createInteraction({
layerState._viewer &&
((getRenderer().follow.current() &&
getRenderer().follow.current() !== layerState._trackedEntity) ||
(getRenderer().kind === 'navara' &&
!getRenderer().follow.current() &&
(!getRenderer().follow.current() &&
!getRenderer().follow.releasing()))
) {
parts.tracking._clearTracking(true, {
@@ -0,0 +1,53 @@
import test from 'node:test';
import assert from 'node:assert/strict';
import { createEngineEvent } from '../../globe/contract.js';
import { createInteraction } from './interaction.js';
test('external null follow clears satellite state on Cesium; own release stays guarded', () => {
const previous = globalThis.document;
globalThis.document = new EventTarget();
try {
const changed = createEngineEvent();
let current = null,
releasing = false;
const calls = [];
const renderer = {
kind: 'cesium',
follow: {
onChanged: (fn) => changed.addEventListener(fn),
current: () => current,
releasing: () => releasing,
},
listenClick: () => ({ destroy() {} }),
};
const state = {
_enabled: true,
_trackedNorad: 25544,
_viewer: {},
_trackedEntity: { id: 'own' },
};
const interaction = createInteraction({
state,
services: { picking: {} },
parts: { tracking: { _clearTracking: (...args) => calls.push(args) } },
getRenderer: () => renderer,
});
interaction._installClickHandler(state._viewer);
releasing = true;
changed.raiseEvent();
assert.equal(calls.length, 0);
releasing = false;
changed.raiseEvent();
assert.equal(calls.length, 1);
assert.equal(calls[0][0], true);
current = state._trackedEntity;
changed.raiseEvent();
assert.equal(calls.length, 1);
current = { id: 'foreign' };
changed.raiseEvent();
assert.equal(calls.length, 2);
state._trackedEntityChangedRemove();
} finally {
if (previous === undefined) delete globalThis.document;
else globalThis.document = previous;
}
});
+30 -14
View File
@@ -1,8 +1,10 @@
// Satellite drawing and native follow, extracted unchanged from the layer.
// Satellite drawing and guarded native follow.
import * as Cesium from 'cesium';
import { isPointerFree } from '../../../data/inputOwnership.js';
export function createSatellitesCesiumRenderer(engine, { viewer } = {}) {
let releasing = false;
let starting = null;
return {
kind: 'cesium',
engine,
@@ -70,23 +72,37 @@ export function createSatellitesCesiumRenderer(engine, { viewer } = {}) {
removeTracked: (entity) => viewer?.entities.remove(entity),
follow: {
start: (entity) => {
if (engine) {
engine.camera.follow({
native: entity,
position: () => entity.position.getValue(viewer.clock.currentTime),
viewFrom: () => entity.viewFrom.getValue(viewer.clock.currentTime),
});
} else {
viewer.camera?.cancelFlight();
viewer.trackedEntity = entity;
starting = entity;
try {
if (engine) {
engine.camera.follow({
native: entity,
position: () =>
entity.position.getValue(viewer.clock.currentTime),
viewFrom: () =>
entity.viewFrom.getValue(viewer.clock.currentTime),
});
} else {
viewer.camera?.cancelFlight();
viewer.trackedEntity = entity;
}
} finally {
starting = null;
}
},
release: () => {
const current = engine?.camera.following();
if (current && current.native === viewer?.trackedEntity) current.stop();
else if (viewer) viewer.trackedEntity = undefined;
releasing = true;
try {
const current = engine?.camera.following();
if (current && current.native === viewer?.trackedEntity)
current.stop();
else if (viewer) viewer.trackedEntity = undefined;
} finally {
releasing = false;
}
},
current: () => viewer?.trackedEntity,
current: () => starting ?? viewer?.trackedEntity,
releasing: () => releasing,
onChanged: (listener) =>
viewer.trackedEntityChanged.addEventListener(listener),
},
@@ -52,3 +52,69 @@ test('native satellite follow goes through the shared camera contract', () => {
assert.equal(options.position(), position);
assert.deepEqual({ ...options.viewFrom() }, { ...offset });
});
test('native own follow release is guarded without hiding later external release', () => {
const event = new Cesium.Event();
let entity = { id: 'satellite' };
const viewer = {
trackedEntityChanged: event,
get trackedEntity() {
return entity;
},
set trackedEntity(value) {
entity = value;
event.raiseEvent(value);
},
};
const renderer = createSatellitesCesiumRenderer(null, { viewer });
const guards = [];
renderer.follow.onChanged(() => guards.push(renderer.follow.releasing()));
renderer.follow.release();
viewer.trackedEntity = { id: 'other' };
viewer.trackedEntity = undefined;
assert.deepEqual(guards, [true, false, false]);
assert.equal(renderer.follow.releasing(), false);
});
test('native follow takeover reports its starting entity through an intermediate null', () => {
const event = new Cesium.Event();
let current = { id: 'foreign' };
const viewer = {
clock: { currentTime: Cesium.JulianDate.now() },
trackedEntityChanged: event,
get trackedEntity() {
return current;
},
set trackedEntity(v) {
current = v;
event.raiseEvent();
},
};
const engine = {
camera: {
follow: ({ native }) => {
viewer.trackedEntity = undefined;
viewer.trackedEntity = native;
},
},
};
const renderer = createSatellitesCesiumRenderer(engine, { viewer });
const entity = {
id: 'own',
position: {
getValue() {
return geo.cartesian3.ZERO;
},
},
viewFrom: {
getValue() {
return geo.cartesian3.ZERO;
},
},
};
const seen = [];
renderer.follow.onChanged(() => seen.push(renderer.follow.current()));
renderer.follow.start(entity);
assert.deepEqual(seen, [entity, entity]);
assert.equal(renderer.follow.current(), entity);
});