mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-18 09:12:18 +00:00
feat(vessels): render on Navara (WIP: browser parity not yet run)
render/navara.js: one always-on-top engine.movers chevron bank (atlas of every chevron icon at 32 px), MMSI pick ids, trail on engine.lines, camera reads through the shared Navara layer view (extracted from the aircraft renderer to src/layers/shared/render/navaraView.js, + camera pickEllipsoid and canvas clientWidth). Registered in navaraMode. QA: vessel qaDrawn; probe selected() falls back to getSelectedInfo; qa-w1-layers vessel section; qa-vessels-engines side by side; --engine for qa-vessel-cards/datum; qa-flights-engines military near pose 100 km. Unit tests on the fake engine pass; browser runs NOT done (see progress).
This commit is contained in:
1 parent
620ada6df3
commit
69a78710cc
14 files changed
+850
-154
No files matched your search
@@ -22,7 +22,7 @@ import {
|
||||
aircraftIconCells,
|
||||
drawAircraftIconAtlas,
|
||||
} from '../../../data/aircraftIcons.js';
|
||||
import { registerViewerEngine } from '../../../globe/cesium/engineFromViewer.js';
|
||||
import { createNavaraLayerView } from '../../shared/render/navaraView.js';
|
||||
|
||||
const BASE_SIZE_PX = 20;
|
||||
|
||||
@@ -252,130 +252,13 @@ export function createAircraftNavaraRenderer({
|
||||
};
|
||||
|
||||
// --- the view ------------------------------------------------------------
|
||||
let frameNumber = 0;
|
||||
removers.push(
|
||||
engine.frames.preUpdate.addEventListener(() => {
|
||||
frameNumber++;
|
||||
}),
|
||||
);
|
||||
const camera = {
|
||||
positionWC: geo.cartesian3.create(),
|
||||
positionCartographic: geo.cartographic.create(),
|
||||
directionWC: geo.cartesian3.create(),
|
||||
upWC: geo.cartesian3.create(),
|
||||
rightWC: geo.cartesian3.create(),
|
||||
heading: 0,
|
||||
pitch: 0,
|
||||
roll: 0,
|
||||
frustum: { fovy: 1, aspectRatio: 1 },
|
||||
};
|
||||
let poseFrame = -1;
|
||||
const lastPosition = geo.cartesian3.create(Number.NaN, 0, 0);
|
||||
// The camera as of now: refreshed once per frame, and whenever it moved.
|
||||
const freshCamera = () => {
|
||||
const live = engine.camera.livePosition;
|
||||
if (
|
||||
poseFrame === frameNumber &&
|
||||
live.x === lastPosition.x &&
|
||||
live.y === lastPosition.y &&
|
||||
live.z === lastPosition.z
|
||||
)
|
||||
return camera;
|
||||
const pose = engine.camera.pose();
|
||||
geo.cartesian3.clone(pose.position, camera.positionWC);
|
||||
geo.cartographic.clone(pose.cartographic, camera.positionCartographic);
|
||||
geo.cartesian3.clone(pose.direction, camera.directionWC);
|
||||
geo.cartesian3.clone(pose.up, camera.upWC);
|
||||
geo.cartesian3.clone(pose.right, camera.rightWC);
|
||||
camera.heading = pose.heading;
|
||||
camera.pitch = pose.pitch;
|
||||
camera.roll = pose.roll;
|
||||
camera.frustum.fovy = pose.fovy;
|
||||
camera.frustum.aspectRatio = pose.aspectRatio ?? 1;
|
||||
geo.cartesian3.clone(live, lastPosition);
|
||||
poseFrame = frameNumber;
|
||||
return camera;
|
||||
};
|
||||
const cameraView = new Proxy(camera, {
|
||||
get: (target, key) => freshCamera()[key],
|
||||
const layerView = createNavaraLayerView(engine, {
|
||||
layerId,
|
||||
wrap: (run) => inFrameDo(run),
|
||||
isDestroyed: () => destroyed,
|
||||
});
|
||||
const scene = {
|
||||
get camera() {
|
||||
return cameraView;
|
||||
},
|
||||
canvas: {
|
||||
get clientHeight() {
|
||||
return engine.host.size().height;
|
||||
},
|
||||
},
|
||||
frameState: {
|
||||
get frameNumber() {
|
||||
return frameNumber;
|
||||
},
|
||||
},
|
||||
};
|
||||
// Shared helpers project through the engine registered for their scene.
|
||||
removers.push(registerViewerEngine(scene, engine));
|
||||
const horizon = {
|
||||
isPointVisible: (position) => engine.projector.horizonVisible(position),
|
||||
};
|
||||
const scratchDelta = geo.cartesian3.create();
|
||||
let frustum = null;
|
||||
const inFrustum = (position) => {
|
||||
const { origin, direction, right, up, tanX, tanY } = frustum;
|
||||
geo.cartesian3.subtract(position, origin, scratchDelta);
|
||||
const z = geo.cartesian3.dot(scratchDelta, direction);
|
||||
if (z <= -1) return false;
|
||||
const x = Math.abs(geo.cartesian3.dot(scratchDelta, right));
|
||||
const y = Math.abs(geo.cartesian3.dot(scratchDelta, up));
|
||||
return x <= z * tanX + 1 && y <= z * tanY + 1;
|
||||
};
|
||||
const view = {
|
||||
get camera() {
|
||||
return cameraView;
|
||||
},
|
||||
scene,
|
||||
surfaceOwner: engine,
|
||||
surfaceScene: engine,
|
||||
frameNumber: () => frameNumber,
|
||||
viewportHeightPx: () => engine.host.size().height,
|
||||
frustumTester() {
|
||||
const cam = freshCamera();
|
||||
const tanY = Math.tan(cam.frustum.fovy / 2);
|
||||
const { width, height } = engine.host.size();
|
||||
frustum = {
|
||||
origin: cam.positionWC,
|
||||
direction: cam.directionWC,
|
||||
right: cam.rightWC,
|
||||
up: cam.upWC,
|
||||
tanY,
|
||||
tanX: tanY * (height > 0 ? width / height : 1),
|
||||
};
|
||||
return inFrustum;
|
||||
},
|
||||
horizon: () => horizon,
|
||||
worldToWindow: (position, result) =>
|
||||
engine.projector.worldToWindow(position, result),
|
||||
requestRender: () => engine.render.request(layerId),
|
||||
on(event, listener) {
|
||||
const source =
|
||||
event === 'moveEnd'
|
||||
? engine.camera.moveEnd
|
||||
: event === 'preRender'
|
||||
? engine.frames.preRender
|
||||
: event === 'preUpdate'
|
||||
? engine.frames.preUpdate
|
||||
: null;
|
||||
if (!source) return null;
|
||||
return source.addEventListener((...args) =>
|
||||
inFrameDo(() => listener(...args)),
|
||||
);
|
||||
},
|
||||
isDestroyed: () => destroyed || engine.isDestroyed?.() === true,
|
||||
holdFrames() {},
|
||||
closeFrameLatch() {},
|
||||
releaseFrames() {},
|
||||
};
|
||||
removers.push(layerView.destroy);
|
||||
const { view, freshCamera } = layerView;
|
||||
|
||||
// --- fleet sprites ---------------------------------------------------------
|
||||
let atlas = null;
|
||||
|
||||
Reference in new issue
Block a user