Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2025-02-02 07:13:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Moved the render style methods to World and use them as part of the event proxy

Browse source
This commit is contained in:
Richard Davey 2019-12-03 14:48:04 +00:00
parent ad4c982bee
commit 76c81e19c3
2 changed files with 193 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
src/physics/matter-js/MatterPhysics.js
View file

@ -704,47 +704,27 @@ var MatterPhysics = new Class({
* If you are using this on a Phaser Game Object, such as a Matter Sprite, then pass in the body property
* to this method, not the Game Object itself.
*
* If you wish to skip a value, pass `undefined` for it.
* If you wish to reset a value, so it uses those set in the World Debug Config, pass `null` or `false` as the value.
* If you wish to skip a parameter, so it retains its current value, pass `false` for it.
*
* If you wish to reset the Body render colors to the defaults found in the World Debug Config, then call
* this method with just the `body` argument provided, and no others.
*
* All other values are considered numeric color values.
*
* @method Phaser.Physics.Matter.MatterPhysics#setBodyRenderStyle
* @since 3.22.0
*
* @param {MatterJS.Body} body - The Matter Body to set the render style on.
* @param {number} [lineColor] - The stroke color. Set to `null` to use the default debug config values.
* @param {number} [fillColor] - The fill color. Set to `null` to use the default debug config values.
* @param {number} [opacity] - The opacity, between 0 and 1. Set to `null` to use the default debug config values.
* @param {number} [lineThickness] - The stroke line thickness. Set to `null` to use the default debug config values.
* @param {number} [lineColor] - The line color.
* @param {number} [fillColor] - The fill color.
* @param {number} [lineThickness] - The line thickness.
* @param {number} [opacity] - The opacity, between 0 and 1.
*
* @return {this} This Matter Physics instance for method chaining.
*/
setBodyRenderStyle: function (body, lineColor, fillColor, opacity, lineThickness)
setBodyRenderStyle: function (body, lineColor, fillColor, lineThickness, opacity)
{
var render = body.render;
if (render)
{
if (fillColor !== undefined)
{
render.fillColor = fillColor;
}
if (lineColor !== undefined)
{
render.strokeColor = lineColor;
}
if (opacity !== undefined)
{
render.opacity = opacity;
}
if (lineThickness !== undefined)
{
render.lineThickness = lineThickness;
}
}
this.world.setBodyRenderStyle(body, lineColor, fillColor, lineThickness, opacity);
return this;
},
@ -755,8 +735,11 @@ var MatterPhysics = new Class({
* If you are using this on a Phaser Game Object, then pass in the body property
* to this method, not the Game Object itself.
*
* If you wish to skip a value, pass `undefined` for it.
* If you wish to reset a value, so it uses those set in the World Debug Config, pass `null` or `false` as the value.
* If you wish to skip a parameter, so it retains its current value, pass `false` for it.
*
* If you wish to reset the Constraint render colors to the defaults found in the World Debug Config, then call
* this method with just the `constraint` argument provided, and no others.
*
* All other values are considered numeric color values.
*
* @method Phaser.Physics.Matter.MatterPhysics#setConstraintRenderStyle
@ -773,35 +756,7 @@ var MatterPhysics = new Class({
*/
setConstraintRenderStyle: function (constraint, lineColor, lineThickness, pinSize, anchorColor, anchorSize)
{
var render = constraint.render;
if (render)
{
if (lineColor !== undefined)
{
render.strokeColor = lineColor;
}
if (lineThickness !== undefined)
{
render.lineThickness = lineThickness;
}
if (pinSize !== undefined)
{
render.pinSize = pinSize;
}
if (anchorColor !== undefined)
{
render.anchorColor = anchorColor;
}
if (anchorSize !== undefined)
{
render.anchorSize = anchorSize;
}
}
this.world.setConstraintRenderStyle(constraint, lineColor, lineThickness, pinSize, anchorColor, anchorSize);
return this;
},

228
src/physics/matter-js/World.js
View file

@ -303,6 +303,180 @@ var World = new Class({
}
},
/**
* Sets the debug render style for the given Matter Body.
*
* If you are using this on a Phaser Game Object, such as a Matter Sprite, then pass in the body property
* to this method, not the Game Object itself.
*
* If you wish to skip a parameter, so it retains its current value, pass `false` for it.
*
* If you wish to reset the Body render colors to the defaults found in the World Debug Config, then call
* this method with just the `body` argument provided, and no others.
*
* All other values are considered numeric color values.
*
* @method Phaser.Physics.Matter.World#setBodyRenderStyle
* @since 3.22.0
*
* @param {MatterJS.Body} body - The Matter Body to set the render style on.
* @param {number} [lineColor] - The line color. If `null` it will use the World Debug Config value.
* @param {number} [fillColor] - The fill color. If `null` it will use the World Debug Config value.
* @param {number} [lineThickness] - The line thickness. If `null` it will use the World Debug Config value.
* @param {number} [opacity] - The opacity, between 0 and 1.
*
* @return {this} This Matter World instance for method chaining.
*/
setBodyRenderStyle: function (body, lineColor, fillColor, lineThickness, opacity)
{
var render = body.render;
var config = this.debugConfig;
if (!render)
{
return this;
}
if (lineColor === undefined || lineColor === null)
{
lineColor = (body.isStatic) ? config.staticStrokeColor : config.strokeColor;
}
if (fillColor === undefined || fillColor === null)
{
fillColor = (body.isStatic) ? config.staticFillColor : config.fillColor;
}
if (lineThickness === undefined || lineThickness === null)
{
lineThickness = config.lineThickness;
}
if (lineColor !== false)
{
render.strokeColor = lineColor;
}
if (fillColor !== false)
{
render.fillColor = fillColor;
}
if (lineThickness !== false)
{
render.lineThickness = lineThickness;
}
if (typeof(opacity) === 'number')
{
render.opacity = opacity;
}
return this;
},
/**
* Sets the debug render style for the given Matter Constraint.
*
* If you are using this on a Phaser Game Object, then pass in the body property
* to this method, not the Game Object itself.
*
* If you wish to skip a parameter, so it retains its current value, pass `false` for it.
*
* If you wish to reset the Constraint render colors to the defaults found in the World Debug Config, then call
* this method with just the `constraint` argument provided, and no others.
*
* All other values are considered numeric color values.
*
* @method Phaser.Physics.Matter.World#setConstraintRenderStyle
* @since 3.22.0
*
* @param {MatterJS.Constraint} constraint - The Matter Constraint to set the render style on.
* @param {number} [lineColor] - The line color. If `null` it will use the World Debug Config value.
* @param {number} [lineThickness] - The line thickness. If `null` it will use the World Debug Config value.
* @param {number} [pinSize] - If this constraint is a pin, this sets the size of the pin circle. If `null` it will use the World Debug Config value.
* @param {number} [anchorColor] - The color used when rendering this constraints anchors. If `null` it will use the World Debug Config value.
* @param {number} [anchorSize] - The size of the anchor circle, if this constraint has anchors. If `null` it will use the World Debug Config value.
*
* @return {this} This Matter World instance for method chaining.
*/
setConstraintRenderStyle: function (constraint, lineColor, lineThickness, pinSize, anchorColor, anchorSize)
{
var render = constraint.render;
var config = this.debugConfig;
if (!render)
{
return this;
}
// Reset them
if (lineColor === undefined || lineColor === null)
{
var type = render.type;
if (type === 'line')
{
lineColor = config.jointColor;
}
else if (type === 'pin')
{
lineColor = config.pinColor;
}
else if (type === 'spring')
{
lineColor = config.springColor;
}
}
if (lineThickness === undefined || lineThickness === null)
{
lineThickness = config.jointLineThickness;
}
if (pinSize === undefined || pinSize === null)
{
pinSize = config.pinSize;
}
if (anchorColor === undefined || anchorColor === null)
{
anchorColor = config.anchorColor;
}
if (anchorSize === undefined || anchorSize === null)
{
anchorSize = config.anchorSize;
}
if (lineColor !== false)
{
render.strokeColor = lineColor;
}
if (lineThickness !== false)
{
render.lineThickness = lineThickness;
}
if (pinSize !== false)
{
render.pinSize = pinSize;
}
if (anchorColor !== false)
{
render.anchorColor = anchorColor;
}
if (anchorSize !== false)
{
render.anchorSize = anchorSize;
}
return this;
},
/**
* This internal method acts as a proxy between all of the Matter JS events and then re-emits them
* via this class.
@ -313,7 +487,6 @@ var World = new Class({
setEventsProxy: function ()
{
var _this = this;
var debugConfig = this.debugConfig;
var engine = this.engine;
var world = this.localWorld;
@ -332,60 +505,11 @@ var World = new Class({
if (obj.type === 'body')
{
if (render.fillColor === null)
{
render.fillColor = (obj.isStatic) ? debugConfig.staticFillColor : debugConfig.fillColor;
}
if (render.strokeColor === null)
{
render.strokeColor = (obj.isStatic) ? debugConfig.staticStrokeColor : debugConfig.strokeColor;
}
if (render.lineThickness === null)
{
render.lineThickness = debugConfig.lineThickness;
}
_this.setBodyRenderStyle(obj, render.strokeColor, render.fillColor, render.lineThickness);
}
else if (obj.type === 'constraint')
{
var type = render.type;
if (render.strokeColor === null)
{
if (type === 'line')
{
render.strokeColor = debugConfig.jointColor;
}
else if (type === 'pin')
{
render.strokeColor = debugConfig.pinColor;
}
else if (type === 'spring')
{
render.strokeColor = debugConfig.springColor;
}
}
if (render.lineThickness === null)
{
render.lineThickness = debugConfig.jointLineThickness;
}
if (render.pinSize === null)
{
render.pinSize = debugConfig.pinSize;
}
if (render.anchorColor === null)
{
render.anchorColor = debugConfig.anchorColor;
}
if (render.anchorSize === null)
{
render.anchorSize = debugConfig.anchorSize;
}
_this.setConstraintRenderStyle(obj, render.strokeColor, render.lineThickness, render.pinSize, render.anchorColor, render.anchorSize);
}
}
});