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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Pavle Goloskokovic 2018-01-15 11:29:55 +01:00
commit 3664e84e19
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gameobjects/tilemap/dynamiclayer/DynamicTilemapLayer.js
View file

@ -89,6 +89,7 @@ var DynamicTilemapLayer = new Class({
*/ */
this.culledTiles = []; this.culledTiles = [];
this.setAlpha(this.layer.alpha);
this.setTexture(tileset.image.key); this.setTexture(tileset.image.key);
this.setPosition(x, y); this.setPosition(x, y);
this.setSizeToFrame(); this.setSizeToFrame();

1
src/gameobjects/tilemap/staticlayer/StaticTilemapLayer.js
View file

@ -98,6 +98,7 @@ var StaticTilemapLayer = new Class({
this.dirty = true; this.dirty = true;
this.vertexCount = 0; this.vertexCount = 0;
this.setAlpha(this.layer.alpha);
this.setTexture(tileset.image.key); this.setTexture(tileset.image.key);
this.setPosition(x, y); this.setPosition(x, y);
this.setSizeToFrame(); this.setSizeToFrame();

7
src/input/local/inc/ProcessDragEvents.js
View file

@ -208,11 +208,12 @@ var ProcessDragEvents = function (pointer, time)
this.emit('dragenter', pointer, gameObject, input.target); this.emit('dragenter', pointer, gameObject, input.target);
} }
var dragEvent = new InputEvent.DRAG(pointer, gameObject); var dragX = pointer.x - gameObject.input.dragX;
var dragY = pointer.y - gameObject.input.dragY;
gameObject.emit('drag', pointer, dragEvent.dragX, dragEvent.dragY); gameObject.emit('drag', pointer, dragX, dragY);
this.emit('drag', dragEvent); this.emit('drag', pointer, gameObject, dragX, dragY);
} }
} }