Added Phasers new Physics Manager and restored the pre-1.1.4 ArcadePhysics system. The new manager can handle multiple physics systems running in parallel, which could be extremely useful for lots of games.

Author: photonstorm

README.md

@@ -214,6 +214,7 @@ Bug Fixes:
 * You can now load in CSV Tilemaps again and they get created properly (fixes #391)
 * Tilemap.putTile can now insert a tile into a null/blank area of the map (before it could only replace existing tiles)
 * Tilemap.putTile now correctly re-calculates the collision data based on the new collideIndexes array (fixes #371)
+* Circle.circumferencePoint using the asDegrees parameter would apply degToRad instead of radToDeg (thanks Ziriax, fixes #509)
 
 
 TO DO:

build/config.php

@@ -135,14 +135,20 @@
     <script src="$path/src/utils/Debug.js"></script>
     <script src="$path/src/utils/Color.js"></script>
 
-    <script src="$path/src/physics/World.js"></script>
-    <script src="$path/src/physics/PointProxy.js"></script>
-    <script src="$path/src/physics/InversePointProxy.js"></script>
-    <script src="$path/src/physics/Body.js"></script>
-    <script src="$path/src/physics/Spring.js"></script>
-    <script src="$path/src/physics/Material.js"></script>
-    <script src="$path/src/physics/ContactMaterial.js"></script>
-    <script src="$path/src/physics/CollisionGroup.js"></script>
+    <script src="$path/src/physics/Physics.js"></script>
+
+    <script src="$path/src/physics/arcade/World.js"></script>
+    <script src="$path/src/physics/arcade/Body.js"></script>
+    <script src="$path/src/physics/arcade/QuadTree.js"></script>
+
+    <script src="$path/src/physics/p2/World.js"></script>
+    <script src="$path/src/physics/p2/PointProxy.js"></script>
+    <script src="$path/src/physics/p2/InversePointProxy.js"></script>
+    <script src="$path/src/physics/p2/Body.js"></script>
+    <script src="$path/src/physics/p2/Spring.js"></script>
+    <script src="$path/src/physics/p2/Material.js"></script>
+    <script src="$path/src/physics/p2/ContactMaterial.js"></script>
+    <script src="$path/src/physics/p2/CollisionGroup.js"></script>
 
     <script src="$path/src/particles/Particles.js"></script>
     <script src="$path/src/particles/arcade/ArcadeParticles.js"></script>
@@ -154,4 +160,12 @@
     <script src="$path/src/tilemap/TilemapParser.js"></script>
     <script src="$path/src/tilemap/Tileset.js"></script>
 EOL;
+
+/*
+
+
+
+
+*/
+
 ?>

build/phaser.d.ts

@@ -1450,7 +1450,7 @@ declare module Phaser {
         static intersectsRectangle(c: Phaser.Circle, r: Phaser.Rectangle): boolean;
         //methods
         circumference(): number;
-        circumferencePoint(angle: number, asDegrees: number, output?: Phaser.Point): Phaser.Point;
+        circumferencePoint(angle: number, asDegrees: boolean, output?: Phaser.Point): Phaser.Point;
         clone(out: Phaser.Circle): Phaser.Circle;
         contains(x: number, y: number): boolean;
         copyFrom(source: any): Circle;

examples/wip/physics-1.js

@@ -0,0 +1,54 @@
+
+var game = new Phaser.Game(800, 600, Phaser.CANVAS, 'phaser-example', { preload: preload, create: create, update: update, render: render });
+
+function preload() {
+
+    game.load.image('atari', 'assets/sprites/atari130xe.png');
+    game.load.image('mushroom', 'assets/sprites/mushroom2.png');
+
+}
+
+var sprite1;
+var sprite2;
+
+function create() {
+
+    game.stage.backgroundColor = '#2d2d2d';
+
+    //  This will check Sprite vs. Sprite collision
+
+    sprite1 = game.add.sprite(50, 200, 'atari');
+    sprite1.name = 'atari';
+
+    sprite2 = game.add.sprite(700, 220, 'mushroom');
+    sprite2.name = 'mushroom';
+
+    //  Enable the physics bodies of both sprites
+    game.physics.enable([sprite1, sprite2]);
+
+    //  And move 'em
+    sprite1.body.velocity.x = 100;
+    sprite2.body.velocity.x = -100;
+
+}
+
+function update() {
+
+    // object1, object2, collideCallback, processCallback, callbackContext
+    game.physics.arcade.collide(sprite1, sprite2, collisionHandler, null, this);
+
+}
+
+function collisionHandler (obj1, obj2) {
+
+    //  The two sprites are colliding
+    game.stage.backgroundColor = '#992d2d';
+
+}
+
+function render() {
+
+    // game.debug.physicsBody(sprite1.body);
+    // game.debug.physicsBody(sprite2.body);
+
+}

src/animation/Animation.js

@@ -139,8 +139,6 @@ Phaser.Animation = function (game, parent, name, frameData, frames, delay, loop)
     //  Set-up some event listeners
     this.game.onPause.add(this.onPause, this);
     this.game.onResume.add(this.onResume, this);
-
-    console.log('animation created', this);
 
 };
 

src/core/Game.js

@@ -172,7 +172,7 @@ Phaser.Game = function (width, height, renderer, parent, state, transparent, ant
     this.world = null;
 
     /**
-    * @property {Phaser.Physics.World} physics - Reference to the physics world.
+    * @property {Phaser.Physics} physics - Reference to the physics manager.
     */
     this.physics = null;
 
@@ -414,7 +414,7 @@ Phaser.Game.prototype = {
             this.tweens = new Phaser.TweenManager(this);
             this.input = new Phaser.Input(this);
             this.sound = new Phaser.SoundManager(this);
-            this.physics = new Phaser.Physics.World(this, this.physicsConfig);
+            this.physics = new Phaser.Physics(this, this.physicsConfig);
             this.particles = new Phaser.Particles(this);
             this.plugins = new Phaser.PluginManager(this, this);
             this.net = new Phaser.Net(this);