diff --git a/src/core/index.js b/src/core/index.js index 1c020a6..e79c6ca 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -54,6 +54,8 @@ // filters - webgl AbstractFilter: require('./renderers/webgl/filters/AbstractFilter'), + FXAAFilter: require('../renderers/webgl/filters/FXAAFilter'), + SpriteMaskFilter: require('../renderers/webgl/filters/SpriteMaskFilter'), /** * This helper function will automatically detect which renderer you should be using. diff --git a/src/core/index.js b/src/core/index.js index 1c020a6..e79c6ca 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -54,6 +54,8 @@ // filters - webgl AbstractFilter: require('./renderers/webgl/filters/AbstractFilter'), + FXAAFilter: require('../renderers/webgl/filters/FXAAFilter'), + SpriteMaskFilter: require('../renderers/webgl/filters/SpriteMaskFilter'), /** * This helper function will automatically detect which renderer you should be using. diff --git a/src/deprecation.js b/src/deprecation.js index bee8c7a..4370924 100644 --- a/src/deprecation.js +++ b/src/deprecation.js @@ -2,7 +2,7 @@ var core = require('./core'), mesh = require('./mesh'), extras = require('./extras'), - utils = require('./core/utils'); + filters = require('./filters'); /** * @class @@ -159,7 +159,7 @@ BaseTextureCache: { get: function () { console.warn('The BaseTextureCache class has been moved to utils.BaseTextureCache, please use utils.BaseTextureCache from now on.'); - return utils.BaseTextureCache; + return core.utils.BaseTextureCache; } }, /** @@ -172,7 +172,7 @@ TextureCache: { get: function () { console.warn('The TextureCache class has been moved to utils.TextureCache, please use utils.TextureCache from now on.'); - return utils.TextureCache; + return core.utils.TextureCache; } } }); @@ -232,3 +232,49 @@ this.frame = frame; console.warn('setFrame is now deprecated, please use the frame property, e.g : myTexture.frame = frame;'); }; + +Object.defineProperties(filters, { + + /** + * @class + * @private + * @name PIXI.filters.AbstractFilter + * @see {@link PIXI.AbstractFilter} + * @deprecated since version 3.0.6 + */ + AbstractFilter: { + get: function() { + console.warn('filters.AbstractFilter is an undocumented alias, please use AbstractFilter from now on.'); + return core.AbstractFilter; + } + }, + + /** + * @class + * @private + * @name PIXI.filters.FXAAFilter + * @see {@link PIXI.FXAAFilter} + * @deprecated since version 3.0.6 + */ + FXAAFilter: { + get: function() { + console.warn('filters.AbstractFilter is an undocumented alias, please use FXAAFilter from now on.'); + return core.FXAAFilter; + } + }, + + /** + * @class + * @private + * @name PIXI.filters.SpriteMaskFilter + * @see {@link PIXI.SpriteMaskFilter} + * @deprecated since version 3.0.6 + */ + SpriteMaskFilter: { + get: function() { + console.warn('filters.SpriteMaskFilter is an undocumented alias, please use SpriteMaskFilter from now on.'); + return core.SpriteMaskFilter; + } + } +}); + diff --git a/src/core/index.js b/src/core/index.js index 1c020a6..e79c6ca 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -54,6 +54,8 @@ // filters - webgl AbstractFilter: require('./renderers/webgl/filters/AbstractFilter'), + FXAAFilter: require('../renderers/webgl/filters/FXAAFilter'), + SpriteMaskFilter: require('../renderers/webgl/filters/SpriteMaskFilter'), /** * This helper function will automatically detect which renderer you should be using. diff --git a/src/deprecation.js b/src/deprecation.js index bee8c7a..4370924 100644 --- a/src/deprecation.js +++ b/src/deprecation.js @@ -2,7 +2,7 @@ var core = require('./core'), mesh = require('./mesh'), extras = require('./extras'), - utils = require('./core/utils'); + filters = require('./filters'); /** * @class @@ -159,7 +159,7 @@ BaseTextureCache: { get: function () { console.warn('The BaseTextureCache class has been moved to utils.BaseTextureCache, please use utils.BaseTextureCache from now on.'); - return utils.BaseTextureCache; + return core.utils.BaseTextureCache; } }, /** @@ -172,7 +172,7 @@ TextureCache: { get: function () { console.warn('The TextureCache class has been moved to utils.TextureCache, please use utils.TextureCache from now on.'); - return utils.TextureCache; + return core.utils.TextureCache; } } }); @@ -232,3 +232,49 @@ this.frame = frame; console.warn('setFrame is now deprecated, please use the frame property, e.g : myTexture.frame = frame;'); }; + +Object.defineProperties(filters, { + + /** + * @class + * @private + * @name PIXI.filters.AbstractFilter + * @see {@link PIXI.AbstractFilter} + * @deprecated since version 3.0.6 + */ + AbstractFilter: { + get: function() { + console.warn('filters.AbstractFilter is an undocumented alias, please use AbstractFilter from now on.'); + return core.AbstractFilter; + } + }, + + /** + * @class + * @private + * @name PIXI.filters.FXAAFilter + * @see {@link PIXI.FXAAFilter} + * @deprecated since version 3.0.6 + */ + FXAAFilter: { + get: function() { + console.warn('filters.AbstractFilter is an undocumented alias, please use FXAAFilter from now on.'); + return core.FXAAFilter; + } + }, + + /** + * @class + * @private + * @name PIXI.filters.SpriteMaskFilter + * @see {@link PIXI.SpriteMaskFilter} + * @deprecated since version 3.0.6 + */ + SpriteMaskFilter: { + get: function() { + console.warn('filters.SpriteMaskFilter is an undocumented alias, please use SpriteMaskFilter from now on.'); + return core.SpriteMaskFilter; + } + } +}); + diff --git a/src/filters/index.js b/src/filters/index.js index 0b79c6d..3dba827 100644 --- a/src/filters/index.js +++ b/src/filters/index.js @@ -9,11 +9,6 @@ * @namespace PIXI.filters */ module.exports = { - // expose some internal filters... - AbstractFilter: require('../core/renderers/webgl/filters/AbstractFilter'), - FXAAFilter: require('../core/renderers/webgl/filters/FXAAFilter'), - SpriteMaskFilter: require('../core/renderers/webgl/filters/SpriteMaskFilter'), - // add the rest! AsciiFilter: require('./ascii/AsciiFilter'), BloomFilter: require('./bloom/BloomFilter'), BlurFilter: require('./blur/BlurFilter'),