Skip to content

Commit 3d7ca63

Browse files
committed
Fixed the vectors used in the BlurX and BlurY filters (thanks @nickryall, fix phaserjs#668)
1 parent 77f8e5e commit 3d7ca63

File tree

3 files changed

+34
-30
lines changed

3 files changed

+34
-30
lines changed

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ Phaser 2.0.3
55

66
Phaser is a fast, free and fun open source game framework for making desktop and mobile browser HTML5 games. It uses [Pixi.js](https://github.com/GoodBoyDigital/pixi.js/) internally for fast 2D Canvas and WebGL rendering.
77

8-
Version: 2.0.3 "Allorallen" - Released: -in development-
8+
Version: 2.0.3 "Allorallen" - Released: 11th April 2014
99

1010
By Richard Davey, [Photon Storm](http://www.photonstorm.com)
1111

12-
[![Build Status](https://travis-ci.org/photonstorm/phaser.png?branch=dev)](https://travis-ci.org/photonstorm/phaser)
13-
1412
* View the [Official Website](http://phaser.io)
1513
* Follow on [Twitter](https://twitter.com/photonstorm)
1614
* Join the [Forum](http://www.html5gamedevs.com/forum/14-phaser/)
@@ -21,6 +19,7 @@ By Richard Davey, [Photon Storm](http://www.photonstorm.com)
2119

2220
[Subscribe to our new Phaser Newsletter](https://confirmsubscription.com/h/r/369DE48E3E86AF1E). We'll email you when new versions are released as well as send you our regular Phaser game making magazine.
2321

22+
[![Build Status](https://travis-ci.org/photonstorm/phaser.png?branch=dev)](https://travis-ci.org/photonstorm/phaser)
2423
[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/photonstorm/phaser/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
2524

2625

@@ -60,7 +59,7 @@ There is also an [un-official Getting Started Guide](http://www.antonoffplus.com
6059
Change Log
6160
----------
6261

63-
Version 2.0.3 - "Allorallen" - -in development-
62+
Version 2.0.3 - "Allorallen" - 11th April 2014
6463

6564
Updates
6665

@@ -159,6 +158,7 @@ Bug Fixes
159158
* Group.removeBetween now properly iterates through the children.
160159
* P2.World had a type in the restitution method title. Now fixed.
161160
* Objects with an InputHandler now deactivate it when the object is removed from a Group but not destroyed (fix #672)
161+
* Fixed the vectors used in the BlurX and BlurY filters (thanks @nickryall, fix #668)
162162

163163

164164
p2.js v0.5.0

filters/BlurX.js

+15-13
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,27 @@ Phaser.Filter.BlurX = function (game) {
1111

1212
"precision mediump float;",
1313
"varying vec2 vTextureCoord;",
14-
"varying float vColor;",
14+
"varying vec4 vColor;",
1515
"uniform float blur;",
1616
"uniform sampler2D uSampler;",
1717

1818
"void main(void) {",
19-
"vec4 sum = vec4(0.0);",
2019

21-
"sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;",
22-
"sum += texture2D(uSampler, vec2(vTextureCoord.x - 3.0*blur, vTextureCoord.y)) * 0.09;",
23-
"sum += texture2D(uSampler, vec2(vTextureCoord.x - 2.0*blur, vTextureCoord.y)) * 0.12;",
24-
"sum += texture2D(uSampler, vec2(vTextureCoord.x - blur, vTextureCoord.y)) * 0.15;",
25-
"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y)) * 0.16;",
26-
"sum += texture2D(uSampler, vec2(vTextureCoord.x + blur, vTextureCoord.y)) * 0.15;",
27-
"sum += texture2D(uSampler, vec2(vTextureCoord.x + 2.0*blur, vTextureCoord.y)) * 0.12;",
28-
"sum += texture2D(uSampler, vec2(vTextureCoord.x + 3.0*blur, vTextureCoord.y)) * 0.09;",
29-
"sum += texture2D(uSampler, vec2(vTextureCoord.x + 4.0*blur, vTextureCoord.y)) * 0.05;",
20+
"vec4 sum = vec4(0.0);",
3021

31-
"gl_FragColor = sum;",
22+
"sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;",
23+
"sum += texture2D(uSampler, vec2(vTextureCoord.x - 3.0*blur, vTextureCoord.y)) * 0.09;",
24+
"sum += texture2D(uSampler, vec2(vTextureCoord.x - 2.0*blur, vTextureCoord.y)) * 0.12;",
25+
"sum += texture2D(uSampler, vec2(vTextureCoord.x - blur, vTextureCoord.y)) * 0.15;",
26+
"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y)) * 0.16;",
27+
"sum += texture2D(uSampler, vec2(vTextureCoord.x + blur, vTextureCoord.y)) * 0.15;",
28+
"sum += texture2D(uSampler, vec2(vTextureCoord.x + 2.0*blur, vTextureCoord.y)) * 0.12;",
29+
"sum += texture2D(uSampler, vec2(vTextureCoord.x + 3.0*blur, vTextureCoord.y)) * 0.09;",
30+
"sum += texture2D(uSampler, vec2(vTextureCoord.x + 4.0*blur, vTextureCoord.y)) * 0.05;",
3231

33-
"}"
32+
"gl_FragColor = sum;",
33+
34+
"}"
3435
];
3536

3637
};
@@ -45,6 +46,7 @@ Object.defineProperty(Phaser.Filter.BlurX.prototype, 'blur', {
4546
},
4647

4748
set: function(value) {
49+
this.dirty = true;
4850
this.uniforms.blur.value = (1/7000) * value;
4951
}
5052

filters/BlurY.js

+15-13
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,27 @@ Phaser.Filter.BlurY = function (game) {
1111

1212
"precision mediump float;",
1313
"varying vec2 vTextureCoord;",
14-
"varying float vColor;",
14+
"varying vec4 vColor;",
1515
"uniform float blur;",
1616
"uniform sampler2D uSampler;",
1717

1818
"void main(void) {",
19-
"vec4 sum = vec4(0.0);",
2019

21-
"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;",
22-
"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 3.0*blur)) * 0.09;",
23-
"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 2.0*blur)) * 0.12;",
24-
"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - blur)) * 0.15;",
25-
"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y)) * 0.16;",
26-
"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y + blur)) * 0.15;",
27-
"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y + 2.0*blur)) * 0.12;",
28-
"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y + 3.0*blur)) * 0.09;",
29-
"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y + 4.0*blur)) * 0.05;",
20+
"vec4 sum = vec4(0.0);",
3021

31-
"gl_FragColor = sum;",
22+
"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;",
23+
"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 3.0*blur)) * 0.09;",
24+
"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 2.0*blur)) * 0.12;",
25+
"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - blur)) * 0.15;",
26+
"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y)) * 0.16;",
27+
"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y + blur)) * 0.15;",
28+
"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y + 2.0*blur)) * 0.12;",
29+
"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y + 3.0*blur)) * 0.09;",
30+
"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y + 4.0*blur)) * 0.05;",
3231

33-
"}"
32+
"gl_FragColor = sum;",
33+
34+
"}"
3435

3536
];
3637

@@ -46,6 +47,7 @@ Object.defineProperty(Phaser.Filter.BlurY.prototype, 'blur', {
4647
},
4748

4849
set: function(value) {
50+
this.dirty = true;
4951
this.uniforms.blur.value = (1/7000) * value;
5052
}
5153

0 commit comments

Comments
 (0)