mirror of
https://github.com/wassname/phaser.git
synced 2026-09-12 12:40:47 +08:00
Upgraded to Pixi.js 1.4.4
This commit is contained in:
photonstorm
+190
-230
@@ -104,7 +104,7 @@ PIXI.DisplayObject = function()
|
||||
this.stage = null;
|
||||
|
||||
/**
|
||||
* [read-only] The multiplied alpha of the displayobject
|
||||
* [read-only] The multiplied alpha of the displayObject
|
||||
*
|
||||
* @property worldAlpha
|
||||
* @type Number
|
||||
@@ -122,6 +122,13 @@ PIXI.DisplayObject = function()
|
||||
*/
|
||||
this._interactive = false;
|
||||
|
||||
/**
|
||||
* This is the cursor that will be used when the mouse is over this object. To enable this the element must have interaction = true and buttonMode = true
|
||||
*
|
||||
* @property defaultCursor
|
||||
* @type String
|
||||
*
|
||||
*/
|
||||
this.defaultCursor = 'pointer';
|
||||
|
||||
/**
|
||||
@@ -132,20 +139,10 @@ PIXI.DisplayObject = function()
|
||||
* @readOnly
|
||||
* @private
|
||||
*/
|
||||
this.worldTransform = PIXI.mat3.create(); //mat3.identity();
|
||||
this.worldTransform = new PIXI.Matrix();
|
||||
|
||||
/**
|
||||
* [read-only] Current transform of the object locally
|
||||
*
|
||||
* @property localTransform
|
||||
* @type Mat3
|
||||
* @readOnly
|
||||
* @private
|
||||
*/
|
||||
this.localTransform = PIXI.mat3.create(); //mat3.identity();
|
||||
|
||||
/**
|
||||
* [NYI] Unkown
|
||||
* [NYI] Unknown
|
||||
*
|
||||
* @property color
|
||||
* @type Array<>
|
||||
@@ -162,13 +159,43 @@ PIXI.DisplayObject = function()
|
||||
*/
|
||||
this.dynamic = true;
|
||||
|
||||
// chach that puppy!
|
||||
// cached sin rotation and cos rotation
|
||||
this._sr = 0;
|
||||
this._cr = 1;
|
||||
|
||||
|
||||
/**
|
||||
* The area the filter is applied to
|
||||
*
|
||||
* @property filterArea
|
||||
* @type Rectangle
|
||||
*/
|
||||
this.filterArea = new PIXI.Rectangle(0,0,1,1);
|
||||
|
||||
/**
|
||||
* The original, cached bounds of the object
|
||||
*
|
||||
* @property _bounds
|
||||
* @type Rectangle
|
||||
* @private
|
||||
*/
|
||||
this._bounds = new PIXI.Rectangle(0, 0, 1, 1);
|
||||
/**
|
||||
* The most up-to-date bounds of the object
|
||||
*
|
||||
* @property _currentBounds
|
||||
* @type Rectangle
|
||||
* @private
|
||||
*/
|
||||
this._currentBounds = null;
|
||||
/**
|
||||
* The original, cached mask of the object
|
||||
*
|
||||
* @property _currentBounds
|
||||
* @type Rectangle
|
||||
* @private
|
||||
*/
|
||||
this._mask = null;
|
||||
|
||||
/*
|
||||
* MOUSE Callbacks
|
||||
*/
|
||||
@@ -224,7 +251,7 @@ PIXI.DisplayObject = function()
|
||||
*/
|
||||
|
||||
/**
|
||||
* A callback that is used when the user touch's over the displayObject
|
||||
* A callback that is used when the user touches over the displayObject
|
||||
* @method touchstart
|
||||
* @param interactionData {InteractionData}
|
||||
*/
|
||||
@@ -279,9 +306,30 @@ Object.defineProperty(PIXI.DisplayObject.prototype, 'interactive', {
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* [read-only] Indicates if the sprite is globaly visible.
|
||||
*
|
||||
* @property worldVisible
|
||||
* @type Boolean
|
||||
*/
|
||||
Object.defineProperty(PIXI.DisplayObject.prototype, 'worldVisible', {
|
||||
get: function() {
|
||||
var item = this;
|
||||
|
||||
do
|
||||
{
|
||||
if(!item.visible)return false;
|
||||
item = item.parent;
|
||||
}
|
||||
while(item);
|
||||
|
||||
return true;
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* Sets a mask for the displayObject. A mask is an object that limits the visibility of an object to the shape of the mask applied to it.
|
||||
* In PIXI a regular mask must be a PIXI.Ggraphics object. This allows for much faster masking in canvas as it utilises shape clipping.
|
||||
* In PIXI a regular mask must be a PIXI.Graphics object. This allows for much faster masking in canvas as it utilises shape clipping.
|
||||
* To remove a mask, set this property to null.
|
||||
*
|
||||
* @property mask
|
||||
@@ -293,27 +341,9 @@ Object.defineProperty(PIXI.DisplayObject.prototype, 'mask', {
|
||||
},
|
||||
set: function(value) {
|
||||
|
||||
|
||||
if(value)
|
||||
{
|
||||
if(this._mask)
|
||||
{
|
||||
value.start = this._mask.start;
|
||||
value.end = this._mask.end;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.addFilter(value);
|
||||
value.renderable = false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
this.removeFilter(this._mask);
|
||||
this._mask.renderable = true;
|
||||
}
|
||||
|
||||
if(this._mask)this._mask.isMask = false;
|
||||
this._mask = value;
|
||||
if(this._mask)this._mask.isMask = true;
|
||||
}
|
||||
});
|
||||
|
||||
@@ -332,9 +362,6 @@ Object.defineProperty(PIXI.DisplayObject.prototype, 'filters', {
|
||||
|
||||
if(value)
|
||||
{
|
||||
if(this._filters)this.removeFilter(this._filters);
|
||||
this.addFilter(value);
|
||||
|
||||
// now put all the passes in one place..
|
||||
var passes = [];
|
||||
for (var i = 0; i < value.length; i++)
|
||||
@@ -346,172 +373,14 @@ Object.defineProperty(PIXI.DisplayObject.prototype, 'filters', {
|
||||
}
|
||||
}
|
||||
|
||||
value.start.filterPasses = passes;
|
||||
}
|
||||
else
|
||||
{
|
||||
if(this._filters) {
|
||||
this.removeFilter(this._filters);
|
||||
}
|
||||
// TODO change this as it is legacy
|
||||
this._filterBlock = {target:this, filterPasses:passes};
|
||||
}
|
||||
|
||||
this._filters = value;
|
||||
}
|
||||
});
|
||||
|
||||
/*
|
||||
* Adds a filter to this displayObject
|
||||
*
|
||||
* @method addFilter
|
||||
* @param mask {Graphics} the graphics object to use as a filter
|
||||
* @private
|
||||
*/
|
||||
PIXI.DisplayObject.prototype.addFilter = function(data)
|
||||
{
|
||||
//if(this.filter)return;
|
||||
//this.filter = true;
|
||||
// data[0].target = this;
|
||||
|
||||
|
||||
// insert a filter block..
|
||||
// TODO Onject pool thease bad boys..
|
||||
var start = new PIXI.FilterBlock();
|
||||
var end = new PIXI.FilterBlock();
|
||||
|
||||
data.start = start;
|
||||
data.end = end;
|
||||
|
||||
start.data = data;
|
||||
end.data = data;
|
||||
|
||||
start.first = start.last = this;
|
||||
end.first = end.last = this;
|
||||
|
||||
start.open = true;
|
||||
|
||||
start.target = this;
|
||||
|
||||
/*
|
||||
* insert start
|
||||
*/
|
||||
|
||||
var childFirst = start;
|
||||
var childLast = start;
|
||||
var nextObject;
|
||||
var previousObject;
|
||||
|
||||
previousObject = this.first._iPrev;
|
||||
|
||||
if(previousObject)
|
||||
{
|
||||
nextObject = previousObject._iNext;
|
||||
childFirst._iPrev = previousObject;
|
||||
previousObject._iNext = childFirst;
|
||||
}
|
||||
else
|
||||
{
|
||||
nextObject = this;
|
||||
}
|
||||
|
||||
if(nextObject)
|
||||
{
|
||||
nextObject._iPrev = childLast;
|
||||
childLast._iNext = nextObject;
|
||||
}
|
||||
|
||||
// now insert the end filter block..
|
||||
|
||||
/*
|
||||
* insert end filter
|
||||
*/
|
||||
childFirst = end;
|
||||
childLast = end;
|
||||
nextObject = null;
|
||||
previousObject = null;
|
||||
|
||||
previousObject = this.last;
|
||||
nextObject = previousObject._iNext;
|
||||
|
||||
if(nextObject)
|
||||
{
|
||||
nextObject._iPrev = childLast;
|
||||
childLast._iNext = nextObject;
|
||||
}
|
||||
|
||||
childFirst._iPrev = previousObject;
|
||||
previousObject._iNext = childFirst;
|
||||
|
||||
var updateLast = this;
|
||||
|
||||
var prevLast = this.last;
|
||||
while(updateLast)
|
||||
{
|
||||
if(updateLast.last === prevLast)
|
||||
{
|
||||
updateLast.last = end;
|
||||
}
|
||||
updateLast = updateLast.parent;
|
||||
}
|
||||
|
||||
this.first = start;
|
||||
|
||||
// if webGL...
|
||||
if(this.__renderGroup)
|
||||
{
|
||||
this.__renderGroup.addFilterBlocks(start, end);
|
||||
}
|
||||
};
|
||||
|
||||
/*
|
||||
* Removes the filter to this displayObject
|
||||
*
|
||||
* @method removeFilter
|
||||
* @private
|
||||
*/
|
||||
PIXI.DisplayObject.prototype.removeFilter = function(data)
|
||||
{
|
||||
//if(!this.filter)return;
|
||||
//this.filter = false;
|
||||
// console.log('YUOIO')
|
||||
// modify the list..
|
||||
var startBlock = data.start;
|
||||
|
||||
|
||||
var nextObject = startBlock._iNext;
|
||||
var previousObject = startBlock._iPrev;
|
||||
|
||||
if(nextObject)nextObject._iPrev = previousObject;
|
||||
if(previousObject)previousObject._iNext = nextObject;
|
||||
|
||||
this.first = startBlock._iNext;
|
||||
|
||||
// remove the end filter
|
||||
var lastBlock = data.end;
|
||||
|
||||
nextObject = lastBlock._iNext;
|
||||
previousObject = lastBlock._iPrev;
|
||||
|
||||
if(nextObject)nextObject._iPrev = previousObject;
|
||||
previousObject._iNext = nextObject;
|
||||
|
||||
// this is always true too!
|
||||
var tempLast = lastBlock._iPrev;
|
||||
// need to make sure the parents last is updated too
|
||||
var updateLast = this;
|
||||
while(updateLast.last === lastBlock)
|
||||
{
|
||||
updateLast.last = tempLast;
|
||||
updateLast = updateLast.parent;
|
||||
if(!updateLast)break;
|
||||
}
|
||||
|
||||
// if webGL...
|
||||
if(this.__renderGroup)
|
||||
{
|
||||
this.__renderGroup.removeFilterBlocks(startBlock, lastBlock);
|
||||
}
|
||||
};
|
||||
|
||||
/*
|
||||
* Updates the object transform for rendering
|
||||
*
|
||||
@@ -523,48 +392,139 @@ PIXI.DisplayObject.prototype.updateTransform = function()
|
||||
// TODO OPTIMIZE THIS!! with dirty
|
||||
if(this.rotation !== this.rotationCache)
|
||||
{
|
||||
if(isNaN(parseFloat(this.rotation)))
|
||||
throw new Error('DisplayObject rotation values must be numeric.');
|
||||
|
||||
this.rotationCache = this.rotation;
|
||||
this._sr = Math.sin(this.rotation);
|
||||
this._cr = Math.cos(this.rotation);
|
||||
}
|
||||
|
||||
var localTransform = this.localTransform;
|
||||
var parentTransform = this.parent.worldTransform;
|
||||
var worldTransform = this.worldTransform;
|
||||
// var localTransform = this.localTransform//.toArray();
|
||||
var parentTransform = this.parent.worldTransform;//.toArray();
|
||||
var worldTransform = this.worldTransform;//.toArray();
|
||||
//console.log(localTransform)
|
||||
localTransform[0] = this._cr * this.scale.x;
|
||||
localTransform[1] = -this._sr * this.scale.y;
|
||||
localTransform[3] = this._sr * this.scale.x;
|
||||
localTransform[4] = this._cr * this.scale.y;
|
||||
|
||||
// TODO --> do we even need a local matrix???
|
||||
|
||||
var px = this.pivot.x;
|
||||
var py = this.pivot.y;
|
||||
|
||||
// Cache the matrix values (makes for huge speed increases!)
|
||||
var a00 = localTransform[0], a01 = localTransform[1], a02 = this.position.x - localTransform[0] * px - py * localTransform[1],
|
||||
a10 = localTransform[3], a11 = localTransform[4], a12 = this.position.y - localTransform[4] * py - px * localTransform[3],
|
||||
var a00 = this._cr * this.scale.x,
|
||||
a01 = -this._sr * this.scale.y,
|
||||
a10 = this._sr * this.scale.x,
|
||||
a11 = this._cr * this.scale.y,
|
||||
a02 = this.position.x + a00 * px - py * a01,
|
||||
a12 = this.position.y + a11 * py - px * a10,
|
||||
b00 = parentTransform.a, b01 = parentTransform.b, b02 = parentTransform.tx,
|
||||
b10 = parentTransform.c, b11 = parentTransform.d, b12 = parentTransform.ty;
|
||||
|
||||
b00 = parentTransform[0], b01 = parentTransform[1], b02 = parentTransform[2],
|
||||
b10 = parentTransform[3], b11 = parentTransform[4], b12 = parentTransform[5];
|
||||
worldTransform.a = b00 * a00 + b01 * a10;
|
||||
worldTransform.b = b00 * a01 + b01 * a11;
|
||||
worldTransform.tx = b00 * a02 + b01 * a12 + b02;
|
||||
|
||||
localTransform[2] = a02;
|
||||
localTransform[5] = a12;
|
||||
worldTransform.c = b10 * a00 + b11 * a10;
|
||||
worldTransform.d = b10 * a01 + b11 * a11;
|
||||
worldTransform.ty = b10 * a02 + b11 * a12 + b12;
|
||||
|
||||
worldTransform[0] = b00 * a00 + b01 * a10;
|
||||
worldTransform[1] = b00 * a01 + b01 * a11;
|
||||
worldTransform[2] = b00 * a02 + b01 * a12 + b02;
|
||||
|
||||
worldTransform[3] = b10 * a00 + b11 * a10;
|
||||
worldTransform[4] = b10 * a01 + b11 * a11;
|
||||
worldTransform[5] = b10 * a02 + b11 * a12 + b12;
|
||||
|
||||
// because we are using affine transformation, we can optimise the matrix concatenation process.. wooo!
|
||||
// mat3.multiply(this.localTransform, this.parent.worldTransform, this.worldTransform);
|
||||
this.worldAlpha = this.alpha * this.parent.worldAlpha;
|
||||
|
||||
this.vcount = PIXI.visibleCount;
|
||||
};
|
||||
|
||||
PIXI.visibleCount = 0;
|
||||
/**
|
||||
* Retrieves the bounds of the displayObject as a rectangle object
|
||||
*
|
||||
* @method getBounds
|
||||
* @return {Rectangle} the rectangular bounding area
|
||||
*/
|
||||
PIXI.DisplayObject.prototype.getBounds = function()
|
||||
{
|
||||
return PIXI.EmptyRectangle;
|
||||
};
|
||||
|
||||
/**
|
||||
* Retrieves the local bounds of the displayObject as a rectangle object
|
||||
*
|
||||
* @method getLocalBounds
|
||||
* @return {Rectangle} the rectangular bounding area
|
||||
*/
|
||||
PIXI.DisplayObject.prototype.getLocalBounds = function()
|
||||
{
|
||||
var matrixCache = this.worldTransform;
|
||||
|
||||
this.worldTransform = PIXI.identityMatrix;
|
||||
|
||||
this.updateTransform();
|
||||
|
||||
var bounds = this.getBounds();
|
||||
|
||||
this.worldTransform = matrixCache;
|
||||
|
||||
return bounds;
|
||||
};
|
||||
|
||||
/**
|
||||
* Sets the object's stage reference, the stage this object is connected to
|
||||
*
|
||||
* @method setStageReference
|
||||
* @param stage {Stage} the stage that the object will have as its current stage reference
|
||||
*/
|
||||
PIXI.DisplayObject.prototype.setStageReference = function(stage)
|
||||
{
|
||||
this.stage = stage;
|
||||
if(this._interactive)this.stage.dirty = true;
|
||||
};
|
||||
|
||||
/**
|
||||
* Renders the object using the WebGL renderer
|
||||
*
|
||||
* @method _renderWebGL
|
||||
* @param renderSession {RenderSession}
|
||||
* @private
|
||||
*/
|
||||
PIXI.DisplayObject.prototype._renderWebGL = function(renderSession)
|
||||
{
|
||||
// OVERWRITE;
|
||||
// this line is just here to pass jshinting :)
|
||||
renderSession = renderSession;
|
||||
};
|
||||
|
||||
/**
|
||||
* Renders the object using the Canvas renderer
|
||||
*
|
||||
* @method _renderCanvas
|
||||
* @param renderSession {RenderSession}
|
||||
* @private
|
||||
*/
|
||||
PIXI.DisplayObject.prototype._renderCanvas = function(renderSession)
|
||||
{
|
||||
// OVERWRITE;
|
||||
// this line is just here to pass jshinting :)
|
||||
renderSession = renderSession;
|
||||
};
|
||||
|
||||
/**
|
||||
* The position of the displayObject on the x axis relative to the local coordinates of the parent.
|
||||
*
|
||||
* @property x
|
||||
* @type Number
|
||||
*/
|
||||
Object.defineProperty(PIXI.DisplayObject.prototype, 'x', {
|
||||
get: function() {
|
||||
return this.position.x;
|
||||
},
|
||||
set: function(value) {
|
||||
this.position.x = value;
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* The position of the displayObject on the y axis relative to the local coordinates of the parent.
|
||||
*
|
||||
* @property y
|
||||
* @type Number
|
||||
*/
|
||||
Object.defineProperty(PIXI.DisplayObject.prototype, 'y', {
|
||||
get: function() {
|
||||
return this.position.y;
|
||||
},
|
||||
set: function(value) {
|
||||
this.position.y = value;
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user