Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/open-source'
Browse files Browse the repository at this point in the history
  • Loading branch information
@pjcozzi
pjcozzi committed Jan 20, 2014
2 parents 989d48b + e549687 commit 14f442a
Show file tree
Hide file tree
Showing 150 changed files with 926 additions and 926 deletions.
2 changes: 1 addition & 1 deletion Source/Core/AxisAlignedBoundingBox.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ define([
*
* @example
* // Compute an axis aligned bounding box enclosing two points.
* var box = AxisAlignedBoundingBox.fromPoints([new Cartesian3(2, 0, 0), new Cartesian3(-2, 0, 0)]);
* var box = Cesium.AxisAlignedBoundingBox.fromPoints([new Cesium.Cartesian3(2, 0, 0), new Cesium.Cartesian3(-2, 0, 0)]);
*/
AxisAlignedBoundingBox.fromPoints = function(positions, result) {
if (!defined(result)) {
Expand Down
14 changes: 7 additions & 7 deletions Source/Core/BoundingSphere.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,11 +331,11 @@ define([
* // Compute the bounding sphere from 3 positions, each specified relative to a center.
* // In addition to the X, Y, and Z coordinates, the points array contains two additional
* // elements per point which are ignored for the purpose of computing the bounding sphere.
* var center = new Cartesian3(1.0, 2.0, 3.0);
* var center = new Cesium.Cartesian3(1.0, 2.0, 3.0);
* var points = [1.0, 2.0, 3.0, 0.1, 0.2,
* 4.0, 5.0, 6.0, 0.1, 0.2,
* 7.0, 8.0, 9.0, 0.1, 0.2];
* var sphere = BoundingSphere.fromVertices(points, center, 5);
* var sphere = Cesium.BoundingSphere.fromVertices(points, center, 5);
*/
BoundingSphere.fromVertices = function(positions, center, stride, result) {
if (!defined(result)) {
Expand Down Expand Up @@ -505,7 +505,7 @@ define([
*
* @example
* // Create a bounding sphere around the unit cube
* var sphere = BoundingSphere.fromCornerPoints(new Cartesian3(-0.5, -0.5, -0.5), new Cartesian3(0.5, 0.5, 0.5));
* var sphere = Cesium.BoundingSphere.fromCornerPoints(new Cesium.Cartesian3(-0.5, -0.5, -0.5), new Cesium.Cartesian3(0.5, 0.5, 0.5));
*/
BoundingSphere.fromCornerPoints = function(corner, oppositeCorner, result) {
//>>includeStart('debug', pragmas.debug);
Expand Down Expand Up @@ -538,7 +538,7 @@ define([
* @exception {DeveloperError} ellipsoid is required.
*
* @example
* var boundingSphere = BoundingSphere.fromEllipsoid(ellipsoid);
* var boundingSphere = Cesium.BoundingSphere.fromEllipsoid(ellipsoid);
*/
BoundingSphere.fromEllipsoid = function(ellipsoid, result) {
//>>includeStart('debug', pragmas.debug);
Expand Down Expand Up @@ -748,9 +748,9 @@ define([
* @exception {DeveloperError} transform is required.
*
* @example
* var modelMatrix = Transforms.eastNorthUpToFixedFrame(positionOnEllipsoid);
* var boundingSphere = new BoundingSphere();
* var newBoundingSphere = BoundingSphere.transformWithoutScale(boundingSphere, modelMatrix);
* var modelMatrix = Cesium.Transforms.eastNorthUpToFixedFrame(positionOnEllipsoid);
* var boundingSphere = new Cesium.BoundingSphere();
* var newBoundingSphere = Cesium.BoundingSphere.transformWithoutScale(boundingSphere, modelMatrix);
*/
BoundingSphere.transformWithoutScale = function(sphere, transform, result) {
//>>includeStart('debug', pragmas.debug);
Expand Down
18 changes: 9 additions & 9 deletions Source/Core/BoxGeometry.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ define([
* @see BoxGeometry#createGeometry
*
* @example
* var box = new BoxGeometry({
* vertexFormat : VertexFormat.POSITION_ONLY,
* maximumCorner : new Cartesian3(250000.0, 250000.0, 250000.0),
* minimumCorner : new Cartesian3(-250000.0, -250000.0, -250000.0)
* 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)
* });
* var geometry = BoxGeometry.createGeometry(box);
* var geometry = Cesium.BoxGeometry.createGeometry(box);
*/
var BoxGeometry = function(options) {
options = defaultValue(options, defaultValue.EMPTY_OBJECT);
Expand Down Expand Up @@ -86,11 +86,11 @@ define([
* @see BoxGeometry#createGeometry
*
* @example
* var box = BoxGeometry.fromDimensions({
* vertexFormat : VertexFormat.POSITION_ONLY,
* dimensions : new Cartesian3(500000.0, 500000.0, 500000.0)
* var box = Cesium.BoxGeometry.fromDimensions({
* vertexFormat : Cesium.VertexFormat.POSITION_ONLY,
* dimensions : new Cesium.Cartesian3(500000.0, 500000.0, 500000.0)
* });
* var geometry = BoxGeometry.createGeometry(box);
* var geometry = Cesium.BoxGeometry.createGeometry(box);
*/
BoxGeometry.fromDimensions = function(options) {
options = defaultValue(options, defaultValue.EMPTY_OBJECT);
Expand Down
14 changes: 7 additions & 7 deletions Source/Core/BoxOutlineGeometry.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ define([
* @see BoxOutlineGeometry#createGeometry
*
* @example
* var box = new BoxOutlineGeometry({
* maximumCorner : new Cartesian3(250000.0, 250000.0, 250000.0),
* minimumCorner : new Cartesian3(-250000.0, -250000.0, -250000.0)
* 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)
* });
* var geometry = BoxOutlineGeometry.createGeometry(box);
* var geometry = Cesium.BoxOutlineGeometry.createGeometry(box);
*/
var BoxOutlineGeometry = function(options) {
options = defaultValue(options, defaultValue.EMPTY_OBJECT);
Expand Down Expand Up @@ -78,10 +78,10 @@ define([
* @see BoxOutlineGeometry#createGeometry
*
* @example
* var box = BoxOutlineGeometry.fromDimensions({
* dimensions : new Cartesian3(500000.0, 500000.0, 500000.0)
* var box = Cesium.BoxOutlineGeometry.fromDimensions({
* dimensions : new Cesium.Cartesian3(500000.0, 500000.0, 500000.0)
* });
* var geometry = BoxOutlineGeometry.createGeometry(box);
* var geometry = Cesium.BoxOutlineGeometry.createGeometry(box);
*/
BoxOutlineGeometry.fromDimensions = function(options) {
options = defaultValue(options, defaultValue.EMPTY_OBJECT);
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Cartesian2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,11 @@ define([
* @example
* // Create a Cartesian2 with (1.0, 2.0)
* var v = [1.0, 2.0];
* var p = Cartesian2.fromArray(v);
* var p = Cesium.Cartesian2.fromArray(v);
*
* // Create a Cartesian2 with (1.0, 2.0) using an offset into an array
* var v2 = [0.0, 0.0, 1.0, 2.0];
* var p2 = Cartesian2.fromArray(v2, 2);
* var p2 = Cesium.Cartesian2.fromArray(v2, 2);
*/
Cartesian2.fromArray = Cartesian2.unpack;

Expand Down Expand Up @@ -339,7 +339,7 @@ define([
*
* @example
* // Returns 1.0
* var d = Cartesian2.distance(new Cartesian2(1.0, 0.0), new Cartesian2(2.0, 0.0));
* var d = Cesium.Cartesian2.distance(new Cesium.Cartesian2(1.0, 0.0), new Cesium.Cartesian2(2.0, 0.0));
*/
Cartesian2.distance = function(left, right) {
//>>includeStart('debug', pragmas.debug);
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Cartesian3.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,11 @@ define([
* @example
* // Create a Cartesian3 with (1.0, 2.0, 3.0)
* var v = [1.0, 2.0, 3.0];
* var p = Cartesian3.fromArray(v);
* var p = Cesium.Cartesian3.fromArray(v);
*
* // Create a Cartesian3 with (1.0, 2.0, 3.0) using an offset into an array
* var v2 = [0.0, 0.0, 1.0, 2.0, 3.0];
* var p2 = Cartesian3.fromArray(v2, 2);
* var p2 = Cesium.Cartesian3.fromArray(v2, 2);
*/
Cartesian3.fromArray = Cartesian3.unpack;

Expand Down Expand Up @@ -370,7 +370,7 @@ define([
*
* @example
* // Returns 1.0
* var d = Cartesian3.distance(new Cartesian3(1.0, 0.0, 0.0), new Cartesian3(2.0, 0.0, 0.0));
* var d = Cesium.Cartesian3.distance(new Cesium.Cartesian3(1.0, 0.0, 0.0), new Cesium.Cartesian3(2.0, 0.0, 0.0));
*/
Cartesian3.distance = function(left, right) {
//>>includeStart('debug', pragmas.debug);
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Cartesian4.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,11 @@ define([
* @example
* // Create a Cartesian4 with (1.0, 2.0, 3.0, 4.0)
* var v = [1.0, 2.0, 3.0, 4.0];
* var p = Cartesian4.fromArray(v);
* var p = Cesium.Cartesian4.fromArray(v);
*
* // Create a Cartesian4 with (1.0, 2.0, 3.0, 4.0) using an offset into an array
* var v2 = [0.0, 0.0, 1.0, 2.0, 3.0, 4.0];
* var p2 = Cartesian4.fromArray(v2, 2);
* var p2 = Cesium.Cartesian4.fromArray(v2, 2);
*/
Cartesian4.fromArray = Cartesian4.unpack;

Expand Down Expand Up @@ -346,7 +346,7 @@ define([
*
* @example
* // Returns 1.0
* var d = Cartesian4.distance(new Cartesian4(1.0, 0.0, 0.0, 0.0), new Cartesian4(2.0, 0.0, 0.0, 0.0));
* var d = Cesium.Cartesian4.distance(new Cesium.Cartesian4(1.0, 0.0, 0.0, 0.0), new Cesium.Cartesian4(2.0, 0.0, 0.0, 0.0));
*/
Cartesian4.distance = function(left, right) {
//>>includeStart('debug', pragmas.debug);
Expand Down
24 changes: 12 additions & 12 deletions Source/Core/CatmullRomSpline.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,14 @@ define([
*
* @example
* // spline above the earth from Philadelphia to Los Angeles
* var spline = new CatmullRomSpline({
* var spline = new Cesium.CatmullRomSpline({
* times : [ 0.0, 1.5, 3.0, 4.5, 6.0 ],
* points : [
* new Cartesian3(1235398.0, -4810983.0, 4146266.0),
* new Cartesian3(1372574.0, -5345182.0, 4606657.0),
* new Cartesian3(-757983.0, -5542796.0, 4514323.0),
* new Cartesian3(-2821260.0, -5248423.0, 4021290.0),
* new Cartesian3(-2539788.0, -4724797.0, 3620093.0)
* new Cesium.Cartesian3(1235398.0, -4810983.0, 4146266.0),
* new Cesium.Cartesian3(1372574.0, -5345182.0, 4606657.0),
* new Cesium.Cartesian3(-757983.0, -5542796.0, 4514323.0),
* new Cesium.Cartesian3(-2821260.0, -5248423.0, 4021290.0),
* new Cesium.Cartesian3(-2539788.0, -4724797.0, 3620093.0)
* ]
* });
*/
Expand Down Expand Up @@ -234,14 +234,14 @@ define([
*
* @example
* // spline above the earth from Philadelphia to Los Angeles
* var spline = new CatmullRomSpline({
* var spline = new Cesium.CatmullRomSpline({
* times : [ 0.0, 1.5, 3.0, 4.5, 6.0 ],
* points : [
* new Cartesian3(1235398.0, -4810983.0, 4146266.0),
* new Cartesian3(1372574.0, -5345182.0, 4606657.0),
* new Cartesian3(-757983.0, -5542796.0, 4514323.0),
* new Cartesian3(-2821260.0, -5248423.0, 4021290.0),
* new Cartesian3(-2539788.0, -4724797.0, 3620093.0)
* new Cesium.Cartesian3(1235398.0, -4810983.0, 4146266.0),
* new Cesium.Cartesian3(1372574.0, -5345182.0, 4606657.0),
* new Cesium.Cartesian3(-757983.0, -5542796.0, 4514323.0),
* new Cesium.Cartesian3(-2821260.0, -5248423.0, 4021290.0),
* new Cesium.Cartesian3(-2539788.0, -4724797.0, 3620093.0)
* ]
* });
*
Expand Down
8 changes: 4 additions & 4 deletions Source/Core/CircleGeometry.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ define([
*
* @example
* // Create a circle.
* var ellipsoid = Ellipsoid.WGS84;
* var circle = new CircleGeometry({
* var ellipsoid = Cesium.Ellipsoid.WGS84;
* var circle = new Cesium.CircleGeometry({
* ellipsoid : ellipsoid,
* center : ellipsoid.cartographicToCartesian(Cartographic.fromDegrees(-75.59777, 40.03883)),
* center : ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-75.59777, 40.03883)),
* radius : 100000.0
* });
* var geometry = CircleGeometry.createGeometry(circle);
* var geometry = Cesium.CircleGeometry.createGeometry(circle);
*/
var CircleGeometry = function(options) {
options = defaultValue(options, defaultValue.EMPTY_OBJECT);
Expand Down
8 changes: 4 additions & 4 deletions Source/Core/CircleOutlineGeometry.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ define([
*
* @example
* // Create a circle.
* var ellipsoid = Ellipsoid.WGS84;
* var circle = new CircleOutlineGeometry({
* var ellipsoid = Cesium.Ellipsoid.WGS84;
* var circle = new Cesium.CircleOutlineGeometry({
* ellipsoid : ellipsoid,
* center : ellipsoid.cartographicToCartesian(Cartographic.fromDegrees(-75.59777, 40.03883)),
* center : ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-75.59777, 40.03883)),
* radius : 100000.0
* });
* var geometry = CircleOutlineGeometry.createGeometry(circle);
* var geometry = Cesium.CircleOutlineGeometry.createGeometry(circle);
*/
var CircleOutlineGeometry = function(options) {
options = defaultValue(options, defaultValue.EMPTY_OBJECT);
Expand Down
10 changes: 5 additions & 5 deletions Source/Core/Clock.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ define([
*
* @example
* // Create a clock that loops on Christmas day 2013 and runs in real-time.
* var clock = new Clock({
* startTime : JulianDate.fromIso8601("12-25-2013"),
* currentTime : JulianDate.fromIso8601("12-25-2013"),
* stopTime : JulianDate.fromIso8601("12-26-2013"),
* clockRange : ClockRange.LOOP_STOP,
* var clock = new Cesium.Clock({
* startTime : Cesium.JulianDate.fromIso8601("12-25-2013"),
* currentTime : Cesium.JulianDate.fromIso8601("12-25-2013"),
* stopTime : Cesium.JulianDate.fromIso8601("12-26-2013"),
* clockRange : Cesium.ClockRange.LOOP_STOP,
* clockStep : SYSTEM_CLOCK_MULTIPLIER
* });
*/
Expand Down
14 changes: 7 additions & 7 deletions Source/Core/Color.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ define([
* @returns {Color} A new color instance.
*
* @example
* var color = Color.fromRgba(0x67ADDFFF);
* var color = Cesium.Color.fromRgba(0x67ADDFFF);
*
* @see Color#toRgba
*/
Expand Down Expand Up @@ -190,17 +190,17 @@ define([
*
* @example
* //Create a completely random color
* var color = Color.fromRandom();
* var color = Cesium.Color.fromRandom();
*
* //Create a random shade of yellow.
* var color = Color.fromRandom({
* var color = Cesium.Color.fromRandom({
* red : 1.0,
* green : 1.0,
* alpha : 1.0
* });
*
* //Create a random bright color.
* var color = Color.fromRandom({
* var color = Cesium.Color.fromRandom({
* minimumRed : 0.75,
* minimumGreen : 0.75,
* minimumBlue : 0.75,
Expand Down Expand Up @@ -284,8 +284,8 @@ define([
* @exception {DeveloperError} color is required.
*
* @example
* var cesiumBlue = Color.fromCssColorString('#67ADDF');
* var green = Color.fromCssColorString('green');
* var cesiumBlue = Cesium.Color.fromCssColorString('#67ADDF');
* var green = Cesium.Color.fromCssColorString('green');
*
* @see <a href="http://www.w3.org/TR/css3-color">CSS color values</a>
*/
Expand Down Expand Up @@ -556,7 +556,7 @@ define([
* @returns {Number} A single numeric unsigned 32-bit RGBA value.
*
* @example
* var rgba = Color.BLUE.toRgba();
* var rgba = Cesium.Color.BLUE.toRgba();
*
* @see Color.fromRgba
*/
Expand Down
18 changes: 9 additions & 9 deletions Source/Core/ColorGeometryInstanceAttribute.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ define([
* @param {Number} [alpha=1.0] The alpha component.
*
* @example
* var instance = new GeometryInstance({
* geometry : new BoxGeometry({
* dimensions : new Cartesian3(1000000.0, 1000000.0, 500000.0)
* var instance = new Cesium.GeometryInstance({
* geometry : new Cesium.BoxGeometry({
* dimensions : new Cesium.Cartesian3(1000000.0, 1000000.0, 500000.0)
* }),
* modelMatrix : Matrix4.multiplyByTranslation(Transforms.eastNorthUpToFixedFrame(
* ellipsoid.cartographicToCartesian(Cartographic.fromDegrees(-0.0, 0.0))), new Cartesian3(0.0, 0.0, 1000000.0)),
* modelMatrix : Cesium.Matrix4.multiplyByTranslation(Cesium.Transforms.eastNorthUpToFixedFrame(
* ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-0.0, 0.0))), new Cesium.Cartesian3(0.0, 0.0, 1000000.0)),
* id : 'box',
* attributes : {
* color : new ColorGeometryInstanceAttribute(red, green, blue, alpha)
* color : new Cesium.ColorGeometryInstanceAttribute(red, green, blue, alpha)
* }
* });
*
Expand Down Expand Up @@ -107,10 +107,10 @@ define([
* @exception {DeveloperError} color is required.
*
* @example
* var instance = new GeometryInstance({
* var instance = new Cesium.GeometryInstance({
* geometry : // ...
* attributes : {
* color : ColorGeometryInstanceAttribute.fromColor(Color.CORNFLOWERBLUE),
* color : Cesium.ColorGeometryInstanceAttribute.fromColor(Cesium.Color.CORNFLOWERBLUE),
* }
* });
*/
Expand All @@ -134,7 +134,7 @@ define([
*
* @example
* var attributes = primitive.getGeometryInstanceAttributes('an id');
* attributes.color = ColorGeometryInstanceAttribute.toValue(Color.AQUA, attributes.color);
* attributes.color = Cesium.ColorGeometryInstanceAttribute.toValue(Cesium.Color.AQUA, attributes.color);
*/
ColorGeometryInstanceAttribute.toValue = function(color, result) {
if (!defined(color)) {
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/ComponentDatatype.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ define([
* @returns {Boolean} <code>true</code> if the provided component datatype is a valid enumeration value; otherwise, <code>false</code>.
*
* @example
* if (!ComponentDatatype.validate(componentDatatype)) {
* throw new DeveloperError('componentDatatype must be a valid enumeration value.');
* if (!Cesium.ComponentDatatype.validate(componentDatatype)) {
* throw new Cesium.DeveloperError('componentDatatype must be a valid enumeration value.');
* }
*/
ComponentDatatype.validate = function(componentDatatype) {
Expand Down Expand Up @@ -140,7 +140,7 @@ define([
*
* @example
* // creates a Float32Array with length of 100
* var typedArray = ComponentDatatype.createTypedArray(ComponentDatatype.FLOAT, 100);
* var typedArray = Cesium.ComponentDatatype.createTypedArray(Cesium.ComponentDatatype.FLOAT, 100);
*/
ComponentDatatype.createTypedArray = function(componentDatatype, valuesOrLength) {
if (!defined(componentDatatype)) {
Expand Down
Loading

0 comments on commit 14f442a

Please sign in to comment.