Merge pull request phaserjs#557 from alvinsight/1.2

Examples ready to be released !

examples/_site/examples.json

@@ -708,10 +708,22 @@
       "file": "load+polygon+2.js",
       "title": "load polygon 2"
     },
+    {
+      "file": "lock+constraint.js",
+      "title": "lock constraint"
+    },
     {
       "file": "postbroadphase+callback.js",
       "title": "postbroadphase callback"
     },
+    {
+      "file": "prismatic+constraint.js",
+      "title": "prismatic constraint"
+    },
+    {
+      "file": "revolute+constraint.js",
+      "title": "revolute constraint"
+    },
     {
       "file": "springs.js",
       "title": "springs"

examples/animation/change texture on click.js

@@ -34,6 +34,6 @@ function changeMummy() {
 
 function render() {
 
-    game.debug.spriteBounds(bot);
+    game.debug.body(bot);
 
 }

examples/arcade physics/sprite vs group.js

@@ -16,20 +16,20 @@ function create() {
 
     game.stage.backgroundColor = '#2d2d2d';
 
-    game.physics.enable(game.world, Phaser.Physics.ARCADE);
-
     //  This example will check Sprite vs. Group collision
 
     sprite = game.add.sprite(32, 200, 'phaser');
     sprite.name = 'phaser-dude';
+
+    game.physics.enable(sprite, Phaser.Physics.ARCADE);
 
     group = game.add.group();
     group.enableBody = true;
     group.physicsBodyType = Phaser.Physics.ARCADE;
 
     for (var i = 0; i < 50; i++)
     {
-        var c = group.create(game.rnd.integerInRange(100, 770), game.rnd.integerInRange(0, 570), 'veggies', game.rnd.integerInRange(0, 36));
+        var c = group.create(game.rnd.integerInRange(100, 770), game.rnd.integerInRange(0, 570), 'veggies', game.rnd.integerInRange(0, 35));
         c.name = 'veg' + i;
         c.body.immovable = true;
     }

examples/basics/03 - move an image.js

@@ -19,8 +19,8 @@ function create() {
     //  and assign it to a variable
     var image = game.add.sprite(0, 0, 'einstein');
 
-    image.physicsEnabled = true;
+    game.physics.enable(image, Phaser.Physics.ARCADE);
 
-    image.body.moveRight(150);
+    image.body.velocity.x=150;
 
 }

examples/camera/basic follow.js

@@ -24,14 +24,16 @@ function create() {
         game.add.sprite(game.world.randomX, game.world.randomY, 'ufo');
     }
 
+    game.physics.startSystem(Phaser.Physics.P2JS);
+
     fixed = game.add.sprite(300, 320, 'player');
     fixed.fixedToCamera = true;
     fixed.cameraOffset.x = 300;
     fixed.cameraOffset.y = 300;
 
     player = game.add.sprite(150, 320, 'player');
 
-    player.physicsEnabled = true;
+    game.physics.p2.enable(player);
 
     cursors = game.input.keyboard.createCursorKeys();
 

examples/debug/debug physics.js

@@ -20,15 +20,18 @@ function create() {
     sprite = game.add.sprite(0, 0, 'sprite');
     sprite.alpha = 0.5 ;
     sprite.x = game.width / 2 ;
-    sprite.physicsEnabled = true;
 
     // create sprite B
     otherSprite = game.add.sprite(0, 0, 'otherSprite');
     otherSprite.alpha = 0.5 ;
     otherSprite.x = (game.width / 2) + 150 ;
     otherSprite.y = (game.height / 2) + 150 ;
-    otherSprite.physicsEnabled = true;
-    otherSprite.body.immovable = true ;
+
+
+
+    game.physics.enable([sprite,otherSprite], Phaser.Physics.ARCADE);
+
+
 }
 
 function update()

examples/geometry/circle.js

@@ -12,7 +12,7 @@ function create() {
 
 function render () {
 
-    game.debug.circle(circle,'#cfffff');
+    game.debug.geom(circle,'#cfffff');
     game.debug.text('Diameter : '+circle.diameter,50,200);
     game.debug.text('Circumference : '+circle.circumference(),50,230);
 

examples/input/follow mouse.js

@@ -12,6 +12,7 @@ var sprite;
 function create() {
 
     sprite = game.add.sprite(game.world.centerX, game.world.centerY, 'ball');
+    game.physics.enable(sprite, Phaser.Physics.ARCADE);
 
 }
 
@@ -21,7 +22,7 @@ function update() {
     if (game.input.mousePointer.isDown)
     {
         //  400 is the speed it will move towards the mouse
-        game.physics.moveToPointer(sprite, 400);
+        game.physics.arcade.moveToPointer(sprite, 400);
 
         //  if it's overlapping the mouse, don't move any more
         if (Phaser.Rectangle.contains(sprite.body, game.input.x, game.input.y))

examples/input/keyboard hotkeys.js

@@ -17,6 +17,8 @@ function create() {
 
     game.stage.backgroundColor = '#736357';
 
+    game.add.text(0,0,'Press one, two or three !',{});
+
     //  Here we create 3 hotkeys, keys 1-3 and bind them all to their own functions
 
     key1 = game.input.keyboard.addKey(Phaser.Keyboard.ONE);

examples/input/keyboard justpressed.js

@@ -18,13 +18,14 @@ function create() {
     game.stage.backgroundColor = '#2d2d2d';
 
     bullets = game.add.group();
+    bullets.enableBody = true;
+    bullets.physicsBodyType = Phaser.Physics.ARCADE;
     bullets.createMultiple(10, 'bullet');
-    bullets.setAll('physicsEnabled',true);
     bullets.callAll('events.onOutOfBounds.add', 'events.onOutOfBounds', resetBullet, this);
 
     sprite = game.add.sprite(400, 550, 'phaser');
 
-    sprite.physicsEnabled = true;
+    game.physics.enable(sprite, Phaser.Physics.ARCADE);
 
     //  Stop the following keys from propagating up to the browser
     game.input.keyboard.addKeyCapture([ Phaser.Keyboard.LEFT, Phaser.Keyboard.RIGHT, Phaser.Keyboard.SPACEBAR ]);

examples/sprites/collide world bounds.js

@@ -11,6 +11,8 @@ var pineapples;
 function create() {
 
     pineapples = game.add.group();
+    pineapples.enableBody = true;
+    pineapples.physicsBodyType = Phaser.Physics.ARCADE;
 
     for (var i = 0; i < 10; i++)
     {

examples/sprites/out of bounds.js

@@ -14,13 +14,14 @@ var aliens;
 function create() {
 
     //  We only want world bounds on the left and right
-    game.physics.setBoundsToWorld(true, true, false, false);
-    game.physics.friction = 0;
+    game.physics.setBoundsToWorld();
 
     player = game.add.sprite(400, 500, 'ship');
     player.anchor.setTo(0.5, 0.5);
 
     aliens = game.add.group();
+    aliens.enableBody = true;
+    aliens.physicsBodyType = Phaser.Physics.ARCADE;
 
     for (var y = 0; y < 4; y++)
     {
@@ -30,7 +31,6 @@ function create() {
             alien.name = 'alien' + x.toString() + y.toString();
             alien.checkWorldBounds = true;
             alien.events.onOutOfBounds.add(alienOut, this);
-            alien.physicsEnabled = true;
             alien.body.velocity.y = 50 + Math.random() * 200;
         }
     }

examples/tile sprites/colliding with tiling sprite.js

@@ -14,22 +14,35 @@ function preload() {
 
 function create() {
 
+    game.physics.arcade.gravity.y = 20;
+
     ball = game.add.sprite(400, 0, 'ball');
-    ball.physicsEnabled = true;
+
+
+
+
+    game.physics.enable(ball, Phaser.Physics.ARCADE);
 
     tilesprite = game.add.tileSprite(300, 450, 200, 100, 'starfield');
 
-    tilesprite.physicsEnabled = true;
-    // tilesprite.body.immovable = true;
 
-    // tilesprite.body.setRectangle(200, 100, 0, 0);
+
+    game.physics.enable(tilesprite, Phaser.Physics.ARCADE);
+
+
+    ball.body.collideWorldBounds = true;
+
+    tilesprite.body.collideWorldBounds = true;
+
 
     cursors = game.input.keyboard.createCursorKeys();
 
 }
 
 function update() {
 
+    game.physics.arcade.collide(ball,tilesprite);
+
     if (cursors.left.isDown)
     {
         tilesprite.x -= 8;

examples/time/basic repeat event.js

@@ -33,7 +33,7 @@ function createBall() {
 
     var ball = game.add.sprite(game.world.randomX, 0, 'ball');
 
-    ball.physicsEnabled = true;
+    game.physics.enable(ball, Phaser.Physics.ARCADE);
 
 }