wassname/phaser
1
0
Fork 0
mirror of https://github.com/wassname/phaser.git synced 2026-08-14 12:40:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed input handler from Graphics as it's just meant to be used as a texture really, if you need input events you can apply Graphics to a Sprite.

Browse Source 
You can now create a Physics Body directly via game.physics.createBody(), and Body has been updated so it's no longer always bound to a Sprite.
Debug.renderPhysicsBody now works with Rectangles, Lines and multiple Convex shapes.
Starting to get the Tiled polyline parsing working nicely. Not too far off a complete tilemap collision.
This commit is contained in:
photonstorm
2014-02-17 17:54:10 +00:00
parent 78bf874888
commit cad14848e8
10 changed files with 332 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/physics/Body.js
+49 -16
View File
@@ -5,7 +5,7 @@
*/
/**
* The Physics Body is linked to a single Sprite and defines properties that determine how the physics body is simulated.
* The Physics Body is typically linked to a single Sprite and defines properties that determine how the physics body is simulated.
* These properties affect how the body reacts to forces, what forces it generates on itself (to simulate friction), and how it reacts to collisions in the scene.
* In most cases, the properties are used to simulate physical effects. Each body also has its own property values that determine exactly how it reacts to forces and collisions in the scene.
* By default a single Rectangle shape is added to the Body that matches the dimensions of the parent Sprite. See addShape, removeShape, clearShapes to add extra shapes around the Body.
@@ -13,20 +13,29 @@
* @class Phaser.Physics.Body
* @classdesc Physics Body Constructor
* @constructor
* @param {Phaser.Sprite} sprite - The Sprite object this physics body belongs to.
* @param {Phaser.Game} game - Game reference to the currently running game.
* @param {Phaser.Sprite} [sprite] - The Sprite object this physics body belongs to.
* @param {number} [x=0] - The x coordinate of this Body.
* @param {number} [y=0] - The y coordinate of this Body.
* @param {number} [mass=1] - The default mass of this Body (0 = static).
*/
Phaser.Physics.Body = function (sprite) {
Phaser.Physics.Body = function (game, sprite, x, y, mass) {
sprite = sprite || null;
x = x || 0;
y = y || 0;
if (typeof mass === 'undefined') { mass = 1; }
/**
* @property {Phaser.Game} game - Local reference to game.
*/
this.game = game;
/**
* @property {Phaser.Sprite} sprite - Reference to the parent Sprite.
*/
this.sprite = sprite;
/**
* @property {Phaser.Game} game - Local reference to game.
*/
this.game = sprite.game;
/**
* @property {Phaser.Point} offset - The offset of the Physics Body from the Sprite x/y position.
*/
@@ -36,7 +45,7 @@ Phaser.Physics.Body = function (sprite) {
* @property {p2.Body} data - The p2 Body data.
* @protected
*/
this.data = new p2.Body({ position:[this.px2p(sprite.position.x), this.px2p(sprite.position.y)], mass: 1 });
this.data = new p2.Body({ position:[this.px2p(x), this.px2p(y)], mass: mass });
this.data.parent = this;
/**
@@ -53,9 +62,11 @@ Phaser.Physics.Body = function (sprite) {
// this.onRemoved = new Phaser.Signal();
// Set-up the default shape
this.setRectangleFromSprite(sprite);
this.game.physics.addBody(this.data);
if (sprite)
{
this.setRectangleFromSprite(sprite);
this.game.physics.addBody(this.data);
}
};
@@ -220,7 +231,8 @@ Phaser.Physics.Body.prototype = {
*/
moveLeft: function (speed) {
this.data.velocity[0] = this.px2p(-speed);
// this.data.velocity[0] = this.px2p(-speed);
this.data.force[0] += this.px2p(-speed);
},
@@ -233,7 +245,8 @@ Phaser.Physics.Body.prototype = {
*/
moveRight: function (speed) {
this.data.velocity[0] = this.px2p(speed);
// this.data.velocity[0] = this.px2p(speed);
this.data.force[0] += this.px2p(speed);
},
@@ -246,7 +259,8 @@ Phaser.Physics.Body.prototype = {
*/
moveUp: function (speed) {
this.data.velocity[1] = this.px2p(-speed);
// this.data.velocity[1] = this.px2p(-speed);
this.data.force[1] += this.px2p(-speed);
},
@@ -259,7 +273,8 @@ Phaser.Physics.Body.prototype = {
*/
moveDown: function (speed) {
this.data.velocity[1] = this.px2p(speed);
// this.data.velocity[1] = this.px2p(speed);
this.data.force[1] += this.px2p(speed);
},
@@ -744,10 +759,16 @@ Object.defineProperty(Phaser.Physics.Body.prototype, "static", {
if (value && this.data.motionState !== Phaser.STATIC)
{
this.data.motionState = Phaser.STATIC;
this.mass = 0;
}
else if (!value && this.data.motionState === Phaser.STATIC)
{
this.data.motionState = Phaser.DYNAMIC;
if (this.mass === 0)
{
this.mass = 1;
}
}
}
@@ -771,10 +792,16 @@ Object.defineProperty(Phaser.Physics.Body.prototype, "dynamic", {
if (value && this.data.motionState !== Phaser.DYNAMIC)
{
this.data.motionState = Phaser.DYNAMIC;
if (this.mass === 0)
{
this.mass = 1;
}
}
else if (!value && this.data.motionState === Phaser.DYNAMIC)
{
this.data.motionState = Phaser.STATIC;
this.mass = 0;
}
}
@@ -802,6 +829,7 @@ Object.defineProperty(Phaser.Physics.Body.prototype, "kinematic", {
else if (!value && this.data.motionState === Phaser.KINEMATIC)
{
this.data.motionState = Phaser.STATIC;
this.mass = 0;
}
}
@@ -999,6 +1027,11 @@ Object.defineProperty(Phaser.Physics.Body.prototype, "mass", {
{
this.data.mass = value;
this.data.updateMassProperties();
if (value === 0)
{
// this.static = true;
}
}
}
src/physics/World.js
+34
View File
@@ -232,3 +232,37 @@ Phaser.Physics.World.prototype.destroy = function () {
this.game = null;
};
/**
* @method Phaser.Physics.World.prototype.createBody
* @param {number} x - The x coordinate of Body.
* @param {number} y - The y coordinate of Body.
* @param {number} mass - The mass of the Body. A mass of 0 means a 'static' Body is created.
* @param {boolean} [addToWorld=false] - Automatically add this Body to the world? (usually false as it won't have any shapes on construction).
* @param {object} options - An object containing the build options:
* @param {boolean} [options.optimalDecomp=false] - Set to true if you need optimal decomposition. Warning: very slow for polygons with more than 10 vertices.
* @param {boolean} [options.skipSimpleCheck=false] - Set to true if you already know that the path is not intersecting itself.
* @param {boolean|number} [options.removeCollinearPoints=false] - Set to a number (angle threshold value) to remove collinear points, or false to keep all points.
* @param {(number[]|...number)} points - An array of 2d vectors that form the convex or concave polygon.
* Either [[0,0], [0,1],...] or a flat array of numbers that will be interpreted as [x,y, x,y, ...],
* or the arguments passed can be flat x,y values e.g. `setPolygon(options, x,y, x,y, x,y, ...)` where `x` and `y` are numbers.
*/
Phaser.Physics.World.prototype.createBody = function (x, y, mass, addToWorld, options, data) {
if (typeof addToWorld === 'undefined') { addToWorld = false; }
var body = new Phaser.Physics.Body(this.game, null, x, y, mass);
if (data)
{
body.addPolygon(options, data);
}
if (addToWorld)
{
this.addBody(body.data);
}
return body;
};