From 84741f065fb58edfbc38dc0a741242293915f180 Mon Sep 17 00:00:00 2001
From: photonstorm <rdavey@gmail.com>
Date: Wed, 12 Mar 2014 16:33:53 +0000
Subject: [PATCH] New P2 examples. And fixed Camera.atLimit value.

---
 examples/assets/sprites/diamonds32x24x5.png | Bin 0 -> 3327 bytes
 examples/p2 physics/impact events.js        |  82 ++++++++++++++++++
 examples/p2 physics/thrust.js               |  65 +++++++++++++++
 examples/p2 physics/world move.js           |  88 ++++++++++++++++++++
 src/core/Camera.js                          |   8 +-
 src/core/Group.js                           |   9 +-
 src/gameobjects/TileSprite.js               |   2 +-
 src/physics/p2/World.js                     |   6 +-
 8 files changed, 249 insertions(+), 11 deletions(-)
 create mode 100644 examples/assets/sprites/diamonds32x24x5.png
 create mode 100644 examples/p2 physics/impact events.js
 create mode 100644 examples/p2 physics/thrust.js
 create mode 100644 examples/p2 physics/world move.js

diff --git a/examples/assets/sprites/diamonds32x24x5.png b/examples/assets/sprites/diamonds32x24x5.png
new file mode 100644
index 0000000000000000000000000000000000000000..94c2d21dde8186fa9088a1f3345e012a58588665
GIT binary patch
literal 3327
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

literal 0
HcmV?d00001

diff --git a/examples/p2 physics/impact events.js b/examples/p2 physics/impact events.js
new file mode 100644
index 000000000..1cc95b1ce
--- /dev/null
+++ b/examples/p2 physics/impact events.js	
@@ -0,0 +1,82 @@
+
+var game = new Phaser.Game(800, 600, Phaser.AUTO, 'phaser-example', { preload: preload, create: create, update: update, render: render });
+
+function preload() {
+
+    game.load.image('stars', 'assets/misc/starfield.jpg');
+    game.load.image('ship', 'assets/sprites/thrust_ship2.png');
+    game.load.image('ball', 'assets/sprites/shinyball.png');
+	game.load.spritesheet('diamonds', 'assets/sprites/diamonds32x24x5.png', 32, 24);
+
+}
+
+var ship;
+var starfield;
+var diamonds;
+var cursors;
+
+function create() {
+
+    game.world.setBounds(0, 0, 1920, 1200);
+
+    game.physics.startSystem(Phaser.Physics.P2JS);
+    game.physics.p2.defaultRestitution = 0.8;
+
+    // starfield = game.add.tileSprite(0, 0, 800, 600, 'stars');
+    // starfield.fixedToCamera = true;
+
+    diamonds = game.add.group();
+    // diamonds.enableBody = true;
+    // diamonds.physicsBodyType = Phaser.Physics.P2JS;
+
+    for (var i = 0; i < 50; i++)
+    {
+        // var d = diamonds.create(game.world.randomX, game.world.randomY, 'diamonds', game.rnd.integerInRange(0, 5));
+        // game.physics.p2.enable(d, true);
+
+        var d = diamonds.create(game.world.randomX, game.world.randomY, 'ball');
+        game.physics.p2.enable(d);
+        d.body.setCircle(16);
+    }
+
+	ship = game.add.sprite(200, 200, 'ship');
+
+	game.physics.p2.enable(ship, true);
+
+	game.camera.follow(ship);
+
+    cursors = game.input.keyboard.createCursorKeys();
+
+}
+
+function update() {
+
+    if (cursors.left.isDown)
+    {
+		ship.body.rotateLeft(100);
+    }
+    else if (cursors.right.isDown)
+    {
+		ship.body.rotateRight(100);
+    }
+    else
+    {
+		ship.body.setZeroRotation();
+    }
+
+    if (cursors.up.isDown)
+    {
+    	ship.body.thrust(400);
+    }
+    else if (cursors.down.isDown)
+    {
+        ship.body.reverse(400);
+    }
+
+    // starfield.tilePosition.add(ship.body.velocity.x / 4, ship.body.velocity.y / 4);
+
+}
+
+function render() {
+
+}
\ No newline at end of file
diff --git a/examples/p2 physics/thrust.js b/examples/p2 physics/thrust.js
new file mode 100644
index 000000000..d2c9b9605
--- /dev/null
+++ b/examples/p2 physics/thrust.js	
@@ -0,0 +1,65 @@
+
+var game = new Phaser.Game(800, 600, Phaser.AUTO, 'phaser-example', { preload: preload, create: create, update: update, render: render });
+
+function preload() {
+
+    game.load.image('stars', 'assets/misc/starfield.jpg');
+	game.load.image('ship', 'assets/sprites/thrust_ship2.png');
+
+}
+
+var ship;
+var starfield;
+var cursors;
+
+function create() {
+
+    game.world.setBounds(0, 0, 1920, 1200);
+
+    game.physics.startSystem(Phaser.Physics.P2JS);
+    game.physics.p2.defaultRestitution = 0.8;
+
+    starfield = game.add.tileSprite(0, 0, 800, 600, 'stars');
+    starfield.fixedToCamera = true;
+
+	ship = game.add.sprite(200, 200, 'ship');
+
+	game.physics.p2.enable(ship);
+
+	game.camera.follow(ship);
+
+    cursors = game.input.keyboard.createCursorKeys();
+
+}
+
+function update() {
+
+    if (cursors.left.isDown)
+    {
+		ship.body.rotateLeft(100);
+    }
+    else if (cursors.right.isDown)
+    {
+		ship.body.rotateRight(100);
+    }
+    else
+    {
+		ship.body.setZeroRotation();
+    }
+
+    if (cursors.up.isDown)
+    {
+    	ship.body.thrust(400);
+    }
+    else if (cursors.down.isDown)
+    {
+        ship.body.reverse(400);
+    }
+
+    starfield.tilePosition.add(ship.body.velocity.x, ship.body.velocity.y);
+
+}
+
+function render() {
+
+}
\ No newline at end of file
diff --git a/examples/p2 physics/world move.js b/examples/p2 physics/world move.js
new file mode 100644
index 000000000..6f458d45e
--- /dev/null
+++ b/examples/p2 physics/world move.js	
@@ -0,0 +1,88 @@
+
+var game = new Phaser.Game(800, 600, Phaser.AUTO, 'phaser-example', { preload: preload, create: create, update: update, render: render });
+
+function preload() {
+
+    game.load.image('stars', 'assets/misc/starfield.jpg');
+    game.load.spritesheet('ship', 'assets/sprites/humstar.png', 32, 32);
+    game.load.image('ball', 'assets/sprites/shinyball.png');
+
+}
+
+var ship;
+var starfield;
+var cursors;
+
+function create() {
+
+    game.world.setBounds(0, 0, 1600, 1200);
+
+    game.physics.startSystem(Phaser.Physics.P2JS);
+    game.physics.p2.defaultRestitution = 0.9;
+
+    starfield = game.add.tileSprite(0, 0, 800, 600, 'stars');
+    starfield.fixedToCamera = true;
+
+    balls = game.add.group();
+    balls.enableBody = true;
+    balls.physicsBodyType = Phaser.Physics.P2JS;
+
+    for (var i = 0; i < 50; i++)
+    {
+        var ball = balls.create(game.world.randomX, game.world.randomY, 'ball');
+        ball.body.setCircle(16);
+    }
+
+	ship = game.add.sprite(200, 200, 'ship');
+    ship.scale.set(2);
+    ship.smoothed = false;
+    ship.animations.add('fly', [0,1,2,3,4,5], 10, true);
+    ship.play('fly');
+
+    //  Create our physics body - a 28px radius circle. Set the 'false' parameter below to 'true' to enable debugging
+	game.physics.p2.enable(ship, false);
+    ship.body.setCircle(28);
+
+	game.camera.follow(ship);
+
+    cursors = game.input.keyboard.createCursorKeys();
+
+}
+
+function update() {
+
+    ship.body.setZeroVelocity();
+
+    if (cursors.left.isDown)
+    {
+		ship.body.moveLeft(200);
+    }
+    else if (cursors.right.isDown)
+    {
+		ship.body.moveRight(200);
+    }
+
+    if (cursors.up.isDown)
+    {
+    	ship.body.moveUp(200);
+    }
+    else if (cursors.down.isDown)
+    {
+        ship.body.moveDown(200);
+    }
+
+    if (!game.camera.atLimit.x)
+    {
+        starfield.tilePosition.x += (ship.body.velocity.x * 16) * game.time.physicsElapsed;
+    }
+
+    if (!game.camera.atLimit.y)
+    {
+        starfield.tilePosition.y += (ship.body.velocity.y * 16) * game.time.physicsElapsed;
+    }
+
+}
+
+function render() {
+
+}
\ No newline at end of file
diff --git a/src/core/Camera.js b/src/core/Camera.js
index f6eebd599..69727a0ae 100644
--- a/src/core/Camera.js
+++ b/src/core/Camera.js
@@ -275,25 +275,25 @@ Phaser.Camera.prototype = {
         this.atLimit.y = false;
 
         //  Make sure we didn't go outside the cameras bounds
-        if (this.view.x < this.bounds.x)
+        if (this.view.x <= this.bounds.x)
         {
             this.atLimit.x = true;
             this.view.x = this.bounds.x;
         }
 
-        if (this.view.right > this.bounds.right)
+        if (this.view.right >= this.bounds.right)
         {
             this.atLimit.x = true;
             this.view.x = this.bounds.right - this.width;
         }
 
-        if (this.view.y < this.bounds.top)
+        if (this.view.y <= this.bounds.top)
         {
             this.atLimit.y = true;
             this.view.y = this.bounds.top;
         }
 
-        if (this.view.bottom > this.bounds.bottom)
+        if (this.view.bottom >= this.bounds.bottom)
         {
             this.atLimit.y = true;
             this.view.y = this.bounds.bottom - this.height;
diff --git a/src/core/Group.js b/src/core/Group.js
index 85c6a5804..df217d96a 100644
--- a/src/core/Group.js
+++ b/src/core/Group.js
@@ -289,15 +289,18 @@ Phaser.Group.prototype.create = function (x, y, key, frame, exists) {
     {
         if (this.physicsBodyType === Phaser.Physics.ARCADE)
         {
-            child.body = new Phaser.Physics.Arcade.Body(child);
+            this.game.physics.arcade.enable(child);
+            // child.body = new Phaser.Physics.Arcade.Body(child);
         }
         else if (this.physicsBodyType === Phaser.Physics.NINJA && this.game.physics.ninja)
         {
-            child.body = new Phaser.Physics.Ninja.Body(this.game.physics.ninja, child, 1);
+            this.game.physics.ninja.enable(child);
+            // child.body = new Phaser.Physics.Ninja.Body(this.game.physics.ninja, child, 1);
         }
         else if (this.physicsBodyType === Phaser.Physics.P2JS && this.game.physics.p2)
         {
-            child.body = new Phaser.Physics.P2.Body(this.game, child, x, y, 1);
+            this.game.physics.p2.enable(child);
+            // child.body = new Phaser.Physics.P2.Body(this.game, child, x, y, 1);
         }
     }
 
diff --git a/src/gameobjects/TileSprite.js b/src/gameobjects/TileSprite.js
index aac98731a..b7de22443 100644
--- a/src/gameobjects/TileSprite.js
+++ b/src/gameobjects/TileSprite.js
@@ -6,7 +6,7 @@
 
 /**
 * A TileSprite is a Sprite that has a repeating texture. The texture can be scrolled and scaled and will automatically wrap on the edges as it does so.
-* Please note that TileSprites have no input handler or physics bodies.
+* Please note that TileSprites, as with normal Sprites, have no input handler or physics bodies by default. Both need enabling.
 *
 * @class Phaser.TileSprite
 * @constructor
diff --git a/src/physics/p2/World.js b/src/physics/p2/World.js
index d7d4ae061..14b4f138f 100644
--- a/src/physics/p2/World.js
+++ b/src/physics/p2/World.js
@@ -130,9 +130,9 @@ Phaser.Physics.P2 = function (game, config) {
     }
 
     //  Hook into the World events
-    this.world.on("postStep", this.postStepHandler, this);
-    this.world.on("postBroadphase", this.postBroadphaseHandler, this);
-    this.world.on("impact", this.impactHandler, this);
+    // this.world.on("postStep", this.postStepHandler, this);
+    // this.world.on("postBroadphase", this.postBroadphaseHandler, this);
+    // this.world.on("impact", this.impactHandler, this);
     this.world.on("beginContact", this.beginContactHandler, this);
     this.world.on("endContact", this.endContactHandler, this);