Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-27 23:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

The P2 World constructor wouldn't let you use your own config unless you specified both the gravity *and* broadphase. Now allows one or both (thanks @englercj #1412)

Browse source
This commit is contained in:
photonstorm 2014-12-11 22:04:45 +00:00
parent 93e0d2f3b1
commit 3c564a33b6
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -76,6 +76,8 @@ Version 2.2.2 - "Alkindar" - in development
### Updates ### Updates
* TypeScript definitions fixes and updates (thanks @clark-stevenson) * TypeScript definitions fixes and updates (thanks @clark-stevenson)
* DOM.visualBounds now includes scroll bars (#1429)
* The new fixed time-step code has been more carefully linked to Pixi transform updates. This should finally put a stop to the tunneling issues that were being reported.
### Bug Fixes ### Bug Fixes
@ -94,6 +96,7 @@ Android browser does not support Full Screen.
* TilemapParser now checks for image collections, avoiding crashes. These would arise with maps exported from the new release of Tiled (thanks @paul-reilly #1440) * TilemapParser now checks for image collections, avoiding crashes. These would arise with maps exported from the new release of Tiled (thanks @paul-reilly #1440)
* Group.replace could still access `newChild.parent` after it was set to `undefined`. This unifies the approach (thanks @pnstickney #1410 #1417) * Group.replace could still access `newChild.parent` after it was set to `undefined`. This unifies the approach (thanks @pnstickney #1410 #1417)
* P2.postBroadphaserHandler updated to avoid skipping final 2 pairs. * P2.postBroadphaserHandler updated to avoid skipping final 2 pairs.
* The P2 World constructor wouldn't let you use your own config unless you specified both the gravity *and* broadphase. Now allows one or both (thanks @englercj #1412)
For details about changes made in previous versions of Phaser see the full Change Log at https://github.com/photonstorm/phaser/blob/master/CHANGELOG.md For details about changes made in previous versions of Phaser see the full Change Log at https://github.com/photonstorm/phaser/blob/master/CHANGELOG.md

14
src/physics/p2/World.js
View file

@ -24,10 +24,22 @@ Phaser.Physics.P2 = function (game, config) {
*/ */
this.game = game; this.game = game;
if (typeof config === 'undefined' || !config.hasOwnProperty('gravity') || !config.hasOwnProperty('broadphase')) if (typeof config === 'undefined')
{ {
config = { gravity: [0, 0], broadphase: new p2.SAPBroadphase() }; config = { gravity: [0, 0], broadphase: new p2.SAPBroadphase() };
} }
else
{
if (!config.hasOwnProperty('gravity')
{
config.gravity: [0, 0];
}
if (!config.hasOwnProperty('broadphase')
{
config.broadphase: new p2.SAPBroadphase();
}
}
/** /**
* @property {object} config - The p2 World configuration object. * @property {object} config - The p2 World configuration object.