Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into leap-seconds-suck
Browse files Browse the repository at this point in the history
  • Loading branch information
@pjcozzi
pjcozzi committed Jun 30, 2015
2 parents 9316fe6 + a48142a commit e74d4be
Show file tree
Hide file tree
Showing 12 changed files with 366 additions and 541 deletions.
27 changes: 27 additions & 0 deletions Apps/Sandcastle/gallery/Camera.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,35 @@
});
}

function flyInACity() {
Sandcastle.declare(flyInACity);

var camera = scene.camera;
camera.flyTo({
destination : Cesium.Cartesian3.fromDegrees(-73.98580932617188, 40.74843406689482, 363.34038727246224),
complete : function() {
setTimeout(function() {
camera.flyTo({
destination : Cesium.Cartesian3.fromDegrees(-73.98585975679403, 40.75759944127251, 186.50838555841779),
orientation : {
heading : Cesium.Math.toRadians(200.0),
pitch : Cesium.Math.toRadians(-50.0)
},
easingFunction : Cesium.EasingFunction.LINEAR_NONE
});
}, 3000);
}
});
}

Sandcastle.addToolbarMenu([{
text : 'Camera Options'
}, {
text : 'Fly in a city',
onselect : function() {
flyInACity();
Sandcastle.highlight(flyInACity);
}
}, {
text : 'Fly to San Diego',
onselect : function() {
Expand Down
9 changes: 9 additions & 0 deletions CHANGES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Change Log

* Breaking changes
* Removed `Scene.fxaaOrderIndependentTranslucency`, which was deprecated in 1.10. Use `Scene.fxaa` which is now `true` by default.
* Removed `Camera.clone` that was deprecated in 1.10.
* Deprecated
* The STK World Terrain url `cesiumjs.org/stk-terrain/world` has been deprecated, use `assets.agi.com/stk-terrain/world` instead. A redirect will be in place until 1.14.
* Deprecated `AxisAlignedBoundingBox.intersect` and `BoundingSphere.intersect`. These will be removed in 1.13. Use `.intersectPlane` and, if necessary, `Plane.fromCartesian4`.
Expand All @@ -30,6 +31,14 @@ Change Log
* Add `QuantizedMeshTerrainData` constructor argument `orientedBoundingBox`.
* Add `TerrainMesh.orientedBoundingBox` which holds the `OrientedBoundingBox` for the mesh for a single terrain tile.
* Use `OrientedBoundingBox` when rendering terrain and imagery to improve performance of rendering and loading (by up to 50% of terrain/imagery tiles, depending on camera view).
* Fixed 2D and Columbus view lighting issue [#2635](https://github.com/AnalyticalGraphicsInc/cesium/issues/2635).
* Improved camera flights. [#2825](https://github.com/AnalyticalGraphicsInc/cesium/pull/2825)
* Fixed camera flights that ended up at the wrong position in Columbus view. [#802](https://github.com/AnalyticalGraphicsInc/cesium/issues/802)
* Fixed camera flights through the map in 2D. [#804](https://github.com/AnalyticalGraphicsInc/cesium/issues/804)
* Fixed strange camera flights from opposite sides of the globe. [#1158](https://github.com/AnalyticalGraphicsInc/cesium/issues/1158)
* Fixed camera flights that wouldn't fly to the home view after zooming out past it. [#1400](https://github.com/AnalyticalGraphicsInc/cesium/issues/1400)
* Fixed flying to rectangles that cross the IDL in Columbus view and 2D. [#2093](https://github.com/AnalyticalGraphicsInc/cesium/issues/2093)
* Fixed flights with a pitch of -90 degrees. [#2468](https://github.com/AnalyticalGraphicsInc/cesium/issues/2468)

### 1.10 - 2015-06-01

Expand Down
2 changes: 0 additions & 2 deletions Source/Core/EasingFunction.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ define([
*
* @namespace
* @alias EasingFunction
*
* @private
*/
var EasingFunction = {
/**
Expand Down
144 changes: 85 additions & 59 deletions Source/Scene/Camera.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,31 @@ define([
}
}

function getHeading(direction, up) {
var heading;
if (!CesiumMath.equalsEpsilon(Math.abs(direction.z), 1.0, CesiumMath.EPSILON3)) {
heading = Math.atan2(direction.y, direction.x) - CesiumMath.PI_OVER_TWO;
} else {
heading = Math.atan2(up.y, up.x) - CesiumMath.PI_OVER_TWO;
}

return CesiumMath.TWO_PI - CesiumMath.zeroToTwoPi(heading);
}

function getPitch(direction) {
return CesiumMath.PI_OVER_TWO - CesiumMath.acosClamped(direction.z);
}

function getRoll(direction, up, right) {
var roll = 0.0;
if (!CesiumMath.equalsEpsilon(Math.abs(direction.z), 1.0, CesiumMath.EPSILON3)) {
roll = Math.atan2(-right.z, up.z);
roll = CesiumMath.zeroToTwoPi(roll + CesiumMath.TWO_PI);
}

return roll;
}

var scratchHPRMatrix1 = new Matrix4();
var scratchHPRMatrix2 = new Matrix4();

Expand Down Expand Up @@ -663,19 +688,11 @@ define([
var transform = Transforms.eastNorthUpToFixedFrame(this.positionWC, ellipsoid, scratchHPRMatrix2);
this._setTransform(transform);

var direction = this.direction;
var up = this.up;

var heading;
if (!CesiumMath.equalsEpsilon(Math.abs(direction.z), 1.0, CesiumMath.EPSILON3)) {
heading = Math.atan2(direction.y, direction.x) - CesiumMath.PI_OVER_TWO;
} else {
heading = Math.atan2(up.y, up.x) - CesiumMath.PI_OVER_TWO;
}
var heading = getHeading(this.direction, this.up);

this._setTransform(oldTransform);

return CesiumMath.TWO_PI - CesiumMath.zeroToTwoPi(heading);
return heading;
}

return undefined;
Expand All @@ -698,7 +715,7 @@ define([
var transform = Transforms.eastNorthUpToFixedFrame(this.positionWC, ellipsoid, scratchHPRMatrix2);
this._setTransform(transform);

var pitch = CesiumMath.PI_OVER_TWO - CesiumMath.acosClamped(this.direction.z);
var pitch = getPitch(this.direction);

this._setTransform(oldTransform);

Expand All @@ -725,15 +742,7 @@ define([
var transform = Transforms.eastNorthUpToFixedFrame(this.positionWC, ellipsoid, scratchHPRMatrix2);
this._setTransform(transform);

var up = this.up;
var right = this.right;
var direction = this.direction;

var roll = 0.0;
if (!CesiumMath.equalsEpsilon(Math.abs(direction.z), 1.0, CesiumMath.EPSILON3)) {
roll = Math.atan2(-right.z, up.z);
roll = CesiumMath.zeroToTwoPi(roll + CesiumMath.TWO_PI);
}
var roll = getRoll(this.direction, this.up, this.right);

this._setTransform(oldTransform);

Expand Down Expand Up @@ -2277,14 +2286,21 @@ define([
var scratchFlyToMatrix4 = new Matrix4();
var newOptions = {
destination : undefined,
direction : undefined,
up : undefined,
heading : undefined,
pitch : undefined,
roll : undefined,
duration : undefined,
complete : undefined,
cancel : undefined,
endTransform : undefined
endTransform : undefined,
maximumHeight : undefined,
easingFunction : undefined
};

var scratchFlyDirection = new Cartesian3();
var scratchFlyUp = new Cartesian3();
var scratchFlyRight = new Cartesian3();

/**
* Flies the camera from its current position to a new position.
*
Expand All @@ -2299,6 +2315,8 @@ define([
* @param {Matrix4} [options.endTransform] Transform matrix representing the reference frame the camera will be in when the flight is completed.
* @param {Boolean} [options.convert=true] When <code>true</code>, the destination is converted to the correct coordinate system for each scene mode. When <code>false</code>, the destination is expected
* to be in the correct coordinate system.
* @param {Number} [options.maximumHeight] The maximum height at the peak of the flight.
* @param {EasingFunction|EasingFunction~Callback} [options.easingFunction] Controls how the time is interpolated over the duration of the flight.
*
* @exception {DeveloperError} If either direction or up is given, then both are required.
*
Expand Down Expand Up @@ -2346,42 +2364,52 @@ define([

var isRectangle = defined(destination.west);
if (isRectangle) {
if (scene.mode !== SceneMode.SCENE3D && destination.west > destination.east) {
destination = Rectangle.MAX_VALUE;
}
destination = scene.camera.getRectangleCameraCoordinates(destination, scratchFlyToDestination);
}

var direction;
var up;
var heading;
var pitch;
var roll;

var orientation = defaultValue(options.orientation, defaultValue.EMPTY_OBJECT);
if (defined(orientation.heading)) {
var heading = defaultValue(orientation.heading, 0.0);
var pitch = defaultValue(orientation.pitch, -CesiumMath.PI_OVER_TWO);
var roll = defaultValue(orientation.roll, 0.0);
heading = orientation.heading;
pitch = orientation.pitch;
roll = orientation.roll;
} else if (defined(orientation.direction)) {
var direction = Cartesian3.clone(orientation.direction, scratchFlyDirection);
var up = Cartesian3.clone(orientation.up, scratchFlyUp);

var rotQuat = Quaternion.fromHeadingPitchRoll(heading - CesiumMath.PI_OVER_TWO, pitch, roll, scratchFlyToQuaternion);
var rotMat = Matrix3.fromQuaternion(rotQuat, scratchFlyToMatrix3);
if (scene.mode === SceneMode.SCENE3D) {
var ellipsoid = this._projection.ellipsoid;
var transform = Transforms.eastNorthUpToFixedFrame(destination, ellipsoid, scratchHPRMatrix1);
var invTransform = Matrix4.inverseTransformation(transform, scratchHPRMatrix2);

direction = Matrix3.getColumn(rotMat, 0, scratchFlyToDirection);
up = Matrix3.getColumn(rotMat, 2, scratchFlyToUp);
Matrix4.multiplyByPointAsVector(invTransform, direction, direction);
Matrix4.multiplyByPointAsVector(invTransform, up, up);
}

var ellipsoid = this._projection.ellipsoid;
var transform = Transforms.eastNorthUpToFixedFrame(destination, ellipsoid, scratchFlyToMatrix4);
var right = Cartesian3.cross(direction, up, scratchFlyRight);

Matrix4.multiplyByPointAsVector(transform, direction, direction);
Matrix4.multiplyByPointAsVector(transform, up, up);
} else if (defined(orientation.direction)) {
direction = orientation.direction;
up = orientation.up;
heading = getHeading(direction, up);
pitch = getPitch(direction);
roll = getRoll(direction, up, right);
}

newOptions.destination = destination;
newOptions.direction = direction;
newOptions.up = up;
newOptions.heading = heading;
newOptions.pitch = pitch;
newOptions.roll = roll;
newOptions.duration = options.duration;
newOptions.complete = options.complete;
newOptions.cancel = options.cancel;
newOptions.endTransform = options.endTransform;
newOptions.convert = isRectangle ? false : options.convert;
newOptions.maximumHeight = options.maximumHeight;
newOptions.easingFunction = options.easingFunction;

scene.tweens.add(CameraFlightPath.createTween(scene, newOptions));
};
Expand Down Expand Up @@ -2469,6 +2497,9 @@ define([
var scratchflyToBoundingSphereDirection = new Cartesian3();
var scratchflyToBoundingSphereUp = new Cartesian3();
var scratchflyToBoundingSphereRight = new Cartesian3();
var scratchFlyToBoundingSphereCart4 = new Cartesian4();
var scratchFlyToBoundingSphereQuaternion = new Quaternion();
var scratchFlyToBoundingSphereMatrix3 = new Matrix3();

/**
* Flys the camera to a location where the current view contains the provided bounding sphere.
Expand All @@ -2489,6 +2520,8 @@ define([
* @param {Camera~FlightCompleteCallback} [options.complete] The function to execute when the flight is complete.
* @param {Camera~FlightCancelledCallback} [options.cancel] The function to execute if the flight is cancelled.
* @param {Matrix4} [options.endTransform] Transform matrix representing the reference frame the camera will be in when the flight is completed.
* @param {Number} [options.maximumHeight] The maximum height at the peak of the flight.
* @param {EasingFunction|EasingFunction~Callback} [options.easingFunction] Controls how the time is interpolated over the duration of the flight.
*/
Camera.prototype.flyToBoundingSphere = function(boundingSphere, options) {
//>>includeStart('debug', pragmas.debug);
Expand Down Expand Up @@ -2521,6 +2554,14 @@ define([
Cartesian3.normalize(direction, direction);

up = Matrix4.multiplyByPointAsVector(transform, Cartesian3.UNIT_Z, scratchflyToBoundingSphereUp);
if (1.0 - Math.abs(Cartesian3.dot(direction, up)) < CesiumMath.EPSILON6) {
var rotateQuat = Quaternion.fromAxisAngle(direction, offset.heading, scratchFlyToBoundingSphereQuaternion);
var rotation = Matrix3.fromQuaternion(rotateQuat, scratchFlyToBoundingSphereMatrix3);

Cartesian3.fromCartesian4(Matrix4.getColumn(transform, 1, scratchFlyToBoundingSphereCart4), up);
Matrix3.multiplyByVector(rotation, up, up);
}

var right = Cartesian3.cross(direction, up, scratchflyToBoundingSphereRight);
Cartesian3.cross(right, direction, up);
Cartesian3.normalize(up, up);
Expand All @@ -2535,27 +2576,12 @@ define([
duration : options.duration,
complete : options.complete,
cancel : options.cancel,
endTransform : options.endTransform
endTransform : options.endTransform,
maximumHeight : options.maximumHeight,
easingFunction : options.easingFunction
});
};

/**
* Returns a duplicate of a Camera instance.
* @deprecated
* @returns {Camera} The provided result parameter or a new copy of the Camera instance.
*/
Camera.prototype.clone = function() {
var camera = new Camera(this._scene);
camera.position = Cartesian3.clone(this.position);
camera.direction = Cartesian3.clone(this.direction);
camera.up = Cartesian3.clone(this.up);
camera.right = Cartesian3.clone(this.right);
camera._transform = Matrix4.clone(this.transform);
camera._transformChanged = true;
camera.frustum = this.frustum.clone();
return camera;
};

/**
* @private
*/
Expand Down
Loading

0 comments on commit e74d4be

Please sign in to comment.