mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
Keep the camera layer's Cesium picks, entities and projection in its rendering part
The camera layer's lifecycle, cards, geometry, hover and selection parts had left the Cesium allow-list but still drove the scene: Cesium camera move events, scene picks and pick objects, entity removal, the activation ray probe and the cards' canvas projection. The move events now come from the camera port and card render requests go through the frame port; the rest moves into the rendering part, which stays listed. The move listeners are attached and released in one place, with a test.
This commit is contained in:
1 parent
f6c5e6ba10
commit
a8f41d30fc
9 files changed
+348
-161
No files matched your search
@@ -111,3 +111,64 @@ test('icons leave the scene they were added to, whichever viewer tears down', ()
|
||||
assert.equal(current.isDestroyed(), true);
|
||||
assert.equal(state._icons, null);
|
||||
});
|
||||
|
||||
test('the obstruction probe sees through the layer and needs a ray pick', () => {
|
||||
const coverage = [{ id: 'cov' }];
|
||||
const plane = { id: 'plane' };
|
||||
const calls = [];
|
||||
const state = {
|
||||
_viewer: {
|
||||
scene: {
|
||||
pickFromRay(ray, exclude) {
|
||||
calls.push({ ray, exclude });
|
||||
return { position: { x: 1, y: 2, z: 3 } };
|
||||
},
|
||||
},
|
||||
},
|
||||
_coverageEntities: coverage,
|
||||
_projectionEntities: [{ planeEntity: plane }, null, {}],
|
||||
};
|
||||
const rendering = createRendering({
|
||||
state,
|
||||
services: { focus: {} },
|
||||
parts: {},
|
||||
});
|
||||
assert.equal(rendering.canPickFromRay(), true);
|
||||
const hit = rendering.obstructionHit(
|
||||
{ x: 0, y: 0, z: 0 },
|
||||
{ x: 1, y: 0, z: 0 },
|
||||
);
|
||||
assert.deepEqual(hit.position, { x: 1, y: 2, z: 3 });
|
||||
assert.deepEqual(calls[0].exclude, [...coverage, plane]);
|
||||
assert.ok(calls[0].ray instanceof Cesium.Ray);
|
||||
state._viewer = { scene: {} };
|
||||
assert.equal(rendering.canPickFromRay(), false);
|
||||
assert.equal(
|
||||
rendering.obstructionHit({ x: 0, y: 0, z: 0 }, { x: 1, y: 0, z: 0 }),
|
||||
undefined,
|
||||
);
|
||||
});
|
||||
|
||||
test('cards go only where the horizon lets the camera see', () => {
|
||||
const eye = Cesium.Cartesian3.fromDegrees(0, 0, 20_000_000);
|
||||
const front = Cesium.Cartesian3.fromDegrees(0, 0);
|
||||
const back = Cesium.Cartesian3.fromDegrees(180, 0);
|
||||
const state = {
|
||||
_viewer: {
|
||||
camera: { positionWC: eye },
|
||||
scene: {
|
||||
canvas: { clientWidth: 800, clientHeight: 0, height: 600 },
|
||||
cartesianToCanvasCoordinates: () => ({ x: 10, y: 20 }),
|
||||
},
|
||||
},
|
||||
};
|
||||
const view = createRendering({
|
||||
state,
|
||||
services: { focus: {} },
|
||||
parts: {},
|
||||
}).cardView();
|
||||
assert.equal(view.width, 800);
|
||||
assert.equal(view.height, 600);
|
||||
assert.deepEqual(view.screenOf(front), { x: 10, y: 20 });
|
||||
assert.equal(view.screenOf(back), null);
|
||||
});
|
||||
Reference in new issue
Block a user