Skip to content

Commit b2fc6c4

Browse files
committed
Fixed filters for new shader code.
1 parent f22159e commit b2fc6c4

50 files changed

Lines changed: 906 additions & 451 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

build/config.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
<script src="$path/src/pixi/extras/Rope.js"></script>
2929
<script src="$path/src/pixi/extras/TilingSprite.js"></script>
3030
31+
<script src="$path/src/pixi/filters/AbstractFilter.js"></script>
3132
<script src="$path/src/pixi/filters/FilterBlock.js"></script>
33+
3234
<script src="$path/src/pixi/primitives/Graphics.js"></script>
3335
3436
<script src="$path/src/pixi/renderers/canvas/CanvasGraphics.js"></script>

examples/_site/examples.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,18 @@
178178
}
179179
],
180180
"filters": [
181+
{
182+
"file": "checker+wave.js",
183+
"title": "checker wave"
184+
},
181185
{
182186
"file": "fire.js",
183187
"title": "fire"
184188
},
189+
{
190+
"file": "hue+rotate.js",
191+
"title": "hue rotate"
192+
},
185193
{
186194
"file": "lightbeams.js",
187195
"title": "lightbeams"

examples/_site/js/phaser-examples.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ $(document).ready(function(){
9595

9696
.done(function(data) {
9797

98-
console.log(data);
99-
10098
if (data.version !== '1.1.3')
10199
{
102100
$("#upgrade").append(data.version);

examples/_site/js/phaser-viewer.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ $(document).ready(function(){
5858

5959
.done(function(data) {
6060

61-
console.log(data);
62-
6361
if (data.version !== '1.1.3')
6462
{
6563
$("#upgrade").append(data.version);

examples/filters/checker wave.js

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
2+
var game = new Phaser.Game(800, 600, Phaser.WEBGL, 'phaser-example', { preload: preload, create: create, update: update });
3+
4+
var background;
5+
var filter;
6+
7+
function preload() {
8+
9+
game.load.image('s', 'assets/pics/undersea.jpg');
10+
game.load.image('phaser', 'assets/sprites/phaser.png');
11+
game.load.script('filter', '../filters/CheckerWave.js');
12+
13+
}
14+
15+
function create() {
16+
17+
game.add.sprite(0, 0, 's');
18+
19+
background = game.add.sprite(0, 0);
20+
background.width = 800;
21+
background.height = 600;
22+
23+
filter = game.add.filter('CheckerWave', 800, 600);
24+
filter.alpha = 0.2;
25+
26+
background.filters = [filter];
27+
28+
var logo = game.add.sprite(game.world.centerX, 100, 'phaser');
29+
logo.anchor.setTo(0.5, 0.5);
30+
31+
}
32+
33+
function update() {
34+
35+
filter.update();
36+
37+
}

examples/filters/fire.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var filter;
77
function preload() {
88

99
game.load.image('phaser', 'assets/sprites/phaser2.png');
10-
game.load.script('fire', '../filters/Fire.js');
10+
game.load.script('filter', '../filters/Fire.js');
1111

1212
}
1313

examples/filters/hue rotate.js

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
2+
var game = new Phaser.Game(800, 600, Phaser.WEBGL, 'phaser-example', { preload: preload, create: create, update: update });
3+
4+
var background;
5+
var filter;
6+
7+
function preload() {
8+
9+
game.load.image('phaser', 'assets/sprites/phaser2.png');
10+
game.load.script('filter', '../filters/HueRotate.js');
11+
// game.load.image('texture', 'assets/textures/ooze.png');
12+
game.load.image('texture', 'assets/pics/ra_einstein.png');
13+
14+
}
15+
16+
function create() {
17+
18+
var logo = game.add.sprite(game.world.centerX, game.world.centerY, 'texture');
19+
logo.anchor.setTo(0.5, 0.5);
20+
logo.texture.baseTexture._powerOf2 = true;
21+
22+
23+
background = game.add.sprite(0, 0);
24+
background.width = logo.width;
25+
background.height = logo.height;
26+
27+
filter = game.add.filter('HueRotate', logo.width, logo.height, logo.texture);
28+
// filter.alpha = 0.0;
29+
30+
background.filters = [filter];
31+
32+
}
33+
34+
function update() {
35+
36+
filter.update();
37+
38+
}

examples/filters/lightbeams.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var filter;
77
function preload() {
88

99
game.load.image('phaser', 'assets/sprites/phaser2.png');
10-
game.load.script('light', '../filters/LightBeam.js');
10+
game.load.script('filter', '../filters/LightBeam.js');
1111

1212
}
1313

examples/filters/plasma.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var filter;
77
function preload() {
88

99
game.load.image('phaser', 'assets/sprites/phaser2.png');
10-
game.load.script('plasma', '../filters/Plasma.js');
10+
game.load.script('filter', '../filters/Plasma.js');
1111

1212
}
1313

examples/filters/tunnel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function preload() {
88

99
game.load.image('phaser', 'assets/sprites/phaser.png');
1010
game.load.image('texture', 'assets/textures/ooze.png');
11-
game.load.script('tunnel', '../filters/Tunnel.js');
11+
game.load.script('filter', '../filters/Tunnel.js');
1212

1313
}
1414

0 commit comments

Comments
 (0)