diff --git a/CHANGES.md b/CHANGES.md index d5f67f80f54f..81b714be7b54 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,7 @@ Change Log * Changed `Globe.pick` to return a position in ECEF coordinates regardless of the current scene mode. This will only effect you if you were working around a bug to make `Globe.pick` work in 2D and Columbus View. Use `Globe.pickWorldCoordinates` to get the position in world coordinates that correlate to the current scene mode. [#6859](https://github.com/AnalyticalGraphicsInc/cesium/pull/6859) * Removed the unused `frameState` parameter in `evaluate` and `evaluateColor` functions in `Expression`, `StyleExpression`, `ConditionsExpression` and all other places that call the functions. [#6890](https://github.com/AnalyticalGraphicsInc/cesium/pull/6890) * Removed `PostProcessStageLibrary.createLensFlarStage`. Use `PostProcessStageLibrary.createLensFlareStage` instead. [#6972](https://github.com/AnalyticalGraphicsInc/cesium/pull/6972) +* Removed `Scene.fxaa`. Use `Scene.postProcessStages.fxaa.enabled` instead. [#6980](https://github.com/AnalyticalGraphicsInc/cesium/pull/6980) ##### Additions :tada: * Added `ClippingPlaneCollection.planeAdded` and `ClippingPlaneCollection.planeRemoved` events. `planeAdded` is raised when a new plane is added to the collection and `planeRemoved` is raised when a plane is removed. [#6875](https://github.com/AnalyticalGraphicsInc/cesium/pull/6875) diff --git a/Source/Scene/Scene.js b/Source/Scene/Scene.js index d683a0cc0278..68242abcacd9 100644 --- a/Source/Scene/Scene.js +++ b/Source/Scene/Scene.js @@ -1430,25 +1430,6 @@ define([ } }, - /** - * When true, enables Fast Approximate Anti-aliasing even when order independent translucency - * is unsupported. - * @memberof Scene.prototype - * @type {Boolean} - * @default true - * @deprecated - */ - fxaa : { - get : function() { - deprecationWarning('Scene.fxaa', 'The Scene.fxaa property has been deprecated. Use Scene.postProcessStages.fxaa.'); - return this.postProcessStages.fxaa.enabled; - }, - set : function(value) { - deprecationWarning('Scene.fxaa', 'The Scene.fxaa property has been deprecated. Use Scene.postProcessStages.fxaa.'); - this.postProcessStages.fxaa.enabled = value; - } - }, - /** * @private */ diff --git a/Specs/Scene/ClassificationPrimitiveSpec.js b/Specs/Scene/ClassificationPrimitiveSpec.js index ba2dcdef2c2a..e3c278aa3470 100644 --- a/Specs/Scene/ClassificationPrimitiveSpec.js +++ b/Specs/Scene/ClassificationPrimitiveSpec.js @@ -58,7 +58,7 @@ defineSuite([ beforeAll(function() { scene = createScene(); - scene.fxaa = false; + scene.postProcessStages.fxaa.enabled = false; ellipsoid = Ellipsoid.WGS84; }); diff --git a/Specs/Scene/GroundPrimitiveSpec.js b/Specs/Scene/GroundPrimitiveSpec.js index 5a5bb859254c..4e26ae7d9832 100644 --- a/Specs/Scene/GroundPrimitiveSpec.js +++ b/Specs/Scene/GroundPrimitiveSpec.js @@ -65,7 +65,7 @@ defineSuite([ beforeAll(function() { scene = createScene(); - scene.fxaa = false; + scene.postProcessStages.fxaa.enabled = false; context = scene.context; @@ -467,7 +467,7 @@ defineSuite([ }); largeScene.render(); - largeScene.fxaa = false; + largeScene.postProcessStages.fxaa.enabled = false; largeScene.camera.setView({ destination : destination }); var largeSceneDepthPrimitive = new MockGlobePrimitive(new Primitive({ diff --git a/Specs/Scene/PointCloud3DTileContentSpec.js b/Specs/Scene/PointCloud3DTileContentSpec.js index 1e5907acf35f..6197cf410e64 100644 --- a/Specs/Scene/PointCloud3DTileContentSpec.js +++ b/Specs/Scene/PointCloud3DTileContentSpec.js @@ -512,7 +512,7 @@ defineSuite([ noAttenuationPixelCount = scene.logarithmicDepthBuffer ? 20 : 16; var center = new Cartesian3.fromRadians(centerLongitude, centerLatitude, 5.0); scene.camera.lookAt(center, new HeadingPitchRange(0.0, -1.57, 5.0)); - scene.fxaa = false; + scene.postProcessStages.fxaa.enabled = false; scene.camera.zoomIn(6); return Cesium3DTilesTester.loadTileset(scene, pointCloudNoColorUrl).then(function(tileset) { diff --git a/Specs/Scene/SceneSpec.js b/Specs/Scene/SceneSpec.js index 3faf61d56441..6027f800c13b 100644 --- a/Specs/Scene/SceneSpec.js +++ b/Specs/Scene/SceneSpec.js @@ -111,7 +111,7 @@ defineSuite([ afterEach(function() { scene.backgroundColor = new Color(0.0, 0.0, 0.0, 0.0); scene.debugCommandFilter = undefined; - scene.fxaa = false; + scene.postProcessStages.fxaa.enabled = false; scene.primitives.removeAll(); scene.morphTo3D(0.0); @@ -418,7 +418,7 @@ defineSuite([ primitives.add(rectanglePrimitive); scene.camera.setView({ destination : rectangle }); - scene.fxaa = false; + scene.postProcessStages.fxaa.enabled = false; expect(scene).toRenderAndCall(function(rgba) { expect(rgba[0]).not.toEqual(0); expect(rgba[1]).toEqual(0); @@ -465,7 +465,7 @@ defineSuite([ s._oit._translucentMultipassSupport = false; } - s.fxaa = true; + s.postProcessStages.fxaa.enabled = false; var rectangle = Rectangle.fromDegrees(-100.0, 30.0, -90.0, 40.0);