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.

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

Jump to bottom

Fix camera tilt in ICRF. #1516

Merged
merged 3 commits into from
Feb 27, 2014
Merged

Fix camera tilt in ICRF. #1516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0af0e0
Fix camera tilt in ICRF.
bagnell Feb 27, 2014
c744f78
Update CHANGES.md.
bagnell Feb 27, 2014
c1ac969
Tweak CHANGES.md
pjcozzi Feb 27, 2014
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
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ Beta Releases
* Added the ability for imagery providers to specify view-dependent attribution to be display in the `CreditDisplay`.
* View-dependent imagery source attribution is now added to the `CreditDisplay` by the `BingMapsImageryProvider`.
* Fixed viewing an extent. [#1431](https://github.com/AnalyticalGraphicsInc/cesium/issues/1431)
* Fixed camera tilt in ICRF. [#544](https://github.com/AnalyticalGraphicsInc/cesium/issues/544)
* Fixed developer error when zooming in 2D. If the zoom would create an invalid frustum, nothing is done. [#1432](https://github.com/AnalyticalGraphicsInc/cesium/issues/1432)
* Fixed `WallGeometry` bug that failed by removing positions that were less close together by less than 6 decimal places. [#1483](https://github.com/AnalyticalGraphicsInc/cesium/pull/1483)
* Fixed `EllipsoidGeometry` texture coordinates. [#1454](https://github.com/AnalyticalGraphicsInc/cesium/issues/1454)
Expand Down
3 changes: 1 addition & 2 deletions Source/Scene/ScreenSpaceCameraController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ define([

var ellipsoid = controller._ellipsoid;
var minHeight = controller.minimumZoomDistance * 0.25;
var height = ellipsoid.cartesianToCartographic(controller._cameraController._camera.position).height;
var height = ellipsoid.cartesianToCartographic(controller._cameraController._camera.positionWC).height;
if (height - minHeight - 1.0 < CesiumMath.EPSILON3 &&
movement.endPosition.y - movement.startPosition.y < 0) {
return;
Expand All @@ -898,7 +898,6 @@ define([

// CAMERA TODO: Remove the need for camera access
var camera = cameraController._camera;
center = camera.worldToCameraCoordinates(center, center);
var transform = Transforms.eastNorthUpToFixedFrame(center, ellipsoid, tilt3DTransform);

var oldEllipsoid = controller._ellipsoid;
Expand Down