Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deprecated Scene.fxaa. #6980

Merged
merged 2 commits into from
Aug 31, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
19 changes: 0 additions & 19 deletions Source/Scene/Scene.js
Original file line number Diff line number Diff line change
Expand Up @@ -1430,25 +1430,6 @@ define([
}
},

/**
* When <code>true</code>, 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
*/
Expand Down
2 changes: 1 addition & 1 deletion Specs/Scene/ClassificationPrimitiveSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ defineSuite([

beforeAll(function() {
scene = createScene();
scene.fxaa = false;
scene.postProcessStages.fxaa.enabled = false;

ellipsoid = Ellipsoid.WGS84;
});
Expand Down
4 changes: 2 additions & 2 deletions Specs/Scene/GroundPrimitiveSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ defineSuite([

beforeAll(function() {
scene = createScene();
scene.fxaa = false;
scene.postProcessStages.fxaa.enabled = false;

context = scene.context;

Expand Down Expand Up @@ -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({
Expand Down
2 changes: 1 addition & 1 deletion Specs/Scene/PointCloud3DTileContentSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions Specs/Scene/SceneSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down