Skip to content

Commit 4cfce8b

Browse files
photonstormphotonstorm
committed
Group now extends PIXI.DisplayObjectContainer, rather than owning a _container property, which makes life a whole lot easier re: nesting.
1 parent 9737710 commit 4cfce8b

89 files changed

Lines changed: 970 additions & 1315 deletions

Some content is hidden

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

‎README.md‎

Lines changed: 2 additions & 0 deletions

‎build/config.php‎

Lines changed: 58 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,47 +13,76 @@
1313
<script src="$path/src/Phaser.js"></script>
1414
<script src="$path/src/utils/Utils.js"></script>
1515
16-
<script src="$path/src/pixi/core/Matrix.js"></script>
16+
<script src="$path/src/pixi/Pixi.js"></script>
1717
<script src="$path/src/pixi/core/Point.js"></script>
1818
<script src="$path/src/pixi/core/Rectangle.js"></script>
1919
<script src="$path/src/pixi/core/Polygon.js"></script>
20-
20+
<script src="$path/src/pixi/core/Circle.js"></script>
21+
<script src="$path/src/pixi/core/Ellipse.js"></script>
22+
<script src="$path/src/pixi/core/Matrix.js"></script>
2123
<script src="$path/src/pixi/display/DisplayObject.js"></script>
2224
<script src="$path/src/pixi/display/DisplayObjectContainer.js"></script>
2325
<script src="$path/src/pixi/display/Sprite.js"></script>
26+
<script src="$path/src/pixi/display/SpriteBatch.js"></script>
27+
<script src="$path/src/pixi/display/MovieClip.js"></script>
28+
<script src="$path/src/pixi/filters/FilterBlock.js"></script>
29+
<script src="$path/src/pixi/text/Text.js"></script>
30+
<script src="$path/src/pixi/text/BitmapText.js"></script>
31+
<script src="$path/src/pixi/InteractionData.js"></script>
32+
<script src="$path/src/pixi/InteractionManager.js"></script>
2433
<script src="$path/src/pixi/display/Stage.js"></script>
25-
26-
<script src="$path/src/pixi/extras/CustomRenderable.js"></script>
34+
<script src="$path/src/pixi/utils/Utils.js"></script>
35+
<script src="$path/src/pixi/utils/EventTarget.js"></script>
36+
<script src="$path/src/pixi/utils/Detector.js"></script>
37+
<script src="$path/src/pixi/utils/Polyk.js"></script>
38+
<script src="$path/src/pixi/renderers/webgl/utils/WebGLShaderUtils.js"></script>
39+
<script src="$path/src/pixi/renderers/webgl/shaders/PixiShader.js"></script>
40+
<script src="$path/src/pixi/renderers/webgl/shaders/PixiFastShader.js"></script>
41+
<script src="$path/src/pixi/renderers/webgl/shaders/StripShader.js"></script>
42+
<script src="$path/src/pixi/renderers/webgl/shaders/PrimitiveShader.js"></script>
43+
<script src="$path/src/pixi/renderers/webgl/utils/WebGLGraphics.js"></script>
44+
<script src="$path/src/pixi/renderers/webgl/WebGLRenderer.js"></script>
45+
<script src="$path/src/pixi/renderers/webgl/utils/WebGLMaskManager.js"></script>
46+
<script src="$path/src/pixi/renderers/webgl/utils/WebGLShaderManager.js"></script>
47+
<script src="$path/src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js"></script>
48+
<script src="$path/src/pixi/renderers/webgl/utils/WebGLFastSpriteBatch.js"></script>
49+
<script src="$path/src/pixi/renderers/webgl/utils/WebGLFilterManager.js"></script>
50+
<script src="$path/src/pixi/renderers/webgl/utils/FilterTexture.js"></script>
51+
<script src="$path/src/pixi/renderers/canvas/utils/CanvasMaskManager.js"></script>
52+
<script src="$path/src/pixi/renderers/canvas/utils/CanvasTinter.js"></script>
53+
<script src="$path/src/pixi/renderers/canvas/CanvasRenderer.js"></script>
54+
<script src="$path/src/pixi/renderers/canvas/CanvasGraphics.js"></script>
55+
<script src="$path/src/pixi/primitives/Graphics.js"></script>
2756
<script src="$path/src/pixi/extras/Strip.js"></script>
2857
<script src="$path/src/pixi/extras/Rope.js"></script>
2958
<script src="$path/src/pixi/extras/TilingSprite.js"></script>
30-
31-
<script src="$path/src/pixi/filters/AbstractFilter.js"></script>
32-
<script src="$path/src/pixi/filters/FilterBlock.js"></script>
33-
34-
<script src="$path/src/pixi/primitives/Graphics.js"></script>
35-
36-
<script src="$path/src/pixi/renderers/canvas/CanvasGraphics.js"></script>
37-
<script src="$path/src/pixi/renderers/canvas/CanvasRenderer.js"></script>
38-
39-
<script src="$path/src/pixi/renderers/webgl/PixiShader.js"></script>
40-
<script src="$path/src/pixi/renderers/webgl/PrimitiveShader.js"></script>
41-
<script src="$path/src/pixi/renderers/webgl/StripShader.js"></script>
42-
<script src="$path/src/pixi/renderers/webgl/WebGLBatch.js"></script>
43-
<script src="$path/src/pixi/renderers/webgl/WebGLFilterManager.js"></script>
44-
<script src="$path/src/pixi/renderers/webgl/WebGLGraphics.js"></script>
45-
<script src="$path/src/pixi/renderers/webgl/WebGLRenderer.js"></script>
46-
<script src="$path/src/pixi/renderers/webgl/WebGLRenderGroup.js"></script>
47-
<script src="$path/src/pixi/renderers/webgl/WebGLShaders.js"></script>
48-
49-
<script src="$path/src/pixi/text/BitmapText.js"></script>
50-
<script src="$path/src/pixi/text/Text.js"></script>
51-
59+
<script src="$path/src/pixi/extras/Spine.js"></script>
5260
<script src="$path/src/pixi/textures/BaseTexture.js"></script>
5361
<script src="$path/src/pixi/textures/Texture.js"></script>
54-
55-
<script src="$path/src/pixi/utils/EventTarget.js"></script>
56-
<script src="$path/src/pixi/utils/Polyk.js"></script>
62+
<script src="$path/src/pixi/textures/RenderTexture.js"></script>
63+
<script src="$path/src/pixi/loaders/AssetLoader.js"></script>
64+
<script src="$path/src/pixi/loaders/JsonLoader.js"></script>
65+
<script src="$path/src/pixi/loaders/AtlasLoader.js"></script>
66+
<script src="$path/src/pixi/loaders/SpriteSheetLoader.js"></script>
67+
<script src="$path/src/pixi/loaders/ImageLoader.js"></script>
68+
<script src="$path/src/pixi/loaders/BitmapFontLoader.js"></script>
69+
<script src="$path/src/pixi/loaders/SpineLoader.js"></script>
70+
<script src="$path/src/pixi/filters/AbstractFilter.js"></script>
71+
<script src="$path/src/pixi/filters/AlphaMaskFilter.js"></script>
72+
<script src="$path/src/pixi/filters/ColorMatrixFilter.js"></script>
73+
<script src="$path/src/pixi/filters/GrayFilter.js"></script>
74+
<script src="$path/src/pixi/filters/DisplacementFilter.js"></script>
75+
<script src="$path/src/pixi/filters/PixelateFilter.js"></script>
76+
<script src="$path/src/pixi/filters/BlurXFilter.js"></script>
77+
<script src="$path/src/pixi/filters/BlurYFilter.js"></script>
78+
<script src="$path/src/pixi/filters/BlurFilter.js"></script>
79+
<script src="$path/src/pixi/filters/InvertFilter.js"></script>
80+
<script src="$path/src/pixi/filters/SepiaFilter.js"></script>
81+
<script src="$path/src/pixi/filters/TwistFilter.js"></script>
82+
<script src="$path/src/pixi/filters/ColorStepFilter.js"></script>
83+
<script src="$path/src/pixi/filters/DotScreenFilter.js"></script>
84+
<script src="$path/src/pixi/filters/CrossHatchFilter.js"></script>
85+
<script src="$path/src/pixi/filters/RGBSplitFilter.js"></script>
5786
5887
<script src="$path/src/core/Camera.js"></script>
5988
<script src="$path/src/core/State.js"></script>
@@ -145,7 +174,5 @@
145174
<script src="$path/src/tilemap/TilemapLayer.js"></script>
146175
<script src="$path/src/tilemap/TilemapParser.js"></script>
147176
<script src="$path/src/tilemap/Tileset.js"></script>
148-
149-
<script src="$path/src/PixiPatch.js"></script>
150177
EOL;
151178
?>

‎examples/wip/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function getFile() {
3232

3333
function dirToArray($dir) {
3434

35-
$ignore = array('.', '..', '_site', 'assets', 'states', 'book', 'filters');
35+
$ignore = array('.', '..', '_site', 'assets', 'states', 'book', 'filters', 'misc');
3636
$result = array();
3737
$root = scandir($dir);
3838
$dirs = array_diff($root, $ignore);

examples/wip/2ball.js renamed to examples/wip/misc/2ball.js

File renamed without changes.

examples/wip/64x64.png renamed to examples/wip/misc/64x64.png

File renamed without changes.

examples/wip/SAT.js renamed to examples/wip/misc/SAT.js

File renamed without changes.

examples/wip/acceleration.js renamed to examples/wip/misc/acceleration.js

File renamed without changes.

examples/wip/audio loop.js renamed to examples/wip/misc/audio loop.js

File renamed without changes.

examples/wip/blocked.js renamed to examples/wip/misc/blocked.js

File renamed without changes.

examples/wip/bmd.js renamed to examples/wip/misc/bmd.js

File renamed without changes.

0 commit comments

Comments
 (0)