diff --git a/src/filters/displacement/DisplacementFilter.js b/src/filters/displacement/DisplacementFilter.js index 6ffb10f..a6b4dce 100644 --- a/src/filters/displacement/DisplacementFilter.js +++ b/src/filters/displacement/DisplacementFilter.js @@ -12,7 +12,7 @@ * @memberof PIXI.filters * @param sprite {Sprite} the sprite used for the displacement map. (make sure its added to the scene!) */ -function DisplacementFilter(sprite) +function DisplacementFilter(sprite, scale) { var maskMatrix = new core.Matrix(); sprite.renderable = false; @@ -33,9 +33,13 @@ this.maskSprite = sprite; this.maskMatrix = maskMatrix; + if (scale === 0) { + console.warn('Pixi.js DisplacementFilter warning: given scale is 0, the displacement filter would have no effect'); + } else if (scale === null || scale === undefined) { + scale = 20; + } - this.scale = new core.Point(20,20); - + this.scale = new core.Point(scale, scale); } DisplacementFilter.prototype = Object.create(core.AbstractFilter.prototype); diff --git a/src/filters/displacement/DisplacementFilter.js b/src/filters/displacement/DisplacementFilter.js index 6ffb10f..a6b4dce 100644 --- a/src/filters/displacement/DisplacementFilter.js +++ b/src/filters/displacement/DisplacementFilter.js @@ -12,7 +12,7 @@ * @memberof PIXI.filters * @param sprite {Sprite} the sprite used for the displacement map. (make sure its added to the scene!) */ -function DisplacementFilter(sprite) +function DisplacementFilter(sprite, scale) { var maskMatrix = new core.Matrix(); sprite.renderable = false; @@ -33,9 +33,13 @@ this.maskSprite = sprite; this.maskMatrix = maskMatrix; + if (scale === 0) { + console.warn('Pixi.js DisplacementFilter warning: given scale is 0, the displacement filter would have no effect'); + } else if (scale === null || scale === undefined) { + scale = 20; + } - this.scale = new core.Point(20,20); - + this.scale = new core.Point(scale, scale); } DisplacementFilter.prototype = Object.create(core.AbstractFilter.prototype); diff --git a/src/filters/displacement/displacement.frag b/src/filters/displacement/displacement.frag index 94cdb41..3850c1a 100644 --- a/src/filters/displacement/displacement.frag +++ b/src/filters/displacement/displacement.frag @@ -11,7 +11,6 @@ void main(void) { - vec4 original = texture2D(uSampler, vTextureCoord); vec4 map = texture2D(mapSampler, vMapCoord); map -= 0.5;