diff --git a/.eslintrc.json b/.eslintrc.json index 5559ce5b6e87..01a053756fca 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,5 +1,8 @@ { "extends": "./Tools/eslint-config-cesium/browser.js", + "plugins": [ + "html" + ], "rules": { "no-unused-vars": ["error", {"vars": "all", "args": "none"}] } diff --git a/.npmignore b/.npmignore index 5c1ffb023c05..6074008c7998 100644 --- a/.npmignore +++ b/.npmignore @@ -1,3 +1,4 @@ +/.eslintcache /.externalToolBuilders /.gitattributes /.github diff --git a/Apps/CesiumViewer/CesiumViewer.js b/Apps/CesiumViewer/CesiumViewer.js index e75448693cda..3d61c11f1ba9 100644 --- a/Apps/CesiumViewer/CesiumViewer.js +++ b/Apps/CesiumViewer/CesiumViewer.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Cesium/Core/Cartesian3', 'Cesium/Core/defined', diff --git a/Apps/Sandcastle/LinkButton.js b/Apps/Sandcastle/LinkButton.js index fb67133c38a4..260b554b5af7 100644 --- a/Apps/Sandcastle/LinkButton.js +++ b/Apps/Sandcastle/LinkButton.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'dijit/_CssStateMixin', 'dijit/_TemplatedMixin', diff --git a/CHANGES.md b/CHANGES.md index 74816b676176..4d0b19db3c05 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,20 +3,12 @@ Change Log ### 1.35 - 2017-07-05 +* Breaking changes + * `JulianDate.fromIso8601` will default to midnight UTC if no time is provided to match the Javascript [`Date` specification](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date). You must specify a local time of midnight to achieve the old behavior. * Deprecated * `GoogleEarthImageryProvider` has been deprecated and will be removed in Cesium 1.37, use `GoogleEarthEnterpriseMapsProvider` instead. - * The `throttleRequest` parameter for `TerrainProvider.requestTileGeometry`, `CesiumTerrainProvider.requestTileGeometry`, `VRTheWorldTerrainProvider.requestTileGeometry`, and `EllipsoidTerrainProvider.requestTileGeometry` is deprecated and will be replaced with an optional `Request` object. The `throttleRequests` parameter will be removed in 1.37. Instead to throttle requests set the request's `throttle` property to `true`. + * The `throttleRequest` parameter for `TerrainProvider.requestTileGeometry`, `CesiumTerrainProvider.requestTileGeometry`, `VRTheWorldTerrainProvider.requestTileGeometry`, and `EllipsoidTerrainProvider.requestTileGeometry` is deprecated and will be replaced with an optional `Request` object. The `throttleRequests` parameter will be removed in 1.37. Instead set the request's `throttle` property to `true` to throttle requests. * The ability to provide a Promise for the `options.url` parameter of `loadWithXhr` and for the `url` parameter of `loadArrayBuffer`, `loadBlob`, `loadImageViaBlob`, `loadText`, `loadJson`, `loadXML`, `loadImage`, `loadCRN`, `loadKTX`, and `loadCubeMap` is deprecated. This will be removed in 1.37, instead `url` must be a string. -* Added an `options.request` parameter to `loadWithXhr` and a `request` parameter to `loadArrayBuffer`, `loadBlob`, `loadImageViaBlob`, `loadText`, `loadJson`, `loadJsonp`, `loadXML`, `loadImageFromTypedArray`, `loadImage`, `loadCRN`, and `loadKTX`. -* Fixed bug where if polylines were set to follow the surface of an undefined globe, Cesium would crash [#5413](https://github.com/AnalyticalGraphicsInc/cesium/pull/5413) -* Fixed a bug where picking clusters would return undefined instead of a list of the clustered entities. [#5286](https://github.com/AnalyticalGraphicsInc/cesium/issues/5286) -* Fixed a bug where picking would break when the Sun came into view [#5478](https://github.com/AnalyticalGraphicsInc/cesium/issues/5478) -* Reduced the amount of Sun bloom post-process effect near the horizon. [#5381](https://github.com/AnalyticalGraphicsInc/cesium/issues/5381) -* Updated glTF/glb MIME types. [#5420](https://github.com/AnalyticalGraphicsInc/cesium/issues/5420) -* Fixed a bug where camera zooming worked incorrectly when the display height was greater than the display width [#5421](https://github.com/AnalyticalGraphicsInc/cesium/pull/5421) -* Added Sandcastle demo for ArcticDEM data. [#5224](https://github.com/AnalyticalGraphicsInc/cesium/issues/5224) -* `CzmlDataSource` and `KmlDataSource` load functions now take an optional `query` object, which will append query parameters to all network requests. [#5419](https://github.com/AnalyticalGraphicsInc/cesium/pull/5419), [#5434](https://github.com/AnalyticalGraphicsInc/cesium/pull/5434) -* Fixed geocoder bug so geocoder can accurately handle NSEW inputs [#5407](https://github.com/AnalyticalGraphicsInc/cesium/pull/5407) * Added support for [3D Tiles](https://github.com/AnalyticalGraphicsInc/3d-tiles/blob/master/README.md) for streaming massive heterogeneous 3D geospatial datasets. The new Cesium APIs are: * `Cesium3DTileset` * `Cesium3DTileStyle`, `StyleExpression`, `Expression`, and `ConditionsExpression` @@ -25,9 +17,20 @@ Change Log * `Cesium3DTileFeature` * `Cesium3DTilesInspector`, `Cesium3DTilesInspectorViewModel`, and `viewerCesium3DTilesInspectorMixin` * `Cesium3DTileColorBlendMode` -* Added a Sandcastle demo for setting time with the Clock API [#5457](https://github.com/AnalyticalGraphicsInc/cesium/pull/5457); -* Added support for `ParticleSystem`s. [#5212](https://github.com/AnalyticalGraphicsInc/cesium/pull/5212) +* Added a particle system for effects like smoke, fire, sparks, etc. See `ParticleSystem`, `Particle`, `ParticleBurst`, `BoxEmitter`, `CircleEmitter`, `ConeEmitter`, `ParticleEmitter`, and `SphereEmitter`, and the new Sandcastle examples: `Particle System` and `Particle System Fireworks`. [#5212](https://github.com/AnalyticalGraphicsInc/cesium/pull/5212) +* Added an `options.request` parameter to `loadWithXhr` and a `request` parameter to `loadArrayBuffer`, `loadBlob`, `loadImageViaBlob`, `loadText`, `loadJson`, `loadJsonp`, `loadXML`, `loadImageFromTypedArray`, `loadImage`, `loadCRN`, and `loadKTX`. +* `CzmlDataSource` and `KmlDataSource` load functions now take an optional `query` object, which will append query parameters to all network requests. [#5419](https://github.com/AnalyticalGraphicsInc/cesium/pull/5419), [#5434](https://github.com/AnalyticalGraphicsInc/cesium/pull/5434) +* Added Sandcastle demo for setting time with the Clock API [#5457](https://github.com/AnalyticalGraphicsInc/cesium/pull/5457); +* Added Sandcastle demo for ArcticDEM data. [#5224](https://github.com/AnalyticalGraphicsInc/cesium/issues/5224) +* Fixed geocoder bug so geocoder can accurately handle NSEW inputs [#5407](https://github.com/AnalyticalGraphicsInc/cesium/pull/5407) +* Fixed a bug where picking would break when the Sun came into view [#5478](https://github.com/AnalyticalGraphicsInc/cesium/issues/5478) +* Fixed a bug where picking clusters would return undefined instead of a list of the clustered entities. [#5286](https://github.com/AnalyticalGraphicsInc/cesium/issues/5286) +* Fixed bug where if polylines were set to follow the surface of an undefined globe, Cesium would throw an exception. [#5413](https://github.com/AnalyticalGraphicsInc/cesium/pull/5413) +* Reduced the amount of Sun bloom post-process effect near the horizon. [#5381](https://github.com/AnalyticalGraphicsInc/cesium/issues/5381) +* Fixed a bug where camera zooming worked incorrectly when the display height was greater than the display width [#5421](https://github.com/AnalyticalGraphicsInc/cesium/pull/5421) +* Updated glTF/glb MIME types. [#5420](https://github.com/AnalyticalGraphicsInc/cesium/issues/5420) * Added `Cesium.Math.randomBetween`. +* Modified `defaultValue` to check for both `undefined` and `null`. [#5551](https://github.com/AnalyticalGraphicsInc/cesium/pull/5551) ### 1.34 - 2017-06-01 diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index f32f702a586b..c5b0760c6be6 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -147,4 +147,6 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu * [Ryan King](https://github.com/ryki2658) * [Jason Wohlgemuth](https://github.com/jhwohlgemuth) * [Hülya Yurtman](https://github.com/hulyayurtman) -* [Esra ERİK](https://github.com/esraerik) \ No newline at end of file +* [Esra ERİK](https://github.com/esraerik) +* [Rishabh Shah](https://github.com/rms13) +* [Rudraksha Shah](https://github.com/Rudraksha20) diff --git a/Documentation/Contributors/CodingGuide/README.md b/Documentation/Contributors/CodingGuide/README.md index b46302464927..48e41d0f636a 100644 --- a/Documentation/Contributors/CodingGuide/README.md +++ b/Documentation/Contributors/CodingGuide/README.md @@ -14,6 +14,7 @@ To some extent, this guide can be summarized as _make new code similar to existi * [Naming](#naming) * [Formatting](#formatting) +* [Linting](#linting) * [Units](#units) * [Basic Code Construction](#basic-code-construction) * [Functions](#functions) @@ -135,7 +136,18 @@ function Model(options) { * Text files, including JavaScript files, end with a newline to minimize the noise in diffs. -* When [disabling rules with inline comments](http://eslint.org/docs/user-guide/configuring#disabling-rules-with-inline-comments), place the comments on new lines and as close to the associated code as possible: +## Linting + +For syntax and style guidelines, we use the [ESLint](http://eslint.org/docs/rules/) recommended settings as a base and extend it with additional rules via a shared config Node module, [eslint-config-cesium](https://www.npmjs.com/package/eslint-config-cesium), which is maintained as part of the Cesium repository and also used throughout the Cesium ecosystem. For a list of which rules are enabled, look in [index.js](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/Tools/eslint-config-cesium/index.js), [browser.js](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/Tools/eslint-config-cesium/browser.js), and [node.js](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/Tools/eslint-config-cesium/node.js). + +* When disabling linting for one line, use `//eslint-disable-line`: +```js +function exit(warningMessage) { + window.alert('Cannot exit: ' + warningMessage); //eslint-disable-line no-alert +} +``` + +* When disabling linting for blocks of code, place `eslint-disable` comments on new lines and as close to the associated code as possible: ```js /*eslint-disable no-empty*/ try { @@ -145,6 +157,8 @@ try { /*eslint-enable no-empty*/ ``` +* See [Disabling Rules with Inline Comments](http://eslint.org/docs/user-guide/configuring#disabling-rules-with-inline-comments) for more examples. + ## Units * Cesium uses SI units: @@ -249,7 +263,6 @@ if (defined(u)) { ``` * Use Cesium's `freezeObject` function to create enums, e.g., ```javascript -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Documentation/Contributors/TestingGuide/README.md b/Documentation/Contributors/TestingGuide/README.md index 8dcc2f7150d8..cbfd07340e97 100644 --- a/Documentation/Contributors/TestingGuide/README.md +++ b/Documentation/Contributors/TestingGuide/README.md @@ -233,7 +233,6 @@ Tests are written in JavaScript using Jasmine. It is important to realize that Here is a stripped down version of the tests: ```javascript -/*global defineSuite*/ defineSuite([ 'Core/Cartesian3' ], function( @@ -696,7 +695,6 @@ This test is more cohesive and easier to debug than if it were written using a _ As mentioned above, some tests are in the `'WebGL'` category. To assign a category to a suite, pass the category to `defineSuite`. ```javascript -/*global defineSuite*/ defineSuite([ 'Scene/DebugModelMatrixPrimitive', 'Specs/createScene' diff --git a/Source/Core/AssociativeArray.js b/Source/Core/AssociativeArray.js index 537025901c3d..982ed84e31c6 100644 --- a/Source/Core/AssociativeArray.js +++ b/Source/Core/AssociativeArray.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined', './defineProperties', diff --git a/Source/Core/AttributeCompression.js b/Source/Core/AttributeCompression.js index 04dd27eea126..599665bb5532 100644 --- a/Source/Core/AttributeCompression.js +++ b/Source/Core/AttributeCompression.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian2', './Cartesian3', diff --git a/Source/Core/AxisAlignedBoundingBox.js b/Source/Core/AxisAlignedBoundingBox.js index bec857c9d3d5..e8faf28930df 100644 --- a/Source/Core/AxisAlignedBoundingBox.js +++ b/Source/Core/AxisAlignedBoundingBox.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './Check', diff --git a/Source/Core/BingMapsApi.js b/Source/Core/BingMapsApi.js index e2cb40bcafa4..a62fae727f6b 100644 --- a/Source/Core/BingMapsApi.js +++ b/Source/Core/BingMapsApi.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Credit', './defined' diff --git a/Source/Core/BingMapsGeocoderService.js b/Source/Core/BingMapsGeocoderService.js index c2f20daa0420..85b8effcd263 100644 --- a/Source/Core/BingMapsGeocoderService.js +++ b/Source/Core/BingMapsGeocoderService.js @@ -1,20 +1,19 @@ -/*global define*/ define([ - './BingMapsApi', - './Check', - './defaultValue', - './defined', - './defineProperties', - './loadJsonp', - './Rectangle' -], function( - BingMapsApi, - Check, - defaultValue, - defined, - defineProperties, - loadJsonp, - Rectangle) { + './BingMapsApi', + './Check', + './defaultValue', + './defined', + './defineProperties', + './loadJsonp', + './Rectangle' + ], function( + BingMapsApi, + Check, + defaultValue, + defined, + defineProperties, + loadJsonp, + Rectangle) { 'use strict'; var url = 'https://dev.virtualearth.net/REST/v1/Locations'; diff --git a/Source/Core/BoundingRectangle.js b/Source/Core/BoundingRectangle.js index 3fffcbfeca77..3473bade133c 100644 --- a/Source/Core/BoundingRectangle.js +++ b/Source/Core/BoundingRectangle.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian2', './Cartographic', diff --git a/Source/Core/BoundingSphere.js b/Source/Core/BoundingSphere.js index 6b09fac6e795..f7f3dc731909 100644 --- a/Source/Core/BoundingSphere.js +++ b/Source/Core/BoundingSphere.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './Cartographic', diff --git a/Source/Core/BoxGeometry.js b/Source/Core/BoxGeometry.js index ed7aaf5ff8b4..ca30cd0998eb 100644 --- a/Source/Core/BoxGeometry.js +++ b/Source/Core/BoxGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './BoundingSphere', './Cartesian3', diff --git a/Source/Core/BoxOutlineGeometry.js b/Source/Core/BoxOutlineGeometry.js index 61b18b314426..c44aee0630a2 100644 --- a/Source/Core/BoxOutlineGeometry.js +++ b/Source/Core/BoxOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './BoundingSphere', './Cartesian3', diff --git a/Source/Core/Cartesian2.js b/Source/Core/Cartesian2.js index 2c698e4ef35d..4ec43930c932 100644 --- a/Source/Core/Cartesian2.js +++ b/Source/Core/Cartesian2.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Check', './defaultValue', diff --git a/Source/Core/Cartesian3.js b/Source/Core/Cartesian3.js index 6fa2ea2b3546..6775785c09c0 100644 --- a/Source/Core/Cartesian3.js +++ b/Source/Core/Cartesian3.js @@ -1,11 +1,10 @@ -/*global define*/ define([ - './Check', - './defaultValue', - './defined', - './DeveloperError', - './freezeObject', - './Math' + './Check', + './defaultValue', + './defined', + './DeveloperError', + './freezeObject', + './Math' ], function( Check, defaultValue, diff --git a/Source/Core/Cartesian4.js b/Source/Core/Cartesian4.js index 60db4aebd288..8b905750f844 100644 --- a/Source/Core/Cartesian4.js +++ b/Source/Core/Cartesian4.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Check', './defaultValue', diff --git a/Source/Core/Cartographic.js b/Source/Core/Cartographic.js index 9b6a6a31a05a..a4ae56af58d7 100644 --- a/Source/Core/Cartographic.js +++ b/Source/Core/Cartographic.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './Check', diff --git a/Source/Core/CartographicGeocoderService.js b/Source/Core/CartographicGeocoderService.js index 9b6f72ff895d..13e9f48d3e54 100644 --- a/Source/Core/CartographicGeocoderService.js +++ b/Source/Core/CartographicGeocoderService.js @@ -1,18 +1,17 @@ -/*global define*/ define([ - './Cartesian3', - './Check', - './defaultValue', - './defineProperties', - './defined', - '../ThirdParty/when' -], function( - Cartesian3, - Check, - defaultValue, - defineProperties, - defined, - when) { + '../ThirdParty/when', + './Cartesian3', + './Check', + './defaultValue', + './defined', + './defineProperties' + ], function( + when, + Cartesian3, + Check, + defaultValue, + defined, + defineProperties) { 'use strict'; /** diff --git a/Source/Core/CatmullRomSpline.js b/Source/Core/CatmullRomSpline.js index 6607e11fe0ea..8a4534b08396 100644 --- a/Source/Core/CatmullRomSpline.js +++ b/Source/Core/CatmullRomSpline.js @@ -1,21 +1,20 @@ -/*global define*/ define([ './Cartesian3', './Cartesian4', + './Check', './defaultValue', './defined', './defineProperties', - './DeveloperError', './HermiteSpline', './Matrix4', './Spline' ], function( Cartesian3, Cartesian4, + Check, defaultValue, defined, defineProperties, - DeveloperError, HermiteSpline, Matrix4, Spline) { @@ -152,15 +151,10 @@ define([ var lastTangent = options.lastTangent; //>>includeStart('debug', pragmas.debug); - if (!defined(points) || !defined(times)) { - throw new DeveloperError('points and times are required.'); - } - if (points.length < 2) { - throw new DeveloperError('points.length must be greater than or equal to 2.'); - } - if (times.length !== points.length) { - throw new DeveloperError('times.length must be equal to points.length.'); - } + Check.defined('points', points); + Check.defined('times', times); + Check.typeOf.number.greaterThanOrEquals('points.length', points.length, 2); + Check.typeOf.number.equals('times.length', 'points.length', times.length, points.length); //>>includeEnd('debug'); if (points.length > 2) { diff --git a/Source/Core/CesiumTerrainProvider.js b/Source/Core/CesiumTerrainProvider.js index 8a54460e8b81..dca0c7e69c96 100644 --- a/Source/Core/CesiumTerrainProvider.js +++ b/Source/Core/CesiumTerrainProvider.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/Uri', '../ThirdParty/when', diff --git a/Source/Core/Check.js b/Source/Core/Check.js index 06f63ed4cead..93990297584f 100644 --- a/Source/Core/Check.js +++ b/Source/Core/Check.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined', './DeveloperError' @@ -165,5 +164,22 @@ define([ } }; + /** + * Throws if test1 and test2 is not typeof 'number' and not equal in value + * + * @param {String} name1 The name of the first variable being tested + * @param {String} name2 The name of the second variable being tested against + * @param {*} test1 The value to test + * @param {*} test2 The value to test against + * @exception {DeveloperError} test1 and test2 should be type of 'number' and be equal in value + */ + Check.typeOf.number.equals = function (name1, name2, test1, test2) { + Check.typeOf.number(name1, test1); + Check.typeOf.number(name2, test2); + if (test1 !== test2) { + throw new DeveloperError(name1 + ' must be equal to ' + name2 + ', the actual values are ' + test1 + ' and ' + test2); + } + }; + return Check; }); diff --git a/Source/Core/CircleGeometry.js b/Source/Core/CircleGeometry.js index 4a3e87dfdaf6..cfc74b95eb5c 100644 --- a/Source/Core/CircleGeometry.js +++ b/Source/Core/CircleGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './Check', diff --git a/Source/Core/CircleOutlineGeometry.js b/Source/Core/CircleOutlineGeometry.js index fa5e78ade493..7b115a79d1cd 100644 --- a/Source/Core/CircleOutlineGeometry.js +++ b/Source/Core/CircleOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './Check', diff --git a/Source/Core/Clock.js b/Source/Core/Clock.js index f310104c5440..38a7e1bd4e0c 100644 --- a/Source/Core/Clock.js +++ b/Source/Core/Clock.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './ClockRange', './ClockStep', diff --git a/Source/Core/ClockRange.js b/Source/Core/ClockRange.js index 6a3ac6bc62de..ded2c10be1c9 100644 --- a/Source/Core/ClockRange.js +++ b/Source/Core/ClockRange.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './freezeObject' ], function( diff --git a/Source/Core/ClockStep.js b/Source/Core/ClockStep.js index 4d178438b77a..c81f1ed757f4 100644 --- a/Source/Core/ClockStep.js +++ b/Source/Core/ClockStep.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './freezeObject' ], function( diff --git a/Source/Core/Color.js b/Source/Core/Color.js index 1e138969ce35..c0e2d620e0ae 100644 --- a/Source/Core/Color.js +++ b/Source/Core/Color.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Check', './defaultValue', diff --git a/Source/Core/ColorGeometryInstanceAttribute.js b/Source/Core/ColorGeometryInstanceAttribute.js index 32154d967af5..b03b29657da2 100644 --- a/Source/Core/ColorGeometryInstanceAttribute.js +++ b/Source/Core/ColorGeometryInstanceAttribute.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Color', './ComponentDatatype', diff --git a/Source/Core/ComponentDatatype.js b/Source/Core/ComponentDatatype.js index bb1e7d533528..6a685d5c7bad 100644 --- a/Source/Core/ComponentDatatype.js +++ b/Source/Core/ComponentDatatype.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './defined', diff --git a/Source/Core/CompressedTextureBuffer.js b/Source/Core/CompressedTextureBuffer.js index 2bee0c470813..20b3bf7d00d2 100644 --- a/Source/Core/CompressedTextureBuffer.js +++ b/Source/Core/CompressedTextureBuffer.js @@ -1,11 +1,9 @@ -/*global define*/ define([ './defined', './defineProperties' ], function( defined, - defineProperties - ) { + defineProperties) { 'use strict'; /** @@ -90,4 +88,4 @@ define([ }; return CompressedTextureBuffer; -}); \ No newline at end of file +}); diff --git a/Source/Core/CornerType.js b/Source/Core/CornerType.js index 94891eb90dda..3b4c557a9c2e 100644 --- a/Source/Core/CornerType.js +++ b/Source/Core/CornerType.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './freezeObject' ], function( diff --git a/Source/Core/CorridorGeometry.js b/Source/Core/CorridorGeometry.js index 407a71b10684..eb44d140f0aa 100644 --- a/Source/Core/CorridorGeometry.js +++ b/Source/Core/CorridorGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './arrayRemoveDuplicates', './BoundingSphere', diff --git a/Source/Core/CorridorGeometryLibrary.js b/Source/Core/CorridorGeometryLibrary.js index 7ffd2953ded6..dfa20ca7ac9e 100644 --- a/Source/Core/CorridorGeometryLibrary.js +++ b/Source/Core/CorridorGeometryLibrary.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './CornerType', diff --git a/Source/Core/CorridorOutlineGeometry.js b/Source/Core/CorridorOutlineGeometry.js index a2b268591246..90fd307ba88d 100644 --- a/Source/Core/CorridorOutlineGeometry.js +++ b/Source/Core/CorridorOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './arrayRemoveDuplicates', './BoundingSphere', diff --git a/Source/Core/Credit.js b/Source/Core/Credit.js index 820e20d7fb3b..4f8fff707084 100644 --- a/Source/Core/Credit.js +++ b/Source/Core/Credit.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined', './defineProperties', diff --git a/Source/Core/CubicRealPolynomial.js b/Source/Core/CubicRealPolynomial.js index 7d0b281eacdd..981429c91163 100644 --- a/Source/Core/CubicRealPolynomial.js +++ b/Source/Core/CubicRealPolynomial.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './DeveloperError', './QuadraticRealPolynomial' diff --git a/Source/Core/CylinderGeometry.js b/Source/Core/CylinderGeometry.js index 854e57f018ed..ee1bb81f3191 100644 --- a/Source/Core/CylinderGeometry.js +++ b/Source/Core/CylinderGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './BoundingSphere', './Cartesian2', diff --git a/Source/Core/CylinderGeometryLibrary.js b/Source/Core/CylinderGeometryLibrary.js index a1bedc793ea8..09b4764822ef 100644 --- a/Source/Core/CylinderGeometryLibrary.js +++ b/Source/Core/CylinderGeometryLibrary.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Math' ], function( diff --git a/Source/Core/CylinderOutlineGeometry.js b/Source/Core/CylinderOutlineGeometry.js index f57a9e1d95f6..5722e1bbdd90 100644 --- a/Source/Core/CylinderOutlineGeometry.js +++ b/Source/Core/CylinderOutlineGeometry.js @@ -1,14 +1,13 @@ -/*global define*/ define([ './BoundingSphere', './Cartesian2', './Cartesian3', + './Check', './ComponentDatatype', './CylinderGeometryLibrary', './defaultValue', './defined', - './DeveloperError', './Geometry', './GeometryAttribute', './GeometryAttributes', @@ -18,11 +17,11 @@ define([ BoundingSphere, Cartesian2, Cartesian3, + Check, ComponentDatatype, CylinderGeometryLibrary, defaultValue, defined, - DeveloperError, Geometry, GeometryAttribute, GeometryAttributes, @@ -72,18 +71,10 @@ define([ var numberOfVerticalLines = Math.max(defaultValue(options.numberOfVerticalLines, 16), 0); //>>includeStart('debug', pragmas.debug); - if (!defined(length)) { - throw new DeveloperError('options.length must be defined.'); - } - if (!defined(topRadius)) { - throw new DeveloperError('options.topRadius must be defined.'); - } - if (!defined(bottomRadius)) { - throw new DeveloperError('options.bottomRadius must be defined.'); - } - if (slices < 3) { - throw new DeveloperError('options.slices must be greater than or equal to 3.'); - } + Check.typeOf.number('options.positions', length); + Check.typeOf.number('options.topRadius', topRadius); + Check.typeOf.number('options.bottomRadius', bottomRadius); + Check.typeOf.number.greaterThanOrEquals('options.slices', slices, 3); //>>includeEnd('debug'); this._length = length; @@ -111,12 +102,8 @@ define([ */ CylinderOutlineGeometry.pack = function(value, array, startingIndex) { //>>includeStart('debug', pragmas.debug); - if (!defined(value)) { - throw new DeveloperError('value is required'); - } - if (!defined(array)) { - throw new DeveloperError('array is required'); - } + Check.typeOf.object('value', value); + Check.defined('array', array); //>>includeEnd('debug'); startingIndex = defaultValue(startingIndex, 0); @@ -148,9 +135,7 @@ define([ */ CylinderOutlineGeometry.unpack = function(array, startingIndex, result) { //>>includeStart('debug', pragmas.debug); - if (!defined(array)) { - throw new DeveloperError('array is required'); - } + Check.defined('array', array); //>>includeEnd('debug'); startingIndex = defaultValue(startingIndex, 0); diff --git a/Source/Core/DefaultProxy.js b/Source/Core/DefaultProxy.js index a5086a22fadc..f32abdae2d2b 100644 --- a/Source/Core/DefaultProxy.js +++ b/Source/Core/DefaultProxy.js @@ -1,4 +1,3 @@ -/*global define*/ define(function() { 'use strict'; diff --git a/Source/Core/DeveloperError.js b/Source/Core/DeveloperError.js index 01a44e6dd319..c9d68c1760f6 100644 --- a/Source/Core/DeveloperError.js +++ b/Source/Core/DeveloperError.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined' ], function( diff --git a/Source/Core/DistanceDisplayCondition.js b/Source/Core/DistanceDisplayCondition.js index 6c0a1df9e36c..14379460742a 100644 --- a/Source/Core/DistanceDisplayCondition.js +++ b/Source/Core/DistanceDisplayCondition.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './defined', diff --git a/Source/Core/DistanceDisplayConditionGeometryInstanceAttribute.js b/Source/Core/DistanceDisplayConditionGeometryInstanceAttribute.js index 9d039fa3298f..1205e346aa43 100644 --- a/Source/Core/DistanceDisplayConditionGeometryInstanceAttribute.js +++ b/Source/Core/DistanceDisplayConditionGeometryInstanceAttribute.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './ComponentDatatype', './defaultValue', diff --git a/Source/Core/DoublyLinkedList.js b/Source/Core/DoublyLinkedList.js index 969222203a8b..c73ff464338c 100644 --- a/Source/Core/DoublyLinkedList.js +++ b/Source/Core/DoublyLinkedList.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/defineProperties' diff --git a/Source/Core/EarthOrientationParameters.js b/Source/Core/EarthOrientationParameters.js index 646e139d0506..8e3c502d4605 100644 --- a/Source/Core/EarthOrientationParameters.js +++ b/Source/Core/EarthOrientationParameters.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/when', './binarySearch', diff --git a/Source/Core/EarthOrientationParametersSample.js b/Source/Core/EarthOrientationParametersSample.js index 745054b0d944..178a801af19c 100644 --- a/Source/Core/EarthOrientationParametersSample.js +++ b/Source/Core/EarthOrientationParametersSample.js @@ -1,4 +1,3 @@ -/*global define*/ define(function() { 'use strict'; diff --git a/Source/Core/EasingFunction.js b/Source/Core/EasingFunction.js index b66a60104a47..16e49465dbd9 100644 --- a/Source/Core/EasingFunction.js +++ b/Source/Core/EasingFunction.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/Tween', './freezeObject' diff --git a/Source/Core/EllipseGeometry.js b/Source/Core/EllipseGeometry.js index 1f8407a3a3ff..4fde906bbf73 100644 --- a/Source/Core/EllipseGeometry.js +++ b/Source/Core/EllipseGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './BoundingSphere', './Cartesian2', diff --git a/Source/Core/EllipseGeometryLibrary.js b/Source/Core/EllipseGeometryLibrary.js index daa59fc12d9a..ff3c3477dfb9 100644 --- a/Source/Core/EllipseGeometryLibrary.js +++ b/Source/Core/EllipseGeometryLibrary.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './Math', diff --git a/Source/Core/EllipseOutlineGeometry.js b/Source/Core/EllipseOutlineGeometry.js index 3ad2bc402303..b72e86aacd3b 100644 --- a/Source/Core/EllipseOutlineGeometry.js +++ b/Source/Core/EllipseOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './BoundingSphere', './Cartesian3', diff --git a/Source/Core/Ellipsoid.js b/Source/Core/Ellipsoid.js index 7f7b3a3d3f7a..dc421686d47b 100644 --- a/Source/Core/Ellipsoid.js +++ b/Source/Core/Ellipsoid.js @@ -1,8 +1,7 @@ -/*global define*/ define([ - './Check', './Cartesian3', './Cartographic', + './Check', './defaultValue', './defined', './defineProperties', @@ -11,9 +10,9 @@ define([ './Math', './scaleToGeodeticSurface' ], function( - Check, Cartesian3, Cartographic, + Check, defaultValue, defined, defineProperties, diff --git a/Source/Core/EllipsoidGeodesic.js b/Source/Core/EllipsoidGeodesic.js index 166942f77dd1..854a6702074b 100644 --- a/Source/Core/EllipsoidGeodesic.js +++ b/Source/Core/EllipsoidGeodesic.js @@ -1,20 +1,19 @@ -/*global define*/ define([ './Cartesian3', './Cartographic', + './Check', './defaultValue', './defined', './defineProperties', - './DeveloperError', './Ellipsoid', './Math' ], function( Cartesian3, Cartographic, + Check, defaultValue, defined, defineProperties, - DeveloperError, Ellipsoid, CesiumMath) { 'use strict'; @@ -179,9 +178,7 @@ define([ var lastCartesian = Cartesian3.normalize(ellipsoid.cartographicToCartesian(end, scratchCart2), scratchCart2); //>>includeStart('debug', pragmas.debug); - if (Math.abs(Math.abs(Cartesian3.angleBetween(firstCartesian, lastCartesian)) - Math.PI) < 0.0125) { - throw new DeveloperError('geodesic position is not unique'); - } + Check.typeOf.number.greaterThanOrEquals('value', Math.abs(Math.abs(Cartesian3.angleBetween(firstCartesian, lastCartesian)) - Math.PI), 0.0125); //>>includeEnd('debug'); vincentyInverseFormula(ellipsoidGeodesic, ellipsoid.maximumRadius, ellipsoid.minimumRadius, @@ -244,9 +241,7 @@ define([ surfaceDistance : { get : function() { //>>includeStart('debug', pragmas.debug); - if (!defined(this._distance)) { - throw new DeveloperError('set end positions before getting surfaceDistance'); - } + Check.defined('distance', this._distance); //>>includeEnd('debug'); return this._distance; @@ -286,9 +281,7 @@ define([ startHeading : { get : function() { //>>includeStart('debug', pragmas.debug); - if (!defined(this._distance)) { - throw new DeveloperError('set end positions before getting startHeading'); - } + Check.defined('distance', this._distance); //>>includeEnd('debug'); return this._startHeading; @@ -304,9 +297,7 @@ define([ endHeading : { get : function() { //>>includeStart('debug', pragmas.debug); - if (!defined(this._distance)) { - throw new DeveloperError('set end positions before getting endHeading'); - } + Check.defined('distance', this._distance); //>>includeEnd('debug'); return this._endHeading; @@ -322,12 +313,8 @@ define([ */ EllipsoidGeodesic.prototype.setEndPoints = function(start, end) { //>>includeStart('debug', pragmas.debug); - if (!defined(start)) { - throw new DeveloperError('start cartographic position is required'); - } - if (!defined(end)) { - throw new DeveloperError('end cartgraphic position is required'); - } + Check.defined('start', start); + Check.defined('end', end); //>>includeEnd('debug'); computeProperties(this, start, end, this._ellipsoid); @@ -355,9 +342,7 @@ define([ */ EllipsoidGeodesic.prototype.interpolateUsingSurfaceDistance = function(distance, result) { //>>includeStart('debug', pragmas.debug); - if (!defined(this._distance)) { - throw new DeveloperError('start and end must be set before calling function interpolateUsingSurfaceDistance'); - } + Check.defined('distance', this._distance); //>>includeEnd('debug'); var constants = this._constants; diff --git a/Source/Core/EllipsoidGeometry.js b/Source/Core/EllipsoidGeometry.js index 2d3ac20a64a2..73dfd009ba9e 100644 --- a/Source/Core/EllipsoidGeometry.js +++ b/Source/Core/EllipsoidGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './BoundingSphere', './Cartesian2', diff --git a/Source/Core/EllipsoidOutlineGeometry.js b/Source/Core/EllipsoidOutlineGeometry.js index 94c7aab3b732..888a700442b3 100644 --- a/Source/Core/EllipsoidOutlineGeometry.js +++ b/Source/Core/EllipsoidOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './BoundingSphere', './Cartesian3', diff --git a/Source/Core/EllipsoidTangentPlane.js b/Source/Core/EllipsoidTangentPlane.js index c2c178566c18..4cb3018c2bea 100644 --- a/Source/Core/EllipsoidTangentPlane.js +++ b/Source/Core/EllipsoidTangentPlane.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './AxisAlignedBoundingBox', './Cartesian2', diff --git a/Source/Core/EllipsoidTerrainProvider.js b/Source/Core/EllipsoidTerrainProvider.js index 58adf683ca83..6aaeb9a868f7 100644 --- a/Source/Core/EllipsoidTerrainProvider.js +++ b/Source/Core/EllipsoidTerrainProvider.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/when', './defaultValue', diff --git a/Source/Core/EllipsoidalOccluder.js b/Source/Core/EllipsoidalOccluder.js index 3fad0be9bda6..ff00a96cd762 100644 --- a/Source/Core/EllipsoidalOccluder.js +++ b/Source/Core/EllipsoidalOccluder.js @@ -1,19 +1,18 @@ -/*global define*/ define([ './BoundingSphere', './Cartesian3', + './Check', './defaultValue', './defined', './defineProperties', - './DeveloperError', './Rectangle' ], function( BoundingSphere, Cartesian3, + Check, defaultValue, defined, defineProperties, - DeveloperError, Rectangle) { 'use strict'; @@ -42,9 +41,7 @@ define([ */ function EllipsoidalOccluder(ellipsoid, cameraPosition) { //>>includeStart('debug', pragmas.debug); - if (!defined(ellipsoid)) { - throw new DeveloperError('ellipsoid is required.'); - } + Check.typeOf.object('ellipsoid', ellipsoid); //>>includeEnd('debug'); this._ellipsoid = ellipsoid; @@ -159,12 +156,8 @@ define([ */ EllipsoidalOccluder.prototype.computeHorizonCullingPoint = function(directionToPoint, positions, result) { //>>includeStart('debug', pragmas.debug); - if (!defined(directionToPoint)) { - throw new DeveloperError('directionToPoint is required'); - } - if (!defined(positions)) { - throw new DeveloperError('positions is required'); - } + Check.typeOf.object('directionToPoint', directionToPoint); + Check.defined('positions', positions); //>>includeEnd('debug'); if (!defined(result)) { @@ -206,15 +199,9 @@ define([ */ EllipsoidalOccluder.prototype.computeHorizonCullingPointFromVertices = function(directionToPoint, vertices, stride, center, result) { //>>includeStart('debug', pragmas.debug); - if (!defined(directionToPoint)) { - throw new DeveloperError('directionToPoint is required'); - } - if (!defined(vertices)) { - throw new DeveloperError('vertices is required'); - } - if (!defined(stride)) { - throw new DeveloperError('stride is required'); - } + Check.typeOf.object('directionToPoint', directionToPoint); + Check.defined('vertices', vertices); + Check.typeOf.number('stride', stride); //>>includeEnd('debug'); if (!defined(result)) { @@ -254,9 +241,7 @@ define([ */ EllipsoidalOccluder.prototype.computeHorizonCullingPointFromRectangle = function(rectangle, ellipsoid, result) { //>>includeStart('debug', pragmas.debug); - if (!defined(rectangle)) { - throw new DeveloperError('rectangle is required.'); - } + Check.typeOf.object('rectangle', rectangle); //>>includeEnd('debug'); var positions = Rectangle.subsample(rectangle, ellipsoid, 0.0, subsampleScratch); diff --git a/Source/Core/EncodedCartesian3.js b/Source/Core/EncodedCartesian3.js index 4a203c6add05..ec7fd301e9a3 100644 --- a/Source/Core/EncodedCartesian3.js +++ b/Source/Core/EncodedCartesian3.js @@ -1,12 +1,11 @@ -/*global define*/ define([ './Cartesian3', - './defined', - './DeveloperError' + './Check', + './defined' ], function( Cartesian3, - defined, - DeveloperError) { + Check, + defined) { 'use strict'; /** @@ -58,9 +57,7 @@ define([ */ EncodedCartesian3.encode = function(value, result) { //>>includeStart('debug', pragmas.debug); - if (!defined(value)) { - throw new DeveloperError('value is required'); - } + Check.typeOf.number('value', value); //>>includeEnd('debug'); if (!defined(result)) { @@ -106,9 +103,7 @@ define([ */ EncodedCartesian3.fromCartesian = function(cartesian, result) { //>>includeStart('debug', pragmas.debug); - if (!defined(cartesian)) { - throw new DeveloperError('cartesian is required'); - } + Check.typeOf.object('cartesian', cartesian); //>>includeEnd('debug'); if (!defined(result)) { @@ -162,15 +157,9 @@ define([ */ EncodedCartesian3.writeElements = function(cartesian, cartesianArray, index) { //>>includeStart('debug', pragmas.debug); - if (!defined(cartesian)) { - throw new DeveloperError('cartesian is required'); - } - if (!defined(cartesianArray)) { - throw new DeveloperError('cartesianArray is required'); - } - if (typeof index !== 'number' || index < 0) { - throw new DeveloperError('index must be a number greater than or equal to 0.'); - } + Check.defined('cartesianArray', cartesianArray); + Check.typeOf.number('index', index); + Check.typeOf.number.greaterThanOrEquals('index', index, 0); //>>includeEnd('debug'); EncodedCartesian3.fromCartesian(cartesian, encodedP); diff --git a/Source/Core/Event.js b/Source/Core/Event.js index 15e6204338fd..4244fca65768 100644 --- a/Source/Core/Event.js +++ b/Source/Core/Event.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Check', './defined', diff --git a/Source/Core/EventHelper.js b/Source/Core/EventHelper.js index 2fa6bf92066d..81c9932c9bd2 100644 --- a/Source/Core/EventHelper.js +++ b/Source/Core/EventHelper.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined', './DeveloperError' diff --git a/Source/Core/ExtrapolationType.js b/Source/Core/ExtrapolationType.js index 56d739926a2e..fe8bfb588f0b 100644 --- a/Source/Core/ExtrapolationType.js +++ b/Source/Core/ExtrapolationType.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './freezeObject' ], function( diff --git a/Source/Core/FeatureDetection.js b/Source/Core/FeatureDetection.js index a018118b7369..2f0953778dc6 100644 --- a/Source/Core/FeatureDetection.js +++ b/Source/Core/FeatureDetection.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './defined', diff --git a/Source/Core/Fullscreen.js b/Source/Core/Fullscreen.js index 8c9371bc952c..2773263ee75b 100644 --- a/Source/Core/Fullscreen.js +++ b/Source/Core/Fullscreen.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined', './defineProperties' diff --git a/Source/Core/GeocoderService.js b/Source/Core/GeocoderService.js index 08bbdb3f6d66..e2ac837c36a3 100644 --- a/Source/Core/GeocoderService.js +++ b/Source/Core/GeocoderService.js @@ -1,6 +1,5 @@ -/*global define*/ define([ - './DeveloperError' + './DeveloperError' ], function( DeveloperError) { 'use strict'; diff --git a/Source/Core/GeographicProjection.js b/Source/Core/GeographicProjection.js index ae80bda3ac47..1127bb335352 100644 --- a/Source/Core/GeographicProjection.js +++ b/Source/Core/GeographicProjection.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './Cartographic', diff --git a/Source/Core/GeographicTilingScheme.js b/Source/Core/GeographicTilingScheme.js index 1ee704738475..3f0ec1a13b6c 100644 --- a/Source/Core/GeographicTilingScheme.js +++ b/Source/Core/GeographicTilingScheme.js @@ -1,20 +1,19 @@ -/*global define*/ define([ './Cartesian2', + './Check', './defaultValue', './defined', './defineProperties', - './DeveloperError', './Ellipsoid', './GeographicProjection', './Math', './Rectangle' ], function( Cartesian2, + Check, defaultValue, defined, defineProperties, - DeveloperError, Ellipsoid, GeographicProjection, CesiumMath, @@ -115,9 +114,7 @@ define([ */ GeographicTilingScheme.prototype.rectangleToNativeRectangle = function(rectangle, result) { //>>includeStart('debug', pragmas.debug); - if (!defined(rectangle)) { - throw new DeveloperError('rectangle is required.'); - } + Check.defined('rectangle', rectangle); //>>includeEnd('debug'); var west = CesiumMath.toDegrees(rectangle.west); diff --git a/Source/Core/Geometry.js b/Source/Core/Geometry.js index 51a4e5502b60..63b004636f89 100644 --- a/Source/Core/Geometry.js +++ b/Source/Core/Geometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Check', './defaultValue', diff --git a/Source/Core/GeometryAttribute.js b/Source/Core/GeometryAttribute.js index 9c47b23a2beb..179bc2c055ee 100644 --- a/Source/Core/GeometryAttribute.js +++ b/Source/Core/GeometryAttribute.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './defined', diff --git a/Source/Core/GeometryAttributes.js b/Source/Core/GeometryAttributes.js index db95c08b0f5d..7ff7192d4694 100644 --- a/Source/Core/GeometryAttributes.js +++ b/Source/Core/GeometryAttributes.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue' ], function( diff --git a/Source/Core/GeometryInstance.js b/Source/Core/GeometryInstance.js index 41bb6b9965dd..3a1e3c327877 100644 --- a/Source/Core/GeometryInstance.js +++ b/Source/Core/GeometryInstance.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './defined', diff --git a/Source/Core/GeometryInstanceAttribute.js b/Source/Core/GeometryInstanceAttribute.js index e61296a9cc23..069d27cd0792 100644 --- a/Source/Core/GeometryInstanceAttribute.js +++ b/Source/Core/GeometryInstanceAttribute.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './defined', diff --git a/Source/Core/GeometryPipeline.js b/Source/Core/GeometryPipeline.js index 45f075ac4543..f2089a3334bf 100644 --- a/Source/Core/GeometryPipeline.js +++ b/Source/Core/GeometryPipeline.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './AttributeCompression', './barycentricCoordinates', diff --git a/Source/Core/GeometryType.js b/Source/Core/GeometryType.js index 07a252d9e6fb..6200a81a08d0 100644 --- a/Source/Core/GeometryType.js +++ b/Source/Core/GeometryType.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './freezeObject' ], function( diff --git a/Source/Core/GoogleEarthEnterpriseMetadata.js b/Source/Core/GoogleEarthEnterpriseMetadata.js index a6203bd46069..e3d2fd0076f9 100644 --- a/Source/Core/GoogleEarthEnterpriseMetadata.js +++ b/Source/Core/GoogleEarthEnterpriseMetadata.js @@ -1,40 +1,39 @@ -/*global define*/ define([ - '../ThirdParty/google-earth-dbroot-parser', - '../ThirdParty/when', - './appendForwardSlash', - './Check', - './Credit', - './defaultValue', - './defined', - './defineProperties', - './GoogleEarthEnterpriseTileInformation', - './isBitSet', - './joinUrls', - './loadArrayBuffer', - './Math', - './Request', - './RequestType', - './RuntimeError', - './TaskProcessor' -], function( - dbrootParser, - when, - appendForwardSlash, - Check, - Credit, - defaultValue, - defined, - defineProperties, - GoogleEarthEnterpriseTileInformation, - isBitSet, - joinUrls, - loadArrayBuffer, - CesiumMath, - Request, - RequestType, - RuntimeError, - TaskProcessor) { + '../ThirdParty/google-earth-dbroot-parser', + '../ThirdParty/when', + './appendForwardSlash', + './Check', + './Credit', + './defaultValue', + './defined', + './defineProperties', + './GoogleEarthEnterpriseTileInformation', + './isBitSet', + './joinUrls', + './loadArrayBuffer', + './Math', + './Request', + './RequestType', + './RuntimeError', + './TaskProcessor' + ], function( + dbrootParser, + when, + appendForwardSlash, + Check, + Credit, + defaultValue, + defined, + defineProperties, + GoogleEarthEnterpriseTileInformation, + isBitSet, + joinUrls, + loadArrayBuffer, + CesiumMath, + Request, + RequestType, + RuntimeError, + TaskProcessor) { 'use strict'; function stringToBuffer(str) { diff --git a/Source/Core/GoogleEarthEnterpriseTerrainData.js b/Source/Core/GoogleEarthEnterpriseTerrainData.js index d2afbc158f9c..8fd4ce2ea11e 100644 --- a/Source/Core/GoogleEarthEnterpriseTerrainData.js +++ b/Source/Core/GoogleEarthEnterpriseTerrainData.js @@ -1,40 +1,39 @@ -/*global define*/ define([ - './BoundingSphere', - './Cartesian2', - './Cartesian3', - './Check', - './defaultValue', - './defined', - './defineProperties', - './DeveloperError', - './IndexDatatype', - './Intersections2D', - './Math', - './OrientedBoundingBox', - './QuantizedMeshTerrainData', - './Rectangle', - './TaskProcessor', - './TerrainEncoding', - './TerrainMesh' -], function( - BoundingSphere, - Cartesian2, - Cartesian3, - Check, - defaultValue, - defined, - defineProperties, - DeveloperError, - IndexDatatype, - Intersections2D, - CesiumMath, - OrientedBoundingBox, - QuantizedMeshTerrainData, - Rectangle, - TaskProcessor, - TerrainEncoding, - TerrainMesh) { + './BoundingSphere', + './Cartesian2', + './Cartesian3', + './Check', + './defaultValue', + './defined', + './defineProperties', + './DeveloperError', + './IndexDatatype', + './Intersections2D', + './Math', + './OrientedBoundingBox', + './QuantizedMeshTerrainData', + './Rectangle', + './TaskProcessor', + './TerrainEncoding', + './TerrainMesh' + ], function( + BoundingSphere, + Cartesian2, + Cartesian3, + Check, + defaultValue, + defined, + defineProperties, + DeveloperError, + IndexDatatype, + Intersections2D, + CesiumMath, + OrientedBoundingBox, + QuantizedMeshTerrainData, + Rectangle, + TaskProcessor, + TerrainEncoding, + TerrainMesh) { 'use strict'; /** diff --git a/Source/Core/GoogleEarthEnterpriseTerrainProvider.js b/Source/Core/GoogleEarthEnterpriseTerrainProvider.js index d5e2928633b5..86e20aed6abc 100644 --- a/Source/Core/GoogleEarthEnterpriseTerrainProvider.js +++ b/Source/Core/GoogleEarthEnterpriseTerrainProvider.js @@ -1,50 +1,49 @@ -/*global define*/ define([ - '../ThirdParty/when', - './Credit', - './defaultValue', - './defined', - './defineProperties', - './deprecationWarning', - './DeveloperError', - './Event', - './GeographicTilingScheme', - './GoogleEarthEnterpriseMetadata', - './GoogleEarthEnterpriseTerrainData', - './HeightmapTerrainData', - './JulianDate', - './loadArrayBuffer', - './Math', - './Rectangle', - './Request', - './RequestState', - './RequestType', - './RuntimeError', - './TaskProcessor', - './TileProviderError' -], function( - when, - Credit, - defaultValue, - defined, - defineProperties, - deprecationWarning, - DeveloperError, - Event, - GeographicTilingScheme, - GoogleEarthEnterpriseMetadata, - GoogleEarthEnterpriseTerrainData, - HeightmapTerrainData, - JulianDate, - loadArrayBuffer, - CesiumMath, - Rectangle, - Request, - RequestState, - RequestType, - RuntimeError, - TaskProcessor, - TileProviderError) { + '../ThirdParty/when', + './Credit', + './defaultValue', + './defined', + './defineProperties', + './deprecationWarning', + './DeveloperError', + './Event', + './GeographicTilingScheme', + './GoogleEarthEnterpriseMetadata', + './GoogleEarthEnterpriseTerrainData', + './HeightmapTerrainData', + './JulianDate', + './loadArrayBuffer', + './Math', + './Rectangle', + './Request', + './RequestState', + './RequestType', + './RuntimeError', + './TaskProcessor', + './TileProviderError' + ], function( + when, + Credit, + defaultValue, + defined, + defineProperties, + deprecationWarning, + DeveloperError, + Event, + GeographicTilingScheme, + GoogleEarthEnterpriseMetadata, + GoogleEarthEnterpriseTerrainData, + HeightmapTerrainData, + JulianDate, + loadArrayBuffer, + CesiumMath, + Rectangle, + Request, + RequestState, + RequestType, + RuntimeError, + TaskProcessor, + TileProviderError) { 'use strict'; var TerrainState = { diff --git a/Source/Core/GoogleEarthEnterpriseTileInformation.js b/Source/Core/GoogleEarthEnterpriseTileInformation.js index 88099aae61e8..403db8c7237c 100644 --- a/Source/Core/GoogleEarthEnterpriseTileInformation.js +++ b/Source/Core/GoogleEarthEnterpriseTileInformation.js @@ -1,10 +1,9 @@ -/*global define*/ define([ - './defined', - './isBitSet' -], function( - defined, - isBitSet) { + './defined', + './isBitSet' + ], function( + defined, + isBitSet) { 'use strict'; // Bitmask for checking tile properties diff --git a/Source/Core/GregorianDate.js b/Source/Core/GregorianDate.js index d723edbe522b..e4cf3ee20dd7 100644 --- a/Source/Core/GregorianDate.js +++ b/Source/Core/GregorianDate.js @@ -1,4 +1,3 @@ -/*global define*/ define(function() { 'use strict'; diff --git a/Source/Core/HeadingPitchRange.js b/Source/Core/HeadingPitchRange.js index efdd7976990e..09e7d0c49c49 100644 --- a/Source/Core/HeadingPitchRange.js +++ b/Source/Core/HeadingPitchRange.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './defined' diff --git a/Source/Core/HeadingPitchRoll.js b/Source/Core/HeadingPitchRoll.js index bbbc5ca0fbcb..b934f6d04f3e 100644 --- a/Source/Core/HeadingPitchRoll.js +++ b/Source/Core/HeadingPitchRoll.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './defined', diff --git a/Source/Core/Heap.js b/Source/Core/Heap.js index 11f379213a36..a7847cb4e545 100644 --- a/Source/Core/Heap.js +++ b/Source/Core/Heap.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Check', './defaultValue', diff --git a/Source/Core/HeightmapTerrainData.js b/Source/Core/HeightmapTerrainData.js index 83c1dc88e263..701b15e9285d 100644 --- a/Source/Core/HeightmapTerrainData.js +++ b/Source/Core/HeightmapTerrainData.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/when', './defaultValue', diff --git a/Source/Core/HeightmapTessellator.js b/Source/Core/HeightmapTessellator.js index ebf11928f13a..93f39bb0f2b0 100644 --- a/Source/Core/HeightmapTessellator.js +++ b/Source/Core/HeightmapTessellator.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './AxisAlignedBoundingBox', './BoundingSphere', diff --git a/Source/Core/HermitePolynomialApproximation.js b/Source/Core/HermitePolynomialApproximation.js index 0d4d327b4187..a4166535d070 100644 --- a/Source/Core/HermitePolynomialApproximation.js +++ b/Source/Core/HermitePolynomialApproximation.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './defined', diff --git a/Source/Core/HermiteSpline.js b/Source/Core/HermiteSpline.js index 1ea0795995d7..2d5e745dcc3b 100644 --- a/Source/Core/HermiteSpline.js +++ b/Source/Core/HermiteSpline.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './Cartesian4', diff --git a/Source/Core/Iau2000Orientation.js b/Source/Core/Iau2000Orientation.js index 0e4d103bcf4b..c43f6d0ccae9 100644 --- a/Source/Core/Iau2000Orientation.js +++ b/Source/Core/Iau2000Orientation.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined', './IauOrientationParameters', diff --git a/Source/Core/Iau2006XysData.js b/Source/Core/Iau2006XysData.js index da31fb1402ee..c8d0e64c6a9a 100644 --- a/Source/Core/Iau2006XysData.js +++ b/Source/Core/Iau2006XysData.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/when', './buildModuleUrl', diff --git a/Source/Core/Iau2006XysSample.js b/Source/Core/Iau2006XysSample.js index 2013aed6aa80..acc758a56890 100644 --- a/Source/Core/Iau2006XysSample.js +++ b/Source/Core/Iau2006XysSample.js @@ -1,4 +1,3 @@ -/*global define*/ define(function() { 'use strict'; diff --git a/Source/Core/IauOrientationAxes.js b/Source/Core/IauOrientationAxes.js index 65c7a440f078..fc6bcad19433 100644 --- a/Source/Core/IauOrientationAxes.js +++ b/Source/Core/IauOrientationAxes.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './defined', diff --git a/Source/Core/IauOrientationParameters.js b/Source/Core/IauOrientationParameters.js index a9beb8e0e030..ad4d1a1d04ea 100644 --- a/Source/Core/IauOrientationParameters.js +++ b/Source/Core/IauOrientationParameters.js @@ -1,4 +1,3 @@ -/*global define*/ define(function() { 'use strict'; diff --git a/Source/Core/IndexDatatype.js b/Source/Core/IndexDatatype.js index 2922700c3556..f9239667643c 100644 --- a/Source/Core/IndexDatatype.js +++ b/Source/Core/IndexDatatype.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined', './DeveloperError', diff --git a/Source/Core/InterpolationAlgorithm.js b/Source/Core/InterpolationAlgorithm.js index 48a9b8b0ebf8..e0e7393e48be 100644 --- a/Source/Core/InterpolationAlgorithm.js +++ b/Source/Core/InterpolationAlgorithm.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './DeveloperError' ], function( diff --git a/Source/Core/Intersect.js b/Source/Core/Intersect.js index 29718f16cdeb..613b44efc4a4 100644 --- a/Source/Core/Intersect.js +++ b/Source/Core/Intersect.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './freezeObject' ], function( diff --git a/Source/Core/IntersectionTests.js b/Source/Core/IntersectionTests.js index 495dd1bcb7b8..d2e00bc3da4b 100644 --- a/Source/Core/IntersectionTests.js +++ b/Source/Core/IntersectionTests.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './Cartographic', diff --git a/Source/Core/Intersections2D.js b/Source/Core/Intersections2D.js index 1ad68bd56f8e..36f88b1eb673 100644 --- a/Source/Core/Intersections2D.js +++ b/Source/Core/Intersections2D.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './defined', diff --git a/Source/Core/Interval.js b/Source/Core/Interval.js index 332058b3575b..cb2d010694bf 100644 --- a/Source/Core/Interval.js +++ b/Source/Core/Interval.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue' ], function( diff --git a/Source/Core/Iso8601.js b/Source/Core/Iso8601.js index b0ebea7c4498..564e9954000e 100644 --- a/Source/Core/Iso8601.js +++ b/Source/Core/Iso8601.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './freezeObject', './JulianDate', diff --git a/Source/Core/JulianDate.js b/Source/Core/JulianDate.js index b42152b95ffc..a7407ef36b9c 100644 --- a/Source/Core/JulianDate.js +++ b/Source/Core/JulianDate.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/sprintf', './binarySearch', @@ -353,7 +352,8 @@ define([ } //>>includeEnd('debug') - //Not move onto the time string, which is much simpler. + //Now move onto the time string, which is much simpler. + //If no time is specified, it is considered the beginning of the day, UTC to match Javascript's implementation. var offsetIndex; if (defined(time)) { tokens = time.match(matchHoursMinutesSeconds); @@ -425,9 +425,6 @@ define([ minute = minute + new Date(Date.UTC(year, month - 1, day, hour, minute)).getTimezoneOffset(); break; } - } else { - //If no time is specified, it is considered the beginning of the day, local time. - minute = minute + new Date(year, month - 1, day).getTimezoneOffset(); } //ISO8601 denotes a leap second by any time having a seconds component of 60 seconds. diff --git a/Source/Core/KeyboardEventModifier.js b/Source/Core/KeyboardEventModifier.js index 120f9cde7944..a3e00a2d3058 100644 --- a/Source/Core/KeyboardEventModifier.js +++ b/Source/Core/KeyboardEventModifier.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './freezeObject' ], function( diff --git a/Source/Core/LagrangePolynomialApproximation.js b/Source/Core/LagrangePolynomialApproximation.js index 329d304c2d11..e2a5635b1b37 100644 --- a/Source/Core/LagrangePolynomialApproximation.js +++ b/Source/Core/LagrangePolynomialApproximation.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined' ], function( diff --git a/Source/Core/LeapSecond.js b/Source/Core/LeapSecond.js index acf253c0e7a5..f7c3ad73a3f2 100644 --- a/Source/Core/LeapSecond.js +++ b/Source/Core/LeapSecond.js @@ -1,4 +1,3 @@ -/*global define*/ define(function() { 'use strict'; diff --git a/Source/Core/LinearApproximation.js b/Source/Core/LinearApproximation.js index ef09cf8bdc2b..72b1c561d9bc 100644 --- a/Source/Core/LinearApproximation.js +++ b/Source/Core/LinearApproximation.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined', './DeveloperError' diff --git a/Source/Core/LinearSpline.js b/Source/Core/LinearSpline.js index e31f695dc7de..e7bdd157527a 100644 --- a/Source/Core/LinearSpline.js +++ b/Source/Core/LinearSpline.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './defaultValue', diff --git a/Source/Core/ManagedArray.js b/Source/Core/ManagedArray.js index ec172bec83f1..7679194f9856 100644 --- a/Source/Core/ManagedArray.js +++ b/Source/Core/ManagedArray.js @@ -1,12 +1,11 @@ -/*global define*/ define([ + './Check', './defaultValue', - './defineProperties', - './Check' + './defineProperties' ], function( + Check, defaultValue, - defineProperties, - Check) { + defineProperties) { 'use strict'; /** diff --git a/Source/Core/MapProjection.js b/Source/Core/MapProjection.js index 4ad6b2c80d8b..ad173693f428 100644 --- a/Source/Core/MapProjection.js +++ b/Source/Core/MapProjection.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defineProperties', './DeveloperError' diff --git a/Source/Core/MapboxApi.js b/Source/Core/MapboxApi.js index 43dadf66c51e..8261edb2707a 100644 --- a/Source/Core/MapboxApi.js +++ b/Source/Core/MapboxApi.js @@ -1,10 +1,9 @@ -/*global define*/ define([ - './defined', - './Credit' -], function( - defined, - Credit) { + './Credit', + './defined' + ], function( + Credit, + defined) { 'use strict'; var MapboxApi = { diff --git a/Source/Core/Math.js b/Source/Core/Math.js index 9e35624abff9..ab4bc9505e74 100644 --- a/Source/Core/Math.js +++ b/Source/Core/Math.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/mersenne-twister', './defaultValue', diff --git a/Source/Core/Matrix2.js b/Source/Core/Matrix2.js index b7e717685487..4246e27f9d3e 100644 --- a/Source/Core/Matrix2.js +++ b/Source/Core/Matrix2.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian2', './Check', diff --git a/Source/Core/Matrix3.js b/Source/Core/Matrix3.js index 21bb14a5483c..23e9b6c21376 100644 --- a/Source/Core/Matrix3.js +++ b/Source/Core/Matrix3.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './Check', diff --git a/Source/Core/Matrix4.js b/Source/Core/Matrix4.js index 13e4ba5d9c69..9e2eba17b6e4 100644 --- a/Source/Core/Matrix4.js +++ b/Source/Core/Matrix4.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './Cartesian4', diff --git a/Source/Core/NearFarScalar.js b/Source/Core/NearFarScalar.js index f73d1df6f3d3..480907351f63 100644 --- a/Source/Core/NearFarScalar.js +++ b/Source/Core/NearFarScalar.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './defined', diff --git a/Source/Core/Occluder.js b/Source/Core/Occluder.js index 3fc9cc003616..13d060202346 100644 --- a/Source/Core/Occluder.js +++ b/Source/Core/Occluder.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './BoundingSphere', './Cartesian3', diff --git a/Source/Core/OrientedBoundingBox.js b/Source/Core/OrientedBoundingBox.js index 53e6441b4839..8d3e61b3c7b3 100644 --- a/Source/Core/OrientedBoundingBox.js +++ b/Source/Core/OrientedBoundingBox.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './BoundingSphere', './Cartesian2', diff --git a/Source/Core/Packable.js b/Source/Core/Packable.js index 08b360ec831e..3c93a3ea6e05 100644 --- a/Source/Core/Packable.js +++ b/Source/Core/Packable.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './DeveloperError' ], function( diff --git a/Source/Core/PackableForInterpolation.js b/Source/Core/PackableForInterpolation.js index 8387e7755d39..654051dfa84a 100644 --- a/Source/Core/PackableForInterpolation.js +++ b/Source/Core/PackableForInterpolation.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './DeveloperError' ], function( diff --git a/Source/Core/PinBuilder.js b/Source/Core/PinBuilder.js index 8539be706769..556b43d47e10 100644 --- a/Source/Core/PinBuilder.js +++ b/Source/Core/PinBuilder.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './buildModuleUrl', './Color', diff --git a/Source/Core/PixelFormat.js b/Source/Core/PixelFormat.js index 80f5bf07d4a6..5c01b6999909 100644 --- a/Source/Core/PixelFormat.js +++ b/Source/Core/PixelFormat.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Renderer/PixelDatatype', './freezeObject', diff --git a/Source/Core/Plane.js b/Source/Core/Plane.js index 1b659c7118b0..f52eea521e15 100644 --- a/Source/Core/Plane.js +++ b/Source/Core/Plane.js @@ -1,16 +1,15 @@ -/*global define*/ define([ './Cartesian3', './defined', './DeveloperError', - './Math', - './freezeObject' + './freezeObject', + './Math' ], function( Cartesian3, defined, DeveloperError, - CesiumMath, - freezeObject) { + freezeObject, + CesiumMath) { 'use strict'; /** diff --git a/Source/Core/PolygonGeometry.js b/Source/Core/PolygonGeometry.js index 575e122cb7d2..2bedcce148a9 100644 --- a/Source/Core/PolygonGeometry.js +++ b/Source/Core/PolygonGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './BoundingRectangle', './BoundingSphere', diff --git a/Source/Core/PolygonGeometryLibrary.js b/Source/Core/PolygonGeometryLibrary.js index f36e24764715..58b77b2b3277 100644 --- a/Source/Core/PolygonGeometryLibrary.js +++ b/Source/Core/PolygonGeometryLibrary.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './arrayRemoveDuplicates', './Cartesian3', diff --git a/Source/Core/PolygonHierarchy.js b/Source/Core/PolygonHierarchy.js index 839c470e4681..c6c084905b2e 100644 --- a/Source/Core/PolygonHierarchy.js +++ b/Source/Core/PolygonHierarchy.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined' ], function( diff --git a/Source/Core/PolygonOutlineGeometry.js b/Source/Core/PolygonOutlineGeometry.js index f33a77983a40..53040a1aa5b9 100644 --- a/Source/Core/PolygonOutlineGeometry.js +++ b/Source/Core/PolygonOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './arrayRemoveDuplicates', './BoundingSphere', diff --git a/Source/Core/PolygonPipeline.js b/Source/Core/PolygonPipeline.js index 6ed1a3e0a33b..fc2c96461d46 100644 --- a/Source/Core/PolygonPipeline.js +++ b/Source/Core/PolygonPipeline.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/earcut-2.1.1', './Cartesian2', diff --git a/Source/Core/PolylineGeometry.js b/Source/Core/PolylineGeometry.js index 4e652fde7efe..0f18c9dff6d2 100644 --- a/Source/Core/PolylineGeometry.js +++ b/Source/Core/PolylineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './arrayRemoveDuplicates', './BoundingSphere', diff --git a/Source/Core/PolylinePipeline.js b/Source/Core/PolylinePipeline.js index 96574e817fdb..66e745420a09 100644 --- a/Source/Core/PolylinePipeline.js +++ b/Source/Core/PolylinePipeline.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './Cartographic', diff --git a/Source/Core/PolylineVolumeGeometry.js b/Source/Core/PolylineVolumeGeometry.js index 27ab9b72c452..f83739e0a9ce 100644 --- a/Source/Core/PolylineVolumeGeometry.js +++ b/Source/Core/PolylineVolumeGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './arrayRemoveDuplicates', './BoundingRectangle', diff --git a/Source/Core/PolylineVolumeGeometryLibrary.js b/Source/Core/PolylineVolumeGeometryLibrary.js index a6429bc7a76f..f773764b9850 100644 --- a/Source/Core/PolylineVolumeGeometryLibrary.js +++ b/Source/Core/PolylineVolumeGeometryLibrary.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian2', './Cartesian3', diff --git a/Source/Core/PolylineVolumeOutlineGeometry.js b/Source/Core/PolylineVolumeOutlineGeometry.js index aa2789d41aa6..a28f961559fd 100644 --- a/Source/Core/PolylineVolumeOutlineGeometry.js +++ b/Source/Core/PolylineVolumeOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './arrayRemoveDuplicates', './BoundingRectangle', diff --git a/Source/Core/PrimitiveType.js b/Source/Core/PrimitiveType.js index 30d3174aa460..29103d668836 100644 --- a/Source/Core/PrimitiveType.js +++ b/Source/Core/PrimitiveType.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './freezeObject', './WebGLConstants' diff --git a/Source/Core/QuadraticRealPolynomial.js b/Source/Core/QuadraticRealPolynomial.js index 6ed3c0c422bc..a246cbedea8b 100644 --- a/Source/Core/QuadraticRealPolynomial.js +++ b/Source/Core/QuadraticRealPolynomial.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './DeveloperError', './Math' diff --git a/Source/Core/QuantizedMeshTerrainData.js b/Source/Core/QuantizedMeshTerrainData.js index 8459fe4e6776..668787d1a478 100644 --- a/Source/Core/QuantizedMeshTerrainData.js +++ b/Source/Core/QuantizedMeshTerrainData.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/when', './BoundingSphere', diff --git a/Source/Core/QuarticRealPolynomial.js b/Source/Core/QuarticRealPolynomial.js index 704207eca111..4a82e3d800b0 100644 --- a/Source/Core/QuarticRealPolynomial.js +++ b/Source/Core/QuarticRealPolynomial.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './CubicRealPolynomial', './DeveloperError', diff --git a/Source/Core/Quaternion.js b/Source/Core/Quaternion.js index 070f82866a8a..b021504e1d36 100644 --- a/Source/Core/Quaternion.js +++ b/Source/Core/Quaternion.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './Check', diff --git a/Source/Core/QuaternionSpline.js b/Source/Core/QuaternionSpline.js index 5ce76cb8eb5f..b39951a9779e 100644 --- a/Source/Core/QuaternionSpline.js +++ b/Source/Core/QuaternionSpline.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './defined', diff --git a/Source/Core/Queue.js b/Source/Core/Queue.js index a6e3caa3dc0c..bfe60c066c41 100644 --- a/Source/Core/Queue.js +++ b/Source/Core/Queue.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defineProperties' ], function( diff --git a/Source/Core/Ray.js b/Source/Core/Ray.js index 839b3a5a0da8..e8e202f3bbeb 100644 --- a/Source/Core/Ray.js +++ b/Source/Core/Ray.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './defaultValue', diff --git a/Source/Core/Rectangle.js b/Source/Core/Rectangle.js index db03159872ba..615921b29801 100644 --- a/Source/Core/Rectangle.js +++ b/Source/Core/Rectangle.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartographic', './Check', diff --git a/Source/Core/RectangleGeometry.js b/Source/Core/RectangleGeometry.js index 3eb2a510a391..671c9231f972 100644 --- a/Source/Core/RectangleGeometry.js +++ b/Source/Core/RectangleGeometry.js @@ -1,56 +1,55 @@ -/*global define*/ define([ - './BoundingSphere', - './Cartesian2', - './Cartesian3', - './Cartographic', - './Check', - './ComponentDatatype', - './defaultValue', - './defined', - './defineProperties', - './DeveloperError', - './Ellipsoid', - './Geometry', - './GeometryAttribute', - './GeometryAttributes', - './GeometryInstance', - './GeometryPipeline', - './IndexDatatype', - './Math', - './Matrix3', - './PolygonPipeline', - './PrimitiveType', - './Quaternion', - './Rectangle', - './RectangleGeometryLibrary', - './VertexFormat' -], function( - BoundingSphere, - Cartesian2, - Cartesian3, - Cartographic, - Check, - ComponentDatatype, - defaultValue, - defined, - defineProperties, - DeveloperError, - Ellipsoid, - Geometry, - GeometryAttribute, - GeometryAttributes, - GeometryInstance, - GeometryPipeline, - IndexDatatype, - CesiumMath, - Matrix3, - PolygonPipeline, - PrimitiveType, - Quaternion, - Rectangle, - RectangleGeometryLibrary, - VertexFormat) { + './BoundingSphere', + './Cartesian2', + './Cartesian3', + './Cartographic', + './Check', + './ComponentDatatype', + './defaultValue', + './defined', + './defineProperties', + './DeveloperError', + './Ellipsoid', + './Geometry', + './GeometryAttribute', + './GeometryAttributes', + './GeometryInstance', + './GeometryPipeline', + './IndexDatatype', + './Math', + './Matrix3', + './PolygonPipeline', + './PrimitiveType', + './Quaternion', + './Rectangle', + './RectangleGeometryLibrary', + './VertexFormat' + ], function( + BoundingSphere, + Cartesian2, + Cartesian3, + Cartographic, + Check, + ComponentDatatype, + defaultValue, + defined, + defineProperties, + DeveloperError, + Ellipsoid, + Geometry, + GeometryAttribute, + GeometryAttributes, + GeometryInstance, + GeometryPipeline, + IndexDatatype, + CesiumMath, + Matrix3, + PolygonPipeline, + PrimitiveType, + Quaternion, + Rectangle, + RectangleGeometryLibrary, + VertexFormat) { 'use strict'; var positionScratch = new Cartesian3(); diff --git a/Source/Core/RectangleGeometryLibrary.js b/Source/Core/RectangleGeometryLibrary.js index 6f7ef2cb8e51..97bc0796d97d 100644 --- a/Source/Core/RectangleGeometryLibrary.js +++ b/Source/Core/RectangleGeometryLibrary.js @@ -1,22 +1,21 @@ -/*global define*/ define([ - './Cartesian3', - './Cartographic', - './defined', - './DeveloperError', - './GeographicProjection', - './Math', - './Matrix2', - './Rectangle' -], function( - Cartesian3, - Cartographic, - defined, - DeveloperError, - GeographicProjection, - CesiumMath, - Matrix2, - Rectangle) { + './Cartesian3', + './Cartographic', + './defined', + './DeveloperError', + './GeographicProjection', + './Math', + './Matrix2', + './Rectangle' + ], function( + Cartesian3, + Cartographic, + defined, + DeveloperError, + GeographicProjection, + CesiumMath, + Matrix2, + Rectangle) { 'use strict'; var cos = Math.cos; diff --git a/Source/Core/RectangleOutlineGeometry.js b/Source/Core/RectangleOutlineGeometry.js index 785a381b42ce..dad4bac5291b 100644 --- a/Source/Core/RectangleOutlineGeometry.js +++ b/Source/Core/RectangleOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './BoundingSphere', './Cartesian3', diff --git a/Source/Core/ReferenceFrame.js b/Source/Core/ReferenceFrame.js index 78c0a614f1e8..eef0fe0a44b5 100644 --- a/Source/Core/ReferenceFrame.js +++ b/Source/Core/ReferenceFrame.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './freezeObject' ], function( diff --git a/Source/Core/Request.js b/Source/Core/Request.js index 42ed344b1c50..f2997887be1e 100644 --- a/Source/Core/Request.js +++ b/Source/Core/Request.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './defined', diff --git a/Source/Core/RequestErrorEvent.js b/Source/Core/RequestErrorEvent.js index 3604035b00d4..d11bacd7e570 100644 --- a/Source/Core/RequestErrorEvent.js +++ b/Source/Core/RequestErrorEvent.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined', './parseResponseHeaders' diff --git a/Source/Core/RequestScheduler.js b/Source/Core/RequestScheduler.js index 264838a5b826..f7a6c5c9a09c 100644 --- a/Source/Core/RequestScheduler.js +++ b/Source/Core/RequestScheduler.js @@ -1,26 +1,25 @@ -/*global define*/ define([ - './clone', + '../ThirdParty/Uri', + '../ThirdParty/when', './Check', + './clone', './defined', './defineProperties', './Heap', './isBlobUri', './isDataUri', - './RequestState', - '../ThirdParty/Uri', - '../ThirdParty/when' + './RequestState' ], function( - clone, + Uri, + when, Check, + clone, defined, defineProperties, Heap, isBlobUri, isDataUri, - RequestState, - Uri, - when) { + RequestState) { 'use strict'; function sortRequests(a, b) { diff --git a/Source/Core/RequestState.js b/Source/Core/RequestState.js index 23498ef57fc7..cf81401d0888 100644 --- a/Source/Core/RequestState.js +++ b/Source/Core/RequestState.js @@ -1,7 +1,6 @@ -/*global define*/ define([ '../Core/freezeObject' -], function( + ], function( freezeObject) { 'use strict'; diff --git a/Source/Core/RequestType.js b/Source/Core/RequestType.js index d01348b54d53..d4a4b01dad5e 100644 --- a/Source/Core/RequestType.js +++ b/Source/Core/RequestType.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Core/RuntimeError.js b/Source/Core/RuntimeError.js index 1543c0d1ed44..e20a700fd176 100644 --- a/Source/Core/RuntimeError.js +++ b/Source/Core/RuntimeError.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined' ], function( diff --git a/Source/Core/ScreenSpaceEventHandler.js b/Source/Core/ScreenSpaceEventHandler.js index ba63e2e20f02..06a5944ebdfd 100644 --- a/Source/Core/ScreenSpaceEventHandler.js +++ b/Source/Core/ScreenSpaceEventHandler.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './AssociativeArray', './Cartesian2', diff --git a/Source/Core/ScreenSpaceEventType.js b/Source/Core/ScreenSpaceEventType.js index 3c4388123f91..0b77e6ffe859 100644 --- a/Source/Core/ScreenSpaceEventType.js +++ b/Source/Core/ScreenSpaceEventType.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './freezeObject' ], function( diff --git a/Source/Core/ShowGeometryInstanceAttribute.js b/Source/Core/ShowGeometryInstanceAttribute.js index cc74480ed28a..30a1526ce7bb 100644 --- a/Source/Core/ShowGeometryInstanceAttribute.js +++ b/Source/Core/ShowGeometryInstanceAttribute.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './ComponentDatatype', './defaultValue', diff --git a/Source/Core/Simon1994PlanetaryPositions.js b/Source/Core/Simon1994PlanetaryPositions.js index 3962010540c2..22c2d2e37d5b 100644 --- a/Source/Core/Simon1994PlanetaryPositions.js +++ b/Source/Core/Simon1994PlanetaryPositions.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './defined', diff --git a/Source/Core/SimplePolylineGeometry.js b/Source/Core/SimplePolylineGeometry.js index af587d36b6d7..c384ede5125d 100644 --- a/Source/Core/SimplePolylineGeometry.js +++ b/Source/Core/SimplePolylineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './BoundingSphere', './Cartesian3', diff --git a/Source/Core/SphereGeometry.js b/Source/Core/SphereGeometry.js index 18d9b74d56ef..d2dc8ca860ba 100644 --- a/Source/Core/SphereGeometry.js +++ b/Source/Core/SphereGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './Check', diff --git a/Source/Core/SphereOutlineGeometry.js b/Source/Core/SphereOutlineGeometry.js index 0dbff9a8017a..c14baddac6fa 100644 --- a/Source/Core/SphereOutlineGeometry.js +++ b/Source/Core/SphereOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './Check', diff --git a/Source/Core/Spherical.js b/Source/Core/Spherical.js index 5eecf7e6b1a4..633dac0c49f7 100644 --- a/Source/Core/Spherical.js +++ b/Source/Core/Spherical.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Check', './defaultValue', diff --git a/Source/Core/Spline.js b/Source/Core/Spline.js index f7ea8e696f42..cbc7e6940ceb 100644 --- a/Source/Core/Spline.js +++ b/Source/Core/Spline.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './defined', diff --git a/Source/Core/TaskProcessor.js b/Source/Core/TaskProcessor.js index 0a7edeb4220c..47b2f8f67fa5 100644 --- a/Source/Core/TaskProcessor.js +++ b/Source/Core/TaskProcessor.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/when', './buildModuleUrl', diff --git a/Source/Core/TerrainData.js b/Source/Core/TerrainData.js index d9e6e17f3475..d29eea279c2a 100644 --- a/Source/Core/TerrainData.js +++ b/Source/Core/TerrainData.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defineProperties', './DeveloperError' diff --git a/Source/Core/TerrainEncoding.js b/Source/Core/TerrainEncoding.js index 744ba8fdad65..332fdf0ebd8a 100644 --- a/Source/Core/TerrainEncoding.js +++ b/Source/Core/TerrainEncoding.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './AttributeCompression', './Cartesian2', diff --git a/Source/Core/TerrainMesh.js b/Source/Core/TerrainMesh.js index 4c25c7990ecf..cffa35b8c7ca 100644 --- a/Source/Core/TerrainMesh.js +++ b/Source/Core/TerrainMesh.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue' ], function( diff --git a/Source/Core/TerrainProvider.js b/Source/Core/TerrainProvider.js index 6bdc2e000016..314b51fafb5a 100644 --- a/Source/Core/TerrainProvider.js +++ b/Source/Core/TerrainProvider.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined', './defineProperties', diff --git a/Source/Core/TerrainQuantization.js b/Source/Core/TerrainQuantization.js index 6f493be8131e..a48e744eac12 100644 --- a/Source/Core/TerrainQuantization.js +++ b/Source/Core/TerrainQuantization.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './freezeObject' ], function( diff --git a/Source/Core/TileAvailability.js b/Source/Core/TileAvailability.js index 6d877c350c49..2b8db8babc2d 100644 --- a/Source/Core/TileAvailability.js +++ b/Source/Core/TileAvailability.js @@ -1,18 +1,17 @@ -/*global define*/ define([ - './binarySearch', - './Cartographic', - './defined', - './defineProperties', - './DeveloperError', - './Rectangle' -], function( - binarySearch, - Cartographic, - defined, - defineProperties, - DeveloperError, - Rectangle) { + './binarySearch', + './Cartographic', + './defined', + './defineProperties', + './DeveloperError', + './Rectangle' + ], function( + binarySearch, + Cartographic, + defined, + defineProperties, + DeveloperError, + Rectangle) { 'use strict'; /** diff --git a/Source/Core/TileProviderError.js b/Source/Core/TileProviderError.js index 3204ca59963a..1c4918e7e02e 100644 --- a/Source/Core/TileProviderError.js +++ b/Source/Core/TileProviderError.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './defined', diff --git a/Source/Core/TilingScheme.js b/Source/Core/TilingScheme.js index 1e98a22e5703..9bf09345ba61 100644 --- a/Source/Core/TilingScheme.js +++ b/Source/Core/TilingScheme.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defineProperties', './DeveloperError' diff --git a/Source/Core/TimeConstants.js b/Source/Core/TimeConstants.js index 75e6caf5e94f..7a09ff288735 100644 --- a/Source/Core/TimeConstants.js +++ b/Source/Core/TimeConstants.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './freezeObject' ], function( diff --git a/Source/Core/TimeInterval.js b/Source/Core/TimeInterval.js index 1e5dfbe0d64d..fc7305dba238 100644 --- a/Source/Core/TimeInterval.js +++ b/Source/Core/TimeInterval.js @@ -1,16 +1,15 @@ -/*global define*/ define([ + './Check', './defaultValue', './defined', './defineProperties', - './DeveloperError', './freezeObject', './JulianDate' ], function( + Check, defaultValue, defined, defineProperties, - DeveloperError, freezeObject, JulianDate) { 'use strict'; @@ -139,12 +138,8 @@ define([ */ TimeInterval.fromIso8601 = function(options, result) { //>>includeStart('debug', pragmas.debug); - if (!defined(options)) { - throw new DeveloperError('options is required.'); - } - if (!defined(options.iso8601)) { - throw new DeveloperError('options.iso8601 is required.'); - } + Check.typeOf.object('options', options); + Check.typeOf.string('options.iso8601', options.iso8601); //>>includeEnd('debug'); var dates = options.iso8601.split('/'); @@ -180,9 +175,7 @@ define([ */ TimeInterval.toIso8601 = function(timeInterval, precision) { //>>includeStart('debug', pragmas.debug); - if (!defined(timeInterval)) { - throw new DeveloperError('timeInterval is required.'); - } + Check.typeOf.object('timeInterval', timeInterval); //>>includeEnd('debug'); return JulianDate.toIso8601(timeInterval.start, precision) + '/' + JulianDate.toIso8601(timeInterval.stop, precision); @@ -243,9 +236,7 @@ define([ */ TimeInterval.equalsEpsilon = function(left, right, epsilon, dataComparer) { //>>includeStart('debug', pragmas.debug); - if (typeof epsilon !== 'number') { - throw new DeveloperError('epsilon is required and must be a number.'); - } + Check.typeOf.number('epsilon', epsilon); //>>includeEnd('debug'); return left === right || @@ -269,12 +260,8 @@ define([ */ TimeInterval.intersect = function(left, right, result, mergeCallback) { //>>includeStart('debug', pragmas.debug); - if (!defined(left)) { - throw new DeveloperError('left is required.'); - } - if (!defined(result)) { - throw new DeveloperError('result is required.'); - } + Check.typeOf.object('left', left); + Check.typeOf.object('result', result); //>>includeEnd('debug'); if (!defined(right)) { @@ -317,12 +304,8 @@ define([ */ TimeInterval.contains = function(timeInterval, julianDate) { //>>includeStart('debug', pragmas.debug); - if (!defined(timeInterval)) { - throw new DeveloperError('timeInterval is required.'); - } - if (!defined(julianDate)) { - throw new DeveloperError('julianDate is required.'); - } + Check.typeOf.object('timeInterval', timeInterval); + Check.typeOf.object('julianDate', julianDate); //>>includeEnd('debug'); if (timeInterval.isEmpty) { diff --git a/Source/Core/TimeIntervalCollection.js b/Source/Core/TimeIntervalCollection.js index 414ae265828d..9aec462d1622 100644 --- a/Source/Core/TimeIntervalCollection.js +++ b/Source/Core/TimeIntervalCollection.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './binarySearch', './defaultValue', diff --git a/Source/Core/TimeStandard.js b/Source/Core/TimeStandard.js index d6511ed3b684..5f08446a3eab 100644 --- a/Source/Core/TimeStandard.js +++ b/Source/Core/TimeStandard.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './freezeObject' ], function( diff --git a/Source/Core/Tipsify.js b/Source/Core/Tipsify.js index e98fafed847e..2a5350cc62e4 100644 --- a/Source/Core/Tipsify.js +++ b/Source/Core/Tipsify.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './defined', diff --git a/Source/Core/Transforms.js b/Source/Core/Transforms.js index 27edaabc93ec..9a3276a31018 100644 --- a/Source/Core/Transforms.js +++ b/Source/Core/Transforms.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/when', './Cartesian2', diff --git a/Source/Core/TranslationRotationScale.js b/Source/Core/TranslationRotationScale.js index dea95c42570e..827de967cb6d 100644 --- a/Source/Core/TranslationRotationScale.js +++ b/Source/Core/TranslationRotationScale.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './defaultValue', diff --git a/Source/Core/TridiagonalSystemSolver.js b/Source/Core/TridiagonalSystemSolver.js index b57ac12e86b9..95cdde80215b 100644 --- a/Source/Core/TridiagonalSystemSolver.js +++ b/Source/Core/TridiagonalSystemSolver.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './defined', diff --git a/Source/Core/TrustedServers.js b/Source/Core/TrustedServers.js index 010cf3cc65fd..3afb22750fa5 100644 --- a/Source/Core/TrustedServers.js +++ b/Source/Core/TrustedServers.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/Uri', './defined', diff --git a/Source/Core/VRTheWorldTerrainProvider.js b/Source/Core/VRTheWorldTerrainProvider.js index 5339deb9c6c8..bd139b308966 100644 --- a/Source/Core/VRTheWorldTerrainProvider.js +++ b/Source/Core/VRTheWorldTerrainProvider.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/when', './Credit', diff --git a/Source/Core/VertexFormat.js b/Source/Core/VertexFormat.js index 98d2f5b24620..64b93c9dced7 100644 --- a/Source/Core/VertexFormat.js +++ b/Source/Core/VertexFormat.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './defined', diff --git a/Source/Core/VideoSynchronizer.js b/Source/Core/VideoSynchronizer.js index c64d9fdd966d..ed93913720f5 100644 --- a/Source/Core/VideoSynchronizer.js +++ b/Source/Core/VideoSynchronizer.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './defined', diff --git a/Source/Core/Visibility.js b/Source/Core/Visibility.js index 3203207dcf36..06a7b4ad0421 100644 --- a/Source/Core/Visibility.js +++ b/Source/Core/Visibility.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './freezeObject' ], function( diff --git a/Source/Core/WallGeometry.js b/Source/Core/WallGeometry.js index 590e8e9a7678..d45dd60e6527 100644 --- a/Source/Core/WallGeometry.js +++ b/Source/Core/WallGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './BoundingSphere', './Cartesian3', diff --git a/Source/Core/WallGeometryLibrary.js b/Source/Core/WallGeometryLibrary.js index e8966f641120..03e95c5a63ef 100644 --- a/Source/Core/WallGeometryLibrary.js +++ b/Source/Core/WallGeometryLibrary.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartographic', './defined', diff --git a/Source/Core/WallOutlineGeometry.js b/Source/Core/WallOutlineGeometry.js index 64fdb10893c1..e46187d3ea16 100644 --- a/Source/Core/WallOutlineGeometry.js +++ b/Source/Core/WallOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './BoundingSphere', './Cartesian3', diff --git a/Source/Core/WebGLConstants.js b/Source/Core/WebGLConstants.js index 9419bf5becbc..ec64f9e17f96 100644 --- a/Source/Core/WebGLConstants.js +++ b/Source/Core/WebGLConstants.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './freezeObject' ], function( diff --git a/Source/Core/WebMercatorProjection.js b/Source/Core/WebMercatorProjection.js index 7ea54a4295ec..3d15029cf108 100644 --- a/Source/Core/WebMercatorProjection.js +++ b/Source/Core/WebMercatorProjection.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './Cartographic', diff --git a/Source/Core/WebMercatorTilingScheme.js b/Source/Core/WebMercatorTilingScheme.js index 5d347d2ad086..876303451d88 100644 --- a/Source/Core/WebMercatorTilingScheme.js +++ b/Source/Core/WebMercatorTilingScheme.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian2', './defaultValue', diff --git a/Source/Core/WindingOrder.js b/Source/Core/WindingOrder.js index 06999e6a24c2..19d2540e2a16 100644 --- a/Source/Core/WindingOrder.js +++ b/Source/Core/WindingOrder.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './freezeObject', './WebGLConstants' diff --git a/Source/Core/appendForwardSlash.js b/Source/Core/appendForwardSlash.js index c33e9fb27d06..6dc8c295d602 100644 --- a/Source/Core/appendForwardSlash.js +++ b/Source/Core/appendForwardSlash.js @@ -1,4 +1,3 @@ -/*global define*/ define(function() { 'use strict'; diff --git a/Source/Core/arrayFill.js b/Source/Core/arrayFill.js index ac6d36ce4a2a..e2c6924bee60 100644 --- a/Source/Core/arrayFill.js +++ b/Source/Core/arrayFill.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Check', './defaultValue', diff --git a/Source/Core/arrayRemoveDuplicates.js b/Source/Core/arrayRemoveDuplicates.js index 23c9f1b821ee..0d8bc3bac2af 100644 --- a/Source/Core/arrayRemoveDuplicates.js +++ b/Source/Core/arrayRemoveDuplicates.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Check', './defaultValue', diff --git a/Source/Core/barycentricCoordinates.js b/Source/Core/barycentricCoordinates.js index 25b83e20307b..bf00ec5cd3ac 100644 --- a/Source/Core/barycentricCoordinates.js +++ b/Source/Core/barycentricCoordinates.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian2', './Cartesian3', @@ -8,7 +7,7 @@ define([ Cartesian2, Cartesian3, Check, - defined ) { + defined) { 'use strict'; var scratchCartesian1 = new Cartesian3(); diff --git a/Source/Core/binarySearch.js b/Source/Core/binarySearch.js index 7ee44ffe1269..ddda37708c99 100644 --- a/Source/Core/binarySearch.js +++ b/Source/Core/binarySearch.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Check', './defined' diff --git a/Source/Core/buildModuleUrl.js b/Source/Core/buildModuleUrl.js index 7c4e9fcac99a..509f9e2509e3 100644 --- a/Source/Core/buildModuleUrl.js +++ b/Source/Core/buildModuleUrl.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/Uri', './defined', diff --git a/Source/Core/cancelAnimationFrame.js b/Source/Core/cancelAnimationFrame.js index bb25f39b57ed..4cf0e02c310f 100644 --- a/Source/Core/cancelAnimationFrame.js +++ b/Source/Core/cancelAnimationFrame.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined' ], function( diff --git a/Source/Core/clone.js b/Source/Core/clone.js index adb23549355e..845d57e91c0d 100644 --- a/Source/Core/clone.js +++ b/Source/Core/clone.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue' ], function( diff --git a/Source/Core/combine.js b/Source/Core/combine.js index b9fda764809e..d36f1ad57719 100644 --- a/Source/Core/combine.js +++ b/Source/Core/combine.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './defined' diff --git a/Source/Core/createGuid.js b/Source/Core/createGuid.js index fecedc21ad63..7203976887e1 100644 --- a/Source/Core/createGuid.js +++ b/Source/Core/createGuid.js @@ -1,4 +1,3 @@ -/*global define*/ define(function() { 'use strict'; diff --git a/Source/Core/decodeGoogleEarthEnterpriseData.js b/Source/Core/decodeGoogleEarthEnterpriseData.js index a90533016bfe..d0369a45f8b1 100644 --- a/Source/Core/decodeGoogleEarthEnterpriseData.js +++ b/Source/Core/decodeGoogleEarthEnterpriseData.js @@ -1,12 +1,11 @@ -/*global define*/ define([ - './Check', - './defined', - './RuntimeError' -], function( - Check, - defined, - RuntimeError) { + './Check', + './defined', + './RuntimeError' + ], function( + Check, + defined, + RuntimeError) { 'use strict'; var compressedMagic = 0x7468dead; diff --git a/Source/Core/defaultValue.js b/Source/Core/defaultValue.js index 1389059d0970..0eca91ac6b8e 100644 --- a/Source/Core/defaultValue.js +++ b/Source/Core/defaultValue.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './freezeObject' ], function( @@ -19,7 +18,7 @@ define([ * param = Cesium.defaultValue(param, 'default'); */ function defaultValue(a, b) { - if (a !== undefined) { + if (a !== undefined && a !== null) { return a; } return b; diff --git a/Source/Core/defineProperties.js b/Source/Core/defineProperties.js index 08eaca76fe44..28c3a271d42e 100644 --- a/Source/Core/defineProperties.js +++ b/Source/Core/defineProperties.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined' ], function( diff --git a/Source/Core/defined.js b/Source/Core/defined.js index f41b07616fa9..cfe5ec44faed 100644 --- a/Source/Core/defined.js +++ b/Source/Core/defined.js @@ -1,4 +1,3 @@ -/*global define*/ define(function() { 'use strict'; diff --git a/Source/Core/deprecationWarning.js b/Source/Core/deprecationWarning.js index bee1a901a34b..a9645ec34175 100644 --- a/Source/Core/deprecationWarning.js +++ b/Source/Core/deprecationWarning.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined', './DeveloperError', diff --git a/Source/Core/destroyObject.js b/Source/Core/destroyObject.js index 4ac62e55abbf..92b91e82f8d7 100644 --- a/Source/Core/destroyObject.js +++ b/Source/Core/destroyObject.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './DeveloperError' diff --git a/Source/Core/formatError.js b/Source/Core/formatError.js index 7da9d97f92fe..cdfb47948a7e 100644 --- a/Source/Core/formatError.js +++ b/Source/Core/formatError.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined' ], function( diff --git a/Source/Core/freezeObject.js b/Source/Core/freezeObject.js index c5c18edff739..73a635c1e79c 100644 --- a/Source/Core/freezeObject.js +++ b/Source/Core/freezeObject.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined' ], function( diff --git a/Source/Core/getAbsoluteUri.js b/Source/Core/getAbsoluteUri.js index e5e1d6b69cdd..189f7b8ecf7f 100644 --- a/Source/Core/getAbsoluteUri.js +++ b/Source/Core/getAbsoluteUri.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/Uri', './defaultValue', diff --git a/Source/Core/getBaseUri.js b/Source/Core/getBaseUri.js index f440262cfcec..8a87fcccf8d8 100644 --- a/Source/Core/getBaseUri.js +++ b/Source/Core/getBaseUri.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/Uri', './defined', diff --git a/Source/Core/getExtensionFromUri.js b/Source/Core/getExtensionFromUri.js index c15703837ab8..4604653caaa5 100644 --- a/Source/Core/getExtensionFromUri.js +++ b/Source/Core/getExtensionFromUri.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/Uri', './defined', diff --git a/Source/Core/getFilenameFromUri.js b/Source/Core/getFilenameFromUri.js index 3bf0ac9428da..db88d390208e 100644 --- a/Source/Core/getFilenameFromUri.js +++ b/Source/Core/getFilenameFromUri.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/Uri', './defined', diff --git a/Source/Core/getImagePixels.js b/Source/Core/getImagePixels.js index e65f025eec84..1d6376b4d3aa 100644 --- a/Source/Core/getImagePixels.js +++ b/Source/Core/getImagePixels.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined' ], function( diff --git a/Source/Core/getMagic.js b/Source/Core/getMagic.js index ca6905108e40..ff17c4eb7c50 100644 --- a/Source/Core/getMagic.js +++ b/Source/Core/getMagic.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './getStringFromTypedArray' diff --git a/Source/Core/getStringFromTypedArray.js b/Source/Core/getStringFromTypedArray.js index c58d640d503d..a3d3c514910a 100644 --- a/Source/Core/getStringFromTypedArray.js +++ b/Source/Core/getStringFromTypedArray.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './defined', diff --git a/Source/Core/getTimestamp.js b/Source/Core/getTimestamp.js index 4fe42118d1d6..decf020e3bff 100644 --- a/Source/Core/getTimestamp.js +++ b/Source/Core/getTimestamp.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined' ], function( diff --git a/Source/Core/isArray.js b/Source/Core/isArray.js index dc11965a602f..0f75fb82e370 100644 --- a/Source/Core/isArray.js +++ b/Source/Core/isArray.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined' ], function( diff --git a/Source/Core/isBitSet.js b/Source/Core/isBitSet.js index 48b82a831dbc..c8ed267d865e 100644 --- a/Source/Core/isBitSet.js +++ b/Source/Core/isBitSet.js @@ -1,4 +1,3 @@ -/*global define*/ define([], function() { 'use strict'; diff --git a/Source/Core/isBlobUri.js b/Source/Core/isBlobUri.js index dc4afb78502f..60d4fdda54e3 100644 --- a/Source/Core/isBlobUri.js +++ b/Source/Core/isBlobUri.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Check' ], function( diff --git a/Source/Core/isCrossOriginUrl.js b/Source/Core/isCrossOriginUrl.js index 7f1b3f138927..42bdabb752dc 100644 --- a/Source/Core/isCrossOriginUrl.js +++ b/Source/Core/isCrossOriginUrl.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined' ], function( diff --git a/Source/Core/isDataUri.js b/Source/Core/isDataUri.js index 0cd24a228c1e..0c3f89ae3a9b 100644 --- a/Source/Core/isDataUri.js +++ b/Source/Core/isDataUri.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Check' ], function( diff --git a/Source/Core/isLeapYear.js b/Source/Core/isLeapYear.js index 99359a3fe019..9144e294be85 100644 --- a/Source/Core/isLeapYear.js +++ b/Source/Core/isLeapYear.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './DeveloperError' ], function( diff --git a/Source/Core/joinUrls.js b/Source/Core/joinUrls.js index 3a47587edbd6..a6a71faee95c 100644 --- a/Source/Core/joinUrls.js +++ b/Source/Core/joinUrls.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/Uri', './defaultValue', diff --git a/Source/Core/loadArrayBuffer.js b/Source/Core/loadArrayBuffer.js index cc56d573ff6c..52fe6bfc6571 100644 --- a/Source/Core/loadArrayBuffer.js +++ b/Source/Core/loadArrayBuffer.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './loadWithXhr' ], function( diff --git a/Source/Core/loadBlob.js b/Source/Core/loadBlob.js index 0e136d22c37c..6ff0fb919b2c 100644 --- a/Source/Core/loadBlob.js +++ b/Source/Core/loadBlob.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './loadWithXhr' ], function( diff --git a/Source/Core/loadCRN.js b/Source/Core/loadCRN.js index eac7121e1004..6043a94f448e 100644 --- a/Source/Core/loadCRN.js +++ b/Source/Core/loadCRN.js @@ -1,18 +1,17 @@ -/*global define*/ define([ - './CompressedTextureBuffer', - './defined', - './DeveloperError', - './loadArrayBuffer', - './TaskProcessor', - '../ThirdParty/when' -], function( - CompressedTextureBuffer, - defined, - DeveloperError, - loadArrayBuffer, - TaskProcessor, - when) { + '../ThirdParty/when', + './CompressedTextureBuffer', + './defined', + './DeveloperError', + './loadArrayBuffer', + './TaskProcessor' + ], function( + when, + CompressedTextureBuffer, + defined, + DeveloperError, + loadArrayBuffer, + TaskProcessor) { 'use strict'; var transcodeTaskProcessor = new TaskProcessor('transcodeCRNToDXT', Number.POSITIVE_INFINITY); diff --git a/Source/Core/loadImage.js b/Source/Core/loadImage.js index 79c0c95673ae..d14db2cba6a4 100644 --- a/Source/Core/loadImage.js +++ b/Source/Core/loadImage.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/when', './Check', diff --git a/Source/Core/loadImageFromTypedArray.js b/Source/Core/loadImageFromTypedArray.js index e7f636031aa6..25df7e15b383 100644 --- a/Source/Core/loadImageFromTypedArray.js +++ b/Source/Core/loadImageFromTypedArray.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/when', './Check', diff --git a/Source/Core/loadImageViaBlob.js b/Source/Core/loadImageViaBlob.js index 384531a9bab0..f63618c54257 100644 --- a/Source/Core/loadImageViaBlob.js +++ b/Source/Core/loadImageViaBlob.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/when', './defined', diff --git a/Source/Core/loadJson.js b/Source/Core/loadJson.js index 1fd1de5133c0..9b8e89b89134 100644 --- a/Source/Core/loadJson.js +++ b/Source/Core/loadJson.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './clone', './defined', diff --git a/Source/Core/loadJsonp.js b/Source/Core/loadJsonp.js index c63f3b58b0b0..ee3f10b621ca 100644 --- a/Source/Core/loadJsonp.js +++ b/Source/Core/loadJsonp.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/Uri', '../ThirdParty/when', diff --git a/Source/Core/loadKTX.js b/Source/Core/loadKTX.js index 19be19fb4ce4..39f90213ed19 100644 --- a/Source/Core/loadKTX.js +++ b/Source/Core/loadKTX.js @@ -1,17 +1,16 @@ -/*global define*/ define([ '../ThirdParty/when', + './Check', './CompressedTextureBuffer', './defined', - './DeveloperError', './loadArrayBuffer', './PixelFormat', './RuntimeError' ], function( when, + Check, CompressedTextureBuffer, defined, - DeveloperError, loadArrayBuffer, PixelFormat, RuntimeError) { @@ -72,9 +71,7 @@ define([ */ function loadKTX(urlOrBuffer, headers, request) { //>>includeStart('debug', pragmas.debug); - if (!defined(urlOrBuffer)) { - throw new DeveloperError('urlOrBuffer is required.'); - } + Check.defined('urlOrBuffer', urlOrBuffer); //>>includeEnd('debug'); var loadPromise; diff --git a/Source/Core/loadText.js b/Source/Core/loadText.js index 8ca386fe1bfa..eaf5b59a8a6c 100644 --- a/Source/Core/loadText.js +++ b/Source/Core/loadText.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './loadWithXhr' ], function( diff --git a/Source/Core/loadWithXhr.js b/Source/Core/loadWithXhr.js index f5e2690aa778..2fa503c19089 100644 --- a/Source/Core/loadWithXhr.js +++ b/Source/Core/loadWithXhr.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/when', './Check', diff --git a/Source/Core/loadXML.js b/Source/Core/loadXML.js index 780ff6ad5eea..7266ae08e705 100644 --- a/Source/Core/loadXML.js +++ b/Source/Core/loadXML.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './loadWithXhr' ], function( diff --git a/Source/Core/mergeSort.js b/Source/Core/mergeSort.js index e7f0663f3205..cb71f17895bd 100644 --- a/Source/Core/mergeSort.js +++ b/Source/Core/mergeSort.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined', './DeveloperError' diff --git a/Source/Core/objectToQuery.js b/Source/Core/objectToQuery.js index 0fc695c26039..ee2529da9e80 100644 --- a/Source/Core/objectToQuery.js +++ b/Source/Core/objectToQuery.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined', './DeveloperError', diff --git a/Source/Core/oneTimeWarning.js b/Source/Core/oneTimeWarning.js index 295cde6174e7..2973c4f82404 100644 --- a/Source/Core/oneTimeWarning.js +++ b/Source/Core/oneTimeWarning.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defaultValue', './defined', diff --git a/Source/Core/parseResponseHeaders.js b/Source/Core/parseResponseHeaders.js index 867680e412f0..c0afdd83e0d0 100644 --- a/Source/Core/parseResponseHeaders.js +++ b/Source/Core/parseResponseHeaders.js @@ -1,4 +1,3 @@ -/*global define*/ define([], function() { 'use strict'; diff --git a/Source/Core/pointInsideTriangle.js b/Source/Core/pointInsideTriangle.js index bc26e5521fea..2735877f960a 100644 --- a/Source/Core/pointInsideTriangle.js +++ b/Source/Core/pointInsideTriangle.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './barycentricCoordinates', './Cartesian3' diff --git a/Source/Core/queryToObject.js b/Source/Core/queryToObject.js index 937c1ab93194..c65426a94139 100644 --- a/Source/Core/queryToObject.js +++ b/Source/Core/queryToObject.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined', './DeveloperError', diff --git a/Source/Core/requestAnimationFrame.js b/Source/Core/requestAnimationFrame.js index cf16a4f5e3f4..87039dfa1b8d 100644 --- a/Source/Core/requestAnimationFrame.js +++ b/Source/Core/requestAnimationFrame.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined', './getTimestamp' diff --git a/Source/Core/sampleTerrain.js b/Source/Core/sampleTerrain.js index 8a43a84b8627..ae08dc42aba9 100644 --- a/Source/Core/sampleTerrain.js +++ b/Source/Core/sampleTerrain.js @@ -1,12 +1,9 @@ -/*global define*/ define([ '../ThirdParty/when', - './defined', - './DeveloperError' + './Check' ], function( when, - defined, - DeveloperError) { + Check) { 'use strict'; /** @@ -45,15 +42,9 @@ define([ */ function sampleTerrain(terrainProvider, level, positions) { //>>includeStart('debug', pragmas.debug); - if (!defined(terrainProvider)) { - throw new DeveloperError('terrainProvider is required.'); - } - if (!defined(level)) { - throw new DeveloperError('level is required.'); - } - if (!defined(positions)) { - throw new DeveloperError('positions is required.'); - } + Check.typeOf.object('terrainProvider', terrainProvider); + Check.typeOf.number('level', level); + Check.defined('positions', positions); //>>includeEnd('debug'); var deferred = when.defer(); diff --git a/Source/Core/sampleTerrainMostDetailed.js b/Source/Core/sampleTerrainMostDetailed.js index 793eeb2e0367..4a39b8e8c154 100644 --- a/Source/Core/sampleTerrainMostDetailed.js +++ b/Source/Core/sampleTerrainMostDetailed.js @@ -1,14 +1,13 @@ -/*global define*/ define([ - '../ThirdParty/when', - './defined', - './sampleTerrain', - './DeveloperError' -], function( - when, - defined, - sampleTerrain, - DeveloperError) { + '../ThirdParty/when', + './defined', + './DeveloperError', + './sampleTerrain' + ], function( + when, + defined, + DeveloperError, + sampleTerrain) { 'use strict'; /** diff --git a/Source/Core/scaleToGeodeticSurface.js b/Source/Core/scaleToGeodeticSurface.js index c5b7d6a823b2..6b6611724c3a 100644 --- a/Source/Core/scaleToGeodeticSurface.js +++ b/Source/Core/scaleToGeodeticSurface.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Cartesian3', './defined', diff --git a/Source/Core/subdivideArray.js b/Source/Core/subdivideArray.js index 5947acf41b78..918157ccd347 100644 --- a/Source/Core/subdivideArray.js +++ b/Source/Core/subdivideArray.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './defined', './DeveloperError' diff --git a/Source/Core/wrapFunction.js b/Source/Core/wrapFunction.js index 5949b7ab0de1..d0dd70f336cd 100644 --- a/Source/Core/wrapFunction.js +++ b/Source/Core/wrapFunction.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './DeveloperError' ], function( diff --git a/Source/Core/writeTextToCanvas.js b/Source/Core/writeTextToCanvas.js index c54ee0feaf90..d092f31afe84 100644 --- a/Source/Core/writeTextToCanvas.js +++ b/Source/Core/writeTextToCanvas.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/measureText', './Color', diff --git a/Source/DataSources/BillboardGraphics.js b/Source/DataSources/BillboardGraphics.js index 27e33c9f1728..86c260c86d5f 100644 --- a/Source/DataSources/BillboardGraphics.js +++ b/Source/DataSources/BillboardGraphics.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/BillboardVisualizer.js b/Source/DataSources/BillboardVisualizer.js index fd64b9db3000..69c4f2ec1d00 100644 --- a/Source/DataSources/BillboardVisualizer.js +++ b/Source/DataSources/BillboardVisualizer.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/AssociativeArray', '../Core/BoundingRectangle', diff --git a/Source/DataSources/BoundingSphereState.js b/Source/DataSources/BoundingSphereState.js index 388d0cd5e506..75dac8caa713 100644 --- a/Source/DataSources/BoundingSphereState.js +++ b/Source/DataSources/BoundingSphereState.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/DataSources/BoxGeometryUpdater.js b/Source/DataSources/BoxGeometryUpdater.js index 1dae2673290b..e216bc3cda29 100644 --- a/Source/DataSources/BoxGeometryUpdater.js +++ b/Source/DataSources/BoxGeometryUpdater.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoxGeometry', '../Core/BoxOutlineGeometry', diff --git a/Source/DataSources/BoxGraphics.js b/Source/DataSources/BoxGraphics.js index 50e3e78560d7..fb902ec2a071 100644 --- a/Source/DataSources/BoxGraphics.js +++ b/Source/DataSources/BoxGraphics.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/CallbackProperty.js b/Source/DataSources/CallbackProperty.js index f3f47f40e6f0..6066b84614d6 100644 --- a/Source/DataSources/CallbackProperty.js +++ b/Source/DataSources/CallbackProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/defineProperties', diff --git a/Source/DataSources/CheckerboardMaterialProperty.js b/Source/DataSources/CheckerboardMaterialProperty.js index 0943613c900a..f60ba8f18bbe 100644 --- a/Source/DataSources/CheckerboardMaterialProperty.js +++ b/Source/DataSources/CheckerboardMaterialProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian2', '../Core/Color', diff --git a/Source/DataSources/ColorMaterialProperty.js b/Source/DataSources/ColorMaterialProperty.js index dd034ef0ad6f..c4d29aeff65c 100644 --- a/Source/DataSources/ColorMaterialProperty.js +++ b/Source/DataSources/ColorMaterialProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Color', '../Core/defined', diff --git a/Source/DataSources/CompositeEntityCollection.js b/Source/DataSources/CompositeEntityCollection.js index 771d330f54a8..48e806faa94d 100644 --- a/Source/DataSources/CompositeEntityCollection.js +++ b/Source/DataSources/CompositeEntityCollection.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/createGuid', '../Core/defined', diff --git a/Source/DataSources/CompositeMaterialProperty.js b/Source/DataSources/CompositeMaterialProperty.js index c3b3bde5a133..7cdb9bcc1b0a 100644 --- a/Source/DataSources/CompositeMaterialProperty.js +++ b/Source/DataSources/CompositeMaterialProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/defineProperties', diff --git a/Source/DataSources/CompositePositionProperty.js b/Source/DataSources/CompositePositionProperty.js index ba573a9a5b80..4bc3789ad049 100644 --- a/Source/DataSources/CompositePositionProperty.js +++ b/Source/DataSources/CompositePositionProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/CompositeProperty.js b/Source/DataSources/CompositeProperty.js index 6980a0bca733..ed0a45cbed43 100644 --- a/Source/DataSources/CompositeProperty.js +++ b/Source/DataSources/CompositeProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/defineProperties', diff --git a/Source/DataSources/ConstantPositionProperty.js b/Source/DataSources/ConstantPositionProperty.js index b1e5cd3cf05b..5fc280293430 100644 --- a/Source/DataSources/ConstantPositionProperty.js +++ b/Source/DataSources/ConstantPositionProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/defaultValue', diff --git a/Source/DataSources/ConstantProperty.js b/Source/DataSources/ConstantProperty.js index 96e46a5914c1..4ae6969e2794 100644 --- a/Source/DataSources/ConstantProperty.js +++ b/Source/DataSources/ConstantProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/defineProperties', diff --git a/Source/DataSources/CorridorGeometryUpdater.js b/Source/DataSources/CorridorGeometryUpdater.js index 839d47b534e0..93c5580db486 100644 --- a/Source/DataSources/CorridorGeometryUpdater.js +++ b/Source/DataSources/CorridorGeometryUpdater.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Color', '../Core/ColorGeometryInstanceAttribute', diff --git a/Source/DataSources/CorridorGraphics.js b/Source/DataSources/CorridorGraphics.js index e20f69ad28f6..977328137a7c 100644 --- a/Source/DataSources/CorridorGraphics.js +++ b/Source/DataSources/CorridorGraphics.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/CustomDataSource.js b/Source/DataSources/CustomDataSource.js index da9be5220fa3..13af50d969aa 100644 --- a/Source/DataSources/CustomDataSource.js +++ b/Source/DataSources/CustomDataSource.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/defineProperties', diff --git a/Source/DataSources/CylinderGeometryUpdater.js b/Source/DataSources/CylinderGeometryUpdater.js index 0c35d09f49c5..45fa1736199a 100644 --- a/Source/DataSources/CylinderGeometryUpdater.js +++ b/Source/DataSources/CylinderGeometryUpdater.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Color', '../Core/ColorGeometryInstanceAttribute', diff --git a/Source/DataSources/CylinderGraphics.js b/Source/DataSources/CylinderGraphics.js index 8f1a5b3a1f18..3b0deba5cedd 100644 --- a/Source/DataSources/CylinderGraphics.js +++ b/Source/DataSources/CylinderGraphics.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/CzmlDataSource.js b/Source/DataSources/CzmlDataSource.js index cd573e18235e..50e147bfa285 100644 --- a/Source/DataSources/CzmlDataSource.js +++ b/Source/DataSources/CzmlDataSource.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingRectangle', '../Core/Cartesian2', diff --git a/Source/DataSources/DataSource.js b/Source/DataSources/DataSource.js index a2afc6f7eb64..61db315d2e9e 100644 --- a/Source/DataSources/DataSource.js +++ b/Source/DataSources/DataSource.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defineProperties', '../Core/DeveloperError' diff --git a/Source/DataSources/DataSourceClock.js b/Source/DataSources/DataSourceClock.js index 70f8b2871322..a539a2bba0c8 100644 --- a/Source/DataSources/DataSourceClock.js +++ b/Source/DataSources/DataSourceClock.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Clock', '../Core/defaultValue', diff --git a/Source/DataSources/DataSourceCollection.js b/Source/DataSources/DataSourceCollection.js index 0651be75cec9..05b9d8ac9d37 100644 --- a/Source/DataSources/DataSourceCollection.js +++ b/Source/DataSources/DataSourceCollection.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/DataSourceDisplay.js b/Source/DataSources/DataSourceDisplay.js index 2f6f95f9db30..98d243669d77 100644 --- a/Source/DataSources/DataSourceDisplay.js +++ b/Source/DataSources/DataSourceDisplay.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/Check', diff --git a/Source/DataSources/DynamicGeometryUpdater.js b/Source/DataSources/DynamicGeometryUpdater.js index ab0400485a40..4a7c9d866b15 100644 --- a/Source/DataSources/DynamicGeometryUpdater.js +++ b/Source/DataSources/DynamicGeometryUpdater.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/DeveloperError' ], function( diff --git a/Source/DataSources/EllipseGeometryUpdater.js b/Source/DataSources/EllipseGeometryUpdater.js index e47c1a4af98c..fa83fde44ad5 100644 --- a/Source/DataSources/EllipseGeometryUpdater.js +++ b/Source/DataSources/EllipseGeometryUpdater.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Color', '../Core/ColorGeometryInstanceAttribute', diff --git a/Source/DataSources/EllipseGraphics.js b/Source/DataSources/EllipseGraphics.js index 27b66d8cdb20..9af080f67641 100644 --- a/Source/DataSources/EllipseGraphics.js +++ b/Source/DataSources/EllipseGraphics.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/EllipsoidGeometryUpdater.js b/Source/DataSources/EllipsoidGeometryUpdater.js index 80070e1765b1..00f93ca8f1fc 100644 --- a/Source/DataSources/EllipsoidGeometryUpdater.js +++ b/Source/DataSources/EllipsoidGeometryUpdater.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/Color', diff --git a/Source/DataSources/EllipsoidGraphics.js b/Source/DataSources/EllipsoidGraphics.js index ccf1ce9ee63d..e005fd128549 100644 --- a/Source/DataSources/EllipsoidGraphics.js +++ b/Source/DataSources/EllipsoidGraphics.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/Entity.js b/Source/DataSources/Entity.js index 2ff35a74afef..abc2823c379a 100644 --- a/Source/DataSources/Entity.js +++ b/Source/DataSources/Entity.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/createGuid', diff --git a/Source/DataSources/EntityCluster.js b/Source/DataSources/EntityCluster.js index 1382684c228d..f3d961679a9f 100644 --- a/Source/DataSources/EntityCluster.js +++ b/Source/DataSources/EntityCluster.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingRectangle', '../Core/Cartesian2', diff --git a/Source/DataSources/EntityCollection.js b/Source/DataSources/EntityCollection.js index d25b41c5fc1e..51c09888200c 100644 --- a/Source/DataSources/EntityCollection.js +++ b/Source/DataSources/EntityCollection.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/AssociativeArray', '../Core/createGuid', diff --git a/Source/DataSources/EntityView.js b/Source/DataSources/EntityView.js index 05610b38e61f..48e792d5b54d 100644 --- a/Source/DataSources/EntityView.js +++ b/Source/DataSources/EntityView.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/defaultValue', diff --git a/Source/DataSources/GeoJsonDataSource.js b/Source/DataSources/GeoJsonDataSource.js index 5dae530523c0..2123486fcb1c 100644 --- a/Source/DataSources/GeoJsonDataSource.js +++ b/Source/DataSources/GeoJsonDataSource.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/Color', diff --git a/Source/DataSources/GeometryUpdater.js b/Source/DataSources/GeometryUpdater.js index 57f8ecf5457a..c3634da36891 100644 --- a/Source/DataSources/GeometryUpdater.js +++ b/Source/DataSources/GeometryUpdater.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defineProperties', '../Core/DeveloperError' diff --git a/Source/DataSources/GeometryVisualizer.js b/Source/DataSources/GeometryVisualizer.js index 7c9b30b568b4..295278fc651d 100644 --- a/Source/DataSources/GeometryVisualizer.js +++ b/Source/DataSources/GeometryVisualizer.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/AssociativeArray', '../Core/BoundingSphere', diff --git a/Source/DataSources/GridMaterialProperty.js b/Source/DataSources/GridMaterialProperty.js index 13813a2e4697..55848325e59b 100644 --- a/Source/DataSources/GridMaterialProperty.js +++ b/Source/DataSources/GridMaterialProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian2', '../Core/Color', diff --git a/Source/DataSources/ImageMaterialProperty.js b/Source/DataSources/ImageMaterialProperty.js index 00c484e620fb..ae0b9412ed2d 100644 --- a/Source/DataSources/ImageMaterialProperty.js +++ b/Source/DataSources/ImageMaterialProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian2', '../Core/Color', diff --git a/Source/DataSources/KmlDataSource.js b/Source/DataSources/KmlDataSource.js index bc1c24e3cdfd..ded2f89e5fcc 100644 --- a/Source/DataSources/KmlDataSource.js +++ b/Source/DataSources/KmlDataSource.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/AssociativeArray', '../Core/BoundingRectangle', diff --git a/Source/DataSources/LabelGraphics.js b/Source/DataSources/LabelGraphics.js index 026fa778b3b5..52cf604de454 100644 --- a/Source/DataSources/LabelGraphics.js +++ b/Source/DataSources/LabelGraphics.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/LabelVisualizer.js b/Source/DataSources/LabelVisualizer.js index 0407205174d0..208fd19c31c0 100644 --- a/Source/DataSources/LabelVisualizer.js +++ b/Source/DataSources/LabelVisualizer.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/AssociativeArray', '../Core/Cartesian2', diff --git a/Source/DataSources/MaterialProperty.js b/Source/DataSources/MaterialProperty.js index 4bd0f8556207..c9b164c18a21 100644 --- a/Source/DataSources/MaterialProperty.js +++ b/Source/DataSources/MaterialProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Color', '../Core/defined', diff --git a/Source/DataSources/ModelGraphics.js b/Source/DataSources/ModelGraphics.js index 766d60064855..db69b5d8df4f 100644 --- a/Source/DataSources/ModelGraphics.js +++ b/Source/DataSources/ModelGraphics.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/ModelVisualizer.js b/Source/DataSources/ModelVisualizer.js index a066931b4456..fd24f13cc280 100644 --- a/Source/DataSources/ModelVisualizer.js +++ b/Source/DataSources/ModelVisualizer.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/AssociativeArray', '../Core/BoundingSphere', diff --git a/Source/DataSources/NodeTransformationProperty.js b/Source/DataSources/NodeTransformationProperty.js index 5e5f032228bd..b0f03dc7dc12 100644 --- a/Source/DataSources/NodeTransformationProperty.js +++ b/Source/DataSources/NodeTransformationProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/PathGraphics.js b/Source/DataSources/PathGraphics.js index b900b552c3a9..0f617347b500 100644 --- a/Source/DataSources/PathGraphics.js +++ b/Source/DataSources/PathGraphics.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/PathVisualizer.js b/Source/DataSources/PathVisualizer.js index 887110d3ee84..7d929f4a88ba 100644 --- a/Source/DataSources/PathVisualizer.js +++ b/Source/DataSources/PathVisualizer.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/AssociativeArray', '../Core/Cartesian3', diff --git a/Source/DataSources/PointGraphics.js b/Source/DataSources/PointGraphics.js index 4688b5100e59..923622822561 100644 --- a/Source/DataSources/PointGraphics.js +++ b/Source/DataSources/PointGraphics.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/PointVisualizer.js b/Source/DataSources/PointVisualizer.js index 16878334b8b5..97bf0a13b0ec 100644 --- a/Source/DataSources/PointVisualizer.js +++ b/Source/DataSources/PointVisualizer.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/AssociativeArray', '../Core/Cartesian3', diff --git a/Source/DataSources/PolygonGeometryUpdater.js b/Source/DataSources/PolygonGeometryUpdater.js index 3aac6923c32e..c0ab0c898172 100644 --- a/Source/DataSources/PolygonGeometryUpdater.js +++ b/Source/DataSources/PolygonGeometryUpdater.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Color', '../Core/ColorGeometryInstanceAttribute', diff --git a/Source/DataSources/PolygonGraphics.js b/Source/DataSources/PolygonGraphics.js index 66e37aa5c37a..cfec1fba9f54 100644 --- a/Source/DataSources/PolygonGraphics.js +++ b/Source/DataSources/PolygonGraphics.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/PolylineArrowMaterialProperty.js b/Source/DataSources/PolylineArrowMaterialProperty.js index 5dba53c76041..3c213d380a19 100644 --- a/Source/DataSources/PolylineArrowMaterialProperty.js +++ b/Source/DataSources/PolylineArrowMaterialProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Color', '../Core/defined', diff --git a/Source/DataSources/PolylineDashMaterialProperty.js b/Source/DataSources/PolylineDashMaterialProperty.js index 9f619f2c7a5e..bd8339bbbe87 100644 --- a/Source/DataSources/PolylineDashMaterialProperty.js +++ b/Source/DataSources/PolylineDashMaterialProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Color', '../Core/defaultValue', diff --git a/Source/DataSources/PolylineGeometryUpdater.js b/Source/DataSources/PolylineGeometryUpdater.js index de16014577c5..ed5805ae524b 100644 --- a/Source/DataSources/PolylineGeometryUpdater.js +++ b/Source/DataSources/PolylineGeometryUpdater.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/Color', diff --git a/Source/DataSources/PolylineGlowMaterialProperty.js b/Source/DataSources/PolylineGlowMaterialProperty.js index 2aeda90aad1d..e7841ec96dcc 100644 --- a/Source/DataSources/PolylineGlowMaterialProperty.js +++ b/Source/DataSources/PolylineGlowMaterialProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Color', '../Core/defaultValue', diff --git a/Source/DataSources/PolylineGraphics.js b/Source/DataSources/PolylineGraphics.js index d78cad84e1b6..1ff2d03e666a 100644 --- a/Source/DataSources/PolylineGraphics.js +++ b/Source/DataSources/PolylineGraphics.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/PolylineOutlineMaterialProperty.js b/Source/DataSources/PolylineOutlineMaterialProperty.js index 7ba2e07dc871..1667686c08ef 100644 --- a/Source/DataSources/PolylineOutlineMaterialProperty.js +++ b/Source/DataSources/PolylineOutlineMaterialProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Color', '../Core/defaultValue', diff --git a/Source/DataSources/PolylineVolumeGeometryUpdater.js b/Source/DataSources/PolylineVolumeGeometryUpdater.js index 0de042792313..c83822ec5be4 100644 --- a/Source/DataSources/PolylineVolumeGeometryUpdater.js +++ b/Source/DataSources/PolylineVolumeGeometryUpdater.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Color', '../Core/ColorGeometryInstanceAttribute', diff --git a/Source/DataSources/PolylineVolumeGraphics.js b/Source/DataSources/PolylineVolumeGraphics.js index 5004f3f5f131..ae7337d1b383 100644 --- a/Source/DataSources/PolylineVolumeGraphics.js +++ b/Source/DataSources/PolylineVolumeGraphics.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/PositionProperty.js b/Source/DataSources/PositionProperty.js index 1b0f78820344..af5b00665e19 100644 --- a/Source/DataSources/PositionProperty.js +++ b/Source/DataSources/PositionProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/defined', diff --git a/Source/DataSources/PositionPropertyArray.js b/Source/DataSources/PositionPropertyArray.js index ab0bdef13a4b..6615277e6369 100644 --- a/Source/DataSources/PositionPropertyArray.js +++ b/Source/DataSources/PositionPropertyArray.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/Property.js b/Source/DataSources/Property.js index 3f201ddcda0a..85d1a1df8abb 100644 --- a/Source/DataSources/Property.js +++ b/Source/DataSources/Property.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/PropertyArray.js b/Source/DataSources/PropertyArray.js index 48172dc89c08..09d117ad9ff5 100644 --- a/Source/DataSources/PropertyArray.js +++ b/Source/DataSources/PropertyArray.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/defineProperties', diff --git a/Source/DataSources/PropertyBag.js b/Source/DataSources/PropertyBag.js index 5bd13dfbd397..febe2ff3e78e 100644 --- a/Source/DataSources/PropertyBag.js +++ b/Source/DataSources/PropertyBag.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/RectangleGeometryUpdater.js b/Source/DataSources/RectangleGeometryUpdater.js index 4fbdb2926b29..bc499b6c531c 100644 --- a/Source/DataSources/RectangleGeometryUpdater.js +++ b/Source/DataSources/RectangleGeometryUpdater.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Color', '../Core/ColorGeometryInstanceAttribute', diff --git a/Source/DataSources/RectangleGraphics.js b/Source/DataSources/RectangleGraphics.js index d2aa92cee27d..52b0f429fdb3 100644 --- a/Source/DataSources/RectangleGraphics.js +++ b/Source/DataSources/RectangleGraphics.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/ReferenceProperty.js b/Source/DataSources/ReferenceProperty.js index 455d5795c040..0e608d9c569f 100644 --- a/Source/DataSources/ReferenceProperty.js +++ b/Source/DataSources/ReferenceProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/defineProperties', diff --git a/Source/DataSources/Rotation.js b/Source/DataSources/Rotation.js index 3f1480576cc1..da1e35d304d5 100755 --- a/Source/DataSources/Rotation.js +++ b/Source/DataSources/Rotation.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/SampledPositionProperty.js b/Source/DataSources/SampledPositionProperty.js index d524d26d60a1..28da3c99fada 100644 --- a/Source/DataSources/SampledPositionProperty.js +++ b/Source/DataSources/SampledPositionProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/defaultValue', diff --git a/Source/DataSources/SampledProperty.js b/Source/DataSources/SampledProperty.js index 06214848f64b..95dd7bbbdfd2 100644 --- a/Source/DataSources/SampledProperty.js +++ b/Source/DataSources/SampledProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/binarySearch', '../Core/defaultValue', diff --git a/Source/DataSources/ScaledPositionProperty.js b/Source/DataSources/ScaledPositionProperty.js index 5e629433c300..8b0aeaad84b2 100644 --- a/Source/DataSources/ScaledPositionProperty.js +++ b/Source/DataSources/ScaledPositionProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/defineProperties', diff --git a/Source/DataSources/StaticGeometryColorBatch.js b/Source/DataSources/StaticGeometryColorBatch.js index 782075db8e9a..c8284092b5d9 100644 --- a/Source/DataSources/StaticGeometryColorBatch.js +++ b/Source/DataSources/StaticGeometryColorBatch.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/AssociativeArray', '../Core/Color', diff --git a/Source/DataSources/StaticGeometryPerMaterialBatch.js b/Source/DataSources/StaticGeometryPerMaterialBatch.js index 527c6690130c..0a74c5d0a856 100644 --- a/Source/DataSources/StaticGeometryPerMaterialBatch.js +++ b/Source/DataSources/StaticGeometryPerMaterialBatch.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/AssociativeArray', '../Core/Color', diff --git a/Source/DataSources/StaticGroundGeometryColorBatch.js b/Source/DataSources/StaticGroundGeometryColorBatch.js index 35b50a495cbe..e0c22eb2a100 100644 --- a/Source/DataSources/StaticGroundGeometryColorBatch.js +++ b/Source/DataSources/StaticGroundGeometryColorBatch.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/AssociativeArray', '../Core/Color', diff --git a/Source/DataSources/StaticOutlineGeometryBatch.js b/Source/DataSources/StaticOutlineGeometryBatch.js index 5999837ade6e..fe5786d42230 100644 --- a/Source/DataSources/StaticOutlineGeometryBatch.js +++ b/Source/DataSources/StaticOutlineGeometryBatch.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/AssociativeArray', '../Core/Color', diff --git a/Source/DataSources/StripeMaterialProperty.js b/Source/DataSources/StripeMaterialProperty.js index a4c9e60be0d6..c3fc1197ea6b 100644 --- a/Source/DataSources/StripeMaterialProperty.js +++ b/Source/DataSources/StripeMaterialProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Color', '../Core/defaultValue', diff --git a/Source/DataSources/StripeOrientation.js b/Source/DataSources/StripeOrientation.js index 7c227cc93ed0..77064b549c4d 100644 --- a/Source/DataSources/StripeOrientation.js +++ b/Source/DataSources/StripeOrientation.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/DataSources/TimeIntervalCollectionPositionProperty.js b/Source/DataSources/TimeIntervalCollectionPositionProperty.js index 03681d4ba7d9..81ad2d81b0e3 100644 --- a/Source/DataSources/TimeIntervalCollectionPositionProperty.js +++ b/Source/DataSources/TimeIntervalCollectionPositionProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/TimeIntervalCollectionProperty.js b/Source/DataSources/TimeIntervalCollectionProperty.js index 8a85a640621e..5f62c6a26d87 100644 --- a/Source/DataSources/TimeIntervalCollectionProperty.js +++ b/Source/DataSources/TimeIntervalCollectionProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/defineProperties', diff --git a/Source/DataSources/VelocityOrientationProperty.js b/Source/DataSources/VelocityOrientationProperty.js index 5a23864f1b61..46c11685fc6b 100644 --- a/Source/DataSources/VelocityOrientationProperty.js +++ b/Source/DataSources/VelocityOrientationProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/defaultValue', diff --git a/Source/DataSources/VelocityVectorProperty.js b/Source/DataSources/VelocityVectorProperty.js index 456e2651a308..96a6e14f9535 100644 --- a/Source/DataSources/VelocityVectorProperty.js +++ b/Source/DataSources/VelocityVectorProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/defaultValue', diff --git a/Source/DataSources/Visualizer.js b/Source/DataSources/Visualizer.js index a3bf02711074..253374ad80ae 100644 --- a/Source/DataSources/Visualizer.js +++ b/Source/DataSources/Visualizer.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/DeveloperError' ], function( diff --git a/Source/DataSources/WallGeometryUpdater.js b/Source/DataSources/WallGeometryUpdater.js index c0b9c0c8c560..8ade7d448206 100644 --- a/Source/DataSources/WallGeometryUpdater.js +++ b/Source/DataSources/WallGeometryUpdater.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Color', '../Core/ColorGeometryInstanceAttribute', diff --git a/Source/DataSources/WallGraphics.js b/Source/DataSources/WallGraphics.js index 55a87535e036..e85dc36cf7fb 100644 --- a/Source/DataSources/WallGraphics.js +++ b/Source/DataSources/WallGraphics.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/createMaterialPropertyDescriptor.js b/Source/DataSources/createMaterialPropertyDescriptor.js index 100a4aaef562..85c3408e0b20 100644 --- a/Source/DataSources/createMaterialPropertyDescriptor.js +++ b/Source/DataSources/createMaterialPropertyDescriptor.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Color', '../Core/DeveloperError', diff --git a/Source/DataSources/createPropertyDescriptor.js b/Source/DataSources/createPropertyDescriptor.js index 420d6782d0a5..4cbfdf2a3f8d 100644 --- a/Source/DataSources/createPropertyDescriptor.js +++ b/Source/DataSources/createPropertyDescriptor.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/DataSources/createRawPropertyDescriptor.js b/Source/DataSources/createRawPropertyDescriptor.js index 0ba7470fab9e..9dceccb2e915 100644 --- a/Source/DataSources/createRawPropertyDescriptor.js +++ b/Source/DataSources/createRawPropertyDescriptor.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './createPropertyDescriptor' ], function( diff --git a/Source/DataSources/dynamicGeometryGetBoundingSphere.js b/Source/DataSources/dynamicGeometryGetBoundingSphere.js index d79b6b3fd6a3..db98b73d0f5f 100644 --- a/Source/DataSources/dynamicGeometryGetBoundingSphere.js +++ b/Source/DataSources/dynamicGeometryGetBoundingSphere.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/defined', diff --git a/Source/Renderer/AutomaticUniforms.js b/Source/Renderer/AutomaticUniforms.js index b202f464fce4..31b313ab7f60 100644 --- a/Source/Renderer/AutomaticUniforms.js +++ b/Source/Renderer/AutomaticUniforms.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/Matrix4', diff --git a/Source/Renderer/Buffer.js b/Source/Renderer/Buffer.js index edb489e7d313..3e6d4bdbede3 100644 --- a/Source/Renderer/Buffer.js +++ b/Source/Renderer/Buffer.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/Renderer/BufferUsage.js b/Source/Renderer/BufferUsage.js index c46034a91992..274a7205f906 100644 --- a/Source/Renderer/BufferUsage.js +++ b/Source/Renderer/BufferUsage.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject', '../Core/WebGLConstants' diff --git a/Source/Renderer/ClearCommand.js b/Source/Renderer/ClearCommand.js index 898282117f65..2ae7268a88c9 100644 --- a/Source/Renderer/ClearCommand.js +++ b/Source/Renderer/ClearCommand.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Color', '../Core/defaultValue', diff --git a/Source/Renderer/ComputeCommand.js b/Source/Renderer/ComputeCommand.js index 1eb7f2a24888..0ed531cdd1bb 100644 --- a/Source/Renderer/ComputeCommand.js +++ b/Source/Renderer/ComputeCommand.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', './Pass' diff --git a/Source/Renderer/ComputeEngine.js b/Source/Renderer/ComputeEngine.js index 13235334a893..1ab87d6cebd8 100644 --- a/Source/Renderer/ComputeEngine.js +++ b/Source/Renderer/ComputeEngine.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingRectangle', '../Core/Color', diff --git a/Source/Renderer/Context.js b/Source/Renderer/Context.js index 7966c47e0418..7eff7dc3fa52 100644 --- a/Source/Renderer/Context.js +++ b/Source/Renderer/Context.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/clone', '../Core/Color', diff --git a/Source/Renderer/ContextLimits.js b/Source/Renderer/ContextLimits.js index e79909e1b8d5..59032139076a 100644 --- a/Source/Renderer/ContextLimits.js +++ b/Source/Renderer/ContextLimits.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defineProperties' ], function( diff --git a/Source/Renderer/CubeMap.js b/Source/Renderer/CubeMap.js index 8f29baa1343b..b95bf56c009f 100644 --- a/Source/Renderer/CubeMap.js +++ b/Source/Renderer/CubeMap.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/Renderer/CubeMapFace.js b/Source/Renderer/CubeMapFace.js index ca923da99fe7..1695c9a09776 100644 --- a/Source/Renderer/CubeMapFace.js +++ b/Source/Renderer/CubeMapFace.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defineProperties', diff --git a/Source/Renderer/DrawCommand.js b/Source/Renderer/DrawCommand.js index e6d23b398b6f..66262617f24a 100644 --- a/Source/Renderer/DrawCommand.js +++ b/Source/Renderer/DrawCommand.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/Renderer/Framebuffer.js b/Source/Renderer/Framebuffer.js index 2e2c1f97406a..a98a6aa376ec 100644 --- a/Source/Renderer/Framebuffer.js +++ b/Source/Renderer/Framebuffer.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/Renderer/MipmapHint.js b/Source/Renderer/MipmapHint.js index 44a633894841..f031275dbfdb 100644 --- a/Source/Renderer/MipmapHint.js +++ b/Source/Renderer/MipmapHint.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject', '../Core/WebGLConstants' diff --git a/Source/Renderer/Pass.js b/Source/Renderer/Pass.js index 6691bc45f9f3..a5f7bdbb04dd 100644 --- a/Source/Renderer/Pass.js +++ b/Source/Renderer/Pass.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Renderer/PassState.js b/Source/Renderer/PassState.js index 4a0e5515143a..f72c79d998ea 100644 --- a/Source/Renderer/PassState.js +++ b/Source/Renderer/PassState.js @@ -1,4 +1,3 @@ -/*global define*/ define([], function() { 'use strict'; diff --git a/Source/Renderer/PickFramebuffer.js b/Source/Renderer/PickFramebuffer.js index ba1b1399eae0..651055d2bbaa 100644 --- a/Source/Renderer/PickFramebuffer.js +++ b/Source/Renderer/PickFramebuffer.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingRectangle', '../Core/Color', diff --git a/Source/Renderer/PixelDatatype.js b/Source/Renderer/PixelDatatype.js index ad5b4846a8ee..47400ac73b8e 100644 --- a/Source/Renderer/PixelDatatype.js +++ b/Source/Renderer/PixelDatatype.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject', '../Core/WebGLConstants' diff --git a/Source/Renderer/RenderState.js b/Source/Renderer/RenderState.js index 93c074526257..3b30bebbd290 100644 --- a/Source/Renderer/RenderState.js +++ b/Source/Renderer/RenderState.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingRectangle', '../Core/Color', diff --git a/Source/Renderer/Renderbuffer.js b/Source/Renderer/Renderbuffer.js index ebee4b0be504..c36c80e0bc84 100644 --- a/Source/Renderer/Renderbuffer.js +++ b/Source/Renderer/Renderbuffer.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/Renderer/RenderbufferFormat.js b/Source/Renderer/RenderbufferFormat.js index ce99580b7f02..3513c2cb338f 100644 --- a/Source/Renderer/RenderbufferFormat.js +++ b/Source/Renderer/RenderbufferFormat.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject', '../Core/WebGLConstants' diff --git a/Source/Renderer/Sampler.js b/Source/Renderer/Sampler.js index 85c8c6e32bcb..c11922f91a52 100644 --- a/Source/Renderer/Sampler.js +++ b/Source/Renderer/Sampler.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/Renderer/ShaderCache.js b/Source/Renderer/ShaderCache.js index d02724bdfedc..d8635213de6d 100644 --- a/Source/Renderer/ShaderCache.js +++ b/Source/Renderer/ShaderCache.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/defineProperties', diff --git a/Source/Renderer/ShaderProgram.js b/Source/Renderer/ShaderProgram.js index a76faa6acb8e..e839d4cd4e0f 100644 --- a/Source/Renderer/ShaderProgram.js +++ b/Source/Renderer/ShaderProgram.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/Renderer/ShaderSource.js b/Source/Renderer/ShaderSource.js index 8bda4b2b5f66..36bb4637145b 100644 --- a/Source/Renderer/ShaderSource.js +++ b/Source/Renderer/ShaderSource.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/Renderer/Texture.js b/Source/Renderer/Texture.js index a330e3aecfc0..2de068ea749e 100644 --- a/Source/Renderer/Texture.js +++ b/Source/Renderer/Texture.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian2', '../Core/defaultValue', diff --git a/Source/Renderer/TextureMagnificationFilter.js b/Source/Renderer/TextureMagnificationFilter.js index 777ce3d93506..ba87c508d991 100644 --- a/Source/Renderer/TextureMagnificationFilter.js +++ b/Source/Renderer/TextureMagnificationFilter.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject', '../Core/WebGLConstants' diff --git a/Source/Renderer/TextureMinificationFilter.js b/Source/Renderer/TextureMinificationFilter.js index 465816365200..270d5d9ecc39 100644 --- a/Source/Renderer/TextureMinificationFilter.js +++ b/Source/Renderer/TextureMinificationFilter.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject', '../Core/WebGLConstants' diff --git a/Source/Renderer/TextureWrap.js b/Source/Renderer/TextureWrap.js index 295b45e453e8..2bb3aae84d08 100644 --- a/Source/Renderer/TextureWrap.js +++ b/Source/Renderer/TextureWrap.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject', '../Core/WebGLConstants' diff --git a/Source/Renderer/UniformState.js b/Source/Renderer/UniformState.js index 3abe699ca767..283cde78e82f 100644 --- a/Source/Renderer/UniformState.js +++ b/Source/Renderer/UniformState.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingRectangle', '../Core/Cartesian2', diff --git a/Source/Renderer/VertexArray.js b/Source/Renderer/VertexArray.js index a02d27dc7996..535f57e76307 100644 --- a/Source/Renderer/VertexArray.js +++ b/Source/Renderer/VertexArray.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/ComponentDatatype', '../Core/defaultValue', diff --git a/Source/Renderer/VertexArrayFacade.js b/Source/Renderer/VertexArrayFacade.js index d7a793888394..82c3d0a5ba0b 100644 --- a/Source/Renderer/VertexArrayFacade.js +++ b/Source/Renderer/VertexArrayFacade.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/ComponentDatatype', '../Core/defaultValue', diff --git a/Source/Renderer/createUniform.js b/Source/Renderer/createUniform.js index b25e26a7f79f..f1c798dabac7 100644 --- a/Source/Renderer/createUniform.js +++ b/Source/Renderer/createUniform.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian2', '../Core/Cartesian3', diff --git a/Source/Renderer/createUniformArray.js b/Source/Renderer/createUniformArray.js index 0a55769997ab..002fd33ffc00 100644 --- a/Source/Renderer/createUniformArray.js +++ b/Source/Renderer/createUniformArray.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian2', '../Core/Cartesian3', diff --git a/Source/Renderer/loadCubeMap.js b/Source/Renderer/loadCubeMap.js index 81d6528aff59..e3b28341b8db 100644 --- a/Source/Renderer/loadCubeMap.js +++ b/Source/Renderer/loadCubeMap.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/DeveloperError', diff --git a/Source/Scene/Appearance.js b/Source/Scene/Appearance.js index d0fc71f50dbe..6920e981cdf5 100644 --- a/Source/Scene/Appearance.js +++ b/Source/Scene/Appearance.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/clone', '../Core/combine', diff --git a/Source/Scene/ArcGisMapServerImageryProvider.js b/Source/Scene/ArcGisMapServerImageryProvider.js index fa53f26b766e..8a542745b2bb 100644 --- a/Source/Scene/ArcGisMapServerImageryProvider.js +++ b/Source/Scene/ArcGisMapServerImageryProvider.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian2', '../Core/Cartesian3', diff --git a/Source/Scene/AttributeType.js b/Source/Scene/AttributeType.js index fb380f843b26..cb1cda93073c 100644 --- a/Source/Scene/AttributeType.js +++ b/Source/Scene/AttributeType.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/Axis.js b/Source/Scene/Axis.js index e98bf2f81466..c661477ab070 100644 --- a/Source/Scene/Axis.js +++ b/Source/Scene/Axis.js @@ -1,11 +1,10 @@ -/*global define*/ define([ '../Core/Check', '../Core/freezeObject', '../Core/Math', '../Core/Matrix3', '../Core/Matrix4' -], function( + ], function( Check, freezeObject, CesiumMath, diff --git a/Source/Scene/BatchTable.js b/Source/Scene/BatchTable.js index 29a0542ce97b..e32799823b04 100644 --- a/Source/Scene/BatchTable.js +++ b/Source/Scene/BatchTable.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian2', '../Core/Cartesian3', diff --git a/Source/Scene/Batched3DModel3DTileContent.js b/Source/Scene/Batched3DModel3DTileContent.js index 21b279df17a3..fd2a50198a5f 100644 --- a/Source/Scene/Batched3DModel3DTileContent.js +++ b/Source/Scene/Batched3DModel3DTileContent.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Check', '../Core/Color', diff --git a/Source/Scene/Billboard.js b/Source/Scene/Billboard.js index 3fc847c3adc6..88e8d1870597 100644 --- a/Source/Scene/Billboard.js +++ b/Source/Scene/Billboard.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingRectangle', '../Core/Cartesian2', diff --git a/Source/Scene/BillboardCollection.js b/Source/Scene/BillboardCollection.js index fac857137bb0..8e46636ec7bf 100644 --- a/Source/Scene/BillboardCollection.js +++ b/Source/Scene/BillboardCollection.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/AttributeCompression', '../Core/BoundingSphere', diff --git a/Source/Scene/BingMapsImageryProvider.js b/Source/Scene/BingMapsImageryProvider.js index fdcf1531b7c6..5c2f4e67a3bc 100644 --- a/Source/Scene/BingMapsImageryProvider.js +++ b/Source/Scene/BingMapsImageryProvider.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BingMapsApi', '../Core/Cartesian2', diff --git a/Source/Scene/BingMapsStyle.js b/Source/Scene/BingMapsStyle.js index fd1965d396fb..72e21754d1ff 100644 --- a/Source/Scene/BingMapsStyle.js +++ b/Source/Scene/BingMapsStyle.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/BlendEquation.js b/Source/Scene/BlendEquation.js index 1f16c2fd86a0..27bf019d21eb 100644 --- a/Source/Scene/BlendEquation.js +++ b/Source/Scene/BlendEquation.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject', '../Core/WebGLConstants' diff --git a/Source/Scene/BlendFunction.js b/Source/Scene/BlendFunction.js index 2da26a81bd02..fd7a0d196762 100644 --- a/Source/Scene/BlendFunction.js +++ b/Source/Scene/BlendFunction.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject', '../Core/WebGLConstants' diff --git a/Source/Scene/BlendOption.js b/Source/Scene/BlendOption.js index 4f2b7ef1702c..de511f724bc8 100644 --- a/Source/Scene/BlendOption.js +++ b/Source/Scene/BlendOption.js @@ -1,8 +1,7 @@ -/*global define*/ define([ - '../Core/freezeObject' -], function( - freezeObject) { + '../Core/freezeObject' + ], function( + freezeObject) { 'use strict'; /** diff --git a/Source/Scene/BlendingState.js b/Source/Scene/BlendingState.js index 474dfe7a845a..72954ac8419b 100644 --- a/Source/Scene/BlendingState.js +++ b/Source/Scene/BlendingState.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject', './BlendEquation', diff --git a/Source/Scene/BoxEmitter.js b/Source/Scene/BoxEmitter.js index 02f91c866a03..65c8f5fa3c95 100644 --- a/Source/Scene/BoxEmitter.js +++ b/Source/Scene/BoxEmitter.js @@ -1,15 +1,14 @@ -/*global define*/ define([ - '../Core/defaultValue', - '../Core/defineProperties', '../Core/Cartesian3', '../Core/Check', + '../Core/defaultValue', + '../Core/defineProperties', '../Core/Math' ], function( - defaultValue, - defineProperties, Cartesian3, Check, + defaultValue, + defineProperties, CesiumMath) { 'use strict'; diff --git a/Source/Scene/Camera.js b/Source/Scene/Camera.js index 029b8dfc6ad7..357b541a9726 100644 --- a/Source/Scene/Camera.js +++ b/Source/Scene/Camera.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/Cartesian2', @@ -1276,7 +1275,7 @@ define([ if (mode === SceneMode.SCENE2D) { this.flyTo({ - destination : Rectangle.MAX_VALUE, + destination : Camera.DEFAULT_VIEW_RECTANGLE, duration : duration, endTransform : Matrix4.IDENTITY }); diff --git a/Source/Scene/CameraEventAggregator.js b/Source/Scene/CameraEventAggregator.js index 78e6e7206451..5391377a99b0 100644 --- a/Source/Scene/CameraEventAggregator.js +++ b/Source/Scene/CameraEventAggregator.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian2', '../Core/defined', diff --git a/Source/Scene/CameraEventType.js b/Source/Scene/CameraEventType.js index 9e1e7e15c004..0f732fd028eb 100644 --- a/Source/Scene/CameraEventType.js +++ b/Source/Scene/CameraEventType.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/CameraFlightPath.js b/Source/Scene/CameraFlightPath.js index 5b032128860c..f161f4e17ddf 100644 --- a/Source/Scene/CameraFlightPath.js +++ b/Source/Scene/CameraFlightPath.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian2', '../Core/Cartesian3', diff --git a/Source/Scene/Cesium3DTile.js b/Source/Scene/Cesium3DTile.js index bb1b96551045..825bc5ad6af2 100644 --- a/Source/Scene/Cesium3DTile.js +++ b/Source/Scene/Cesium3DTile.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/Cartesian3', @@ -130,7 +129,8 @@ define([ this.geometricError = header.geometricError; if (!defined(this.geometricError)) { - throw new RuntimeError('geometricError must be defined'); + this.geometricError = defined(parent) ? parent.geometricError : tileset._geometricError; + Cesium3DTile._deprecationWarning('geometricErrorUndefined', 'Required property geometricError is undefined for this tile. Using parent\'s geometric error instead.'); } var refine; diff --git a/Source/Scene/Cesium3DTileBatchTable.js b/Source/Scene/Cesium3DTileBatchTable.js index 69f20ac1be21..79401ae40314 100644 --- a/Source/Scene/Cesium3DTileBatchTable.js +++ b/Source/Scene/Cesium3DTileBatchTable.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/arrayFill', '../Core/Cartesian2', diff --git a/Source/Scene/Cesium3DTileChildrenVisibility.js b/Source/Scene/Cesium3DTileChildrenVisibility.js index 338fff0e205f..ddfd279b147d 100644 --- a/Source/Scene/Cesium3DTileChildrenVisibility.js +++ b/Source/Scene/Cesium3DTileChildrenVisibility.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/Cesium3DTileColorBlendMode.js b/Source/Scene/Cesium3DTileColorBlendMode.js index 1c1d7c4fbb17..b069783eabcf 100644 --- a/Source/Scene/Cesium3DTileColorBlendMode.js +++ b/Source/Scene/Cesium3DTileColorBlendMode.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/Cesium3DTileContent.js b/Source/Scene/Cesium3DTileContent.js index f39056a7c2be..509220253ceb 100644 --- a/Source/Scene/Cesium3DTileContent.js +++ b/Source/Scene/Cesium3DTileContent.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defineProperties', '../Core/DeveloperError' diff --git a/Source/Scene/Cesium3DTileContentFactory.js b/Source/Scene/Cesium3DTileContentFactory.js index c90d50b4917b..5ae5548a865f 100644 --- a/Source/Scene/Cesium3DTileContentFactory.js +++ b/Source/Scene/Cesium3DTileContentFactory.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './Batched3DModel3DTileContent', './Composite3DTileContent', diff --git a/Source/Scene/Cesium3DTileContentState.js b/Source/Scene/Cesium3DTileContentState.js index 98fdad9a96bf..40c51b19bb24 100644 --- a/Source/Scene/Cesium3DTileContentState.js +++ b/Source/Scene/Cesium3DTileContentState.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/Cesium3DTileFeature.js b/Source/Scene/Cesium3DTileFeature.js index 5e03d3fc4cf8..c63a3efcf524 100644 --- a/Source/Scene/Cesium3DTileFeature.js +++ b/Source/Scene/Cesium3DTileFeature.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Color', '../Core/defined', diff --git a/Source/Scene/Cesium3DTileFeatureTable.js b/Source/Scene/Cesium3DTileFeatureTable.js index ff6283cd18e7..88da2420874e 100644 --- a/Source/Scene/Cesium3DTileFeatureTable.js +++ b/Source/Scene/Cesium3DTileFeatureTable.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/ComponentDatatype', '../Core/defaultValue', diff --git a/Source/Scene/Cesium3DTileOptimizationHint.js b/Source/Scene/Cesium3DTileOptimizationHint.js index b76479cbc6f3..4af204a74499 100644 --- a/Source/Scene/Cesium3DTileOptimizationHint.js +++ b/Source/Scene/Cesium3DTileOptimizationHint.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/Cesium3DTileOptimizations.js b/Source/Scene/Cesium3DTileOptimizations.js index 60b040574792..d3e08593f9a3 100644 --- a/Source/Scene/Cesium3DTileOptimizations.js +++ b/Source/Scene/Cesium3DTileOptimizations.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/Check', diff --git a/Source/Scene/Cesium3DTileRefine.js b/Source/Scene/Cesium3DTileRefine.js index 8b3773ba8a4f..b72832f10903 100644 --- a/Source/Scene/Cesium3DTileRefine.js +++ b/Source/Scene/Cesium3DTileRefine.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/Cesium3DTileStyle.js b/Source/Scene/Cesium3DTileStyle.js index 2b04c683e432..02b4d55947ae 100644 --- a/Source/Scene/Cesium3DTileStyle.js +++ b/Source/Scene/Cesium3DTileStyle.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/clone', '../Core/defaultValue', diff --git a/Source/Scene/Cesium3DTileStyleEngine.js b/Source/Scene/Cesium3DTileStyleEngine.js index a74bb5e536dc..07ac449b0e52 100644 --- a/Source/Scene/Cesium3DTileStyleEngine.js +++ b/Source/Scene/Cesium3DTileStyleEngine.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/defineProperties' diff --git a/Source/Scene/Cesium3DTileset.js b/Source/Scene/Cesium3DTileset.js index 26ab3dbb49dc..b1187b4af987 100644 --- a/Source/Scene/Cesium3DTileset.js +++ b/Source/Scene/Cesium3DTileset.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian2', '../Core/Cartesian3', diff --git a/Source/Scene/Cesium3DTilesetStatistics.js b/Source/Scene/Cesium3DTilesetStatistics.js index 85442f395427..8a95ff1be422 100644 --- a/Source/Scene/Cesium3DTilesetStatistics.js +++ b/Source/Scene/Cesium3DTilesetStatistics.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined' ], function( diff --git a/Source/Scene/Cesium3DTilesetTraversal.js b/Source/Scene/Cesium3DTilesetTraversal.js index 08fbdae2ab13..e1c4b137b74e 100644 --- a/Source/Scene/Cesium3DTilesetTraversal.js +++ b/Source/Scene/Cesium3DTilesetTraversal.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/freezeObject', diff --git a/Source/Scene/CircleEmitter.js b/Source/Scene/CircleEmitter.js index 77614e4af0b4..7197a2d40313 100644 --- a/Source/Scene/CircleEmitter.js +++ b/Source/Scene/CircleEmitter.js @@ -1,15 +1,14 @@ -/*global define*/ define([ - '../Core/defaultValue', - '../Core/defineProperties', '../Core/Cartesian3', '../Core/Check', + '../Core/defaultValue', + '../Core/defineProperties', '../Core/Math' ], function( - defaultValue, - defineProperties, Cartesian3, Check, + defaultValue, + defineProperties, CesiumMath) { 'use strict'; diff --git a/Source/Scene/ColorBlendMode.js b/Source/Scene/ColorBlendMode.js index c020c1dd1248..c74452a93472 100644 --- a/Source/Scene/ColorBlendMode.js +++ b/Source/Scene/ColorBlendMode.js @@ -1,8 +1,7 @@ -/*global define*/ define([ '../Core/freezeObject', '../Core/Math' -], function( + ], function( freezeObject, CesiumMath) { 'use strict'; @@ -39,4 +38,4 @@ define([ }; return freezeObject(ColorBlendMode); -}); \ No newline at end of file +}); diff --git a/Source/Scene/Composite3DTileContent.js b/Source/Scene/Composite3DTileContent.js index 39b0cf0ab799..ebdcc7de5081 100644 --- a/Source/Scene/Composite3DTileContent.js +++ b/Source/Scene/Composite3DTileContent.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/Scene/ConditionsExpression.js b/Source/Scene/ConditionsExpression.js index 21f1a7eaaa32..1bc5d32d74c0 100644 --- a/Source/Scene/ConditionsExpression.js +++ b/Source/Scene/ConditionsExpression.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/clone', '../Core/defined', diff --git a/Source/Scene/ConeEmitter.js b/Source/Scene/ConeEmitter.js index 21201b4dda4a..ccb6574ca6d1 100644 --- a/Source/Scene/ConeEmitter.js +++ b/Source/Scene/ConeEmitter.js @@ -1,15 +1,14 @@ -/*global define*/ define([ - '../Core/defaultValue', - '../Core/defineProperties', '../Core/Cartesian3', '../Core/Check', + '../Core/defaultValue', + '../Core/defineProperties', '../Core/Math' ], function( - defaultValue, - defineProperties, Cartesian3, Check, + defaultValue, + defineProperties, CesiumMath) { 'use strict'; diff --git a/Source/Scene/CreditDisplay.js b/Source/Scene/CreditDisplay.js index 395512488550..fadc80f5b51a 100644 --- a/Source/Scene/CreditDisplay.js +++ b/Source/Scene/CreditDisplay.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Credit', '../Core/defaultValue', diff --git a/Source/Scene/CullFace.js b/Source/Scene/CullFace.js index 25cf2ff2f1df..f9dfecc5e8bc 100644 --- a/Source/Scene/CullFace.js +++ b/Source/Scene/CullFace.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject', '../Core/WebGLConstants' diff --git a/Source/Scene/CullingVolume.js b/Source/Scene/CullingVolume.js index 5c350c946495..454f40b2c428 100644 --- a/Source/Scene/CullingVolume.js +++ b/Source/Scene/CullingVolume.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/Cartesian4', diff --git a/Source/Scene/DebugAppearance.js b/Source/Scene/DebugAppearance.js index 288fa7ca075f..71c647009ed5 100644 --- a/Source/Scene/DebugAppearance.js +++ b/Source/Scene/DebugAppearance.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/Scene/DebugCameraPrimitive.js b/Source/Scene/DebugCameraPrimitive.js index b5f4cb09f24a..32a8b5681362 100644 --- a/Source/Scene/DebugCameraPrimitive.js +++ b/Source/Scene/DebugCameraPrimitive.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/Cartesian3', diff --git a/Source/Scene/DebugModelMatrixPrimitive.js b/Source/Scene/DebugModelMatrixPrimitive.js index e7417b90842a..1113374a2896 100644 --- a/Source/Scene/DebugModelMatrixPrimitive.js +++ b/Source/Scene/DebugModelMatrixPrimitive.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/Color', diff --git a/Source/Scene/DepthFunction.js b/Source/Scene/DepthFunction.js index a8568c4b24cc..ac825df6299b 100644 --- a/Source/Scene/DepthFunction.js +++ b/Source/Scene/DepthFunction.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject', '../Core/WebGLConstants' diff --git a/Source/Scene/DepthPlane.js b/Source/Scene/DepthPlane.js index 78e5808e05b1..8559baa6219a 100644 --- a/Source/Scene/DepthPlane.js +++ b/Source/Scene/DepthPlane.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/Cartesian3', diff --git a/Source/Scene/DeviceOrientationCameraController.js b/Source/Scene/DeviceOrientationCameraController.js index 0b026cdc0a38..710d1c1b8fe9 100644 --- a/Source/Scene/DeviceOrientationCameraController.js +++ b/Source/Scene/DeviceOrientationCameraController.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/destroyObject', diff --git a/Source/Scene/DiscardMissingTileImagePolicy.js b/Source/Scene/DiscardMissingTileImagePolicy.js index b9d1c9e4ec12..b64a27eb8755 100644 --- a/Source/Scene/DiscardMissingTileImagePolicy.js +++ b/Source/Scene/DiscardMissingTileImagePolicy.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/Scene/EllipsoidPrimitive.js b/Source/Scene/EllipsoidPrimitive.js index 6a729af619cc..cd4ceff8f342 100644 --- a/Source/Scene/EllipsoidPrimitive.js +++ b/Source/Scene/EllipsoidPrimitive.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/BoxGeometry', diff --git a/Source/Scene/EllipsoidSurfaceAppearance.js b/Source/Scene/EllipsoidSurfaceAppearance.js index 5253814b2369..f6c65df59fcb 100644 --- a/Source/Scene/EllipsoidSurfaceAppearance.js +++ b/Source/Scene/EllipsoidSurfaceAppearance.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/Scene/Empty3DTileContent.js b/Source/Scene/Empty3DTileContent.js index f463c70d9ce1..8018618fc7d3 100644 --- a/Source/Scene/Empty3DTileContent.js +++ b/Source/Scene/Empty3DTileContent.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defineProperties', '../Core/destroyObject' diff --git a/Source/Scene/Expression.js b/Source/Scene/Expression.js index 3dd75d703743..479b4cd3b968 100644 --- a/Source/Scene/Expression.js +++ b/Source/Scene/Expression.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian2', '../Core/Cartesian3', diff --git a/Source/Scene/ExpressionNodeType.js b/Source/Scene/ExpressionNodeType.js index b6529ef93632..4cf7bfebe9c0 100644 --- a/Source/Scene/ExpressionNodeType.js +++ b/Source/Scene/ExpressionNodeType.js @@ -1,7 +1,6 @@ -/*global define*/ define([ '../Core/freezeObject' -], function( + ], function( freezeObject) { 'use strict'; diff --git a/Source/Scene/FXAA.js b/Source/Scene/FXAA.js index 6696c6651820..515ac9cc937c 100644 --- a/Source/Scene/FXAA.js +++ b/Source/Scene/FXAA.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingRectangle', '../Core/Cartesian2', diff --git a/Source/Scene/Fog.js b/Source/Scene/Fog.js index 7e8ae1126354..b06a34dbe147 100644 --- a/Source/Scene/Fog.js +++ b/Source/Scene/Fog.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/defined', diff --git a/Source/Scene/FrameRateMonitor.js b/Source/Scene/FrameRateMonitor.js index 987412e962c9..b01fa6c6d231 100644 --- a/Source/Scene/FrameRateMonitor.js +++ b/Source/Scene/FrameRateMonitor.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/Scene/FrameState.js b/Source/Scene/FrameState.js index da3a84c4d2bb..2f3826452682 100644 --- a/Source/Scene/FrameState.js +++ b/Source/Scene/FrameState.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './SceneMode' ], function( diff --git a/Source/Scene/FrustumCommands.js b/Source/Scene/FrustumCommands.js index fe5828910791..10bb1e8365f9 100644 --- a/Source/Scene/FrustumCommands.js +++ b/Source/Scene/FrustumCommands.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Renderer/Pass' diff --git a/Source/Scene/GetFeatureInfoFormat.js b/Source/Scene/GetFeatureInfoFormat.js index c5fac1744df5..83ff2f0545d5 100644 --- a/Source/Scene/GetFeatureInfoFormat.js +++ b/Source/Scene/GetFeatureInfoFormat.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartographic', '../Core/defined', diff --git a/Source/Scene/Globe.js b/Source/Scene/Globe.js index f947b21caaf5..8a351098c7b9 100644 --- a/Source/Scene/Globe.js +++ b/Source/Scene/Globe.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/buildModuleUrl', diff --git a/Source/Scene/GlobeDepth.js b/Source/Scene/GlobeDepth.js index 2254e270b81f..043690568771 100644 --- a/Source/Scene/GlobeDepth.js +++ b/Source/Scene/GlobeDepth.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingRectangle', '../Core/Color', diff --git a/Source/Scene/GlobeSurfaceShaderSet.js b/Source/Scene/GlobeSurfaceShaderSet.js index 7ed5d9a3496d..2442df1a5efb 100644 --- a/Source/Scene/GlobeSurfaceShaderSet.js +++ b/Source/Scene/GlobeSurfaceShaderSet.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/destroyObject', diff --git a/Source/Scene/GlobeSurfaceTile.js b/Source/Scene/GlobeSurfaceTile.js index 6975d41972c0..0c8cb7763019 100644 --- a/Source/Scene/GlobeSurfaceTile.js +++ b/Source/Scene/GlobeSurfaceTile.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/Cartesian3', diff --git a/Source/Scene/GlobeSurfaceTileProvider.js b/Source/Scene/GlobeSurfaceTileProvider.js index 60cf90f421f1..5892f1d1d655 100644 --- a/Source/Scene/GlobeSurfaceTileProvider.js +++ b/Source/Scene/GlobeSurfaceTileProvider.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/BoxOutlineGeometry', diff --git a/Source/Scene/GoogleEarthEnterpriseImageryProvider.js b/Source/Scene/GoogleEarthEnterpriseImageryProvider.js index de89b45a60ed..f156bcc5e37b 100644 --- a/Source/Scene/GoogleEarthEnterpriseImageryProvider.js +++ b/Source/Scene/GoogleEarthEnterpriseImageryProvider.js @@ -1,44 +1,43 @@ -/*global define*/ define([ - '../Core/Credit', - '../Core/decodeGoogleEarthEnterpriseData', - '../Core/defaultValue', - '../Core/defined', - '../Core/defineProperties', - '../Core/DeveloperError', - '../Core/Event', - '../Core/GeographicTilingScheme', - '../Core/GoogleEarthEnterpriseMetadata', - '../Core/loadArrayBuffer', - '../Core/loadImageFromTypedArray', - '../Core/Math', - '../Core/Rectangle', - '../Core/Request', - '../Core/RequestType', - '../Core/RuntimeError', - '../Core/TileProviderError', - '../ThirdParty/protobuf-minimal', - '../ThirdParty/when' -], function( - Credit, - decodeGoogleEarthEnterpriseData, - defaultValue, - defined, - defineProperties, - DeveloperError, - Event, - GeographicTilingScheme, - GoogleEarthEnterpriseMetadata, - loadArrayBuffer, - loadImageFromTypedArray, - CesiumMath, - Rectangle, - Request, - RequestType, - RuntimeError, - TileProviderError, - protobuf, - when) { + '../Core/Credit', + '../Core/decodeGoogleEarthEnterpriseData', + '../Core/defaultValue', + '../Core/defined', + '../Core/defineProperties', + '../Core/DeveloperError', + '../Core/Event', + '../Core/GeographicTilingScheme', + '../Core/GoogleEarthEnterpriseMetadata', + '../Core/loadArrayBuffer', + '../Core/loadImageFromTypedArray', + '../Core/Math', + '../Core/Rectangle', + '../Core/Request', + '../Core/RequestType', + '../Core/RuntimeError', + '../Core/TileProviderError', + '../ThirdParty/protobuf-minimal', + '../ThirdParty/when' + ], function( + Credit, + decodeGoogleEarthEnterpriseData, + defaultValue, + defined, + defineProperties, + DeveloperError, + Event, + GeographicTilingScheme, + GoogleEarthEnterpriseMetadata, + loadArrayBuffer, + loadImageFromTypedArray, + CesiumMath, + Rectangle, + Request, + RequestType, + RuntimeError, + TileProviderError, + protobuf, + when) { 'use strict'; function GoogleEarthEnterpriseDiscardPolicy() { diff --git a/Source/Scene/GoogleEarthEnterpriseMapsProvider.js b/Source/Scene/GoogleEarthEnterpriseMapsProvider.js index 4251d3d2d40a..346337168ca8 100644 --- a/Source/Scene/GoogleEarthEnterpriseMapsProvider.js +++ b/Source/Scene/GoogleEarthEnterpriseMapsProvider.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Credit', '../Core/defaultValue', diff --git a/Source/Scene/GoogleEarthImageryProvider.js b/Source/Scene/GoogleEarthImageryProvider.js index cca47c60bf32..31448f3bba88 100644 --- a/Source/Scene/GoogleEarthImageryProvider.js +++ b/Source/Scene/GoogleEarthImageryProvider.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/deprecationWarning', './GoogleEarthEnterpriseMapsProvider' diff --git a/Source/Scene/GridImageryProvider.js b/Source/Scene/GridImageryProvider.js index 7bfa4f16485e..df4e2951aa65 100644 --- a/Source/Scene/GridImageryProvider.js +++ b/Source/Scene/GridImageryProvider.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Color', '../Core/defaultValue', diff --git a/Source/Scene/GroundPrimitive.js b/Source/Scene/GroundPrimitive.js index f9beea6215bb..6deff85dbfad 100644 --- a/Source/Scene/GroundPrimitive.js +++ b/Source/Scene/GroundPrimitive.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/buildModuleUrl', diff --git a/Source/Scene/HeightReference.js b/Source/Scene/HeightReference.js index 88d61a205868..f2ff681cdaff 100644 --- a/Source/Scene/HeightReference.js +++ b/Source/Scene/HeightReference.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/HorizontalOrigin.js b/Source/Scene/HorizontalOrigin.js index 87f5d981370e..3f0506394555 100644 --- a/Source/Scene/HorizontalOrigin.js +++ b/Source/Scene/HorizontalOrigin.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/Imagery.js b/Source/Scene/Imagery.js index 07414e2ac3e7..936a544874f5 100644 --- a/Source/Scene/Imagery.js +++ b/Source/Scene/Imagery.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/destroyObject', diff --git a/Source/Scene/ImageryLayer.js b/Source/Scene/ImageryLayer.js index 39d7014322fd..c03383ec04c1 100644 --- a/Source/Scene/ImageryLayer.js +++ b/Source/Scene/ImageryLayer.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian2', '../Core/Cartesian4', diff --git a/Source/Scene/ImageryLayerCollection.js b/Source/Scene/ImageryLayerCollection.js index dbab6e103d4e..125914878430 100644 --- a/Source/Scene/ImageryLayerCollection.js +++ b/Source/Scene/ImageryLayerCollection.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/Scene/ImageryLayerFeatureInfo.js b/Source/Scene/ImageryLayerFeatureInfo.js index ae4ce8998537..10afa5b9c82c 100644 --- a/Source/Scene/ImageryLayerFeatureInfo.js +++ b/Source/Scene/ImageryLayerFeatureInfo.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined' ], function( diff --git a/Source/Scene/ImageryProvider.js b/Source/Scene/ImageryProvider.js index 36c5a2eb573e..edf244a2aa3b 100644 --- a/Source/Scene/ImageryProvider.js +++ b/Source/Scene/ImageryProvider.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/defineProperties', diff --git a/Source/Scene/ImagerySplitDirection.js b/Source/Scene/ImagerySplitDirection.js index 61e1871ba450..c88c4c4924a1 100644 --- a/Source/Scene/ImagerySplitDirection.js +++ b/Source/Scene/ImagerySplitDirection.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/ImageryState.js b/Source/Scene/ImageryState.js index 333db3b2341d..c7d244090d18 100644 --- a/Source/Scene/ImageryState.js +++ b/Source/Scene/ImageryState.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/Instanced3DModel3DTileContent.js b/Source/Scene/Instanced3DModel3DTileContent.js index a4c347774a88..df1de7ca0593 100644 --- a/Source/Scene/Instanced3DModel3DTileContent.js +++ b/Source/Scene/Instanced3DModel3DTileContent.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/AttributeCompression', '../Core/Cartesian3', @@ -9,8 +8,8 @@ define([ '../Core/defineProperties', '../Core/destroyObject', '../Core/DeveloperError', - '../Core/FeatureDetection', '../Core/Ellipsoid', + '../Core/FeatureDetection', '../Core/getAbsoluteUri', '../Core/getBaseUri', '../Core/getStringFromTypedArray', @@ -36,8 +35,8 @@ define([ defineProperties, destroyObject, DeveloperError, - FeatureDetection, Ellipsoid, + FeatureDetection, getAbsoluteUri, getBaseUri, getStringFromTypedArray, diff --git a/Source/Scene/JobScheduler.js b/Source/Scene/JobScheduler.js index 3172a8ebdb64..f25b063ea03e 100644 --- a/Source/Scene/JobScheduler.js +++ b/Source/Scene/JobScheduler.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/defineProperties', diff --git a/Source/Scene/JobType.js b/Source/Scene/JobType.js index b5fd6d1d1ede..ffaf87a2d132 100644 --- a/Source/Scene/JobType.js +++ b/Source/Scene/JobType.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/Label.js b/Source/Scene/Label.js index 1d3b4803684a..54865f47fde8 100644 --- a/Source/Scene/Label.js +++ b/Source/Scene/Label.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingRectangle', '../Core/Cartesian2', diff --git a/Source/Scene/LabelCollection.js b/Source/Scene/LabelCollection.js index 7875c7115436..c93803a6c255 100644 --- a/Source/Scene/LabelCollection.js +++ b/Source/Scene/LabelCollection.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingRectangle', '../Core/Cartesian2', diff --git a/Source/Scene/LabelStyle.js b/Source/Scene/LabelStyle.js index fabbd0a6b90e..528873aca5f5 100644 --- a/Source/Scene/LabelStyle.js +++ b/Source/Scene/LabelStyle.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/MapMode2D.js b/Source/Scene/MapMode2D.js index 235f2aa274a6..7e8b193cdd03 100644 --- a/Source/Scene/MapMode2D.js +++ b/Source/Scene/MapMode2D.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/MapboxImageryProvider.js b/Source/Scene/MapboxImageryProvider.js index ac2949df0c54..dae41db9161d 100644 --- a/Source/Scene/MapboxImageryProvider.js +++ b/Source/Scene/MapboxImageryProvider.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Credit', '../Core/defaultValue', diff --git a/Source/Scene/Material.js b/Source/Scene/Material.js index b16f4e32275d..5f5f53e2b430 100644 --- a/Source/Scene/Material.js +++ b/Source/Scene/Material.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian2', '../Core/clone', diff --git a/Source/Scene/MaterialAppearance.js b/Source/Scene/MaterialAppearance.js index b6b1dc533927..d73f4d56c7bf 100644 --- a/Source/Scene/MaterialAppearance.js +++ b/Source/Scene/MaterialAppearance.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/Scene/Model.js b/Source/Scene/Model.js index 7e4f74c34b9b..0759964059f3 100644 --- a/Source/Scene/Model.js +++ b/Source/Scene/Model.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/Cartesian2', diff --git a/Source/Scene/ModelAnimation.js b/Source/Scene/ModelAnimation.js index 1a671ccf28c2..f47ea3af611c 100644 --- a/Source/Scene/ModelAnimation.js +++ b/Source/Scene/ModelAnimation.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defineProperties', diff --git a/Source/Scene/ModelAnimationCache.js b/Source/Scene/ModelAnimationCache.js index ad78f54b5f18..8a4f9a581533 100644 --- a/Source/Scene/ModelAnimationCache.js +++ b/Source/Scene/ModelAnimationCache.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/defined', diff --git a/Source/Scene/ModelAnimationCollection.js b/Source/Scene/ModelAnimationCollection.js index 0c5c3a1c94e1..b2603afb5821 100644 --- a/Source/Scene/ModelAnimationCollection.js +++ b/Source/Scene/ModelAnimationCollection.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/clone', '../Core/defaultValue', diff --git a/Source/Scene/ModelAnimationLoop.js b/Source/Scene/ModelAnimationLoop.js index ad38e0772d0d..10b22812eb90 100644 --- a/Source/Scene/ModelAnimationLoop.js +++ b/Source/Scene/ModelAnimationLoop.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/ModelAnimationState.js b/Source/Scene/ModelAnimationState.js index 8f665b9ee0e2..6e0f5ab535a6 100644 --- a/Source/Scene/ModelAnimationState.js +++ b/Source/Scene/ModelAnimationState.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/ModelInstance.js b/Source/Scene/ModelInstance.js index 399893de4528..db80c3c0c378 100644 --- a/Source/Scene/ModelInstance.js +++ b/Source/Scene/ModelInstance.js @@ -1,8 +1,7 @@ -/*global define*/ define([ '../Core/defineProperties', '../Core/Matrix4' -], function( + ], function( defineProperties, Matrix4) { 'use strict'; diff --git a/Source/Scene/ModelInstanceCollection.js b/Source/Scene/ModelInstanceCollection.js index e76f677a8261..86f7586b6b50 100644 --- a/Source/Scene/ModelInstanceCollection.js +++ b/Source/Scene/ModelInstanceCollection.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/Cartesian3', diff --git a/Source/Scene/ModelMaterial.js b/Source/Scene/ModelMaterial.js index 7ccb3ed50f60..5ad3856197aa 100644 --- a/Source/Scene/ModelMaterial.js +++ b/Source/Scene/ModelMaterial.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/defineProperties', diff --git a/Source/Scene/ModelMesh.js b/Source/Scene/ModelMesh.js index e0fad8045e19..6b1363d3b83f 100644 --- a/Source/Scene/ModelMesh.js +++ b/Source/Scene/ModelMesh.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defineProperties' ], function( diff --git a/Source/Scene/ModelNode.js b/Source/Scene/ModelNode.js index 0f2503564c80..619093d16196 100644 --- a/Source/Scene/ModelNode.js +++ b/Source/Scene/ModelNode.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defineProperties', '../Core/Matrix4' diff --git a/Source/Scene/Moon.js b/Source/Scene/Moon.js index 1f898e669124..ec9235296fa1 100644 --- a/Source/Scene/Moon.js +++ b/Source/Scene/Moon.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/buildModuleUrl', '../Core/Cartesian3', diff --git a/Source/Scene/NeverTileDiscardPolicy.js b/Source/Scene/NeverTileDiscardPolicy.js index 41f02ef8c79d..ac64a383a5e3 100644 --- a/Source/Scene/NeverTileDiscardPolicy.js +++ b/Source/Scene/NeverTileDiscardPolicy.js @@ -1,4 +1,3 @@ -/*global define*/ define([], function() { 'use strict'; diff --git a/Source/Scene/OIT.js b/Source/Scene/OIT.js index 8f0131f6cae2..ba47d94211eb 100644 --- a/Source/Scene/OIT.js +++ b/Source/Scene/OIT.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingRectangle', '../Core/Color', diff --git a/Source/Scene/OrthographicFrustum.js b/Source/Scene/OrthographicFrustum.js index a95f3470de5a..7d36ab91817f 100644 --- a/Source/Scene/OrthographicFrustum.js +++ b/Source/Scene/OrthographicFrustum.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/defineProperties', diff --git a/Source/Scene/OrthographicOffCenterFrustum.js b/Source/Scene/OrthographicOffCenterFrustum.js index 1d84ac5b253f..19f34a558f75 100644 --- a/Source/Scene/OrthographicOffCenterFrustum.js +++ b/Source/Scene/OrthographicOffCenterFrustum.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/Cartesian4', diff --git a/Source/Scene/Particle.js b/Source/Scene/Particle.js index 1aae2cb4de54..e2ef1ee0493d 100644 --- a/Source/Scene/Particle.js +++ b/Source/Scene/Particle.js @@ -1,18 +1,17 @@ -/*global define*/ define([ - '../Core/defaultValue', - '../Core/defined', - '../Core/defineProperties', '../Core/Cartesian2', '../Core/Cartesian3', - '../Core/Color' - ],function( - defaultValue, - defined, - defineProperties, + '../Core/Color', + '../Core/defaultValue', + '../Core/defined', + '../Core/defineProperties' + ], function( Cartesian2, Cartesian3, - Color) { + Color, + defaultValue, + defined, + defineProperties) { 'use strict'; var defaultSize = new Cartesian2(1.0, 1.0); diff --git a/Source/Scene/ParticleBurst.js b/Source/Scene/ParticleBurst.js index eec3ee7d1647..0062f1443e08 100644 --- a/Source/Scene/ParticleBurst.js +++ b/Source/Scene/ParticleBurst.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defineProperties' diff --git a/Source/Scene/ParticleEmitter.js b/Source/Scene/ParticleEmitter.js index c58c6ff82dd5..9b1f1c04186e 100644 --- a/Source/Scene/ParticleEmitter.js +++ b/Source/Scene/ParticleEmitter.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defineProperties', '../Core/DeveloperError' diff --git a/Source/Scene/ParticleSystem.js b/Source/Scene/ParticleSystem.js index 3571a28b135b..b2d9ca5f21e4 100644 --- a/Source/Scene/ParticleSystem.js +++ b/Source/Scene/ParticleSystem.js @@ -1,36 +1,35 @@ -/*global define*/ define([ + '../Core/Cartesian2', + '../Core/Cartesian3', '../Core/Check', + '../Core/Color', '../Core/defaultValue', '../Core/defined', '../Core/defineProperties', '../Core/destroyObject', - '../Core/Cartesian2', - '../Core/Cartesian3', '../Core/Event', - '../Core/Matrix4', - '../Core/Math', '../Core/JulianDate', - '../Core/Color', + '../Core/Math', + '../Core/Matrix4', './BillboardCollection', - './Particle', - './CircleEmitter' + './CircleEmitter', + './Particle' ], function( + Cartesian2, + Cartesian3, Check, + Color, defaultValue, defined, defineProperties, destroyObject, - Cartesian2, - Cartesian3, Event, - Matrix4, - CesiumMath, JulianDate, - Color, + CesiumMath, + Matrix4, BillboardCollection, - Particle, - CircleEmitter) { + CircleEmitter, + Particle) { 'use strict'; /** diff --git a/Source/Scene/PerInstanceColorAppearance.js b/Source/Scene/PerInstanceColorAppearance.js index 52295b8321a2..adc631dd7896 100644 --- a/Source/Scene/PerInstanceColorAppearance.js +++ b/Source/Scene/PerInstanceColorAppearance.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defineProperties', diff --git a/Source/Scene/PerformanceDisplay.js b/Source/Scene/PerformanceDisplay.js index fda49e5e8fed..dbcd34648ff2 100644 --- a/Source/Scene/PerformanceDisplay.js +++ b/Source/Scene/PerformanceDisplay.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/Scene/PerspectiveFrustum.js b/Source/Scene/PerspectiveFrustum.js index 3dde9dc3137c..7a89e15af51a 100644 --- a/Source/Scene/PerspectiveFrustum.js +++ b/Source/Scene/PerspectiveFrustum.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/defineProperties', diff --git a/Source/Scene/PerspectiveOffCenterFrustum.js b/Source/Scene/PerspectiveOffCenterFrustum.js index fe23401db8cc..d43ff749ee36 100644 --- a/Source/Scene/PerspectiveOffCenterFrustum.js +++ b/Source/Scene/PerspectiveOffCenterFrustum.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/Cartesian4', diff --git a/Source/Scene/PickDepth.js b/Source/Scene/PickDepth.js index 5e1f85e3e510..16486ec01cad 100644 --- a/Source/Scene/PickDepth.js +++ b/Source/Scene/PickDepth.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/destroyObject', diff --git a/Source/Scene/PointCloud3DTileContent.js b/Source/Scene/PointCloud3DTileContent.js index 4e9675c9e966..7e447c28412f 100644 --- a/Source/Scene/PointCloud3DTileContent.js +++ b/Source/Scene/PointCloud3DTileContent.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian2', '../Core/Cartesian3', diff --git a/Source/Scene/PointPrimitive.js b/Source/Scene/PointPrimitive.js index a6be423d2071..088f03b61dfa 100644 --- a/Source/Scene/PointPrimitive.js +++ b/Source/Scene/PointPrimitive.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingRectangle', '../Core/Cartesian2', diff --git a/Source/Scene/PointPrimitiveCollection.js b/Source/Scene/PointPrimitiveCollection.js index ac2b74d66b2e..aa42b0394272 100644 --- a/Source/Scene/PointPrimitiveCollection.js +++ b/Source/Scene/PointPrimitiveCollection.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/Color', diff --git a/Source/Scene/Polyline.js b/Source/Scene/Polyline.js index c0dfcb439aad..144d701bf910 100644 --- a/Source/Scene/Polyline.js +++ b/Source/Scene/Polyline.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/arrayRemoveDuplicates', '../Core/BoundingSphere', diff --git a/Source/Scene/PolylineCollection.js b/Source/Scene/PolylineCollection.js index ddbc799db2b7..ae447fee85d8 100644 --- a/Source/Scene/PolylineCollection.js +++ b/Source/Scene/PolylineCollection.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/Cartesian2', diff --git a/Source/Scene/PolylineColorAppearance.js b/Source/Scene/PolylineColorAppearance.js index 646114f564a1..ceafe597913f 100644 --- a/Source/Scene/PolylineColorAppearance.js +++ b/Source/Scene/PolylineColorAppearance.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defineProperties', diff --git a/Source/Scene/PolylineMaterialAppearance.js b/Source/Scene/PolylineMaterialAppearance.js index 050e2bc5c5ff..491093032f3e 100644 --- a/Source/Scene/PolylineMaterialAppearance.js +++ b/Source/Scene/PolylineMaterialAppearance.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/Scene/Primitive.js b/Source/Scene/Primitive.js index 34b10c3a0b9f..a872bef41470 100644 --- a/Source/Scene/Primitive.js +++ b/Source/Scene/Primitive.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/Cartesian2', diff --git a/Source/Scene/PrimitiveCollection.js b/Source/Scene/PrimitiveCollection.js index e5fc610be801..e2f38bcc6854 100644 --- a/Source/Scene/PrimitiveCollection.js +++ b/Source/Scene/PrimitiveCollection.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/createGuid', '../Core/defaultValue', diff --git a/Source/Scene/PrimitivePipeline.js b/Source/Scene/PrimitivePipeline.js index dfffa094a7f5..53fe041e8e81 100644 --- a/Source/Scene/PrimitivePipeline.js +++ b/Source/Scene/PrimitivePipeline.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/ComponentDatatype', diff --git a/Source/Scene/PrimitiveState.js b/Source/Scene/PrimitiveState.js index e57f8b879c75..196bc604a662 100644 --- a/Source/Scene/PrimitiveState.js +++ b/Source/Scene/PrimitiveState.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/QuadtreeOccluders.js b/Source/Scene/QuadtreeOccluders.js index b2ace041f5b9..88ec1299ae01 100644 --- a/Source/Scene/QuadtreeOccluders.js +++ b/Source/Scene/QuadtreeOccluders.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/defineProperties', diff --git a/Source/Scene/QuadtreePrimitive.js b/Source/Scene/QuadtreePrimitive.js index fc32b8aa6fe2..b796aca00906 100644 --- a/Source/Scene/QuadtreePrimitive.js +++ b/Source/Scene/QuadtreePrimitive.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/Cartographic', diff --git a/Source/Scene/QuadtreeTile.js b/Source/Scene/QuadtreeTile.js index 65c45f7274a1..243e35226d79 100644 --- a/Source/Scene/QuadtreeTile.js +++ b/Source/Scene/QuadtreeTile.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/defineProperties', diff --git a/Source/Scene/QuadtreeTileLoadState.js b/Source/Scene/QuadtreeTileLoadState.js index 5e2674ff4dd3..d061867963bd 100644 --- a/Source/Scene/QuadtreeTileLoadState.js +++ b/Source/Scene/QuadtreeTileLoadState.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/QuadtreeTileProvider.js b/Source/Scene/QuadtreeTileProvider.js index 55fc8b4434c3..5680c601217a 100644 --- a/Source/Scene/QuadtreeTileProvider.js +++ b/Source/Scene/QuadtreeTileProvider.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defineProperties', '../Core/DeveloperError' diff --git a/Source/Scene/Scene.js b/Source/Scene/Scene.js index 43cbd75051ed..9c52f0f7c97d 100644 --- a/Source/Scene/Scene.js +++ b/Source/Scene/Scene.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingRectangle', '../Core/BoundingSphere', diff --git a/Source/Scene/SceneMode.js b/Source/Scene/SceneMode.js index a18f54816f1b..7d374e7a4666 100644 --- a/Source/Scene/SceneMode.js +++ b/Source/Scene/SceneMode.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/SceneTransforms.js b/Source/Scene/SceneTransforms.js index 9156130c26f8..0875789b19ec 100644 --- a/Source/Scene/SceneTransforms.js +++ b/Source/Scene/SceneTransforms.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingRectangle', '../Core/Cartesian2', diff --git a/Source/Scene/SceneTransitioner.js b/Source/Scene/SceneTransitioner.js index c04d553e089d..6e9628cae134 100644 --- a/Source/Scene/SceneTransitioner.js +++ b/Source/Scene/SceneTransitioner.js @@ -1,8 +1,7 @@ -/*global define*/ define([ - '../Core/Check', '../Core/Cartesian3', '../Core/Cartographic', + '../Core/Check', '../Core/defined', '../Core/destroyObject', '../Core/DeveloperError', @@ -19,9 +18,9 @@ define([ './PerspectiveFrustum', './SceneMode' ], function( - Check, Cartesian3, Cartographic, + Check, defined, destroyObject, DeveloperError, diff --git a/Source/Scene/ScreenSpaceCameraController.js b/Source/Scene/ScreenSpaceCameraController.js index 9ae72235cc2d..f6a1f7990291 100644 --- a/Source/Scene/ScreenSpaceCameraController.js +++ b/Source/Scene/ScreenSpaceCameraController.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian2', '../Core/Cartesian3', diff --git a/Source/Scene/ShadowMap.js b/Source/Scene/ShadowMap.js index c4a118563545..f77fdeb64cd7 100644 --- a/Source/Scene/ShadowMap.js +++ b/Source/Scene/ShadowMap.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingRectangle', '../Core/BoundingSphere', diff --git a/Source/Scene/ShadowMapShader.js b/Source/Scene/ShadowMapShader.js index 41b2e00966b7..a656d6646428 100644 --- a/Source/Scene/ShadowMapShader.js +++ b/Source/Scene/ShadowMapShader.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Renderer/ShaderSource' diff --git a/Source/Scene/ShadowMode.js b/Source/Scene/ShadowMode.js index d2a837485af9..5b146e1f7514 100644 --- a/Source/Scene/ShadowMode.js +++ b/Source/Scene/ShadowMode.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/SingleTileImageryProvider.js b/Source/Scene/SingleTileImageryProvider.js index 9e869c6b5b62..52f4e7048caf 100644 --- a/Source/Scene/SingleTileImageryProvider.js +++ b/Source/Scene/SingleTileImageryProvider.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Credit', '../Core/defaultValue', diff --git a/Source/Scene/SkyAtmosphere.js b/Source/Scene/SkyAtmosphere.js index 89aa3410dab7..e37242aaddb1 100644 --- a/Source/Scene/SkyAtmosphere.js +++ b/Source/Scene/SkyAtmosphere.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/Cartesian4', diff --git a/Source/Scene/SkyBox.js b/Source/Scene/SkyBox.js index 37552d15d71a..d64c5952c1f0 100644 --- a/Source/Scene/SkyBox.js +++ b/Source/Scene/SkyBox.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoxGeometry', '../Core/Cartesian3', diff --git a/Source/Scene/SphereEmitter.js b/Source/Scene/SphereEmitter.js index 23c0bb86eeaa..6642b61235f2 100644 --- a/Source/Scene/SphereEmitter.js +++ b/Source/Scene/SphereEmitter.js @@ -1,15 +1,14 @@ -/*global define*/ define([ - '../Core/defaultValue', - '../Core/defineProperties', '../Core/Cartesian3', '../Core/Check', + '../Core/defaultValue', + '../Core/defineProperties', '../Core/Math' ], function( - defaultValue, - defineProperties, Cartesian3, Check, + defaultValue, + defineProperties, CesiumMath) { 'use strict'; diff --git a/Source/Scene/StencilFunction.js b/Source/Scene/StencilFunction.js index 0d8e8014e4df..0c46dca25894 100644 --- a/Source/Scene/StencilFunction.js +++ b/Source/Scene/StencilFunction.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject', '../Core/WebGLConstants' diff --git a/Source/Scene/StencilOperation.js b/Source/Scene/StencilOperation.js index 97b82b4f2b3d..84403815ec42 100644 --- a/Source/Scene/StencilOperation.js +++ b/Source/Scene/StencilOperation.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject', '../Core/WebGLConstants' diff --git a/Source/Scene/StyleExpression.js b/Source/Scene/StyleExpression.js index 81fd8315fe7b..3bb72e05ecb2 100644 --- a/Source/Scene/StyleExpression.js +++ b/Source/Scene/StyleExpression.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/DeveloperError' ], function( diff --git a/Source/Scene/Sun.js b/Source/Scene/Sun.js index 30bc89760f35..cd948ab45d84 100644 --- a/Source/Scene/Sun.js +++ b/Source/Scene/Sun.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/Cartesian2', diff --git a/Source/Scene/SunPostProcess.js b/Source/Scene/SunPostProcess.js index 7dfb7e275dfd..739d9a1cc2b9 100644 --- a/Source/Scene/SunPostProcess.js +++ b/Source/Scene/SunPostProcess.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingRectangle', '../Core/Cartesian2', diff --git a/Source/Scene/TerrainState.js b/Source/Scene/TerrainState.js index e49cdb8a3aa7..d5ca30d8b8e9 100644 --- a/Source/Scene/TerrainState.js +++ b/Source/Scene/TerrainState.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/TextureAtlas.js b/Source/Scene/TextureAtlas.js index e774a3317520..ac0ba6ffe30d 100644 --- a/Source/Scene/TextureAtlas.js +++ b/Source/Scene/TextureAtlas.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingRectangle', '../Core/Cartesian2', diff --git a/Source/Scene/TileBoundingRegion.js b/Source/Scene/TileBoundingRegion.js index 2eb8c6b480ed..48ac2003f723 100644 --- a/Source/Scene/TileBoundingRegion.js +++ b/Source/Scene/TileBoundingRegion.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/Cartesian3', diff --git a/Source/Scene/TileBoundingSphere.js b/Source/Scene/TileBoundingSphere.js index 2f99c5e4d2e7..ffc98d1245ad 100644 --- a/Source/Scene/TileBoundingSphere.js +++ b/Source/Scene/TileBoundingSphere.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/Cartesian3', diff --git a/Source/Scene/TileBoundingVolume.js b/Source/Scene/TileBoundingVolume.js index 6227dc5b55e8..580a876cdb65 100644 --- a/Source/Scene/TileBoundingVolume.js +++ b/Source/Scene/TileBoundingVolume.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/DeveloperError' ], function( diff --git a/Source/Scene/TileCoordinatesImageryProvider.js b/Source/Scene/TileCoordinatesImageryProvider.js index 0ecf383b481f..7c47c00ccc67 100644 --- a/Source/Scene/TileCoordinatesImageryProvider.js +++ b/Source/Scene/TileCoordinatesImageryProvider.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Color', '../Core/defaultValue', diff --git a/Source/Scene/TileDiscardPolicy.js b/Source/Scene/TileDiscardPolicy.js index b13ac3d80c57..9a1e8c5bcfdf 100644 --- a/Source/Scene/TileDiscardPolicy.js +++ b/Source/Scene/TileDiscardPolicy.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/DeveloperError' ], function( diff --git a/Source/Scene/TileImagery.js b/Source/Scene/TileImagery.js index 256dadb9f7c8..592ca81550f0 100644 --- a/Source/Scene/TileImagery.js +++ b/Source/Scene/TileImagery.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', './ImageryState' diff --git a/Source/Scene/TileOrientedBoundingBox.js b/Source/Scene/TileOrientedBoundingBox.js index a074396ab48a..bf09771654a6 100644 --- a/Source/Scene/TileOrientedBoundingBox.js +++ b/Source/Scene/TileOrientedBoundingBox.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/BoxOutlineGeometry', diff --git a/Source/Scene/TileReplacementQueue.js b/Source/Scene/TileReplacementQueue.js index 435ec351b415..62a896b784ff 100644 --- a/Source/Scene/TileReplacementQueue.js +++ b/Source/Scene/TileReplacementQueue.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined' ], function( diff --git a/Source/Scene/TileState.js b/Source/Scene/TileState.js index f6d55a9b6b56..6c8a8f28e516 100644 --- a/Source/Scene/TileState.js +++ b/Source/Scene/TileState.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/TileTerrain.js b/Source/Scene/TileTerrain.js index 98c315518c93..450590d70c76 100644 --- a/Source/Scene/TileTerrain.js +++ b/Source/Scene/TileTerrain.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingSphere', '../Core/Cartesian3', diff --git a/Source/Scene/Tileset3DTileContent.js b/Source/Scene/Tileset3DTileContent.js index e258f23c577a..eefe59433ea0 100644 --- a/Source/Scene/Tileset3DTileContent.js +++ b/Source/Scene/Tileset3DTileContent.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defineProperties', diff --git a/Source/Scene/TweenCollection.js b/Source/Scene/TweenCollection.js index e9359fa64f88..a146daf37a24 100644 --- a/Source/Scene/TweenCollection.js +++ b/Source/Scene/TweenCollection.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/clone', '../Core/defaultValue', diff --git a/Source/Scene/UrlTemplateImageryProvider.js b/Source/Scene/UrlTemplateImageryProvider.js index c30ede35ec07..7187182f0700 100644 --- a/Source/Scene/UrlTemplateImageryProvider.js +++ b/Source/Scene/UrlTemplateImageryProvider.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian2', '../Core/Cartesian3', diff --git a/Source/Scene/VerticalOrigin.js b/Source/Scene/VerticalOrigin.js index 1e109364d60f..e3da79940a9a 100644 --- a/Source/Scene/VerticalOrigin.js +++ b/Source/Scene/VerticalOrigin.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/freezeObject' ], function( diff --git a/Source/Scene/ViewportQuad.js b/Source/Scene/ViewportQuad.js index b8dbeb2269f9..6762b940ac9c 100644 --- a/Source/Scene/ViewportQuad.js +++ b/Source/Scene/ViewportQuad.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoundingRectangle', '../Core/Color', diff --git a/Source/Scene/WebMapServiceImageryProvider.js b/Source/Scene/WebMapServiceImageryProvider.js index 93e98bc4a010..3b88e91490d9 100644 --- a/Source/Scene/WebMapServiceImageryProvider.js +++ b/Source/Scene/WebMapServiceImageryProvider.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/combine', '../Core/defaultValue', diff --git a/Source/Scene/WebMapTileServiceImageryProvider.js b/Source/Scene/WebMapTileServiceImageryProvider.js index 21986a61866f..50cf0bfb964a 100644 --- a/Source/Scene/WebMapTileServiceImageryProvider.js +++ b/Source/Scene/WebMapTileServiceImageryProvider.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/combine', '../Core/Credit', diff --git a/Source/Scene/createOpenStreetMapImageryProvider.js b/Source/Scene/createOpenStreetMapImageryProvider.js index 841cb1542a5c..c0ba063e5237 100644 --- a/Source/Scene/createOpenStreetMapImageryProvider.js +++ b/Source/Scene/createOpenStreetMapImageryProvider.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Credit', '../Core/defaultValue', diff --git a/Source/Scene/createTangentSpaceDebugPrimitive.js b/Source/Scene/createTangentSpaceDebugPrimitive.js index 36954a59818c..54c9295aedaa 100644 --- a/Source/Scene/createTangentSpaceDebugPrimitive.js +++ b/Source/Scene/createTangentSpaceDebugPrimitive.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/ColorGeometryInstanceAttribute', '../Core/defaultValue', diff --git a/Source/Scene/createTileMapServiceImageryProvider.js b/Source/Scene/createTileMapServiceImageryProvider.js index 53ef9cd1866b..15b971f504a8 100644 --- a/Source/Scene/createTileMapServiceImageryProvider.js +++ b/Source/Scene/createTileMapServiceImageryProvider.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian2', '../Core/Cartographic', diff --git a/Source/Scene/getAttributeOrUniformBySemantic.js b/Source/Scene/getAttributeOrUniformBySemantic.js index 41520014e123..6afe2bb935e9 100644 --- a/Source/Scene/getAttributeOrUniformBySemantic.js +++ b/Source/Scene/getAttributeOrUniformBySemantic.js @@ -1,4 +1,3 @@ -/*global define*/ define([], function() { 'use strict'; diff --git a/Source/Scene/getBinaryAccessor.js b/Source/Scene/getBinaryAccessor.js index e4aa0036f26a..7aca4807e112 100644 --- a/Source/Scene/getBinaryAccessor.js +++ b/Source/Scene/getBinaryAccessor.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian2', '../Core/Cartesian3', diff --git a/Source/Scene/modelMaterialsCommon.js b/Source/Scene/modelMaterialsCommon.js index 08b2387e4643..08a004db888c 100644 --- a/Source/Scene/modelMaterialsCommon.js +++ b/Source/Scene/modelMaterialsCommon.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/ThirdParty/NoSleep.js b/Source/ThirdParty/NoSleep.js index 5568d9746bf4..0e36d272b562 100644 --- a/Source/ThirdParty/NoSleep.js +++ b/Source/ThirdParty/NoSleep.js @@ -4,7 +4,6 @@ * Rich Tibbett * MIT license **/ -/*global define*/ define(function() { "use strict"; diff --git a/Source/ThirdParty/Tween.js b/Source/ThirdParty/Tween.js index 284800520a85..98dac2eca3c6 100644 --- a/Source/ThirdParty/Tween.js +++ b/Source/ThirdParty/Tween.js @@ -39,7 +39,6 @@ THE SOFTWARE. * @author Ben Delarre / http://delarre.net */ -/*global define*/ define(function() { // Date.now shim for (ahem) Internet Explo(d|r)er diff --git a/Source/ThirdParty/Uri.js b/Source/ThirdParty/Uri.js index 33d50e443847..f281308f531f 100644 --- a/Source/ThirdParty/Uri.js +++ b/Source/ThirdParty/Uri.js @@ -22,7 +22,6 @@ * limitations under the License. * */ -/*global define*/ define(function() { /** diff --git a/Source/ThirdParty/crunch.js b/Source/ThirdParty/crunch.js index 9bc5362a1ce9..a4b48739dc7d 100644 --- a/Source/ThirdParty/crunch.js +++ b/Source/ThirdParty/crunch.js @@ -37,7 +37,6 @@ // For instructions, see: // https://github.com/AnalyticalGraphicsInc/crunch -/*global define*/ define([], function() { var Module;if(!Module)Module=(typeof Module!=="undefined"?Module:null)||{};var moduleOverrides={};for(var key in Module){if(Module.hasOwnProperty(key)){moduleOverrides[key]=Module[key]}}var ENVIRONMENT_IS_WEB=typeof window==="object";var ENVIRONMENT_IS_WORKER=typeof importScripts==="function";var ENVIRONMENT_IS_NODE=typeof process==="object"&&typeof require==="function"&&!ENVIRONMENT_IS_WEB&&!ENVIRONMENT_IS_WORKER;var ENVIRONMENT_IS_SHELL=!ENVIRONMENT_IS_WEB&&!ENVIRONMENT_IS_NODE&&!ENVIRONMENT_IS_WORKER;if(ENVIRONMENT_IS_NODE){if(!Module["print"])Module["print"]=function print(x){process["stdout"].write(x+"\n")};if(!Module["printErr"])Module["printErr"]=function printErr(x){process["stderr"].write(x+"\n")};var nodeFS=require("fs");var nodePath=require("path");Module["read"]=function read(filename,binary){filename=nodePath["normalize"](filename);var ret=nodeFS["readFileSync"](filename);if(!ret&&filename!=nodePath["resolve"](filename)){filename=path.join(__dirname,"..","src",filename);ret=nodeFS["readFileSync"](filename)}if(ret&&!binary)ret=ret.toString();return ret};Module["readBinary"]=function readBinary(filename){var ret=Module["read"](filename,true);if(!ret.buffer){ret=new Uint8Array(ret)}assert(ret.buffer);return ret};Module["load"]=function load(f){globalEval(read(f))};if(!Module["thisProgram"]){if(process["argv"].length>1){Module["thisProgram"]=process["argv"][1].replace(/\\/g,"/")}else{Module["thisProgram"]="unknown-program"}}Module["arguments"]=process["argv"].slice(2);if(typeof module!=="undefined"){module["exports"]=Module}process["on"]("uncaughtException",(function(ex){if(!(ex instanceof ExitStatus)){throw ex}}));Module["inspect"]=(function(){return"[Emscripten Module object]"})}else if(ENVIRONMENT_IS_SHELL){if(!Module["print"])Module["print"]=print;if(typeof printErr!="undefined")Module["printErr"]=printErr;if(typeof read!="undefined"){Module["read"]=read}else{Module["read"]=function read(){throw"no read() available (jsc?)"}}Module["readBinary"]=function readBinary(f){if(typeof readbuffer==="function"){return new Uint8Array(readbuffer(f))}var data=read(f,"binary");assert(typeof data==="object");return data};if(typeof scriptArgs!="undefined"){Module["arguments"]=scriptArgs}else if(typeof arguments!="undefined"){Module["arguments"]=arguments}}else if(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER){Module["read"]=function read(url){var xhr=new XMLHttpRequest;xhr.open("GET",url,false);xhr.send(null);return xhr.responseText};if(typeof arguments!="undefined"){Module["arguments"]=arguments}if(typeof console!=="undefined"){if(!Module["print"])Module["print"]=function print(x){console.log(x)};if(!Module["printErr"])Module["printErr"]=function printErr(x){console.log(x)}}else{var TRY_USE_DUMP=false;if(!Module["print"])Module["print"]=TRY_USE_DUMP&&typeof dump!=="undefined"?(function(x){dump(x)}):(function(x){})}if(ENVIRONMENT_IS_WORKER){Module["load"]=importScripts}if(typeof Module["setWindowTitle"]==="undefined"){Module["setWindowTitle"]=(function(title){document.title=title})}}else{throw"Unknown runtime environment. Where are we?"}function globalEval(x){eval.call(null,x)}if(!Module["load"]&&Module["read"]){Module["load"]=function load(f){globalEval(Module["read"](f))}}if(!Module["print"]){Module["print"]=(function(){})}if(!Module["printErr"]){Module["printErr"]=Module["print"]}if(!Module["arguments"]){Module["arguments"]=[]}if(!Module["thisProgram"]){Module["thisProgram"]="./this.program"}Module.print=Module["print"];Module.printErr=Module["printErr"];Module["preRun"]=[];Module["postRun"]=[];for(var key in moduleOverrides){if(moduleOverrides.hasOwnProperty(key)){Module[key]=moduleOverrides[key]}}var Runtime={setTempRet0:(function(value){tempRet0=value}),getTempRet0:(function(){return tempRet0}),stackSave:(function(){return STACKTOP}),stackRestore:(function(stackTop){STACKTOP=stackTop}),getNativeTypeSize:(function(type){switch(type){case"i1":case"i8":return 1;case"i16":return 2;case"i32":return 4;case"i64":return 8;case"float":return 4;case"double":return 8;default:{if(type[type.length-1]==="*"){return Runtime.QUANTUM_SIZE}else if(type[0]==="i"){var bits=parseInt(type.substr(1));assert(bits%8===0);return bits/8}else{return 0}}}}),getNativeFieldSize:(function(type){return Math.max(Runtime.getNativeTypeSize(type),Runtime.QUANTUM_SIZE)}),STACK_ALIGN:16,prepVararg:(function(ptr,type){if(type==="double"||type==="i64"){if(ptr&7){assert((ptr&7)===4);ptr+=4}}else{assert((ptr&3)===0)}return ptr}),getAlignSize:(function(type,size,vararg){if(!vararg&&(type=="i64"||type=="double"))return 8;if(!type)return Math.min(size,8);return Math.min(size||(type?Runtime.getNativeFieldSize(type):0),Runtime.QUANTUM_SIZE)}),dynCall:(function(sig,ptr,args){if(args&&args.length){if(!args.splice)args=Array.prototype.slice.call(args);args.splice(0,0,ptr);return Module["dynCall_"+sig].apply(null,args)}else{return Module["dynCall_"+sig].call(null,ptr)}}),functionPointers:[],addFunction:(function(func){for(var i=0;i=TOTAL_MEMORY){var success=enlargeMemory();if(!success){DYNAMICTOP=ret;return 0}}return ret}),alignMemory:(function(size,quantum){var ret=size=Math.ceil(size/(quantum?quantum:16))*(quantum?quantum:16);return ret}),makeBigInt:(function(low,high,unsigned){var ret=unsigned?+(low>>>0)+ +(high>>>0)*+4294967296:+(low>>>0)+ +(high|0)*+4294967296;return ret}),GLOBAL_BASE:8,QUANTUM_SIZE:4,__dummy__:0};Module["Runtime"]=Runtime;var __THREW__=0;var ABORT=false;var EXITSTATUS=0;var undef=0;var tempValue,tempInt,tempBigInt,tempInt2,tempBigInt2,tempPair,tempBigIntI,tempBigIntR,tempBigIntS,tempBigIntP,tempBigIntD,tempDouble,tempFloat;var tempI64,tempI64b;var tempRet0,tempRet1,tempRet2,tempRet3,tempRet4,tempRet5,tempRet6,tempRet7,tempRet8,tempRet9;function assert(condition,text){if(!condition){abort("Assertion failed: "+text)}}var globalScope=this;function getCFunc(ident){var func=Module["_"+ident];if(!func){try{func=eval("_"+ident)}catch(e){}}assert(func,"Cannot call unknown function "+ident+" (perhaps LLVM optimizations or closure removed it?)");return func}var cwrap,ccall;((function(){var JSfuncs={"stackSave":(function(){Runtime.stackSave()}),"stackRestore":(function(){Runtime.stackRestore()}),"arrayToC":(function(arr){var ret=Runtime.stackAlloc(arr.length);writeArrayToMemory(arr,ret);return ret}),"stringToC":(function(str){var ret=0;if(str!==null&&str!==undefined&&str!==0){ret=Runtime.stackAlloc((str.length<<2)+1);writeStringToMemory(str,ret)}return ret})};var toC={"string":JSfuncs["stringToC"],"array":JSfuncs["arrayToC"]};ccall=function ccallFunc(ident,returnType,argTypes,args,opts){var func=getCFunc(ident);var cArgs=[];var stack=0;if(args){for(var i=0;i>0]=value;break;case"i8":HEAP8[ptr>>0]=value;break;case"i16":HEAP16[ptr>>1]=value;break;case"i32":HEAP32[ptr>>2]=value;break;case"i64":tempI64=[value>>>0,(tempDouble=value,+Math_abs(tempDouble)>=+1?tempDouble>+0?(Math_min(+Math_floor(tempDouble/+4294967296),+4294967295)|0)>>>0:~~+Math_ceil((tempDouble- +(~~tempDouble>>>0))/+4294967296)>>>0:0)],HEAP32[ptr>>2]=tempI64[0],HEAP32[ptr+4>>2]=tempI64[1];break;case"float":HEAPF32[ptr>>2]=value;break;case"double":HEAPF64[ptr>>3]=value;break;default:abort("invalid type for setValue: "+type)}}Module["setValue"]=setValue;function getValue(ptr,type,noSafe){type=type||"i8";if(type.charAt(type.length-1)==="*")type="i32";switch(type){case"i1":return HEAP8[ptr>>0];case"i8":return HEAP8[ptr>>0];case"i16":return HEAP16[ptr>>1];case"i32":return HEAP32[ptr>>2];case"i64":return HEAP32[ptr>>2];case"float":return HEAPF32[ptr>>2];case"double":return HEAPF64[ptr>>3];default:abort("invalid type for setValue: "+type)}return null}Module["getValue"]=getValue;var ALLOC_NORMAL=0;var ALLOC_STACK=1;var ALLOC_STATIC=2;var ALLOC_DYNAMIC=3;var ALLOC_NONE=4;Module["ALLOC_NORMAL"]=ALLOC_NORMAL;Module["ALLOC_STACK"]=ALLOC_STACK;Module["ALLOC_STATIC"]=ALLOC_STATIC;Module["ALLOC_DYNAMIC"]=ALLOC_DYNAMIC;Module["ALLOC_NONE"]=ALLOC_NONE;function allocate(slab,types,allocator,ptr){var zeroinit,size;if(typeof slab==="number"){zeroinit=true;size=slab}else{zeroinit=false;size=slab.length}var singleType=typeof types==="string"?types:null;var ret;if(allocator==ALLOC_NONE){ret=ptr}else{ret=[_malloc,Runtime.stackAlloc,Runtime.staticAlloc,Runtime.dynamicAlloc][allocator===undefined?ALLOC_STATIC:allocator](Math.max(size,singleType?1:types.length))}if(zeroinit){var ptr=ret,stop;assert((ret&3)==0);stop=ret+(size&~3);for(;ptr>2]=0}stop=ret+size;while(ptr>0]=0}return ret}if(singleType==="i8"){if(slab.subarray||slab.slice){HEAPU8.set(slab,ret)}else{HEAPU8.set(new Uint8Array(slab),ret)}return ret}var i=0,type,typeSize,previousType;while(i>0];hasUtf|=t;if(t==0&&!length)break;i++;if(length&&i==length)break}if(!length)length=i;var ret="";if(hasUtf<128){var MAX_CHUNK=1024;var curr;while(length>0){curr=String.fromCharCode.apply(String,HEAPU8.subarray(ptr,ptr+Math.min(length,MAX_CHUNK)));ret=ret?ret+curr:curr;ptr+=MAX_CHUNK;length-=MAX_CHUNK}return ret}return Module["UTF8ToString"](ptr)}Module["Pointer_stringify"]=Pointer_stringify;function AsciiToString(ptr){var str="";while(1){var ch=HEAP8[ptr++>>0];if(!ch)return str;str+=String.fromCharCode(ch)}}Module["AsciiToString"]=AsciiToString;function stringToAscii(str,outPtr){return writeAsciiToMemory(str,outPtr,false)}Module["stringToAscii"]=stringToAscii;function UTF8ArrayToString(u8Array,idx){var u0,u1,u2,u3,u4,u5;var str="";while(1){u0=u8Array[idx++];if(!u0)return str;if(!(u0&128)){str+=String.fromCharCode(u0);continue}u1=u8Array[idx++]&63;if((u0&224)==192){str+=String.fromCharCode((u0&31)<<6|u1);continue}u2=u8Array[idx++]&63;if((u0&240)==224){u0=(u0&15)<<12|u1<<6|u2}else{u3=u8Array[idx++]&63;if((u0&248)==240){u0=(u0&7)<<18|u1<<12|u2<<6|u3}else{u4=u8Array[idx++]&63;if((u0&252)==248){u0=(u0&3)<<24|u1<<18|u2<<12|u3<<6|u4}else{u5=u8Array[idx++]&63;u0=(u0&1)<<30|u1<<24|u2<<18|u3<<12|u4<<6|u5}}}if(u0<65536){str+=String.fromCharCode(u0)}else{var ch=u0-65536;str+=String.fromCharCode(55296|ch>>10,56320|ch&1023)}}}Module["UTF8ArrayToString"]=UTF8ArrayToString;function UTF8ToString(ptr){return UTF8ArrayToString(HEAPU8,ptr)}Module["UTF8ToString"]=UTF8ToString;function stringToUTF8Array(str,outU8Array,outIdx,maxBytesToWrite){if(!(maxBytesToWrite>0))return 0;var startIdx=outIdx;var endIdx=outIdx+maxBytesToWrite-1;for(var i=0;i=55296&&u<=57343)u=65536+((u&1023)<<10)|str.charCodeAt(++i)&1023;if(u<=127){if(outIdx>=endIdx)break;outU8Array[outIdx++]=u}else if(u<=2047){if(outIdx+1>=endIdx)break;outU8Array[outIdx++]=192|u>>6;outU8Array[outIdx++]=128|u&63}else if(u<=65535){if(outIdx+2>=endIdx)break;outU8Array[outIdx++]=224|u>>12;outU8Array[outIdx++]=128|u>>6&63;outU8Array[outIdx++]=128|u&63}else if(u<=2097151){if(outIdx+3>=endIdx)break;outU8Array[outIdx++]=240|u>>18;outU8Array[outIdx++]=128|u>>12&63;outU8Array[outIdx++]=128|u>>6&63;outU8Array[outIdx++]=128|u&63}else if(u<=67108863){if(outIdx+4>=endIdx)break;outU8Array[outIdx++]=248|u>>24;outU8Array[outIdx++]=128|u>>18&63;outU8Array[outIdx++]=128|u>>12&63;outU8Array[outIdx++]=128|u>>6&63;outU8Array[outIdx++]=128|u&63}else{if(outIdx+5>=endIdx)break;outU8Array[outIdx++]=252|u>>30;outU8Array[outIdx++]=128|u>>24&63;outU8Array[outIdx++]=128|u>>18&63;outU8Array[outIdx++]=128|u>>12&63;outU8Array[outIdx++]=128|u>>6&63;outU8Array[outIdx++]=128|u&63}}outU8Array[outIdx]=0;return outIdx-startIdx}Module["stringToUTF8Array"]=stringToUTF8Array;function stringToUTF8(str,outPtr,maxBytesToWrite){return stringToUTF8Array(str,HEAPU8,outPtr,maxBytesToWrite)}Module["stringToUTF8"]=stringToUTF8;function lengthBytesUTF8(str){var len=0;for(var i=0;i=55296&&u<=57343)u=65536+((u&1023)<<10)|str.charCodeAt(++i)&1023;if(u<=127){++len}else if(u<=2047){len+=2}else if(u<=65535){len+=3}else if(u<=2097151){len+=4}else if(u<=67108863){len+=5}else{len+=6}}return len}Module["lengthBytesUTF8"]=lengthBytesUTF8;function UTF16ToString(ptr){var i=0;var str="";while(1){var codeUnit=HEAP16[ptr+i*2>>1];if(codeUnit==0)return str;++i;str+=String.fromCharCode(codeUnit)}}Module["UTF16ToString"]=UTF16ToString;function stringToUTF16(str,outPtr,maxBytesToWrite){if(maxBytesToWrite===undefined){maxBytesToWrite=2147483647}if(maxBytesToWrite<2)return 0;maxBytesToWrite-=2;var startPtr=outPtr;var numCharsToWrite=maxBytesToWrite>1]=codeUnit;outPtr+=2}HEAP16[outPtr>>1]=0;return outPtr-startPtr}Module["stringToUTF16"]=stringToUTF16;function lengthBytesUTF16(str){return str.length*2}Module["lengthBytesUTF16"]=lengthBytesUTF16;function UTF32ToString(ptr){var i=0;var str="";while(1){var utf32=HEAP32[ptr+i*4>>2];if(utf32==0)return str;++i;if(utf32>=65536){var ch=utf32-65536;str+=String.fromCharCode(55296|ch>>10,56320|ch&1023)}else{str+=String.fromCharCode(utf32)}}}Module["UTF32ToString"]=UTF32ToString;function stringToUTF32(str,outPtr,maxBytesToWrite){if(maxBytesToWrite===undefined){maxBytesToWrite=2147483647}if(maxBytesToWrite<4)return 0;var startPtr=outPtr;var endPtr=startPtr+maxBytesToWrite-4;for(var i=0;i=55296&&codeUnit<=57343){var trailSurrogate=str.charCodeAt(++i);codeUnit=65536+((codeUnit&1023)<<10)|trailSurrogate&1023}HEAP32[outPtr>>2]=codeUnit;outPtr+=4;if(outPtr+4>endPtr)break}HEAP32[outPtr>>2]=0;return outPtr-startPtr}Module["stringToUTF32"]=stringToUTF32;function lengthBytesUTF32(str){var len=0;for(var i=0;i=55296&&codeUnit<=57343)++i;len+=4}return len}Module["lengthBytesUTF32"]=lengthBytesUTF32;function demangle(func){var hasLibcxxabi=!!Module["___cxa_demangle"];if(hasLibcxxabi){try{var buf=_malloc(func.length);writeStringToMemory(func.substr(1),buf);var status=_malloc(4);var ret=Module["___cxa_demangle"](buf,0,0,status);if(getValue(status,"i32")===0&&ret){return Pointer_stringify(ret)}}catch(e){}finally{if(buf)_free(buf);if(status)_free(status);if(ret)_free(ret)}}var i=3;var basicTypes={"v":"void","b":"bool","c":"char","s":"short","i":"int","l":"long","f":"float","d":"double","w":"wchar_t","a":"signed char","h":"unsigned char","t":"unsigned short","j":"unsigned int","m":"unsigned long","x":"long long","y":"unsigned long long","z":"..."};var subs=[];var first=true;function dump(x){if(x)Module.print(x);Module.print(func);var pre="";for(var a=0;a"}else{ret=name}paramLoop:while(i0){var c=func[i++];if(c in basicTypes){list.push(basicTypes[c])}else{switch(c){case"P":list.push(parse(true,1,true)[0]+"*");break;case"R":list.push(parse(true,1,true)[0]+"&");break;case"L":{i++;var end=func.indexOf("E",i);var size=end-i;list.push(func.substr(i,size));i+=size+2;break};case"A":{var size=parseInt(func.substr(i));i+=size.toString().length;if(func[i]!=="_")throw"?";i++;list.push(parse(true,1,true)[0]+" ["+size+"]");break};case"E":break paramLoop;default:ret+="?"+c;break paramLoop}}}if(!allowVoid&&list.length===1&&list[0]==="void")list=[];if(rawList){if(ret){list.push(ret+"?")}return list}else{return ret+flushList()}}var parsed=func;try{if(func=="Object._main"||func=="_main"){return"main()"}if(typeof func==="number")func=Pointer_stringify(func);if(func[0]!=="_")return func;if(func[1]!=="_")return func;if(func[2]!=="Z")return func;switch(func[3]){case"n":return"operator new()";case"d":return"operator delete()"}parsed=parse()}catch(e){parsed+="?"}if(parsed.indexOf("?")>=0&&!hasLibcxxabi){Runtime.warnOnce("warning: a problem occurred in builtin C++ name demangling; build with -s DEMANGLE_SUPPORT=1 to link in libcxxabi demangling")}return parsed}function demangleAll(text){return text.replace(/__Z[\w\d_]+/g,(function(x){var y=demangle(x);return x===y?x:x+" ["+y+"]"}))}function jsStackTrace(){var err=new Error;if(!err.stack){try{throw new Error(0)}catch(e){err=e}if(!err.stack){return"(no stack trace available)"}}return err.stack.toString()}function stackTrace(){return demangleAll(jsStackTrace())}Module["stackTrace"]=stackTrace;var PAGE_SIZE=4096;function alignMemoryPage(x){if(x%4096>0){x+=4096-x%4096}return x}var HEAP;var HEAP8,HEAPU8,HEAP16,HEAPU16,HEAP32,HEAPU32,HEAPF32,HEAPF64;var STATIC_BASE=0,STATICTOP=0,staticSealed=false;var STACK_BASE=0,STACKTOP=0,STACK_MAX=0;var DYNAMIC_BASE=0,DYNAMICTOP=0;function enlargeMemory(){var OLD_TOTAL_MEMORY=TOTAL_MEMORY;var LIMIT=Math.pow(2,31);if(DYNAMICTOP>=LIMIT)return false;while(TOTAL_MEMORY<=DYNAMICTOP){if(TOTAL_MEMORY=LIMIT)return false;try{if(ArrayBuffer.transfer){buffer=ArrayBuffer.transfer(buffer,TOTAL_MEMORY)}else{var oldHEAP8=HEAP8;buffer=new ArrayBuffer(TOTAL_MEMORY)}}catch(e){return false}var success=_emscripten_replace_memory(buffer);if(!success)return false;Module["buffer"]=buffer;Module["HEAP8"]=HEAP8=new Int8Array(buffer);Module["HEAP16"]=HEAP16=new Int16Array(buffer);Module["HEAP32"]=HEAP32=new Int32Array(buffer);Module["HEAPU8"]=HEAPU8=new Uint8Array(buffer);Module["HEAPU16"]=HEAPU16=new Uint16Array(buffer);Module["HEAPU32"]=HEAPU32=new Uint32Array(buffer);Module["HEAPF32"]=HEAPF32=new Float32Array(buffer);Module["HEAPF64"]=HEAPF64=new Float64Array(buffer);if(!ArrayBuffer.transfer){HEAP8.set(oldHEAP8)}return true}var byteLength;try{byteLength=Function.prototype.call.bind(Object.getOwnPropertyDescriptor(ArrayBuffer.prototype,"byteLength").get);byteLength(new ArrayBuffer(4))}catch(e){byteLength=(function(buffer){return buffer.byteLength})}var TOTAL_STACK=Module["TOTAL_STACK"]||5242880;var TOTAL_MEMORY=Module["TOTAL_MEMORY"]||16777216;var totalMemory=64*1024;while(totalMemory0){var callback=callbacks.shift();if(typeof callback=="function"){callback();continue}var func=callback.func;if(typeof func==="number"){if(callback.arg===undefined){Runtime.dynCall("v",func)}else{Runtime.dynCall("vi",func,[callback.arg])}}else{func(callback.arg===undefined?null:callback.arg)}}}var __ATPRERUN__=[];var __ATINIT__=[];var __ATMAIN__=[];var __ATEXIT__=[];var __ATPOSTRUN__=[];var runtimeInitialized=false;var runtimeExited=false;function preRun(){if(Module["preRun"]){if(typeof Module["preRun"]=="function")Module["preRun"]=[Module["preRun"]];while(Module["preRun"].length){addOnPreRun(Module["preRun"].shift())}}callRuntimeCallbacks(__ATPRERUN__)}function ensureInitRuntime(){if(runtimeInitialized)return;runtimeInitialized=true;callRuntimeCallbacks(__ATINIT__)}function preMain(){callRuntimeCallbacks(__ATMAIN__)}function exitRuntime(){callRuntimeCallbacks(__ATEXIT__);runtimeExited=true}function postRun(){if(Module["postRun"]){if(typeof Module["postRun"]=="function")Module["postRun"]=[Module["postRun"]];while(Module["postRun"].length){addOnPostRun(Module["postRun"].shift())}}callRuntimeCallbacks(__ATPOSTRUN__)}function addOnPreRun(cb){__ATPRERUN__.unshift(cb)}Module["addOnPreRun"]=addOnPreRun;function addOnInit(cb){__ATINIT__.unshift(cb)}Module["addOnInit"]=addOnInit;function addOnPreMain(cb){__ATMAIN__.unshift(cb)}Module["addOnPreMain"]=addOnPreMain;function addOnExit(cb){__ATEXIT__.unshift(cb)}Module["addOnExit"]=addOnExit;function addOnPostRun(cb){__ATPOSTRUN__.unshift(cb)}Module["addOnPostRun"]=addOnPostRun;function intArrayFromString(stringy,dontAddNull,length){var len=length>0?length:lengthBytesUTF8(stringy)+1;var u8array=new Array(len);var numBytesWritten=stringToUTF8Array(stringy,u8array,0,u8array.length);if(dontAddNull)u8array.length=numBytesWritten;return u8array}Module["intArrayFromString"]=intArrayFromString;function intArrayToString(array){var ret=[];for(var i=0;i255){chr&=255}ret.push(String.fromCharCode(chr))}return ret.join("")}Module["intArrayToString"]=intArrayToString;function writeStringToMemory(string,buffer,dontAddNull){var array=intArrayFromString(string,dontAddNull);var i=0;while(i>0]=chr;i=i+1}}Module["writeStringToMemory"]=writeStringToMemory;function writeArrayToMemory(array,buffer){for(var i=0;i>0]=array[i]}}Module["writeArrayToMemory"]=writeArrayToMemory;function writeAsciiToMemory(str,buffer,dontAddNull){for(var i=0;i>0]=str.charCodeAt(i)}if(!dontAddNull)HEAP8[buffer>>0]=0}Module["writeAsciiToMemory"]=writeAsciiToMemory;function unSign(value,bits,ignore){if(value>=0){return value}return bits<=32?2*Math.abs(1<=half&&(bits<=32||value>half)){value=-2*half+value}return value}if(!Math["imul"]||Math["imul"](4294967295,5)!==-5)Math["imul"]=function imul(a,b){var ah=a>>>16;var al=a&65535;var bh=b>>>16;var bl=b&65535;return al*bl+(ah*bl+al*bh<<16)|0};Math.imul=Math["imul"];if(!Math["clz32"])Math["clz32"]=(function(x){x=x>>>0;for(var i=0;i<32;i++){if(x&1<<31-i)return i}return 32});Math.clz32=Math["clz32"];var Math_abs=Math.abs;var Math_cos=Math.cos;var Math_sin=Math.sin;var Math_tan=Math.tan;var Math_acos=Math.acos;var Math_asin=Math.asin;var Math_atan=Math.atan;var Math_atan2=Math.atan2;var Math_exp=Math.exp;var Math_log=Math.log;var Math_sqrt=Math.sqrt;var Math_ceil=Math.ceil;var Math_floor=Math.floor;var Math_pow=Math.pow;var Math_imul=Math.imul;var Math_fround=Math.fround;var Math_min=Math.min;var Math_clz32=Math.clz32;var runDependencies=0;var runDependencyWatcher=null;var dependenciesFulfilled=null;function getUniqueRunDependency(id){return id}function addRunDependency(id){runDependencies++;if(Module["monitorRunDependencies"]){Module["monitorRunDependencies"](runDependencies)}}Module["addRunDependency"]=addRunDependency;function removeRunDependency(id){runDependencies--;if(Module["monitorRunDependencies"]){Module["monitorRunDependencies"](runDependencies)}if(runDependencies==0){if(runDependencyWatcher!==null){clearInterval(runDependencyWatcher);runDependencyWatcher=null}if(dependenciesFulfilled){var callback=dependenciesFulfilled;dependenciesFulfilled=null;callback()}}}Module["removeRunDependency"]=removeRunDependency;Module["preloadedImages"]={};Module["preloadedAudios"]={};var memoryInitializer=null;var ASM_CONSTS=[];STATIC_BASE=8;STATICTOP=STATIC_BASE+5888;__ATINIT__.push();allocate([116,0,0,0,86,7,0,0,116,0,0,0,99,7,0,0,156,0,0,0,112,7,0,0,16,0,0,0,0,0,0,0,156,0,0,0,145,7,0,0,24,0,0,0,0,0,0,0,156,0,0,0,215,7,0,0,24,0,0,0,0,0,0,0,156,0,0,0,179,7,0,0,56,0,0,0,0,0,0,0,156,0,0,0,249,7,0,0,40,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,40,0,0,0,1,0,0,0,2,0,0,0,3,0,0,0,4,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,88,0,0,0,1,0,0,0,5,0,0,0,3,0,0,0,4,0,0,0,1,0,0,0,2,0,0,0,2,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,108,1,0,0,220,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,4,0,0,0,227,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,4,0,0,0,219,16,0,0,0,4,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,115,40,37,117,41,58,32,65,115,115,101,114,116,105,111,110,32,102,97,105,108,117,114,101,58,32,34,37,115,34,10,0,109,95,115,105,122,101,32,60,61,32,109,95,99,97,112,97,99,105,116,121,0,46,47,105,110,99,92,99,114,110,95,100,101,99,111,109,112,46,104,0,109,105,110,95,110,101,119,95,99,97,112,97,99,105,116,121,32,60,32,40,48,120,55,70,70,70,48,48,48,48,85,32,47,32,101,108,101,109,101,110,116,95,115,105,122,101,41,0,110,101,119,95,99,97,112,97,99,105,116,121,32,38,38,32,40,110,101,119,95,99,97,112,97,99,105,116,121,32,62,32,109,95,99,97,112,97,99,105,116,121,41,0,110,117,109,95,99,111,100,101,115,91,99,93,0,115,111,114,116,101,100,95,112,111,115,32,60,32,116,111,116,97,108,95,117,115,101,100,95,115,121,109,115,0,112,67,111,100,101,115,105,122,101,115,91,115,121,109,95,105,110,100,101,120,93,32,61,61,32,99,111,100,101,115,105,122,101,0,116,32,60,32,40,49,85,32,60,60,32,116,97,98,108,101,95,98,105,116,115,41,0,109,95,108,111,111,107,117,112,91,116,93,32,61,61,32,99,85,73,78,84,51,50,95,77,65,88,0,99,114,110,100,95,109,97,108,108,111,99,58,32,115,105,122,101,32,116,111,111,32,98,105,103,0,99,114,110,100,95,109,97,108,108,111,99,58,32,111,117,116,32,111,102,32,109,101,109,111,114,121,0,40,40,117,105,110,116,51,50,41,112,95,110,101,119,32,38,32,40,67,82,78,68,95,77,73,78,95,65,76,76,79,67,95,65,76,73,71,78,77,69,78,84,32,45,32,49,41,41,32,61,61,32,48,0,99,114,110,100,95,114,101,97,108,108,111,99,58,32,98,97,100,32,112,116,114,0,99,114,110,100,95,102,114,101,101,58,32,98,97,100,32,112,116,114,0,102,97,108,115,101,0,40,116,111,116,97,108,95,115,121,109,115,32,62,61,32,49,41,32,38,38,32,40,116,111,116,97,108,95,115,121,109,115,32,60,61,32,112,114,101,102,105,120,95,99,111,100,105,110,103,58,58,99,77,97,120,83,117,112,112,111,114,116,101,100,83,121,109,115,41,0,17,18,19,20,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15,16,48,0,110,117,109,95,98,105,116,115,32,60,61,32,51,50,85,0,109,95,98,105,116,95,99,111,117,110,116,32,60,61,32,99,66,105,116,66,117,102,83,105,122,101,0,116,32,33,61,32,99,85,73,78,84,51,50,95,77,65,88,0,109,111,100,101,108,46,109,95,99,111,100,101,95,115,105,122,101,115,91,115,121,109,93,32,61,61,32,108,101,110,0,0,2,3,1,0,2,3,4,5,6,7,1,40,108,101,110,32,62,61,32,49,41,32,38,38,32,40,108,101,110,32,60,61,32,99,77,97,120,69,120,112,101,99,116,101,100,67,111,100,101,83,105,122,101,41,0,105,32,60,32,109,95,115,105,122,101,0,110,101,120,116,95,108,101,118,101,108,95,111,102,115,32,62,32,99,117,114,95,108,101,118,101,108,95,111,102,115,0,1,2,2,3,3,3,3,4,0,0,0,0,0,0,1,1,0,1,0,1,0,0,1,2,1,2,0,0,0,1,0,2,1,0,2,0,0,1,2,3,110,117,109,32,38,38,32,40,110,117,109,32,61,61,32,126,110,117,109,95,99,104,101,99,107,41,0,83,116,57,101,120,99,101,112,116,105,111,110,0,83,116,57,116,121,112,101,95,105,110,102,111,0,78,49,48,95,95,99,120,120,97,98,105,118,49,49,54,95,95,115,104,105,109,95,116,121,112,101,95,105,110,102,111,69,0,78,49,48,95,95,99,120,120,97,98,105,118,49,49,55,95,95,99,108,97,115,115,95,116,121,112,101,95,105,110,102,111,69,0,78,49,48,95,95,99,120,120,97,98,105,118,49,49,57,95,95,112,111,105,110,116,101,114,95,116,121,112,101,95,105,110,102,111,69,0,78,49,48,95,95,99,120,120,97,98,105,118,49,49,55,95,95,112,98,97,115,101,95,116,121,112,101,95,105,110,102,111,69,0,78,49,48,95,95,99,120,120,97,98,105,118,49,50,48,95,95,115,105,95,99,108,97,115,115,95,116,121,112,101,95,105,110,102,111,69,0,112,116,104,114,101,97,100,95,111,110,99,101,32,102,97,105,108,117,114,101,32,105,110,32,95,95,99,120,97,95,103,101,116,95,103,108,111,98,97,108,115,95,102,97,115,116,40,41,0,116,101,114,109,105,110,97,116,101,95,104,97,110,100,108,101,114,32,117,110,101,120,112,101,99,116,101,100,108,121,32,114,101,116,117,114,110,101,100,0,99,97,110,110,111,116,32,99,114,101,97,116,101,32,112,116,104,114,101,97,100,32,107,101,121,32,102,111,114,32,95,95,99,120,97,95,103,101,116,95,103,108,111,98,97,108,115,40,41,0,99,97,110,110,111,116,32,122,101,114,111,32,111,117,116,32,116,104,114,101,97,100,32,118,97,108,117,101,32,102,111,114,32,95,95,99,120,97,95,103,101,116,95,103,108,111,98,97,108,115,40,41,0,116,101,114,109,105,110,97,116,105,110,103,32,119,105,116,104,32,37,115,32,101,120,99,101,112,116,105,111,110,32,111,102,32,116,121,112,101,32,37,115,58,32,37,115,0,116,101,114,109,105,110,97,116,105,110,103,32,119,105,116,104,32,37,115,32,101,120,99,101,112,116,105,111,110,32,111,102,32,116,121,112,101,32,37,115,0,116,101,114,109,105,110,97,116,105,110,103,32,119,105,116,104,32,37,115,32,102,111,114,101,105,103,110,32,101,120,99,101,112,116,105,111,110,0,116,101,114,109,105,110,97,116,105,110,103,0,117,110,99,97,117,103,104,116,0,84,33,34,25,13,1,2,3,17,75,28,12,16,4,11,29,18,30,39,104,110,111,112,113,98,32,5,6,15,19,20,21,26,8,22,7,40,36,23,24,9,10,14,27,31,37,35,131,130,125,38,42,43,60,61,62,63,67,71,74,77,88,89,90,91,92,93,94,95,96,97,99,100,101,102,103,105,106,107,108,114,115,116,121,122,123,124,0,73,108,108,101,103,97,108,32,98,121,116,101,32,115,101,113,117,101,110,99,101,0,68,111,109,97,105,110,32,101,114,114,111,114,0,82,101,115,117,108,116,32,110,111,116,32,114,101,112,114,101,115,101,110,116,97,98,108,101,0,78,111,116,32,97,32,116,116,121,0,80,101,114,109,105,115,115,105,111,110,32,100,101,110,105,101,100,0,79,112,101,114,97,116,105,111,110,32,110,111,116,32,112,101,114,109,105,116,116,101,100,0,78,111,32,115,117,99,104,32,102,105,108,101,32,111,114,32,100,105,114,101,99,116,111,114,121,0,78,111,32,115,117,99,104,32,112,114,111,99,101,115,115,0,70,105,108,101,32,101,120,105,115,116,115,0,86,97,108,117,101,32,116,111,111,32,108,97,114,103,101,32,102,111,114,32,100,97,116,97,32,116,121,112,101,0,78,111,32,115,112,97,99,101,32,108,101,102,116,32,111,110,32,100,101,118,105,99,101,0,79,117,116,32,111,102,32,109,101,109,111,114,121,0,82,101,115,111,117,114,99,101,32,98,117,115,121,0,73,110,116,101,114,114,117,112,116,101,100,32,115,121,115,116,101,109,32,99,97,108,108,0,82,101,115,111,117,114,99,101,32,116,101,109,112,111,114,97,114,105,108,121,32,117,110,97,118,97,105,108,97,98,108,101,0,73,110,118,97,108,105,100,32,115,101,101,107,0,67,114,111,115,115,45,100,101,118,105,99,101,32,108,105,110,107,0,82,101,97,100,45,111,110,108,121,32,102,105,108,101,32,115,121,115,116,101,109,0,68,105,114,101,99,116,111,114,121,32,110,111,116,32,101,109,112,116,121,0,67,111,110,110,101,99,116,105,111,110,32,114,101,115,101,116,32,98,121,32,112,101,101,114,0,79,112,101,114,97,116,105,111,110,32,116,105,109,101,100,32,111,117,116,0,67,111,110,110,101,99,116,105,111,110,32,114,101,102,117,115,101,100,0,72,111,115,116,32,105,115,32,100,111,119,110,0,72,111,115,116,32,105,115,32,117,110,114,101,97,99,104,97,98,108,101,0,65,100,100,114,101,115,115,32,105,110,32,117,115,101,0,66,114,111,107,101,110,32,112,105,112,101,0,73,47,79,32,101,114,114,111,114,0,78,111,32,115,117,99,104,32,100,101,118,105,99,101,32,111,114,32,97,100,100,114,101,115,115,0,66,108,111,99,107,32,100,101,118,105,99,101,32,114,101,113,117,105,114,101,100,0,78,111,32,115,117,99,104,32,100,101,118,105,99,101,0,78,111,116,32,97,32,100,105,114,101,99,116,111,114,121,0,73,115,32,97,32,100,105,114,101,99,116,111,114,121,0,84,101,120,116,32,102,105,108,101,32,98,117,115,121,0,69,120,101,99,32,102,111,114,109,97,116,32,101,114,114,111,114,0,73,110,118,97,108,105,100,32,97,114,103,117,109,101,110,116,0,65,114,103,117,109,101,110,116,32,108,105,115,116,32,116,111,111,32,108,111,110,103,0,83,121,109,98,111,108,105,99,32,108,105,110,107,32,108,111,111,112,0,70,105,108,101,110,97,109,101,32,116,111,111,32,108,111,110,103,0,84,111,111,32,109,97,110,121,32,111,112,101,110,32,102,105,108,101,115,32,105,110,32,115,121,115,116,101,109,0,78,111,32,102,105,108,101,32,100,101,115,99,114,105,112,116,111,114,115,32,97,118,97,105,108,97,98,108,101,0,66,97,100,32,102,105,108,101,32,100,101,115,99,114,105,112,116,111,114,0,78,111,32,99,104,105,108,100,32,112,114,111,99,101,115,115,0,66,97,100,32,97,100,100,114,101,115,115,0,70,105,108,101,32,116,111,111,32,108,97,114,103,101,0,84,111,111,32,109,97,110,121,32,108,105,110,107,115,0,78,111,32,108,111,99,107,115,32,97,118,97,105,108,97,98,108,101,0,82,101,115,111,117,114,99,101,32,100,101,97,100,108,111,99,107,32,119,111,117,108,100,32,111,99,99,117,114,0,83,116,97,116,101,32,110,111,116,32,114,101,99,111,118,101,114,97,98,108,101,0,80,114,101,118,105,111,117,115,32,111,119,110,101,114,32,100,105,101,100,0,79,112,101,114,97,116,105,111,110,32,99,97,110,99,101,108,101,100,0,70,117,110,99,116,105,111,110,32,110,111,116,32,105,109,112,108,101,109,101,110,116,101,100,0,78,111,32,109,101,115,115,97,103,101,32,111,102,32,100,101,115,105,114,101,100,32,116,121,112,101,0,73,100,101,110,116,105,102,105,101,114,32,114,101,109,111,118,101,100,0,68,101,118,105,99,101,32,110,111,116,32,97,32,115,116,114,101,97,109,0,78,111,32,100,97,116,97,32,97,118,97,105,108,97,98,108,101,0,68,101,118,105,99,101,32,116,105,109,101,111,117,116,0,79,117,116,32,111,102,32,115,116,114,101,97,109,115,32,114,101,115,111,117,114,99,101,115,0,76,105,110,107,32,104,97,115,32,98,101,101,110,32,115,101,118,101,114,101,100,0,80,114,111,116,111,99,111,108,32,101,114,114,111,114,0,66,97,100,32,109,101,115,115,97,103,101,0,70,105,108,101,32,100,101,115,99,114,105,112,116,111,114,32,105,110,32,98,97,100,32,115,116,97,116,101,0,78,111,116,32,97,32,115,111,99,107,101,116,0,68,101,115,116,105,110,97,116,105,111,110,32,97,100,100,114,101,115,115,32,114,101,113,117,105,114,101,100,0,77,101,115,115,97,103,101,32,116,111,111,32,108,97,114,103,101,0,80,114,111,116,111,99,111,108,32,119,114,111,110,103,32,116,121,112,101,32,102,111,114,32,115,111,99,107,101,116,0,80,114,111,116,111,99,111,108,32,110,111,116,32,97,118,97,105,108,97,98,108,101,0,80,114,111,116,111,99,111,108,32,110,111,116,32,115,117,112,112,111,114,116,101,100,0,83,111,99,107,101,116,32,116,121,112,101,32,110,111,116,32,115,117,112,112,111,114,116,101,100,0,78,111,116,32,115,117,112,112,111,114,116,101,100,0,80,114,111,116,111,99,111,108,32,102,97,109,105,108,121,32,110,111,116,32,115,117,112,112,111,114,116,101,100,0,65,100,100,114,101,115,115,32,102,97,109,105,108,121,32,110,111,116,32,115,117,112,112,111,114,116,101,100,32,98,121,32,112,114,111,116,111,99,111,108,0,65,100,100,114,101,115,115,32,110,111,116,32,97,118,97,105,108,97,98,108,101,0,78,101,116,119,111,114,107,32,105,115,32,100,111,119,110,0,78,101,116,119,111,114,107,32,117,110,114,101,97,99,104,97,98,108,101,0,67,111,110,110,101,99,116,105,111,110,32,114,101,115,101,116,32,98,121,32,110,101,116,119,111,114,107,0,67,111,110,110,101,99,116,105,111,110,32,97,98,111,114,116,101,100,0,78,111,32,98,117,102,102,101,114,32,115,112,97,99,101,32,97,118,97,105,108,97,98,108,101,0,83,111,99,107,101,116,32,105,115,32,99,111,110,110,101,99,116,101,100,0,83,111,99,107,101,116,32,110,111,116,32,99,111,110,110,101,99,116,101,100,0,67,97,110,110,111,116,32,115,101,110,100,32,97,102,116,101,114,32,115,111,99,107,101,116,32,115,104,117,116,100,111,119,110,0,79,112,101,114,97,116,105,111,110,32,97,108,114,101,97,100,121,32,105,110,32,112,114,111,103,114,101,115,115,0,79,112,101,114,97,116,105,111,110,32,105,110,32,112,114,111,103,114,101,115,115,0,83,116,97,108,101,32,102,105,108,101,32,104,97,110,100,108,101,0,82,101,109,111,116,101,32,73,47,79,32,101,114,114,111,114,0,81,117,111,116,97,32,101,120,99,101,101,100,101,100,0,78,111,32,109,101,100,105,117,109,32,102,111,117,110,100,0,87,114,111,110,103,32,109,101,100,105,117,109,32,116,121,112,101,0,78,111,32,101,114,114,111,114,32,105,110,102,111,114,109,97,116,105,111,110,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,0,10,0,17,17,17,0,0,0,0,5,0,0,0,0,0,0,9,0,0,0,0,11,0,0,0,0,0,0,0,0,17,0,15,10,17,17,17,3,10,7,0,1,19,9,11,11,0,0,9,6,11,0,0,11,0,6,17,0,0,0,17,17,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,17,0,10,10,17,17,17,0,10,0,0,2,0,9,11,0,0,0,9,0,11,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,12,0,0,0,0,9,12,0,0,0,0,0,12,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,0,0,0,0,0,0,0,0,0,0,0,13,0,0,0,4,13,0,0,0,0,9,14,0,0,0,0,0,14,0,0,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,15,0,0,0,0,9,16,0,0,0,0,0,16,0,0,16,0,0,18,0,0,0,18,18,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,0,0,0,18,18,18,0,0,0,0,0,0,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,10,0,0,0,0,10,0,0,0,0,9,11,0,0,0,0,0,11,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,12,0,0,0,0,9,12,0,0,0,0,0,12,0,0,12,0,0,48,49,50,51,52,53,54,55,56,57,65,66,67,68,69,70,45,43,32,32,32,48,88,48,120,0,40,110,117,108,108,41,0,45,48,88,43,48,88,32,48,88,45,48,120,43,48,120,32,48,120,0,105,110,102,0,73,78,70,0,110,97,110,0,78,65,78,0,46,0],"i8",ALLOC_NONE,Runtime.GLOBAL_BASE);var tempDoublePtr=Runtime.alignMemory(allocate(12,"i8",ALLOC_STATIC),8);assert(tempDoublePtr%8==0);function copyTempFloat(ptr){HEAP8[tempDoublePtr]=HEAP8[ptr];HEAP8[tempDoublePtr+1]=HEAP8[ptr+1];HEAP8[tempDoublePtr+2]=HEAP8[ptr+2];HEAP8[tempDoublePtr+3]=HEAP8[ptr+3]}function copyTempDouble(ptr){HEAP8[tempDoublePtr]=HEAP8[ptr];HEAP8[tempDoublePtr+1]=HEAP8[ptr+1];HEAP8[tempDoublePtr+2]=HEAP8[ptr+2];HEAP8[tempDoublePtr+3]=HEAP8[ptr+3];HEAP8[tempDoublePtr+4]=HEAP8[ptr+4];HEAP8[tempDoublePtr+5]=HEAP8[ptr+5];HEAP8[tempDoublePtr+6]=HEAP8[ptr+6];HEAP8[tempDoublePtr+7]=HEAP8[ptr+7]}var _BDtoIHigh=true;Module["_i64Subtract"]=_i64Subtract;Module["_i64Add"]=_i64Add;function _pthread_cleanup_push(routine,arg){__ATEXIT__.push((function(){Runtime.dynCall("vi",routine,[arg])}));_pthread_cleanup_push.level=__ATEXIT__.length}Module["_memset"]=_memset;var _BDtoILow=true;Module["_bitshift64Lshr"]=_bitshift64Lshr;Module["_bitshift64Shl"]=_bitshift64Shl;function _pthread_cleanup_pop(){assert(_pthread_cleanup_push.level==__ATEXIT__.length,"cannot pop if something else added meanwhile!");__ATEXIT__.pop();_pthread_cleanup_push.level=__ATEXIT__.length}function _abort(){Module["abort"]()}function __ZSt18uncaught_exceptionv(){return!!__ZSt18uncaught_exceptionv.uncaught_exception}var EXCEPTIONS={last:0,caught:[],infos:{},deAdjust:(function(adjusted){if(!adjusted||EXCEPTIONS.infos[adjusted])return adjusted;for(var ptr in EXCEPTIONS.infos){var info=EXCEPTIONS.infos[ptr];if(info.adjusted===adjusted){return ptr}}return adjusted}),addRef:(function(ptr){if(!ptr)return;var info=EXCEPTIONS.infos[ptr];info.refcount++}),decRef:(function(ptr){if(!ptr)return;var info=EXCEPTIONS.infos[ptr];assert(info.refcount>0);info.refcount--;if(info.refcount===0){if(info.destructor){Runtime.dynCall("vi",info.destructor,[ptr])}delete EXCEPTIONS.infos[ptr];___cxa_free_exception(ptr)}}),clearRef:(function(ptr){if(!ptr)return;var info=EXCEPTIONS.infos[ptr];info.refcount=0})};function ___cxa_begin_catch(ptr){__ZSt18uncaught_exceptionv.uncaught_exception--;EXCEPTIONS.caught.push(ptr);EXCEPTIONS.addRef(EXCEPTIONS.deAdjust(ptr));return ptr}function _pthread_once(ptr,func){if(!_pthread_once.seen)_pthread_once.seen={};if(ptr in _pthread_once.seen)return;Runtime.dynCall("v",func);_pthread_once.seen[ptr]=1}function _emscripten_memcpy_big(dest,src,num){HEAPU8.set(HEAPU8.subarray(src,src+num),dest);return dest}Module["_memcpy"]=_memcpy;var SYSCALLS={varargs:0,get:(function(varargs){SYSCALLS.varargs+=4;var ret=HEAP32[SYSCALLS.varargs-4>>2];return ret}),getStr:(function(){var ret=Pointer_stringify(SYSCALLS.get());return ret}),get64:(function(){var low=SYSCALLS.get(),high=SYSCALLS.get();if(low>=0)assert(high===0);else assert(high===-1);return low}),getZero:(function(){assert(SYSCALLS.get()===0)})};function ___syscall6(which,varargs){SYSCALLS.varargs=varargs;try{var stream=SYSCALLS.getStreamFromFD();FS.close(stream);return 0}catch(e){if(typeof FS==="undefined"||!(e instanceof FS.ErrnoError))abort(e);return-e.errno}}var PTHREAD_SPECIFIC={};function _pthread_getspecific(key){return PTHREAD_SPECIFIC[key]||0}function ___setErrNo(value){if(Module["___errno_location"])HEAP32[Module["___errno_location"]()>>2]=value;return value}var ERRNO_CODES={EPERM:1,ENOENT:2,ESRCH:3,EINTR:4,EIO:5,ENXIO:6,E2BIG:7,ENOEXEC:8,EBADF:9,ECHILD:10,EAGAIN:11,EWOULDBLOCK:11,ENOMEM:12,EACCES:13,EFAULT:14,ENOTBLK:15,EBUSY:16,EEXIST:17,EXDEV:18,ENODEV:19,ENOTDIR:20,EISDIR:21,EINVAL:22,ENFILE:23,EMFILE:24,ENOTTY:25,ETXTBSY:26,EFBIG:27,ENOSPC:28,ESPIPE:29,EROFS:30,EMLINK:31,EPIPE:32,EDOM:33,ERANGE:34,ENOMSG:42,EIDRM:43,ECHRNG:44,EL2NSYNC:45,EL3HLT:46,EL3RST:47,ELNRNG:48,EUNATCH:49,ENOCSI:50,EL2HLT:51,EDEADLK:35,ENOLCK:37,EBADE:52,EBADR:53,EXFULL:54,ENOANO:55,EBADRQC:56,EBADSLT:57,EDEADLOCK:35,EBFONT:59,ENOSTR:60,ENODATA:61,ETIME:62,ENOSR:63,ENONET:64,ENOPKG:65,EREMOTE:66,ENOLINK:67,EADV:68,ESRMNT:69,ECOMM:70,EPROTO:71,EMULTIHOP:72,EDOTDOT:73,EBADMSG:74,ENOTUNIQ:76,EBADFD:77,EREMCHG:78,ELIBACC:79,ELIBBAD:80,ELIBSCN:81,ELIBMAX:82,ELIBEXEC:83,ENOSYS:38,ENOTEMPTY:39,ENAMETOOLONG:36,ELOOP:40,EOPNOTSUPP:95,EPFNOSUPPORT:96,ECONNRESET:104,ENOBUFS:105,EAFNOSUPPORT:97,EPROTOTYPE:91,ENOTSOCK:88,ENOPROTOOPT:92,ESHUTDOWN:108,ECONNREFUSED:111,EADDRINUSE:98,ECONNABORTED:103,ENETUNREACH:101,ENETDOWN:100,ETIMEDOUT:110,EHOSTDOWN:112,EHOSTUNREACH:113,EINPROGRESS:115,EALREADY:114,EDESTADDRREQ:89,EMSGSIZE:90,EPROTONOSUPPORT:93,ESOCKTNOSUPPORT:94,EADDRNOTAVAIL:99,ENETRESET:102,EISCONN:106,ENOTCONN:107,ETOOMANYREFS:109,EUSERS:87,EDQUOT:122,ESTALE:116,ENOTSUP:95,ENOMEDIUM:123,EILSEQ:84,EOVERFLOW:75,ECANCELED:125,ENOTRECOVERABLE:131,EOWNERDEAD:130,ESTRPIPE:86};function _sysconf(name){switch(name){case 30:return PAGE_SIZE;case 85:return totalMemory/PAGE_SIZE;case 132:case 133:case 12:case 137:case 138:case 15:case 235:case 16:case 17:case 18:case 19:case 20:case 149:case 13:case 10:case 236:case 153:case 9:case 21:case 22:case 159:case 154:case 14:case 77:case 78:case 139:case 80:case 81:case 82:case 68:case 67:case 164:case 11:case 29:case 47:case 48:case 95:case 52:case 51:case 46:return 200809;case 79:return 0;case 27:case 246:case 127:case 128:case 23:case 24:case 160:case 161:case 181:case 182:case 242:case 183:case 184:case 243:case 244:case 245:case 165:case 178:case 179:case 49:case 50:case 168:case 169:case 175:case 170:case 171:case 172:case 97:case 76:case 32:case 173:case 35:return-1;case 176:case 177:case 7:case 155:case 8:case 157:case 125:case 126:case 92:case 93:case 129:case 130:case 131:case 94:case 91:return 1;case 74:case 60:case 69:case 70:case 4:return 1024;case 31:case 42:case 72:return 32;case 87:case 26:case 33:return 2147483647;case 34:case 1:return 47839;case 38:case 36:return 99;case 43:case 37:return 2048;case 0:return 2097152;case 3:return 65536;case 28:return 32768;case 44:return 32767;case 75:return 16384;case 39:return 1e3;case 89:return 700;case 71:return 256;case 40:return 255;case 2:return 100;case 180:return 64;case 25:return 20;case 5:return 16;case 6:return 6;case 73:return 4;case 84:{if(typeof navigator==="object")return navigator["hardwareConcurrency"]||1;return 1}}___setErrNo(ERRNO_CODES.EINVAL);return-1}function _sbrk(bytes){var self=_sbrk;if(!self.called){DYNAMICTOP=alignMemoryPage(DYNAMICTOP);self.called=true;assert(Runtime.dynamicAlloc);self.alloc=Runtime.dynamicAlloc;Runtime.dynamicAlloc=(function(){abort("cannot dynamically allocate, sbrk now has control")})}var ret=DYNAMICTOP;if(bytes!=0){var success=self.alloc(bytes);if(!success)return-1>>>0}return ret}var PTHREAD_SPECIFIC_NEXT_KEY=1;function _pthread_key_create(key,destructor){if(key==0){return ERRNO_CODES.EINVAL}HEAP32[key>>2]=PTHREAD_SPECIFIC_NEXT_KEY;PTHREAD_SPECIFIC[PTHREAD_SPECIFIC_NEXT_KEY]=0;PTHREAD_SPECIFIC_NEXT_KEY++;return 0}var _BItoD=true;var PATH=undefined;function _emscripten_set_main_loop_timing(mode,value){Browser.mainLoop.timingMode=mode;Browser.mainLoop.timingValue=value;if(!Browser.mainLoop.func){return 1}if(mode==0){Browser.mainLoop.scheduler=function Browser_mainLoop_scheduler_setTimeout(){setTimeout(Browser.mainLoop.runner,value)};Browser.mainLoop.method="timeout"}else if(mode==1){Browser.mainLoop.scheduler=function Browser_mainLoop_scheduler_rAF(){Browser.requestAnimationFrame(Browser.mainLoop.runner)};Browser.mainLoop.method="rAF"}else if(mode==2){if(!window["setImmediate"]){var setImmediates=[];var emscriptenMainLoopMessageId="__emcc";function Browser_setImmediate_messageHandler(event){if(event.source===window&&event.data===emscriptenMainLoopMessageId){event.stopPropagation();setImmediates.shift()()}}window.addEventListener("message",Browser_setImmediate_messageHandler,true);window["setImmediate"]=function Browser_emulated_setImmediate(func){setImmediates.push(func);window.postMessage(emscriptenMainLoopMessageId,"*")}}Browser.mainLoop.scheduler=function Browser_mainLoop_scheduler_setImmediate(){window["setImmediate"](Browser.mainLoop.runner)};Browser.mainLoop.method="immediate"}return 0}function _emscripten_set_main_loop(func,fps,simulateInfiniteLoop,arg,noSetTiming){Module["noExitRuntime"]=true;assert(!Browser.mainLoop.func,"emscripten_set_main_loop: there can only be one main loop function at once: call emscripten_cancel_main_loop to cancel the previous one before setting a new one with different parameters.");Browser.mainLoop.func=func;Browser.mainLoop.arg=arg;var thisMainLoopId=Browser.mainLoop.currentlyRunningMainloop;Browser.mainLoop.runner=function Browser_mainLoop_runner(){if(ABORT)return;if(Browser.mainLoop.queue.length>0){var start=Date.now();var blocker=Browser.mainLoop.queue.shift();blocker.func(blocker.arg);if(Browser.mainLoop.remainingBlockers){var remaining=Browser.mainLoop.remainingBlockers;var next=remaining%1==0?remaining-1:Math.floor(remaining);if(blocker.counted){Browser.mainLoop.remainingBlockers=next}else{next=next+.5;Browser.mainLoop.remainingBlockers=(8*remaining+next)/9}}console.log('main loop blocker "'+blocker.name+'" took '+(Date.now()-start)+" ms");Browser.mainLoop.updateStatus();setTimeout(Browser.mainLoop.runner,0);return}if(thisMainLoopId1&&Browser.mainLoop.currentFrameNumber%Browser.mainLoop.timingValue!=0){Browser.mainLoop.scheduler();return}if(Browser.mainLoop.method==="timeout"&&Module.ctx){Module.printErr("Looks like you are rendering without using requestAnimationFrame for the main loop. You should use 0 for the frame rate in emscripten_set_main_loop in order to use requestAnimationFrame, as that can greatly improve your frame rates!");Browser.mainLoop.method=""}Browser.mainLoop.runIter((function(){if(typeof arg!=="undefined"){Runtime.dynCall("vi",func,[arg])}else{Runtime.dynCall("v",func)}}));if(thisMainLoopId0)_emscripten_set_main_loop_timing(0,1e3/fps);else _emscripten_set_main_loop_timing(1,1);Browser.mainLoop.scheduler()}if(simulateInfiniteLoop){throw"SimulateInfiniteLoop"}}var Browser={mainLoop:{scheduler:null,method:"",currentlyRunningMainloop:0,func:null,arg:0,timingMode:0,timingValue:0,currentFrameNumber:0,queue:[],pause:(function(){Browser.mainLoop.scheduler=null;Browser.mainLoop.currentlyRunningMainloop++}),resume:(function(){Browser.mainLoop.currentlyRunningMainloop++;var timingMode=Browser.mainLoop.timingMode;var timingValue=Browser.mainLoop.timingValue;var func=Browser.mainLoop.func;Browser.mainLoop.func=null;_emscripten_set_main_loop(func,0,false,Browser.mainLoop.arg,true);_emscripten_set_main_loop_timing(timingMode,timingValue);Browser.mainLoop.scheduler()}),updateStatus:(function(){if(Module["setStatus"]){var message=Module["statusMessage"]||"Please wait...";var remaining=Browser.mainLoop.remainingBlockers;var expected=Browser.mainLoop.expectedBlockers;if(remaining){if(remaining=6){var curr=leftchar>>leftbits-6&63;leftbits-=6;ret+=BASE[curr]}}if(leftbits==2){ret+=BASE[(leftchar&3)<<4];ret+=PAD+PAD}else if(leftbits==4){ret+=BASE[(leftchar&15)<<2];ret+=PAD}return ret}audio.src="data:audio/x-"+name.substr(-3)+";base64,"+encode64(byteArray);finish(audio)};audio.src=url;Browser.safeSetTimeout((function(){finish(audio)}),1e4)}else{return fail()}};Module["preloadPlugins"].push(audioPlugin);var canvas=Module["canvas"];function pointerLockChange(){Browser.pointerLock=document["pointerLockElement"]===canvas||document["mozPointerLockElement"]===canvas||document["webkitPointerLockElement"]===canvas||document["msPointerLockElement"]===canvas}if(canvas){canvas.requestPointerLock=canvas["requestPointerLock"]||canvas["mozRequestPointerLock"]||canvas["webkitRequestPointerLock"]||canvas["msRequestPointerLock"]||(function(){});canvas.exitPointerLock=document["exitPointerLock"]||document["mozExitPointerLock"]||document["webkitExitPointerLock"]||document["msExitPointerLock"]||(function(){});canvas.exitPointerLock=canvas.exitPointerLock.bind(document);document.addEventListener("pointerlockchange",pointerLockChange,false);document.addEventListener("mozpointerlockchange",pointerLockChange,false);document.addEventListener("webkitpointerlockchange",pointerLockChange,false);document.addEventListener("mspointerlockchange",pointerLockChange,false);if(Module["elementPointerLock"]){canvas.addEventListener("click",(function(ev){if(!Browser.pointerLock&&canvas.requestPointerLock){canvas.requestPointerLock();ev.preventDefault()}}),false)}}}),createContext:(function(canvas,useWebGL,setInModule,webGLContextAttributes){if(useWebGL&&Module.ctx&&canvas==Module.canvas)return Module.ctx;var ctx;var contextHandle;if(useWebGL){var contextAttributes={antialias:false,alpha:false};if(webGLContextAttributes){for(var attribute in webGLContextAttributes){contextAttributes[attribute]=webGLContextAttributes[attribute]}}contextHandle=GL.createContext(canvas,contextAttributes);if(contextHandle){ctx=GL.getContext(contextHandle).GLctx}canvas.style.backgroundColor="black"}else{ctx=canvas.getContext("2d")}if(!ctx)return null;if(setInModule){if(!useWebGL)assert(typeof GLctx==="undefined","cannot set in module if GLctx is used, but we are a non-GL context that would replace it");Module.ctx=ctx;if(useWebGL)GL.makeContextCurrent(contextHandle);Module.useWebGL=useWebGL;Browser.moduleContextCreatedCallbacks.forEach((function(callback){callback()}));Browser.init()}return ctx}),destroyContext:(function(canvas,useWebGL,setInModule){}),fullScreenHandlersInstalled:false,lockPointer:undefined,resizeCanvas:undefined,requestFullScreen:(function(lockPointer,resizeCanvas,vrDevice){Browser.lockPointer=lockPointer;Browser.resizeCanvas=resizeCanvas;Browser.vrDevice=vrDevice;if(typeof Browser.lockPointer==="undefined")Browser.lockPointer=true;if(typeof Browser.resizeCanvas==="undefined")Browser.resizeCanvas=false;if(typeof Browser.vrDevice==="undefined")Browser.vrDevice=null;var canvas=Module["canvas"];function fullScreenChange(){Browser.isFullScreen=false;var canvasContainer=canvas.parentNode;if((document["webkitFullScreenElement"]||document["webkitFullscreenElement"]||document["mozFullScreenElement"]||document["mozFullscreenElement"]||document["fullScreenElement"]||document["fullscreenElement"]||document["msFullScreenElement"]||document["msFullscreenElement"]||document["webkitCurrentFullScreenElement"])===canvasContainer){canvas.cancelFullScreen=document["cancelFullScreen"]||document["mozCancelFullScreen"]||document["webkitCancelFullScreen"]||document["msExitFullscreen"]||document["exitFullscreen"]||(function(){});canvas.cancelFullScreen=canvas.cancelFullScreen.bind(document);if(Browser.lockPointer)canvas.requestPointerLock();Browser.isFullScreen=true;if(Browser.resizeCanvas)Browser.setFullScreenCanvasSize()}else{canvasContainer.parentNode.insertBefore(canvas,canvasContainer);canvasContainer.parentNode.removeChild(canvasContainer);if(Browser.resizeCanvas)Browser.setWindowedCanvasSize()}if(Module["onFullScreen"])Module["onFullScreen"](Browser.isFullScreen);Browser.updateCanvasDimensions(canvas)}if(!Browser.fullScreenHandlersInstalled){Browser.fullScreenHandlersInstalled=true;document.addEventListener("fullscreenchange",fullScreenChange,false);document.addEventListener("mozfullscreenchange",fullScreenChange,false);document.addEventListener("webkitfullscreenchange",fullScreenChange,false);document.addEventListener("MSFullscreenChange",fullScreenChange,false)}var canvasContainer=document.createElement("div");canvas.parentNode.insertBefore(canvasContainer,canvas);canvasContainer.appendChild(canvas);canvasContainer.requestFullScreen=canvasContainer["requestFullScreen"]||canvasContainer["mozRequestFullScreen"]||canvasContainer["msRequestFullscreen"]||(canvasContainer["webkitRequestFullScreen"]?(function(){canvasContainer["webkitRequestFullScreen"](Element["ALLOW_KEYBOARD_INPUT"])}):null);if(vrDevice){canvasContainer.requestFullScreen({vrDisplay:vrDevice})}else{canvasContainer.requestFullScreen()}}),nextRAF:0,fakeRequestAnimationFrame:(function(func){var now=Date.now();if(Browser.nextRAF===0){Browser.nextRAF=now+1e3/60}else{while(now+2>=Browser.nextRAF){Browser.nextRAF+=1e3/60}}var delay=Math.max(Browser.nextRAF-now,0);setTimeout(func,delay)}),requestAnimationFrame:function requestAnimationFrame(func){if(typeof window==="undefined"){Browser.fakeRequestAnimationFrame(func)}else{if(!window.requestAnimationFrame){window.requestAnimationFrame=window["requestAnimationFrame"]||window["mozRequestAnimationFrame"]||window["webkitRequestAnimationFrame"]||window["msRequestAnimationFrame"]||window["oRequestAnimationFrame"]||Browser.fakeRequestAnimationFrame}window.requestAnimationFrame(func)}},safeCallback:(function(func){return(function(){if(!ABORT)return func.apply(null,arguments)})}),allowAsyncCallbacks:true,queuedAsyncCallbacks:[],pauseAsyncCallbacks:(function(){Browser.allowAsyncCallbacks=false}),resumeAsyncCallbacks:(function(){Browser.allowAsyncCallbacks=true;if(Browser.queuedAsyncCallbacks.length>0){var callbacks=Browser.queuedAsyncCallbacks;Browser.queuedAsyncCallbacks=[];callbacks.forEach((function(func){func()}))}}),safeRequestAnimationFrame:(function(func){return Browser.requestAnimationFrame((function(){if(ABORT)return;if(Browser.allowAsyncCallbacks){func()}else{Browser.queuedAsyncCallbacks.push(func)}}))}),safeSetTimeout:(function(func,timeout){Module["noExitRuntime"]=true;return setTimeout((function(){if(ABORT)return;if(Browser.allowAsyncCallbacks){func()}else{Browser.queuedAsyncCallbacks.push(func)}}),timeout)}),safeSetInterval:(function(func,timeout){Module["noExitRuntime"]=true;return setInterval((function(){if(ABORT)return;if(Browser.allowAsyncCallbacks){func()}}),timeout)}),getMimetype:(function(name){return{"jpg":"image/jpeg","jpeg":"image/jpeg","png":"image/png","bmp":"image/bmp","ogg":"audio/ogg","wav":"audio/wav","mp3":"audio/mpeg"}[name.substr(name.lastIndexOf(".")+1)]}),getUserMedia:(function(func){if(!window.getUserMedia){window.getUserMedia=navigator["getUserMedia"]||navigator["mozGetUserMedia"]}window.getUserMedia(func)}),getMovementX:(function(event){return event["movementX"]||event["mozMovementX"]||event["webkitMovementX"]||0}),getMovementY:(function(event){return event["movementY"]||event["mozMovementY"]||event["webkitMovementY"]||0}),getMouseWheelDelta:(function(event){var delta=0;switch(event.type){case"DOMMouseScroll":delta=event.detail;break;case"mousewheel":delta=event.wheelDelta;break;case"wheel":delta=event["deltaY"];break;default:throw"unrecognized mouse wheel event: "+event.type}return delta}),mouseX:0,mouseY:0,mouseMovementX:0,mouseMovementY:0,touches:{},lastTouches:{},calculateMouseEvent:(function(event){if(Browser.pointerLock){if(event.type!="mousemove"&&"mozMovementX"in event){Browser.mouseMovementX=Browser.mouseMovementY=0}else{Browser.mouseMovementX=Browser.getMovementX(event);Browser.mouseMovementY=Browser.getMovementY(event)}if(typeof SDL!="undefined"){Browser.mouseX=SDL.mouseX+Browser.mouseMovementX;Browser.mouseY=SDL.mouseY+Browser.mouseMovementY}else{Browser.mouseX+=Browser.mouseMovementX;Browser.mouseY+=Browser.mouseMovementY}}else{var rect=Module["canvas"].getBoundingClientRect();var cw=Module["canvas"].width;var ch=Module["canvas"].height;var scrollX=typeof window.scrollX!=="undefined"?window.scrollX:window.pageXOffset;var scrollY=typeof window.scrollY!=="undefined"?window.scrollY:window.pageYOffset;if(event.type==="touchstart"||event.type==="touchend"||event.type==="touchmove"){var touch=event.touch;if(touch===undefined){return}var adjustedX=touch.pageX-(scrollX+rect.left);var adjustedY=touch.pageY-(scrollY+rect.top);adjustedX=adjustedX*(cw/rect.width);adjustedY=adjustedY*(ch/rect.height);var coords={x:adjustedX,y:adjustedY};if(event.type==="touchstart"){Browser.lastTouches[touch.identifier]=coords;Browser.touches[touch.identifier]=coords}else if(event.type==="touchend"||event.type==="touchmove"){var last=Browser.touches[touch.identifier];if(!last)last=coords;Browser.lastTouches[touch.identifier]=last;Browser.touches[touch.identifier]=coords}return}var x=event.pageX-(scrollX+rect.left);var y=event.pageY-(scrollY+rect.top);x=x*(cw/rect.width);y=y*(ch/rect.height);Browser.mouseMovementX=x-Browser.mouseX;Browser.mouseMovementY=y-Browser.mouseY;Browser.mouseX=x;Browser.mouseY=y}}),xhrLoad:(function(url,onload,onerror){var xhr=new XMLHttpRequest;xhr.open("GET",url,true);xhr.responseType="arraybuffer";xhr.onload=function xhr_onload(){if(xhr.status==200||xhr.status==0&&xhr.response){onload(xhr.response)}else{onerror()}};xhr.onerror=onerror;xhr.send(null)}),asyncLoad:(function(url,onload,onerror,noRunDep){Browser.xhrLoad(url,(function(arrayBuffer){assert(arrayBuffer,'Loading data file "'+url+'" failed (no arrayBuffer).');onload(new Uint8Array(arrayBuffer));if(!noRunDep)removeRunDependency("al "+url)}),(function(event){if(onerror){onerror()}else{throw'Loading data file "'+url+'" failed.'}}));if(!noRunDep)addRunDependency("al "+url)}),resizeListeners:[],updateResizeListeners:(function(){var canvas=Module["canvas"];Browser.resizeListeners.forEach((function(listener){listener(canvas.width,canvas.height)}))}),setCanvasSize:(function(width,height,noUpdates){var canvas=Module["canvas"];Browser.updateCanvasDimensions(canvas,width,height);if(!noUpdates)Browser.updateResizeListeners()}),windowedWidth:0,windowedHeight:0,setFullScreenCanvasSize:(function(){if(typeof SDL!="undefined"){var flags=HEAPU32[SDL.screen+Runtime.QUANTUM_SIZE*0>>2];flags=flags|8388608;HEAP32[SDL.screen+Runtime.QUANTUM_SIZE*0>>2]=flags}Browser.updateResizeListeners()}),setWindowedCanvasSize:(function(){if(typeof SDL!="undefined"){var flags=HEAPU32[SDL.screen+Runtime.QUANTUM_SIZE*0>>2];flags=flags&~8388608;HEAP32[SDL.screen+Runtime.QUANTUM_SIZE*0>>2]=flags}Browser.updateResizeListeners()}),updateCanvasDimensions:(function(canvas,wNative,hNative){if(wNative&&hNative){canvas.widthNative=wNative;canvas.heightNative=hNative}else{wNative=canvas.widthNative;hNative=canvas.heightNative}var w=wNative;var h=hNative;if(Module["forcedAspectRatio"]&&Module["forcedAspectRatio"]>0){if(w/h>2]=ret}return ret}function _pthread_self(){return 0}function ___syscall140(which,varargs){SYSCALLS.varargs=varargs;try{var stream=SYSCALLS.getStreamFromFD(),offset_high=SYSCALLS.get(),offset_low=SYSCALLS.get(),result=SYSCALLS.get(),whence=SYSCALLS.get();var offset=offset_low;assert(offset_high===0);FS.llseek(stream,offset,whence);HEAP32[result>>2]=stream.position;if(stream.getdents&&offset===0&&whence===0)stream.getdents=null;return 0}catch(e){if(typeof FS==="undefined"||!(e instanceof FS.ErrnoError))abort(e);return-e.errno}}function ___syscall146(which,varargs){SYSCALLS.varargs=varargs;try{var stream=SYSCALLS.get(),iov=SYSCALLS.get(),iovcnt=SYSCALLS.get();var ret=0;if(!___syscall146.buffer)___syscall146.buffer=[];var buffer=___syscall146.buffer;for(var i=0;i>2];var len=HEAP32[iov+(i*8+4)>>2];for(var j=0;j0){return}preRun();if(runDependencies>0)return;if(Module["calledRun"])return;function doRun(){if(Module["calledRun"])return;Module["calledRun"]=true;if(ABORT)return;ensureInitRuntime();preMain();if(Module["onRuntimeInitialized"])Module["onRuntimeInitialized"]();if(Module["_main"]&&shouldRunNow)Module["callMain"](args);postRun()}if(Module["setStatus"]){Module["setStatus"]("Running...");setTimeout((function(){setTimeout((function(){Module["setStatus"]("")}),1);doRun()}),1)}else{doRun()}}Module["run"]=Module.run=run;function exit(status,implicit){if(implicit&&Module["noExitRuntime"]){return}if(Module["noExitRuntime"]){}else{ABORT=true;EXITSTATUS=status;STACKTOP=initialStackTop;exitRuntime();if(Module["onExit"])Module["onExit"](status)}if(ENVIRONMENT_IS_NODE){process["stdout"]["once"]("drain",(function(){process["exit"](status)}));console.log(" ");setTimeout((function(){process["exit"](status)}),500)}else if(ENVIRONMENT_IS_SHELL&&typeof quit==="function"){quit(status)}throw new ExitStatus(status)}Module["exit"]=Module.exit=exit;var abortDecorators=[];function abort(what){if(what!==undefined){Module.print(what);Module.printErr(what);what=JSON.stringify(what)}else{what=""}ABORT=true;EXITSTATUS=1;var extra="\nIf this abort() is unexpected, build with -s ASSERTIONS=1 which can give more information.";var output="abort("+what+") at "+stackTrace()+extra;if(abortDecorators){abortDecorators.forEach((function(decorator){output=decorator(output,what)}))}throw output}Module["abort"]=Module.abort=abort;if(Module["preInit"]){if(typeof Module["preInit"]=="function")Module["preInit"]=[Module["preInit"]];while(Module["preInit"].length>0){Module["preInit"].pop()()}}var shouldRunNow=true;if(Module["noInitialRun"]){shouldRunNow=false}Module["noExitRuntime"]=true;run() return Module; -}); \ No newline at end of file +}); diff --git a/Source/ThirdParty/earcut-2.1.1.js b/Source/ThirdParty/earcut-2.1.1.js index be074fec16b9..3b6d8636a3c2 100644 --- a/Source/ThirdParty/earcut-2.1.1.js +++ b/Source/ThirdParty/earcut-2.1.1.js @@ -1,4 +1,3 @@ -/*global define*/ define([], function() { 'use strict'; diff --git a/Source/ThirdParty/gltfDefaults.js b/Source/ThirdParty/gltfDefaults.js index d9174d665b2f..5ca87748bf11 100644 --- a/Source/ThirdParty/gltfDefaults.js +++ b/Source/ThirdParty/gltfDefaults.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/defaultValue', diff --git a/Source/ThirdParty/google-earth-dbroot-parser.js b/Source/ThirdParty/google-earth-dbroot-parser.js index 4354c7c45c39..ef369c84aaea 100644 --- a/Source/ThirdParty/google-earth-dbroot-parser.js +++ b/Source/ThirdParty/google-earth-dbroot-parser.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './protobuf-minimal' ], function( diff --git a/Source/ThirdParty/jsep.js b/Source/ThirdParty/jsep.js index 442b3d4531ca..7c5886740f6f 100644 --- a/Source/ThirdParty/jsep.js +++ b/Source/ThirdParty/jsep.js @@ -2,7 +2,6 @@ // JSEP may be freely distributed under the MIT License // http://jsep.from.so/ -/*global define*/ define(function() { /*global module: true, exports: true, console: true */ diff --git a/Source/ThirdParty/kdbush.js b/Source/ThirdParty/kdbush.js index 6508d0349ff1..91dfa1435783 100644 --- a/Source/ThirdParty/kdbush.js +++ b/Source/ThirdParty/kdbush.js @@ -1,4 +1,3 @@ -/*global define*/ define([], function() { 'use strict'; diff --git a/Source/ThirdParty/knockout.js b/Source/ThirdParty/knockout.js index 19f2dd41b801..8c2a144f32bc 100644 --- a/Source/ThirdParty/knockout.js +++ b/Source/ThirdParty/knockout.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './knockout-3.4.0', './knockout-es5', diff --git a/Source/ThirdParty/measureText.js b/Source/ThirdParty/measureText.js index 8a32a26454f0..51b5c2580d01 100644 --- a/Source/ThirdParty/measureText.js +++ b/Source/ThirdParty/measureText.js @@ -35,7 +35,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **/ -/*global define*/ define(function() { /*jshint strict:false*/ /* diff --git a/Source/ThirdParty/sprintf.js b/Source/ThirdParty/sprintf.js index 4745dd9e3430..b487908bd8ac 100644 --- a/Source/ThirdParty/sprintf.js +++ b/Source/ThirdParty/sprintf.js @@ -125,7 +125,6 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/*global define*/ define(function() { function sprintf () { diff --git a/Source/Widgets/Animation/Animation.js b/Source/Widgets/Animation/Animation.js index b8cf1aa6ea4c..1c1e63091c93 100644 --- a/Source/Widgets/Animation/Animation.js +++ b/Source/Widgets/Animation/Animation.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/Color', '../../Core/defined', diff --git a/Source/Widgets/Animation/AnimationViewModel.js b/Source/Widgets/Animation/AnimationViewModel.js index dc4a5e4700ef..4f884513cf23 100644 --- a/Source/Widgets/Animation/AnimationViewModel.js +++ b/Source/Widgets/Animation/AnimationViewModel.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/binarySearch', '../../Core/ClockRange', diff --git a/Source/Widgets/BaseLayerPicker/BaseLayerPicker.js b/Source/Widgets/BaseLayerPicker/BaseLayerPicker.js index b702a6fff470..aed4ba427bae 100644 --- a/Source/Widgets/BaseLayerPicker/BaseLayerPicker.js +++ b/Source/Widgets/BaseLayerPicker/BaseLayerPicker.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defined', '../../Core/defineProperties', diff --git a/Source/Widgets/BaseLayerPicker/BaseLayerPickerViewModel.js b/Source/Widgets/BaseLayerPicker/BaseLayerPickerViewModel.js index f925142a3846..74613d8eb576 100644 --- a/Source/Widgets/BaseLayerPicker/BaseLayerPickerViewModel.js +++ b/Source/Widgets/BaseLayerPicker/BaseLayerPickerViewModel.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defaultValue', '../../Core/defined', diff --git a/Source/Widgets/BaseLayerPicker/ProviderViewModel.js b/Source/Widgets/BaseLayerPicker/ProviderViewModel.js index 904dd015e808..408b3a62512b 100644 --- a/Source/Widgets/BaseLayerPicker/ProviderViewModel.js +++ b/Source/Widgets/BaseLayerPicker/ProviderViewModel.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defined', '../../Core/defineProperties', diff --git a/Source/Widgets/BaseLayerPicker/createDefaultImageryProviderViewModels.js b/Source/Widgets/BaseLayerPicker/createDefaultImageryProviderViewModels.js index 433d34841900..4ee11ebfbd9d 100644 --- a/Source/Widgets/BaseLayerPicker/createDefaultImageryProviderViewModels.js +++ b/Source/Widgets/BaseLayerPicker/createDefaultImageryProviderViewModels.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/buildModuleUrl', '../../Scene/ArcGisMapServerImageryProvider', diff --git a/Source/Widgets/BaseLayerPicker/createDefaultTerrainProviderViewModels.js b/Source/Widgets/BaseLayerPicker/createDefaultTerrainProviderViewModels.js index af24c65c3004..d5cdaef54871 100644 --- a/Source/Widgets/BaseLayerPicker/createDefaultTerrainProviderViewModels.js +++ b/Source/Widgets/BaseLayerPicker/createDefaultTerrainProviderViewModels.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/buildModuleUrl', '../../Core/CesiumTerrainProvider', diff --git a/Source/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspector.js b/Source/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspector.js index 8c90f59d6a67..faa7d1228d6d 100644 --- a/Source/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspector.js +++ b/Source/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspector.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/Check', '../../Core/defaultValue', @@ -8,7 +7,7 @@ define([ '../../ThirdParty/knockout', '../getElement', './Cesium3DTilesInspectorViewModel' -], function( + ], function( Check, defaultValue, defined, diff --git a/Source/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel.js b/Source/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel.js index 23b02d8ca357..087e97918e5f 100644 --- a/Source/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel.js +++ b/Source/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel.js @@ -1,32 +1,31 @@ -/*global define*/ define([ - '../../Scene/Cesium3DTileFeature', - '../../Scene/Cesium3DTileset', - '../../Scene/Cesium3DTileStyle', - '../../Scene/Cesium3DTileColorBlendMode', '../../Core/Check', '../../Core/Color', '../../Core/defined', '../../Core/defineProperties', '../../Core/destroyObject', - '../../ThirdParty/knockout', - '../../Scene/PerformanceDisplay', '../../Core/ScreenSpaceEventHandler', - '../../Core/ScreenSpaceEventType' -], function( - Cesium3DTileFeature, - Cesium3DTileset, - Cesium3DTileStyle, - Cesium3DTileColorBlendMode, + '../../Core/ScreenSpaceEventType', + '../../Scene/Cesium3DTileColorBlendMode', + '../../Scene/Cesium3DTileFeature', + '../../Scene/Cesium3DTileset', + '../../Scene/Cesium3DTileStyle', + '../../Scene/PerformanceDisplay', + '../../ThirdParty/knockout' + ], function( Check, Color, defined, defineProperties, destroyObject, - knockout, - PerformanceDisplay, ScreenSpaceEventHandler, - ScreenSpaceEventType) { + ScreenSpaceEventType, + Cesium3DTileColorBlendMode, + Cesium3DTileFeature, + Cesium3DTileset, + Cesium3DTileStyle, + PerformanceDisplay, + knockout) { 'use strict'; function getPickTileset(viewModel) { diff --git a/Source/Widgets/CesiumInspector/CesiumInspector.js b/Source/Widgets/CesiumInspector/CesiumInspector.js index d9dd5d9d360d..5146063e5f04 100644 --- a/Source/Widgets/CesiumInspector/CesiumInspector.js +++ b/Source/Widgets/CesiumInspector/CesiumInspector.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defined', '../../Core/defineProperties', diff --git a/Source/Widgets/CesiumInspector/CesiumInspectorViewModel.js b/Source/Widgets/CesiumInspector/CesiumInspectorViewModel.js index 7082697ef435..c257adaa36df 100644 --- a/Source/Widgets/CesiumInspector/CesiumInspectorViewModel.js +++ b/Source/Widgets/CesiumInspector/CesiumInspectorViewModel.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defined', '../../Core/defineProperties', diff --git a/Source/Widgets/CesiumWidget/CesiumWidget.js b/Source/Widgets/CesiumWidget/CesiumWidget.js index 8322cc4b9c5a..da432e22142a 100644 --- a/Source/Widgets/CesiumWidget/CesiumWidget.js +++ b/Source/Widgets/CesiumWidget/CesiumWidget.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/buildModuleUrl', '../../Core/Cartesian3', diff --git a/Source/Widgets/ClockViewModel.js b/Source/Widgets/ClockViewModel.js index 96bd1cf9351e..15b3402bc91e 100644 --- a/Source/Widgets/ClockViewModel.js +++ b/Source/Widgets/ClockViewModel.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Clock', '../Core/defined', diff --git a/Source/Widgets/Command.js b/Source/Widgets/Command.js index a3a94ef604da..b0dcf3c5e0fe 100644 --- a/Source/Widgets/Command.js +++ b/Source/Widgets/Command.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/DeveloperError' ], function( diff --git a/Source/Widgets/FullscreenButton/FullscreenButton.js b/Source/Widgets/FullscreenButton/FullscreenButton.js index 982deca97c37..03832eb283c3 100644 --- a/Source/Widgets/FullscreenButton/FullscreenButton.js +++ b/Source/Widgets/FullscreenButton/FullscreenButton.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defined', '../../Core/defineProperties', diff --git a/Source/Widgets/FullscreenButton/FullscreenButtonViewModel.js b/Source/Widgets/FullscreenButton/FullscreenButtonViewModel.js index 41b1d3e03b40..40239446f3c0 100644 --- a/Source/Widgets/FullscreenButton/FullscreenButtonViewModel.js +++ b/Source/Widgets/FullscreenButton/FullscreenButtonViewModel.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defaultValue', '../../Core/defineProperties', diff --git a/Source/Widgets/Geocoder/Geocoder.js b/Source/Widgets/Geocoder/Geocoder.js index 3d21be2dd4fd..7926cf53b489 100644 --- a/Source/Widgets/Geocoder/Geocoder.js +++ b/Source/Widgets/Geocoder/Geocoder.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defined', '../../Core/defineProperties', diff --git a/Source/Widgets/Geocoder/GeocoderViewModel.js b/Source/Widgets/Geocoder/GeocoderViewModel.js index c12e42e7a8a9..8dc02b5cdb02 100644 --- a/Source/Widgets/Geocoder/GeocoderViewModel.js +++ b/Source/Widgets/Geocoder/GeocoderViewModel.js @@ -1,12 +1,11 @@ -/*global define*/ define([ '../../Core/BingMapsGeocoderService', + '../../Core/CartographicGeocoderService', '../../Core/defaultValue', '../../Core/defined', '../../Core/defineProperties', '../../Core/DeveloperError', '../../Core/Event', - '../../Core/CartographicGeocoderService', '../../Core/Matrix4', '../../ThirdParty/knockout', '../../ThirdParty/when', @@ -14,12 +13,12 @@ define([ '../getElement' ], function( BingMapsGeocoderService, + CartographicGeocoderService, defaultValue, defined, defineProperties, DeveloperError, Event, - CartographicGeocoderService, Matrix4, knockout, when, diff --git a/Source/Widgets/HomeButton/HomeButton.js b/Source/Widgets/HomeButton/HomeButton.js index dd0f185b5a2c..a162fa4d09cf 100644 --- a/Source/Widgets/HomeButton/HomeButton.js +++ b/Source/Widgets/HomeButton/HomeButton.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defined', '../../Core/defineProperties', diff --git a/Source/Widgets/HomeButton/HomeButtonViewModel.js b/Source/Widgets/HomeButton/HomeButtonViewModel.js index 1c869d24bcb9..720673fc5f7f 100644 --- a/Source/Widgets/HomeButton/HomeButtonViewModel.js +++ b/Source/Widgets/HomeButton/HomeButtonViewModel.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defined', '../../Core/defineProperties', diff --git a/Source/Widgets/InfoBox/InfoBox.js b/Source/Widgets/InfoBox/InfoBox.js index 1f63fdb82137..da8d533b05c8 100644 --- a/Source/Widgets/InfoBox/InfoBox.js +++ b/Source/Widgets/InfoBox/InfoBox.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/buildModuleUrl', '../../Core/Color', diff --git a/Source/Widgets/InfoBox/InfoBoxViewModel.js b/Source/Widgets/InfoBox/InfoBoxViewModel.js index d9fcbd9f1885..39d4b2ead05d 100644 --- a/Source/Widgets/InfoBox/InfoBoxViewModel.js +++ b/Source/Widgets/InfoBox/InfoBoxViewModel.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defined', '../../Core/defineProperties', diff --git a/Source/Widgets/NavigationHelpButton/NavigationHelpButton.js b/Source/Widgets/NavigationHelpButton/NavigationHelpButton.js index 83c1dedef3f7..82023519f517 100644 --- a/Source/Widgets/NavigationHelpButton/NavigationHelpButton.js +++ b/Source/Widgets/NavigationHelpButton/NavigationHelpButton.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/buildModuleUrl', '../../Core/defaultValue', diff --git a/Source/Widgets/NavigationHelpButton/NavigationHelpButtonViewModel.js b/Source/Widgets/NavigationHelpButton/NavigationHelpButtonViewModel.js index d1d01dd61df0..ebbd26ef838d 100644 --- a/Source/Widgets/NavigationHelpButton/NavigationHelpButtonViewModel.js +++ b/Source/Widgets/NavigationHelpButton/NavigationHelpButtonViewModel.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defineProperties', '../../ThirdParty/knockout', diff --git a/Source/Widgets/PerformanceWatchdog/PerformanceWatchdog.js b/Source/Widgets/PerformanceWatchdog/PerformanceWatchdog.js index f4be8f943c2b..641e7b2d9077 100644 --- a/Source/Widgets/PerformanceWatchdog/PerformanceWatchdog.js +++ b/Source/Widgets/PerformanceWatchdog/PerformanceWatchdog.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defined', '../../Core/defineProperties', diff --git a/Source/Widgets/PerformanceWatchdog/PerformanceWatchdogViewModel.js b/Source/Widgets/PerformanceWatchdog/PerformanceWatchdogViewModel.js index 4a2e245da403..5b1c26770b51 100644 --- a/Source/Widgets/PerformanceWatchdog/PerformanceWatchdogViewModel.js +++ b/Source/Widgets/PerformanceWatchdog/PerformanceWatchdogViewModel.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defaultValue', '../../Core/defined', diff --git a/Source/Widgets/ProjectionPicker/ProjectionPicker.js b/Source/Widgets/ProjectionPicker/ProjectionPicker.js index 1405115e4113..c7a8ad891d32 100644 --- a/Source/Widgets/ProjectionPicker/ProjectionPicker.js +++ b/Source/Widgets/ProjectionPicker/ProjectionPicker.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defined', '../../Core/defineProperties', diff --git a/Source/Widgets/ProjectionPicker/ProjectionPickerViewModel.js b/Source/Widgets/ProjectionPicker/ProjectionPickerViewModel.js index 47efdeb637a2..2eaeb5ddc0c7 100644 --- a/Source/Widgets/ProjectionPicker/ProjectionPickerViewModel.js +++ b/Source/Widgets/ProjectionPicker/ProjectionPickerViewModel.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defined', '../../Core/defineProperties', diff --git a/Source/Widgets/SceneModePicker/SceneModePicker.js b/Source/Widgets/SceneModePicker/SceneModePicker.js index 92901be69d39..74bd8ba636a3 100644 --- a/Source/Widgets/SceneModePicker/SceneModePicker.js +++ b/Source/Widgets/SceneModePicker/SceneModePicker.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defined', '../../Core/defineProperties', diff --git a/Source/Widgets/SceneModePicker/SceneModePickerViewModel.js b/Source/Widgets/SceneModePicker/SceneModePickerViewModel.js index 7deb1339ac4c..4eef323d0d87 100644 --- a/Source/Widgets/SceneModePicker/SceneModePickerViewModel.js +++ b/Source/Widgets/SceneModePicker/SceneModePickerViewModel.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defaultValue', '../../Core/defined', diff --git a/Source/Widgets/SelectionIndicator/SelectionIndicator.js b/Source/Widgets/SelectionIndicator/SelectionIndicator.js index 4108d9b2b620..4be492721dbe 100644 --- a/Source/Widgets/SelectionIndicator/SelectionIndicator.js +++ b/Source/Widgets/SelectionIndicator/SelectionIndicator.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defined', '../../Core/defineProperties', diff --git a/Source/Widgets/SelectionIndicator/SelectionIndicatorViewModel.js b/Source/Widgets/SelectionIndicator/SelectionIndicatorViewModel.js index 408510032cd8..3f8288297d7c 100644 --- a/Source/Widgets/SelectionIndicator/SelectionIndicatorViewModel.js +++ b/Source/Widgets/SelectionIndicator/SelectionIndicatorViewModel.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/Cartesian2', '../../Core/defaultValue', diff --git a/Source/Widgets/SvgPathBindingHandler.js b/Source/Widgets/SvgPathBindingHandler.js index 5521a7be6d3a..de0f36aed643 100644 --- a/Source/Widgets/SvgPathBindingHandler.js +++ b/Source/Widgets/SvgPathBindingHandler.js @@ -1,4 +1,3 @@ -/*global define*/ define(function() { 'use strict'; diff --git a/Source/Widgets/Timeline/Timeline.js b/Source/Widgets/Timeline/Timeline.js index 29b5dfd0715a..c4102573f48d 100644 --- a/Source/Widgets/Timeline/Timeline.js +++ b/Source/Widgets/Timeline/Timeline.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/ClockRange', '../../Core/defined', diff --git a/Source/Widgets/Timeline/TimelineHighlightRange.js b/Source/Widgets/Timeline/TimelineHighlightRange.js index 61d9dc6b48a2..5c102b33bbfb 100644 --- a/Source/Widgets/Timeline/TimelineHighlightRange.js +++ b/Source/Widgets/Timeline/TimelineHighlightRange.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defaultValue', '../../Core/JulianDate' diff --git a/Source/Widgets/Timeline/TimelineTrack.js b/Source/Widgets/Timeline/TimelineTrack.js index ae3424b9b2d1..6851edb6541b 100644 --- a/Source/Widgets/Timeline/TimelineTrack.js +++ b/Source/Widgets/Timeline/TimelineTrack.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/Color', '../../Core/defined', diff --git a/Source/Widgets/ToggleButtonViewModel.js b/Source/Widgets/ToggleButtonViewModel.js index c627c54abe31..b4dc3f7a1301 100644 --- a/Source/Widgets/ToggleButtonViewModel.js +++ b/Source/Widgets/ToggleButtonViewModel.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/Widgets/VRButton/VRButton.js b/Source/Widgets/VRButton/VRButton.js index 795f50212461..d345bd4f545b 100644 --- a/Source/Widgets/VRButton/VRButton.js +++ b/Source/Widgets/VRButton/VRButton.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defined', '../../Core/defineProperties', diff --git a/Source/Widgets/VRButton/VRButtonViewModel.js b/Source/Widgets/VRButton/VRButtonViewModel.js index a5ec9bfbc66e..279310b752c3 100644 --- a/Source/Widgets/VRButton/VRButtonViewModel.js +++ b/Source/Widgets/VRButton/VRButtonViewModel.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defaultValue', '../../Core/defined', diff --git a/Source/Widgets/Viewer/Viewer.js b/Source/Widgets/Viewer/Viewer.js index 4218dbd27e7e..7ca93367ca3c 100644 --- a/Source/Widgets/Viewer/Viewer.js +++ b/Source/Widgets/Viewer/Viewer.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/BoundingSphere', '../../Core/Cartesian3', diff --git a/Source/Widgets/Viewer/viewerCesium3DTilesInspectorMixin.js b/Source/Widgets/Viewer/viewerCesium3DTilesInspectorMixin.js index 069189bc5f3b..996f98fb65f4 100644 --- a/Source/Widgets/Viewer/viewerCesium3DTilesInspectorMixin.js +++ b/Source/Widgets/Viewer/viewerCesium3DTilesInspectorMixin.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/Check', '../../Core/defineProperties', diff --git a/Source/Widgets/Viewer/viewerCesiumInspectorMixin.js b/Source/Widgets/Viewer/viewerCesiumInspectorMixin.js index 6f93b85915f9..f3cc79729c14 100644 --- a/Source/Widgets/Viewer/viewerCesiumInspectorMixin.js +++ b/Source/Widgets/Viewer/viewerCesiumInspectorMixin.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defined', '../../Core/defineProperties', diff --git a/Source/Widgets/Viewer/viewerDragDropMixin.js b/Source/Widgets/Viewer/viewerDragDropMixin.js index 183424f9fe21..e3c6d3f443c2 100644 --- a/Source/Widgets/Viewer/viewerDragDropMixin.js +++ b/Source/Widgets/Viewer/viewerDragDropMixin.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defaultValue', '../../Core/defined', diff --git a/Source/Widgets/Viewer/viewerPerformanceWatchdogMixin.js b/Source/Widgets/Viewer/viewerPerformanceWatchdogMixin.js index e92ec1e76385..134e3fcda98b 100644 --- a/Source/Widgets/Viewer/viewerPerformanceWatchdogMixin.js +++ b/Source/Widgets/Viewer/viewerPerformanceWatchdogMixin.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../../Core/defaultValue', '../../Core/defined', diff --git a/Source/Widgets/createCommand.js b/Source/Widgets/createCommand.js index a89c6662563e..713ba2c489c3 100644 --- a/Source/Widgets/createCommand.js +++ b/Source/Widgets/createCommand.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/Widgets/getElement.js b/Source/Widgets/getElement.js index aee459990dea..7ac605cac65b 100644 --- a/Source/Widgets/getElement.js +++ b/Source/Widgets/getElement.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/DeveloperError' ], function( diff --git a/Source/Widgets/subscribeAndEvaluate.js b/Source/Widgets/subscribeAndEvaluate.js index ffae62bf087b..0a81a75eebda 100644 --- a/Source/Widgets/subscribeAndEvaluate.js +++ b/Source/Widgets/subscribeAndEvaluate.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../ThirdParty/knockout' ], function( diff --git a/Source/Workers/combineGeometry.js b/Source/Workers/combineGeometry.js index 284a54953414..4173e1dc5ce4 100644 --- a/Source/Workers/combineGeometry.js +++ b/Source/Workers/combineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Scene/PrimitivePipeline', './createTaskProcessorWorker' diff --git a/Source/Workers/createBoxGeometry.js b/Source/Workers/createBoxGeometry.js index 27a4e65c25a1..2b79065a91b7 100644 --- a/Source/Workers/createBoxGeometry.js +++ b/Source/Workers/createBoxGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoxGeometry', '../Core/defined' diff --git a/Source/Workers/createBoxOutlineGeometry.js b/Source/Workers/createBoxOutlineGeometry.js index f47cd40f9e13..586ba54a979b 100644 --- a/Source/Workers/createBoxOutlineGeometry.js +++ b/Source/Workers/createBoxOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/BoxOutlineGeometry', '../Core/defined' diff --git a/Source/Workers/createCircleGeometry.js b/Source/Workers/createCircleGeometry.js index a1c2e19c6010..7ec181578bd3 100644 --- a/Source/Workers/createCircleGeometry.js +++ b/Source/Workers/createCircleGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/CircleGeometry', diff --git a/Source/Workers/createCircleOutlineGeometry.js b/Source/Workers/createCircleOutlineGeometry.js index b834e71379ee..73d403b6176b 100644 --- a/Source/Workers/createCircleOutlineGeometry.js +++ b/Source/Workers/createCircleOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/CircleOutlineGeometry', diff --git a/Source/Workers/createCorridorGeometry.js b/Source/Workers/createCorridorGeometry.js index a72943cea612..04862ca46094 100644 --- a/Source/Workers/createCorridorGeometry.js +++ b/Source/Workers/createCorridorGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/CorridorGeometry', '../Core/defined', diff --git a/Source/Workers/createCorridorOutlineGeometry.js b/Source/Workers/createCorridorOutlineGeometry.js index 1948ed8ba2b8..5aafd42f0a19 100644 --- a/Source/Workers/createCorridorOutlineGeometry.js +++ b/Source/Workers/createCorridorOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/CorridorOutlineGeometry', '../Core/defined', diff --git a/Source/Workers/createCylinderGeometry.js b/Source/Workers/createCylinderGeometry.js index 5ea366af8307..06360bb69114 100644 --- a/Source/Workers/createCylinderGeometry.js +++ b/Source/Workers/createCylinderGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/CylinderGeometry', '../Core/defined' diff --git a/Source/Workers/createCylinderOutlineGeometry.js b/Source/Workers/createCylinderOutlineGeometry.js index bc42d20b42d4..2f9fea098b11 100644 --- a/Source/Workers/createCylinderOutlineGeometry.js +++ b/Source/Workers/createCylinderOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/CylinderOutlineGeometry', '../Core/defined' diff --git a/Source/Workers/createEllipseGeometry.js b/Source/Workers/createEllipseGeometry.js index b50e3b842dbb..16f097a9b992 100644 --- a/Source/Workers/createEllipseGeometry.js +++ b/Source/Workers/createEllipseGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/defined', diff --git a/Source/Workers/createEllipseOutlineGeometry.js b/Source/Workers/createEllipseOutlineGeometry.js index e047b1d4a806..6e101d4a6811 100644 --- a/Source/Workers/createEllipseOutlineGeometry.js +++ b/Source/Workers/createEllipseOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Cartesian3', '../Core/defined', diff --git a/Source/Workers/createEllipsoidGeometry.js b/Source/Workers/createEllipsoidGeometry.js index 42e4ea2c4be6..7779c6d8cbd9 100644 --- a/Source/Workers/createEllipsoidGeometry.js +++ b/Source/Workers/createEllipsoidGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/EllipsoidGeometry' diff --git a/Source/Workers/createEllipsoidOutlineGeometry.js b/Source/Workers/createEllipsoidOutlineGeometry.js index db4e9db6c7ea..8f5a2282ac21 100644 --- a/Source/Workers/createEllipsoidOutlineGeometry.js +++ b/Source/Workers/createEllipsoidOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/EllipsoidOutlineGeometry' diff --git a/Source/Workers/createGeometry.js b/Source/Workers/createGeometry.js index 7afe0f2c4f1b..f82872a34920 100644 --- a/Source/Workers/createGeometry.js +++ b/Source/Workers/createGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Scene/PrimitivePipeline', diff --git a/Source/Workers/createPolygonGeometry.js b/Source/Workers/createPolygonGeometry.js index c8610813b4fe..e57458a91c22 100644 --- a/Source/Workers/createPolygonGeometry.js +++ b/Source/Workers/createPolygonGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/Ellipsoid', diff --git a/Source/Workers/createPolygonOutlineGeometry.js b/Source/Workers/createPolygonOutlineGeometry.js index 59f8bcc50353..c8609081483b 100644 --- a/Source/Workers/createPolygonOutlineGeometry.js +++ b/Source/Workers/createPolygonOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/Ellipsoid', diff --git a/Source/Workers/createPolylineGeometry.js b/Source/Workers/createPolylineGeometry.js index c00bbb973c41..04356c91bf34 100644 --- a/Source/Workers/createPolylineGeometry.js +++ b/Source/Workers/createPolylineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/Ellipsoid', diff --git a/Source/Workers/createPolylineVolumeGeometry.js b/Source/Workers/createPolylineVolumeGeometry.js index 91cfb93055ca..70e903f24c4c 100644 --- a/Source/Workers/createPolylineVolumeGeometry.js +++ b/Source/Workers/createPolylineVolumeGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/Ellipsoid', diff --git a/Source/Workers/createPolylineVolumeOutlineGeometry.js b/Source/Workers/createPolylineVolumeOutlineGeometry.js index 810a44d9caa3..79b9acbc0eb0 100644 --- a/Source/Workers/createPolylineVolumeOutlineGeometry.js +++ b/Source/Workers/createPolylineVolumeOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/Ellipsoid', diff --git a/Source/Workers/createRectangleGeometry.js b/Source/Workers/createRectangleGeometry.js index 5f83db6e9538..49377036a7be 100644 --- a/Source/Workers/createRectangleGeometry.js +++ b/Source/Workers/createRectangleGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/Ellipsoid', diff --git a/Source/Workers/createRectangleOutlineGeometry.js b/Source/Workers/createRectangleOutlineGeometry.js index 7ee943fdedb5..4dcc681bd8d6 100644 --- a/Source/Workers/createRectangleOutlineGeometry.js +++ b/Source/Workers/createRectangleOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/Ellipsoid', diff --git a/Source/Workers/createSimplePolylineGeometry.js b/Source/Workers/createSimplePolylineGeometry.js index 3644eb47de8c..71de0ea8c0e0 100644 --- a/Source/Workers/createSimplePolylineGeometry.js +++ b/Source/Workers/createSimplePolylineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/Ellipsoid', diff --git a/Source/Workers/createSphereGeometry.js b/Source/Workers/createSphereGeometry.js index e8ae4077125c..5a9bb86815d2 100644 --- a/Source/Workers/createSphereGeometry.js +++ b/Source/Workers/createSphereGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/SphereGeometry' diff --git a/Source/Workers/createSphereOutlineGeometry.js b/Source/Workers/createSphereOutlineGeometry.js index dbc8012a33cf..4273bfd5a90d 100644 --- a/Source/Workers/createSphereOutlineGeometry.js +++ b/Source/Workers/createSphereOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/SphereOutlineGeometry' diff --git a/Source/Workers/createTaskProcessorWorker.js b/Source/Workers/createTaskProcessorWorker.js index 265303a07202..ce0d12a5a249 100644 --- a/Source/Workers/createTaskProcessorWorker.js +++ b/Source/Workers/createTaskProcessorWorker.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defaultValue', '../Core/defined', diff --git a/Source/Workers/createVerticesFromGoogleEarthEnterpriseBuffer.js b/Source/Workers/createVerticesFromGoogleEarthEnterpriseBuffer.js index 59b4c8b3ae3f..cbde530e722c 100644 --- a/Source/Workers/createVerticesFromGoogleEarthEnterpriseBuffer.js +++ b/Source/Workers/createVerticesFromGoogleEarthEnterpriseBuffer.js @@ -1,42 +1,41 @@ -/*global define*/ define([ - '../Core/AxisAlignedBoundingBox', - '../Core/BoundingSphere', - '../Core/Cartesian2', - '../Core/Cartesian3', - '../Core/Cartographic', - '../Core/defaultValue', - '../Core/defined', - '../Core/Ellipsoid', - '../Core/EllipsoidalOccluder', - '../Core/Math', - '../Core/Matrix4', - '../Core/OrientedBoundingBox', - '../Core/Rectangle', - '../Core/RuntimeError', - '../Core/TerrainEncoding', - '../Core/Transforms', - '../Core/WebMercatorProjection', - './createTaskProcessorWorker' -], function( - AxisAlignedBoundingBox, - BoundingSphere, - Cartesian2, - Cartesian3, - Cartographic, - defaultValue, - defined, - Ellipsoid, - EllipsoidalOccluder, - CesiumMath, - Matrix4, - OrientedBoundingBox, - Rectangle, - RuntimeError, - TerrainEncoding, - Transforms, - WebMercatorProjection, - createTaskProcessorWorker) { + '../Core/AxisAlignedBoundingBox', + '../Core/BoundingSphere', + '../Core/Cartesian2', + '../Core/Cartesian3', + '../Core/Cartographic', + '../Core/defaultValue', + '../Core/defined', + '../Core/Ellipsoid', + '../Core/EllipsoidalOccluder', + '../Core/Math', + '../Core/Matrix4', + '../Core/OrientedBoundingBox', + '../Core/Rectangle', + '../Core/RuntimeError', + '../Core/TerrainEncoding', + '../Core/Transforms', + '../Core/WebMercatorProjection', + './createTaskProcessorWorker' + ], function( + AxisAlignedBoundingBox, + BoundingSphere, + Cartesian2, + Cartesian3, + Cartographic, + defaultValue, + defined, + Ellipsoid, + EllipsoidalOccluder, + CesiumMath, + Matrix4, + OrientedBoundingBox, + Rectangle, + RuntimeError, + TerrainEncoding, + Transforms, + WebMercatorProjection, + createTaskProcessorWorker) { 'use strict'; var sizeOfUint16 = Uint16Array.BYTES_PER_ELEMENT; diff --git a/Source/Workers/createVerticesFromHeightmap.js b/Source/Workers/createVerticesFromHeightmap.js index 322515418a70..214084111175 100644 --- a/Source/Workers/createVerticesFromHeightmap.js +++ b/Source/Workers/createVerticesFromHeightmap.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/Ellipsoid', '../Core/HeightmapTessellator', diff --git a/Source/Workers/createVerticesFromQuantizedTerrainMesh.js b/Source/Workers/createVerticesFromQuantizedTerrainMesh.js index 2c81e05a22b5..bbd328bdd0f2 100644 --- a/Source/Workers/createVerticesFromQuantizedTerrainMesh.js +++ b/Source/Workers/createVerticesFromQuantizedTerrainMesh.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/AttributeCompression', '../Core/AxisAlignedBoundingBox', diff --git a/Source/Workers/createWallGeometry.js b/Source/Workers/createWallGeometry.js index eca171c69e35..b0970f0c7a5c 100644 --- a/Source/Workers/createWallGeometry.js +++ b/Source/Workers/createWallGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/Ellipsoid', diff --git a/Source/Workers/createWallOutlineGeometry.js b/Source/Workers/createWallOutlineGeometry.js index 7be52b6c41f4..ed57693643f6 100644 --- a/Source/Workers/createWallOutlineGeometry.js +++ b/Source/Workers/createWallOutlineGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/defined', '../Core/Ellipsoid', diff --git a/Source/Workers/decodeGoogleEarthEnterprisePacket.js b/Source/Workers/decodeGoogleEarthEnterprisePacket.js index 2a91b6b28385..12f02ab0be4f 100644 --- a/Source/Workers/decodeGoogleEarthEnterprisePacket.js +++ b/Source/Workers/decodeGoogleEarthEnterprisePacket.js @@ -1,16 +1,15 @@ -/*global define*/ define([ - '../Core/decodeGoogleEarthEnterpriseData', - '../Core/RuntimeError', - '../Core/GoogleEarthEnterpriseTileInformation', - './createTaskProcessorWorker', - '../ThirdParty/pako_inflate' -], function( - decodeGoogleEarthEnterpriseData, - RuntimeError, - GoogleEarthEnterpriseTileInformation, - createTaskProcessorWorker, - pako) { + '../Core/decodeGoogleEarthEnterpriseData', + '../Core/GoogleEarthEnterpriseTileInformation', + '../Core/RuntimeError', + '../ThirdParty/pako_inflate', + './createTaskProcessorWorker' + ], function( + decodeGoogleEarthEnterpriseData, + GoogleEarthEnterpriseTileInformation, + RuntimeError, + pako, + createTaskProcessorWorker) { 'use strict'; // Datatype sizes diff --git a/Source/Workers/transcodeCRNToDXT.js b/Source/Workers/transcodeCRNToDXT.js index 4eaa40f2a7e8..e5a28e1297cd 100644 --- a/Source/Workers/transcodeCRNToDXT.js +++ b/Source/Workers/transcodeCRNToDXT.js @@ -1,19 +1,17 @@ -/*global define*/ define([ - '../Core/CompressedTextureBuffer', - '../Core/defined', - '../Core/PixelFormat', - '../Core/RuntimeError', - '../ThirdParty/crunch', - './createTaskProcessorWorker' -], function( - CompressedTextureBuffer, - defined, - PixelFormat, - RuntimeError, - crunch, - createTaskProcessorWorker -) { + '../Core/CompressedTextureBuffer', + '../Core/defined', + '../Core/PixelFormat', + '../Core/RuntimeError', + '../ThirdParty/crunch', + './createTaskProcessorWorker' + ], function( + CompressedTextureBuffer, + defined, + PixelFormat, + RuntimeError, + crunch, + createTaskProcessorWorker) { 'use strict'; // Modified from texture-tester diff --git a/Source/Workers/upsampleQuantizedTerrainMesh.js b/Source/Workers/upsampleQuantizedTerrainMesh.js index c194ede5065d..1d4b737e5a89 100644 --- a/Source/Workers/upsampleQuantizedTerrainMesh.js +++ b/Source/Workers/upsampleQuantizedTerrainMesh.js @@ -1,4 +1,3 @@ -/*global define*/ define([ '../Core/AttributeCompression', '../Core/BoundingSphere', diff --git a/Specs/.eslintrc.json b/Specs/.eslintrc.json index 4e5b171366ba..18af24775402 100644 --- a/Specs/.eslintrc.json +++ b/Specs/.eslintrc.json @@ -3,6 +3,9 @@ "env": { "jasmine": true }, + "globals": { + "defineSuite": true + }, "rules": { "quotes": "off" } diff --git a/Specs/BadGeometry.js b/Specs/BadGeometry.js index 8d996c5211ad..07d82fe5e25a 100644 --- a/Specs/BadGeometry.js +++ b/Specs/BadGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/queryToObject', 'Core/RuntimeError' diff --git a/Specs/Cesium3DTilesTester.js b/Specs/Cesium3DTilesTester.js index 07bff2877fe1..9f47a6ad7f6a 100644 --- a/Specs/Cesium3DTilesTester.js +++ b/Specs/Cesium3DTilesTester.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/arrayFill', 'Core/Color', diff --git a/Specs/Core/AssociativeArraySpec.js b/Specs/Core/AssociativeArraySpec.js index 00079f2dde7f..499cd2ba1cde 100644 --- a/Specs/Core/AssociativeArraySpec.js +++ b/Specs/Core/AssociativeArraySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/AssociativeArray' ], function( diff --git a/Specs/Core/AttributeCompressionSpec.js b/Specs/Core/AttributeCompressionSpec.js index 574bda8995bf..7c2fdf55d94d 100644 --- a/Specs/Core/AttributeCompressionSpec.js +++ b/Specs/Core/AttributeCompressionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/AttributeCompression', 'Core/Cartesian2', diff --git a/Specs/Core/AxisAlignedBoundingBoxSpec.js b/Specs/Core/AxisAlignedBoundingBoxSpec.js index 07ea32ac8b1a..bc10e1621463 100644 --- a/Specs/Core/AxisAlignedBoundingBoxSpec.js +++ b/Specs/Core/AxisAlignedBoundingBoxSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/AxisAlignedBoundingBox', 'Core/Cartesian3', diff --git a/Specs/Core/BingMapsApiSpec.js b/Specs/Core/BingMapsApiSpec.js index 2839cd839c85..de359dbd55ea 100644 --- a/Specs/Core/BingMapsApiSpec.js +++ b/Specs/Core/BingMapsApiSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/BingMapsApi' ], function( diff --git a/Specs/Core/BingMapsGeocoderServiceSpec.js b/Specs/Core/BingMapsGeocoderServiceSpec.js index 26e7be7758b3..95221d14f187 100644 --- a/Specs/Core/BingMapsGeocoderServiceSpec.js +++ b/Specs/Core/BingMapsGeocoderServiceSpec.js @@ -1,14 +1,13 @@ -/*global defineSuite*/ defineSuite([ - 'Core/BingMapsGeocoderService', - 'Core/loadJsonp', - 'Core/Rectangle', - 'Specs/createScene' -], function( - BingMapsGeocoderService, - loadJsonp, - Rectangle, - createScene) { + 'Core/BingMapsGeocoderService', + 'Core/loadJsonp', + 'Core/Rectangle', + 'Specs/createScene' + ], function( + BingMapsGeocoderService, + loadJsonp, + Rectangle, + createScene) { 'use strict'; var service; diff --git a/Specs/Core/BoundingRectangleSpec.js b/Specs/Core/BoundingRectangleSpec.js index 770c285351d3..bc849a0dffb0 100644 --- a/Specs/Core/BoundingRectangleSpec.js +++ b/Specs/Core/BoundingRectangleSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/BoundingRectangle', 'Core/Cartesian2', diff --git a/Specs/Core/BoundingSphereSpec.js b/Specs/Core/BoundingSphereSpec.js index 9d63d03bd730..ceca57c35302 100644 --- a/Specs/Core/BoundingSphereSpec.js +++ b/Specs/Core/BoundingSphereSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/BoundingSphere', 'Core/Cartesian3', diff --git a/Specs/Core/BoxGeometrySpec.js b/Specs/Core/BoxGeometrySpec.js index 10167f44166a..8bf3c8788df1 100644 --- a/Specs/Core/BoxGeometrySpec.js +++ b/Specs/Core/BoxGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/BoxGeometry', 'Core/AxisAlignedBoundingBox', diff --git a/Specs/Core/BoxOutlineGeometrySpec.js b/Specs/Core/BoxOutlineGeometrySpec.js index d6b83c512768..7c251f5ce34a 100644 --- a/Specs/Core/BoxOutlineGeometrySpec.js +++ b/Specs/Core/BoxOutlineGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/BoxOutlineGeometry', 'Core/AxisAlignedBoundingBox', diff --git a/Specs/Core/Cartesian2Spec.js b/Specs/Core/Cartesian2Spec.js index a2af6188b0e1..16ba027c7cea 100644 --- a/Specs/Core/Cartesian2Spec.js +++ b/Specs/Core/Cartesian2Spec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Cartesian2', 'Core/Math', diff --git a/Specs/Core/Cartesian3Spec.js b/Specs/Core/Cartesian3Spec.js index 854b0e62a1b7..e66ef04aeda5 100644 --- a/Specs/Core/Cartesian3Spec.js +++ b/Specs/Core/Cartesian3Spec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Cartesian3', 'Core/Cartographic', diff --git a/Specs/Core/Cartesian4Spec.js b/Specs/Core/Cartesian4Spec.js index a2e877a6aef7..2d5b5c3128d2 100644 --- a/Specs/Core/Cartesian4Spec.js +++ b/Specs/Core/Cartesian4Spec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Cartesian4', 'Core/Color', diff --git a/Specs/Core/CartographicGeocoderServiceSpec.js b/Specs/Core/CartographicGeocoderServiceSpec.js index f0d31c766184..1e6f653d5599 100644 --- a/Specs/Core/CartographicGeocoderServiceSpec.js +++ b/Specs/Core/CartographicGeocoderServiceSpec.js @@ -1,10 +1,9 @@ -/*global defineSuite*/ defineSuite([ - 'Core/CartographicGeocoderService', - 'Core/Cartesian3' -], function( - CartographicGeocoderService, - Cartesian3) { + 'Core/CartographicGeocoderService', + 'Core/Cartesian3' + ], function( + CartographicGeocoderService, + Cartesian3) { 'use strict'; var service = new CartographicGeocoderService(); diff --git a/Specs/Core/CartographicSpec.js b/Specs/Core/CartographicSpec.js index a2a3c129170b..d7d777d01b6c 100644 --- a/Specs/Core/CartographicSpec.js +++ b/Specs/Core/CartographicSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Cartographic', 'Core/Cartesian3', diff --git a/Specs/Core/CatmullRomSplineSpec.js b/Specs/Core/CatmullRomSplineSpec.js index 26327919f641..685ad309c458 100644 --- a/Specs/Core/CatmullRomSplineSpec.js +++ b/Specs/Core/CatmullRomSplineSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/CatmullRomSpline', 'Core/Cartesian3', diff --git a/Specs/Core/CesiumTerrainProviderSpec.js b/Specs/Core/CesiumTerrainProviderSpec.js index 04cb24bff555..c9c8a0b32b02 100644 --- a/Specs/Core/CesiumTerrainProviderSpec.js +++ b/Specs/Core/CesiumTerrainProviderSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/CesiumTerrainProvider', 'Core/DefaultProxy', diff --git a/Specs/Core/CheckSpec.js b/Specs/Core/CheckSpec.js index 5d8eabe70552..714da0248acb 100644 --- a/Specs/Core/CheckSpec.js +++ b/Specs/Core/CheckSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Check' ], function( @@ -190,6 +189,32 @@ defineSuite([ }); }); + describe('Check.typeOf.number.equals', function () { + it('throws if either value is not a number', function () { + expect(function () { + Check.typeOf.number.equals('mockName1', 'mockname2', 'a', 3); + }).toThrowDeveloperError(); + expect(function () { + Check.typeOf.number.equals('mockName1', 'mockname2', 3, 'a'); + }).toThrowDeveloperError(); + expect(function () { + Check.typeOf.number.equals('mockName1', 'mockname2', 'b', 'a'); + }).toThrowDeveloperError(); + }); + + it('throws if both the values are a number but not equal', function () { + expect(function () { + Check.typeOf.number.equals('mockName1', 'mockName2', 1, 4); + }).toThrowDeveloperError(); + }); + + it('does not throw if both values are a number and are equal', function () { + expect(function () { + Check.typeOf.number.equal('mockName1', 'mockName2', 3, 3); + }).not.toThrowDeveloperError(); + }); + }); + describe('Check.typeOf.number.greaterThan', function () { it('throws if test is equal to limit', function () { expect(function () { diff --git a/Specs/Core/CircleGeometrySpec.js b/Specs/Core/CircleGeometrySpec.js index d59bb4cdc40a..3c0fca67ed8f 100644 --- a/Specs/Core/CircleGeometrySpec.js +++ b/Specs/Core/CircleGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/CircleGeometry', 'Core/Cartesian3', diff --git a/Specs/Core/CircleOutlineGeometrySpec.js b/Specs/Core/CircleOutlineGeometrySpec.js index 1e0a0f17f7ce..9d3468a8b576 100644 --- a/Specs/Core/CircleOutlineGeometrySpec.js +++ b/Specs/Core/CircleOutlineGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/CircleOutlineGeometry', 'Core/Cartesian3', diff --git a/Specs/Core/ClockSpec.js b/Specs/Core/ClockSpec.js index 5bc6e164a8f2..3e3074b4ab34 100644 --- a/Specs/Core/ClockSpec.js +++ b/Specs/Core/ClockSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Clock', 'Core/ClockRange', diff --git a/Specs/Core/ColorGeometryInstanceAttributeSpec.js b/Specs/Core/ColorGeometryInstanceAttributeSpec.js index 3d41df3b00de..ff55201dc65b 100644 --- a/Specs/Core/ColorGeometryInstanceAttributeSpec.js +++ b/Specs/Core/ColorGeometryInstanceAttributeSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/ColorGeometryInstanceAttribute', 'Core/Color', diff --git a/Specs/Core/ColorSpec.js b/Specs/Core/ColorSpec.js index 88c91726431b..8fda59ddf956 100644 --- a/Specs/Core/ColorSpec.js +++ b/Specs/Core/ColorSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Color', 'Core/Cartesian4', diff --git a/Specs/Core/ComponentDatatypeSpec.js b/Specs/Core/ComponentDatatypeSpec.js index 5d65b5e19e61..6e41114fc2cd 100644 --- a/Specs/Core/ComponentDatatypeSpec.js +++ b/Specs/Core/ComponentDatatypeSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/ComponentDatatype' ], function( diff --git a/Specs/Core/CorridorGeometrySpec.js b/Specs/Core/CorridorGeometrySpec.js index 262b39282e6d..129575e85781 100644 --- a/Specs/Core/CorridorGeometrySpec.js +++ b/Specs/Core/CorridorGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/CorridorGeometry', 'Core/Cartesian3', diff --git a/Specs/Core/CorridorOutlineGeometrySpec.js b/Specs/Core/CorridorOutlineGeometrySpec.js index f1b337129c3e..f3317faaf0c4 100644 --- a/Specs/Core/CorridorOutlineGeometrySpec.js +++ b/Specs/Core/CorridorOutlineGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/CorridorOutlineGeometry', 'Core/Cartesian3', diff --git a/Specs/Core/CubicRealPolynomialSpec.js b/Specs/Core/CubicRealPolynomialSpec.js index d15c0c7d4633..e43d66886fea 100644 --- a/Specs/Core/CubicRealPolynomialSpec.js +++ b/Specs/Core/CubicRealPolynomialSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/CubicRealPolynomial', 'Core/Math' diff --git a/Specs/Core/CylinderGeometrySpec.js b/Specs/Core/CylinderGeometrySpec.js index 27ba87a01d06..267326b2863f 100644 --- a/Specs/Core/CylinderGeometrySpec.js +++ b/Specs/Core/CylinderGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/CylinderGeometry', 'Core/VertexFormat', diff --git a/Specs/Core/CylinderOutlineGeometrySpec.js b/Specs/Core/CylinderOutlineGeometrySpec.js index a94194bf0ba4..0aefe556725d 100644 --- a/Specs/Core/CylinderOutlineGeometrySpec.js +++ b/Specs/Core/CylinderOutlineGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/CylinderOutlineGeometry', 'Specs/createPackableSpecs' diff --git a/Specs/Core/DeveloperErrorSpec.js b/Specs/Core/DeveloperErrorSpec.js index 77655baf28d9..828f68551968 100644 --- a/Specs/Core/DeveloperErrorSpec.js +++ b/Specs/Core/DeveloperErrorSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/DeveloperError' ], function( diff --git a/Specs/Core/DistanceDisplayConditionGeometryInstanceAttributeSpec.js b/Specs/Core/DistanceDisplayConditionGeometryInstanceAttributeSpec.js index ee16c16be984..7cdd3e1b2542 100644 --- a/Specs/Core/DistanceDisplayConditionGeometryInstanceAttributeSpec.js +++ b/Specs/Core/DistanceDisplayConditionGeometryInstanceAttributeSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/DistanceDisplayConditionGeometryInstanceAttribute', 'Core/ComponentDatatype', diff --git a/Specs/Core/DistanceDisplayConditionSpec.js b/Specs/Core/DistanceDisplayConditionSpec.js index 22b35a8ae8d2..7ff0776000bf 100644 --- a/Specs/Core/DistanceDisplayConditionSpec.js +++ b/Specs/Core/DistanceDisplayConditionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/DistanceDisplayCondition' ], function( diff --git a/Specs/Core/DoublyLinkedListSpec.js b/Specs/Core/DoublyLinkedListSpec.js index 7ee82223d8b5..1874ccc7fff4 100644 --- a/Specs/Core/DoublyLinkedListSpec.js +++ b/Specs/Core/DoublyLinkedListSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/DoublyLinkedList' ], function( diff --git a/Specs/Core/EarthOrientationParametersSpec.js b/Specs/Core/EarthOrientationParametersSpec.js index 976b2cc9fa38..a99eb3b871e8 100644 --- a/Specs/Core/EarthOrientationParametersSpec.js +++ b/Specs/Core/EarthOrientationParametersSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/EarthOrientationParameters', 'Core/defined', diff --git a/Specs/Core/EllipseGeometrySpec.js b/Specs/Core/EllipseGeometrySpec.js index 938bba921cd1..c1d9f9fcd811 100644 --- a/Specs/Core/EllipseGeometrySpec.js +++ b/Specs/Core/EllipseGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/EllipseGeometry', 'Core/Cartesian3', diff --git a/Specs/Core/EllipseOutlineGeometrySpec.js b/Specs/Core/EllipseOutlineGeometrySpec.js index a32e14a5a8f0..103caadbcbe1 100644 --- a/Specs/Core/EllipseOutlineGeometrySpec.js +++ b/Specs/Core/EllipseOutlineGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/EllipseOutlineGeometry', 'Core/Cartesian3', diff --git a/Specs/Core/EllipsoidGeodesicSpec.js b/Specs/Core/EllipsoidGeodesicSpec.js index ded788f0a228..b8fb030314bb 100644 --- a/Specs/Core/EllipsoidGeodesicSpec.js +++ b/Specs/Core/EllipsoidGeodesicSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/EllipsoidGeodesic', 'Core/Cartographic', diff --git a/Specs/Core/EllipsoidGeometrySpec.js b/Specs/Core/EllipsoidGeometrySpec.js index c53930d3d8ae..0bbc97a8d55f 100644 --- a/Specs/Core/EllipsoidGeometrySpec.js +++ b/Specs/Core/EllipsoidGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/EllipsoidGeometry', 'Core/Cartesian3', diff --git a/Specs/Core/EllipsoidOutlineGeometrySpec.js b/Specs/Core/EllipsoidOutlineGeometrySpec.js index ffa41f6fe590..d3d64b571173 100644 --- a/Specs/Core/EllipsoidOutlineGeometrySpec.js +++ b/Specs/Core/EllipsoidOutlineGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/EllipsoidOutlineGeometry', 'Core/Cartesian3', diff --git a/Specs/Core/EllipsoidSpec.js b/Specs/Core/EllipsoidSpec.js index 944c388ebb21..fbddd9c5fefb 100644 --- a/Specs/Core/EllipsoidSpec.js +++ b/Specs/Core/EllipsoidSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Ellipsoid', 'Core/Cartesian3', diff --git a/Specs/Core/EllipsoidTangentPlaneSpec.js b/Specs/Core/EllipsoidTangentPlaneSpec.js index 54e34c0e8641..2bfff3cd3dc6 100644 --- a/Specs/Core/EllipsoidTangentPlaneSpec.js +++ b/Specs/Core/EllipsoidTangentPlaneSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/EllipsoidTangentPlane', 'Core/Cartesian2', diff --git a/Specs/Core/EllipsoidTerrainProviderSpec.js b/Specs/Core/EllipsoidTerrainProviderSpec.js index 9380c28b8cc8..539df7690da4 100644 --- a/Specs/Core/EllipsoidTerrainProviderSpec.js +++ b/Specs/Core/EllipsoidTerrainProviderSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/EllipsoidTerrainProvider', 'Core/TerrainProvider', diff --git a/Specs/Core/EllipsoidalOccluderSpec.js b/Specs/Core/EllipsoidalOccluderSpec.js index 5e803dbd1858..8bab406cea96 100644 --- a/Specs/Core/EllipsoidalOccluderSpec.js +++ b/Specs/Core/EllipsoidalOccluderSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/EllipsoidalOccluder', 'Core/BoundingSphere', diff --git a/Specs/Core/EncodedCartesian3Spec.js b/Specs/Core/EncodedCartesian3Spec.js index 75639901b44d..a3571f12e3c5 100644 --- a/Specs/Core/EncodedCartesian3Spec.js +++ b/Specs/Core/EncodedCartesian3Spec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/EncodedCartesian3', 'Core/Cartesian3' diff --git a/Specs/Core/EventSpec.js b/Specs/Core/EventSpec.js index c9e5c43234a7..944a04f61a2e 100644 --- a/Specs/Core/EventSpec.js +++ b/Specs/Core/EventSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Event' ], function( diff --git a/Specs/Core/FeatureDetectionSpec.js b/Specs/Core/FeatureDetectionSpec.js index d23e6cab9384..f043252950f8 100644 --- a/Specs/Core/FeatureDetectionSpec.js +++ b/Specs/Core/FeatureDetectionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/FeatureDetection' ], function( diff --git a/Specs/Core/FullscreenSpec.js b/Specs/Core/FullscreenSpec.js index 09f671edc58a..4b102c6e7988 100644 --- a/Specs/Core/FullscreenSpec.js +++ b/Specs/Core/FullscreenSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Fullscreen', 'Core/FeatureDetection' diff --git a/Specs/Core/GeographicProjectionSpec.js b/Specs/Core/GeographicProjectionSpec.js index 9d78218e0919..f6e9ea1b6e91 100644 --- a/Specs/Core/GeographicProjectionSpec.js +++ b/Specs/Core/GeographicProjectionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/GeographicProjection', 'Core/Cartesian3', diff --git a/Specs/Core/GeographicTilingSchemeSpec.js b/Specs/Core/GeographicTilingSchemeSpec.js index f95ba4a4401a..0d406aea57c7 100644 --- a/Specs/Core/GeographicTilingSchemeSpec.js +++ b/Specs/Core/GeographicTilingSchemeSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/GeographicTilingScheme', 'Core/Cartesian2', diff --git a/Specs/Core/GeometryAttributeSpec.js b/Specs/Core/GeometryAttributeSpec.js index fd3d1b7a3b8d..af1b2fc3fb91 100644 --- a/Specs/Core/GeometryAttributeSpec.js +++ b/Specs/Core/GeometryAttributeSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/GeometryAttribute', 'Core/ComponentDatatype' diff --git a/Specs/Core/GeometryInstanceAttributeSpec.js b/Specs/Core/GeometryInstanceAttributeSpec.js index bdbf9edbd4ab..88f103d601cd 100644 --- a/Specs/Core/GeometryInstanceAttributeSpec.js +++ b/Specs/Core/GeometryInstanceAttributeSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/GeometryInstanceAttribute', 'Core/ComponentDatatype' diff --git a/Specs/Core/GeometryInstanceSpec.js b/Specs/Core/GeometryInstanceSpec.js index cd2b338020f2..e599ad46aeeb 100644 --- a/Specs/Core/GeometryInstanceSpec.js +++ b/Specs/Core/GeometryInstanceSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/GeometryInstance', 'Core/BoundingSphere', diff --git a/Specs/Core/GeometryPipelineSpec.js b/Specs/Core/GeometryPipelineSpec.js index 0980b1c8048a..125fe9a58706 100644 --- a/Specs/Core/GeometryPipelineSpec.js +++ b/Specs/Core/GeometryPipelineSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/GeometryPipeline', 'Core/AttributeCompression', diff --git a/Specs/Core/GeometrySpec.js b/Specs/Core/GeometrySpec.js index bb4a47e6384b..692b85e036f8 100644 --- a/Specs/Core/GeometrySpec.js +++ b/Specs/Core/GeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Geometry', 'Core/BoundingSphere', diff --git a/Specs/Core/GoogleEarthEnterpriseMetadataSpec.js b/Specs/Core/GoogleEarthEnterpriseMetadataSpec.js index d3b2237c40ac..a05d9946f101 100644 --- a/Specs/Core/GoogleEarthEnterpriseMetadataSpec.js +++ b/Specs/Core/GoogleEarthEnterpriseMetadataSpec.js @@ -1,24 +1,23 @@ -/*global defineSuite*/ defineSuite([ - 'Core/GoogleEarthEnterpriseMetadata', - 'Core/GoogleEarthEnterpriseTileInformation', - 'Core/decodeGoogleEarthEnterpriseData', - 'Core/DefaultProxy', - 'Core/defaultValue', - 'Core/loadWithXhr', - 'Core/Math', - 'Core/Request', - 'ThirdParty/when' -], function( - GoogleEarthEnterpriseMetadata, - GoogleEarthEnterpriseTileInformation, - decodeGoogleEarthEnterpriseData, - DefaultProxy, - defaultValue, - loadWithXhr, - CesiumMath, - Request, - when) { + 'Core/GoogleEarthEnterpriseMetadata', + 'Core/decodeGoogleEarthEnterpriseData', + 'Core/DefaultProxy', + 'Core/defaultValue', + 'Core/GoogleEarthEnterpriseTileInformation', + 'Core/loadWithXhr', + 'Core/Math', + 'Core/Request', + 'ThirdParty/when' + ], function( + GoogleEarthEnterpriseMetadata, + decodeGoogleEarthEnterpriseData, + DefaultProxy, + defaultValue, + GoogleEarthEnterpriseTileInformation, + loadWithXhr, + CesiumMath, + Request, + when) { 'use strict'; it('tileXYToQuadKey', function() { diff --git a/Specs/Core/GoogleEarthEnterpriseTerrainDataSpec.js b/Specs/Core/GoogleEarthEnterpriseTerrainDataSpec.js index a83de4d1cd74..adc3192935f7 100644 --- a/Specs/Core/GoogleEarthEnterpriseTerrainDataSpec.js +++ b/Specs/Core/GoogleEarthEnterpriseTerrainDataSpec.js @@ -1,32 +1,31 @@ -/*global defineSuite*/ defineSuite([ - 'Core/GoogleEarthEnterpriseTerrainData', - 'Core/BoundingSphere', - 'Core/Cartesian3', - 'Core/Cartographic', - 'Core/Ellipsoid', - 'Core/GeographicTilingScheme', - 'Core/Math', - 'Core/Matrix4', - 'Core/Rectangle', - 'Core/TerrainData', - 'Core/TerrainMesh', - 'Core/Transforms', - 'ThirdParty/when' -], function( - GoogleEarthEnterpriseTerrainData, - BoundingSphere, - Cartesian3, - Cartographic, - Ellipsoid, - GeographicTilingScheme, - CesiumMath, - Matrix4, - Rectangle, - TerrainData, - TerrainMesh, - Transforms, - when) { + 'Core/GoogleEarthEnterpriseTerrainData', + 'Core/BoundingSphere', + 'Core/Cartesian3', + 'Core/Cartographic', + 'Core/Ellipsoid', + 'Core/GeographicTilingScheme', + 'Core/Math', + 'Core/Matrix4', + 'Core/Rectangle', + 'Core/TerrainData', + 'Core/TerrainMesh', + 'Core/Transforms', + 'ThirdParty/when' + ], function( + GoogleEarthEnterpriseTerrainData, + BoundingSphere, + Cartesian3, + Cartographic, + Ellipsoid, + GeographicTilingScheme, + CesiumMath, + Matrix4, + Rectangle, + TerrainData, + TerrainMesh, + Transforms, + when) { 'use strict'; var sizeOfUint8 = Uint8Array.BYTES_PER_ELEMENT; diff --git a/Specs/Core/GoogleEarthEnterpriseTerrainProviderSpec.js b/Specs/Core/GoogleEarthEnterpriseTerrainProviderSpec.js index 9917d46c18be..e82efc691d24 100644 --- a/Specs/Core/GoogleEarthEnterpriseTerrainProviderSpec.js +++ b/Specs/Core/GoogleEarthEnterpriseTerrainProviderSpec.js @@ -1,40 +1,39 @@ -/*global defineSuite*/ defineSuite([ - 'Core/GoogleEarthEnterpriseTerrainProvider', - 'Core/DefaultProxy', - 'Core/defaultValue', - 'Core/defined', - 'Core/Ellipsoid', - 'Core/GeographicTilingScheme', - 'Core/GoogleEarthEnterpriseMetadata', - 'Core/GoogleEarthEnterpriseTerrainData', - 'Core/GoogleEarthEnterpriseTileInformation', - 'Core/loadImage', - 'Core/loadWithXhr', - 'Core/Math', - 'Core/Request', - 'Core/RequestScheduler', - 'Core/TerrainProvider', - 'Specs/pollToPromise', - 'ThirdParty/when' -], function( - GoogleEarthEnterpriseTerrainProvider, - DefaultProxy, - defaultValue, - defined, - Ellipsoid, - GeographicTilingScheme, - GoogleEarthEnterpriseMetadata, - GoogleEarthEnterpriseTerrainData, - GoogleEarthEnterpriseTileInformation, - loadImage, - loadWithXhr, - CesiumMath, - Request, - RequestScheduler, - TerrainProvider, - pollToPromise, - when) { + 'Core/GoogleEarthEnterpriseTerrainProvider', + 'Core/DefaultProxy', + 'Core/defaultValue', + 'Core/defined', + 'Core/Ellipsoid', + 'Core/GeographicTilingScheme', + 'Core/GoogleEarthEnterpriseMetadata', + 'Core/GoogleEarthEnterpriseTerrainData', + 'Core/GoogleEarthEnterpriseTileInformation', + 'Core/loadImage', + 'Core/loadWithXhr', + 'Core/Math', + 'Core/Request', + 'Core/RequestScheduler', + 'Core/TerrainProvider', + 'Specs/pollToPromise', + 'ThirdParty/when' + ], function( + GoogleEarthEnterpriseTerrainProvider, + DefaultProxy, + defaultValue, + defined, + Ellipsoid, + GeographicTilingScheme, + GoogleEarthEnterpriseMetadata, + GoogleEarthEnterpriseTerrainData, + GoogleEarthEnterpriseTileInformation, + loadImage, + loadWithXhr, + CesiumMath, + Request, + RequestScheduler, + TerrainProvider, + pollToPromise, + when) { 'use strict'; function installMockGetQuadTreePacket() { diff --git a/Specs/Core/HeadingPitchRangeSpec.js b/Specs/Core/HeadingPitchRangeSpec.js index c1a6e1765a6f..005d3aab534c 100644 --- a/Specs/Core/HeadingPitchRangeSpec.js +++ b/Specs/Core/HeadingPitchRangeSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/HeadingPitchRange' ], function( diff --git a/Specs/Core/HeadingPitchRollSpec.js b/Specs/Core/HeadingPitchRollSpec.js index 920b4c05896c..96642a9d99cd 100644 --- a/Specs/Core/HeadingPitchRollSpec.js +++ b/Specs/Core/HeadingPitchRollSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/HeadingPitchRoll', 'Core/Math', diff --git a/Specs/Core/HeapSpec.js b/Specs/Core/HeapSpec.js index 4d41e7e48fb0..1b77e269652e 100644 --- a/Specs/Core/HeapSpec.js +++ b/Specs/Core/HeapSpec.js @@ -1,7 +1,6 @@ -/*global defineSuite*/ defineSuite([ 'Core/Heap' -], function( + ], function( Heap) { 'use strict'; diff --git a/Specs/Core/HeightmapTerrainDataSpec.js b/Specs/Core/HeightmapTerrainDataSpec.js index d0c64e8053ca..86f6200e87ce 100644 --- a/Specs/Core/HeightmapTerrainDataSpec.js +++ b/Specs/Core/HeightmapTerrainDataSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/HeightmapTerrainData', 'Core/GeographicTilingScheme', diff --git a/Specs/Core/HermitePolynomialApproximationSpec.js b/Specs/Core/HermitePolynomialApproximationSpec.js index 3df430cee744..f0be614abea7 100644 --- a/Specs/Core/HermitePolynomialApproximationSpec.js +++ b/Specs/Core/HermitePolynomialApproximationSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/HermitePolynomialApproximation' ], function( diff --git a/Specs/Core/HermiteSplineSpec.js b/Specs/Core/HermiteSplineSpec.js index cf8c2a3af390..5e41eb4a86bf 100644 --- a/Specs/Core/HermiteSplineSpec.js +++ b/Specs/Core/HermiteSplineSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/HermiteSpline', 'Core/Cartesian3', diff --git a/Specs/Core/Iau2000OrientationSpec.js b/Specs/Core/Iau2000OrientationSpec.js index c8275f4c4875..56b176c6da3b 100644 --- a/Specs/Core/Iau2000OrientationSpec.js +++ b/Specs/Core/Iau2000OrientationSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Iau2000Orientation', 'Core/JulianDate', diff --git a/Specs/Core/Iau2006XysDataSpec.js b/Specs/Core/Iau2006XysDataSpec.js index efd2cdaffc3e..01633034aa45 100644 --- a/Specs/Core/Iau2006XysDataSpec.js +++ b/Specs/Core/Iau2006XysDataSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Iau2006XysData', 'Core/defined', diff --git a/Specs/Core/IauOrientationAxesSpec.js b/Specs/Core/IauOrientationAxesSpec.js index 04f841158d5a..f76f60d5ec32 100644 --- a/Specs/Core/IauOrientationAxesSpec.js +++ b/Specs/Core/IauOrientationAxesSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/IauOrientationAxes', 'Core/Iau2000Orientation', diff --git a/Specs/Core/IndexDatatypeSpec.js b/Specs/Core/IndexDatatypeSpec.js index bed73f426e25..449e4611f400 100644 --- a/Specs/Core/IndexDatatypeSpec.js +++ b/Specs/Core/IndexDatatypeSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/IndexDatatype', 'Core/Math' diff --git a/Specs/Core/IntersectionTestsSpec.js b/Specs/Core/IntersectionTestsSpec.js index 787cf5aff3b2..40708226e9a0 100644 --- a/Specs/Core/IntersectionTestsSpec.js +++ b/Specs/Core/IntersectionTestsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/IntersectionTests', 'Core/BoundingSphere', diff --git a/Specs/Core/Intersections2DSpec.js b/Specs/Core/Intersections2DSpec.js index d5d35e9101c5..5b4b34dc452c 100644 --- a/Specs/Core/Intersections2DSpec.js +++ b/Specs/Core/Intersections2DSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Intersections2D' ], function( diff --git a/Specs/Core/IntervalSpec.js b/Specs/Core/IntervalSpec.js index d9ad76fe73b9..a0af3f96bbc5 100644 --- a/Specs/Core/IntervalSpec.js +++ b/Specs/Core/IntervalSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Interval' ], function( diff --git a/Specs/Core/JulianDateSpec.js b/Specs/Core/JulianDateSpec.js index 1927640fd509..713120e59976 100644 --- a/Specs/Core/JulianDateSpec.js +++ b/Specs/Core/JulianDateSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/JulianDate', 'Core/Math', @@ -164,76 +163,76 @@ defineSuite([ }).toThrowDeveloperError(); }); - it('Construct from ISO8601 local calendar date, basic format', function() { - var expectedDate = JulianDate.fromDate(new Date(2009, 7, 1)); + it('Construct from ISO8601 calendar date, basic format', function() { + var expectedDate = JulianDate.fromDate(new Date(Date.UTC(2009, 7, 1))); var computedDate = JulianDate.fromIso8601('20090801'); expect(computedDate).toEqual(expectedDate); }); - it('Construct from ISO8601 local calendar date, extended format', function() { - var expectedDate = JulianDate.fromDate(new Date(2009, 7, 1)); + it('Construct from ISO8601 calendar date, extended format', function() { + var expectedDate = JulianDate.fromDate(new Date(Date.UTC(2009, 7, 1))); var computedDate = JulianDate.fromIso8601('2009-08-01'); expect(computedDate).toEqual(expectedDate); }); - it('Construct from ISO8601 local calendar date on Feb 29th, basic format', function() { - var expectedDate = JulianDate.fromDate(new Date(2000, 1, 29)); + it('Construct from ISO8601 calendar date on Feb 29th, basic format', function() { + var expectedDate = JulianDate.fromDate(new Date(Date.UTC(2000, 1, 29))); var computedDate = JulianDate.fromIso8601('20000229'); expect(computedDate).toEqual(expectedDate); }); - it('Construct from ISO8601 local calendar date on Feb 29th, extended format', function() { - var expectedDate = JulianDate.fromDate(new Date(2000, 1, 29)); + it('Construct from ISO8601 calendar date on Feb 29th, extended format', function() { + var expectedDate = JulianDate.fromDate(new Date(Date.UTC(2000, 1, 29))); var computedDate = JulianDate.fromIso8601('2000-02-29'); expect(computedDate).toEqual(expectedDate); }); - it('Construct from an ISO8601 local ordinal date, basic format', function() { - var expectedDate = JulianDate.fromDate(new Date(1985, 3, 12)); + it('Construct from an ISO8601 ordinal date, basic format', function() { + var expectedDate = JulianDate.fromDate(new Date(Date.UTC(1985, 3, 12))); var computedDate = JulianDate.fromIso8601('1985102'); expect(computedDate).toEqual(expectedDate); }); - it('Construct from an ISO8601 local ordinal date, extended format', function() { - var expectedDate = JulianDate.fromDate(new Date(1985, 3, 12)); + it('Construct from an ISO8601 ordinal date, extended format', function() { + var expectedDate = JulianDate.fromDate(new Date(Date.UTC(1985, 3, 12))); var computedDate = JulianDate.fromIso8601('1985-102'); expect(computedDate).toEqual(expectedDate); }); it('Construct an ISO8601 ordinal date on a leap year', function() { - var expectedDate = JulianDate.fromDate(new Date(2000, 11, 31)); + var expectedDate = JulianDate.fromDate(new Date(Date.UTC(2000, 11, 31))); var computedDate = JulianDate.fromIso8601('2000-366'); expect(computedDate).toEqual(expectedDate); }); - it('Construct from an ISO8601 local week date, basic format', function() { - var expectedDate = JulianDate.fromDate(new Date(1985, 3, 12)); + it('Construct from an ISO8601 week date, basic format', function() { + var expectedDate = JulianDate.fromDate(new Date(Date.UTC(1985, 3, 12))); var computedDate = JulianDate.fromIso8601('1985W155'); expect(computedDate).toEqual(expectedDate); }); - it('Construct from an ISO8601 local week date, extended format', function() { - var expectedDate = JulianDate.fromDate(new Date(2008, 8, 27)); + it('Construct from an ISO8601 week date, extended format', function() { + var expectedDate = JulianDate.fromDate(new Date(Date.UTC(2008, 8, 27))); var computedDate = JulianDate.fromIso8601('2008-W39-6'); expect(computedDate).toEqual(expectedDate); }); - it('Construct from an ISO8601 local calendar week date, basic format', function() { - var expectedDate = JulianDate.fromDate(new Date(1985, 3, 7)); + it('Construct from an ISO8601 calendar week date, basic format', function() { + var expectedDate = JulianDate.fromDate(new Date(Date.UTC(1985, 3, 7))); var computedDate = JulianDate.fromIso8601('1985W15'); expect(computedDate).toEqual(expectedDate); }); - it('Construct from an ISO8601 local calendar week date, extended format', function() { - var expectedDate = JulianDate.fromDate(new Date(2008, 8, 21)); + it('Construct from an ISO8601 calendar week date, extended format', function() { + var expectedDate = JulianDate.fromDate(new Date(Date.UTC(2008, 8, 21))); var computedDate = JulianDate.fromIso8601('2008-W39'); expect(computedDate).toEqual(expectedDate); }); //Note, there is no 'extended format' for calendar month because eliminating the //would confuse is with old YYMMDD dates - it('Construct from an ISO8601 local calendar month, basic format', function() { - var expectedDate = JulianDate.fromDate(new Date(1985, 3, 1)); + it('Construct from an ISO8601 calendar month, basic format', function() { + var expectedDate = JulianDate.fromDate(new Date(Date.UTC(1985, 3, 1))); var computedDate = JulianDate.fromIso8601('1985-04'); expect(computedDate).toEqual(expectedDate); }); diff --git a/Specs/Core/LagrangePolynomialApproximationSpec.js b/Specs/Core/LagrangePolynomialApproximationSpec.js index a3bfaebe112e..5551e5ef140e 100644 --- a/Specs/Core/LagrangePolynomialApproximationSpec.js +++ b/Specs/Core/LagrangePolynomialApproximationSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/LagrangePolynomialApproximation' ], function( diff --git a/Specs/Core/LeapSecondSpec.js b/Specs/Core/LeapSecondSpec.js index b19e20fba6b0..44e76b08b135 100644 --- a/Specs/Core/LeapSecondSpec.js +++ b/Specs/Core/LeapSecondSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/LeapSecond', 'Core/JulianDate' diff --git a/Specs/Core/LinearApproximationSpec.js b/Specs/Core/LinearApproximationSpec.js index b26784e58634..b137ad34e529 100644 --- a/Specs/Core/LinearApproximationSpec.js +++ b/Specs/Core/LinearApproximationSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/LinearApproximation' ], function( diff --git a/Specs/Core/LinearSplineSpec.js b/Specs/Core/LinearSplineSpec.js index db9f3343d18d..821f4a6b8a6c 100644 --- a/Specs/Core/LinearSplineSpec.js +++ b/Specs/Core/LinearSplineSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/LinearSpline', 'Core/Cartesian3' diff --git a/Specs/Core/ManagedArraySpec.js b/Specs/Core/ManagedArraySpec.js index 67d138fa540a..94c1c5b32a38 100644 --- a/Specs/Core/ManagedArraySpec.js +++ b/Specs/Core/ManagedArraySpec.js @@ -1,7 +1,6 @@ -/*global defineSuite*/ defineSuite([ 'Core/ManagedArray' -], function( + ], function( ManagedArray) { 'use strict'; diff --git a/Specs/Core/MapboxApiSpec.js b/Specs/Core/MapboxApiSpec.js index 51ece7a3cb3a..d69c648902b7 100644 --- a/Specs/Core/MapboxApiSpec.js +++ b/Specs/Core/MapboxApiSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/MapboxApi' ], function( diff --git a/Specs/Core/MathSpec.js b/Specs/Core/MathSpec.js index a52fa67e1bff..30dd0c169df9 100644 --- a/Specs/Core/MathSpec.js +++ b/Specs/Core/MathSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Math' ], function( diff --git a/Specs/Core/Matrix2Spec.js b/Specs/Core/Matrix2Spec.js index 6b04710404a3..92d00faa0900 100644 --- a/Specs/Core/Matrix2Spec.js +++ b/Specs/Core/Matrix2Spec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Matrix2', 'Core/Cartesian2', diff --git a/Specs/Core/Matrix3Spec.js b/Specs/Core/Matrix3Spec.js index f00b85ae612d..b87c0775d199 100644 --- a/Specs/Core/Matrix3Spec.js +++ b/Specs/Core/Matrix3Spec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Matrix3', 'Core/Cartesian3', diff --git a/Specs/Core/Matrix4Spec.js b/Specs/Core/Matrix4Spec.js index 4c0ba74c8bb8..deeb82f04a91 100644 --- a/Specs/Core/Matrix4Spec.js +++ b/Specs/Core/Matrix4Spec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Matrix4', 'Core/Cartesian3', diff --git a/Specs/Core/NearFarScalarSpec.js b/Specs/Core/NearFarScalarSpec.js index bc45876f6981..51888d536957 100644 --- a/Specs/Core/NearFarScalarSpec.js +++ b/Specs/Core/NearFarScalarSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/NearFarScalar', 'Specs/createPackableSpecs' diff --git a/Specs/Core/OccluderSpec.js b/Specs/Core/OccluderSpec.js index fba1b77ebbcb..3c2b53dfafa8 100644 --- a/Specs/Core/OccluderSpec.js +++ b/Specs/Core/OccluderSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Occluder', 'Core/BoundingSphere', diff --git a/Specs/Core/OrientedBoundingBoxSpec.js b/Specs/Core/OrientedBoundingBoxSpec.js index 936939723b3e..4341fd3fe346 100644 --- a/Specs/Core/OrientedBoundingBoxSpec.js +++ b/Specs/Core/OrientedBoundingBoxSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/OrientedBoundingBox', 'Core/BoundingSphere', diff --git a/Specs/Core/PinBuilderSpec.js b/Specs/Core/PinBuilderSpec.js index 33d6b8ba4f99..86fffe846737 100644 --- a/Specs/Core/PinBuilderSpec.js +++ b/Specs/Core/PinBuilderSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/PinBuilder', 'Core/buildModuleUrl', diff --git a/Specs/Core/PlaneSpec.js b/Specs/Core/PlaneSpec.js index 166aa8185ed2..8e28801b179f 100644 --- a/Specs/Core/PlaneSpec.js +++ b/Specs/Core/PlaneSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Plane', 'Core/Cartesian3', diff --git a/Specs/Core/PolygonGeometrySpec.js b/Specs/Core/PolygonGeometrySpec.js index cddcf5c98a6b..7e5202bb6215 100644 --- a/Specs/Core/PolygonGeometrySpec.js +++ b/Specs/Core/PolygonGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/PolygonGeometry', 'Core/BoundingSphere', diff --git a/Specs/Core/PolygonOutlineGeometrySpec.js b/Specs/Core/PolygonOutlineGeometrySpec.js index 5863827a9fd4..64c75c019f88 100644 --- a/Specs/Core/PolygonOutlineGeometrySpec.js +++ b/Specs/Core/PolygonOutlineGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/PolygonOutlineGeometry', 'Core/BoundingSphere', diff --git a/Specs/Core/PolygonPipelineSpec.js b/Specs/Core/PolygonPipelineSpec.js index 5e6a4bb01532..47e5bc747db4 100644 --- a/Specs/Core/PolygonPipelineSpec.js +++ b/Specs/Core/PolygonPipelineSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/PolygonPipeline', 'Core/Cartesian2', diff --git a/Specs/Core/PolylineGeometrySpec.js b/Specs/Core/PolylineGeometrySpec.js index 4f7b6d3a27e8..a8a2504a3be3 100644 --- a/Specs/Core/PolylineGeometrySpec.js +++ b/Specs/Core/PolylineGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/PolylineGeometry', 'Core/Cartesian3', diff --git a/Specs/Core/PolylinePipelineSpec.js b/Specs/Core/PolylinePipelineSpec.js index c698e653de90..e0024afbfba0 100644 --- a/Specs/Core/PolylinePipelineSpec.js +++ b/Specs/Core/PolylinePipelineSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/PolylinePipeline', 'Core/Cartesian3', diff --git a/Specs/Core/PolylineVolumeGeometrySpec.js b/Specs/Core/PolylineVolumeGeometrySpec.js index 8b8c62da7ca9..8fec731f121a 100644 --- a/Specs/Core/PolylineVolumeGeometrySpec.js +++ b/Specs/Core/PolylineVolumeGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/PolylineVolumeGeometry', 'Core/Cartesian2', diff --git a/Specs/Core/PolylineVolumeOutlineGeometrySpec.js b/Specs/Core/PolylineVolumeOutlineGeometrySpec.js index f3d9c311385e..4c0a5c3618c4 100644 --- a/Specs/Core/PolylineVolumeOutlineGeometrySpec.js +++ b/Specs/Core/PolylineVolumeOutlineGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/PolylineVolumeOutlineGeometry', 'Core/Cartesian2', diff --git a/Specs/Core/QuadraticRealPolynomialSpec.js b/Specs/Core/QuadraticRealPolynomialSpec.js index 2126eff7c5bd..088ddd0c59d3 100644 --- a/Specs/Core/QuadraticRealPolynomialSpec.js +++ b/Specs/Core/QuadraticRealPolynomialSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/QuadraticRealPolynomial', 'Core/Math' diff --git a/Specs/Core/QuantizedMeshTerrainDataSpec.js b/Specs/Core/QuantizedMeshTerrainDataSpec.js index c66692cc7b95..c8a0efeed525 100644 --- a/Specs/Core/QuantizedMeshTerrainDataSpec.js +++ b/Specs/Core/QuantizedMeshTerrainDataSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/QuantizedMeshTerrainData', 'Core/BoundingSphere', diff --git a/Specs/Core/QuarticRealPolynomialSpec.js b/Specs/Core/QuarticRealPolynomialSpec.js index e6cbb2159309..94c04de9a623 100644 --- a/Specs/Core/QuarticRealPolynomialSpec.js +++ b/Specs/Core/QuarticRealPolynomialSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/QuarticRealPolynomial', 'Core/Math' diff --git a/Specs/Core/QuaternionSpec.js b/Specs/Core/QuaternionSpec.js index f653d0792343..ca68320c9ace 100644 --- a/Specs/Core/QuaternionSpec.js +++ b/Specs/Core/QuaternionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Quaternion', 'Core/Cartesian3', diff --git a/Specs/Core/QuaternionSplineSpec.js b/Specs/Core/QuaternionSplineSpec.js index e5b45361b583..04cbc5ccf3d4 100644 --- a/Specs/Core/QuaternionSplineSpec.js +++ b/Specs/Core/QuaternionSplineSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/QuaternionSpline', 'Core/Cartesian3', diff --git a/Specs/Core/QueueSpec.js b/Specs/Core/QueueSpec.js index cc8af166acf4..1a7f414910f7 100644 --- a/Specs/Core/QueueSpec.js +++ b/Specs/Core/QueueSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Queue' ], function( diff --git a/Specs/Core/RaySpec.js b/Specs/Core/RaySpec.js index 44aac36e8bd4..91ea5084b816 100644 --- a/Specs/Core/RaySpec.js +++ b/Specs/Core/RaySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Ray', 'Core/Cartesian3' diff --git a/Specs/Core/RectangleGeometrySpec.js b/Specs/Core/RectangleGeometrySpec.js index c3138f4c80c8..e335affa705f 100644 --- a/Specs/Core/RectangleGeometrySpec.js +++ b/Specs/Core/RectangleGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/RectangleGeometry', 'Core/Cartesian2', diff --git a/Specs/Core/RectangleOutlineGeometrySpec.js b/Specs/Core/RectangleOutlineGeometrySpec.js index fddc7cf7e724..2bcf82aef0fa 100644 --- a/Specs/Core/RectangleOutlineGeometrySpec.js +++ b/Specs/Core/RectangleOutlineGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/RectangleOutlineGeometry', 'Core/Cartesian2', diff --git a/Specs/Core/RectangleSpec.js b/Specs/Core/RectangleSpec.js index 9e41e4898a1e..8358fbdd67b2 100644 --- a/Specs/Core/RectangleSpec.js +++ b/Specs/Core/RectangleSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Rectangle', 'Core/Cartesian3', diff --git a/Specs/Core/RequestErrorEventSpec.js b/Specs/Core/RequestErrorEventSpec.js index d9045c32eff8..b4bbd59e9992 100644 --- a/Specs/Core/RequestErrorEventSpec.js +++ b/Specs/Core/RequestErrorEventSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/RequestErrorEvent' ], function( diff --git a/Specs/Core/RequestSchedulerSpec.js b/Specs/Core/RequestSchedulerSpec.js index 4dfff78ecff2..7ac591cc030b 100644 --- a/Specs/Core/RequestSchedulerSpec.js +++ b/Specs/Core/RequestSchedulerSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/RequestScheduler', 'Core/Request', diff --git a/Specs/Core/RuntimeErrorSpec.js b/Specs/Core/RuntimeErrorSpec.js index 4924c50337f2..012fdba8c391 100644 --- a/Specs/Core/RuntimeErrorSpec.js +++ b/Specs/Core/RuntimeErrorSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/RuntimeError' ], function( diff --git a/Specs/Core/ScreenSpaceEventHandlerSpec.js b/Specs/Core/ScreenSpaceEventHandlerSpec.js index 440a0f0f2104..70014aec08a8 100644 --- a/Specs/Core/ScreenSpaceEventHandlerSpec.js +++ b/Specs/Core/ScreenSpaceEventHandlerSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/ScreenSpaceEventHandler', 'Core/Cartesian2', diff --git a/Specs/Core/ShowGeometryInstanceAttributeSpec.js b/Specs/Core/ShowGeometryInstanceAttributeSpec.js index 157399ef399d..c738fec9da1e 100644 --- a/Specs/Core/ShowGeometryInstanceAttributeSpec.js +++ b/Specs/Core/ShowGeometryInstanceAttributeSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/ShowGeometryInstanceAttribute', 'Core/ComponentDatatype' diff --git a/Specs/Core/Simon1994PlanetaryPositionsSpec.js b/Specs/Core/Simon1994PlanetaryPositionsSpec.js index 2874a9a8c938..7f7ab3a3b198 100644 --- a/Specs/Core/Simon1994PlanetaryPositionsSpec.js +++ b/Specs/Core/Simon1994PlanetaryPositionsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Simon1994PlanetaryPositions', 'Core/defined', diff --git a/Specs/Core/SimplePolylineGeometrySpec.js b/Specs/Core/SimplePolylineGeometrySpec.js index 039e95adcccb..7207c1a759ae 100644 --- a/Specs/Core/SimplePolylineGeometrySpec.js +++ b/Specs/Core/SimplePolylineGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/SimplePolylineGeometry', 'Core/BoundingSphere', diff --git a/Specs/Core/SphereGeometrySpec.js b/Specs/Core/SphereGeometrySpec.js index 763b8185398c..57815a50a14e 100644 --- a/Specs/Core/SphereGeometrySpec.js +++ b/Specs/Core/SphereGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/SphereGeometry', 'Core/Cartesian3', diff --git a/Specs/Core/SphereOutlineGeometrySpec.js b/Specs/Core/SphereOutlineGeometrySpec.js index 4175012b0352..b857e93dfc2a 100644 --- a/Specs/Core/SphereOutlineGeometrySpec.js +++ b/Specs/Core/SphereOutlineGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/SphereOutlineGeometry', 'Specs/createPackableSpecs' diff --git a/Specs/Core/SphericalSpec.js b/Specs/Core/SphericalSpec.js index 92ae2c1f7a50..8d2a75492b8e 100644 --- a/Specs/Core/SphericalSpec.js +++ b/Specs/Core/SphericalSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Spherical', 'Core/Cartesian3', diff --git a/Specs/Core/SplineSpec.js b/Specs/Core/SplineSpec.js index 8b7870491577..8073d53dcf63 100644 --- a/Specs/Core/SplineSpec.js +++ b/Specs/Core/SplineSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Spline', 'Core/Cartesian3', diff --git a/Specs/Core/TaskProcessorSpec.js b/Specs/Core/TaskProcessorSpec.js index b36eea109a1b..ddd2ca8c39ae 100644 --- a/Specs/Core/TaskProcessorSpec.js +++ b/Specs/Core/TaskProcessorSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/TaskProcessor', 'require', diff --git a/Specs/Core/TerrainEncodingSpec.js b/Specs/Core/TerrainEncodingSpec.js index de33f7b07687..34dfc5a5e263 100644 --- a/Specs/Core/TerrainEncodingSpec.js +++ b/Specs/Core/TerrainEncodingSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/TerrainEncoding', 'Core/AttributeCompression', diff --git a/Specs/Core/TileAvailabilitySpec.js b/Specs/Core/TileAvailabilitySpec.js index d1bb25785fe9..b4867cfd0ae4 100644 --- a/Specs/Core/TileAvailabilitySpec.js +++ b/Specs/Core/TileAvailabilitySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/TileAvailability', 'Core/Cartographic', diff --git a/Specs/Core/TimeIntervalCollectionSpec.js b/Specs/Core/TimeIntervalCollectionSpec.js index affbce6216be..60e80161acf9 100644 --- a/Specs/Core/TimeIntervalCollectionSpec.js +++ b/Specs/Core/TimeIntervalCollectionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/TimeIntervalCollection', 'Core/JulianDate', diff --git a/Specs/Core/TimeIntervalSpec.js b/Specs/Core/TimeIntervalSpec.js index 4082689fec21..b0b4b33e039a 100644 --- a/Specs/Core/TimeIntervalSpec.js +++ b/Specs/Core/TimeIntervalSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/TimeInterval', 'Core/JulianDate' diff --git a/Specs/Core/TipsifySpec.js b/Specs/Core/TipsifySpec.js index 6974483a4932..95d59821e1be 100644 --- a/Specs/Core/TipsifySpec.js +++ b/Specs/Core/TipsifySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Tipsify' ], function( diff --git a/Specs/Core/TransformsSpec.js b/Specs/Core/TransformsSpec.js index 365f6dad36d6..07a702507f56 100644 --- a/Specs/Core/TransformsSpec.js +++ b/Specs/Core/TransformsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Transforms', 'Core/Cartesian2', diff --git a/Specs/Core/TranslationRotationScaleSpec.js b/Specs/Core/TranslationRotationScaleSpec.js index ab51f2e833f1..9a8911a427ca 100644 --- a/Specs/Core/TranslationRotationScaleSpec.js +++ b/Specs/Core/TranslationRotationScaleSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/TranslationRotationScale', 'Core/Cartesian3', diff --git a/Specs/Core/TridiagonalSystemSolverSpec.js b/Specs/Core/TridiagonalSystemSolverSpec.js index 0974dcf62bf2..5fe135b50529 100644 --- a/Specs/Core/TridiagonalSystemSolverSpec.js +++ b/Specs/Core/TridiagonalSystemSolverSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/TridiagonalSystemSolver', 'Core/Cartesian3', diff --git a/Specs/Core/TrustedServersSpec.js b/Specs/Core/TrustedServersSpec.js index 164b9b0340aa..3d64be04ed83 100644 --- a/Specs/Core/TrustedServersSpec.js +++ b/Specs/Core/TrustedServersSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/TrustedServers' ], function( diff --git a/Specs/Core/VRTheWorldTerrainProviderSpec.js b/Specs/Core/VRTheWorldTerrainProviderSpec.js index cf5858abc290..a59fe2e195f1 100644 --- a/Specs/Core/VRTheWorldTerrainProviderSpec.js +++ b/Specs/Core/VRTheWorldTerrainProviderSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/VRTheWorldTerrainProvider', 'Core/DefaultProxy', diff --git a/Specs/Core/VertexFormatSpec.js b/Specs/Core/VertexFormatSpec.js index 0c6f19ca3221..764ce3d0d5c3 100644 --- a/Specs/Core/VertexFormatSpec.js +++ b/Specs/Core/VertexFormatSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/VertexFormat', 'Specs/createPackableSpecs' diff --git a/Specs/Core/VideoSynchronizerSpec.js b/Specs/Core/VideoSynchronizerSpec.js index 97893472755d..53ce79889bca 100644 --- a/Specs/Core/VideoSynchronizerSpec.js +++ b/Specs/Core/VideoSynchronizerSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/VideoSynchronizer', 'Core/Clock', diff --git a/Specs/Core/WallGeometrySpec.js b/Specs/Core/WallGeometrySpec.js index 5575f745e006..bb8ca7ac1e44 100644 --- a/Specs/Core/WallGeometrySpec.js +++ b/Specs/Core/WallGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/WallGeometry', 'Core/Cartesian3', diff --git a/Specs/Core/WallOutlineGeometrySpec.js b/Specs/Core/WallOutlineGeometrySpec.js index f0a48df6a7f2..902885728425 100644 --- a/Specs/Core/WallOutlineGeometrySpec.js +++ b/Specs/Core/WallOutlineGeometrySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/WallOutlineGeometry', 'Core/Cartesian3', diff --git a/Specs/Core/WebMercatorProjectionSpec.js b/Specs/Core/WebMercatorProjectionSpec.js index 6a060c1d95cb..ac82f8a1227b 100644 --- a/Specs/Core/WebMercatorProjectionSpec.js +++ b/Specs/Core/WebMercatorProjectionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/WebMercatorProjection', 'Core/Cartesian2', diff --git a/Specs/Core/WebMercatorTilingSchemeSpec.js b/Specs/Core/WebMercatorTilingSchemeSpec.js index aa62b539e1fe..1728b21c71d6 100644 --- a/Specs/Core/WebMercatorTilingSchemeSpec.js +++ b/Specs/Core/WebMercatorTilingSchemeSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/WebMercatorTilingScheme', 'Core/Cartesian2', diff --git a/Specs/Core/appendForwardSlashSpec.js b/Specs/Core/appendForwardSlashSpec.js index 70c0cb9d056d..c2dd9476f6aa 100644 --- a/Specs/Core/appendForwardSlashSpec.js +++ b/Specs/Core/appendForwardSlashSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/appendForwardSlash' ], function( diff --git a/Specs/Core/arrayFillSpec.js b/Specs/Core/arrayFillSpec.js index 181f4c575443..bd35b4e99c80 100644 --- a/Specs/Core/arrayFillSpec.js +++ b/Specs/Core/arrayFillSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/arrayFill' ], function( diff --git a/Specs/Core/arrayRemoveDuplicatesSpec.js b/Specs/Core/arrayRemoveDuplicatesSpec.js index a6d02f6c71d6..8a238b753048 100644 --- a/Specs/Core/arrayRemoveDuplicatesSpec.js +++ b/Specs/Core/arrayRemoveDuplicatesSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/arrayRemoveDuplicates', 'Core/Cartesian3', diff --git a/Specs/Core/barycentricCoordinatesSpec.js b/Specs/Core/barycentricCoordinatesSpec.js index a7f25aa364f9..8f425e1b87da 100644 --- a/Specs/Core/barycentricCoordinatesSpec.js +++ b/Specs/Core/barycentricCoordinatesSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/barycentricCoordinates', 'Core/Cartesian3', diff --git a/Specs/Core/binarySearchSpec.js b/Specs/Core/binarySearchSpec.js index f8121f7a2658..ab816049d32f 100644 --- a/Specs/Core/binarySearchSpec.js +++ b/Specs/Core/binarySearchSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/binarySearch' ], function( diff --git a/Specs/Core/buildModuleUrlSpec.js b/Specs/Core/buildModuleUrlSpec.js index 8fdbca2d51a3..401be71006e7 100644 --- a/Specs/Core/buildModuleUrlSpec.js +++ b/Specs/Core/buildModuleUrlSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/buildModuleUrl', 'Core/loadText', diff --git a/Specs/Core/cloneSpec.js b/Specs/Core/cloneSpec.js index 28f52d0359ef..21737ee98658 100644 --- a/Specs/Core/cloneSpec.js +++ b/Specs/Core/cloneSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/clone' ], function( diff --git a/Specs/Core/combineSpec.js b/Specs/Core/combineSpec.js index 29ad1cc5b0d2..0308a3ae934e 100644 --- a/Specs/Core/combineSpec.js +++ b/Specs/Core/combineSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/combine' ], function( diff --git a/Specs/Core/createGuidSpec.js b/Specs/Core/createGuidSpec.js index d8f20b3bee13..691b08a03f58 100644 --- a/Specs/Core/createGuidSpec.js +++ b/Specs/Core/createGuidSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/createGuid' ], function( diff --git a/Specs/Core/defaultValueSpec.js b/Specs/Core/defaultValueSpec.js new file mode 100644 index 000000000000..51d2517a6cb9 --- /dev/null +++ b/Specs/Core/defaultValueSpec.js @@ -0,0 +1,19 @@ +defineSuite([ + 'Core/defaultValue' + ], function( + defaultValue) { + 'use strict'; + + it('Works with first parameter undefined', function() { + expect(defaultValue(undefined, 5)).toEqual(5); + }); + + it('Works with first parameter null', function() { + expect(defaultValue(null, 5)).toEqual(5); + }); + + it('Works with first parameter not undefined and not null', function() { + expect(defaultValue(1, 5)).toEqual(1); + }); + +}); diff --git a/Specs/Core/definedSpec.js b/Specs/Core/definedSpec.js index f9ace2553110..41283704697b 100644 --- a/Specs/Core/definedSpec.js +++ b/Specs/Core/definedSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/defined' ], function( diff --git a/Specs/Core/deprecationWarningSpec.js b/Specs/Core/deprecationWarningSpec.js index d6588dfb142c..3dc2fa6a821e 100644 --- a/Specs/Core/deprecationWarningSpec.js +++ b/Specs/Core/deprecationWarningSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/deprecationWarning' ], function( diff --git a/Specs/Core/getAbsoluteUriSpec.js b/Specs/Core/getAbsoluteUriSpec.js index 5bd0ef635bae..10d7b734fc0a 100644 --- a/Specs/Core/getAbsoluteUriSpec.js +++ b/Specs/Core/getAbsoluteUriSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/getAbsoluteUri', 'Core/getBaseUri' diff --git a/Specs/Core/getBaseUriSpec.js b/Specs/Core/getBaseUriSpec.js index 5eb4e3c6913d..07afcfe43609 100644 --- a/Specs/Core/getBaseUriSpec.js +++ b/Specs/Core/getBaseUriSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/getBaseUri' ], function( diff --git a/Specs/Core/getExtensionFromUriSpec.js b/Specs/Core/getExtensionFromUriSpec.js index a15c19a1c873..eed43291f013 100644 --- a/Specs/Core/getExtensionFromUriSpec.js +++ b/Specs/Core/getExtensionFromUriSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/getExtensionFromUri' ], function( diff --git a/Specs/Core/getFilenameFromUriSpec.js b/Specs/Core/getFilenameFromUriSpec.js index c4a50afed56e..34b0fc72f5fc 100644 --- a/Specs/Core/getFilenameFromUriSpec.js +++ b/Specs/Core/getFilenameFromUriSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/getFilenameFromUri' ], function( diff --git a/Specs/Core/getStringFromTypedArraySpec.js b/Specs/Core/getStringFromTypedArraySpec.js index 2d0b560c1f9f..446348eae7a5 100644 --- a/Specs/Core/getStringFromTypedArraySpec.js +++ b/Specs/Core/getStringFromTypedArraySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/getStringFromTypedArray' ], function( diff --git a/Specs/Core/isBlobUriSpec.js b/Specs/Core/isBlobUriSpec.js index d319b0a7bf57..f410c8521f7c 100644 --- a/Specs/Core/isBlobUriSpec.js +++ b/Specs/Core/isBlobUriSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/isBlobUri' ], function( diff --git a/Specs/Core/isCrossOriginUrlSpec.js b/Specs/Core/isCrossOriginUrlSpec.js index b68cf9f09765..6726d4a12706 100644 --- a/Specs/Core/isCrossOriginUrlSpec.js +++ b/Specs/Core/isCrossOriginUrlSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/getAbsoluteUri', 'Core/isCrossOriginUrl', diff --git a/Specs/Core/isDataUriSpec.js b/Specs/Core/isDataUriSpec.js index b3864848630c..08716b896a56 100644 --- a/Specs/Core/isDataUriSpec.js +++ b/Specs/Core/isDataUriSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/isDataUri' ], function( diff --git a/Specs/Core/isLeapYearSpec.js b/Specs/Core/isLeapYearSpec.js index d59fedbc7528..9107eae0b79a 100644 --- a/Specs/Core/isLeapYearSpec.js +++ b/Specs/Core/isLeapYearSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/isLeapYear' ], function( diff --git a/Specs/Core/joinUrlsSpec.js b/Specs/Core/joinUrlsSpec.js index 94ee2a10b1b8..99a05a52793a 100644 --- a/Specs/Core/joinUrlsSpec.js +++ b/Specs/Core/joinUrlsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/joinUrls', 'ThirdParty/Uri' diff --git a/Specs/Core/loadArrayBufferSpec.js b/Specs/Core/loadArrayBufferSpec.js index 11b5bdd54073..0bf3b55d9231 100644 --- a/Specs/Core/loadArrayBufferSpec.js +++ b/Specs/Core/loadArrayBufferSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/loadArrayBuffer', 'Core/Request', diff --git a/Specs/Core/loadBlobSpec.js b/Specs/Core/loadBlobSpec.js index af7f40599888..d3be684da542 100644 --- a/Specs/Core/loadBlobSpec.js +++ b/Specs/Core/loadBlobSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/loadBlob', 'Core/Request', diff --git a/Specs/Core/loadCRNSpec.js b/Specs/Core/loadCRNSpec.js index c184d0ab71ec..ce187d90187f 100644 --- a/Specs/Core/loadCRNSpec.js +++ b/Specs/Core/loadCRNSpec.js @@ -1,16 +1,15 @@ -/*global defineSuite*/ defineSuite([ - 'Core/loadCRN', - 'Core/PixelFormat', - 'Core/Request', - 'Core/RequestErrorEvent', - 'Core/RequestScheduler' -], function( - loadCRN, - PixelFormat, - Request, - RequestErrorEvent, - RequestScheduler) { + 'Core/loadCRN', + 'Core/PixelFormat', + 'Core/Request', + 'Core/RequestErrorEvent', + 'Core/RequestScheduler' + ], function( + loadCRN, + PixelFormat, + Request, + RequestErrorEvent, + RequestScheduler) { 'use strict'; var validCompressed = new Uint8Array([72, 120, 0, 74, 227, 123, 0, 0, 0, 138, 92, 167, 0, 4, 0, 4, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, 0, 0, 22, 0, 1, 0, 0, 96, 0, 0, 12, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29, 0, 0, 108, 0, 0, 0, 137, 0, 10, 96, 0, 0, 0, 0, 0, 0, 16, 4, 9, 130, 0, 0, 0, 0, 0, 0, 109, 4, 0, 0, 198, 96, 128, 0, 0, 0, 0, 0, 26, 80, 0, 0, 6, 96, 0, 0, 0, 0, 0, 0, 16, 0, 51, 0, 0, 0, 0, 0, 0, 0, 128, 1, 152, 0, 0, 0, 0, 0, 0, 4, 0]); diff --git a/Specs/Core/loadImageFromTypedArraySpec.js b/Specs/Core/loadImageFromTypedArraySpec.js index d16e6468ab4f..cc02440f399f 100644 --- a/Specs/Core/loadImageFromTypedArraySpec.js +++ b/Specs/Core/loadImageFromTypedArraySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/loadImageFromTypedArray', 'Core/loadArrayBuffer' diff --git a/Specs/Core/loadImageSpec.js b/Specs/Core/loadImageSpec.js index 9837b4e79414..1c838b0fcb90 100644 --- a/Specs/Core/loadImageSpec.js +++ b/Specs/Core/loadImageSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/loadImage', 'Core/Request', diff --git a/Specs/Core/loadImageViaBlobSpec.js b/Specs/Core/loadImageViaBlobSpec.js index 440a4b6c574e..d4731ff13bc3 100644 --- a/Specs/Core/loadImageViaBlobSpec.js +++ b/Specs/Core/loadImageViaBlobSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/loadImageViaBlob', 'Core/Request', diff --git a/Specs/Core/loadJsonSpec.js b/Specs/Core/loadJsonSpec.js index ac2618220a30..21c1dc6d02e0 100644 --- a/Specs/Core/loadJsonSpec.js +++ b/Specs/Core/loadJsonSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/loadJson', 'Core/Request', diff --git a/Specs/Core/loadJsonpSpec.js b/Specs/Core/loadJsonpSpec.js index 7cc442fe470d..6b0a975c4500 100644 --- a/Specs/Core/loadJsonpSpec.js +++ b/Specs/Core/loadJsonpSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/loadJsonp', 'Core/DefaultProxy', diff --git a/Specs/Core/loadKTXSpec.js b/Specs/Core/loadKTXSpec.js index 387854c68e7c..745c22c1a488 100644 --- a/Specs/Core/loadKTXSpec.js +++ b/Specs/Core/loadKTXSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/loadKTX', 'Core/PixelFormat', diff --git a/Specs/Core/loadTextSpec.js b/Specs/Core/loadTextSpec.js index 62bc5620170f..b901228afdb0 100644 --- a/Specs/Core/loadTextSpec.js +++ b/Specs/Core/loadTextSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/loadText', 'Core/Request', diff --git a/Specs/Core/loadWithXhrSpec.js b/Specs/Core/loadWithXhrSpec.js index 84aa74f13f08..f6a2e0c1cf26 100644 --- a/Specs/Core/loadWithXhrSpec.js +++ b/Specs/Core/loadWithXhrSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/loadWithXhr', 'Core/loadImage', diff --git a/Specs/Core/loadXMLSpec.js b/Specs/Core/loadXMLSpec.js index b79a58909b92..b79f6ccc6af7 100644 --- a/Specs/Core/loadXMLSpec.js +++ b/Specs/Core/loadXMLSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/loadXML', 'Core/Request', diff --git a/Specs/Core/mergeSortSpec.js b/Specs/Core/mergeSortSpec.js index ae5b896fb465..2d425411a3c1 100644 --- a/Specs/Core/mergeSortSpec.js +++ b/Specs/Core/mergeSortSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/mergeSort', 'Core/BoundingSphere', diff --git a/Specs/Core/objectToQuerySpec.js b/Specs/Core/objectToQuerySpec.js index 1c7cfdf21f6f..cd55ebabb65f 100644 --- a/Specs/Core/objectToQuerySpec.js +++ b/Specs/Core/objectToQuerySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/objectToQuery', 'Core/queryToObject' diff --git a/Specs/Core/oneTimeWarningSpec.js b/Specs/Core/oneTimeWarningSpec.js index 2084c25fc11f..4c7d2ab5c248 100644 --- a/Specs/Core/oneTimeWarningSpec.js +++ b/Specs/Core/oneTimeWarningSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/oneTimeWarning' ], function( diff --git a/Specs/Core/parseResponseHeadersSpec.js b/Specs/Core/parseResponseHeadersSpec.js index e67fb93b91cf..156db7a7448c 100644 --- a/Specs/Core/parseResponseHeadersSpec.js +++ b/Specs/Core/parseResponseHeadersSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/parseResponseHeaders' ], function( diff --git a/Specs/Core/pointInsideTriangleSpec.js b/Specs/Core/pointInsideTriangleSpec.js index 14dc6eb28642..15168b82cd71 100644 --- a/Specs/Core/pointInsideTriangleSpec.js +++ b/Specs/Core/pointInsideTriangleSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/pointInsideTriangle', 'Core/Cartesian2' diff --git a/Specs/Core/queryToObjectSpec.js b/Specs/Core/queryToObjectSpec.js index d8d5d0a2a567..014553101524 100644 --- a/Specs/Core/queryToObjectSpec.js +++ b/Specs/Core/queryToObjectSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/queryToObject' ], function( diff --git a/Specs/Core/requestAnimationFrameSpec.js b/Specs/Core/requestAnimationFrameSpec.js index c1c54cc42a15..2ae2ade5ea88 100644 --- a/Specs/Core/requestAnimationFrameSpec.js +++ b/Specs/Core/requestAnimationFrameSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/requestAnimationFrame', 'Core/cancelAnimationFrame', diff --git a/Specs/Core/sampleTerrainMostDetailedSpec.js b/Specs/Core/sampleTerrainMostDetailedSpec.js index 36750c7a6a1e..2a9fdb03f13f 100644 --- a/Specs/Core/sampleTerrainMostDetailedSpec.js +++ b/Specs/Core/sampleTerrainMostDetailedSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/sampleTerrainMostDetailed', 'Core/Cartographic', diff --git a/Specs/Core/sampleTerrainSpec.js b/Specs/Core/sampleTerrainSpec.js index e839d08a57ef..4121b8108541 100644 --- a/Specs/Core/sampleTerrainSpec.js +++ b/Specs/Core/sampleTerrainSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/sampleTerrain', 'Core/Cartographic', diff --git a/Specs/Core/subdivideArraySpec.js b/Specs/Core/subdivideArraySpec.js index 65b4eb6fff4a..022a938dd005 100644 --- a/Specs/Core/subdivideArraySpec.js +++ b/Specs/Core/subdivideArraySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/subdivideArray' ], function( diff --git a/Specs/Core/writeTextToCanvasSpec.js b/Specs/Core/writeTextToCanvasSpec.js index e170c80d0fe4..5c49c69115f9 100644 --- a/Specs/Core/writeTextToCanvasSpec.js +++ b/Specs/Core/writeTextToCanvasSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/writeTextToCanvas', 'Core/Color' diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedColors/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedColors/tileset.json index 44733c7f654c..0fa6255e43de 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedColors/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedColors/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -22,7 +22,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedColorsMix/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedColorsMix/tileset.json index 6864219c8e59..94fba540d202 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedColorsMix/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedColorsMix/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -22,7 +22,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedColorsTranslucent/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedColorsTranslucent/tileset.json index 7346380cc8a8..305c826dc2e3 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedColorsTranslucent/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedColorsTranslucent/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -22,7 +22,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedCompressedTextures/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedCompressedTextures/tileset.json index b7b37b18bacd..039c130bd04e 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedCompressedTextures/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedCompressedTextures/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -22,7 +22,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedDeprecated1/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedDeprecated1/tileset.json index d40f3a9aa03b..2b1363587445 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedDeprecated1/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedDeprecated1/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -22,7 +22,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedDeprecated2/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedDeprecated2/tileset.json index e104f9661a07..4b7949b3289f 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedDeprecated2/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedDeprecated2/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -22,7 +22,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedGltfZUp/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedGltfZUp/tileset.json index 9d366cf2e0bb..7db53a6c0cac 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedGltfZUp/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedGltfZUp/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0", + "version": "1.0", "gltfUpAxis": "Z" }, "properties": { @@ -23,7 +23,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedNoBatchIds/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedNoBatchIds/tileset.json index e782cc06759e..2924cc5987bd 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedNoBatchIds/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedNoBatchIds/tileset.json @@ -1,10 +1,10 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedTextured/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedTextured/tileset.json index e1377db0ef66..af493a33a947 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedTextured/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedTextured/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -22,7 +22,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedTranslucent/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedTranslucent/tileset.json index 4909113dcd85..8b9276debc68 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedTranslucent/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedTranslucent/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -22,7 +22,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedTranslucentOpaqueMix/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedTranslucentOpaqueMix/tileset.json index dd19decf470e..c54593ad17fa 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedTranslucentOpaqueMix/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedTranslucentOpaqueMix/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -22,7 +22,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedWGS84/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedWGS84/tileset.json index 8a2fb4674e7c..4d1d329c2467 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedWGS84/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedWGS84/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -22,7 +22,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedWithBatchTable/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedWithBatchTable/tileset.json index 9d27e6783e42..ee7a16bf9f2e 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedWithBatchTable/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedWithBatchTable/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -22,7 +22,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedWithBatchTableBinary/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedWithBatchTableBinary/tileset.json index d0b76fc4bb40..f35a8f907670 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedWithBatchTableBinary/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedWithBatchTableBinary/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -22,7 +22,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedWithBoundingSphere/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedWithBoundingSphere/tileset.json index 6e095bb737b2..7ee16de3a2b9 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedWithBoundingSphere/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedWithBoundingSphere/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -22,7 +22,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "sphere": [ 1215011.9317263428, diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedWithKHRMaterialsCommon/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedWithKHRMaterialsCommon/tileset.json index 28e0ad85e8e9..841fb01251a2 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedWithKHRMaterialsCommon/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedWithKHRMaterialsCommon/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -22,7 +22,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedWithQuantization/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedWithQuantization/tileset.json index 7e55f3ab9ece..3ca72d8356ca 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedWithQuantization/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedWithQuantization/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -22,7 +22,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedWithTransformBox/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedWithTransformBox/tileset.json index ee1b0dcc8a70..906ba939c7f3 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedWithTransformBox/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedWithTransformBox/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -40,7 +40,7 @@ 4081602.0044800863, 1 ], - "refine": "add", + "refine": "ADD", "boundingVolume": { "box": [ 0, diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedWithTransformRegion/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedWithTransformRegion/tileset.json index 5d4f361d7c03..f2343b3f0340 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedWithTransformRegion/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedWithTransformRegion/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -40,7 +40,7 @@ 4081602.0044800863, 1 ], - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedWithTransformSphere/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedWithTransformSphere/tileset.json index d98b14ec7368..17e9f8495e15 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedWithTransformSphere/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedWithTransformSphere/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -40,7 +40,7 @@ 4081602.0044800863, 1 ], - "refine": "add", + "refine": "ADD", "boundingVolume": { "sphere": [ 0, diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedWithoutBatchTable/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedWithoutBatchTable/tileset.json index 510bf187f33e..a82eb34578a6 100644 --- a/Specs/Data/Cesium3DTiles/Batched/BatchedWithoutBatchTable/tileset.json +++ b/Specs/Data/Cesium3DTiles/Batched/BatchedWithoutBatchTable/tileset.json @@ -1,10 +1,10 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Composite/Composite/tileset.json b/Specs/Data/Cesium3DTiles/Composite/Composite/tileset.json index eb6aa226c12a..6d27a3cd0769 100644 --- a/Specs/Data/Cesium3DTiles/Composite/Composite/tileset.json +++ b/Specs/Data/Cesium3DTiles/Composite/Composite/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -22,7 +22,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Composite/CompositeOfComposite/tileset.json b/Specs/Data/Cesium3DTiles/Composite/CompositeOfComposite/tileset.json index d5465d72d802..9ff5ce26b102 100644 --- a/Specs/Data/Cesium3DTiles/Composite/CompositeOfComposite/tileset.json +++ b/Specs/Data/Cesium3DTiles/Composite/CompositeOfComposite/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -22,7 +22,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchy/tileset.json b/Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchy/tileset.json index ed31f390fa80..01d4746f1ded 100644 --- a/Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchy/tileset.json +++ b/Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchy/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 70, "root": { @@ -22,7 +22,7 @@ 4081602.0044800863, 1 ], - "refine": "add", + "refine": "ADD", "boundingVolume": { "box": [ 0, diff --git a/Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchyBinary/tileset.json b/Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchyBinary/tileset.json index ed31f390fa80..01d4746f1ded 100644 --- a/Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchyBinary/tileset.json +++ b/Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchyBinary/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 70, "root": { @@ -22,7 +22,7 @@ 4081602.0044800863, 1 ], - "refine": "add", + "refine": "ADD", "boundingVolume": { "box": [ 0, diff --git a/Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchyMultipleParents/tileset.json b/Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchyMultipleParents/tileset.json index ed31f390fa80..01d4746f1ded 100644 --- a/Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchyMultipleParents/tileset.json +++ b/Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchyMultipleParents/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 70, "root": { @@ -22,7 +22,7 @@ 4081602.0044800863, 1 ], - "refine": "add", + "refine": "ADD", "boundingVolume": { "box": [ 0, diff --git a/Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchyNoParents/tileset.json b/Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchyNoParents/tileset.json index ed31f390fa80..01d4746f1ded 100644 --- a/Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchyNoParents/tileset.json +++ b/Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchyNoParents/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 70, "root": { @@ -22,7 +22,7 @@ 4081602.0044800863, 1 ], - "refine": "add", + "refine": "ADD", "boundingVolume": { "box": [ 0, diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedCompressedTextures/tileset.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedCompressedTextures/tileset.json index 090c238793f5..ee21abd873f8 100644 --- a/Specs/Data/Cesium3DTiles/Instanced/InstancedCompressedTextures/tileset.json +++ b/Specs/Data/Cesium3DTiles/Instanced/InstancedCompressedTextures/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "Height": { @@ -10,7 +10,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedGltfExternal/tileset.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedGltfExternal/tileset.json index f54857135d9a..1264306de538 100644 --- a/Specs/Data/Cesium3DTiles/Instanced/InstancedGltfExternal/tileset.json +++ b/Specs/Data/Cesium3DTiles/Instanced/InstancedGltfExternal/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "Height": { @@ -10,7 +10,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedGltfZUp/tileset.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedGltfZUp/tileset.json index a60d5e450505..cd3a4dba4e31 100644 --- a/Specs/Data/Cesium3DTiles/Instanced/InstancedGltfZUp/tileset.json +++ b/Specs/Data/Cesium3DTiles/Instanced/InstancedGltfZUp/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0", + "version": "1.0", "gltfUpAxis": "Z" }, "properties": { @@ -11,7 +11,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedOct32POrientation/tileset.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedOct32POrientation/tileset.json index c52f33490b81..bc91387e2c1a 100644 --- a/Specs/Data/Cesium3DTiles/Instanced/InstancedOct32POrientation/tileset.json +++ b/Specs/Data/Cesium3DTiles/Instanced/InstancedOct32POrientation/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "Height": { @@ -10,7 +10,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedOrientation/tileset.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedOrientation/tileset.json index 29e3cb2a488e..79872aae09cf 100644 --- a/Specs/Data/Cesium3DTiles/Instanced/InstancedOrientation/tileset.json +++ b/Specs/Data/Cesium3DTiles/Instanced/InstancedOrientation/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "Height": { @@ -10,7 +10,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedQuantized/tileset.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedQuantized/tileset.json index 0a1d5acc31e6..d82edd03c5e7 100644 --- a/Specs/Data/Cesium3DTiles/Instanced/InstancedQuantized/tileset.json +++ b/Specs/Data/Cesium3DTiles/Instanced/InstancedQuantized/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "Height": { @@ -10,7 +10,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedQuantizedOct32POrientation/tileset.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedQuantizedOct32POrientation/tileset.json index c41b07b335f2..ea91d0c95995 100644 --- a/Specs/Data/Cesium3DTiles/Instanced/InstancedQuantizedOct32POrientation/tileset.json +++ b/Specs/Data/Cesium3DTiles/Instanced/InstancedQuantizedOct32POrientation/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "Height": { @@ -10,7 +10,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedRTC/tileset.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedRTC/tileset.json index 9c5d59deb4ce..85d11f148ba8 100644 --- a/Specs/Data/Cesium3DTiles/Instanced/InstancedRTC/tileset.json +++ b/Specs/Data/Cesium3DTiles/Instanced/InstancedRTC/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "Height": { @@ -10,7 +10,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedRedMaterial/tileset.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedRedMaterial/tileset.json index 1543d7c05bc2..710dcc963a5a 100644 --- a/Specs/Data/Cesium3DTiles/Instanced/InstancedRedMaterial/tileset.json +++ b/Specs/Data/Cesium3DTiles/Instanced/InstancedRedMaterial/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "Height": { @@ -10,7 +10,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedScale/tileset.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedScale/tileset.json index 611188681761..f8ba2f5739b6 100644 --- a/Specs/Data/Cesium3DTiles/Instanced/InstancedScale/tileset.json +++ b/Specs/Data/Cesium3DTiles/Instanced/InstancedScale/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "Height": { @@ -10,7 +10,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedScaleNonUniform/tileset.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedScaleNonUniform/tileset.json index 03f2136ba036..90431270eab1 100644 --- a/Specs/Data/Cesium3DTiles/Instanced/InstancedScaleNonUniform/tileset.json +++ b/Specs/Data/Cesium3DTiles/Instanced/InstancedScaleNonUniform/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "Height": { @@ -10,7 +10,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedTextured/tileset.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedTextured/tileset.json index ae42528eb3b5..c95a236fb41d 100644 --- a/Specs/Data/Cesium3DTiles/Instanced/InstancedTextured/tileset.json +++ b/Specs/Data/Cesium3DTiles/Instanced/InstancedTextured/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "Height": { @@ -10,7 +10,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedWithBatchIds/tileset.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedWithBatchIds/tileset.json index 5214b77061f9..31d2593ed266 100644 --- a/Specs/Data/Cesium3DTiles/Instanced/InstancedWithBatchIds/tileset.json +++ b/Specs/Data/Cesium3DTiles/Instanced/InstancedWithBatchIds/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "Height": { @@ -10,7 +10,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedWithBatchTable/tileset.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedWithBatchTable/tileset.json index 51047647dad5..33d3f8817d1e 100644 --- a/Specs/Data/Cesium3DTiles/Instanced/InstancedWithBatchTable/tileset.json +++ b/Specs/Data/Cesium3DTiles/Instanced/InstancedWithBatchTable/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "Height": { @@ -10,7 +10,7 @@ }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedWithBatchTableBinary/tileset.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedWithBatchTableBinary/tileset.json index 77f564e44e67..6ab092a8e0a6 100644 --- a/Specs/Data/Cesium3DTiles/Instanced/InstancedWithBatchTableBinary/tileset.json +++ b/Specs/Data/Cesium3DTiles/Instanced/InstancedWithBatchTableBinary/tileset.json @@ -1,16 +1,10 @@ { "asset": { - "version": "0.0" - }, - "properties": { - "Height": { - "minimum": 20, - "maximum": 20 - } + "version": "1.0" }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedWithTransform/tileset.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedWithTransform/tileset.json index 9c550fbc3e82..38f1c4e75c9f 100644 --- a/Specs/Data/Cesium3DTiles/Instanced/InstancedWithTransform/tileset.json +++ b/Specs/Data/Cesium3DTiles/Instanced/InstancedWithTransform/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "Height": { @@ -28,7 +28,7 @@ 4081608.4380407534, 1 ], - "refine": "add", + "refine": "ADD", "boundingVolume": { "box": [ 0, diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedWithoutBatchTable/tileset.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedWithoutBatchTable/tileset.json index 23eae57d525b..7f66a2cec49f 100644 --- a/Specs/Data/Cesium3DTiles/Instanced/InstancedWithoutBatchTable/tileset.json +++ b/Specs/Data/Cesium3DTiles/Instanced/InstancedWithoutBatchTable/tileset.json @@ -1,10 +1,10 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 70, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "region": [ -1.3197004795898053, diff --git a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudBatched/tileset.json b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudBatched/tileset.json index 7da76d80e07d..87e96c338c92 100644 --- a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudBatched/tileset.json +++ b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudBatched/tileset.json @@ -1,10 +1,10 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 17.32, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "sphere": [ 1215012.8828876738, diff --git a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudConstantColor/tileset.json b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudConstantColor/tileset.json index 86f287b67821..beff8312dccd 100644 --- a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudConstantColor/tileset.json +++ b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudConstantColor/tileset.json @@ -1,10 +1,10 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 17.32, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "sphere": [ 1215012.8828876738, diff --git a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudNoColor/tileset.json b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudNoColor/tileset.json index 1ba137876a77..d59e8e15cc18 100644 --- a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudNoColor/tileset.json +++ b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudNoColor/tileset.json @@ -1,10 +1,10 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 17.32, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "sphere": [ 1215012.8828876738, diff --git a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudNormals/tileset.json b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudNormals/tileset.json index cbd112148fe4..4556bd903e8d 100644 --- a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudNormals/tileset.json +++ b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudNormals/tileset.json @@ -1,10 +1,10 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 17.32, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "sphere": [ 1215012.8828876738, diff --git a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudNormalsOctEncoded/tileset.json b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudNormalsOctEncoded/tileset.json index dda4b23c12b1..e4df349fe341 100644 --- a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudNormalsOctEncoded/tileset.json +++ b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudNormalsOctEncoded/tileset.json @@ -1,10 +1,10 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 17.32, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "sphere": [ 1215012.8828876738, diff --git a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudQuantized/tileset.json b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudQuantized/tileset.json index fd46571f8aec..55bda5330a10 100644 --- a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudQuantized/tileset.json +++ b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudQuantized/tileset.json @@ -1,10 +1,10 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 17.32, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "sphere": [ 1215012.8828876738, diff --git a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudQuantizedOctEncoded/tileset.json b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudQuantizedOctEncoded/tileset.json index 21a1a017e1ed..90106cb98bca 100644 --- a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudQuantizedOctEncoded/tileset.json +++ b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudQuantizedOctEncoded/tileset.json @@ -1,10 +1,10 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 17.32, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "sphere": [ 1215012.8828876738, diff --git a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudRGB/tileset.json b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudRGB/tileset.json index 166b270b98be..80b8ca18329f 100644 --- a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudRGB/tileset.json +++ b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudRGB/tileset.json @@ -1,10 +1,10 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 17.32, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "sphere": [ 1215012.8828876738, diff --git a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudRGB565/tileset.json b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudRGB565/tileset.json index e5862c523b4f..faf6c1f4735d 100644 --- a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudRGB565/tileset.json +++ b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudRGB565/tileset.json @@ -1,10 +1,10 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 17.32, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "sphere": [ 1215012.8828876738, diff --git a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudRGBA/tileset.json b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudRGBA/tileset.json index 8aca46b846aa..31421493e025 100644 --- a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudRGBA/tileset.json +++ b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudRGBA/tileset.json @@ -1,10 +1,10 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 17.32, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "sphere": [ 1215012.8828876738, diff --git a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudWGS84/tileset.json b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudWGS84/tileset.json index e07802ddb35c..d3daee3da889 100644 --- a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudWGS84/tileset.json +++ b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudWGS84/tileset.json @@ -1,10 +1,10 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 17.32, "root": { - "refine": "add", + "refine": "ADD", "boundingVolume": { "sphere": [ 1215012.8828876738, diff --git a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudWithPerPointProperties/tileset.json b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudWithPerPointProperties/tileset.json index 903f7739add9..b96eb8773efc 100644 --- a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudWithPerPointProperties/tileset.json +++ b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudWithPerPointProperties/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 17.32, "root": { @@ -22,7 +22,7 @@ 4081605.22126042, 1 ], - "refine": "add", + "refine": "ADD", "boundingVolume": { "sphere": [ 0, diff --git a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudWithTransform/tileset.json b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudWithTransform/tileset.json index 16d86434b967..0082b8b8a182 100644 --- a/Specs/Data/Cesium3DTiles/PointCloud/PointCloudWithTransform/tileset.json +++ b/Specs/Data/Cesium3DTiles/PointCloud/PointCloudWithTransform/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 17.32, "root": { @@ -22,7 +22,7 @@ 4081605.22126042, 1 ], - "refine": "add", + "refine": "ADD", "boundingVolume": { "sphere": [ 0, diff --git a/Specs/Data/Cesium3DTiles/Tilesets/Tileset/tileset.json b/Specs/Data/Cesium3DTiles/Tilesets/Tileset/tileset.json index b2ede34c3f38..baef7f135368 100644 --- a/Specs/Data/Cesium3DTiles/Tilesets/Tileset/tileset.json +++ b/Specs/Data/Cesium3DTiles/Tilesets/Tileset/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0", + "version": "1.0", "tilesetVersion": "1.2.3" }, "properties": { @@ -34,7 +34,7 @@ ] }, "geometricError": 70, - "refine": "add", + "refine": "ADD", "content": { "url": "parent.b3dm", "boundingVolume": { diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetEmptyRoot/tileset.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetEmptyRoot/tileset.json index 8d9760a740ba..c612f287e72a 100644 --- a/Specs/Data/Cesium3DTiles/Tilesets/TilesetEmptyRoot/tileset.json +++ b/Specs/Data/Cesium3DTiles/Tilesets/TilesetEmptyRoot/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -33,7 +33,7 @@ ] }, "geometricError": 70, - "refine": "add", + "refine": "ADD", "children": [ { "boundingVolume": { diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tileset.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tileset.json index c3f31982179f..4b1aba30142c 100644 --- a/Specs/Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tileset.json +++ b/Specs/Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -33,7 +33,7 @@ ] }, "geometricError": 70, - "refine": "add", + "refine": "ADD", "content": { "url": "tileset2.json" } diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tileset2.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tileset2.json index bb2342e10ee7..e2e4b8f7a4c4 100644 --- a/Specs/Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tileset2.json +++ b/Specs/Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tileset2.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 70, "root": { @@ -15,7 +15,7 @@ ] }, "geometricError": 70, - "refine": "add", + "refine": "ADD", "content": { "url": "parent.b3dm" }, diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tileset3/tileset3.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tileset3/tileset3.json index 9cb6e6d8927d..76266f647b3c 100644 --- a/Specs/Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tileset3/tileset3.json +++ b/Specs/Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tileset3/tileset3.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 0, "root": { @@ -15,7 +15,7 @@ ] }, "geometricError": 0, - "refine": "add", + "refine": "ADD", "content": { "url": "ll.b3dm" } diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetRefinementMix/tileset.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetRefinementMix/tileset.json index a267e65f5edc..41268f2063ac 100644 --- a/Specs/Data/Cesium3DTiles/Tilesets/TilesetRefinementMix/tileset.json +++ b/Specs/Data/Cesium3DTiles/Tilesets/TilesetRefinementMix/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -33,7 +33,7 @@ ] }, "geometricError": 70, - "refine": "add", + "refine": "ADD", "content": { "url": "parent.b3dm", "boundingVolume": { @@ -60,7 +60,7 @@ ] }, "geometricError": 70, - "refine": "replace", + "refine": "REPLACE", "content": { "url": "parent.b3dm" }, @@ -77,7 +77,7 @@ ] }, "geometricError": 0, - "refine": "add", + "refine": "ADD", "content": { "url": "ll.b3dm" } @@ -94,7 +94,7 @@ ] }, "geometricError": 0, - "refine": "replace", + "refine": "REPLACE", "content": { "url": "ur.b3dm" } @@ -113,7 +113,7 @@ ] }, "geometricError": 70, - "refine": "add", + "refine": "ADD", "content": { "url": "parent.b3dm" }, @@ -130,7 +130,7 @@ ] }, "geometricError": 0, - "refine": "add", + "refine": "ADD", "content": { "url": "ul.b3dm" } @@ -147,7 +147,7 @@ ] }, "geometricError": 0, - "refine": "replace", + "refine": "REPLACE", "content": { "url": "lr.b3dm" } diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacement1/tileset.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacement1/tileset.json index 94d831ec611f..13421c2a40e6 100644 --- a/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacement1/tileset.json +++ b/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacement1/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -33,7 +33,7 @@ ] }, "geometricError": 70, - "refine": "replace", + "refine": "REPLACE", "content": { "url": "parent.b3dm", "boundingVolume": { @@ -60,7 +60,7 @@ ] }, "geometricError": 70, - "refine": "add", + "refine": "ADD", "children": [ { "boundingVolume": { @@ -108,7 +108,7 @@ ] }, "geometricError": 70, - "refine": "add", + "refine": "ADD", "children": [ { "boundingVolume": { diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacement2/tileset.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacement2/tileset.json index 0f386d533338..543d3880e472 100644 --- a/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacement2/tileset.json +++ b/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacement2/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -33,7 +33,7 @@ ] }, "geometricError": 70, - "refine": "replace", + "refine": "REPLACE", "content": { "url": "parent.b3dm", "boundingVolume": { @@ -60,7 +60,7 @@ ] }, "geometricError": 70, - "refine": "add", + "refine": "ADD", "children": [ { "boundingVolume": { @@ -74,7 +74,7 @@ ] }, "geometricError": 7, - "refine": "replace", + "refine": "REPLACE", "children": [ { "boundingVolume": { diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacement3/tileset.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacement3/tileset.json index 21564b776b9b..4115d3fc5f48 100644 --- a/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacement3/tileset.json +++ b/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacement3/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -33,7 +33,7 @@ ] }, "geometricError": 70, - "refine": "replace", + "refine": "REPLACE", "content": { "url": "parent.b3dm", "boundingVolume": { @@ -60,7 +60,7 @@ ] }, "geometricError": 70, - "refine": "add", + "refine": "ADD", "content": { "url": "tileset2.json" } diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacement3/tileset2.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacement3/tileset2.json index 30f0a8e37191..83548f74ee4b 100644 --- a/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacement3/tileset2.json +++ b/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacement3/tileset2.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 70, "root": { @@ -15,7 +15,7 @@ ] }, "geometricError": 70, - "refine": "replace", + "refine": "REPLACE", "children": [ { "boundingVolume": { diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacementWithViewerRequestVolume/tileset.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacementWithViewerRequestVolume/tileset.json index b625126b1b2e..a75decf7f1c4 100644 --- a/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacementWithViewerRequestVolume/tileset.json +++ b/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacementWithViewerRequestVolume/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "properties": { "id": { @@ -33,7 +33,7 @@ ] }, "geometricError": 240, - "refine": "replace", + "refine": "REPLACE", "children": [ { "boundingVolume": { @@ -47,7 +47,7 @@ ] }, "geometricError": 70, - "refine": "replace", + "refine": "REPLACE", "content": { "url": "parent.b3dm", "boundingVolume": { diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetWithExternalResources/tileset.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetWithExternalResources/tileset.json index 572a43b44cfa..5b872d079909 100644 --- a/Specs/Data/Cesium3DTiles/Tilesets/TilesetWithExternalResources/tileset.json +++ b/Specs/Data/Cesium3DTiles/Tilesets/TilesetWithExternalResources/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0", + "version": "1.0", "tilesetVersion": "1.2.3" }, "geometricError": 70, @@ -16,7 +16,7 @@ ] }, "geometricError": 70, - "refine": "add", + "refine": "ADD", "children": [ { "boundingVolume": { @@ -30,7 +30,7 @@ ] }, "geometricError": 70, - "refine": "add", + "refine": "ADD", "content": { "url": "tileset2/tileset2.json" } @@ -47,7 +47,7 @@ ] }, "geometricError": 70, - "refine": "add", + "refine": "ADD", "content": { "url": "external.b3dm" }, @@ -82,7 +82,7 @@ ] }, "geometricError": 70, - "refine": "add", + "refine": "ADD", "content": { "url": "external.i3dm" }, @@ -117,7 +117,7 @@ ] }, "geometricError": 70, - "refine": "add", + "refine": "ADD", "content": { "url": "embed.i3dm" }, diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetWithExternalResources/tileset2/tileset2.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetWithExternalResources/tileset2/tileset2.json index 8a51f4353085..1480a90a01b0 100644 --- a/Specs/Data/Cesium3DTiles/Tilesets/TilesetWithExternalResources/tileset2/tileset2.json +++ b/Specs/Data/Cesium3DTiles/Tilesets/TilesetWithExternalResources/tileset2/tileset2.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 70, "root": { @@ -15,7 +15,7 @@ ] }, "geometricError": 70, - "refine": "add", + "refine": "ADD", "children": [ { "boundingVolume": { @@ -29,7 +29,7 @@ ] }, "geometricError": 70, - "refine": "add", + "refine": "ADD", "content": { "url": "external.b3dm" }, @@ -64,7 +64,7 @@ ] }, "geometricError": 70, - "refine": "add", + "refine": "ADD", "content": { "url": "external.i3dm" }, @@ -99,7 +99,7 @@ ] }, "geometricError": 70, - "refine": "add", + "refine": "ADD", "content": { "url": "embed.i3dm" }, diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetWithTransforms/tileset.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetWithTransforms/tileset.json index 094dd679bdf7..7f1b03e91b9c 100644 --- a/Specs/Data/Cesium3DTiles/Tilesets/TilesetWithTransforms/tileset.json +++ b/Specs/Data/Cesium3DTiles/Tilesets/TilesetWithTransforms/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 70, "root": { @@ -39,7 +39,7 @@ 1 ], "geometricError": 70, - "refine": "add", + "refine": "ADD", "content": { "url": "buildings.b3dm" }, diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/tileset.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/tileset.json index 067e2d15d12e..6e611f672945 100644 --- a/Specs/Data/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/tileset.json +++ b/Specs/Data/Cesium3DTiles/Tilesets/TilesetWithViewerRequestVolume/tileset.json @@ -1,6 +1,6 @@ { "asset": { - "version": "0.0" + "version": "1.0" }, "geometricError": 240, "root": { @@ -15,7 +15,7 @@ ] }, "geometricError": 70, - "refine": "add", + "refine": "ADD", "children": [ { "boundingVolume": { diff --git a/Specs/DataSources/BillboardGraphicsSpec.js b/Specs/DataSources/BillboardGraphicsSpec.js index a8a9ef615111..5a7baa4b281a 100644 --- a/Specs/DataSources/BillboardGraphicsSpec.js +++ b/Specs/DataSources/BillboardGraphicsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/BillboardGraphics', 'Core/Cartesian2', diff --git a/Specs/DataSources/BillboardVisualizerSpec.js b/Specs/DataSources/BillboardVisualizerSpec.js index ee7c1bba1817..92fda4fd6927 100644 --- a/Specs/DataSources/BillboardVisualizerSpec.js +++ b/Specs/DataSources/BillboardVisualizerSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/BillboardVisualizer', 'Core/BoundingRectangle', diff --git a/Specs/DataSources/BoxGeometryUpdaterSpec.js b/Specs/DataSources/BoxGeometryUpdaterSpec.js index 65a0a343f7ea..4674fe6959a2 100644 --- a/Specs/DataSources/BoxGeometryUpdaterSpec.js +++ b/Specs/DataSources/BoxGeometryUpdaterSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/BoxGeometryUpdater', 'Core/Cartesian3', diff --git a/Specs/DataSources/BoxGraphicsSpec.js b/Specs/DataSources/BoxGraphicsSpec.js index 5ef15e8b12a0..3c2887aa366e 100644 --- a/Specs/DataSources/BoxGraphicsSpec.js +++ b/Specs/DataSources/BoxGraphicsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/BoxGraphics', 'Core/Cartesian3', diff --git a/Specs/DataSources/CallbackPropertySpec.js b/Specs/DataSources/CallbackPropertySpec.js index 96c992d8c23f..7a76269153de 100644 --- a/Specs/DataSources/CallbackPropertySpec.js +++ b/Specs/DataSources/CallbackPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/CallbackProperty', 'Core/JulianDate' diff --git a/Specs/DataSources/CheckerboardMaterialPropertySpec.js b/Specs/DataSources/CheckerboardMaterialPropertySpec.js index de60817010aa..9f4e7ddabc12 100644 --- a/Specs/DataSources/CheckerboardMaterialPropertySpec.js +++ b/Specs/DataSources/CheckerboardMaterialPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/CheckerboardMaterialProperty', 'Core/Cartesian2', diff --git a/Specs/DataSources/ColorMaterialPropertySpec.js b/Specs/DataSources/ColorMaterialPropertySpec.js index b1752f5c01a7..9a2cd2111a1f 100644 --- a/Specs/DataSources/ColorMaterialPropertySpec.js +++ b/Specs/DataSources/ColorMaterialPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/ColorMaterialProperty', 'Core/Color', diff --git a/Specs/DataSources/CompositeEntityCollectionSpec.js b/Specs/DataSources/CompositeEntityCollectionSpec.js index 7e061575b78d..88bc0fccdb86 100644 --- a/Specs/DataSources/CompositeEntityCollectionSpec.js +++ b/Specs/DataSources/CompositeEntityCollectionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/CompositeEntityCollection', 'Core/Iso8601', diff --git a/Specs/DataSources/CompositeMaterialPropertySpec.js b/Specs/DataSources/CompositeMaterialPropertySpec.js index 37698d2d1e2e..97a5f980ddb5 100644 --- a/Specs/DataSources/CompositeMaterialPropertySpec.js +++ b/Specs/DataSources/CompositeMaterialPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/CompositeMaterialProperty', 'Core/Color', diff --git a/Specs/DataSources/CompositePositionPropertySpec.js b/Specs/DataSources/CompositePositionPropertySpec.js index cdfafc9defac..761277acce07 100644 --- a/Specs/DataSources/CompositePositionPropertySpec.js +++ b/Specs/DataSources/CompositePositionPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/CompositePositionProperty', 'Core/Cartesian3', diff --git a/Specs/DataSources/CompositePropertySpec.js b/Specs/DataSources/CompositePropertySpec.js index 2d50dfdbfadf..df00d0e2d1b0 100644 --- a/Specs/DataSources/CompositePropertySpec.js +++ b/Specs/DataSources/CompositePropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/CompositeProperty', 'Core/Cartesian3', diff --git a/Specs/DataSources/ConstantPositionPropertySpec.js b/Specs/DataSources/ConstantPositionPropertySpec.js index 05e778954763..04163e655b47 100644 --- a/Specs/DataSources/ConstantPositionPropertySpec.js +++ b/Specs/DataSources/ConstantPositionPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/ConstantPositionProperty', 'Core/Cartesian3', diff --git a/Specs/DataSources/ConstantPropertySpec.js b/Specs/DataSources/ConstantPropertySpec.js index 695a7d57b26a..887771995b27 100644 --- a/Specs/DataSources/ConstantPropertySpec.js +++ b/Specs/DataSources/ConstantPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/ConstantProperty', 'Core/Cartesian3', diff --git a/Specs/DataSources/CorridorGeometryUpdaterSpec.js b/Specs/DataSources/CorridorGeometryUpdaterSpec.js index 18bea1bc505c..2fef90a3ccf7 100644 --- a/Specs/DataSources/CorridorGeometryUpdaterSpec.js +++ b/Specs/DataSources/CorridorGeometryUpdaterSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/CorridorGeometryUpdater', 'Core/Cartesian3', diff --git a/Specs/DataSources/CorridorGraphicsSpec.js b/Specs/DataSources/CorridorGraphicsSpec.js index bdbbc4434a9b..2844fc9f99e4 100644 --- a/Specs/DataSources/CorridorGraphicsSpec.js +++ b/Specs/DataSources/CorridorGraphicsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/CorridorGraphics', 'Core/Color', diff --git a/Specs/DataSources/CustomDataSourceSpec.js b/Specs/DataSources/CustomDataSourceSpec.js index ff01a6cfdfa1..e367814b7273 100644 --- a/Specs/DataSources/CustomDataSourceSpec.js +++ b/Specs/DataSources/CustomDataSourceSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/CustomDataSource', 'Core/Event', diff --git a/Specs/DataSources/CylinderGeometryUpdaterSpec.js b/Specs/DataSources/CylinderGeometryUpdaterSpec.js index 3f43262cd991..7cffded60ec7 100644 --- a/Specs/DataSources/CylinderGeometryUpdaterSpec.js +++ b/Specs/DataSources/CylinderGeometryUpdaterSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/CylinderGeometryUpdater', 'Core/Cartesian3', diff --git a/Specs/DataSources/CylinderGraphicsSpec.js b/Specs/DataSources/CylinderGraphicsSpec.js index 8e6c99d065f5..62727dc0e240 100644 --- a/Specs/DataSources/CylinderGraphicsSpec.js +++ b/Specs/DataSources/CylinderGraphicsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/CylinderGraphics', 'Core/Color', diff --git a/Specs/DataSources/CzmlDataSourceSpec.js b/Specs/DataSources/CzmlDataSourceSpec.js index 5bf2bc771748..ca23bc64af48 100644 --- a/Specs/DataSources/CzmlDataSourceSpec.js +++ b/Specs/DataSources/CzmlDataSourceSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/CzmlDataSource', 'Core/BoundingRectangle', diff --git a/Specs/DataSources/DataSourceClockSpec.js b/Specs/DataSources/DataSourceClockSpec.js index c89f9165e47e..3bab54eea2a0 100644 --- a/Specs/DataSources/DataSourceClockSpec.js +++ b/Specs/DataSources/DataSourceClockSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/DataSourceClock', 'Core/ClockRange', diff --git a/Specs/DataSources/DataSourceCollectionSpec.js b/Specs/DataSources/DataSourceCollectionSpec.js index b73d43079b93..874aed160f69 100644 --- a/Specs/DataSources/DataSourceCollectionSpec.js +++ b/Specs/DataSources/DataSourceCollectionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/DataSourceCollection', 'Specs/MockDataSource', diff --git a/Specs/DataSources/DataSourceDisplaySpec.js b/Specs/DataSources/DataSourceDisplaySpec.js index 37dac234ffc4..2658683131a8 100644 --- a/Specs/DataSources/DataSourceDisplaySpec.js +++ b/Specs/DataSources/DataSourceDisplaySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/DataSourceDisplay', 'Core/BoundingSphere', diff --git a/Specs/DataSources/EllipseGeometryUpdaterSpec.js b/Specs/DataSources/EllipseGeometryUpdaterSpec.js index 3589b7da5dde..3b87b053f710 100644 --- a/Specs/DataSources/EllipseGeometryUpdaterSpec.js +++ b/Specs/DataSources/EllipseGeometryUpdaterSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/EllipseGeometryUpdater', 'Core/Cartesian3', diff --git a/Specs/DataSources/EllipseGraphicsSpec.js b/Specs/DataSources/EllipseGraphicsSpec.js index e32f7345cebe..c2b00ff008e3 100644 --- a/Specs/DataSources/EllipseGraphicsSpec.js +++ b/Specs/DataSources/EllipseGraphicsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/EllipseGraphics', 'Core/Color', diff --git a/Specs/DataSources/EllipsoidGeometryUpdaterSpec.js b/Specs/DataSources/EllipsoidGeometryUpdaterSpec.js index 15c4d4c5d840..7110103e2dfd 100644 --- a/Specs/DataSources/EllipsoidGeometryUpdaterSpec.js +++ b/Specs/DataSources/EllipsoidGeometryUpdaterSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/EllipsoidGeometryUpdater', 'Core/Cartesian3', diff --git a/Specs/DataSources/EllipsoidGraphicsSpec.js b/Specs/DataSources/EllipsoidGraphicsSpec.js index d42c8a7c03e5..02de993902e7 100644 --- a/Specs/DataSources/EllipsoidGraphicsSpec.js +++ b/Specs/DataSources/EllipsoidGraphicsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/EllipsoidGraphics', 'Core/Cartesian3', diff --git a/Specs/DataSources/EntityClusterSpec.js b/Specs/DataSources/EntityClusterSpec.js index dd77ff1f4e14..07cbf8928522 100644 --- a/Specs/DataSources/EntityClusterSpec.js +++ b/Specs/DataSources/EntityClusterSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/EntityCluster', 'Core/Cartesian2', diff --git a/Specs/DataSources/EntityCollectionSpec.js b/Specs/DataSources/EntityCollectionSpec.js index 85ca583b8cb0..5b13cb1a7cc0 100644 --- a/Specs/DataSources/EntityCollectionSpec.js +++ b/Specs/DataSources/EntityCollectionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/EntityCollection', 'Core/Iso8601', diff --git a/Specs/DataSources/EntitySpec.js b/Specs/DataSources/EntitySpec.js index e71dfabf36a1..85b1444e2915 100644 --- a/Specs/DataSources/EntitySpec.js +++ b/Specs/DataSources/EntitySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/Entity', 'Core/Cartesian3', diff --git a/Specs/DataSources/EntityViewSpec.js b/Specs/DataSources/EntityViewSpec.js index ee615722bf2f..5346a431cd44 100644 --- a/Specs/DataSources/EntityViewSpec.js +++ b/Specs/DataSources/EntityViewSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/EntityView', 'Core/BoundingSphere', diff --git a/Specs/DataSources/GeoJsonDataSourceSpec.js b/Specs/DataSources/GeoJsonDataSourceSpec.js index 7e32de9c81d7..a19097e85205 100644 --- a/Specs/DataSources/GeoJsonDataSourceSpec.js +++ b/Specs/DataSources/GeoJsonDataSourceSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/GeoJsonDataSource', 'Core/Cartesian3', diff --git a/Specs/DataSources/GeometryVisualizerSpec.js b/Specs/DataSources/GeometryVisualizerSpec.js index bd3721b20839..837a189f3209 100644 --- a/Specs/DataSources/GeometryVisualizerSpec.js +++ b/Specs/DataSources/GeometryVisualizerSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/GeometryVisualizer', 'Core/BoundingSphere', @@ -17,13 +16,13 @@ defineSuite([ 'DataSources/Entity', 'DataSources/EntityCollection', 'DataSources/GridMaterialProperty', + 'DataSources/PolylineGeometryUpdater', + 'DataSources/PolylineGraphics', 'DataSources/SampledProperty', 'DataSources/StaticGeometryColorBatch', 'DataSources/StaticGeometryPerMaterialBatch', 'DataSources/StaticGroundGeometryColorBatch', 'DataSources/StaticOutlineGeometryBatch', - 'DataSources/PolylineGeometryUpdater', - 'DataSources/PolylineGraphics', 'Scene/GroundPrimitive', 'Scene/ShadowMode', 'Specs/createDynamicProperty', @@ -47,13 +46,13 @@ defineSuite([ Entity, EntityCollection, GridMaterialProperty, + PolylineGeometryUpdater, + PolylineGraphics, SampledProperty, StaticGeometryColorBatch, StaticGeometryPerMaterialBatch, StaticGroundGeometryColorBatch, StaticOutlineGeometryBatch, - PolylineGeometryUpdater, - PolylineGraphics, GroundPrimitive, ShadowMode, createDynamicProperty, diff --git a/Specs/DataSources/GridMaterialPropertySpec.js b/Specs/DataSources/GridMaterialPropertySpec.js index 416ae21f922a..2a36229e0554 100644 --- a/Specs/DataSources/GridMaterialPropertySpec.js +++ b/Specs/DataSources/GridMaterialPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/GridMaterialProperty', 'Core/Cartesian2', diff --git a/Specs/DataSources/ImageMaterialPropertySpec.js b/Specs/DataSources/ImageMaterialPropertySpec.js index e8c06a29a00d..5fc991729697 100644 --- a/Specs/DataSources/ImageMaterialPropertySpec.js +++ b/Specs/DataSources/ImageMaterialPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/ImageMaterialProperty', 'Core/Cartesian2', diff --git a/Specs/DataSources/KmlDataSourceSpec.js b/Specs/DataSources/KmlDataSourceSpec.js index 130ad93a6e0c..17198cd83648 100644 --- a/Specs/DataSources/KmlDataSourceSpec.js +++ b/Specs/DataSources/KmlDataSourceSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/KmlDataSource', 'Core/BoundingRectangle', diff --git a/Specs/DataSources/LabelGraphicsSpec.js b/Specs/DataSources/LabelGraphicsSpec.js index 70e9d6c9c3f7..282fc3d7a824 100644 --- a/Specs/DataSources/LabelGraphicsSpec.js +++ b/Specs/DataSources/LabelGraphicsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/LabelGraphics', 'Core/Cartesian2', diff --git a/Specs/DataSources/LabelVisualizerSpec.js b/Specs/DataSources/LabelVisualizerSpec.js index e6290fc242c7..c5a2112c6ac6 100644 --- a/Specs/DataSources/LabelVisualizerSpec.js +++ b/Specs/DataSources/LabelVisualizerSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/LabelVisualizer', 'Core/BoundingSphere', diff --git a/Specs/DataSources/ModelGraphicsSpec.js b/Specs/DataSources/ModelGraphicsSpec.js index 34fe22724987..c5db38a7d99c 100644 --- a/Specs/DataSources/ModelGraphicsSpec.js +++ b/Specs/DataSources/ModelGraphicsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/ModelGraphics', 'Core/Cartesian3', diff --git a/Specs/DataSources/ModelVisualizerSpec.js b/Specs/DataSources/ModelVisualizerSpec.js index ba132e850f96..61fa33d7598d 100644 --- a/Specs/DataSources/ModelVisualizerSpec.js +++ b/Specs/DataSources/ModelVisualizerSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/ModelVisualizer', 'Core/BoundingSphere', diff --git a/Specs/DataSources/NodeTransformationPropertySpec.js b/Specs/DataSources/NodeTransformationPropertySpec.js index df34fc3f4ef4..cfba9ae39813 100644 --- a/Specs/DataSources/NodeTransformationPropertySpec.js +++ b/Specs/DataSources/NodeTransformationPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/NodeTransformationProperty', 'Core/Cartesian3', diff --git a/Specs/DataSources/PathGraphicsSpec.js b/Specs/DataSources/PathGraphicsSpec.js index f7add5e01e98..07fba5fb8629 100644 --- a/Specs/DataSources/PathGraphicsSpec.js +++ b/Specs/DataSources/PathGraphicsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/PathGraphics', 'Core/Color', diff --git a/Specs/DataSources/PathVisualizerSpec.js b/Specs/DataSources/PathVisualizerSpec.js index 71125f2513a4..ff604757149a 100644 --- a/Specs/DataSources/PathVisualizerSpec.js +++ b/Specs/DataSources/PathVisualizerSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/PathVisualizer', 'Core/Cartesian3', diff --git a/Specs/DataSources/PointGraphicsSpec.js b/Specs/DataSources/PointGraphicsSpec.js index 5d57aba5f204..93c0b4818a88 100644 --- a/Specs/DataSources/PointGraphicsSpec.js +++ b/Specs/DataSources/PointGraphicsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/PointGraphics', 'Core/Color', diff --git a/Specs/DataSources/PointVisualizerSpec.js b/Specs/DataSources/PointVisualizerSpec.js index 39472f127f38..179677a31758 100644 --- a/Specs/DataSources/PointVisualizerSpec.js +++ b/Specs/DataSources/PointVisualizerSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/PointVisualizer', 'Core/BoundingSphere', diff --git a/Specs/DataSources/PolygonGeometryUpdaterSpec.js b/Specs/DataSources/PolygonGeometryUpdaterSpec.js index d96633dcba8f..38cee4903735 100644 --- a/Specs/DataSources/PolygonGeometryUpdaterSpec.js +++ b/Specs/DataSources/PolygonGeometryUpdaterSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/PolygonGeometryUpdater', 'Core/Cartesian3', diff --git a/Specs/DataSources/PolygonGraphicsSpec.js b/Specs/DataSources/PolygonGraphicsSpec.js index 4aa9310a0a36..ffb4b6f59bbd 100644 --- a/Specs/DataSources/PolygonGraphicsSpec.js +++ b/Specs/DataSources/PolygonGraphicsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/PolygonGraphics', 'Core/Color', diff --git a/Specs/DataSources/PolylineArrowMaterialPropertySpec.js b/Specs/DataSources/PolylineArrowMaterialPropertySpec.js index dd2a887b0803..5fbd806a1b7c 100644 --- a/Specs/DataSources/PolylineArrowMaterialPropertySpec.js +++ b/Specs/DataSources/PolylineArrowMaterialPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/PolylineArrowMaterialProperty', 'Core/Color', diff --git a/Specs/DataSources/PolylineDashMaterialPropertySpec.js b/Specs/DataSources/PolylineDashMaterialPropertySpec.js index d03e4b6cbc64..335a639e8281 100644 --- a/Specs/DataSources/PolylineDashMaterialPropertySpec.js +++ b/Specs/DataSources/PolylineDashMaterialPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/PolylineDashMaterialProperty', 'Core/Color', diff --git a/Specs/DataSources/PolylineGeometryUpdaterSpec.js b/Specs/DataSources/PolylineGeometryUpdaterSpec.js index ef384f9f27fa..55c25e18dcbb 100644 --- a/Specs/DataSources/PolylineGeometryUpdaterSpec.js +++ b/Specs/DataSources/PolylineGeometryUpdaterSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/PolylineGeometryUpdater', 'Core/BoundingSphere', diff --git a/Specs/DataSources/PolylineGlowMaterialPropertySpec.js b/Specs/DataSources/PolylineGlowMaterialPropertySpec.js index f4a8c82c934c..6813206f555d 100644 --- a/Specs/DataSources/PolylineGlowMaterialPropertySpec.js +++ b/Specs/DataSources/PolylineGlowMaterialPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/PolylineGlowMaterialProperty', 'Core/Color', diff --git a/Specs/DataSources/PolylineGraphicsSpec.js b/Specs/DataSources/PolylineGraphicsSpec.js index a41a146c47dd..76a12489621b 100644 --- a/Specs/DataSources/PolylineGraphicsSpec.js +++ b/Specs/DataSources/PolylineGraphicsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/PolylineGraphics', 'Core/Color', diff --git a/Specs/DataSources/PolylineOutlineMaterialPropertySpec.js b/Specs/DataSources/PolylineOutlineMaterialPropertySpec.js index 96158a883b0a..336725889fec 100644 --- a/Specs/DataSources/PolylineOutlineMaterialPropertySpec.js +++ b/Specs/DataSources/PolylineOutlineMaterialPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/PolylineOutlineMaterialProperty', 'Core/Color', diff --git a/Specs/DataSources/PolylineVolumeGeometryUpdaterSpec.js b/Specs/DataSources/PolylineVolumeGeometryUpdaterSpec.js index 811ef935437e..040f890bd77b 100644 --- a/Specs/DataSources/PolylineVolumeGeometryUpdaterSpec.js +++ b/Specs/DataSources/PolylineVolumeGeometryUpdaterSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/PolylineVolumeGeometryUpdater', 'Core/Cartesian2', diff --git a/Specs/DataSources/PolylineVolumeGraphicsSpec.js b/Specs/DataSources/PolylineVolumeGraphicsSpec.js index 06dca21d368d..798b7d83782c 100644 --- a/Specs/DataSources/PolylineVolumeGraphicsSpec.js +++ b/Specs/DataSources/PolylineVolumeGraphicsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/PolylineVolumeGraphics', 'Core/Color', diff --git a/Specs/DataSources/PositionPropertyArraySpec.js b/Specs/DataSources/PositionPropertyArraySpec.js index aa58b4c401ff..8589b301b6ef 100644 --- a/Specs/DataSources/PositionPropertyArraySpec.js +++ b/Specs/DataSources/PositionPropertyArraySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/PositionPropertyArray', 'Core/Cartesian3', diff --git a/Specs/DataSources/PropertyArraySpec.js b/Specs/DataSources/PropertyArraySpec.js index b3036f408b62..d2f181a2b25a 100644 --- a/Specs/DataSources/PropertyArraySpec.js +++ b/Specs/DataSources/PropertyArraySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/PropertyArray', 'Core/JulianDate', diff --git a/Specs/DataSources/PropertyBagSpec.js b/Specs/DataSources/PropertyBagSpec.js index bfe7c9a33640..662823972b4d 100644 --- a/Specs/DataSources/PropertyBagSpec.js +++ b/Specs/DataSources/PropertyBagSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/PropertyBag', 'Core/JulianDate', diff --git a/Specs/DataSources/RectangleGeometryUpdaterSpec.js b/Specs/DataSources/RectangleGeometryUpdaterSpec.js index 998e9ff1d1fe..6c15db890390 100644 --- a/Specs/DataSources/RectangleGeometryUpdaterSpec.js +++ b/Specs/DataSources/RectangleGeometryUpdaterSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/RectangleGeometryUpdater', 'Core/Cartesian3', diff --git a/Specs/DataSources/RectangleGraphicsSpec.js b/Specs/DataSources/RectangleGraphicsSpec.js index 43010332aa3a..b1fbdfe00e57 100644 --- a/Specs/DataSources/RectangleGraphicsSpec.js +++ b/Specs/DataSources/RectangleGraphicsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/RectangleGraphics', 'Core/Color', diff --git a/Specs/DataSources/ReferencePropertySpec.js b/Specs/DataSources/ReferencePropertySpec.js index a5fb814a705f..706c94788e58 100644 --- a/Specs/DataSources/ReferencePropertySpec.js +++ b/Specs/DataSources/ReferencePropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/ReferenceProperty', 'Core/Cartesian3', diff --git a/Specs/DataSources/RotationSpec.js b/Specs/DataSources/RotationSpec.js index de2720bd128e..e2666f93fad4 100644 --- a/Specs/DataSources/RotationSpec.js +++ b/Specs/DataSources/RotationSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/Rotation', 'Core/JulianDate', diff --git a/Specs/DataSources/SampledPositionPropertySpec.js b/Specs/DataSources/SampledPositionPropertySpec.js index 366bc423d61d..90b750cdc01b 100644 --- a/Specs/DataSources/SampledPositionPropertySpec.js +++ b/Specs/DataSources/SampledPositionPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/SampledPositionProperty', 'Core/Cartesian3', diff --git a/Specs/DataSources/SampledPropertySpec.js b/Specs/DataSources/SampledPropertySpec.js index f1cc667df2bc..1fb850cacbb4 100644 --- a/Specs/DataSources/SampledPropertySpec.js +++ b/Specs/DataSources/SampledPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/SampledProperty', 'Core/Cartesian3', diff --git a/Specs/DataSources/StripeMaterialPropertySpec.js b/Specs/DataSources/StripeMaterialPropertySpec.js index 5b765332a2ea..695927c64250 100644 --- a/Specs/DataSources/StripeMaterialPropertySpec.js +++ b/Specs/DataSources/StripeMaterialPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/StripeMaterialProperty', 'Core/Color', diff --git a/Specs/DataSources/TimeIntervalCollectionPositionPropertySpec.js b/Specs/DataSources/TimeIntervalCollectionPositionPropertySpec.js index 10aff8a8eff3..8137db72034a 100644 --- a/Specs/DataSources/TimeIntervalCollectionPositionPropertySpec.js +++ b/Specs/DataSources/TimeIntervalCollectionPositionPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/TimeIntervalCollectionPositionProperty', 'Core/Cartesian3', diff --git a/Specs/DataSources/TimeIntervalCollectionPropertySpec.js b/Specs/DataSources/TimeIntervalCollectionPropertySpec.js index fde3016ee57a..4c162ecf5db0 100644 --- a/Specs/DataSources/TimeIntervalCollectionPropertySpec.js +++ b/Specs/DataSources/TimeIntervalCollectionPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/TimeIntervalCollectionProperty', 'Core/Cartesian3', diff --git a/Specs/DataSources/VelocityOrientationPropertySpec.js b/Specs/DataSources/VelocityOrientationPropertySpec.js index da0284962298..02a682a0faf6 100644 --- a/Specs/DataSources/VelocityOrientationPropertySpec.js +++ b/Specs/DataSources/VelocityOrientationPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/VelocityOrientationProperty', 'Core/Cartesian3', diff --git a/Specs/DataSources/VelocityVectorPropertySpec.js b/Specs/DataSources/VelocityVectorPropertySpec.js index 475c88134de4..e54ab99f5d61 100644 --- a/Specs/DataSources/VelocityVectorPropertySpec.js +++ b/Specs/DataSources/VelocityVectorPropertySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/VelocityVectorProperty', 'Core/Cartesian3', diff --git a/Specs/DataSources/WallGeometryUpdaterSpec.js b/Specs/DataSources/WallGeometryUpdaterSpec.js index 154d0dbdce8e..b3ca9015b47b 100644 --- a/Specs/DataSources/WallGeometryUpdaterSpec.js +++ b/Specs/DataSources/WallGeometryUpdaterSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/WallGeometryUpdater', 'Core/Cartesian3', diff --git a/Specs/DataSources/WallGraphicsSpec.js b/Specs/DataSources/WallGraphicsSpec.js index 43f1e09e168f..906b90bad8da 100644 --- a/Specs/DataSources/WallGraphicsSpec.js +++ b/Specs/DataSources/WallGraphicsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/WallGraphics', 'Core/Color', diff --git a/Specs/DataSources/createMaterialPropertyDescriptorSpec.js b/Specs/DataSources/createMaterialPropertyDescriptorSpec.js index e7864f716164..4fd8d60f6175 100644 --- a/Specs/DataSources/createMaterialPropertyDescriptorSpec.js +++ b/Specs/DataSources/createMaterialPropertyDescriptorSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'DataSources/createMaterialPropertyDescriptor', 'Core/Color', diff --git a/Specs/DomEventSimulator.js b/Specs/DomEventSimulator.js index bf84b47fdb3a..faf9b13995f8 100644 --- a/Specs/DomEventSimulator.js +++ b/Specs/DomEventSimulator.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/defaultValue', 'Core/FeatureDetection' diff --git a/Specs/MockDataSource.js b/Specs/MockDataSource.js index d79fd26d5dce..b9256797b185 100644 --- a/Specs/MockDataSource.js +++ b/Specs/MockDataSource.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/Event', 'DataSources/EntityCluster', diff --git a/Specs/Renderer/AutomaticUniformSpec.js b/Specs/Renderer/AutomaticUniformSpec.js index c3e9ac2d201e..e3d751651d36 100644 --- a/Specs/Renderer/AutomaticUniformSpec.js +++ b/Specs/Renderer/AutomaticUniformSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Cartesian2', 'Core/Cartesian3', diff --git a/Specs/Renderer/BufferSpec.js b/Specs/Renderer/BufferSpec.js index 11c89f013459..d957fa19a039 100644 --- a/Specs/Renderer/BufferSpec.js +++ b/Specs/Renderer/BufferSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Renderer/Buffer', 'Core/IndexDatatype', diff --git a/Specs/Renderer/BuiltinFunctionsSpec.js b/Specs/Renderer/BuiltinFunctionsSpec.js index 4b8436748698..b1e80ffad5a6 100644 --- a/Specs/Renderer/BuiltinFunctionsSpec.js +++ b/Specs/Renderer/BuiltinFunctionsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/BoundingRectangle', 'Core/Cartesian3', diff --git a/Specs/Renderer/ClearCommandSpec.js b/Specs/Renderer/ClearCommandSpec.js index fc7eba9e30e1..26240b64f37c 100644 --- a/Specs/Renderer/ClearCommandSpec.js +++ b/Specs/Renderer/ClearCommandSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Renderer/ClearCommand', 'Core/Color' diff --git a/Specs/Renderer/ClearSpec.js b/Specs/Renderer/ClearSpec.js index e0dd41fb32c9..7109c0705b25 100644 --- a/Specs/Renderer/ClearSpec.js +++ b/Specs/Renderer/ClearSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/BoundingRectangle', 'Core/Color', diff --git a/Specs/Renderer/ComputeCommandSpec.js b/Specs/Renderer/ComputeCommandSpec.js index 62530e84bf0f..e75756c2cc6a 100644 --- a/Specs/Renderer/ComputeCommandSpec.js +++ b/Specs/Renderer/ComputeCommandSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Renderer/ComputeCommand', 'Core/BoundingRectangle', diff --git a/Specs/Renderer/ContextSpec.js b/Specs/Renderer/ContextSpec.js index c13d1e3b6986..bced7cbb9e97 100644 --- a/Specs/Renderer/ContextSpec.js +++ b/Specs/Renderer/ContextSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Renderer/Context', 'Core/Color', diff --git a/Specs/Renderer/CubeMapSpec.js b/Specs/Renderer/CubeMapSpec.js index 4d4c03b8ae4f..beba28aa40cb 100644 --- a/Specs/Renderer/CubeMapSpec.js +++ b/Specs/Renderer/CubeMapSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Renderer/CubeMap', 'Core/Cartesian3', diff --git a/Specs/Renderer/DrawCommandSpec.js b/Specs/Renderer/DrawCommandSpec.js index a066f2cf8e06..ecfebf738e75 100644 --- a/Specs/Renderer/DrawCommandSpec.js +++ b/Specs/Renderer/DrawCommandSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/PrimitiveType', 'Renderer/DrawCommand', diff --git a/Specs/Renderer/DrawSpec.js b/Specs/Renderer/DrawSpec.js index 287880010181..e5e9d55515c1 100644 --- a/Specs/Renderer/DrawSpec.js +++ b/Specs/Renderer/DrawSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/BoundingRectangle', 'Core/Color', diff --git a/Specs/Renderer/FramebufferSpec.js b/Specs/Renderer/FramebufferSpec.js index d733d5899202..56a62a178a36 100644 --- a/Specs/Renderer/FramebufferSpec.js +++ b/Specs/Renderer/FramebufferSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Renderer/Framebuffer', 'Core/Color', diff --git a/Specs/Renderer/PassStateSpec.js b/Specs/Renderer/PassStateSpec.js index 597aab1457a3..3457a6e277c8 100644 --- a/Specs/Renderer/PassStateSpec.js +++ b/Specs/Renderer/PassStateSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Renderer/PassState' ], function( diff --git a/Specs/Renderer/RenderStateSpec.js b/Specs/Renderer/RenderStateSpec.js index 479618ad1ff0..db21029c59d7 100644 --- a/Specs/Renderer/RenderStateSpec.js +++ b/Specs/Renderer/RenderStateSpec.js @@ -1,15 +1,14 @@ -/*global defineSuite*/ defineSuite([ 'Core/WebGLConstants', 'Core/WindingOrder', - 'Renderer/RenderState', 'Renderer/ContextLimits', + 'Renderer/RenderState', 'Specs/createContext' ], function( WebGLConstants, WindingOrder, - RenderState, ContextLimits, + RenderState, createContext) { 'use strict'; diff --git a/Specs/Renderer/RenderbufferSpec.js b/Specs/Renderer/RenderbufferSpec.js index 44604a9a1e42..4211f7ed5885 100644 --- a/Specs/Renderer/RenderbufferSpec.js +++ b/Specs/Renderer/RenderbufferSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Renderer/Renderbuffer', 'Renderer/ContextLimits', diff --git a/Specs/Renderer/SamplerSpec.js b/Specs/Renderer/SamplerSpec.js index 42ed448636fd..27ca18f57729 100644 --- a/Specs/Renderer/SamplerSpec.js +++ b/Specs/Renderer/SamplerSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Renderer/Sampler', 'Renderer/TextureMinificationFilter', diff --git a/Specs/Renderer/ShaderCacheSpec.js b/Specs/Renderer/ShaderCacheSpec.js index 2419fb13e7ac..39e05c765e36 100644 --- a/Specs/Renderer/ShaderCacheSpec.js +++ b/Specs/Renderer/ShaderCacheSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Renderer/ShaderCache', 'Specs/createContext' diff --git a/Specs/Renderer/ShaderProgramSpec.js b/Specs/Renderer/ShaderProgramSpec.js index 374460e21fd7..e2934ed94b66 100644 --- a/Specs/Renderer/ShaderProgramSpec.js +++ b/Specs/Renderer/ShaderProgramSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Renderer/ShaderProgram', 'Renderer/ContextLimits', diff --git a/Specs/Renderer/ShaderSourceSpec.js b/Specs/Renderer/ShaderSourceSpec.js index dfaf3feccdd7..b9105e4b28ed 100644 --- a/Specs/Renderer/ShaderSourceSpec.js +++ b/Specs/Renderer/ShaderSourceSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Renderer/ShaderSource' ], function( diff --git a/Specs/Renderer/TextureSpec.js b/Specs/Renderer/TextureSpec.js index aaae78a5248f..c19d91c26140 100644 --- a/Specs/Renderer/TextureSpec.js +++ b/Specs/Renderer/TextureSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Renderer/Texture', 'Core/Cartesian2', diff --git a/Specs/Renderer/UniformSpec.js b/Specs/Renderer/UniformSpec.js index 6f3443932886..e66ec7dedf65 100644 --- a/Specs/Renderer/UniformSpec.js +++ b/Specs/Renderer/UniformSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Cartesian2', 'Core/Cartesian3', diff --git a/Specs/Renderer/VertexArrayFacadeSpec.js b/Specs/Renderer/VertexArrayFacadeSpec.js index 49cd36133ce9..9d17703e0d7f 100644 --- a/Specs/Renderer/VertexArrayFacadeSpec.js +++ b/Specs/Renderer/VertexArrayFacadeSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Renderer/VertexArrayFacade', 'Core/ComponentDatatype', diff --git a/Specs/Renderer/VertexArrayFactorySpec.js b/Specs/Renderer/VertexArrayFactorySpec.js index 4ad2ee9c7cd8..1c64a716d814 100644 --- a/Specs/Renderer/VertexArrayFactorySpec.js +++ b/Specs/Renderer/VertexArrayFactorySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/ComponentDatatype', 'Core/Geometry', diff --git a/Specs/Renderer/VertexArraySpec.js b/Specs/Renderer/VertexArraySpec.js index 4c5cbbf05f40..f59af9fb5fa6 100644 --- a/Specs/Renderer/VertexArraySpec.js +++ b/Specs/Renderer/VertexArraySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Renderer/VertexArray', 'Core/ComponentDatatype', diff --git a/Specs/Renderer/loadCubeMapSpec.js b/Specs/Renderer/loadCubeMapSpec.js index f681ad3af67b..29b72117395c 100644 --- a/Specs/Renderer/loadCubeMapSpec.js +++ b/Specs/Renderer/loadCubeMapSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Renderer/loadCubeMap', 'Core/Cartesian3', diff --git a/Specs/Scene/AppearanceSpec.js b/Specs/Scene/AppearanceSpec.js index 0bb31d70bf70..89ed92a9ed60 100644 --- a/Specs/Scene/AppearanceSpec.js +++ b/Specs/Scene/AppearanceSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Appearance', 'Core/WebGLConstants', diff --git a/Specs/Scene/ArcGisMapServerImageryProviderSpec.js b/Specs/Scene/ArcGisMapServerImageryProviderSpec.js index 1dcde473ebb1..f20c1578ecec 100644 --- a/Specs/Scene/ArcGisMapServerImageryProviderSpec.js +++ b/Specs/Scene/ArcGisMapServerImageryProviderSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/ArcGisMapServerImageryProvider', 'Core/Cartesian2', diff --git a/Specs/Scene/AxisSpec.js b/Specs/Scene/AxisSpec.js index f0b9b0f94d6e..49dc933e1619 100644 --- a/Specs/Scene/AxisSpec.js +++ b/Specs/Scene/AxisSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Axis', 'Core/Cartesian4', diff --git a/Specs/Scene/BatchTableSpec.js b/Specs/Scene/BatchTableSpec.js index 4630dc86e3d0..2b90647bedae 100644 --- a/Specs/Scene/BatchTableSpec.js +++ b/Specs/Scene/BatchTableSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/BatchTable', 'Core/Cartesian4', diff --git a/Specs/Scene/Batched3DModel3DTileContentSpec.js b/Specs/Scene/Batched3DModel3DTileContentSpec.js index 54122006f0c1..c5e948a855ed 100644 --- a/Specs/Scene/Batched3DModel3DTileContentSpec.js +++ b/Specs/Scene/Batched3DModel3DTileContentSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Batched3DModel3DTileContent', 'Core/Cartesian3', diff --git a/Specs/Scene/BillboardCollectionSpec.js b/Specs/Scene/BillboardCollectionSpec.js index 28a3ed6830c2..7c7f85936060 100644 --- a/Specs/Scene/BillboardCollectionSpec.js +++ b/Specs/Scene/BillboardCollectionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/BillboardCollection', 'Core/BoundingRectangle', diff --git a/Specs/Scene/BingMapsImageryProviderSpec.js b/Specs/Scene/BingMapsImageryProviderSpec.js index 192a04c23746..c9115e241eae 100644 --- a/Specs/Scene/BingMapsImageryProviderSpec.js +++ b/Specs/Scene/BingMapsImageryProviderSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/BingMapsImageryProvider', 'Core/DefaultProxy', diff --git a/Specs/Scene/BoxEmitterSpec.js b/Specs/Scene/BoxEmitterSpec.js index d2a97c83f7ff..a905f1186e97 100644 --- a/Specs/Scene/BoxEmitterSpec.js +++ b/Specs/Scene/BoxEmitterSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/BoxEmitter', 'Core/Cartesian3', diff --git a/Specs/Scene/CameraEventAggregatorSpec.js b/Specs/Scene/CameraEventAggregatorSpec.js index 6fa4f3f7e23c..9654527c7187 100644 --- a/Specs/Scene/CameraEventAggregatorSpec.js +++ b/Specs/Scene/CameraEventAggregatorSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/CameraEventAggregator', 'Core/Cartesian2', diff --git a/Specs/Scene/CameraFlightPathSpec.js b/Specs/Scene/CameraFlightPathSpec.js index e45c067522dc..1e352d9b65eb 100644 --- a/Specs/Scene/CameraFlightPathSpec.js +++ b/Specs/Scene/CameraFlightPathSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/CameraFlightPath', 'Core/Cartesian3', diff --git a/Specs/Scene/CameraSpec.js b/Specs/Scene/CameraSpec.js index 63e083a0e037..0db948d0d3d6 100644 --- a/Specs/Scene/CameraSpec.js +++ b/Specs/Scene/CameraSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Camera', 'Core/BoundingSphere', @@ -2473,7 +2472,7 @@ defineSuite([ destination: destination }); camera.flyHome(0); - expect(camera.position).toEqualEpsilon(Cartesian3.UNIT_Z, CesiumMath.EPSILON8); + expect(camera.position).toEqualEpsilon(new Cartesian3(-9183857.990445068, 3896182.1777645755, 1.0), CesiumMath.EPSILON8); expect(camera.direction).toEqualEpsilon(new Cartesian3(0, 0, -1), CesiumMath.EPSILON8); expect(camera.up).toEqualEpsilon(Cartesian3.UNIT_Y, CesiumMath.EPSILON8); }); diff --git a/Specs/Scene/Cesium3DTileBatchTableSpec.js b/Specs/Scene/Cesium3DTileBatchTableSpec.js index 2db529bb5692..8407e6fc8d67 100644 --- a/Specs/Scene/Cesium3DTileBatchTableSpec.js +++ b/Specs/Scene/Cesium3DTileBatchTableSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Cesium3DTileBatchTable', 'Core/Cartesian2', diff --git a/Specs/Scene/Cesium3DTileContentSpec.js b/Specs/Scene/Cesium3DTileContentSpec.js index 28b8d03e909f..ca1c84b32bf6 100644 --- a/Specs/Scene/Cesium3DTileContentSpec.js +++ b/Specs/Scene/Cesium3DTileContentSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Cesium3DTileContent' ], function( diff --git a/Specs/Scene/Cesium3DTileFeatureTableSpec.js b/Specs/Scene/Cesium3DTileFeatureTableSpec.js index 200ba7a5b546..4d1b6ac051e8 100644 --- a/Specs/Scene/Cesium3DTileFeatureTableSpec.js +++ b/Specs/Scene/Cesium3DTileFeatureTableSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Cesium3DTileFeatureTable', 'Core/ComponentDatatype' diff --git a/Specs/Scene/Cesium3DTileSpec.js b/Specs/Scene/Cesium3DTileSpec.js index 743495dd99bc..fd61ea578315 100644 --- a/Specs/Scene/Cesium3DTileSpec.js +++ b/Specs/Scene/Cesium3DTileSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Cesium3DTile', 'Core/Cartesian3', @@ -122,7 +121,8 @@ defineSuite([ var mockTileset = { debugShowBoundingVolume : true, debugShowViewerRequestVolume : true, - modelMatrix : Matrix4.IDENTITY + modelMatrix : Matrix4.IDENTITY, + _geometricError : 2 }; var centerLongitude = -1.31968; @@ -142,14 +142,6 @@ defineSuite([ expect(tile.isDestroyed()).toEqual(true); }); - it('throws if geometricError is undefined', function() { - var tileWithoutGeometricError = clone(tileWithBoundingSphere, true); - delete tileWithoutGeometricError.geometricError; - expect(function() { - return new Cesium3DTile(mockTileset, '/some_url', tileWithoutGeometricError, undefined); - }).toThrowRuntimeError(); - }); - it('throws if boundingVolume is undefined', function() { var tileWithoutBoundingVolume = clone(tileWithBoundingSphere, true); delete tileWithoutBoundingVolume.boundingVolume; @@ -166,6 +158,33 @@ defineSuite([ }).toThrowRuntimeError(); }); + it('logs deprecation warning if refine is lowercase', function() { + spyOn(Cesium3DTile, '_deprecationWarning'); + var header = clone(tileWithBoundingSphere, true); + header.refine = 'replace'; + var tile = new Cesium3DTile(mockTileset, '/some_url', header, undefined); + expect(tile.refine).toBe(Cesium3DTileRefine.REPLACE); + expect(Cesium3DTile._deprecationWarning).toHaveBeenCalled(); + }); + + it('logs deprecation warning if geometric error is undefined', function() { + spyOn(Cesium3DTile, '_deprecationWarning'); + + var geometricErrorMissing = clone(tileWithBoundingSphere, true); + delete geometricErrorMissing.geometricError; + + var parent = new Cesium3DTile(mockTileset, '/some_url', tileWithBoundingSphere, undefined); + var child = new Cesium3DTile(mockTileset, '/some_url', geometricErrorMissing, parent); + expect(child.geometricError).toBe(parent.geometricError); + expect(child.geometricError).toBe(1); + + var tile = new Cesium3DTile(mockTileset, '/some_url', geometricErrorMissing, undefined); + expect(tile.geometricError).toBe(mockTileset._geometricError); + expect(tile.geometricError).toBe(2); + + expect(Cesium3DTile._deprecationWarning.calls.count()).toBe(2); + }); + describe('bounding volumes', function() { it('can have a bounding sphere', function() { var tile = new Cesium3DTile(mockTileset, '/some_url', tileWithBoundingSphere, undefined); @@ -298,15 +317,6 @@ defineSuite([ var newCenter = Cartesian3.fromRadians(newLongitude, newLatitude); expect(boundingSphere.center).toEqualEpsilon(newCenter, CesiumMath.EPSILON7); }); - - it('logs deprecation warning if refine is lowercase', function() { - spyOn(Cesium3DTile, '_deprecationWarning'); - var header = clone(tileWithBoundingSphere, true); - header.refine = 'replace'; - var tile = new Cesium3DTile(mockTileset, '/some_url', header, undefined); - expect(tile.refine).toBe(Cesium3DTileRefine.REPLACE); - expect(Cesium3DTile._deprecationWarning).toHaveBeenCalled(); - }); }); describe('debug bounding volumes', function() { diff --git a/Specs/Scene/Cesium3DTileStyleSpec.js b/Specs/Scene/Cesium3DTileStyleSpec.js index f8437620960a..e1dccae26621 100644 --- a/Specs/Scene/Cesium3DTileStyleSpec.js +++ b/Specs/Scene/Cesium3DTileStyleSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Cesium3DTileStyle', 'Core/Color', diff --git a/Specs/Scene/Cesium3DTilesetSpec.js b/Specs/Scene/Cesium3DTilesetSpec.js index 6f5c4164805d..b1decb667030 100644 --- a/Specs/Scene/Cesium3DTilesetSpec.js +++ b/Specs/Scene/Cesium3DTilesetSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Cesium3DTileset', 'Core/Cartesian3', @@ -276,7 +275,7 @@ defineSuite([ return Cesium3DTilesTester.loadTileset(scene, tilesetUrl).then(function(tileset) { var asset = tileset.asset; expect(asset).toBeDefined(); - expect(asset.version).toEqual('0.0'); + expect(asset.version).toEqual('1.0'); expect(asset.tilesetVersion).toEqual('1.2.3'); var properties = tileset.properties; diff --git a/Specs/Scene/CircleEmitterSpec.js b/Specs/Scene/CircleEmitterSpec.js index ac5d491fbfb5..2492d5b32961 100644 --- a/Specs/Scene/CircleEmitterSpec.js +++ b/Specs/Scene/CircleEmitterSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/CircleEmitter', 'Core/Cartesian3', diff --git a/Specs/Scene/Composite3DTileContentSpec.js b/Specs/Scene/Composite3DTileContentSpec.js index 6c0111372c8a..103ad89ac774 100644 --- a/Specs/Scene/Composite3DTileContentSpec.js +++ b/Specs/Scene/Composite3DTileContentSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Composite3DTileContent', 'Core/Cartesian3', diff --git a/Specs/Scene/ConditionsExpressionSpec.js b/Specs/Scene/ConditionsExpressionSpec.js index db321cc8444c..47a238ca8e81 100644 --- a/Specs/Scene/ConditionsExpressionSpec.js +++ b/Specs/Scene/ConditionsExpressionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/ConditionsExpression', 'Core/Cartesian4', diff --git a/Specs/Scene/ConeEmitterSpec.js b/Specs/Scene/ConeEmitterSpec.js index 7c59802628eb..9a0063eb158a 100644 --- a/Specs/Scene/ConeEmitterSpec.js +++ b/Specs/Scene/ConeEmitterSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/ConeEmitter', 'Core/Cartesian3', diff --git a/Specs/Scene/CreditDisplaySpec.js b/Specs/Scene/CreditDisplaySpec.js index f65359534c4c..bf59e3ee3126 100644 --- a/Specs/Scene/CreditDisplaySpec.js +++ b/Specs/Scene/CreditDisplaySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/CreditDisplay', 'Core/Credit' diff --git a/Specs/Scene/CullingVolumeSpec.js b/Specs/Scene/CullingVolumeSpec.js index 68e5f16b649d..646a8f66a358 100644 --- a/Specs/Scene/CullingVolumeSpec.js +++ b/Specs/Scene/CullingVolumeSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/CullingVolume', 'Core/AxisAlignedBoundingBox', diff --git a/Specs/Scene/DebugAppearanceSpec.js b/Specs/Scene/DebugAppearanceSpec.js index f8250ef0759d..2a91b3bae204 100644 --- a/Specs/Scene/DebugAppearanceSpec.js +++ b/Specs/Scene/DebugAppearanceSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/DebugAppearance', 'Core/ComponentDatatype', diff --git a/Specs/Scene/DebugCameraPrimitiveSpec.js b/Specs/Scene/DebugCameraPrimitiveSpec.js index 9f4da888c2e3..9634f622b567 100644 --- a/Specs/Scene/DebugCameraPrimitiveSpec.js +++ b/Specs/Scene/DebugCameraPrimitiveSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/DebugCameraPrimitive', 'Core/Cartesian3', diff --git a/Specs/Scene/DebugModelMatrixPrimitiveSpec.js b/Specs/Scene/DebugModelMatrixPrimitiveSpec.js index 2364fab20b13..31550816bf00 100644 --- a/Specs/Scene/DebugModelMatrixPrimitiveSpec.js +++ b/Specs/Scene/DebugModelMatrixPrimitiveSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/DebugModelMatrixPrimitive', 'Core/Cartesian3', diff --git a/Specs/Scene/DeviceOrientationCameraControllerSpec.js b/Specs/Scene/DeviceOrientationCameraControllerSpec.js index 8e6c54d19dc1..ade02cd14159 100644 --- a/Specs/Scene/DeviceOrientationCameraControllerSpec.js +++ b/Specs/Scene/DeviceOrientationCameraControllerSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/DeviceOrientationCameraController', 'Core/Cartesian3', diff --git a/Specs/Scene/DiscardMissingTileImagePolicySpec.js b/Specs/Scene/DiscardMissingTileImagePolicySpec.js index bf1281142743..cdddf88dffea 100644 --- a/Specs/Scene/DiscardMissingTileImagePolicySpec.js +++ b/Specs/Scene/DiscardMissingTileImagePolicySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/DiscardMissingTileImagePolicy', 'Core/Cartesian2', diff --git a/Specs/Scene/EllipsoidPrimitiveSpec.js b/Specs/Scene/EllipsoidPrimitiveSpec.js index cf4b0cc44fb8..5fabfb6b8053 100644 --- a/Specs/Scene/EllipsoidPrimitiveSpec.js +++ b/Specs/Scene/EllipsoidPrimitiveSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/EllipsoidPrimitive', 'Core/Cartesian3', diff --git a/Specs/Scene/EllipsoidSurfaceAppearanceSpec.js b/Specs/Scene/EllipsoidSurfaceAppearanceSpec.js index 358909a5dab6..965119e3cfe3 100644 --- a/Specs/Scene/EllipsoidSurfaceAppearanceSpec.js +++ b/Specs/Scene/EllipsoidSurfaceAppearanceSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/EllipsoidSurfaceAppearance', 'Core/ColorGeometryInstanceAttribute', diff --git a/Specs/Scene/Empty3DTileContentSpec.js b/Specs/Scene/Empty3DTileContentSpec.js index 86dbf32b9438..a28fa903e079 100644 --- a/Specs/Scene/Empty3DTileContentSpec.js +++ b/Specs/Scene/Empty3DTileContentSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Empty3DTileContent' ], function( diff --git a/Specs/Scene/ExpressionSpec.js b/Specs/Scene/ExpressionSpec.js index 087f4effb3c2..381620b847c0 100644 --- a/Specs/Scene/ExpressionSpec.js +++ b/Specs/Scene/ExpressionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Expression', 'Core/Cartesian2', diff --git a/Specs/Scene/FrameRateMonitorSpec.js b/Specs/Scene/FrameRateMonitorSpec.js index b54508373748..fd637ebb5074 100644 --- a/Specs/Scene/FrameRateMonitorSpec.js +++ b/Specs/Scene/FrameRateMonitorSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/FrameRateMonitor', 'Core/defined', diff --git a/Specs/Scene/FrustumCommandsSpec.js b/Specs/Scene/FrustumCommandsSpec.js index e3f5a7eb9afe..2011f9d08201 100644 --- a/Specs/Scene/FrustumCommandsSpec.js +++ b/Specs/Scene/FrustumCommandsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Renderer/Pass', 'Scene/FrustumCommands' diff --git a/Specs/Scene/GeometryRenderingSpec.js b/Specs/Scene/GeometryRenderingSpec.js index 9922e4b19132..ca1e71a6ea4e 100644 --- a/Specs/Scene/GeometryRenderingSpec.js +++ b/Specs/Scene/GeometryRenderingSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/BoundingSphere', 'Core/BoxGeometry', diff --git a/Specs/Scene/GlobeSpec.js b/Specs/Scene/GlobeSpec.js index d0006c09f088..546ecfb63793 100644 --- a/Specs/Scene/GlobeSpec.js +++ b/Specs/Scene/GlobeSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Globe', 'Core/CesiumTerrainProvider', diff --git a/Specs/Scene/GlobeSurfaceTileProviderSpec.js b/Specs/Scene/GlobeSurfaceTileProviderSpec.js index a647c761e2ac..40b865886b56 100644 --- a/Specs/Scene/GlobeSurfaceTileProviderSpec.js +++ b/Specs/Scene/GlobeSurfaceTileProviderSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/GlobeSurfaceTileProvider', 'Core/Cartesian3', diff --git a/Specs/Scene/GlobeSurfaceTileSpec.js b/Specs/Scene/GlobeSurfaceTileSpec.js index 6a9c75861187..acc7e9980e34 100644 --- a/Specs/Scene/GlobeSurfaceTileSpec.js +++ b/Specs/Scene/GlobeSurfaceTileSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/GlobeSurfaceTile', 'Core/Cartesian3', diff --git a/Specs/Scene/GoogleEarthEnterpriseImageryProviderSpec.js b/Specs/Scene/GoogleEarthEnterpriseImageryProviderSpec.js index 00eec62d9ac6..eb7dfaeedb13 100644 --- a/Specs/Scene/GoogleEarthEnterpriseImageryProviderSpec.js +++ b/Specs/Scene/GoogleEarthEnterpriseImageryProviderSpec.js @@ -1,44 +1,43 @@ -/*global defineSuite*/ defineSuite([ - 'Scene/GoogleEarthEnterpriseImageryProvider', - 'Core/decodeGoogleEarthEnterpriseData', - 'Core/DefaultProxy', - 'Core/defaultValue', - 'Core/defined', - 'Core/GeographicTilingScheme', - 'Core/GoogleEarthEnterpriseMetadata', - 'Core/GoogleEarthEnterpriseTileInformation', - 'Core/loadImage', - 'Core/loadWithXhr', - 'Core/Rectangle', - 'Core/RequestScheduler', - 'Scene/DiscardMissingTileImagePolicy', - 'Scene/Imagery', - 'Scene/ImageryLayer', - 'Scene/ImageryProvider', - 'Scene/ImageryState', - 'Specs/pollToPromise', - 'ThirdParty/when' -], function( - GoogleEarthEnterpriseImageryProvider, - decodeGoogleEarthEnterpriseData, - DefaultProxy, - defaultValue, - defined, - GeographicTilingScheme, - GoogleEarthEnterpriseMetadata, - GoogleEarthEnterpriseTileInformation, - loadImage, - loadWithXhr, - Rectangle, - RequestScheduler, - DiscardMissingTileImagePolicy, - Imagery, - ImageryLayer, - ImageryProvider, - ImageryState, - pollToPromise, - when) { + 'Scene/GoogleEarthEnterpriseImageryProvider', + 'Core/decodeGoogleEarthEnterpriseData', + 'Core/DefaultProxy', + 'Core/defaultValue', + 'Core/defined', + 'Core/GeographicTilingScheme', + 'Core/GoogleEarthEnterpriseMetadata', + 'Core/GoogleEarthEnterpriseTileInformation', + 'Core/loadImage', + 'Core/loadWithXhr', + 'Core/Rectangle', + 'Core/RequestScheduler', + 'Scene/DiscardMissingTileImagePolicy', + 'Scene/Imagery', + 'Scene/ImageryLayer', + 'Scene/ImageryProvider', + 'Scene/ImageryState', + 'Specs/pollToPromise', + 'ThirdParty/when' + ], function( + GoogleEarthEnterpriseImageryProvider, + decodeGoogleEarthEnterpriseData, + DefaultProxy, + defaultValue, + defined, + GeographicTilingScheme, + GoogleEarthEnterpriseMetadata, + GoogleEarthEnterpriseTileInformation, + loadImage, + loadWithXhr, + Rectangle, + RequestScheduler, + DiscardMissingTileImagePolicy, + Imagery, + ImageryLayer, + ImageryProvider, + ImageryState, + pollToPromise, + when) { 'use strict'; beforeEach(function() { diff --git a/Specs/Scene/GoogleEarthEnterpriseMapsProviderSpec.js b/Specs/Scene/GoogleEarthEnterpriseMapsProviderSpec.js index 7fa6649ef479..54deb358c16f 100644 --- a/Specs/Scene/GoogleEarthEnterpriseMapsProviderSpec.js +++ b/Specs/Scene/GoogleEarthEnterpriseMapsProviderSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/GoogleEarthEnterpriseMapsProvider', 'Core/DefaultProxy', @@ -14,19 +13,19 @@ defineSuite([ 'Scene/ImageryState', 'Specs/pollToPromise' ], function( - GoogleEarthEnterpriseMapsProvider, - DefaultProxy, - GeographicTilingScheme, - loadImage, - loadWithXhr, - Rectangle, - RequestScheduler, - WebMercatorTilingScheme, - Imagery, - ImageryLayer, - ImageryProvider, - ImageryState, - pollToPromise) { + GoogleEarthEnterpriseMapsProvider, + DefaultProxy, + GeographicTilingScheme, + loadImage, + loadWithXhr, + Rectangle, + RequestScheduler, + WebMercatorTilingScheme, + Imagery, + ImageryLayer, + ImageryProvider, + ImageryState, + pollToPromise) { 'use strict'; afterEach(function() { diff --git a/Specs/Scene/GridImageryProviderSpec.js b/Specs/Scene/GridImageryProviderSpec.js index adcb383ea37a..b798552151f8 100644 --- a/Specs/Scene/GridImageryProviderSpec.js +++ b/Specs/Scene/GridImageryProviderSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/GridImageryProvider', 'Core/Ellipsoid', diff --git a/Specs/Scene/GroundPrimitiveSpec.js b/Specs/Scene/GroundPrimitiveSpec.js index c491c07df482..54c22f83c35a 100644 --- a/Specs/Scene/GroundPrimitiveSpec.js +++ b/Specs/Scene/GroundPrimitiveSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/GroundPrimitive', 'Core/Color', diff --git a/Specs/Scene/HeightmapTessellatorSpec.js b/Specs/Scene/HeightmapTessellatorSpec.js index 8b85e3c8eabd..b8f0330a6fac 100644 --- a/Specs/Scene/HeightmapTessellatorSpec.js +++ b/Specs/Scene/HeightmapTessellatorSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/HeightmapTessellator', 'Core/Cartesian2', diff --git a/Specs/Scene/ImageryLayerCollectionSpec.js b/Specs/Scene/ImageryLayerCollectionSpec.js index d3118a0d3d1e..1f11af9357be 100644 --- a/Specs/Scene/ImageryLayerCollectionSpec.js +++ b/Specs/Scene/ImageryLayerCollectionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/ImageryLayerCollection', 'Core/Cartesian3', diff --git a/Specs/Scene/ImageryLayerSpec.js b/Specs/Scene/ImageryLayerSpec.js index 151b91d5d0ca..fbb3211d453e 100644 --- a/Specs/Scene/ImageryLayerSpec.js +++ b/Specs/Scene/ImageryLayerSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/ImageryLayer', 'Core/EllipsoidTerrainProvider', diff --git a/Specs/Scene/Instanced3DModel3DTileContentSpec.js b/Specs/Scene/Instanced3DModel3DTileContentSpec.js index 7ff687f5e473..ab03463ac95e 100644 --- a/Specs/Scene/Instanced3DModel3DTileContentSpec.js +++ b/Specs/Scene/Instanced3DModel3DTileContentSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Instanced3DModel3DTileContent', 'Core/Cartesian3', diff --git a/Specs/Scene/JobSchedulerSpec.js b/Specs/Scene/JobSchedulerSpec.js index 21d607d788d5..c1aa5fffc753 100644 --- a/Specs/Scene/JobSchedulerSpec.js +++ b/Specs/Scene/JobSchedulerSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/JobScheduler', 'Scene/JobType' diff --git a/Specs/Scene/LabelCollectionSpec.js b/Specs/Scene/LabelCollectionSpec.js index 61b348fe3dc5..1b10f96f4c5f 100644 --- a/Specs/Scene/LabelCollectionSpec.js +++ b/Specs/Scene/LabelCollectionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/LabelCollection', 'Core/BoundingRectangle', diff --git a/Specs/Scene/MapboxImageryProviderSpec.js b/Specs/Scene/MapboxImageryProviderSpec.js index 50b681bd4412..9aca603692ce 100644 --- a/Specs/Scene/MapboxImageryProviderSpec.js +++ b/Specs/Scene/MapboxImageryProviderSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/MapboxImageryProvider', 'Core/DefaultProxy', diff --git a/Specs/Scene/MaterialAppearanceSpec.js b/Specs/Scene/MaterialAppearanceSpec.js index 9a26687dafb1..59d829f29344 100644 --- a/Specs/Scene/MaterialAppearanceSpec.js +++ b/Specs/Scene/MaterialAppearanceSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/MaterialAppearance', 'Core/Color', diff --git a/Specs/Scene/MaterialSpec.js b/Specs/Scene/MaterialSpec.js index 0730cdd41d26..e23d901e0b73 100644 --- a/Specs/Scene/MaterialSpec.js +++ b/Specs/Scene/MaterialSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Material', 'Core/Cartesian3', diff --git a/Specs/Scene/ModelInstanceCollectionSpec.js b/Specs/Scene/ModelInstanceCollectionSpec.js index 72b7b5e23caf..1b493721d190 100644 --- a/Specs/Scene/ModelInstanceCollectionSpec.js +++ b/Specs/Scene/ModelInstanceCollectionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/ModelInstanceCollection', 'Core/BoundingSphere', diff --git a/Specs/Scene/ModelSpec.js b/Specs/Scene/ModelSpec.js index d26296a3193f..43d695d8c48e 100644 --- a/Specs/Scene/ModelSpec.js +++ b/Specs/Scene/ModelSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Model', 'Core/Cartesian2', diff --git a/Specs/Scene/MoonSpec.js b/Specs/Scene/MoonSpec.js index 14dbc1877b38..8f1720172d1b 100644 --- a/Specs/Scene/MoonSpec.js +++ b/Specs/Scene/MoonSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Moon', 'Core/BoundingSphere', diff --git a/Specs/Scene/MultifrustumSpec.js b/Specs/Scene/MultifrustumSpec.js index 07a6b59e196d..ba42f23a16ed 100644 --- a/Specs/Scene/MultifrustumSpec.js +++ b/Specs/Scene/MultifrustumSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/BoundingSphere', 'Core/BoxGeometry', diff --git a/Specs/Scene/OrthographicOffCenterFrustumSpec.js b/Specs/Scene/OrthographicOffCenterFrustumSpec.js index 7897e568b5ac..c296945ea836 100644 --- a/Specs/Scene/OrthographicOffCenterFrustumSpec.js +++ b/Specs/Scene/OrthographicOffCenterFrustumSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/OrthographicOffCenterFrustum', 'Core/Cartesian2', diff --git a/Specs/Scene/ParticleSpec.js b/Specs/Scene/ParticleSpec.js index 661a83706939..5353c5fec733 100644 --- a/Specs/Scene/ParticleSpec.js +++ b/Specs/Scene/ParticleSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Particle', 'Core/Cartesian2', diff --git a/Specs/Scene/ParticleSystemSpec.js b/Specs/Scene/ParticleSystemSpec.js index fe57d7f0baa4..c66c80e8fd9d 100644 --- a/Specs/Scene/ParticleSystemSpec.js +++ b/Specs/Scene/ParticleSystemSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/ParticleSystem', 'Core/Cartesian3', diff --git a/Specs/Scene/PerInstanceColorAppearanceSpec.js b/Specs/Scene/PerInstanceColorAppearanceSpec.js index 111a4befc939..3b392ceed9f7 100644 --- a/Specs/Scene/PerInstanceColorAppearanceSpec.js +++ b/Specs/Scene/PerInstanceColorAppearanceSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/PerInstanceColorAppearance', 'Core/ColorGeometryInstanceAttribute', diff --git a/Specs/Scene/PerspectiveFrustumSpec.js b/Specs/Scene/PerspectiveFrustumSpec.js index ed30a89852a6..91805a77ee43 100644 --- a/Specs/Scene/PerspectiveFrustumSpec.js +++ b/Specs/Scene/PerspectiveFrustumSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/PerspectiveFrustum', 'Core/Cartesian2', diff --git a/Specs/Scene/PerspectiveOffCenterFrustumSpec.js b/Specs/Scene/PerspectiveOffCenterFrustumSpec.js index 535d919f63e5..67289e1cb889 100644 --- a/Specs/Scene/PerspectiveOffCenterFrustumSpec.js +++ b/Specs/Scene/PerspectiveOffCenterFrustumSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/PerspectiveOffCenterFrustum', 'Core/Cartesian2', diff --git a/Specs/Scene/PickSpec.js b/Specs/Scene/PickSpec.js index bcae4bafb71f..4e2028176b05 100644 --- a/Specs/Scene/PickSpec.js +++ b/Specs/Scene/PickSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/FeatureDetection', 'Core/GeometryInstance', diff --git a/Specs/Scene/PointCloud3DTileContentSpec.js b/Specs/Scene/PointCloud3DTileContentSpec.js index ba0648fb55fc..9d773627c26f 100644 --- a/Specs/Scene/PointCloud3DTileContentSpec.js +++ b/Specs/Scene/PointCloud3DTileContentSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/PointCloud3DTileContent', 'Core/Cartesian3', diff --git a/Specs/Scene/PointPrimitiveCollectionSpec.js b/Specs/Scene/PointPrimitiveCollectionSpec.js index b706146371c5..05d3deaec437 100644 --- a/Specs/Scene/PointPrimitiveCollectionSpec.js +++ b/Specs/Scene/PointPrimitiveCollectionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/PointPrimitiveCollection', 'Core/BoundingRectangle', diff --git a/Specs/Scene/PolylineCollectionSpec.js b/Specs/Scene/PolylineCollectionSpec.js index 0daf02c53669..ffc2a741e6ea 100644 --- a/Specs/Scene/PolylineCollectionSpec.js +++ b/Specs/Scene/PolylineCollectionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/PolylineCollection', 'Core/BoundingSphere', diff --git a/Specs/Scene/PolylineColorAppearanceSpec.js b/Specs/Scene/PolylineColorAppearanceSpec.js index 39df4113e094..b2983c6d2ba3 100644 --- a/Specs/Scene/PolylineColorAppearanceSpec.js +++ b/Specs/Scene/PolylineColorAppearanceSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/PolylineColorAppearance', 'Core/Cartesian3', diff --git a/Specs/Scene/PolylineMaterialAppearanceSpec.js b/Specs/Scene/PolylineMaterialAppearanceSpec.js index ef239101a8c8..8f0250777878 100644 --- a/Specs/Scene/PolylineMaterialAppearanceSpec.js +++ b/Specs/Scene/PolylineMaterialAppearanceSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/PolylineMaterialAppearance', 'Core/Cartesian3', diff --git a/Specs/Scene/PrimitiveCollectionSpec.js b/Specs/Scene/PrimitiveCollectionSpec.js index e82772cc6d2b..9923d91726d0 100644 --- a/Specs/Scene/PrimitiveCollectionSpec.js +++ b/Specs/Scene/PrimitiveCollectionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/PrimitiveCollection', 'Core/ColorGeometryInstanceAttribute', diff --git a/Specs/Scene/PrimitiveCullingSpec.js b/Specs/Scene/PrimitiveCullingSpec.js index ac57eeaaee8f..9681083205c4 100644 --- a/Specs/Scene/PrimitiveCullingSpec.js +++ b/Specs/Scene/PrimitiveCullingSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Cartesian3', 'Core/Color', diff --git a/Specs/Scene/PrimitivePipelineSpec.js b/Specs/Scene/PrimitivePipelineSpec.js index 7cf7bdfa5919..efbcff542d9e 100644 --- a/Specs/Scene/PrimitivePipelineSpec.js +++ b/Specs/Scene/PrimitivePipelineSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/PrimitivePipeline', 'Core/BoundingSphere', diff --git a/Specs/Scene/PrimitiveSpec.js b/Specs/Scene/PrimitiveSpec.js index e80109ec8d9d..78b09c22153c 100644 --- a/Specs/Scene/PrimitiveSpec.js +++ b/Specs/Scene/PrimitiveSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Primitive', 'Core/BoundingSphere', diff --git a/Specs/Scene/QuadtreePrimitiveSpec.js b/Specs/Scene/QuadtreePrimitiveSpec.js index 6586a08d1abc..753ba52c2972 100644 --- a/Specs/Scene/QuadtreePrimitiveSpec.js +++ b/Specs/Scene/QuadtreePrimitiveSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/QuadtreePrimitive', 'Core/Cartesian3', diff --git a/Specs/Scene/QuadtreeTileSpec.js b/Specs/Scene/QuadtreeTileSpec.js index 1f76364d1d41..7ff5af37bd75 100644 --- a/Specs/Scene/QuadtreeTileSpec.js +++ b/Specs/Scene/QuadtreeTileSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/QuadtreeTile', 'Core/GeographicTilingScheme', diff --git a/Specs/Scene/SceneSpec.js b/Specs/Scene/SceneSpec.js index 9f3c1fd1cfe8..39a861580ea2 100644 --- a/Specs/Scene/SceneSpec.js +++ b/Specs/Scene/SceneSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/BoundingSphere', 'Core/Cartesian2', @@ -31,9 +30,9 @@ defineSuite([ 'Scene/Primitive', 'Scene/PrimitiveCollection', 'Scene/Scene', + 'Scene/SceneTransforms', 'Scene/ScreenSpaceCameraController', 'Scene/TweenCollection', - 'Scene/SceneTransforms', 'Specs/createCanvas', 'Specs/createScene', 'Specs/equals', @@ -71,9 +70,9 @@ defineSuite([ Primitive, PrimitiveCollection, Scene, + SceneTransforms, ScreenSpaceCameraController, TweenCollection, - SceneTransforms, createCanvas, createScene, equals, diff --git a/Specs/Scene/SceneTransformsSpec.js b/Specs/Scene/SceneTransformsSpec.js index 3cd8c0cba0ff..139edaa31b39 100644 --- a/Specs/Scene/SceneTransformsSpec.js +++ b/Specs/Scene/SceneTransformsSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/SceneTransforms', 'Core/Cartesian2', diff --git a/Specs/Scene/ScreenSpaceCameraControllerSpec.js b/Specs/Scene/ScreenSpaceCameraControllerSpec.js index b4d18ff24de7..d18f175454ca 100644 --- a/Specs/Scene/ScreenSpaceCameraControllerSpec.js +++ b/Specs/Scene/ScreenSpaceCameraControllerSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/ScreenSpaceCameraController', 'Core/Cartesian2', diff --git a/Specs/Scene/ShadowMapSpec.js b/Specs/Scene/ShadowMapSpec.js index bca7e6a9cfdf..e3f4aa7f8c6c 100644 --- a/Specs/Scene/ShadowMapSpec.js +++ b/Specs/Scene/ShadowMapSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/ShadowMap', 'Core/BoundingSphere', diff --git a/Specs/Scene/SingleTileImageryProviderSpec.js b/Specs/Scene/SingleTileImageryProviderSpec.js index 609acb717392..2455cf22f579 100644 --- a/Specs/Scene/SingleTileImageryProviderSpec.js +++ b/Specs/Scene/SingleTileImageryProviderSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/SingleTileImageryProvider', 'Core/DefaultProxy', diff --git a/Specs/Scene/SkyAtmosphereSpec.js b/Specs/Scene/SkyAtmosphereSpec.js index 874f02772b4b..e5d59a3da300 100644 --- a/Specs/Scene/SkyAtmosphereSpec.js +++ b/Specs/Scene/SkyAtmosphereSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/SkyAtmosphere', 'Core/Cartesian3', diff --git a/Specs/Scene/SkyBoxSpec.js b/Specs/Scene/SkyBoxSpec.js index 025420e21c5d..323efa9c414d 100644 --- a/Specs/Scene/SkyBoxSpec.js +++ b/Specs/Scene/SkyBoxSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/SkyBox', 'Core/loadImage', diff --git a/Specs/Scene/SphereEmitterSpec.js b/Specs/Scene/SphereEmitterSpec.js index 54e1b3d7aac6..9da5d1d938c0 100644 --- a/Specs/Scene/SphereEmitterSpec.js +++ b/Specs/Scene/SphereEmitterSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/SphereEmitter', 'Core/Cartesian3', diff --git a/Specs/Scene/StyleExpressionSpec.js b/Specs/Scene/StyleExpressionSpec.js index c48a33b53ccd..4b47f35a6b27 100644 --- a/Specs/Scene/StyleExpressionSpec.js +++ b/Specs/Scene/StyleExpressionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/StyleExpression' ], function( diff --git a/Specs/Scene/SunSpec.js b/Specs/Scene/SunSpec.js index fafe8d9691f2..721444b40bd7 100644 --- a/Specs/Scene/SunSpec.js +++ b/Specs/Scene/SunSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Sun', 'Core/BoundingSphere', diff --git a/Specs/Scene/TextureAtlasSpec.js b/Specs/Scene/TextureAtlasSpec.js index ca9b6102e2cb..107fbcbfda42 100644 --- a/Specs/Scene/TextureAtlasSpec.js +++ b/Specs/Scene/TextureAtlasSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/TextureAtlas', 'Core/BoundingRectangle', diff --git a/Specs/Scene/TileBoundingRegionSpec.js b/Specs/Scene/TileBoundingRegionSpec.js index b2fe4de76a83..6b194eed85f4 100644 --- a/Specs/Scene/TileBoundingRegionSpec.js +++ b/Specs/Scene/TileBoundingRegionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/TileBoundingRegion', 'Core/Cartesian2', diff --git a/Specs/Scene/TileBoundingSphereSpec.js b/Specs/Scene/TileBoundingSphereSpec.js index bdf9482b7c4c..6b8adb213096 100644 --- a/Specs/Scene/TileBoundingSphereSpec.js +++ b/Specs/Scene/TileBoundingSphereSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/TileBoundingSphere', 'Core/Cartesian3', diff --git a/Specs/Scene/TileBoundingVolumeSpec.js b/Specs/Scene/TileBoundingVolumeSpec.js index cf64783bb482..9cfd0378f379 100644 --- a/Specs/Scene/TileBoundingVolumeSpec.js +++ b/Specs/Scene/TileBoundingVolumeSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/TileBoundingVolume' ], function( diff --git a/Specs/Scene/TileCoordinatesImageryProviderSpec.js b/Specs/Scene/TileCoordinatesImageryProviderSpec.js index e6f4b954cf34..ea26e3f42780 100644 --- a/Specs/Scene/TileCoordinatesImageryProviderSpec.js +++ b/Specs/Scene/TileCoordinatesImageryProviderSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/TileCoordinatesImageryProvider', 'Core/Ellipsoid', diff --git a/Specs/Scene/TileImagerySpec.js b/Specs/Scene/TileImagerySpec.js index 5baaf57f95dd..5ef590a1db95 100644 --- a/Specs/Scene/TileImagerySpec.js +++ b/Specs/Scene/TileImagerySpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/TileImagery', 'Scene/ImageryState' diff --git a/Specs/Scene/TileOrientedBoundingBoxSpec.js b/Specs/Scene/TileOrientedBoundingBoxSpec.js index e7f8bb799746..b405b5f66c54 100644 --- a/Specs/Scene/TileOrientedBoundingBoxSpec.js +++ b/Specs/Scene/TileOrientedBoundingBoxSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/TileOrientedBoundingBox', 'Core/Cartesian3', diff --git a/Specs/Scene/TileReplacementQueueSpec.js b/Specs/Scene/TileReplacementQueueSpec.js index 03e02c00f0c6..7e19424caaab 100644 --- a/Specs/Scene/TileReplacementQueueSpec.js +++ b/Specs/Scene/TileReplacementQueueSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/TileReplacementQueue', 'Core/defined', diff --git a/Specs/Scene/Tileset3DTileContentSpec.js b/Specs/Scene/Tileset3DTileContentSpec.js index 36b536d93db9..dfbe5d8ca53b 100644 --- a/Specs/Scene/Tileset3DTileContentSpec.js +++ b/Specs/Scene/Tileset3DTileContentSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/Tileset3DTileContent', 'Core/Cartesian3', diff --git a/Specs/Scene/TweenCollectionSpec.js b/Specs/Scene/TweenCollectionSpec.js index 71c75c76ec25..f71172c18399 100644 --- a/Specs/Scene/TweenCollectionSpec.js +++ b/Specs/Scene/TweenCollectionSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/TweenCollection', 'Core/Color', diff --git a/Specs/Scene/UrlTemplateImageryProviderSpec.js b/Specs/Scene/UrlTemplateImageryProviderSpec.js index f3fbe8d77e9e..b8befc7068a8 100644 --- a/Specs/Scene/UrlTemplateImageryProviderSpec.js +++ b/Specs/Scene/UrlTemplateImageryProviderSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/UrlTemplateImageryProvider', 'Core/DefaultProxy', diff --git a/Specs/Scene/ViewportQuadSpec.js b/Specs/Scene/ViewportQuadSpec.js index 9551d70cebd9..6c88e5f45eac 100644 --- a/Specs/Scene/ViewportQuadSpec.js +++ b/Specs/Scene/ViewportQuadSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/ViewportQuad', 'Core/BoundingRectangle', diff --git a/Specs/Scene/WebMapServiceImageryProviderSpec.js b/Specs/Scene/WebMapServiceImageryProviderSpec.js index 3f729fd64690..43091e5ccc52 100644 --- a/Specs/Scene/WebMapServiceImageryProviderSpec.js +++ b/Specs/Scene/WebMapServiceImageryProviderSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/WebMapServiceImageryProvider', 'Core/Cartographic', diff --git a/Specs/Scene/WebMapTileServiceImageryProviderSpec.js b/Specs/Scene/WebMapTileServiceImageryProviderSpec.js index 11398eba7f48..3e24c8f9df66 100644 --- a/Specs/Scene/WebMapTileServiceImageryProviderSpec.js +++ b/Specs/Scene/WebMapTileServiceImageryProviderSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/WebMapTileServiceImageryProvider', 'Core/Credit', diff --git a/Specs/Scene/createOpenStreetMapImageryProviderSpec.js b/Specs/Scene/createOpenStreetMapImageryProviderSpec.js index 041b175ca4cf..073f9a6c1757 100644 --- a/Specs/Scene/createOpenStreetMapImageryProviderSpec.js +++ b/Specs/Scene/createOpenStreetMapImageryProviderSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/createOpenStreetMapImageryProvider', 'Core/DefaultProxy', diff --git a/Specs/Scene/createTangentSpaceDebugPrimitiveSpec.js b/Specs/Scene/createTangentSpaceDebugPrimitiveSpec.js index 7c63455baa3e..ff843a0793c4 100644 --- a/Specs/Scene/createTangentSpaceDebugPrimitiveSpec.js +++ b/Specs/Scene/createTangentSpaceDebugPrimitiveSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/createTangentSpaceDebugPrimitive', 'Core/Cartesian3', diff --git a/Specs/Scene/createTileMapServiceImageryProviderSpec.js b/Specs/Scene/createTileMapServiceImageryProviderSpec.js index fb1cfc523695..0483b97b277e 100644 --- a/Specs/Scene/createTileMapServiceImageryProviderSpec.js +++ b/Specs/Scene/createTileMapServiceImageryProviderSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Scene/createTileMapServiceImageryProvider', 'Core/Cartesian2', diff --git a/Specs/TestWorkers/createBadGeometry.js b/Specs/TestWorkers/createBadGeometry.js index d3327fc9f7ec..b8eb48b3c5a0 100644 --- a/Specs/TestWorkers/createBadGeometry.js +++ b/Specs/TestWorkers/createBadGeometry.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/RuntimeError' ], function( diff --git a/Specs/TestWorkers/returnByteLength.js b/Specs/TestWorkers/returnByteLength.js index 6f614b8de912..5d60bd5b9438 100644 --- a/Specs/TestWorkers/returnByteLength.js +++ b/Specs/TestWorkers/returnByteLength.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Workers/createTaskProcessorWorker' ], function( diff --git a/Specs/TestWorkers/returnNonCloneable.js b/Specs/TestWorkers/returnNonCloneable.js index 40e3a3d5df39..15b32f5facc7 100644 --- a/Specs/TestWorkers/returnNonCloneable.js +++ b/Specs/TestWorkers/returnNonCloneable.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Workers/createTaskProcessorWorker' ], function( diff --git a/Specs/TestWorkers/returnParameters.js b/Specs/TestWorkers/returnParameters.js index e54b8cc9666e..a3fa20efae8d 100644 --- a/Specs/TestWorkers/returnParameters.js +++ b/Specs/TestWorkers/returnParameters.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Workers/createTaskProcessorWorker' ], function( diff --git a/Specs/TestWorkers/throwError.js b/Specs/TestWorkers/throwError.js index 5ecabe4fe818..c152f2b4fc3c 100644 --- a/Specs/TestWorkers/throwError.js +++ b/Specs/TestWorkers/throwError.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/RuntimeError', 'Workers/createTaskProcessorWorker' diff --git a/Specs/TestWorkers/transferArrayBuffer.js b/Specs/TestWorkers/transferArrayBuffer.js index 7f3f14b3193a..30482b6cc709 100644 --- a/Specs/TestWorkers/transferArrayBuffer.js +++ b/Specs/TestWorkers/transferArrayBuffer.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Workers/createTaskProcessorWorker' ], function( diff --git a/Specs/ThirdParty/knockoutSpec.js b/Specs/ThirdParty/knockoutSpec.js index d78262c72d1e..52f7c16b7a25 100644 --- a/Specs/ThirdParty/knockoutSpec.js +++ b/Specs/ThirdParty/knockoutSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'ThirdParty/knockout' ], function( diff --git a/Specs/ThirdParty/whenSpec.js b/Specs/ThirdParty/whenSpec.js index 0466d41ef32e..afdf7f3fcbd2 100644 --- a/Specs/ThirdParty/whenSpec.js +++ b/Specs/ThirdParty/whenSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'ThirdParty/when' ], function( diff --git a/Specs/Widgets/Animation/AnimationSpec.js b/Specs/Widgets/Animation/AnimationSpec.js index 6c1ed5b46be9..416137b9bf1b 100644 --- a/Specs/Widgets/Animation/AnimationSpec.js +++ b/Specs/Widgets/Animation/AnimationSpec.js @@ -1,16 +1,15 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/Animation/Animation', 'Core/defined', + 'Specs/pollToPromise', 'Widgets/Animation/AnimationViewModel', - 'Widgets/ClockViewModel', - 'Specs/pollToPromise' + 'Widgets/ClockViewModel' ], function( Animation, defined, + pollToPromise, AnimationViewModel, - ClockViewModel, - pollToPromise) { + ClockViewModel) { 'use strict'; var container; diff --git a/Specs/Widgets/Animation/AnimationViewModelSpec.js b/Specs/Widgets/Animation/AnimationViewModelSpec.js index ce1aa3ca85e3..94bd23bd897a 100644 --- a/Specs/Widgets/Animation/AnimationViewModelSpec.js +++ b/Specs/Widgets/Animation/AnimationViewModelSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/Animation/AnimationViewModel', 'Core/ClockRange', diff --git a/Specs/Widgets/BaseLayerPicker/BaseLayerPickerSpec.js b/Specs/Widgets/BaseLayerPicker/BaseLayerPickerSpec.js index 37636c615aba..1f16c6fdf518 100644 --- a/Specs/Widgets/BaseLayerPicker/BaseLayerPickerSpec.js +++ b/Specs/Widgets/BaseLayerPicker/BaseLayerPickerSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/BaseLayerPicker/BaseLayerPicker', 'Core/EllipsoidTerrainProvider', diff --git a/Specs/Widgets/BaseLayerPicker/BaseLayerPickerViewModelSpec.js b/Specs/Widgets/BaseLayerPicker/BaseLayerPickerViewModelSpec.js index 20cab674ed3a..c7d822f9ae77 100644 --- a/Specs/Widgets/BaseLayerPicker/BaseLayerPickerViewModelSpec.js +++ b/Specs/Widgets/BaseLayerPicker/BaseLayerPickerViewModelSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/BaseLayerPicker/BaseLayerPickerViewModel', 'Core/EllipsoidTerrainProvider', diff --git a/Specs/Widgets/BaseLayerPicker/ProviderViewModelSpec.js b/Specs/Widgets/BaseLayerPicker/ProviderViewModelSpec.js index 0a754d1633de..234b3660e851 100644 --- a/Specs/Widgets/BaseLayerPicker/ProviderViewModelSpec.js +++ b/Specs/Widgets/BaseLayerPicker/ProviderViewModelSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/BaseLayerPicker/ProviderViewModel', 'ThirdParty/knockout', diff --git a/Specs/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorSpec.js b/Specs/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorSpec.js index bb9a7ecc70b1..5c61fd9b18aa 100644 --- a/Specs/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorSpec.js +++ b/Specs/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/Cesium3DTilesInspector/Cesium3DTilesInspector', 'Core/Ellipsoid', diff --git a/Specs/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModelSpec.js b/Specs/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModelSpec.js index 53f77c679ed0..8e2aaece0e91 100644 --- a/Specs/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModelSpec.js +++ b/Specs/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModelSpec.js @@ -1,19 +1,18 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel', - 'Scene/Cesium3DTileset', - 'Scene/Cesium3DTileStyle', 'Core/defined', 'Core/Math', + 'Scene/Cesium3DTileset', + 'Scene/Cesium3DTileStyle', 'Scene/Globe', 'Specs/createScene', 'ThirdParty/when' ], function( Cesium3DTilesInspectorViewModel, - Cesium3DTileset, - Cesium3DTileStyle, defined, CesiumMath, + Cesium3DTileset, + Cesium3DTileStyle, Globe, createScene, when) { diff --git a/Specs/Widgets/CesiumInspector/CesiumInspectorSpec.js b/Specs/Widgets/CesiumInspector/CesiumInspectorSpec.js index 7ba2ebf6d9d5..b8094ea7aa5a 100644 --- a/Specs/Widgets/CesiumInspector/CesiumInspectorSpec.js +++ b/Specs/Widgets/CesiumInspector/CesiumInspectorSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/CesiumInspector/CesiumInspector', 'Core/Ellipsoid', diff --git a/Specs/Widgets/CesiumInspector/CesiumInspectorViewModelSpec.js b/Specs/Widgets/CesiumInspector/CesiumInspectorViewModelSpec.js index db0eae9d5ff6..d86916840e5e 100644 --- a/Specs/Widgets/CesiumInspector/CesiumInspectorViewModelSpec.js +++ b/Specs/Widgets/CesiumInspector/CesiumInspectorViewModelSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/CesiumInspector/CesiumInspectorViewModel', 'Core/defined', diff --git a/Specs/Widgets/CesiumWidget/CesiumWidgetSpec.js b/Specs/Widgets/CesiumWidget/CesiumWidgetSpec.js index 779bd67a3a73..0efda424098e 100644 --- a/Specs/Widgets/CesiumWidget/CesiumWidgetSpec.js +++ b/Specs/Widgets/CesiumWidget/CesiumWidgetSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/CesiumWidget/CesiumWidget', 'Core/Clock', diff --git a/Specs/Widgets/ClockViewModelSpec.js b/Specs/Widgets/ClockViewModelSpec.js index bc75cd0c7748..393c24a7626e 100644 --- a/Specs/Widgets/ClockViewModelSpec.js +++ b/Specs/Widgets/ClockViewModelSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/ClockViewModel', 'Core/Clock', diff --git a/Specs/Widgets/FullscreenButton/FullscreenButtonSpec.js b/Specs/Widgets/FullscreenButton/FullscreenButtonSpec.js index 4c327d5d3ab1..fa5f68ad35c4 100644 --- a/Specs/Widgets/FullscreenButton/FullscreenButtonSpec.js +++ b/Specs/Widgets/FullscreenButton/FullscreenButtonSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/FullscreenButton/FullscreenButton' ], function( diff --git a/Specs/Widgets/FullscreenButton/FullscreenButtonViewModelSpec.js b/Specs/Widgets/FullscreenButton/FullscreenButtonViewModelSpec.js index bf55c7667981..a46a47731fef 100644 --- a/Specs/Widgets/FullscreenButton/FullscreenButtonViewModelSpec.js +++ b/Specs/Widgets/FullscreenButton/FullscreenButtonViewModelSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/FullscreenButton/FullscreenButtonViewModel', 'Core/Fullscreen' diff --git a/Specs/Widgets/Geocoder/GeocoderSpec.js b/Specs/Widgets/Geocoder/GeocoderSpec.js index affff0d4fbf2..ba723f2c2fa4 100644 --- a/Specs/Widgets/Geocoder/GeocoderSpec.js +++ b/Specs/Widgets/Geocoder/GeocoderSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/Geocoder/Geocoder', 'Core/Cartesian3', diff --git a/Specs/Widgets/Geocoder/GeocoderViewModelSpec.js b/Specs/Widgets/Geocoder/GeocoderViewModelSpec.js index 833f977b4886..a21421012b3a 100644 --- a/Specs/Widgets/Geocoder/GeocoderViewModelSpec.js +++ b/Specs/Widgets/Geocoder/GeocoderViewModelSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/Geocoder/GeocoderViewModel', 'Core/Cartesian3', diff --git a/Specs/Widgets/HomeButton/HomeButtonSpec.js b/Specs/Widgets/HomeButton/HomeButtonSpec.js index e886ab6cb79b..0571b157b76a 100644 --- a/Specs/Widgets/HomeButton/HomeButtonSpec.js +++ b/Specs/Widgets/HomeButton/HomeButtonSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/HomeButton/HomeButton', 'Specs/createScene' diff --git a/Specs/Widgets/HomeButton/HomeButtonViewModelSpec.js b/Specs/Widgets/HomeButton/HomeButtonViewModelSpec.js index ea3d4e76a74a..b5dcb75ff524 100644 --- a/Specs/Widgets/HomeButton/HomeButtonViewModelSpec.js +++ b/Specs/Widgets/HomeButton/HomeButtonViewModelSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/HomeButton/HomeButtonViewModel', 'Core/Ellipsoid', diff --git a/Specs/Widgets/InfoBox/InfoBoxSpec.js b/Specs/Widgets/InfoBox/InfoBoxSpec.js index a6c387d638d7..b70943123f89 100644 --- a/Specs/Widgets/InfoBox/InfoBoxSpec.js +++ b/Specs/Widgets/InfoBox/InfoBoxSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/InfoBox/InfoBox', 'Core/defined', diff --git a/Specs/Widgets/InfoBox/InfoBoxViewModelSpec.js b/Specs/Widgets/InfoBox/InfoBoxViewModelSpec.js index e269a982f702..be27c3a2c579 100644 --- a/Specs/Widgets/InfoBox/InfoBoxViewModelSpec.js +++ b/Specs/Widgets/InfoBox/InfoBoxViewModelSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/InfoBox/InfoBoxViewModel' ], function( diff --git a/Specs/Widgets/NavigationHelpButton/NavigationHelpButtonSpec.js b/Specs/Widgets/NavigationHelpButton/NavigationHelpButtonSpec.js index 0b047588da40..186b7abf8ef9 100644 --- a/Specs/Widgets/NavigationHelpButton/NavigationHelpButtonSpec.js +++ b/Specs/Widgets/NavigationHelpButton/NavigationHelpButtonSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/NavigationHelpButton/NavigationHelpButton', 'Core/FeatureDetection', diff --git a/Specs/Widgets/NavigationHelpButton/NavigationHelpButtonViewModelSpec.js b/Specs/Widgets/NavigationHelpButton/NavigationHelpButtonViewModelSpec.js index 81affe26bced..a39b1f8d6acb 100644 --- a/Specs/Widgets/NavigationHelpButton/NavigationHelpButtonViewModelSpec.js +++ b/Specs/Widgets/NavigationHelpButton/NavigationHelpButtonViewModelSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/NavigationHelpButton/NavigationHelpButtonViewModel' ], function( diff --git a/Specs/Widgets/PerformanceWatchdog/PerformanceWatchdogSpec.js b/Specs/Widgets/PerformanceWatchdog/PerformanceWatchdogSpec.js index 74d52b97ec10..925f06f4e95a 100644 --- a/Specs/Widgets/PerformanceWatchdog/PerformanceWatchdogSpec.js +++ b/Specs/Widgets/PerformanceWatchdog/PerformanceWatchdogSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/PerformanceWatchdog/PerformanceWatchdog', 'Specs/createScene' diff --git a/Specs/Widgets/PerformanceWatchdog/PerformanceWatchdogViewModelSpec.js b/Specs/Widgets/PerformanceWatchdog/PerformanceWatchdogViewModelSpec.js index 7d9188779e76..4421642da294 100644 --- a/Specs/Widgets/PerformanceWatchdog/PerformanceWatchdogViewModelSpec.js +++ b/Specs/Widgets/PerformanceWatchdog/PerformanceWatchdogViewModelSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/PerformanceWatchdog/PerformanceWatchdogViewModel', 'Core/defined', diff --git a/Specs/Widgets/ProjectionPicker/ProjectionPickerSpec.js b/Specs/Widgets/ProjectionPicker/ProjectionPickerSpec.js index b0928bb52cf7..49d20f94503c 100644 --- a/Specs/Widgets/ProjectionPicker/ProjectionPickerSpec.js +++ b/Specs/Widgets/ProjectionPicker/ProjectionPickerSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/ProjectionPicker/ProjectionPicker', 'Core/FeatureDetection', diff --git a/Specs/Widgets/ProjectionPicker/ProjectionPickerViewModelSpec.js b/Specs/Widgets/ProjectionPicker/ProjectionPickerViewModelSpec.js index 4657b90dcfc2..fe0f1bc64dad 100644 --- a/Specs/Widgets/ProjectionPicker/ProjectionPickerViewModelSpec.js +++ b/Specs/Widgets/ProjectionPicker/ProjectionPickerViewModelSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/ProjectionPicker/ProjectionPickerViewModel', 'Scene/OrthographicFrustum', diff --git a/Specs/Widgets/SceneModePicker/SceneModePickerSpec.js b/Specs/Widgets/SceneModePicker/SceneModePickerSpec.js index 66d5710ba3ae..2620f16043da 100644 --- a/Specs/Widgets/SceneModePicker/SceneModePickerSpec.js +++ b/Specs/Widgets/SceneModePicker/SceneModePickerSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/SceneModePicker/SceneModePicker', 'Core/FeatureDetection', diff --git a/Specs/Widgets/SceneModePicker/SceneModePickerViewModelSpec.js b/Specs/Widgets/SceneModePicker/SceneModePickerViewModelSpec.js index e07968aec502..b361e014178e 100644 --- a/Specs/Widgets/SceneModePicker/SceneModePickerViewModelSpec.js +++ b/Specs/Widgets/SceneModePicker/SceneModePickerViewModelSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/SceneModePicker/SceneModePickerViewModel', 'Core/Ellipsoid', diff --git a/Specs/Widgets/SelectionIndicator/SelectionIndicatorSpec.js b/Specs/Widgets/SelectionIndicator/SelectionIndicatorSpec.js index b49bfe36f31b..ddfaf63bcd63 100644 --- a/Specs/Widgets/SelectionIndicator/SelectionIndicatorSpec.js +++ b/Specs/Widgets/SelectionIndicator/SelectionIndicatorSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/SelectionIndicator/SelectionIndicator', 'Specs/createScene' diff --git a/Specs/Widgets/SelectionIndicator/SelectionIndicatorViewModelSpec.js b/Specs/Widgets/SelectionIndicator/SelectionIndicatorViewModelSpec.js index 722b47f848ae..f79ac25f07df 100644 --- a/Specs/Widgets/SelectionIndicator/SelectionIndicatorViewModelSpec.js +++ b/Specs/Widgets/SelectionIndicator/SelectionIndicatorViewModelSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/SelectionIndicator/SelectionIndicatorViewModel', 'Core/Cartesian2', diff --git a/Specs/Widgets/SvgPathBindingHandlerSpec.js b/Specs/Widgets/SvgPathBindingHandlerSpec.js index b1014541e0c8..d9ccb2ce84cc 100644 --- a/Specs/Widgets/SvgPathBindingHandlerSpec.js +++ b/Specs/Widgets/SvgPathBindingHandlerSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'ThirdParty/knockout' ], function( diff --git a/Specs/Widgets/Timeline/TimelineSpec.js b/Specs/Widgets/Timeline/TimelineSpec.js index 23090d68a4f5..4bbe0e28214f 100644 --- a/Specs/Widgets/Timeline/TimelineSpec.js +++ b/Specs/Widgets/Timeline/TimelineSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/Timeline/Timeline', 'Core/Clock' diff --git a/Specs/Widgets/VRButton/VRButtonSpec.js b/Specs/Widgets/VRButton/VRButtonSpec.js index 7b1293736ce9..625e3990c6cd 100644 --- a/Specs/Widgets/VRButton/VRButtonSpec.js +++ b/Specs/Widgets/VRButton/VRButtonSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/VRButton/VRButton', 'Specs/createScene' diff --git a/Specs/Widgets/VRButton/VRButtonViewModelSpec.js b/Specs/Widgets/VRButton/VRButtonViewModelSpec.js index 2fdd4ea0ba0c..90ff0610f9d0 100644 --- a/Specs/Widgets/VRButton/VRButtonViewModelSpec.js +++ b/Specs/Widgets/VRButton/VRButtonViewModelSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/VRButton/VRButtonViewModel', 'Core/Fullscreen', diff --git a/Specs/Widgets/Viewer/ViewerSpec.js b/Specs/Widgets/Viewer/ViewerSpec.js index 970e659b8c40..e3b39921df1e 100644 --- a/Specs/Widgets/Viewer/ViewerSpec.js +++ b/Specs/Widgets/Viewer/ViewerSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Core/Cartesian3', 'Core/ClockRange', diff --git a/Specs/Widgets/Viewer/viewerDragDropMixinSpec.js b/Specs/Widgets/Viewer/viewerDragDropMixinSpec.js index 7e3f1c5ecb82..11ccf9d8134e 100644 --- a/Specs/Widgets/Viewer/viewerDragDropMixinSpec.js +++ b/Specs/Widgets/Viewer/viewerDragDropMixinSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/Viewer/viewerDragDropMixin', 'Core/defined', diff --git a/Specs/Widgets/Viewer/viewerPerformanceWatchdogMixinSpec.js b/Specs/Widgets/Viewer/viewerPerformanceWatchdogMixinSpec.js index 6add92c3a465..718cc61ec0ee 100644 --- a/Specs/Widgets/Viewer/viewerPerformanceWatchdogMixinSpec.js +++ b/Specs/Widgets/Viewer/viewerPerformanceWatchdogMixinSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/Viewer/viewerPerformanceWatchdogMixin', 'Specs/createViewer', diff --git a/Specs/Widgets/createCommandSpec.js b/Specs/Widgets/createCommandSpec.js index 0cb1ba70005c..73dffd2923b0 100644 --- a/Specs/Widgets/createCommandSpec.js +++ b/Specs/Widgets/createCommandSpec.js @@ -1,4 +1,3 @@ -/*global defineSuite*/ defineSuite([ 'Widgets/createCommand', 'Specs/getArguments', diff --git a/Specs/addDefaultMatchers.js b/Specs/addDefaultMatchers.js index c33eb353d95a..0435305e18e1 100644 --- a/Specs/addDefaultMatchers.js +++ b/Specs/addDefaultMatchers.js @@ -1,4 +1,3 @@ -/*global define*/ define([ './equals', 'Core/Cartesian2', diff --git a/Specs/createCamera.js b/Specs/createCamera.js index aef492e01e13..36fafd388b7b 100644 --- a/Specs/createCamera.js +++ b/Specs/createCamera.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/Cartesian3', 'Core/defaultValue', diff --git a/Specs/createCanvas.js b/Specs/createCanvas.js index 4c68bd952280..8c048578a0bf 100644 --- a/Specs/createCanvas.js +++ b/Specs/createCanvas.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/defaultValue' ], function( diff --git a/Specs/createContext.js b/Specs/createContext.js index d12d5186a3c5..e2eb539c9ca0 100644 --- a/Specs/createContext.js +++ b/Specs/createContext.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/clone', 'Core/defaultValue', diff --git a/Specs/createDynamicGeometryBoundingSphereSpecs.js b/Specs/createDynamicGeometryBoundingSphereSpecs.js index b54661b3ec8d..beb5662a9fdc 100644 --- a/Specs/createDynamicGeometryBoundingSphereSpecs.js +++ b/Specs/createDynamicGeometryBoundingSphereSpecs.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/BoundingSphere', 'Core/JulianDate', diff --git a/Specs/createDynamicProperty.js b/Specs/createDynamicProperty.js index 7d38a7b5d8a8..784b86dc562f 100644 --- a/Specs/createDynamicProperty.js +++ b/Specs/createDynamicProperty.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/defineProperties', 'DataSources/ConstantProperty' diff --git a/Specs/createFrameState.js b/Specs/createFrameState.js index 418201a8cc13..53ebcdc378db 100644 --- a/Specs/createFrameState.js +++ b/Specs/createFrameState.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/defaultValue', 'Core/GeographicProjection', diff --git a/Specs/createGlobe.js b/Specs/createGlobe.js index d0dd87e7f501..aaa05130dca2 100644 --- a/Specs/createGlobe.js +++ b/Specs/createGlobe.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/defaultValue', 'Core/defineProperties', diff --git a/Specs/createPackableArraySpecs.js b/Specs/createPackableArraySpecs.js index 2ea31b3fedc9..691e3d5ac35b 100644 --- a/Specs/createPackableArraySpecs.js +++ b/Specs/createPackableArraySpecs.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/defaultValue' ], function( diff --git a/Specs/createPackableSpecs.js b/Specs/createPackableSpecs.js index 316281b1a06b..38f2878a9409 100644 --- a/Specs/createPackableSpecs.js +++ b/Specs/createPackableSpecs.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/defaultValue', 'Core/defined', diff --git a/Specs/createScene.js b/Specs/createScene.js index ecceb37b4b44..277548492693 100644 --- a/Specs/createScene.js +++ b/Specs/createScene.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/Cartesian2', 'Core/clone', diff --git a/Specs/createViewer.js b/Specs/createViewer.js index 912d75f8cc3d..71821fae091d 100644 --- a/Specs/createViewer.js +++ b/Specs/createViewer.js @@ -1,12 +1,11 @@ -/*global define*/ define([ 'Core/defaultValue', - 'Widgets/Viewer/Viewer', - 'Specs/getWebGLStub' + 'Specs/getWebGLStub', + 'Widgets/Viewer/Viewer' ], function( defaultValue, - Viewer, - getWebGLStub) { + getWebGLStub, + Viewer) { 'use strict'; function createViewer(container, options) { diff --git a/Specs/customizeJasmine.js b/Specs/customizeJasmine.js index e857b01912a6..21dbdce268f3 100644 --- a/Specs/customizeJasmine.js +++ b/Specs/customizeJasmine.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Source/ThirdParty/when', 'Specs/addDefaultMatchers', diff --git a/Specs/equals.js b/Specs/equals.js index ee30087e284c..caeb2a650d39 100644 --- a/Specs/equals.js +++ b/Specs/equals.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/FeatureDetection' ], function( diff --git a/Specs/equalsMethodEqualityTester.js b/Specs/equalsMethodEqualityTester.js index fe55065c0e55..4eb76d939d01 100644 --- a/Specs/equalsMethodEqualityTester.js +++ b/Specs/equalsMethodEqualityTester.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/defined' ], function( diff --git a/Specs/getArguments.js b/Specs/getArguments.js index d338cb51bcd1..907fc73b6e0a 100644 --- a/Specs/getArguments.js +++ b/Specs/getArguments.js @@ -1,4 +1,3 @@ -/*global define*/ define([], function() { 'use strict'; diff --git a/Specs/getWebGLStub.js b/Specs/getWebGLStub.js index 83f60f3e0868..59659d496a6e 100644 --- a/Specs/getWebGLStub.js +++ b/Specs/getWebGLStub.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/clone', 'Core/defaultValue', diff --git a/Specs/pick.js b/Specs/pick.js index 711798051a7d..262b9b1b90f5 100644 --- a/Specs/pick.js +++ b/Specs/pick.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/BoundingRectangle', 'Core/Color', diff --git a/Specs/pollToPromise.js b/Specs/pollToPromise.js index f7e0bcba2493..6a375f8ba7b2 100644 --- a/Specs/pollToPromise.js +++ b/Specs/pollToPromise.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/defaultValue', 'Core/getTimestamp', diff --git a/Specs/render.js b/Specs/render.js index d239ed626176..71c72319fd44 100644 --- a/Specs/render.js +++ b/Specs/render.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'Core/defined', 'Core/Intersect', diff --git a/Specs/testDefinitionChanged.js b/Specs/testDefinitionChanged.js index 0252e4534b76..2e834e16f504 100644 --- a/Specs/testDefinitionChanged.js +++ b/Specs/testDefinitionChanged.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'DataSources/ConstantProperty' ], function( diff --git a/Specs/testMaterialDefinitionChanged.js b/Specs/testMaterialDefinitionChanged.js index 00ebc8a794ab..3982dc7478f0 100644 --- a/Specs/testMaterialDefinitionChanged.js +++ b/Specs/testMaterialDefinitionChanged.js @@ -1,4 +1,3 @@ -/*global define*/ define([ 'DataSources/ColorMaterialProperty' ], function( diff --git a/Tools/eslint-config-cesium/CHANGES.md b/Tools/eslint-config-cesium/CHANGES.md index 28b4bebfeb7c..43f95de4eae0 100644 --- a/Tools/eslint-config-cesium/CHANGES.md +++ b/Tools/eslint-config-cesium/CHANGES.md @@ -1,7 +1,10 @@ Change Log ========== -### 2.0.0 +### 2.0.1 - 2017-06-28 +* Remove [eslint-plugin-html](https://www.npmjs.com/package/eslint-plugin-html) peerDependency from `browser` config. + +### 2.0.0 - 2017-06-27 * Enable [no-floating-decimal](http://eslint.org/docs/rules/no-floating-decimal). * Enable [no-use-before-define](http://eslint.org/docs/rules/no-use-before-define). @@ -16,6 +19,10 @@ Change Log * Enable [no-unused-expressions](http://eslint.org/docs/rules/no-unused-expressions). * Enable [no-sequences](http://eslint.org/docs/rules/no-lonely-if). * Enable [block-scoped-var](http://eslint.org/docs/rules/block-scoped-var). +* Enable Node-specific rules: + * [global-require](http://eslint.org/docs/rules/global-require) + * [no-buffer-constructor](http://eslint.org/docs/rules/no-buffer-constructor) + * [no-new-require](http://eslint.org/docs/rules/no-new-require) ### 1.0.0 - 2017-06-12 diff --git a/Tools/eslint-config-cesium/browser.js b/Tools/eslint-config-cesium/browser.js index c6300a148bef..6ed2ab2d3f5d 100644 --- a/Tools/eslint-config-cesium/browser.js +++ b/Tools/eslint-config-cesium/browser.js @@ -6,9 +6,6 @@ module.exports = { amd: true, browser: true }, - plugins: [ - 'html' - ], rules: { 'no-implicit-globals': 'error' } diff --git a/Tools/eslint-config-cesium/node.js b/Tools/eslint-config-cesium/node.js index 2686d2251d8e..9e4d2eeb57b9 100644 --- a/Tools/eslint-config-cesium/node.js +++ b/Tools/eslint-config-cesium/node.js @@ -4,5 +4,10 @@ module.exports = { extends: './index.js', env: { node: true + }, + rules: { + 'global-require' : 'error', + 'no-buffer-constructor' : 'error', + 'no-new-require' : 'error' } }; diff --git a/Tools/eslint-config-cesium/package.json b/Tools/eslint-config-cesium/package.json index afa7027fbe87..f68a8951f4a1 100644 --- a/Tools/eslint-config-cesium/package.json +++ b/Tools/eslint-config-cesium/package.json @@ -1,6 +1,6 @@ { "name": "eslint-config-cesium", - "version": "1.0.0", + "version": "2.0.1", "description": "ESLint shareable configs for Cesium", "homepage": "http://cesiumjs.org", "license": "Apache-2.0", @@ -19,7 +19,6 @@ "cesium" ], "peerDependencies": { - "eslint": ">= 4", - "eslint-plugin-html": ">= 3" + "eslint": ">= 4" } } diff --git a/gulpfile.js b/gulpfile.js index 66a971cf4e79..a629ab83bfab 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -662,7 +662,6 @@ define(\'' + moduleId + '\', function() {\n\ contents += '})();'; var paths = '\ -/*global define*/\n\ define(function() {\n\ \'use strict\';\n\ return {\n' + modulePathMappings.join(',\n') + '\n\ @@ -978,7 +977,6 @@ function glslToJavaScript(minify, minifyStateFilePath) { contents = contents.split('"').join('\\"').replace(/\n/gm, '\\n\\\n'); contents = copyrightComments + '\ //This file is automatically rebuilt by the Cesium build process.\n\ -/*global define*/\n\ define(function() {\n\ \'use strict\';\n\ return "' + contents + '";\n\ @@ -1019,7 +1017,6 @@ define(function() {\n\ var fileContents = '\ //This file is automatically rebuilt by the Cesium build process.\n\ -/*global define*/\n\ define([\n' + contents.amdPath + '\n ], function(\n' + @@ -1057,7 +1054,6 @@ function createCesiumJs() { }); var contents = '\ -/*global define*/\n\ define([' + moduleIds.join(', ') + '], function(' + parameters.join(', ') + ') {\n\ \'use strict\';\n\ var Cesium = {\n\