diff --git a/src/core/renderers/webgl/managers/FilterManager.js b/src/core/renderers/webgl/managers/FilterManager.js index a8c6985..399dbce 100644 --- a/src/core/renderers/webgl/managers/FilterManager.js +++ b/src/core/renderers/webgl/managers/FilterManager.js @@ -289,10 +289,11 @@ let textureCount = 1; let currentState; - if (shader.uniforms.data.filterArea) + if (uniforms.filterArea) { currentState = this.filterData.stack[this.filterData.index]; - const filterArea = shader.uniforms.filterArea; + + const filterArea = uniforms.filterArea; filterArea[0] = currentState.renderTarget.size.width; filterArea[1] = currentState.renderTarget.size.height; @@ -304,11 +305,11 @@ // use this to clamp displaced texture coords so they belong to filterArea // see displacementFilter fragment shader for an example - if (shader.uniforms.data.filterClamp) + if (uniforms.filterClamp) { currentState = this.filterData.stack[this.filterData.index]; - const filterClamp = shader.uniforms.filterClamp; + const filterClamp = uniforms.filterClamp; filterClamp[0] = 0; filterClamp[1] = 0; diff --git a/src/core/renderers/webgl/managers/FilterManager.js b/src/core/renderers/webgl/managers/FilterManager.js index a8c6985..399dbce 100644 --- a/src/core/renderers/webgl/managers/FilterManager.js +++ b/src/core/renderers/webgl/managers/FilterManager.js @@ -289,10 +289,11 @@ let textureCount = 1; let currentState; - if (shader.uniforms.data.filterArea) + if (uniforms.filterArea) { currentState = this.filterData.stack[this.filterData.index]; - const filterArea = shader.uniforms.filterArea; + + const filterArea = uniforms.filterArea; filterArea[0] = currentState.renderTarget.size.width; filterArea[1] = currentState.renderTarget.size.height; @@ -304,11 +305,11 @@ // use this to clamp displaced texture coords so they belong to filterArea // see displacementFilter fragment shader for an example - if (shader.uniforms.data.filterClamp) + if (uniforms.filterClamp) { currentState = this.filterData.stack[this.filterData.index]; - const filterClamp = shader.uniforms.filterClamp; + const filterClamp = uniforms.filterClamp; filterClamp[0] = 0; filterClamp[1] = 0; diff --git a/src/filters/displacement/DisplacementFilter.js b/src/filters/displacement/DisplacementFilter.js index 112de0b..d5355c3 100644 --- a/src/filters/displacement/DisplacementFilter.js +++ b/src/filters/displacement/DisplacementFilter.js @@ -36,7 +36,7 @@ this.maskMatrix = maskMatrix; this.uniforms.mapSampler = sprite.texture; - this.uniforms.filterMatrix = maskMatrix.toArray(true); + this.uniforms.filterMatrix = maskMatrix; this.uniforms.scale = { x: 1, y: 1 }; if (scale === null || scale === undefined)