Docs updated
Fixed issue where alpha not being set correctly in canvas spriteBatch Fixed issue where previous stage events did not get removed correctly
This commit is contained in:
parent
9dbf8b47c1
commit
847eb6c48e
140 changed files with 12651 additions and 2435 deletions
|
@ -19,7 +19,7 @@
|
|||
|
||||
</div>
|
||||
<div class="yui3-u-1-4 version">
|
||||
<em>API Docs for: 1.4.0</em>
|
||||
<em>API Docs for: 1.4.3</em>
|
||||
</div>
|
||||
</div>
|
||||
<div id="bd" class="yui3-g">
|
||||
|
@ -73,6 +73,8 @@
|
|||
|
||||
<li><a href="../classes/DisplayObjectContainer.html">DisplayObjectContainer</a></li>
|
||||
|
||||
<li><a href="../classes/DotScreenFilter.html">DotScreenFilter</a></li>
|
||||
|
||||
<li><a href="../classes/Ellipse.html">Ellipse</a></li>
|
||||
|
||||
<li><a href="../classes/EventTarget.html">EventTarget</a></li>
|
||||
|
@ -91,6 +93,8 @@
|
|||
|
||||
<li><a href="../classes/PixelateFilter.html">PixelateFilter</a></li>
|
||||
|
||||
<li><a href="../classes/PIXI.PixiFastShader.html">PIXI.PixiFastShader</a></li>
|
||||
|
||||
<li><a href="../classes/PIXI.PixiShader.html">PIXI.PixiShader</a></li>
|
||||
|
||||
<li><a href="../classes/Point.html">Point</a></li>
|
||||
|
@ -115,9 +119,9 @@
|
|||
|
||||
<li><a href="../classes/Spine.html">Spine</a></li>
|
||||
|
||||
<li><a href="../classes/SpriteSheetLoader.html">SpriteSheetLoader</a></li>
|
||||
<li><a href="../classes/Sprite.html">Sprite</a></li>
|
||||
|
||||
<li><a href="../classes/Sprite™.html">Sprite™</a></li>
|
||||
<li><a href="../classes/SpriteSheetLoader.html">SpriteSheetLoader</a></li>
|
||||
|
||||
<li><a href="../classes/Stage.html">Stage</a></li>
|
||||
|
||||
|
@ -127,6 +131,8 @@
|
|||
|
||||
<li><a href="../classes/TilingSprite.html">TilingSprite</a></li>
|
||||
|
||||
<li><a href="../classes/TwistFilter.html">TwistFilter</a></li>
|
||||
|
||||
<li><a href="../classes/WebGLRenderer.html">WebGLRenderer</a></li>
|
||||
|
||||
</ul>
|
||||
|
@ -195,7 +201,7 @@ PIXI.CanvasRenderer = function(width, height, view, transparent)
|
|||
|
||||
this.type = PIXI.CANVAS_RENDERER;
|
||||
|
||||
this.transparent = transparent;
|
||||
this.transparent = !!transparent;
|
||||
|
||||
if(!PIXI.blendModesCanvas)
|
||||
{
|
||||
|
@ -207,6 +213,19 @@ PIXI.CanvasRenderer = function(width, height, view, transparent)
|
|||
PIXI.blendModesCanvas[PIXI.blendModes.ADD] = "lighter"; //IS THIS OK???
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.MULTIPLY] = "multiply";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.SCREEN] = "screen";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.OVERLAY] = "overlay";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.DARKEN] = "darken";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.LIGHTEN] = "lighten";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.COLOR_DODGE] = "color-dodge";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.COLOR_BURN] = "color-burn";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.HARD_LIGHT] = "hard-light";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.SOFT_LIGHT] = "soft-light";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.DIFFERENCE] = "difference";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.EXCLUSION] = "exclusion";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.HUE] = "hue";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.SATURATION] = "saturation";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.COLOR] = "color";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.LUMINOSITY] = "luminosity";
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -215,6 +234,19 @@ PIXI.CanvasRenderer = function(width, height, view, transparent)
|
|||
PIXI.blendModesCanvas[PIXI.blendModes.ADD] = "lighter"; //IS THIS OK???
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.MULTIPLY] = "source-over";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.SCREEN] = "source-over";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.OVERLAY] = "source-over";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.DARKEN] = "source-over";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.LIGHTEN] = "source-over";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.COLOR_DODGE] = "source-over";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.COLOR_BURN] = "source-over";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.HARD_LIGHT] = "source-over";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.SOFT_LIGHT] = "source-over";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.DIFFERENCE] = "source-over";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.EXCLUSION] = "source-over";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.HUE] = "source-over";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.SATURATION] = "source-over";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.COLOR] = "source-over";
|
||||
PIXI.blendModesCanvas[PIXI.blendModes.LUMINOSITY] = "source-over";
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -249,21 +281,7 @@ PIXI.CanvasRenderer = function(width, height, view, transparent)
|
|||
* @property context
|
||||
* @type Canvas 2d Context
|
||||
*/
|
||||
this.context = this.view.getContext( "2d" );
|
||||
|
||||
//some filter variables
|
||||
this.smoothProperty = null;
|
||||
|
||||
if("imageSmoothingEnabled" in this.context)
|
||||
this.smoothProperty = "imageSmoothingEnabled";
|
||||
else if("webkitImageSmoothingEnabled" in this.context)
|
||||
this.smoothProperty = "webkitImageSmoothingEnabled";
|
||||
else if("mozImageSmoothingEnabled" in this.context)
|
||||
this.smoothProperty = "mozImageSmoothingEnabled";
|
||||
else if("oImageSmoothingEnabled" in this.context)
|
||||
this.smoothProperty = "oImageSmoothingEnabled";
|
||||
|
||||
this.scaleMode = null;
|
||||
this.context = this.view.getContext( "2d", { alpha: this.transparent } );
|
||||
|
||||
this.refresh = true;
|
||||
// hack to enable some hardware acceleration!
|
||||
|
@ -275,10 +293,21 @@ PIXI.CanvasRenderer = function(width, height, view, transparent)
|
|||
|
||||
this.maskManager = new PIXI.CanvasMaskManager();
|
||||
|
||||
this.renderSession = {};
|
||||
this.renderSession.context = this.context;
|
||||
this.renderSession.maskManager = this.maskManager;
|
||||
|
||||
this.renderSession = {
|
||||
context: this.context,
|
||||
maskManager: this.maskManager,
|
||||
scaleMode: null,
|
||||
smoothProperty: null
|
||||
};
|
||||
|
||||
if("imageSmoothingEnabled" in this.context)
|
||||
this.renderSession.smoothProperty = "imageSmoothingEnabled";
|
||||
else if("webkitImageSmoothingEnabled" in this.context)
|
||||
this.renderSession.smoothProperty = "webkitImageSmoothingEnabled";
|
||||
else if("mozImageSmoothingEnabled" in this.context)
|
||||
this.renderSession.smoothProperty = "mozImageSmoothingEnabled";
|
||||
else if("oImageSmoothingEnabled" in this.context)
|
||||
this.renderSession.smoothProperty = "oImageSmoothingEnabled";
|
||||
};
|
||||
|
||||
// constructor
|
||||
|
@ -296,20 +325,33 @@ PIXI.CanvasRenderer.prototype.render = function(stage)
|
|||
//stage.__childrenRemoved = [];
|
||||
|
||||
// update textures if need be
|
||||
PIXI.texturesToUpdate = [];
|
||||
PIXI.texturesToDestroy = [];
|
||||
PIXI.texturesToUpdate.length = 0;
|
||||
PIXI.texturesToDestroy.length = 0;
|
||||
|
||||
PIXI.visibleCount++;
|
||||
stage.updateTransform();
|
||||
|
||||
// update the background color
|
||||
if(this.view.style.backgroundColor !== stage.backgroundColorString && !this.transparent)
|
||||
this.view.style.backgroundColor = stage.backgroundColorString;
|
||||
/* if(this.view.style.backgroundColor !== stage.backgroundColorString && !this.transparent)
|
||||
this.view.style.backgroundColor = stage.backgroundColorString; */
|
||||
|
||||
this.context.setTransform(1,0,0,1,0,0);
|
||||
this.context.clearRect(0, 0, this.width, this.height);
|
||||
|
||||
if(this.view.style.backgroundColor !== stage.backgroundColorString )
|
||||
{
|
||||
if(!this.transparent)
|
||||
{
|
||||
this.context.fillStyle = stage.backgroundColorString;
|
||||
this.context.fillRect(0, 0, this.width, this.height);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.context.clearRect(0, 0, this.width, this.height);
|
||||
}
|
||||
}
|
||||
|
||||
//console.log(this.view.style.backgroundColor)
|
||||
|
||||
this.renderDisplayObject(stage);
|
||||
//as
|
||||
|
||||
// run interaction!
|
||||
if(stage.interactive)
|
||||
|
@ -325,7 +367,7 @@ PIXI.CanvasRenderer.prototype.render = function(stage)
|
|||
// remove frame updates..
|
||||
if(PIXI.Texture.frameUpdates.length > 0)
|
||||
{
|
||||
PIXI.Texture.frameUpdates = [];
|
||||
PIXI.Texture.frameUpdates.length = 0;
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -354,7 +396,7 @@ PIXI.CanvasRenderer.prototype.resize = function(width, height)
|
|||
*/
|
||||
PIXI.CanvasRenderer.prototype.renderDisplayObject = function(displayObject, context)
|
||||
{
|
||||
// no loger recurrsive!
|
||||
// no longer recurrsive!
|
||||
//var transform;
|
||||
//var context = this.context;
|
||||
|
||||
|
@ -460,7 +502,6 @@ PIXI.CanvasBuffer = function(width, height)
|
|||
this.canvas = document.createElement( "canvas" );
|
||||
this.context = this.canvas.getContext( "2d" );
|
||||
|
||||
// this.context.f
|
||||
this.canvas.width = width;
|
||||
this.canvas.height = height;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue