mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-21 10:42:22 +00:00
fix(cctv): reuse renderer visibility scratch state
This commit is contained in:
1 parent
c0752784d2
commit
b98b9d390f
6 files changed
+137
-93
No files matched your search
@@ -86,6 +86,89 @@ function sameMatrix(array, matrix) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/** Conservative globe/frustum visibility; null means unknown. */
|
||||
export function createPointsVisibility(scene, camera) {
|
||||
const visibilitySphere = new Cesium.BoundingSphere();
|
||||
let visibilityMargin = null;
|
||||
let visibilityEllipsoid = null;
|
||||
let visibilityOccluder = null;
|
||||
return function visiblePoints(points, marginM) {
|
||||
if (
|
||||
scene.mode !== Cesium.SceneMode.SCENE3D ||
|
||||
!points?.length ||
|
||||
!Number.isFinite(marginM) ||
|
||||
marginM < 0 ||
|
||||
typeof camera.frustum?.computeCullingVolume !== 'function'
|
||||
)
|
||||
return null;
|
||||
const radii = Cesium.Ellipsoid.WGS84.radii;
|
||||
if (marginM >= Math.min(radii.x, radii.y, radii.z)) return null;
|
||||
const eye = camera.positionWC;
|
||||
if (
|
||||
!eye ||
|
||||
!Number.isFinite(eye.x) ||
|
||||
!Number.isFinite(eye.y) ||
|
||||
!Number.isFinite(eye.z)
|
||||
)
|
||||
return null;
|
||||
const direction = camera.directionWC;
|
||||
const up = camera.upWC;
|
||||
if (
|
||||
!direction ||
|
||||
!up ||
|
||||
!Number.isFinite(direction.x) ||
|
||||
!Number.isFinite(direction.y) ||
|
||||
!Number.isFinite(direction.z) ||
|
||||
!Number.isFinite(up.x) ||
|
||||
!Number.isFinite(up.y) ||
|
||||
!Number.isFinite(up.z)
|
||||
)
|
||||
return null;
|
||||
for (const p of points) {
|
||||
if (
|
||||
!p ||
|
||||
!Number.isFinite(p.x) ||
|
||||
!Number.isFinite(p.y) ||
|
||||
!Number.isFinite(p.z)
|
||||
)
|
||||
return null;
|
||||
}
|
||||
if (visibilityMargin !== marginM) {
|
||||
visibilityMargin = marginM;
|
||||
visibilityEllipsoid = new Cesium.Ellipsoid(
|
||||
radii.x - marginM,
|
||||
radii.y - marginM,
|
||||
radii.z - marginM,
|
||||
);
|
||||
visibilityOccluder = new Cesium.EllipsoidalOccluder(visibilityEllipsoid);
|
||||
}
|
||||
const inverse = visibilityEllipsoid.oneOverRadii;
|
||||
const outside =
|
||||
Math.hypot(eye.x * inverse.x, eye.y * inverse.y, eye.z * inverse.z) >= 1;
|
||||
if (outside) {
|
||||
visibilityOccluder.cameraPosition = eye;
|
||||
let visible = false;
|
||||
for (const p of points) {
|
||||
if (visibilityOccluder.isPointVisible(p)) {
|
||||
visible = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!visible) return false;
|
||||
}
|
||||
const culling = camera.frustum.computeCullingVolume(
|
||||
eye,
|
||||
camera.directionWC,
|
||||
camera.upWC,
|
||||
);
|
||||
return (
|
||||
culling.computeVisibility(
|
||||
Cesium.BoundingSphere.fromPoints(points, visibilitySphere),
|
||||
) !== Cesium.Intersect.OUTSIDE
|
||||
);
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {{scene: object, camera: object, report: (error: unknown) => void,
|
||||
* widget?: object, capabilities?: ReadonlySet<string>,
|
||||
@@ -350,9 +433,7 @@ export function createCesiumCamera({
|
||||
}
|
||||
|
||||
const cameraPort = {
|
||||
// The ECEF camera pose describes the globe only in 3D. Consumers that
|
||||
// cannot prove this must avoid globe-only visibility culling.
|
||||
isWorld3D: () => scene.mode === Cesium.SceneMode.SCENE3D,
|
||||
visiblePoints: createPointsVisibility(scene, camera),
|
||||
on: (event, cb, options) => cameraEvents.on(event, cb, options),
|
||||
onCommand: (cb) => commandHooks.on(cb),
|
||||
setView(spec) {
|
||||
|
||||
@@ -337,21 +337,23 @@ test('the camera port gives the clock its own tick back as it goes', () => {
|
||||
}
|
||||
});
|
||||
|
||||
test('camera reports globe mode and fails closed for other modes', () => {
|
||||
test('camera visibility is unknown outside 3D and resolves on the globe', () => {
|
||||
const { scene, camera } = headlessCamera();
|
||||
scene.postUpdate = new Cesium.Event();
|
||||
scene.requestRender = () => {};
|
||||
const { port } = createCesiumCamera({ scene, camera, report: () => {} });
|
||||
for (const [mode, expected] of [
|
||||
[Cesium.SceneMode.SCENE3D, true],
|
||||
[Cesium.SceneMode.SCENE2D, false],
|
||||
[Cesium.SceneMode.COLUMBUS_VIEW, false],
|
||||
[Cesium.SceneMode.MORPHING, false],
|
||||
[undefined, false],
|
||||
const points = [Cesium.Cartesian3.fromDegrees(0, 0, 10)];
|
||||
for (const mode of [
|
||||
Cesium.SceneMode.SCENE2D,
|
||||
Cesium.SceneMode.COLUMBUS_VIEW,
|
||||
Cesium.SceneMode.MORPHING,
|
||||
undefined,
|
||||
]) {
|
||||
scene.mode = mode;
|
||||
assert.equal(port.isWorld3D(), expected);
|
||||
assert.equal(port.visiblePoints(points, 200), null);
|
||||
}
|
||||
scene.mode = Cesium.SceneMode.SCENE3D;
|
||||
assert.equal(typeof port.visiblePoints(points, 200), 'boolean');
|
||||
});
|
||||
|
||||
test('setFov holds the vertical angle across resizes, and waits for a first one', () => {
|
||||
|
||||
Vendored
+2
-2
@@ -234,8 +234,8 @@ export type CameraEvent =
|
||||
'changed' | 'moveStart' | 'moveEnd' | 'followChanged' | 'flightEnd';
|
||||
|
||||
export interface CameraPort {
|
||||
/** True only when its pose is an ECEF view of the 3D globe. Missing means unknown. */
|
||||
isWorld3D?(): boolean;
|
||||
/** Conservative visibility of an ECEF point set, with a horizon margin in metres; null means unknown. */
|
||||
visiblePoints?(points: Ecef[], horizonMarginM: number): boolean | null;
|
||||
pose(): CameraPose;
|
||||
/**
|
||||
* Place the eye. A position with a `{direction, up}` orientation is placed
|
||||
|
||||
Reference in new issue
Block a user