diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index c5bb586..bb7659d 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -25,7 +25,6 @@ this.blurXFilter = new BlurFilterPass(true, strength, quality, resolution, kernelSize); this.blurYFilter = new BlurFilterPass(false, strength, quality, resolution, kernelSize); - this._padding = 0; this.resolution = resolution || settings.RESOLUTION; this.quality = quality || 4; this.blur = strength || 8; @@ -47,7 +46,7 @@ if (xStrength && yStrength) { - const renderTarget = filterManager.getFilterTexture(true); + const renderTarget = filterManager.getFilterTexture(); this.blurXFilter.apply(filterManager, input, renderTarget, true); this.blurYFilter.apply(filterManager, renderTarget, output, false); @@ -151,12 +150,12 @@ */ get blendMode() { - return this.blurYFilter._blendMode; + return this.blurYFilter.blendMode; } set blendMode(value) // eslint-disable-line require-jsdoc { - this.blurYFilter._blendMode = value; + this.blurYFilter.blendMode = value; } /** diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index c5bb586..bb7659d 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -25,7 +25,6 @@ this.blurXFilter = new BlurFilterPass(true, strength, quality, resolution, kernelSize); this.blurYFilter = new BlurFilterPass(false, strength, quality, resolution, kernelSize); - this._padding = 0; this.resolution = resolution || settings.RESOLUTION; this.quality = quality || 4; this.blur = strength || 8; @@ -47,7 +46,7 @@ if (xStrength && yStrength) { - const renderTarget = filterManager.getFilterTexture(true); + const renderTarget = filterManager.getFilterTexture(); this.blurXFilter.apply(filterManager, input, renderTarget, true); this.blurYFilter.apply(filterManager, renderTarget, output, false); @@ -151,12 +150,12 @@ */ get blendMode() { - return this.blurYFilter._blendMode; + return this.blurYFilter.blendMode; } set blendMode(value) // eslint-disable-line require-jsdoc { - this.blurYFilter._blendMode = value; + this.blurYFilter.blendMode = value; } /** diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 85b030c..652469d 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -2,7 +2,6 @@ import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; -import getMaxBlurKernelSize from './getMaxBlurKernelSize'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -42,23 +41,10 @@ this.quality = quality || 4; this.blur = strength || 8; - - this.firstRun = true; } apply(filterManager, input, output, clear) { - if (this.firstRun) - { - const gl = filterManager.renderer.gl; - const kernelSize = getMaxBlurKernelSize(gl); - - this.vertexSrc = generateBlurVertSource(kernelSize, true); - this.fragmentSrc = generateBlurFragSource(kernelSize); - - this.firstRun = false; - } - if (output) { if (this.horizontal) diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index c5bb586..bb7659d 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -25,7 +25,6 @@ this.blurXFilter = new BlurFilterPass(true, strength, quality, resolution, kernelSize); this.blurYFilter = new BlurFilterPass(false, strength, quality, resolution, kernelSize); - this._padding = 0; this.resolution = resolution || settings.RESOLUTION; this.quality = quality || 4; this.blur = strength || 8; @@ -47,7 +46,7 @@ if (xStrength && yStrength) { - const renderTarget = filterManager.getFilterTexture(true); + const renderTarget = filterManager.getFilterTexture(); this.blurXFilter.apply(filterManager, input, renderTarget, true); this.blurYFilter.apply(filterManager, renderTarget, output, false); @@ -151,12 +150,12 @@ */ get blendMode() { - return this.blurYFilter._blendMode; + return this.blurYFilter.blendMode; } set blendMode(value) // eslint-disable-line require-jsdoc { - this.blurYFilter._blendMode = value; + this.blurYFilter.blendMode = value; } /** diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 85b030c..652469d 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -2,7 +2,6 @@ import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; -import getMaxBlurKernelSize from './getMaxBlurKernelSize'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -42,23 +41,10 @@ this.quality = quality || 4; this.blur = strength || 8; - - this.firstRun = true; } apply(filterManager, input, output, clear) { - if (this.firstRun) - { - const gl = filterManager.renderer.gl; - const kernelSize = getMaxBlurKernelSize(gl); - - this.vertexSrc = generateBlurVertSource(kernelSize, true); - this.fragmentSrc = generateBlurFragSource(kernelSize); - - this.firstRun = false; - } - if (output) { if (this.horizontal) diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a9ede81..a8aa5af 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateFragBlurSource(kernelSize) +export default function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/BlurFilter.js b/packages/filters/filter-blur/src/BlurFilter.js index c5bb586..bb7659d 100644 --- a/packages/filters/filter-blur/src/BlurFilter.js +++ b/packages/filters/filter-blur/src/BlurFilter.js @@ -25,7 +25,6 @@ this.blurXFilter = new BlurFilterPass(true, strength, quality, resolution, kernelSize); this.blurYFilter = new BlurFilterPass(false, strength, quality, resolution, kernelSize); - this._padding = 0; this.resolution = resolution || settings.RESOLUTION; this.quality = quality || 4; this.blur = strength || 8; @@ -47,7 +46,7 @@ if (xStrength && yStrength) { - const renderTarget = filterManager.getFilterTexture(true); + const renderTarget = filterManager.getFilterTexture(); this.blurXFilter.apply(filterManager, input, renderTarget, true); this.blurYFilter.apply(filterManager, renderTarget, output, false); @@ -151,12 +150,12 @@ */ get blendMode() { - return this.blurYFilter._blendMode; + return this.blurYFilter.blendMode; } set blendMode(value) // eslint-disable-line require-jsdoc { - this.blurYFilter._blendMode = value; + this.blurYFilter.blendMode = value; } /** diff --git a/packages/filters/filter-blur/src/BlurFilterPass.js b/packages/filters/filter-blur/src/BlurFilterPass.js index 85b030c..652469d 100644 --- a/packages/filters/filter-blur/src/BlurFilterPass.js +++ b/packages/filters/filter-blur/src/BlurFilterPass.js @@ -2,7 +2,6 @@ import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; -import getMaxBlurKernelSize from './getMaxBlurKernelSize'; /** * The BlurFilterPass applies a horizontal or vertical Gaussian blur to an object. @@ -42,23 +41,10 @@ this.quality = quality || 4; this.blur = strength || 8; - - this.firstRun = true; } apply(filterManager, input, output, clear) { - if (this.firstRun) - { - const gl = filterManager.renderer.gl; - const kernelSize = getMaxBlurKernelSize(gl); - - this.vertexSrc = generateBlurVertSource(kernelSize, true); - this.fragmentSrc = generateBlurFragSource(kernelSize); - - this.firstRun = false; - } - if (output) { if (this.horizontal) diff --git a/packages/filters/filter-blur/src/generateBlurFragSource.js b/packages/filters/filter-blur/src/generateBlurFragSource.js index a9ede81..a8aa5af 100644 --- a/packages/filters/filter-blur/src/generateBlurFragSource.js +++ b/packages/filters/filter-blur/src/generateBlurFragSource.js @@ -19,7 +19,7 @@ ].join('\n'); -export default function generateFragBlurSource(kernelSize) +export default function generateBlurFragSource(kernelSize) { const kernel = GAUSSIAN_VALUES[kernelSize]; const halfLength = kernel.length; diff --git a/packages/filters/filter-blur/src/generateBlurVertSource.js b/packages/filters/filter-blur/src/generateBlurVertSource.js index 09da360..41a912a 100644 --- a/packages/filters/filter-blur/src/generateBlurVertSource.js +++ b/packages/filters/filter-blur/src/generateBlurVertSource.js @@ -31,7 +31,7 @@ %blur% }`; -export default function generateVertBlurSource(kernelSize, x) +export default function generateBlurVertSource(kernelSize, x) { const halfLength = Math.ceil(kernelSize / 2);