Skip to content

Commit 155c863

Browse files
photonstormphotonstorm
committed
New Timer class and scale event updates.
1 parent 7d7aa79 commit 155c863

12 files changed

Lines changed: 370 additions & 177 deletions

File tree

‎Gruntfile.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ module.exports = function (grunt) {
109109
'src/tween/Tween.js',
110110
'src/tween/Easing.js',
111111
'src/time/Time.js',
112+
'src/time/Timer.js',
112113
'src/animation/AnimationManager.js',
113114
'src/animation/Animation.js',
114115
'src/animation/Frame.js',

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ Version 1.1.3 - in build
6060
* New: Added Group.sort. You can now sort the Group based on any given numeric property (x, y, health), finally you can do depth-sorting :) Example created to show.
6161
* New: Enhanced renderTexture so it can accept a Phaser.Group object and improved documentation and examples.
6262
* New: Device.littleEndian boolean added. Only safe to use if the browser supports TypedArrays (which IE9 doesn't, but nearly all others do)
63+
* New: You can now call game.sound.play() and simply pass it a key. The sound will play if the audio system is unlocked and optionally destroy itself on complete.
64+
* New: Mouse.capture is a boolean. If set to true then DOM mouse events will have event.preventDefault() applied, if false they will propogate fully.
6365

6466
* Fixed: Lots of fixes to the TypeScript definitions file (many thanks gltovar)
6567
* Fixed: Tilemap commands use specified layer when one given (thanks Izzimach)
@@ -79,7 +81,7 @@ Version 1.1.3 - in build
7981
* Updated: Tided up the Graphics object (thanks BorisKozo)
8082
* Updated: If running in Canvas mode and you have a render function it will save the context and reset the transform before running your render function.
8183
* Updated: Sprite will now check the exists property of the Group it is in, if the Group.exists = false the Sprite won't update.
82-
* Updated: Lots of documentation tweaks across various files such as Pointer and Color.
84+
* Updated: Lots of documentation tweaks across various files such as Pointer, Sound and Color.
8385
* Updated: If you specify 'null' as a Group parent it will now revert to using the World as the parent (before only 'undefined' worked)
8486
* Updated: Skip preupdate/update for PIXI hierarchies in which an ancestor doesn't exist (thanks cocoademon)
8587

‎build/config.php‎

Lines changed: 155 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -1,150 +1,159 @@
11
<?php
22
// All JS files in build order.
33
// Much easier for debugging re: line numbers
4-
?>
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/GrayFilter.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-
63-
<script src="../src/pixi/utils/EventTarget.js"></script>
64-
<script src="../src/pixi/utils/Polyk.js"></script>
65-
66-
<script src="../src/core/Camera.js"></script>
67-
<script src="../src/core/State.js"></script>
68-
<script src="../src/core/StateManager.js"></script>
69-
<script src="../src/core/LinkedList.js"></script>
70-
<script src="../src/core/Signal.js"></script>
71-
<script src="../src/core/SignalBinding.js"></script>
72-
<script src="../src/core/Filter.js"></script>
73-
<script src="../src/core/Plugin.js"></script>
74-
<script src="../src/core/PluginManager.js"></script>
75-
<script src="../src/core/Stage.js"></script>
76-
<script src="../src/core/Group.js"></script>
77-
<script src="../src/core/World.js"></script>
78-
<script src="../src/core/Game.js"></script>
79-
80-
<script src="../src/input/Input.js"></script>
81-
<script src="../src/input/Key.js"></script>
82-
<script src="../src/input/Keyboard.js"></script>
83-
<script src="../src/input/Mouse.js"></script>
84-
<script src="../src/input/MSPointer.js"></script>
85-
<script src="../src/input/Pointer.js"></script>
86-
<script src="../src/input/Touch.js"></script>
87-
<script src="../src/input/InputHandler.js"></script>
88-
89-
<script src="../src/gameobjects/Events.js"></script>
90-
<script src="../src/gameobjects/GameObjectFactory.js"></script>
91-
<script src="../src/gameobjects/BitmapData.js"></script>
92-
<script src="../src/gameobjects/Sprite.js"></script>
93-
<script src="../src/gameobjects/TileSprite.js"></script>
94-
<script src="../src/gameobjects/Text.js"></script>
95-
<script src="../src/gameobjects/BitmapText.js"></script>
96-
<script src="../src/gameobjects/Button.js"></script>
97-
<script src="../src/gameobjects/Graphics.js"></script>
98-
<script src="../src/gameobjects/RenderTexture.js"></script>
99-
100-
<script src="../src/system/Canvas.js"></script>
101-
<script src="../src/system/StageScaleMode.js"></script>
102-
<script src="../src/system/Device.js"></script>
103-
<script src="../src/system/RequestAnimationFrame.js"></script>
104-
105-
<script src="../src/math/RandomDataGenerator.js"></script>
106-
<script src="../src/math/Math.js"></script>
107-
<script src="../src/math/QuadTree.js"></script>
108-
109-
<script src="../src/geom/Circle.js"></script>
110-
<script src="../src/geom/Point.js"></script>
111-
<script src="../src/geom/Rectangle.js"></script>
112-
113-
<script src="../src/net/Net.js"></script>
114-
115-
<script src="../src/tween/TweenManager.js"></script>
116-
<script src="../src/tween/Tween.js"></script>
117-
<script src="../src/tween/Easing.js"></script>
118-
119-
<script src="../src/time/Time.js"></script>
120-
121-
<script src="../src/animation/AnimationManager.js"></script>
122-
<script src="../src/animation/Animation.js"></script>
123-
<script src="../src/animation/Frame.js"></script>
124-
<script src="../src/animation/FrameData.js"></script>
125-
<script src="../src/animation/AnimationParser.js"></script>
126-
127-
<script src="../src/loader/Cache.js"></script>
128-
<script src="../src/loader/Loader.js"></script>
129-
<script src="../src/loader/LoaderParser.js"></script>
130-
131-
<script src="../src/sound/Sound.js"></script>
132-
<script src="../src/sound/SoundManager.js"></script>
133-
134-
<script src="../src/utils/Debug.js"></script>
135-
<script src="../src/utils/Color.js"></script>
136-
137-
<script src="../src/physics/arcade/ArcadePhysics.js"></script>
138-
<script src="../src/physics/arcade/Body.js"></script>
139-
140-
<script src="../src/particles/Particles.js"></script>
141-
<script src="../src/particles/arcade/ArcadeParticles.js"></script>
142-
<script src="../src/particles/arcade/Emitter.js"></script>
143-
144-
<script src="../src/tilemap/Tile.js"></script>
145-
<script src="../src/tilemap/Tilemap.js"></script>
146-
<script src="../src/tilemap/TilemapLayer.js"></script>
147-
<script src="../src/tilemap/TilemapParser.js"></script>
148-
<script src="../src/tilemap/Tileset.js"></script>
4+
if (!isset($path))
5+
{
6+
$path = '..';
7+
}
8+
9+
echo <<<EOL
10+
11+
<script src="$path/src/Intro.js"></script>
12+
<script src="$path/src/pixi/Pixi.js"></script>
13+
<script src="$path/src/Phaser.js"></script>
14+
<script src="$path/src/utils/Utils.js"></script>
15+
16+
<script src="$path/src/pixi/core/Matrix.js"></script>
17+
<script src="$path/src/pixi/core/Point.js"></script>
18+
<script src="$path/src/pixi/core/Rectangle.js"></script>
19+
<script src="$path/src/pixi/core/Polygon.js"></script>
20+
21+
<script src="$path/src/pixi/display/DisplayObject.js"></script>
22+
<script src="$path/src/pixi/display/DisplayObjectContainer.js"></script>
23+
<script src="$path/src/pixi/display/Sprite.js"></script>
24+
<script src="$path/src/pixi/display/Stage.js"></script>
25+
26+
<script src="$path/src/pixi/extras/CustomRenderable.js"></script>
27+
<script src="$path/src/pixi/extras/Strip.js"></script>
28+
<script src="$path/src/pixi/extras/Rope.js"></script>
29+
<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/BlurFilter.js"></script>
33+
<script src="$path/src/pixi/filters/BlurXFilter.js"></script>
34+
<script src="$path/src/pixi/filters/BlurYFilter.js"></script>
35+
<script src="$path/src/pixi/filters/ColorMatrixFilter.js"></script>
36+
<script src="$path/src/pixi/filters/CrossHatchFilter.js"></script>
37+
<script src="$path/src/pixi/filters/DisplacementFilter.js"></script>
38+
<script src="$path/src/pixi/filters/DotScreenFilter.js"></script>
39+
<script src="$path/src/pixi/filters/FilterBlock.js"></script>
40+
<script src="$path/src/pixi/filters/GrayFilter.js"></script>
41+
<script src="$path/src/pixi/filters/InvertFilter.js"></script>
42+
<script src="$path/src/pixi/filters/PixelateFilter.js"></script>
43+
<script src="$path/src/pixi/filters/RGBSplitFilter.js"></script>
44+
<script src="$path/src/pixi/filters/SepiaFilter.js"></script>
45+
<script src="$path/src/pixi/filters/SmartBlurFilter.js"></script>
46+
<script src="$path/src/pixi/filters/TwistFilter.js"></script>
47+
48+
<script src="$path/src/pixi/primitives/Graphics.js"></script>
49+
50+
<script src="$path/src/pixi/renderers/canvas/CanvasGraphics.js"></script>
51+
<script src="$path/src/pixi/renderers/canvas/CanvasRenderer.js"></script>
52+
53+
<script src="$path/src/pixi/renderers/webgl/PixiShader.js"></script>
54+
<script src="$path/src/pixi/renderers/webgl/PrimitiveShader.js"></script>
55+
<script src="$path/src/pixi/renderers/webgl/StripShader.js"></script>
56+
<script src="$path/src/pixi/renderers/webgl/WebGLBatch.js"></script>
57+
<script src="$path/src/pixi/renderers/webgl/WebGLFilterManager.js"></script>
58+
<script src="$path/src/pixi/renderers/webgl/WebGLGraphics.js"></script>
59+
<script src="$path/src/pixi/renderers/webgl/WebGLRenderer.js"></script>
60+
<script src="$path/src/pixi/renderers/webgl/WebGLRenderGroup.js"></script>
61+
<script src="$path/src/pixi/renderers/webgl/WebGLShaders.js"></script>
62+
63+
<script src="$path/src/pixi/text/BitmapText.js"></script>
64+
<script src="$path/src/pixi/text/Text.js"></script>
65+
66+
<script src="$path/src/pixi/textures/BaseTexture.js"></script>
67+
<script src="$path/src/pixi/textures/Texture.js"></script>
68+
69+
<script src="$path/src/pixi/utils/EventTarget.js"></script>
70+
<script src="$path/src/pixi/utils/Polyk.js"></script>
71+
72+
<script src="$path/src/core/Camera.js"></script>
73+
<script src="$path/src/core/State.js"></script>
74+
<script src="$path/src/core/StateManager.js"></script>
75+
<script src="$path/src/core/LinkedList.js"></script>
76+
<script src="$path/src/core/Signal.js"></script>
77+
<script src="$path/src/core/SignalBinding.js"></script>
78+
<script src="$path/src/core/Filter.js"></script>
79+
<script src="$path/src/core/Plugin.js"></script>
80+
<script src="$path/src/core/PluginManager.js"></script>
81+
<script src="$path/src/core/Stage.js"></script>
82+
<script src="$path/src/core/Group.js"></script>
83+
<script src="$path/src/core/World.js"></script>
84+
<script src="$path/src/core/Game.js"></script>
85+
86+
<script src="$path/src/input/Input.js"></script>
87+
<script src="$path/src/input/Key.js"></script>
88+
<script src="$path/src/input/Keyboard.js"></script>
89+
<script src="$path/src/input/Mouse.js"></script>
90+
<script src="$path/src/input/MSPointer.js"></script>
91+
<script src="$path/src/input/Pointer.js"></script>
92+
<script src="$path/src/input/Touch.js"></script>
93+
<script src="$path/src/input/InputHandler.js"></script>
94+
95+
<script src="$path/src/gameobjects/Events.js"></script>
96+
<script src="$path/src/gameobjects/GameObjectFactory.js"></script>
97+
<script src="$path/src/gameobjects/BitmapData.js"></script>
98+
<script src="$path/src/gameobjects/Sprite.js"></script>
99+
<script src="$path/src/gameobjects/TileSprite.js"></script>
100+
<script src="$path/src/gameobjects/Text.js"></script>
101+
<script src="$path/src/gameobjects/BitmapText.js"></script>
102+
<script src="$path/src/gameobjects/Button.js"></script>
103+
<script src="$path/src/gameobjects/Graphics.js"></script>
104+
<script src="$path/src/gameobjects/RenderTexture.js"></script>
105+
106+
<script src="$path/src/system/Canvas.js"></script>
107+
<script src="$path/src/system/StageScaleMode.js"></script>
108+
<script src="$path/src/system/Device.js"></script>
109+
<script src="$path/src/system/RequestAnimationFrame.js"></script>
110+
111+
<script src="$path/src/math/RandomDataGenerator.js"></script>
112+
<script src="$path/src/math/Math.js"></script>
113+
<script src="$path/src/math/QuadTree.js"></script>
114+
115+
<script src="$path/src/geom/Circle.js"></script>
116+
<script src="$path/src/geom/Point.js"></script>
117+
<script src="$path/src/geom/Rectangle.js"></script>
118+
119+
<script src="$path/src/net/Net.js"></script>
120+
121+
<script src="$path/src/tween/TweenManager.js"></script>
122+
<script src="$path/src/tween/Tween.js"></script>
123+
<script src="$path/src/tween/Easing.js"></script>
124+
125+
<script src="$path/src/time/Time.js"></script>
126+
<script src="$path/src/time/Timer.js"></script>
127+
128+
<script src="$path/src/animation/AnimationManager.js"></script>
129+
<script src="$path/src/animation/Animation.js"></script>
130+
<script src="$path/src/animation/Frame.js"></script>
131+
<script src="$path/src/animation/FrameData.js"></script>
132+
<script src="$path/src/animation/AnimationParser.js"></script>
133+
134+
<script src="$path/src/loader/Cache.js"></script>
135+
<script src="$path/src/loader/Loader.js"></script>
136+
<script src="$path/src/loader/LoaderParser.js"></script>
137+
138+
<script src="$path/src/sound/Sound.js"></script>
139+
<script src="$path/src/sound/SoundManager.js"></script>
140+
141+
<script src="$path/src/utils/Debug.js"></script>
142+
<script src="$path/src/utils/Color.js"></script>
143+
144+
<script src="$path/src/physics/arcade/ArcadePhysics.js"></script>
145+
<script src="$path/src/physics/arcade/Body.js"></script>
146+
147+
<script src="$path/src/particles/Particles.js"></script>
148+
<script src="$path/src/particles/arcade/ArcadeParticles.js"></script>
149+
<script src="$path/src/particles/arcade/Emitter.js"></script>
150+
151+
<script src="$path/src/tilemap/Tile.js"></script>
152+
<script src="$path/src/tilemap/Tilemap.js"></script>
153+
<script src="$path/src/tilemap/TilemapLayer.js"></script>
154+
<script src="$path/src/tilemap/TilemapParser.js"></script>
155+
<script src="$path/src/tilemap/Tileset.js"></script>
149156
150-
<script src="../src/PixiPatch.js"></script>
157+
<script src="$path/src/PixiPatch.js"></script>
158+
EOL;
159+
?>

‎examples/_site/view_full.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@
118118
<script src="../src/tween/Tween.js"></script>
119119
<script src="../src/tween/Easing.js"></script>
120120
<script src="../src/time/Time.js"></script>
121+
<script src="../src/time/Timer.js"></script>
121122
<script src="../src/animation/AnimationManager.js"></script>
122123
<script src="../src/animation/Animation.js"></script>
123124
<script src="../src/animation/Frame.js"></script>

‎examples/_site/view_lite.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@
117117
<script src="../src/tween/Tween.js"></script>
118118
<script src="../src/tween/Easing.js"></script>
119119
<script src="../src/time/Time.js"></script>
120+
<script src="../src/time/Timer.js"></script>
120121
<script src="../src/animation/AnimationManager.js"></script>
121122
<script src="../src/animation/Animation.js"></script>
122123
<script src="../src/animation/Frame.js"></script>

‎src/PixiPatch.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ PIXI.CanvasRenderer.prototype.render = function(stage)
2626
// if(this.view.style.backgroundColor!=stage.backgroundColorString && !this.transparent)this.view.style.backgroundColor = stage.backgroundColorString;
2727

2828
this.context.setTransform(1, 0, 0, 1, 0, 0);
29-
this.context.clearRect(0, 0, this.width, this.height)
29+
// this.context.clearRect(0, 0, this.width, this.height)
3030
this.renderDisplayObject(stage);
3131

3232
// Remove frame updates

0 commit comments

Comments
 (0)