Skip to content

Commit

Permalink
Fixed Formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@ggetz
ggetz committed Oct 14, 2015
1 parent 679cbd5 commit 98a32e5
Show file tree
Hide file tree
Showing 6 changed files with 195 additions and 34 deletions.
4 changes: 3 additions & 1 deletion CHANGES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ Change Log
* Deleted old `<subfolder>/package.json` and `*.profile.js` files, not used since we moved away from a Dojo-based build years ago. This should allow future compatibility with newer systems like Browserify and Webpack.
* ...
* Deprecated
* ...
* Depreciated `BoxGeometry.minimumCorner` and `BoxGeometry.maximumCorner`, use `BoxGeometry.minimum` and `BoxGeometry.maximum` instead. These will be removed in 1.17.
* Depreciated `BoxOutlineGeometry.minimumCorner` and `BoxOutlineGeometry.maximumCorner`, use `BoxOutlineGeometry.minimum` and `BoxOutlineGeometry.maximum` instead. These will be removed in 1.17.
* Decreased GPU memory usage in `BillboardCollection` and `LabelCollection` by using the WebGL ANGLE_instanced_arrays extension.
* Added CZML examples to Sandcastle. See the new CZML tab.
* Fixed token issue in ArcGisMapServerImageryProvider.
* `ImageryLayerFeatureInfo` now has an `imageryLayer` property, indicating the layer that contains the feature.
* Added `BoxOutlineGeometry.fromAxisAlignedBoundingBox` and `BoxGeometry.fromAxisAlignedBoundingBox` functions.

### 1.14 - 2015-10-01

Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
* [Kai Ninomiya](https://github.com/kainino0x)
* [Sean Lilley](https://github.com/lilleyse)
* [Katherina Lim](https://github.com/klim705)
* [Gabrielle Getz](https://github.com/ggetz)
* [NICTA](http://www.nicta.com.au/)
* [Chris Cooper](https://github.com/chris-cooper)
* [Kevin Ring](https://github.com/kring)
Expand Down
123 changes: 102 additions & 21 deletions Source/Core/BoxGeometry.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ define([
'./ComponentDatatype',
'./defaultValue',
'./defined',
'./deprecationWarning',
'./DeveloperError',
'./Geometry',
'./GeometryAttribute',
Expand All @@ -17,6 +18,7 @@ define([
ComponentDatatype,
defaultValue,
defined,
deprecationWarning,
DeveloperError,
Geometry,
GeometryAttribute,
Expand All @@ -34,8 +36,8 @@ define([
* @constructor
*
* @param {Object} options Object with the following properties:
* @param {Cartesian3} options.minimumCorner The minimum x, y, and z coordinates of the box.
* @param {Cartesian3} options.maximumCorner The maximum x, y, and z coordinates of the box.
* @param {Cartesian3} options.minimum The minimum x, y, and z coordinates of the box.
* @param {Cartesian3} options.maximum The maximum x, y, and z coordinates of the box.
* @param {VertexFormat} [options.vertexFormat=VertexFormat.DEFAULT] The vertex attributes to be computed.
*
* @see BoxGeometry.fromDimensions
Expand All @@ -47,29 +49,42 @@ define([
* @example
* var box = new Cesium.BoxGeometry({
* vertexFormat : Cesium.VertexFormat.POSITION_ONLY,
* maximumCorner : new Cesium.Cartesian3(250000.0, 250000.0, 250000.0),
* minimumCorner : new Cesium.Cartesian3(-250000.0, -250000.0, -250000.0)
* maximum : new Cesium.Cartesian3(250000.0, 250000.0, 250000.0),
* minimum : new Cesium.Cartesian3(-250000.0, -250000.0, -250000.0)
* });
* var geometry = Cesium.BoxGeometry.createGeometry(box);
*/
var BoxGeometry = function(options) {
options = defaultValue(options, defaultValue.EMPTY_OBJECT);
var min = options.minimumCorner;
var max = options.maximumCorner;

var min = options.minimum;
var max = options.maximum;

//>>includeStart('debug', pragmas.debug);
if (!defined(min)) {
throw new DeveloperError('options.minimumCorner is required.');
if (defined(options.minimumCorner)) {
min = options.minimumCorner;
deprecationWarning('BoxGeometry', 'options.minimumCorner is deprecated. Use options.minimum instead.');
}
else {
throw new DeveloperError('options.minimum is required.');
}
}
if (!defined(max)) {
throw new DeveloperError('options.maximumCorner is required');
if (defined(options.maximumCorner)) {
max = options.maximumCorner;
deprecationWarning('BoxGeometry', 'options.maximumCorner is deprecated. Use options.maximum instead.');
}
else {
throw new DeveloperError('options.maximum is required');
}
}
//>>includeEnd('debug');

var vertexFormat = defaultValue(options.vertexFormat, VertexFormat.DEFAULT);

this._minimumCorner = Cartesian3.clone(min);
this._maximumCorner = Cartesian3.clone(max);
this._minimum = Cartesian3.clone(min);
this._maximum = Cartesian3.clone(max);
this._vertexFormat = vertexFormat;
this._workerName = 'createBoxGeometry';
};
Expand Down Expand Up @@ -111,13 +126,79 @@ define([
var max = corner;

var newOptions = {
minimumCorner : min,
maximumCorner : max,
minimum : min,
maximum : max,
vertexFormat : options.vertexFormat
};
return new BoxGeometry(newOptions);
};

/**
* Creates a cube from the dimensions of an AxisAlignedBoundingBox.
*
* @param {AxisAlignedBoundingBox} boundingBox A description of the AxisAlignedBoundingBox.
* @returns {BoxGeometry}
*
* @exception {DeveloperError} AxisAlignedBoundingBox must be defined.
*
* @see BoxGeometry.createGeometry
*
* @example
* var aabb = Cesium.AxisAlignedBoundingBox.fromPoints(Cesium.Cartesian3.fromDegreesArray([
* -72.0, 40.0,
* -70.0, 35.0,
* -75.0, 30.0,
* -70.0, 30.0,
* -68.0, 40.0
* ]));
* var box = Cesium.BoxGeometry.fromAxisAlignedBoundingBox({
* boundingBox: aabb
* });
*/
BoxGeometry.fromAxisAlignedBoundingBox = function (boundingBox) {
if (!defined(boundingBox)) {
throw new DeveloperError('boundingBox is required.');
}
var newOptions = {
minimum: boundingBox.minimum,
maximum: boundingBox.maximum
};
return new BoxGeometry(newOptions);
};

/**
* Creates a cube from the dimensions of an AxisAlignedBoundingBox.
*
* @param {AxisAlignedBoundingBox} boundingBox A description of the AxisAlignedBoundingBox.
* @returns {BoxGeometry}
*
* @exception {DeveloperError} AxisAlignedBoundingBox must be defined.
*
* @see BoxGeometry.createGeometry
*
* @example
* var aabb = Cesium.AxisAlignedBoundingBox.fromPoints(Cesium.Cartesian3.fromDegreesArray([
* -72.0, 40.0,
* -70.0, 35.0,
* -75.0, 30.0,
* -70.0, 30.0,
* -68.0, 40.0
* ]));
* var box = Cesium.BoxGeometry.fromAxisAlignedBoundingBox({
* boundingBox: aabb
* });
*/
BoxGeometry.fromAxisAlignedBoundingBox = function (boundingBox) {
if (!defined(boundingBox)) {
throw new DeveloperError('boundingBox is required.');
}
var newOptions = {
minimum : boundingBox.minimum,
maximum : boundingBox.maximum
};
return new BoxGeometry(newOptions);
};

/**
* The number of elements used to pack the object into an array.
* @type {Number}
Expand All @@ -144,18 +225,18 @@ define([

startingIndex = defaultValue(startingIndex, 0);

Cartesian3.pack(value._minimumCorner, array, startingIndex);
Cartesian3.pack(value._maximumCorner, array, startingIndex + Cartesian3.packedLength);
Cartesian3.pack(value._minimum, array, startingIndex);
Cartesian3.pack(value._maximum, array, startingIndex + Cartesian3.packedLength);
VertexFormat.pack(value._vertexFormat, array, startingIndex + 2 * Cartesian3.packedLength);
};

var scratchMin = new Cartesian3();
var scratchMax = new Cartesian3();
var scratchVertexFormat = new VertexFormat();
var scratchOptions = {
minimumCorner : scratchMin,
maximumCorner : scratchMax,
vertexFormat : scratchVertexFormat
minimum: scratchMin,
maximum: scratchMax,
vertexFormat: scratchVertexFormat
};

/**
Expand Down Expand Up @@ -183,8 +264,8 @@ define([
return new BoxGeometry(scratchOptions);
}

result._minimumCorner = Cartesian3.clone(min, result._minimumCorner);
result._maximumCorner = Cartesian3.clone(max, result._maximumCorner);
result._minimum = Cartesian3.clone(min, result._minimum);
result._maximum = Cartesian3.clone(max, result._maximum);
result._vertexFormat = VertexFormat.clone(vertexFormat, result._vertexFormat);

return result;
Expand All @@ -197,8 +278,8 @@ define([
* @returns {Geometry} The computed vertices and indices.
*/
BoxGeometry.createGeometry = function(boxGeometry) {
var min = boxGeometry._minimumCorner;
var max = boxGeometry._maximumCorner;
var min = boxGeometry._minimum;
var max = boxGeometry._maximum;
var vertexFormat = boxGeometry._vertexFormat;

var attributes = new GeometryAttributes();
Expand Down
69 changes: 57 additions & 12 deletions Source/Core/BoxOutlineGeometry.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ define([
'./ComponentDatatype',
'./defaultValue',
'./defined',
'./deprecationWarning',
'./DeveloperError',
'./Geometry',
'./GeometryAttribute',
Expand All @@ -16,6 +17,7 @@ define([
ComponentDatatype,
defaultValue,
defined,
deprecationWarning,
DeveloperError,
Geometry,
GeometryAttribute,
Expand All @@ -32,8 +34,8 @@ define([
* @constructor
*
* @param {Object} options Object with the following properties:
* @param {Cartesian3} options.minimumCorner The minimum x, y, and z coordinates of the box.
* @param {Cartesian3} options.maximumCorner The maximum x, y, and z coordinates of the box.
* @param {Cartesian3} options.minimum The minimum x, y, and z coordinates of the box.
* @param {Cartesian3} options.maximum The maximum x, y, and z coordinates of the box.
*
* @see BoxOutlineGeometry.fromDimensions
* @see BoxOutlineGeometry.createGeometry
Expand All @@ -43,23 +45,35 @@ define([
*
* @example
* var box = new Cesium.BoxOutlineGeometry({
* maximumCorner : new Cesium.Cartesian3(250000.0, 250000.0, 250000.0),
* minimumCorner : new Cesium.Cartesian3(-250000.0, -250000.0, -250000.0)
* maximum : new Cesium.Cartesian3(250000.0, 250000.0, 250000.0),
* minimum : new Cesium.Cartesian3(-250000.0, -250000.0, -250000.0)
* });
* var geometry = Cesium.BoxOutlineGeometry.createGeometry(box);
*/
var BoxOutlineGeometry = function(options) {
options = defaultValue(options, defaultValue.EMPTY_OBJECT);

var min = options.minimumCorner;
var max = options.maximumCorner;
var min = options.minimum;
var max = options.maximum;

//>>includeStart('debug', pragmas.debug);
if (!defined(min)) {
throw new DeveloperError('options.minimumCorner is required.');
if (defined(options.minimumCorner)) {
min = options.minimumCorner;
deprecationWarning('BoxOutlineGeometry', 'options.minimumCorner is deprecated. Use options.minimum instead.');
}
else {
throw new DeveloperError('options.minimum is required.');
}
}
if (!defined(max)) {
throw new DeveloperError('options.maximumCorner is required');
if (defined(options.maximumCorner)) {
max = options.maximumCorner;
deprecationWarning('BoxOutlineGeometry', 'options.maximumCorner is deprecated. Use options.maximum instead.');
}
else {
throw new DeveloperError('options.maximum is required');
}
}
//>>includeEnd('debug');

Expand Down Expand Up @@ -103,8 +117,39 @@ define([
var max = corner;

var newOptions = {
minimumCorner : min,
maximumCorner : max
minimum : min,
maximum : max
};
return new BoxOutlineGeometry(newOptions);
};

/**
* Creates an outline of a cube from the dimensions of an AxisAlignedBoundingBox.
*
* @param {AxisAlignedBoundingBox} boundingBox A description of the AxisAlignedBoundingBox.
* @returns {BoxOutlineGeometry}
*
* @exception {DeveloperError} AxisAlignedBoundingBox must be defined.
*
* @see BoxOutlineGeometry.createGeometry
*
* @example
* var aabb = Cesium.AxisAlignedBoundingBox.fromPoints(Cesium.Cartesian3.fromDegreesArray([
* -72.0, 40.0,
* -70.0, 35.0,
* -75.0, 30.0,
* -70.0, 30.0,
* -68.0, 40.0
* ]));
* var box = Cesium.BoxOutlineGeometry.fromAxisAlignedBoundingBox(aabb);
*/
BoxOutlineGeometry.fromAxisAlignedBoundingBox = function(boundingBox) {
if (!defined(boundingBox)) {
throw new DeveloperError('boundingBox is required.');
}
var newOptions = {
minimum : boundingBox.minimum,
maximum : boundingBox.maximum
};
return new BoxOutlineGeometry(newOptions);
};
Expand Down Expand Up @@ -142,8 +187,8 @@ define([
var scratchMin = new Cartesian3();
var scratchMax = new Cartesian3();
var scratchOptions = {
minimumCorner : scratchMin,
maximumCorner : scratchMax
minimum : scratchMin,
maximum : scratchMax
};

/**
Expand Down
16 changes: 16 additions & 0 deletions Specs/Core/BoxGeometrySpec.js
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
/*global defineSuite*/
defineSuite([
'Core/BoxGeometry',
'Core/AxisAlignedBoundingBox',
'Core/Cartesian3',
'Core/VertexFormat',
'Specs/createPackableSpecs'
], function(
BoxGeometry,
AxisAlignedBoundingBox,
Cartesian3,
VertexFormat,
createPackableSpecs) {
Expand Down Expand Up @@ -84,6 +86,20 @@ defineSuite([
expect(m.indices.length).toEqual(12 * 3);
});

it('fromAxisAlignedBoundingBox throws with no boundingBox', function() {
expect(function() {
return BoxGeometry.fromAxisAlignedBoundingBox(undefined);
}).toThrowDeveloperError();
});

it('fromAxisAlignedBoundingBox', function() {
var min = new Cartesian3(-1, -2, -3);
var max = new Cartesian3(1, 2, 3);
var m = BoxGeometry.fromAxisAlignedBoundingBox(new AxisAlignedBoundingBox(min, max));
expect(m._minimum).toEqual(min);
expect(m._maximum).toEqual(max);
});

createPackableSpecs(BoxGeometry, new BoxGeometry({
minimumCorner : new Cartesian3(1.0, 2.0, 3.0),
maximumCorner : new Cartesian3(4.0, 5.0, 6.0),
Expand Down
Loading

0 comments on commit 98a32e5

Please sign in to comment.