From c7ae01d32f14138f899c053f3c93f78adb61b5e7 Mon Sep 17 00:00:00 2001 From: Abu Darda Date: Mon, 29 Apr 2019 22:06:15 +0100 Subject: [PATCH 1/3] empty objects in options have been replaced --- CONTRIBUTORS.md | 1 + Source/Core/EllipsoidTerrainProvider.js | 2 +- Source/Core/GeographicTilingScheme.js | 2 +- .../GoogleEarthEnterpriseTerrainProvider.js | 2 +- Source/Core/WebMercatorTilingScheme.js | 2 +- Source/DataSources/KmlDataSource.js | 4 +-- Source/Renderer/Context.js | 2 +- Source/Renderer/RenderState.js | 28 +++++++++---------- .../Scene/ArcGisMapServerImageryProvider.js | 2 +- Source/Scene/BingMapsImageryProvider.js | 2 +- Source/Scene/ImageryLayer.js | 2 +- Source/Scene/SingleTileImageryProvider.js | 2 +- .../createOpenStreetMapImageryProvider.js | 2 +- .../createTileMapServiceImageryProvider.js | 2 +- Source/Scene/processModelMaterialsCommon.js | 2 +- Source/Scene/processPbrMaterials.js | 2 +- Source/Widgets/CesiumWidget/CesiumWidget.js | 2 +- 17 files changed, 31 insertions(+), 30 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index b3173fe5b3f2..5c82ff8bdd7d 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -206,3 +206,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu * [Adrien David](https://github.com/adridavid) * [Alexander Popiak](https://github.com/apopiak) * [Merijn Wijngaard](https://github.com/mwijngaard) +* [Abu Darda](https://github.com/abuDarda97) diff --git a/Source/Core/EllipsoidTerrainProvider.js b/Source/Core/EllipsoidTerrainProvider.js index 7266b9b11a00..30a594de3e94 100644 --- a/Source/Core/EllipsoidTerrainProvider.js +++ b/Source/Core/EllipsoidTerrainProvider.js @@ -38,7 +38,7 @@ define([ * @see TerrainProvider */ function EllipsoidTerrainProvider(options) { - options = defaultValue(options, {}); + options = defaultValue(options, defaultValue.EMPTY_OBJECT); this._tilingScheme = options.tilingScheme; if (!defined(this._tilingScheme)) { diff --git a/Source/Core/GeographicTilingScheme.js b/Source/Core/GeographicTilingScheme.js index 3f0ec1a13b6c..7d0dfd91b6a3 100644 --- a/Source/Core/GeographicTilingScheme.js +++ b/Source/Core/GeographicTilingScheme.js @@ -38,7 +38,7 @@ define([ * the tile tree. */ function GeographicTilingScheme(options) { - options = defaultValue(options, {}); + options = defaultValue(options, defaultValue.EMPTY_OBJECT); this._ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.WGS84); this._rectangle = defaultValue(options.rectangle, Rectangle.MAX_VALUE); diff --git a/Source/Core/GoogleEarthEnterpriseTerrainProvider.js b/Source/Core/GoogleEarthEnterpriseTerrainProvider.js index 3b8207872418..20946b9df472 100644 --- a/Source/Core/GoogleEarthEnterpriseTerrainProvider.js +++ b/Source/Core/GoogleEarthEnterpriseTerrainProvider.js @@ -116,7 +116,7 @@ define([ * @see {@link http://www.w3.org/TR/cors/|Cross-Origin Resource Sharing} */ function GoogleEarthEnterpriseTerrainProvider(options) { - options = defaultValue(options, {}); + options = defaultValue(options, defaultValue.EMPTY_OBJECT); //>>includeStart('debug', pragmas.debug); if (!(defined(options.url) || defined(options.metadata))) { diff --git a/Source/Core/WebMercatorTilingScheme.js b/Source/Core/WebMercatorTilingScheme.js index 876303451d88..a128b8ec61d3 100644 --- a/Source/Core/WebMercatorTilingScheme.js +++ b/Source/Core/WebMercatorTilingScheme.js @@ -40,7 +40,7 @@ define([ * direction, resulting in a square projection. */ function WebMercatorTilingScheme(options) { - options = defaultValue(options, {}); + options = defaultValue(options, defaultValue.EMPTY_OBJECT); this._ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.WGS84); this._numberOfLevelZeroTilesX = defaultValue(options.numberOfLevelZeroTilesX, 1); diff --git a/Source/DataSources/KmlDataSource.js b/Source/DataSources/KmlDataSource.js index 4ef9027a7e3b..83535db08e29 100644 --- a/Source/DataSources/KmlDataSource.js +++ b/Source/DataSources/KmlDataSource.js @@ -2489,7 +2489,7 @@ define([ * ); */ function KmlDataSource(options) { - options = defaultValue(options, {}); + options = defaultValue(options, defaultValue.EMPTY_OBJECT); var camera = options.camera; var canvas = options.canvas; @@ -2700,7 +2700,7 @@ define([ } //>>includeEnd('debug'); - options = defaultValue(options, {}); + options = defaultValue(options, defaultValue.EMPTY_OBJECT); DataSource.setLoading(this, true); var oldName = this._name; diff --git a/Source/Renderer/Context.js b/Source/Renderer/Context.js index 5bc23186ddf7..c91078986020 100644 --- a/Source/Renderer/Context.js +++ b/Source/Renderer/Context.js @@ -191,7 +191,7 @@ define([ this._canvas = canvas; options = clone(options, true); - options = defaultValue(options, {}); + options = defaultValue(options, defaultValue.EMPTY_OBJECT); options.allowTextureFilterAnisotropic = defaultValue(options.allowTextureFilterAnisotropic, true); var webglOptions = defaultValue(options.webgl, {}); diff --git a/Source/Renderer/RenderState.js b/Source/Renderer/RenderState.js index 774f7a04871f..bf41abe0e87d 100644 --- a/Source/Renderer/RenderState.js +++ b/Source/Renderer/RenderState.js @@ -89,20 +89,20 @@ define([ * @private */ function RenderState(renderState) { - var rs = defaultValue(renderState, {}); - var cull = defaultValue(rs.cull, {}); - var polygonOffset = defaultValue(rs.polygonOffset, {}); - var scissorTest = defaultValue(rs.scissorTest, {}); - var scissorTestRectangle = defaultValue(scissorTest.rectangle, {}); - var depthRange = defaultValue(rs.depthRange, {}); - var depthTest = defaultValue(rs.depthTest, {}); - var colorMask = defaultValue(rs.colorMask, {}); - var blending = defaultValue(rs.blending, {}); - var blendingColor = defaultValue(blending.color, {}); - var stencilTest = defaultValue(rs.stencilTest, {}); - var stencilTestFrontOperation = defaultValue(stencilTest.frontOperation, {}); - var stencilTestBackOperation = defaultValue(stencilTest.backOperation, {}); - var sampleCoverage = defaultValue(rs.sampleCoverage, {}); + var rs = defaultValue(renderState, defaultValue.EMPTY_OBJECT); + var cull = defaultValue(rs.cull, defaultValue.EMPTY_OBJECT); + var polygonOffset = defaultValue(rs.polygonOffset, defaultValue.EMPTY_OBJECT); + var scissorTest = defaultValue(rs.scissorTest, defaultValue.EMPTY_OBJECT); + var scissorTestRectangle = defaultValue(scissorTest.rectangle, defaultValue.EMPTY_OBJECT); + var depthRange = defaultValue(rs.depthRange, defaultValue.EMPTY_OBJECT); + var depthTest = defaultValue(rs.depthTest, defaultValue.EMPTY_OBJECT); + var colorMask = defaultValue(rs.colorMask, defaultValue.EMPTY_OBJECT); + var blending = defaultValue(rs.blending, defaultValue.EMPTY_OBJECT); + var blendingColor = defaultValue(blending.color, defaultValue.EMPTY_OBJECT); + var stencilTest = defaultValue(rs.stencilTest, defaultValue.EMPTY_OBJECT); + var stencilTestFrontOperation = defaultValue(stencilTest.frontOperation, defaultValue.EMPTY_OBJECT); + var stencilTestBackOperation = defaultValue(stencilTest.backOperation, defaultValue.EMPTY_OBJECT); + var sampleCoverage = defaultValue(rs.sampleCoverage, defaultValue.EMPTY_OBJECT); var viewport = rs.viewport; this.frontFace = defaultValue(rs.frontFace, WindingOrder.COUNTER_CLOCKWISE); diff --git a/Source/Scene/ArcGisMapServerImageryProvider.js b/Source/Scene/ArcGisMapServerImageryProvider.js index 03a5ad1a245f..050d6171c9e2 100644 --- a/Source/Scene/ArcGisMapServerImageryProvider.js +++ b/Source/Scene/ArcGisMapServerImageryProvider.js @@ -108,7 +108,7 @@ define([ * @see {@link http://www.w3.org/TR/cors/|Cross-Origin Resource Sharing} */ function ArcGisMapServerImageryProvider(options) { - options = defaultValue(options, {}); + options = defaultValue(options, defaultValue.EMPTY_OBJECT); //>>includeStart('debug', pragmas.debug); if (!defined(options.url)) { diff --git a/Source/Scene/BingMapsImageryProvider.js b/Source/Scene/BingMapsImageryProvider.js index a403bd1338de..87dcf75e3d32 100644 --- a/Source/Scene/BingMapsImageryProvider.js +++ b/Source/Scene/BingMapsImageryProvider.js @@ -92,7 +92,7 @@ define([ * @see {@link http://www.w3.org/TR/cors/|Cross-Origin Resource Sharing} */ function BingMapsImageryProvider(options) { - options = defaultValue(options, {}); + options = defaultValue(options, defaultValue.EMPTY_OBJECT); //>>includeStart('debug', pragmas.debug); if (!defined(options.url)) { diff --git a/Source/Scene/ImageryLayer.js b/Source/Scene/ImageryLayer.js index 6dd674651966..cd92ca4ca909 100644 --- a/Source/Scene/ImageryLayer.js +++ b/Source/Scene/ImageryLayer.js @@ -164,7 +164,7 @@ define([ function ImageryLayer(imageryProvider, options) { this._imageryProvider = imageryProvider; - options = defaultValue(options, {}); + options = defaultValue(options, defaultValue.EMPTY_OBJECT); /** * The alpha blending value of this layer, with 0.0 representing fully transparent and diff --git a/Source/Scene/SingleTileImageryProvider.js b/Source/Scene/SingleTileImageryProvider.js index 3c84cb3e42a4..91d52d2bd461 100644 --- a/Source/Scene/SingleTileImageryProvider.js +++ b/Source/Scene/SingleTileImageryProvider.js @@ -49,7 +49,7 @@ define([ * @see UrlTemplateImageryProvider */ function SingleTileImageryProvider(options) { - options = defaultValue(options, {}); + options = defaultValue(options, defaultValue.EMPTY_OBJECT); //>>includeStart('debug', pragmas.debug); if (!defined(options.url)) { throw new DeveloperError('options.url is required.'); diff --git a/Source/Scene/createOpenStreetMapImageryProvider.js b/Source/Scene/createOpenStreetMapImageryProvider.js index c678129a468b..6841ec54be2d 100644 --- a/Source/Scene/createOpenStreetMapImageryProvider.js +++ b/Source/Scene/createOpenStreetMapImageryProvider.js @@ -59,7 +59,7 @@ define([ * @see {@link http://www.w3.org/TR/cors/|Cross-Origin Resource Sharing} */ function createOpenStreetMapImageryProvider(options) { - options = defaultValue(options, {}); + options = defaultValue(options, defaultValue.EMPTY_OBJECT); var url = defaultValue(options.url, 'https://a.tile.openstreetmap.org/'); url = appendForwardSlash(url); diff --git a/Source/Scene/createTileMapServiceImageryProvider.js b/Source/Scene/createTileMapServiceImageryProvider.js index 2c616d7b8fc0..4c3ead753054 100644 --- a/Source/Scene/createTileMapServiceImageryProvider.js +++ b/Source/Scene/createTileMapServiceImageryProvider.js @@ -83,7 +83,7 @@ define([ * }); */ function createTileMapServiceImageryProvider(options) { - options = defaultValue(options, {}); + options = defaultValue(options, defaultValue.EMPTY_OBJECT); //>>includeStart('debug', pragmas.debug); if (!defined(options.url)) { diff --git a/Source/Scene/processModelMaterialsCommon.js b/Source/Scene/processModelMaterialsCommon.js index f27ae921cdc1..2bc5ea12ffa6 100644 --- a/Source/Scene/processModelMaterialsCommon.js +++ b/Source/Scene/processModelMaterialsCommon.js @@ -24,7 +24,7 @@ define([ * @private */ function processModelMaterialsCommon(gltf, options) { - options = defaultValue(options, {}); + options = defaultValue(options, defaultValue.EMPTY_OBJECT); if (!defined(gltf)) { return; diff --git a/Source/Scene/processPbrMaterials.js b/Source/Scene/processPbrMaterials.js index 561032173de6..3ee8414e062d 100644 --- a/Source/Scene/processPbrMaterials.js +++ b/Source/Scene/processPbrMaterials.js @@ -24,7 +24,7 @@ define([ * @private */ function processPbrMaterials(gltf, options) { - options = defaultValue(options, {}); + options = defaultValue(options, defaultValue.EMPTY_OBJECT); // No need to create new techniques if they already exist, // the shader should handle these values diff --git a/Source/Widgets/CesiumWidget/CesiumWidget.js b/Source/Widgets/CesiumWidget/CesiumWidget.js index 6a28e30dc94d..6ea89d22f410 100644 --- a/Source/Widgets/CesiumWidget/CesiumWidget.js +++ b/Source/Widgets/CesiumWidget/CesiumWidget.js @@ -203,7 +203,7 @@ define([ container = getElement(container); - options = defaultValue(options, {}); + options = defaultValue(options, defaultValue.EMPTY_OBJECT); //Configure the widget DOM elements var element = document.createElement('div'); From 501a874367a2b7cbdf35a917811184717603aef2 Mon Sep 17 00:00:00 2001 From: Abu Darda Date: Sun, 23 Jun 2019 18:55:16 +0100 Subject: [PATCH 2/3] EMPTY_OBJECT removed from context.js file in Renderer folder --- Source/Renderer/Context.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Renderer/Context.js b/Source/Renderer/Context.js index c91078986020..07de3a81ec16 100644 --- a/Source/Renderer/Context.js +++ b/Source/Renderer/Context.js @@ -191,7 +191,8 @@ define([ this._canvas = canvas; options = clone(options, true); - options = defaultValue(options, defaultValue.EMPTY_OBJECT); + // options is being modified here hence why EMPTY_OBJECT is not being used here + options = defaultValue(options, {}); options.allowTextureFilterAnisotropic = defaultValue(options.allowTextureFilterAnisotropic, true); var webglOptions = defaultValue(options.webgl, {}); From 5eaae3533a9a699cda93047253378e86d67c9190 Mon Sep 17 00:00:00 2001 From: Omar Shehata Date: Fri, 16 Aug 2019 09:08:07 -0400 Subject: [PATCH 3/3] Tweak doc --- Source/Renderer/Context.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Renderer/Context.js b/Source/Renderer/Context.js index 07de3a81ec16..de2ea5cfae57 100644 --- a/Source/Renderer/Context.js +++ b/Source/Renderer/Context.js @@ -191,7 +191,7 @@ define([ this._canvas = canvas; options = clone(options, true); - // options is being modified here hence why EMPTY_OBJECT is not being used here + // Don't use defaultValue.EMPTY_OBJECT here because the options object gets modified in the next line. options = defaultValue(options, {}); options.allowTextureFilterAnisotropic = defaultValue(options.allowTextureFilterAnisotropic, true); var webglOptions = defaultValue(options.webgl, {});