Skip to content
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.

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

Solve the issue of #11877 #11907

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
35 changes: 33 additions & 2 deletions packages/engine/Source/Scene/ScreenSpaceCameraController.js
Original file line number Diff line number Diff line change
Expand Up @@ -2901,6 +2901,7 @@ function update3D(controller) {

const scratchAdjustHeightTransform = new Matrix4();
const scratchAdjustHeightCartographic = new Cartographic();
const percentRadius = new Cartesian3();

function adjustHeightForTerrain(controller, cameraChanged) {
controller._adjustedHeightForTerrain = true;
Expand All @@ -2918,6 +2919,11 @@ function adjustHeightForTerrain(controller, cameraChanged) {

let transform;
let mag;
let percentR = 1;
percentRadius.x = ellipsoid.radii.x;
percentRadius.y = ellipsoid.radii.y;
percentRadius.z = ellipsoid.radii.z;

if (!Matrix4.equals(camera.transform, Matrix4.IDENTITY)) {
transform = Matrix4.clone(camera.transform, scratchAdjustHeightTransform);
mag = Cartesian3.magnitude(camera.position);
Expand All @@ -2927,6 +2933,28 @@ function adjustHeightForTerrain(controller, cameraChanged) {
const cartographic = scratchAdjustHeightCartographic;
if (mode === SceneMode.SCENE3D) {
ellipsoid.cartesianToCartographic(camera.position, cartographic);
if (defined(transform)) {
//scale position to another ellipsoid according to percentage of geocentric length
//in the condition of transform camera
percentR = Math.sqrt(
camera.position.x *
camera.position.x *
ellipsoid.oneOverRadiiSquared.x +
camera.position.y *
camera.position.y *
ellipsoid.oneOverRadiiSquared.y +
camera.position.z *
camera.position.z *
ellipsoid.oneOverRadiiSquared.z,
);
if (percentR > 1 - CesiumMath.EPSILON4) {
percentR = 1;
} else {
percentRadius.x = ellipsoid.radii.x * percentR;
percentRadius.y = ellipsoid.radii.y * percentR;
percentRadius.z = ellipsoid.radii.z * percentR;
}
}
} else {
projection.unproject(camera.position, cartographic);
}
Expand All @@ -2945,9 +2973,12 @@ function adjustHeightForTerrain(controller, cameraChanged) {
cartographic.height < height &&
(cameraChanged || Math.abs(percentDifference) <= 0.1)
) {
cartographic.height = height;
cartographic.height = height * percentR;
if (mode === SceneMode.SCENE3D) {
ellipsoid.cartographicToCartesian(cartographic, camera.position);
Ellipsoid.fromCartesian3(percentRadius).cartographicToCartesian(
cartographic,
camera.position,
);
} else {
projection.project(cartographic, camera.position);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2019,7 +2019,7 @@ describe("Scene/ScreenSpaceCameraController", function () {
updateController();

expect(camera.positionCartographic.height).toBeGreaterThanOrEqual(
controller.minimumZoomDistance,
controller.minimumZoomDistance - CesiumMath.EPSILON4,
);
});

Expand Down
Loading