Keep the cockpit camera steady near the ground on both engines

Cesium lifts a camera below its globe every frame, between the cockpit's 20 Hz updates, so an eye placed under the terrain (an aircraft reading below it on a cold floor cell) jumped up and down. The cockpit now also keeps its eye above the engine's own surface. Navara's ground floor stands aside while the camera inputs are off, since the cockpit places the camera itself.
This commit is contained in:
German Khokhlov committed 2026-11-06 16:52:35 +04:00
1 parent 9825b02aab
commit 90166024e9
8 files changed
+105 -9

No files matched your search

+3 -1
View File
@@ -216,10 +216,12 @@ export function createNavaraEngine(
const maps = createNavaraMaps(view, fetch ? { fetch } : {});
const { surface } = createNavaraSurface(view, hooks);
// Navara's controller zooms through the ground; keep the camera above it.
// With the camera inputs off nothing zooms, and the app places the camera
// itself (the cockpit eye, 12 m up): the floor's 30 m would fight it.
groundFloor = createGroundFloor({
surface,
position: () => model.camera.livePosition,
isFree: () => model.isFree(),
isFree: () => model.isFree() && input.cameraInputs(),
lift: (position) => model.lift(position),
setMinimumZoomDistance: (distance) =>
input.input.setCameraOptions({ minimumZoomDistance: distance }),
@@ -562,6 +562,21 @@ test('the floor does not fight flights or a lookAt target', () => {
engine.destroy();
});
test('the floor stands aside while the camera inputs are off (the cockpit drives it)', () => {
const { engine, view } = setup();
view.sampleTerrainHeight = () => 100;
engine.input.setCameraInputs(false);
engine.camera.setView({
destination: cartesian3.fromDegrees(2.35, 48.85, 112),
});
view.emit('preRender', 1);
near(heightOf(engine), 112, 1e-6, 'the cockpit eye 12 m up is kept');
engine.input.setCameraInputs(true);
view.emit('preRender', 2);
near(heightOf(engine), 130, 1e-6, 'lifted once the inputs are back');
engine.destroy();
});
test('the ground floor reports its own ground and margin (diagnostics, not contract)', () => {
const { engine } = setup();
assert.equal(typeof engine.groundFloor.ground, 'function');
+2 -2
View File
@@ -5,8 +5,8 @@
// controller stops at the surface.
//
// Each frame (engine preRender, after the camera model reads Navara's
// camera), while the camera is free (no flight running, no lookAt target)
// and below MAX_HEIGHT:
// camera), while the camera is free (no flight running, no lookAt target,
// camera inputs on) and below MAX_HEIGHT:
// - the ground under the camera is sampled (surface.sampleHeight: tiles,
// else terrain; else the ellipsoid), at most every RESAMPLE_MS or after a
// RESAMPLE_METRES move;
+2
View File
@@ -167,6 +167,8 @@ export function createNavaraInput(
};
return {
input,
/** Whether the app leaves the camera to the user (setCameraInputs). */
cameraInputs: () => cameraInputs,
destroy() {
if (destroyed) return;
destroyed = true;