Skip to content

Commit

Permalink
Merge branch 'master' into corridorOutline
Browse files Browse the repository at this point in the history
  • Loading branch information
hpinkos committed Sep 3, 2013
2 parents 110a052 + 5d81084 commit aafd83c
Show file tree
Hide file tree
Showing 112 changed files with 980 additions and 774 deletions.
17 changes: 9 additions & 8 deletions Apps/Sandcastle/gallery/Geometry and Appearances.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -691,31 +691,31 @@
geometry : boxGeometry,
modelMatrix : boxModelMatrix,
attributes : {
color : Cesium.ColorGeometryInstanceAttribute.fromColor(Cesium.Color.fromRandom({alpha : 1.0}))
color : Cesium.ColorGeometryInstanceAttribute.fromColor(Cesium.Color.fromRandom({alpha : 0.5}))
}
}));

instances.push(new Cesium.GeometryInstance({
geometry : ellipsoidGeometry,
modelMatrix : ellipsoidModelMatrix,
attributes : {
color : Cesium.ColorGeometryInstanceAttribute.fromColor(Cesium.Color.fromRandom({alpha : 1.0}))
color : Cesium.ColorGeometryInstanceAttribute.fromColor(Cesium.Color.fromRandom({alpha : 0.5}))
}
}));

instances.push(new Cesium.GeometryInstance({
geometry : sphereGeometry,
modelMatrix : sphereModelMatrix,
attributes : {
color : Cesium.ColorGeometryInstanceAttribute.fromColor(Cesium.Color.fromRandom({alpha : 1.0}))
color : Cesium.ColorGeometryInstanceAttribute.fromColor(Cesium.Color.fromRandom({alpha : 0.5}))
}
}));
}

primitives.add(new Cesium.Primitive({
geometryInstances : instances,
appearance : new Cesium.PerInstanceColorAppearance({
translucent : false,
translucent : true,
closed : true
})
}));
Expand Down Expand Up @@ -805,7 +805,7 @@
extrudedHeight: 400000
}),
attributes : {
color : Cesium.ColorGeometryInstanceAttribute.fromColor(Cesium.Color.fromRandom({alpha : 1.0}))
color : Cesium.ColorGeometryInstanceAttribute.fromColor(Cesium.Color.fromRandom({alpha : 0.7}))
}
});

Expand All @@ -828,15 +828,16 @@
height: 700000
}),
attributes : {
color : Cesium.ColorGeometryInstanceAttribute.fromColor(Cesium.Color.fromRandom({alpha : 1.0}))
color : Cesium.ColorGeometryInstanceAttribute.fromColor(Cesium.Color.fromRandom({alpha : 0.7}))
}
});

primitives.add(new Cesium.Primitive({
geometryInstances : [corridor, extrudedCorridor, corridorFill],
appearance : new Cesium.PerInstanceColorAppearance({
translucent : false,
closed : true
translucent : true,
closed : true,
faceForward : true
})
}));

Expand Down
3 changes: 2 additions & 1 deletion CHANGES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,19 +69,20 @@ var geometry = BoxGeometry.createGeometry(box);
* Added `Color.fromRandom` to generate random and partially random colors.
* Added an `onCancel` callback to `CameraFlightPath` functions that will be executed if the flight is canceled.
* Added `Scene.debugShowFrustums` and `Scene.debugFrustumStatistics` for rendering debugging.
* Added an `onCancel` callback to `CameraFlightPath` functions that will be executed if the flight is canceled.
* Added `Packable` and `PackableForInterpolation` interfaces to aid interpolation and in-memory data storage. Also made most core Cesium types implement them.
* Added `InterpolationAlgorithm` interface to codify the base interface already being used by `LagrangePolynomialApproximation`, `LinearApproximation`, and `HermitePolynomialApproximation`.
* Improved the performance of polygon triangulation using an O(n log n) algorithm.
* Improved geometry batching performance by moving work to a web worker.
* Improved `WallGeometry` to follow the curvature of the earth.
* Improved visual quality of closed translucent geometries.
* Optimized polyline bounding spheres.
* `Viewer` now automatically sets its clock to that of the first added `DataSource`, regardless of how it was added to the `DataSourceCollection`. Previously, this was only done for dropped files by `viewerDragDropMixin`.
* `CesiumWidget` and `Viewer` now display an HTML error panel if an error occurs while rendering, which can be disabled with a constructor option.
* `CameraFlightPath` now automatically disables and restores mouse input for the flights it generates.
* Fixed broken surface rendering in Columbus View when using the `EllipsoidTerrainProvider`.
* Fixed triangulation for polygons that cross the international date line.
* Fixed `EllipsoidPrimitive` rendering for some oblate ellipsoids. [#1067](https://github.com/AnalyticalGraphicsInc/cesium/pull/1067).
* Fixed Cesium on Nexus 4 with Android 4.3.
* Upgraded Knockout from version 2.2.1 to 2.3.0.

### b19 - 2013-08-01
Expand Down
14 changes: 7 additions & 7 deletions Source/Core/AxisAlignedBoundingBox.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ define([
*
* @param {Array} positions List of points that the bounding box will enclose. Each point must have a <code>x</code>, <code>y</code>, and <code>z</code> properties.
* @param {AxisAlignedBoundingBox} [result] The object onto which to store the result.
* @return {AxisAlignedBoundingBox} The modified result parameter or a new AxisAlignedBoundingBox instance if one was not provided.
* @returns {AxisAlignedBoundingBox} The modified result parameter or a new AxisAlignedBoundingBox instance if one was not provided.
*
* @example
* // Compute an axis aligned bounding box enclosing two points.
Expand Down Expand Up @@ -124,7 +124,7 @@ define([
*
* @param {AxisAlignedBoundingBox} box The bounding box to duplicate.
* @param {AxisAlignedBoundingBox} [result] The object onto which to store the result.
* @return {AxisAlignedBoundingBox} The modified result parameter or a new AxisAlignedBoundingBox instance if none was provided. (Returns undefined if box is undefined)
* @returns {AxisAlignedBoundingBox} The modified result parameter or a new AxisAlignedBoundingBox instance if none was provided. (Returns undefined if box is undefined)
*/
AxisAlignedBoundingBox.clone = function(box, result) {
if (!defined(box)) {
Expand All @@ -148,7 +148,7 @@ define([
*
* @param {AxisAlignedBoundingBox} [left] The first AxisAlignedBoundingBox.
* @param {AxisAlignedBoundingBox} [right] The second AxisAlignedBoundingBox.
* @return {Boolean} <code>true</code> if left and right are equal, <code>false</code> otherwise.
* @returns {Boolean} <code>true</code> if left and right are equal, <code>false</code> otherwise.
*/
AxisAlignedBoundingBox.equals = function(left, right) {
return (left === right) ||
Expand All @@ -168,7 +168,7 @@ define([
* @param {Cartesian4} plane The coefficients of the plane in the form <code>ax + by + cz + d = 0</code>
* where the coefficients a, b, c, and d are the components x, y, z, and w
* of the {Cartesian4}, respectively.
* @return {Intersect} {Intersect.INSIDE} if the entire box is on the side of the plane the normal is pointing,
* @returns {Intersect} {Intersect.INSIDE} if the entire box is on the side of the plane the normal is pointing,
* {Intersect.OUTSIDE} if the entire box is on the opposite side, and {Intersect.INTERSETING}
* if the box intersects the plane.
*
Expand Down Expand Up @@ -206,7 +206,7 @@ define([
* @memberof AxisAlignedBoundingBox
*
* @param {AxisAlignedBoundingBox} [result] The object onto which to store the result.
* @return {AxisAlignedBoundingBox} The modified result parameter or a new AxisAlignedBoundingBox instance if one was not provided.
* @returns {AxisAlignedBoundingBox} The modified result parameter or a new AxisAlignedBoundingBox instance if one was not provided.
*/
AxisAlignedBoundingBox.prototype.clone = function(result) {
return AxisAlignedBoundingBox.clone(this, result);
Expand All @@ -219,7 +219,7 @@ define([
* @param {Cartesian4} plane The coefficients of the plane in the form <code>ax + by + cz + d = 0</code>
* where the coefficients a, b, c, and d are the components x, y, z, and w
* of the {Cartesian4}, respectively.
* @return {Intersect} {Intersect.INSIDE} if the entire box is on the side of the plane the normal is pointing,
* @returns {Intersect} {Intersect.INSIDE} if the entire box is on the side of the plane the normal is pointing,
* {Intersect.OUTSIDE} if the entire box is on the opposite side, and {Intersect.INTERSETING}
* if the box intersects the plane.
*
Expand All @@ -235,7 +235,7 @@ define([
* @memberof AxisAlignedBoundingBox
*
* @param {AxisAlignedBoundingBox} [right] The right hand side AxisAlignedBoundingBox.
* @return {Boolean} <code>true</code> if they are equal, <code>false</code> otherwise.
* @returns {Boolean} <code>true</code> if they are equal, <code>false</code> otherwise.
*/
AxisAlignedBoundingBox.prototype.equals = function(right) {
return AxisAlignedBoundingBox.equals(this, right);
Expand Down
24 changes: 12 additions & 12 deletions Source/Core/BoundingRectangle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ define([
*
* @param {Array} positions List of points that the bounding rectangle will enclose. Each point must have <code>x</code> and <code>y</code> properties.
* @param {BoundingRectangle} [result] The object onto which to store the result.
* @return {BoundingRectangle} The modified result parameter or a new BoundingRectangle instance if one was not provided.
* @returns {BoundingRectangle} The modified result parameter or a new BoundingRectangle instance if one was not provided.
*/
BoundingRectangle.fromPoints = function(positions, result) {
if (!defined(result)) {
Expand Down Expand Up @@ -115,7 +115,7 @@ define([
* @param {Extent} extent The valid extent used to create a bounding rectangle.
* @param {Object} [projection=GeographicProjection] The projection used to project the extent into 2D.
* @param {BoundingRectangle} [result] The object onto which to store the result.
* @return {BoundingRectangle} The modified result parameter or a new BoundingRectangle instance if one was not provided.
* @returns {BoundingRectangle} The modified result parameter or a new BoundingRectangle instance if one was not provided.
*/
BoundingRectangle.fromExtent = function(extent, projection, result) {
if (!defined(result)) {
Expand Down Expand Up @@ -150,7 +150,7 @@ define([
*
* @param {BoundingRectangle} rectangle The bounding rectangle to duplicate.
* @param {BoundingRectangle} [result] The object onto which to store the result.
* @return {BoundingRectangle} The modified result parameter or a new BoundingRectangle instance if one was not provided. (Returns undefined if rectangle is undefined)
* @returns {BoundingRectangle} The modified result parameter or a new BoundingRectangle instance if one was not provided. (Returns undefined if rectangle is undefined)
*/
BoundingRectangle.clone = function(rectangle, result) {
if (!defined(rectangle)) {
Expand All @@ -175,7 +175,7 @@ define([
* @param {BoundingRectangle} left A rectangle to enclose in bounding rectangle.
* @param {BoundingRectangle} right A rectangle to enclose in a bounding rectangle.
* @param {BoundingRectangle} [result] The object onto which to store the result.
* @return {BoundingRectangle} The modified result parameter or a new BoundingRectangle instance if one was not provided.
* @returns {BoundingRectangle} The modified result parameter or a new BoundingRectangle instance if one was not provided.
*
* @exception {DeveloperError} left is required.
* @exception {DeveloperError} right is required.
Expand Down Expand Up @@ -212,7 +212,7 @@ define([
* @param {BoundingRectangle} rectangle A rectangle to expand.
* @param {Cartesian2} point A point to enclose in a bounding rectangle.
* @param {BoundingRectangle} [result] The object onto which to store the result.
* @return {BoundingRectangle} The modified result parameter or a new BoundingRectangle instance if one was not provided.
* @returns {BoundingRectangle} The modified result parameter or a new BoundingRectangle instance if one was not provided.
*
* @exception {DeveloperError} rectangle is required.
* @exception {DeveloperError} point is required.
Expand Down Expand Up @@ -254,7 +254,7 @@ define([
*
* @param {BoundingRectangle} left A rectangle to check for intersection.
* @param {BoundingRectangle} right The other rectangle to check for intersection.
* @return {Intersect} <code>Intersect.INTESECTING</code> if the rectangles intersect, <code>Intersect.OUTSIDE</code> otherwise.
* @returns {Intersect} <code>Intersect.INTESECTING</code> if the rectangles intersect, <code>Intersect.OUTSIDE</code> otherwise.
*
* @exception {DeveloperError} left is required.
* @exception {DeveloperError} right is required.
Expand Down Expand Up @@ -289,7 +289,7 @@ define([
*
* @param {BoundingRectangle} [left] The first BoundingRectangle.
* @param {BoundingRectangle} [right] The second BoundingRectangle.
* @return {Boolean} <code>true</code> if left and right are equal, <code>false</code> otherwise.
* @returns {Boolean} <code>true</code> if left and right are equal, <code>false</code> otherwise.
*/
BoundingRectangle.equals = function(left, right) {
return (left === right) ||
Expand All @@ -306,7 +306,7 @@ define([
* @memberof BoundingRectangle
*
* @param {BoundingRectangle} [result] The object onto which to store the result.
* @return {BoundingRectangle} The modified result parameter or a new BoundingRectangle instance if one was not provided.
* @returns {BoundingRectangle} The modified result parameter or a new BoundingRectangle instance if one was not provided.
*/
BoundingRectangle.prototype.clone = function(result) {
return BoundingRectangle.clone(this, result);
Expand All @@ -318,7 +318,7 @@ define([
*
* @param {BoundingRectangle} right The rectangle to enclose in this bounding rectangle.
* @param {BoundingRectangle} [result] The object onto which to store the result.
* @return {BoundingRectangle} The modified result parameter or a new BoundingRectangle instance if one was not provided.
* @returns {BoundingRectangle} The modified result parameter or a new BoundingRectangle instance if one was not provided.
*
* @exception {DeveloperError} right is required.
*/
Expand All @@ -331,7 +331,7 @@ define([
* @memberof BoundingRectangle
*
* @param {BoundingRectangle} point A point to enclose in a bounding rectangle.
* @return {BoundingRectangle} The modified result parameter or a new BoundingRectangle instance if one was not provided.
* @returns {BoundingRectangle} The modified result parameter or a new BoundingRectangle instance if one was not provided.
*
* @exception {DeveloperError} point is required.
*/
Expand All @@ -344,7 +344,7 @@ define([
* @memberof BoundingRectangle
*
* @param {BoundingRectangle} right A rectangle to check for intersection.
* @return {Intersect} <code>Intersect.INTESECTING</code> if the rectangles intersect, <code>Intersect.OUTSIDE</code> otherwise.
* @returns {Intersect} <code>Intersect.INTESECTING</code> if the rectangles intersect, <code>Intersect.OUTSIDE</code> otherwise.
*
* @exception {DeveloperError} right is required.
*/
Expand All @@ -358,7 +358,7 @@ define([
* @memberof BoundingRectangle
*
* @param {BoundingRectangle} [right] The right hand side BoundingRectangle.
* @return {Boolean} <code>true</code> if they are equal, <code>false</code> otherwise.
* @returns {Boolean} <code>true</code> if they are equal, <code>false</code> otherwise.
*/
BoundingRectangle.prototype.equals = function(right) {
return BoundingRectangle.equals(this, right);
Expand Down
Loading

0 comments on commit aafd83c

Please sign in to comment.