Added Group IDs and references to Sprites, Group sorting, z-index values and child swapping. Also added all of the drag and bounds methods to Input.

This commit is contained in:
Richard Davey
2013-06-02 03:47:54 +01:00
parent 59f7a59312
commit 49fe5ee65f
22 changed files with 1891 additions and 237 deletions
+27 -6
View File
@@ -19,6 +19,11 @@ module Phaser.Components {
this.game = parent.game;
this._sprite = parent;
this.onAddedToGroup = new Phaser.Signal;
this.onRemovedFromGroup = new Phaser.Signal;
this.onKilled = new Phaser.Signal;
this.onRevived = new Phaser.Signal;
this.onInputOver = new Phaser.Signal;
this.onInputOut = new Phaser.Signal;
this.onInputDown = new Phaser.Signal;
@@ -36,15 +41,26 @@ module Phaser.Components {
*/
private _sprite: Sprite;
// Creation and destruction
public onAdded: Phaser.Signal;
/**
* Dispatched by the Group this Sprite is added to.
*/
public onAddedToGroup: Phaser.Signal;
/**
* Dispatched by the Group this Sprite is removed from.
*/
public onRemovedFromGroup: Phaser.Signal;
/**
* Dispatched when this Sprite is killed.
*/
public onKilled: Phaser.Signal;
/**
* Dispatched when this Sprite is revived.
*/
public onRevived: Phaser.Signal;
public onOutOfBounds: Phaser.Signal;
// Input related events
/**
* Dispatched by the Input component when a pointer moves over an Input enabled sprite.
*/
@@ -65,6 +81,11 @@ module Phaser.Components {
*/
public onInputUp: Phaser.Signal;
public onOutOfBounds: Phaser.Signal;
}
}
+249 -2
View File
@@ -39,12 +39,48 @@ module Phaser.Components {
*/
private _sprite: Sprite;
private dragOffsetX: number;
private dragOffsetY: number;
private dragFromPoint: bool;
private dragPixelPerfect:bool = false;
private dragPixelPerfectAlpha:number;
private allowHorizontalDrag: bool = true;
private allowVerticalDrag: bool = true;
private snapOnDrag: bool = false;
private snapOnRelease: bool = false;
private snapX: number;
private snapY: number;
/**
* If enabled the Input component will be updated by the parent Sprite
* @type {Boolean}
*/
public enabled: bool;
/**
* Is this sprite being dragged by the mouse or not?
* @default false
*/
public isDragged: bool = false;
/**
* Is this sprite allowed to be dragged by the mouse? true = yes, false = no
* @default false
*/
public draggable: bool = false;
/**
* An FlxRect region of the game world within which the sprite is restricted during mouse drag
* @default null
*/
public boundsRect: Rectangle = null;
/**
* An FlxSprite the bounds of which this sprite is restricted during mouse drag
* @default null
*/
public boundsSprite: Sprite = null;
/**
* The Input component can monitor either the physics body of the Sprite or the frameBounds
* If checkBody is set to true it will monitor the bounds of the physics body.
@@ -129,6 +165,11 @@ module Phaser.Components {
return;
}
if (this.draggable && this.isDragged)
{
this.updateDrag();
}
if (this.game.input.x != this.oldX || this.game.input.y != this.oldY)
{
this.oldX = this.game.input.x;
@@ -172,14 +213,54 @@ module Phaser.Components {
}
// click handler to add to stack for sorting
}
/**
* Updates the Mouse Drag on this Sprite.
*/
private updateDrag():void
{
if (this.isUp)
{
this.stopDrag();
return;
}
if (this.allowHorizontalDrag)
{
this._sprite.x = this.game.input.x - this.dragOffsetX;
}
if (this.allowVerticalDrag)
{
this._sprite.y = this.game.input.y - this.dragOffsetY;
}
if (this.boundsRect)
{
this.checkBoundsRect();
}
if (this.boundsSprite)
{
this.checkBoundsSprite();
}
if (this.snapOnDrag)
{
this._sprite.x = Math.floor(this._sprite.x / this.snapX) * this.snapX;
this._sprite.y = Math.floor(this._sprite.y / this.snapY) * this.snapY;
}
}
/**
* Returns true if the pointer has entered the Sprite within the specified delay time (defaults to 500ms, half a second)
* @param delay The time below which the pointer is considered as just over.
* @returns {boolean}
*/
public justOver(delay?:number = 500): bool {
public justOver(delay?: number = 500): bool {
return (this.isOver && this.duration < delay);
}
@@ -188,7 +269,7 @@ module Phaser.Components {
* @param delay The time below which the pointer is considered as just out.
* @returns {boolean}
*/
public justOut(delay?:number = 500): bool {
public justOut(delay?: number = 500): bool {
return (this.isOut && (this.game.time.now - this.timeOut < delay));
}
@@ -207,6 +288,172 @@ module Phaser.Components {
}
/**
* Make this Sprite draggable by the mouse. You can also optionally set mouseStartDragCallback and mouseStopDragCallback
*
* @param lockCenter If false the Sprite will drag from where you click it. If true it will center itself to the tip of the mouse pointer.
* @param pixelPerfect If true it will use a pixel perfect test to see if you clicked the Sprite. False uses the bounding box.
* @param alphaThreshold If using pixel perfect collision this specifies the alpha level from 0 to 255 above which a collision is processed (default 255)
* @param boundsRect If you want to restrict the drag of this sprite to a specific FlxRect, pass the FlxRect here, otherwise it's free to drag anywhere
* @param boundsSprite If you want to restrict the drag of this sprite to within the bounding box of another sprite, pass it here
*/
public enableDrag(lockCenter:bool = false, pixelPerfect:bool = false, alphaThreshold:number = 255, boundsRect:Rectangle = null, boundsSprite:Sprite = null):void
{
this.draggable = true;
this.dragFromPoint = lockCenter;
this.dragPixelPerfect = pixelPerfect;
this.dragPixelPerfectAlpha = alphaThreshold;
if (boundsRect)
{
this.boundsRect = boundsRect;
}
if (boundsSprite)
{
this.boundsSprite = boundsSprite;
}
}
/**
* Stops this sprite from being able to be dragged. If it is currently the target of an active drag it will be stopped immediately. Also disables any set callbacks.
*/
public disableDrag():void
{
if (this.isDragged)
{
//FlxMouseControl.dragTarget = null;
//FlxMouseControl.isDragging = false;
}
this.isDragged = false;
this.draggable = false;
//mouseStartDragCallback = null;
//mouseStopDragCallback = null;
}
/**
* Restricts this sprite to drag movement only on the given axis. Note: If both are set to false the sprite will never move!
*
* @param allowHorizontal To enable the sprite to be dragged horizontally set to true, otherwise false
* @param allowVertical To enable the sprite to be dragged vertically set to true, otherwise false
*/
public setDragLock(allowHorizontal:bool = true, allowVertical:bool = true):void
{
this.allowHorizontalDrag = allowHorizontal;
this.allowVerticalDrag = allowVertical;
}
/**
* Make this Sprite snap to the given grid either during drag or when it's released.
* For example 16x16 as the snapX and snapY would make the sprite snap to every 16 pixels.
*
* @param snapX The width of the grid cell in pixels
* @param snapY The height of the grid cell in pixels
* @param onDrag If true the sprite will snap to the grid while being dragged
* @param onRelease If true the sprite will snap to the grid when released
*/
public enableSnap(snapX:number , snapY:number, onDrag:bool = true, onRelease:bool = false):void
{
this.snapOnDrag = onDrag;
this.snapOnRelease = onRelease;
this.snapX = snapX;
this.snapY = snapY;
}
/**
* Stops the sprite from snapping to a grid during drag or release.
*/
public disableSnap():void
{
this.snapOnDrag = false;
this.snapOnRelease = false;
}
/**
* Called by FlxMouseControl when Mouse Drag starts on this Sprite. Should not usually be called directly.
*/
public startDrag():void
{
this.isDragged = true;
if (this.dragFromPoint == false)
{
this.dragOffsetX = this.game.input.x - this._sprite.x;
this.dragOffsetY = this.game.input.y - this._sprite.y;
}
else
{
// Move the sprite to the middle of the mouse
this.dragOffsetX = this._sprite.frameBounds.halfWidth;
this.dragOffsetY = this._sprite.frameBounds.halfHeight;
}
}
/**
* Bounds Rect check for the sprite drag
*/
private checkBoundsRect():void
{
if (this._sprite.x < this.boundsRect.left)
{
this._sprite.x = this.boundsRect.x;
}
else if ((this._sprite.x + this._sprite.width) > this.boundsRect.right)
{
this._sprite.x = this.boundsRect.right - this._sprite.width;
}
if (this._sprite.y < this.boundsRect.top)
{
this._sprite.y = this.boundsRect.top;
}
else if ((this._sprite.y + this._sprite.height) > this.boundsRect.bottom)
{
this._sprite.y = this.boundsRect.bottom - this._sprite.height;
}
}
/**
* Parent Sprite Bounds check for the sprite drag
*/
private checkBoundsSprite():void
{
if (this._sprite.x < this.boundsSprite.x)
{
this._sprite.x = this.boundsSprite.x;
}
else if ((this._sprite.x + this._sprite.width) > (this.boundsSprite.x + this.boundsSprite.width))
{
this._sprite.x = (this.boundsSprite.x + this.boundsSprite.width) - this._sprite.width;
}
if (this._sprite.y < this.boundsSprite.y)
{
this._sprite.y = this.boundsSprite.y;
}
else if ((this._sprite.y + this._sprite.height) > (this.boundsSprite.y + this.boundsSprite.height))
{
this._sprite.y = (this.boundsSprite.y + this.boundsSprite.height) - this._sprite.height;
}
}
/**
* Called by FlxMouseControl when Mouse Drag is stopped on this Sprite. Should not usually be called directly.
*/
public stopDrag():void
{
this.isDragged = false;
if (this.snapOnRelease)
{
this._sprite.x = Math.floor(this._sprite.x / this.snapX) * this.snapX;
this._sprite.y = Math.floor(this._sprite.y / this.snapY) * this.snapY;
}
}
/**
* Render debug infos. (including name, bounds info, position and some other properties)
* @param x {number} X position of the debug info to be rendered.