Skip to content

Commit 8b793cd

Browse files
photonstormphotonstorm
committed
Updated to latest version of Pixi.js. Lovely new WebGL filters now working happily :)
1 parent 94d9fa6 commit 8b793cd

86 files changed

Lines changed: 3088 additions & 874 deletions

Some content is hidden

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

‎Gruntfile.js‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,30 @@ module.exports = function (grunt) {
2727
'src/pixi/extras/Strip.js',
2828
'src/pixi/extras/Rope.js',
2929
'src/pixi/extras/TilingSprite.js',
30+
'src/pixi/filters/AbstractFilter.js',
31+
'src/pixi/filters/BlurFilter.js',
32+
'src/pixi/filters/BlurXFilter.js',
33+
'src/pixi/filters/BlurYFilter.js',
34+
'src/pixi/filters/ColorMatrixFilter.js',
35+
'src/pixi/filters/CrossHatchFilter.js',
36+
'src/pixi/filters/DisplacementFilter.js',
37+
'src/pixi/filters/DotScreenFilter.js',
3038
'src/pixi/filters/FilterBlock.js',
31-
'src/pixi/filters/MaskFilter.js',
39+
'src/pixi/filters/GreyFilter.js',
40+
'src/pixi/filters/InvertFilter.js',
41+
'src/pixi/filters/PixelateFilter.js',
42+
'src/pixi/filters/RGBSplitFilter.js',
43+
'src/pixi/filters/SepiaFilter.js',
44+
'src/pixi/filters/SmartBlurFilter.js',
45+
'src/pixi/filters/TwistFilter.js',
3246
'src/pixi/primitives/Graphics.js',
3347
'src/pixi/renderers/canvas/CanvasGraphics.js',
3448
'src/pixi/renderers/canvas/CanvasRenderer.js',
49+
'src/pixi/renderers/webgl/PixiShader.js',
50+
'src/pixi/renderers/webgl/PrimitiveShader.js',
51+
'src/pixi/renderers/webgl/StripShader.js',
3552
'src/pixi/renderers/webgl/WebGLBatch.js',
53+
'src/pixi/renderers/webgl/WebGLFilterManager.js',
3654
'src/pixi/renderers/webgl/WebGLGraphics.js',
3755
'src/pixi/renderers/webgl/WebGLRenderer.js',
3856
'src/pixi/renderers/webgl/WebGLRenderGroup.js',

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ Change Log
3939

4040
Version 1.1.3 - in build
4141

42+
* New: Updated to use the latest version of Pixi.js - which means you can now use all the sexy new WebGL filters they added :)
4243
* New: Sprite.animations.getAnimation will return an animation instance which was added by name.
4344
* New: Added Mouse.button which is set to the button that was pressed: Phaser.Mouse.LEFT_BUTTON, MIDDLE_BUTTON or RIGHT_BUTTON (thanks wKLV)
4445
* New: Added Mouse.pointerLock signal which you can listen to whenever the browser enters or leaves pointer lock mode.
@@ -54,8 +55,6 @@ Version 1.1.3 - in build
5455

5556
You can view the complete Change Log for all previous versions at https://github.com/photonstorm/phaser/changelog.md
5657

57-
![Tanks](http://www.photonstorm.com/wp-content/uploads/2013/10/phaser_tanks-640x480.png)
58-
5958
How to Build
6059
------------
6160

@@ -65,6 +64,8 @@ We also provide a Grunt script that will build Phaser from source along with all
6564

6665
Run `grunt` in the phaser folder for a list of command-line options.
6766

67+
![Tanks](http://www.photonstorm.com/wp-content/uploads/2013/10/phaser_tanks-640x480.png)
68+
6869
Requirements
6970
------------
7071

‎build/config.php‎

Lines changed: 61 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,67 @@
22
// All JS files in build order.
33
// Much easier for debugging re: line numbers
44
?>
5-
<script src="../src/Intro.js"></script>
6-
<script src="../src/pixi/Pixi.js"></script>
7-
<script src="../src/Phaser.js"></script>
8-
<script src="../src/utils/Utils.js"></script>
9-
10-
<script src="../src/pixi/core/Matrix.js"></script>
11-
<script src="../src/pixi/core/Point.js"></script>
12-
<script src="../src/pixi/core/Rectangle.js"></script>
13-
<script src="../src/pixi/display/DisplayObject.js"></script>
14-
<script src="../src/pixi/display/DisplayObjectContainer.js"></script>
15-
<script src="../src/pixi/display/Sprite.js"></script>
16-
17-
<script src="../src/pixi/display/Stage.js"></script>
18-
<script src="../src/pixi/extras/CustomRenderable.js"></script>
19-
<script src="../src/pixi/extras/Strip.js"></script>
20-
<script src="../src/pixi/extras/Rope.js"></script>
21-
22-
<script src="../src/pixi/extras/TilingSprite.js"></script>
23-
<script src="../src/pixi/filters/FilterBlock.js"></script>
24-
<script src="../src/pixi/filters/MaskFilter.js"></script>
25-
<script src="../src/pixi/primitives/Graphics.js"></script>
26-
<script src="../src/pixi/renderers/canvas/CanvasGraphics.js"></script>
27-
<script src="../src/pixi/renderers/canvas/CanvasRenderer.js"></script>
28-
<script src="../src/pixi/renderers/webgl/WebGLBatch.js"></script>
29-
<script src="../src/pixi/renderers/webgl/WebGLGraphics.js"></script>
30-
<script src="../src/pixi/renderers/webgl/WebGLRenderer.js"></script>
31-
<script src="../src/pixi/renderers/webgl/WebGLRenderGroup.js"></script>
32-
<script src="../src/pixi/renderers/webgl/WebGLShaders.js"></script>
33-
<script src="../src/pixi/text/BitmapText.js"></script>
34-
<script src="../src/pixi/text/Text.js"></script>
35-
<script src="../src/pixi/textures/BaseTexture.js"></script>
36-
<script src="../src/pixi/textures/Texture.js"></script>
37-
<script src="../src/pixi/textures/RenderTexture.js"></script>
38-
<script src="../src/pixi/utils/EventTarget.js"></script>
39-
<script src="../src/pixi/utils/Polyk.js"></script>
5+
<script src="../src/Intro.js"></script>
6+
<script src="../src/pixi/Pixi.js"></script>
7+
<script src="../src/Phaser.js"></script>
8+
<script src="../src/utils/Utils.js"></script>
9+
10+
<script src="../src/pixi/core/Matrix.js"></script>
11+
<script src="../src/pixi/core/Point.js"></script>
12+
<script src="../src/pixi/core/Rectangle.js"></script>
13+
<script src="../src/pixi/core/Polygon.js"></script>
14+
15+
<script src="../src/pixi/display/DisplayObject.js"></script>
16+
<script src="../src/pixi/display/DisplayObjectContainer.js"></script>
17+
<script src="../src/pixi/display/Sprite.js"></script>
18+
<script src="../src/pixi/display/Stage.js"></script>
19+
20+
<script src="../src/pixi/extras/CustomRenderable.js"></script>
21+
<script src="../src/pixi/extras/Strip.js"></script>
22+
<script src="../src/pixi/extras/Rope.js"></script>
23+
<script src="../src/pixi/extras/TilingSprite.js"></script>
24+
25+
<script src="../src/pixi/filters/AbstractFilter.js"></script>
26+
<script src="../src/pixi/filters/BlurFilter.js"></script>
27+
<script src="../src/pixi/filters/BlurXFilter.js"></script>
28+
<script src="../src/pixi/filters/BlurYFilter.js"></script>
29+
<script src="../src/pixi/filters/ColorMatrixFilter.js"></script>
30+
<script src="../src/pixi/filters/CrossHatchFilter.js"></script>
31+
<script src="../src/pixi/filters/DisplacementFilter.js"></script>
32+
<script src="../src/pixi/filters/DotScreenFilter.js"></script>
33+
<script src="../src/pixi/filters/FilterBlock.js"></script>
34+
<script src="../src/pixi/filters/GreyFilter.js"></script>
35+
<script src="../src/pixi/filters/InvertFilter.js"></script>
36+
<script src="../src/pixi/filters/PixelateFilter.js"></script>
37+
<script src="../src/pixi/filters/RGBSplitFilter.js"></script>
38+
<script src="../src/pixi/filters/SepiaFilter.js"></script>
39+
<script src="../src/pixi/filters/SmartBlurFilter.js"></script>
40+
<script src="../src/pixi/filters/TwistFilter.js"></script>
41+
42+
<script src="../src/pixi/primitives/Graphics.js"></script>
43+
44+
<script src="../src/pixi/renderers/canvas/CanvasGraphics.js"></script>
45+
<script src="../src/pixi/renderers/canvas/CanvasRenderer.js"></script>
46+
47+
<script src="../src/pixi/renderers/webgl/PixiShader.js"></script>
48+
<script src="../src/pixi/renderers/webgl/PrimitiveShader.js"></script>
49+
<script src="../src/pixi/renderers/webgl/StripShader.js"></script>
50+
<script src="../src/pixi/renderers/webgl/WebGLBatch.js"></script>
51+
<script src="../src/pixi/renderers/webgl/WebGLFilterManager.js"></script>
52+
<script src="../src/pixi/renderers/webgl/WebGLGraphics.js"></script>
53+
<script src="../src/pixi/renderers/webgl/WebGLRenderer.js"></script>
54+
<script src="../src/pixi/renderers/webgl/WebGLRenderGroup.js"></script>
55+
<script src="../src/pixi/renderers/webgl/WebGLShaders.js"></script>
56+
57+
<script src="../src/pixi/text/BitmapText.js"></script>
58+
<script src="../src/pixi/text/Text.js"></script>
59+
60+
<script src="../src/pixi/textures/BaseTexture.js"></script>
61+
<script src="../src/pixi/textures/Texture.js"></script>
62+
<script src="../src/pixi/textures/RenderTexture.js"></script>
63+
64+
<script src="../src/pixi/utils/EventTarget.js"></script>
65+
<script src="../src/pixi/utils/Polyk.js"></script>
4066

4167
<script src="../src/core/Camera.js"></script>
4268
<script src="../src/core/State.js"></script>

‎build/phaser.d.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
declare class Phaser {
22
static VERSION: string;
3+
static DEV_VERSION: string;
34
static GAMES: Array;
45
static AUTO: number;
56
static CANVAS: number;
@@ -252,7 +253,7 @@ declare module Phaser {
252253
}
253254

254255
class Game {
255-
constructor(width: number, height: number, renderer: number, parent: string, state: Phaser.StateManager, transparent: boolean, antialias: boolean);
256+
constructor(width: number, height: number, renderer: number, parent: string, state: object, transparent: boolean, antialias: boolean);
256257
id: number;
257258
width: number;
258259
height: number;

‎examples/_site/view_full.html‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,64 @@
1515
<script src="../src/pixi/Pixi.js"></script>
1616
<script src="../src/Phaser.js"></script>
1717
<script src="../src/utils/Utils.js"></script>
18+
1819
<script src="../src/pixi/core/Matrix.js"></script>
1920
<script src="../src/pixi/core/Point.js"></script>
2021
<script src="../src/pixi/core/Rectangle.js"></script>
22+
<script src="../src/pixi/core/Polygon.js"></script>
23+
2124
<script src="../src/pixi/display/DisplayObject.js"></script>
2225
<script src="../src/pixi/display/DisplayObjectContainer.js"></script>
2326
<script src="../src/pixi/display/Sprite.js"></script>
2427
<script src="../src/pixi/display/Stage.js"></script>
28+
2529
<script src="../src/pixi/extras/CustomRenderable.js"></script>
2630
<script src="../src/pixi/extras/Strip.js"></script>
2731
<script src="../src/pixi/extras/Rope.js"></script>
2832
<script src="../src/pixi/extras/TilingSprite.js"></script>
33+
34+
<script src="../src/pixi/filters/AbstractFilter.js"></script>
35+
<script src="../src/pixi/filters/BlurFilter.js"></script>
36+
<script src="../src/pixi/filters/BlurXFilter.js"></script>
37+
<script src="../src/pixi/filters/BlurYFilter.js"></script>
38+
<script src="../src/pixi/filters/ColorMatrixFilter.js"></script>
39+
<script src="../src/pixi/filters/CrossHatchFilter.js"></script>
40+
<script src="../src/pixi/filters/DisplacementFilter.js"></script>
41+
<script src="../src/pixi/filters/DotScreenFilter.js"></script>
2942
<script src="../src/pixi/filters/FilterBlock.js"></script>
30-
<script src="../src/pixi/filters/MaskFilter.js"></script>
43+
<script src="../src/pixi/filters/GreyFilter.js"></script>
44+
<script src="../src/pixi/filters/InvertFilter.js"></script>
45+
<script src="../src/pixi/filters/PixelateFilter.js"></script>
46+
<script src="../src/pixi/filters/RGBSplitFilter.js"></script>
47+
<script src="../src/pixi/filters/SepiaFilter.js"></script>
48+
<script src="../src/pixi/filters/SmartBlurFilter.js"></script>
49+
<script src="../src/pixi/filters/TwistFilter.js"></script>
50+
3151
<script src="../src/pixi/primitives/Graphics.js"></script>
52+
3253
<script src="../src/pixi/renderers/canvas/CanvasGraphics.js"></script>
3354
<script src="../src/pixi/renderers/canvas/CanvasRenderer.js"></script>
55+
56+
<script src="../src/pixi/renderers/webgl/PixiShader.js"></script>
57+
<script src="../src/pixi/renderers/webgl/PrimitiveShader.js"></script>
58+
<script src="../src/pixi/renderers/webgl/StripShader.js"></script>
3459
<script src="../src/pixi/renderers/webgl/WebGLBatch.js"></script>
60+
<script src="../src/pixi/renderers/webgl/WebGLFilterManager.js"></script>
3561
<script src="../src/pixi/renderers/webgl/WebGLGraphics.js"></script>
3662
<script src="../src/pixi/renderers/webgl/WebGLRenderer.js"></script>
3763
<script src="../src/pixi/renderers/webgl/WebGLRenderGroup.js"></script>
3864
<script src="../src/pixi/renderers/webgl/WebGLShaders.js"></script>
65+
3966
<script src="../src/pixi/text/BitmapText.js"></script>
4067
<script src="../src/pixi/text/Text.js"></script>
68+
4169
<script src="../src/pixi/textures/BaseTexture.js"></script>
4270
<script src="../src/pixi/textures/Texture.js"></script>
4371
<script src="../src/pixi/textures/RenderTexture.js"></script>
72+
4473
<script src="../src/pixi/utils/EventTarget.js"></script>
4574
<script src="../src/pixi/utils/Polyk.js"></script>
75+
4676
<script src="../src/core/Camera.js"></script>
4777
<script src="../src/core/State.js"></script>
4878
<script src="../src/core/StateManager.js"></script>

‎examples/_site/view_lite.html‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,61 @@
1515
<script src="../src/pixi/Pixi.js"></script>
1616
<script src="../src/Phaser.js"></script>
1717
<script src="../src/utils/Utils.js"></script>
18+
1819
<script src="../src/pixi/core/Matrix.js"></script>
1920
<script src="../src/pixi/core/Point.js"></script>
2021
<script src="../src/pixi/core/Rectangle.js"></script>
22+
<script src="../src/pixi/core/Polygon.js"></script>
23+
2124
<script src="../src/pixi/display/DisplayObject.js"></script>
2225
<script src="../src/pixi/display/DisplayObjectContainer.js"></script>
2326
<script src="../src/pixi/display/Sprite.js"></script>
2427
<script src="../src/pixi/display/Stage.js"></script>
28+
2529
<script src="../src/pixi/extras/CustomRenderable.js"></script>
2630
<script src="../src/pixi/extras/Strip.js"></script>
2731
<script src="../src/pixi/extras/Rope.js"></script>
2832
<script src="../src/pixi/extras/TilingSprite.js"></script>
33+
34+
<script src="../src/pixi/filters/AbstractFilter.js"></script>
35+
<script src="../src/pixi/filters/BlurFilter.js"></script>
36+
<script src="../src/pixi/filters/BlurXFilter.js"></script>
37+
<script src="../src/pixi/filters/BlurYFilter.js"></script>
38+
<script src="../src/pixi/filters/ColorMatrixFilter.js"></script>
39+
<script src="../src/pixi/filters/CrossHatchFilter.js"></script>
40+
<script src="../src/pixi/filters/DisplacementFilter.js"></script>
41+
<script src="../src/pixi/filters/DotScreenFilter.js"></script>
2942
<script src="../src/pixi/filters/FilterBlock.js"></script>
30-
<script src="../src/pixi/filters/MaskFilter.js"></script>
43+
<script src="../src/pixi/filters/GreyFilter.js"></script>
44+
<script src="../src/pixi/filters/InvertFilter.js"></script>
45+
<script src="../src/pixi/filters/PixelateFilter.js"></script>
46+
<script src="../src/pixi/filters/RGBSplitFilter.js"></script>
47+
<script src="../src/pixi/filters/SepiaFilter.js"></script>
48+
<script src="../src/pixi/filters/SmartBlurFilter.js"></script>
49+
<script src="../src/pixi/filters/TwistFilter.js"></script>
50+
3151
<script src="../src/pixi/primitives/Graphics.js"></script>
52+
3253
<script src="../src/pixi/renderers/canvas/CanvasGraphics.js"></script>
3354
<script src="../src/pixi/renderers/canvas/CanvasRenderer.js"></script>
55+
56+
<script src="../src/pixi/renderers/webgl/PixiShader.js"></script>
57+
<script src="../src/pixi/renderers/webgl/PrimitiveShader.js"></script>
58+
<script src="../src/pixi/renderers/webgl/StripShader.js"></script>
3459
<script src="../src/pixi/renderers/webgl/WebGLBatch.js"></script>
60+
<script src="../src/pixi/renderers/webgl/WebGLFilterManager.js"></script>
3561
<script src="../src/pixi/renderers/webgl/WebGLGraphics.js"></script>
3662
<script src="../src/pixi/renderers/webgl/WebGLRenderer.js"></script>
3763
<script src="../src/pixi/renderers/webgl/WebGLRenderGroup.js"></script>
3864
<script src="../src/pixi/renderers/webgl/WebGLShaders.js"></script>
65+
3966
<script src="../src/pixi/text/BitmapText.js"></script>
4067
<script src="../src/pixi/text/Text.js"></script>
68+
4169
<script src="../src/pixi/textures/BaseTexture.js"></script>
4270
<script src="../src/pixi/textures/Texture.js"></script>
4371
<script src="../src/pixi/textures/RenderTexture.js"></script>
72+
4473
<script src="../src/pixi/utils/EventTarget.js"></script>
4574
<script src="../src/pixi/utils/Polyk.js"></script>
4675
<script src="../src/core/Camera.js"></script>

‎examples/assets/games/orbit/background.png‎

1.5 KB
Loading

‎examples/assets/games/orbit/ball.png‎

179 Bytes
Loading

‎examples/assets/games/orbit/bg.png‎

492 Bytes
Loading

‎examples/assets/games/orbit/bricks.png‎

664 Bytes
Loading

0 commit comments

Comments
 (0)