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

BitmapData.alphaMask can now also take a Phaser.Sprite, Phaser.Image or BitmapData object as a source type.

Browse source 
BitmapData.alphaMask has 4 new optional parameters: x, y, x2 and y2 to control exactly where the source and mask images are drawn.
This commit is contained in:
photonstorm 2014-05-24 03:15:13 +01:00
parent be66a694a8
commit 6e9c9c10b8
2 changed files with 28 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -48,7 +48,9 @@ Version 2.0.6 - "Jornhill" - -in development-
### Updates
* BitmapData.draw can now take a BitmapData object as a source type.
* BitmapData.draw can now also take a Phaser.Sprite, Phaser.Image or BitmapData object as a source type. As a result BitmapData.drawSprite is now depcreated.
* BitmapData.alphaMask can now also take a Phaser.Sprite, Phaser.Image or BitmapData object as a source type.
* BitmapData.alphaMask has 4 new optional parameters: x, y, x2 and y2 to control exactly where the source and mask images are drawn.
### New Features

53
src/gameobjects/BitmapData.js
View file

@ -776,10 +776,11 @@ Phaser.BitmapData.prototype = {
},
/**
* Draws the given image to this BitmapData at the coordinates specified. If you need to only draw a part of the image use BitmapData.copyPixels instead.
* Draws the given image or Game Object to this BitmapData at the coordinates specified.
* If you need to only draw a part of the image use BitmapData.copyPixels instead.
*
* @method Phaser.BitmapData#draw
* @param {Phaser.BitmapData|HTMLImage|string} source - The Image to draw. If you give a string it will try and find the Image in the Game.Cache.
* @param {Phaser.Sprite|Phaser.Image|Phaser.BitmapData|HTMLImage|string} source - The Image to draw. If you give a string it will try and find the Image in the Game.Cache.
* @param {number} [x=0] - The x coordinate to draw the image to.
* @param {number} [y=0] - The y coordinate to draw the image to.
*/
@ -797,6 +798,11 @@ Phaser.BitmapData.prototype = {
{
this.context.drawImage(source.canvas, 0, 0, source.width, source.height, x, y, source.width, source.height);
}
else if (source instanceof Phaser.Image || source instanceof Phaser.Sprite)
{
var frame = sprite.texture.frame;
this.context.drawImage(sprite.texture.baseTexture.source, frame.x, frame.y, frame.width, frame.height, x, y, frame.width, frame.height);
}
else
{
this.context.drawImage(source, 0, 0, source.width, source.height, x, y, source.width, source.height);
@ -807,6 +813,8 @@ Phaser.BitmapData.prototype = {
},
/**
* DEPRECATED: Use BitmapData.draw instead.
*
* Draws the given image to this BitmapData at the coordinates specified.
* If you need to only draw a part of the image use BitmapData.copyPixels instead.
*
@ -820,11 +828,7 @@ Phaser.BitmapData.prototype = {
if (typeof x === 'undefined') { x = 0; }
if (typeof y === 'undefined') { y = 0; }
var frame = sprite.texture.frame;
this.context.drawImage(sprite.texture.baseTexture.source, frame.x, frame.y, frame.width, frame.height, x, y, frame.width, frame.height);
this.dirty = true;
this.draw(sprite, x, y);
},
@ -832,34 +836,27 @@ Phaser.BitmapData.prototype = {
* Draws the given image onto this BitmapData using an image as an alpha mask.
*
* @method Phaser.BitmapData#alphaMask
* @param {HTMLImage|string} source - The Image to draw. If you give a key it will try and find the Image in the Game.Cache.
* @param {HTMLImage|string} mask - The Image to use as the alpha mask. If you give a key it will try and find the Image in the Game.Cache.
* @param {Phaser.Sprite|Phaser.Image|Phaser.BitmapData|HTMLImage|string} source - The Image to draw. If you give a key it will try and find the Image in the Game.Cache.
* @param {Phaser.Sprite|Phaser.Image|Phaser.BitmapData|HTMLImage|string} mask - The Image to use as the alpha mask. If you give a key it will try and find the Image in the Game.Cache.
* @param {number} [x=0] - The x coordinate to draw the source image to.
* @param {number} [y=0] - The y coordinate to draw the source image to.
* @param {number} [x2=0] - The x coordinate to draw the mask image to.
* @param {number} [y2=0] - The y coordinate to draw the mask image to.
*/
alphaMask: function (source, mask) {
alphaMask: function (source, mask, x, y, x2, y2) {
if (typeof x === 'undefined') { x = 0; }
if (typeof y === 'undefined') { y = 0; }
if (typeof x2 === 'undefined') { x2 = 0; }
if (typeof y2 === 'undefined') { y2 = 0; }
var temp = this.context.globalCompositeOperation;
if (typeof mask === 'string')
{
mask = this.game.cache.getImage(mask);
}
if (mask)
{
this.context.drawImage(mask, 0, 0);
}
this.draw(mask, x, y);
this.context.globalCompositeOperation = 'source-atop';
if (typeof source === 'string')
{
source = this.game.cache.getImage(source);
}
if (source)
{
this.context.drawImage(source, 0, 0);
}
this.draw(source, x2, y2);
this.context.globalCompositeOperation = temp;