Skip to content

Fix/remaining issues camera inside terrain #4551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open

Fix/remaining issues camera inside terrain #4551

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6ce770b
Revert "Remove padding from camera elevation if inside terrain."
chrneumann Aug 13, 2024
2efeea5
Reapply "Fix render tests for terrain."
chrneumann Aug 13, 2024
d569899
Don't directly update transform in _finalizeElevation.
chrneumann Aug 13, 2024
fe6191c
Prevent throwing in case of wrong zoom calculation.
chrneumann Aug 13, 2024
db287d1
Merge branch 'main' into fix/remaining-issues-camera-inside-terrain
HarelM Aug 28, 2024
b5efbf6
Merge branch 'main' into fix/remaining-issues-camera-inside-terrain
HarelM Aug 28, 2024
9950b94
Merge branch 'main' into fix/remaining-issues-camera-inside-terrain
HarelM Sep 4, 2024
3484b91
Rework catching of errors on zoom recalculation.
chrneumann Sep 12, 2024
1d83c6e
Merge branch 'main' into fix/remaining-issues-camera-inside-terrain
HarelM Sep 14, 2024
c2825a0
Merge remote-tracking branch 'origin/main' into fix/remaining-issues-…
chrneumann Sep 19, 2024
103794d
Fix camera unit test.
chrneumann Sep 19, 2024
1ee53ee
Fix render test.
chrneumann Sep 19, 2024
cba97c1
Merge branch 'main' into fix/remaining-issues-camera-inside-terrain
HarelM Sep 19, 2024
a5dc76d
Merge remote-tracking branch 'origin/main' into fix/remaining-issues-…
chrneumann Sep 30, 2024
cd88615
Add changelog entry.
chrneumann Sep 30, 2024
9940ea5
Remove old transform, apply changes to mercator transform.
chrneumann Sep 30, 2024
0f0d4de
Merge remote-tracking branch 'origin/main' into fix/remaining-issues-…
chrneumann Oct 30, 2024
a177ba4
Fix build and render tests.
chrneumann Oct 30, 2024
e412a62
Merge remote-tracking branch 'origin/main' into fix/remaining-issues-…
chrneumann Oct 30, 2024
dfeb449
Merge branch 'main' into fix/remaining-issues-camera-inside-terrain
HarelM Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/geo/transform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,12 +538,15 @@ export class Transform {
const requiredWorldSize = requiredPixelPerMeter / mercatorZfromAltitude(1, center.lat);
// Since worldSize = this.tileSize * scale:
const requiredScale = requiredWorldSize / this.tileSize;
const zoom = this.scaleZoom(requiredScale);

// update matrices
this._elevation = elevation;
this._center = center;
this.zoom = zoom;
try {
const zoom = this.scaleZoom(requiredScale);
// update matrices
this._elevation = elevation;
this._center = center;
this.zoom = zoom;
} catch (_e) {
console.error(`Could not recalculate zoom. requiredScale: ${requiredScale}`);
}
}

setLocationAtPoint(lnglat: LngLat, point: Point) {
Expand Down
8 changes: 6 additions & 2 deletions src/ui/camera.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,9 @@

_finalizeElevation() {
this._elevationFreeze = false;
this.transform.recalculateZoom(this.terrain);
const tr = this._getTransformForUpdate();
tr.recalculateZoom(this.terrain);
this._applyUpdatedTransform(tr);
}

/**
Expand All @@ -1101,7 +1103,7 @@
if (!this.transformCameraUpdate && !this.terrain) return this.transform;

if (!this._requestedCameraState) {
this._requestedCameraState = this.transform.clone();

Check failure on line 1106 in src/ui/camera.ts

View workflow job for this annotation

GitHub Actions / Unit tests and Coverage

#flyTo › check elevation callbacks 

TypeError: this.transform.clone is not a function

    at CameraMock._getTransformForUpdate (src/ui/camera.ts:1106:57)
    at CameraMock._finalizeElevation (src/ui/camera.ts:1088:25)
    at Object.<anonymous> (src/ui/camera.test.ts:1802:16)
}
return this._requestedCameraState;
}
Expand All @@ -1119,7 +1121,9 @@
*/
_elevateCameraIfInsideTerrain(tr: Transform) : { pitch?: number; zoom?: number } {
const camera = tr.getCameraPosition();
const minAltitude = this.terrain.getElevationForLngLatZoom(camera.lngLat, tr.zoom);
const surfacePadding = Math.min(500, 20 * (25 - tr.zoom));
Copy link
Contributor

@NathanMOlson NathanMOlson Oct 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this surface padding?

At a typical zoom of 15, this sets the minimum altitude at 200m. This amount of surface padding is problematic for ground-level use cases (like an aircraft on the runway, or touring a city at eye-level.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It can help prevent graphic glitches when the camera is directly moving on the surface. Do these use cases have terrain enabled? If so, one could make the padding optional.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The "aircraft on runway" (#4717) use case (#4717) will definitely have terrain enabled.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The linear scaling with zoom level doesn't make sense to me. I think it would be more appropriate to have something like 500 / (2**tr.zoom).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have strong arguments for the current calculation, but why do you think non-linear is better?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because the distance from camera to center point (in meters) is inversely proportional to 2**tr.zoom

If you increase zoom by 1, you are cutting the distance from camera to center point in half. So it seems like you should also cut the padding in half.

const minAltitude = this.terrain.getElevationForLngLatZoom(
camera.lngLat, tr.zoom) + surfacePadding;
if (camera.altitude < minAltitude) {
const newCamera = this.calculateCameraOptionsFromTo(
camera.lngLat, minAltitude, tr.center, tr.elevation);
Expand Down
Binary file modified test/integration/render/tests/terrain/fog-sky-blend/expected.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/integration/render/tests/terrain/fog/expected.png
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The "expected" image shows this bug: #4859

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading