Added doc for BaseTexture.fromCanvas

@param doc about scaleMode in Texture.fromCanvas
@param doc about scaleMode in Texture.fromImage
2014-03-08 01:15:14 +01:00 · 2014-03-08 01:09:33 +01:00 · 2014-03-08 01:08:20 +01:00 · 2014-02-13 08:09:19 -08:00 · 2014-02-13 08:08:45 -08:00
8 changed files with 129 additions and 101 deletions
--- a/Gruntfile.js
+++ b/Gruntfile.js
@ -5,7 +5,6 @@ module.exports = function(grunt) {
    grunt.loadNpmTasks('grunt-contrib-uglify');
    grunt.loadNpmTasks('grunt-contrib-connect');
    grunt.loadNpmTasks('grunt-contrib-yuidoc');
-    grunt.loadNpmTasks('grunt-contrib-watch');

    grunt.loadTasks('tasks');

--- a/bin/pixi.dev.js
+++ b/bin/pixi.dev.js
@ -1,14 +1,14 @@
-/**
- * @license
- * pixi.js - v1.5.0
- * Copyright (c) 2012-2014, Mat Groves
- * http://goodboydigital.com/
- *
- * Compiled: 2014-02-12
- *
- * pixi.js is licensed under the MIT License.
- * http://www.opensource.org/licenses/mit-license.php
- */
+/**
+ * @license
+ * pixi.js - v1.5.1
+ * Copyright (c) 2012-2014, Mat Groves
+ * http://goodboydigital.com/
+ *
+ * Compiled: 2014-02-13
+ *
+ * pixi.js is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license.php
+ */
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -16,7 +16,7 @@
 (function(){

    var root = this;
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -35,7 +35,7 @@ PIXI.WEBGL_RENDERER = 0;
 PIXI.CANVAS_RENDERER = 1;

 // useful for testing against if your lib is using pixi.
-PIXI.VERSION = "v1.4.4";
+PIXI.VERSION = "v1.5.1";

 // the various blend modes supported by pixi
 PIXI.blendModes = {
@ -70,7 +70,7 @@ PIXI.INTERACTION_FREQUENCY = 30;
 PIXI.AUTO_PREVENT_DEFAULT = true;

 PIXI.RAD_TO_DEG = 180 / Math.PI;
-PIXI.DEG_TO_RAD = Math.PI / 180;
+PIXI.DEG_TO_RAD = Math.PI / 180;
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -120,7 +120,7 @@ PIXI.Point.prototype.set = function(x, y)
    this.y = y || ( (y !== 0) ? this.x : 0 ) ;
 };

-
+
 /**
 * @author Mat Groves http://matgroves.com/
 */
@ -207,7 +207,7 @@ PIXI.Rectangle.prototype.contains = function(x, y)
 // constructor
 PIXI.Rectangle.prototype.constructor = PIXI.Rectangle;

-PIXI.EmptyRectangle = new PIXI.Rectangle(0,0,0,0);
+PIXI.EmptyRectangle = new PIXI.Rectangle(0,0,0,0);
 /**
 * @author Adrien Brault <adrien.brault@gmail.com>
 */
@ -285,7 +285,7 @@ PIXI.Polygon.prototype.contains = function(x, y)

 // constructor
 PIXI.Polygon.prototype.constructor = PIXI.Polygon;
-
+
 /**
 * @author Chad Engler <chad@pantherdev.com>
 */
@ -360,7 +360,7 @@ PIXI.Circle.prototype.contains = function(x, y)
 // constructor
 PIXI.Circle.prototype.constructor = PIXI.Circle;

-
+
 /**
 * @author Chad Engler <chad@pantherdev.com>
 */
@ -453,7 +453,7 @@ PIXI.Ellipse.prototype.getBounds = function()

 // constructor
 PIXI.Ellipse.prototype.constructor = PIXI.Ellipse;
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -545,7 +545,7 @@ PIXI.Matrix.prototype.toArray = function(transpose)
    return array;//[this.a, this.b, this.tx, this.c, this.d, this.ty, 0, 0, 1];
 };

-PIXI.identityMatrix = new PIXI.Matrix();
+PIXI.identityMatrix = new PIXI.Matrix();
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -1064,7 +1064,7 @@ Object.defineProperty(PIXI.DisplayObject.prototype, 'y', {
        this.position.y = value;
    }
 });
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -1477,7 +1477,7 @@ PIXI.DisplayObjectContainer.prototype._renderCanvas = function(renderSession)
    {
        renderSession.maskManager.popMask(renderSession.context);
    }
-};
+};
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -1946,12 +1946,12 @@ PIXI.Sprite.fromFrame = function(frameId)
 * @param imageId {String} The image url of the texture
 * @return {Sprite} A new Sprite using a texture from the texture cache matching the image id
 */
-PIXI.Sprite.fromImage = function(imageId)
+PIXI.Sprite.fromImage = function(imageId, crossorigin, scaleMode)
 {
-    var texture = PIXI.Texture.fromImage(imageId);
+    var texture = PIXI.Texture.fromImage(imageId, crossorigin, scaleMode);
    return new PIXI.Sprite(texture);
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/
 */
@ -2126,7 +2126,7 @@ PIXI.SpriteBatch.prototype._renderCanvas = function(renderSession)
    context.restore();
 };

-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -2293,7 +2293,7 @@ PIXI.MovieClip.prototype.updateTransform = function()
        }
    }
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -2304,7 +2304,7 @@ PIXI.FilterBlock = function()
    this.visible = true;
    this.renderable = true;
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -2621,7 +2621,7 @@ PIXI.Text.prototype.destroy = function(destroyTexture)
 };

 PIXI.Text.heightCache = {};
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -2818,7 +2818,7 @@ PIXI.BitmapText.prototype.updateTransform = function()
 };

 PIXI.BitmapText.fonts = {};
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -2881,7 +2881,7 @@ PIXI.InteractionData.prototype.getLocalPosition = function(displayObject)
 };

 // constructor
-PIXI.InteractionData.prototype.constructor = PIXI.InteractionData;
+PIXI.InteractionData.prototype.constructor = PIXI.InteractionData;
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -3597,7 +3597,7 @@ PIXI.InteractionManager.prototype.onTouchEnd = function(event)
        this.touchs[touchEvent.identifier] = null;
    }
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -3733,7 +3733,7 @@ PIXI.Stage.prototype.getMousePosition = function()
 {
    return this.interactionManager.mouse.global;
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -3931,7 +3931,7 @@ PIXI.getNextPowerOfTwo = function(number)
        return result;
    }
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -3945,7 +3945,7 @@ PIXI.getNextPowerOfTwo = function(number)
 * Adds event emitter functionality to a class
 *
 * @class EventTarget
- * 
+ * @example
 *      function MyEmitter() {
 *          PIXI.EventTarget.call(this); //mixes in event target stuff
 *      }
@ -4039,7 +4039,7 @@ PIXI.EventTarget = function () {
 			a.length = 0;
 	};
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -4053,11 +4053,11 @@ PIXI.EventTarget = function () {
 * @param width=800 {Number} the width of the renderers view
 * @param height=600 {Number} the height of the renderers view
 * @param [view] {Canvas} the canvas to use as a view, optional 
- * @param [antialias=false] {Boolean} sets antialias (only applicable in webGL chrome at the moment)
 * @param [transparent=false] {Boolean} the transparency of the render view, default false
+ * @param [antialias=false] {Boolean} sets antialias (only applicable in webGL chrome at the moment)
 *
 */
-PIXI.autoDetectRenderer = function(width, height, view,antialias,transparent)
+PIXI.autoDetectRenderer = function(width, height, view, transparent, antialias)
 {
    if(!width)width = 800;
    if(!height)height = 600;
@ -4079,7 +4079,7 @@ PIXI.autoDetectRenderer = function(width, height, view,antialias,transparent)

    return  new PIXI.CanvasRenderer(width, height, view, transparent);
 };
-
+
 /*
    PolyK library
    url: http://polyk.ivank.net
@ -4249,7 +4249,7 @@ PIXI.PolyK._convex = function(ax, ay, bx, by, cx, cy, sign)
 {
    return ((ay-by)*(cx-bx) + (bx-ax)*(cy-by) >= 0) === sign;
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -4307,7 +4307,7 @@ PIXI.compileProgram = function(gl, vertexSrc, fragmentSrc)

    return shaderProgram;
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 * @author Richard Davey http://www.photonstorm.com @photonstorm
@ -4656,7 +4656,7 @@ PIXI.PixiShader.defaultVertexSrc = [



-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 * @author Richard Davey http://www.photonstorm.com @photonstorm
@ -4803,7 +4803,7 @@ PIXI.PixiFastShader.prototype.destroy = function()

    this.attributes = null;
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -4884,7 +4884,7 @@ PIXI.StripShader.prototype.init = function()

    this.program = program;
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -4989,7 +4989,7 @@ PIXI.PrimitiveShader.prototype.destroy = function()

    this.attribute = null;
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -5530,7 +5530,7 @@ PIXI.WebGLGraphics.buildPoly = function(graphicsData, webGLData)
                   r, g, b, alpha);
    }
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -6087,7 +6087,7 @@ PIXI.WebGLRenderer.prototype.destroy = function()


 PIXI.WebGLRenderer.glContextId = 0;
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -6184,7 +6184,7 @@ PIXI.WebGLMaskManager.prototype.destroy = function()
 {
    this.maskStack = null;
    this.gl = null;
-};
+};
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -6343,7 +6343,7 @@ PIXI.WebGLShaderManager.prototype.destroy = function()
    this.gl = null;
 };

-
+
 /**
 * @author Mat Groves
 * 
@ -6619,7 +6619,7 @@ PIXI.WebGLSpriteBatch.prototype.renderTilingSprite = function(tilingSprite)
     // set the textures uvs temporarily
    // TODO create a separate texture so that we can tile part of a texture

-    if(!tilingSprite._uvs)tilingSprite._uvs = new Float32Array(8);
+    if(!tilingSprite._uvs)tilingSprite._uvs = new PIXI.TextureUvs();

    var uvs = tilingSprite._uvs;

@ -6644,7 +6644,6 @@ PIXI.WebGLSpriteBatch.prototype.renderTilingSprite = function(tilingSprite)
    uvs.x3 = 0 - offsetX;
    uvs.y3 = (1 *scaleY) - offsetY;

-   
    // get the tilingSprites current alpha
    var alpha = tilingSprite.worldAlpha;
    var tint = tilingSprite.tint;
@ -6838,7 +6837,7 @@ PIXI.WebGLSpriteBatch.prototype.destroy = function()
    this.gl = null;
 };

-
+
 /**
 * @author Mat Groves
 * 
@ -7188,7 +7187,7 @@ PIXI.WebGLFastSpriteBatch.prototype.setBlendMode = function(blendMode)
 };


-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -7639,7 +7638,7 @@ PIXI.WebGLFilterManager.prototype.destroy = function()
    gl.deleteBuffer(this.uvBuffer);
    gl.deleteBuffer(this.colorBuffer);
    gl.deleteBuffer(this.indexBuffer);
-};
+};
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -7724,7 +7723,7 @@ PIXI.FilterTexture.prototype.destroy = function()
    this.frameBuffer = null;
    this.texture = null;
 };
-
+
 /**
 * @author Mat Groves
 * 
@ -7772,7 +7771,7 @@ PIXI.CanvasMaskManager.prototype.pushMask = function(maskData, context)
 PIXI.CanvasMaskManager.prototype.popMask = function(context)
 {
    context.restore();
-};
+};

 /**
 * @author Mat Groves
@ -8014,7 +8013,7 @@ PIXI.CanvasTinter.canUseMultiply = PIXI.canUseNewCanvasBlendModes();

 PIXI.CanvasTinter.tintMethod = PIXI.CanvasTinter.canUseMultiply ? PIXI.CanvasTinter.tintWithMultiply :  PIXI.CanvasTinter.tintWithPerPixel;

-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -8404,7 +8403,7 @@ PIXI.CanvasBuffer.prototype.resize = function(width, height)
    this.height = this.canvas.height = height;
 };

-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -8642,7 +8641,7 @@ PIXI.CanvasGraphics.renderGraphicsMask = function(graphics, context)
        }
    }
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -8814,6 +8813,8 @@ PIXI.Graphics.prototype.lineStyle = function(lineWidth, color, alpha)
                        fillColor:this.fillColor, fillAlpha:this.fillAlpha, fill:this.filling, points:[], type:PIXI.Graphics.POLY};

    this.graphicsData.push(this.currentPath);
+
+    return this;
 };

 /**
@ -8833,6 +8834,8 @@ PIXI.Graphics.prototype.moveTo = function(x, y)
    this.currentPath.points.push(x, y);

    this.graphicsData.push(this.currentPath);
+
+    return this;
 };

 /**
@ -8847,6 +8850,8 @@ PIXI.Graphics.prototype.lineTo = function(x, y)
 {
    this.currentPath.points.push(x, y);
    this.dirty = true;
+
+    return this;
 };

 /**
@ -8863,6 +8868,8 @@ PIXI.Graphics.prototype.beginFill = function(color, alpha)
    this.filling = true;
    this.fillColor = color || 0;
    this.fillAlpha = (arguments.length < 2) ? 1 : alpha;
+
+    return this;
 };

 /**
@ -8875,6 +8882,8 @@ PIXI.Graphics.prototype.endFill = function()
    this.filling = false;
    this.fillColor = null;
    this.fillAlpha = 1;
+
+    return this;
 };

 /**
@ -8895,6 +8904,8 @@ PIXI.Graphics.prototype.drawRect = function( x, y, width, height )

    this.graphicsData.push(this.currentPath);
    this.dirty = true;
+
+    return this;
 };

 /**
@ -8916,6 +8927,8 @@ PIXI.Graphics.prototype.drawCircle = function( x, y, radius)

    this.graphicsData.push(this.currentPath);
    this.dirty = true;
+
+    return this;
 };

 /**
@ -8938,6 +8951,8 @@ PIXI.Graphics.prototype.drawEllipse = function( x, y, width, height)

    this.graphicsData.push(this.currentPath);
    this.dirty = true;
+
+    return this;
 };

 /**
@ -8955,6 +8970,8 @@ PIXI.Graphics.prototype.clear = function()
    this.graphicsData = [];

    this.bounds = null; //new PIXI.Rectangle();
+
+    return this;
 };

 /**
@ -9273,7 +9290,7 @@ PIXI.Graphics.POLY = 0;
 PIXI.Graphics.RECT = 1;
 PIXI.Graphics.CIRC = 2;
 PIXI.Graphics.ELIP = 3;
-
+
 /**
 * @author Mat Groves http://matgroves.com/
 */
@ -9385,7 +9402,7 @@ PIXI.Strip.prototype.setTexture = function(texture)
 PIXI.Strip.prototype.onTextureUpdate = function()
 {
    this.updateFrame = true;
-};
+};
 /* @author Mat Groves http://matgroves.com/ @Doormat23
 */

@ -9575,7 +9592,7 @@ PIXI.Rope.prototype.setTexture = function(texture)
    this.texture = texture;
    this.updateFrame = true;
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/
 */
@ -9985,7 +10002,7 @@ PIXI.TilingSprite.prototype.generateTilingTexture = function(forcePowerOfTwo)

   
    this.tilingTexture.baseTexture._powerOf2 = true;
-};
+};
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 * based on pixi impact spine implementation made by Eemeli Kelokorpi (@ekelokorpi) https://github.com/ekelokorpi
@ -11456,7 +11473,7 @@ PIXI.Spine.prototype.createSprite = function (slot, descriptor) {
    slot.sprites[descriptor.name] = sprite;
    return sprite;
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -11645,7 +11662,7 @@ PIXI.BaseTexture.fromCanvas = function(canvas, scaleMode)
 };


-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -11900,7 +11917,7 @@ PIXI.TextureUvs = function()

 };

-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -12112,7 +12129,7 @@ PIXI.RenderTexture.prototype.renderCanvas = function(displayObject, position, cl
    context.setTransform(1,0,0,1,0,0);
 };

-PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
+PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -12272,7 +12289,7 @@ PIXI.AssetLoader.prototype.onAssetLoaded = function(loader)
        if(this.onComplete) this.onComplete();
    }
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -12442,7 +12459,7 @@ PIXI.JsonLoader.prototype.onError = function () {
        type: 'error',
        content: this
    });
-};
+};
 /**
 * @author Martin Kelm http://mkelm.github.com
 */
@ -12633,7 +12650,7 @@ PIXI.AtlasLoader.prototype.onError = function () {
        content: this
    });
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -12733,7 +12750,7 @@ PIXI.SpriteSheetLoader.prototype.onLoaded = function () {
        content: this
    });
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -12848,7 +12865,7 @@ PIXI.ImageLoader.prototype.loadFramedSpriteSheet = function(frameWidth, frameHei
        this.onLoaded();
    }
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -13023,7 +13040,7 @@ PIXI.BitmapFontLoader.prototype.onLoaded = function()
 {
    this.dispatchEvent({type: 'loaded', content: this});
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 * based on pixi impact spine implementation made by Eemeli Kelokorpi (@ekelokorpi) https://github.com/ekelokorpi
@ -13106,7 +13123,7 @@ PIXI.SpineLoader.prototype.onLoaded = function () {
    this.dispatchEvent({type: "loaded", content: this});
 };

-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -13153,7 +13170,7 @@ PIXI.AbstractFilter = function(fragmentSrc, uniforms)
    */
    this.fragmentSrc = fragmentSrc || [];
 };
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -13246,7 +13263,7 @@ Object.defineProperty(PIXI.AlphaMaskFilter.prototype, 'map', {
    }
 });

-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -13305,7 +13322,7 @@ Object.defineProperty(PIXI.ColorMatrixFilter.prototype, 'matrix', {
    set: function(value) {
        this.uniforms.matrix.value = value;
    }
-});
+});
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -13357,7 +13374,7 @@ Object.defineProperty(PIXI.GrayFilter.prototype, 'gray', {
        this.uniforms.gray.value = value;
    }
 });
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -13486,7 +13503,7 @@ Object.defineProperty(PIXI.DisplacementFilter.prototype, 'offset', {
        this.uniforms.offset.value = value;
    }
 });
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -13548,7 +13565,7 @@ Object.defineProperty(PIXI.PixelateFilter.prototype, 'size', {
        this.uniforms.pixelSize.value = value;
    }
 });
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -13602,7 +13619,7 @@ Object.defineProperty(PIXI.BlurXFilter.prototype, 'blur', {
        this.uniforms.blur.value = (1/7000) * value;
    }
 });
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -13655,7 +13672,7 @@ Object.defineProperty(PIXI.BlurYFilter.prototype, 'blur', {
        this.uniforms.blur.value = (1/7000) * value;
    }
 });
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -13723,7 +13740,7 @@ Object.defineProperty(PIXI.BlurFilter.prototype, 'blurY', {
        this.blurYFilter.blur = value;
    }
 });
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -13776,7 +13793,7 @@ Object.defineProperty(PIXI.InvertFilter.prototype, 'invert', {
        this.uniforms.invert.value = value;
    }
 });
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -13830,7 +13847,7 @@ Object.defineProperty(PIXI.SepiaFilter.prototype, 'sepia', {
        this.uniforms.sepia.value = value;
    }
 });
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -13931,7 +13948,7 @@ Object.defineProperty(PIXI.TwistFilter.prototype, 'angle', {
        this.dirty = true;
        this.uniforms.angle.value = value;
    }
-});
+});
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -13983,7 +14000,7 @@ Object.defineProperty(PIXI.ColorStepFilter.prototype, 'step', {
        this.uniforms.step.value = value;
    }
 });
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 * original filter: https://github.com/evanw/glfx.js/blob/master/src/filters/fun/dotscreen.js
@ -14069,7 +14086,7 @@ Object.defineProperty(PIXI.DotScreenFilter.prototype, 'angle', {
        this.dirty = true;
        this.uniforms.angle.value = value;
    }
-});
+});
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -14136,7 +14153,7 @@ Object.defineProperty(PIXI.CrossHatchFilter.prototype, 'blur', {
        this.uniforms.blur.value = (1/7000) * value;
    }
 });
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
@ -14186,7 +14203,7 @@ Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'angle', {
        this.uniforms.blur.value = (1/7000) * value;
    }
 });
-
+
 /**
 * @author Mat Groves http://matgroves.com/ @Doormat23
 */
--- a/bin/pixi.js
+++ b/bin/pixi.js
--- a/bower.json
+++ b/bower.json
@ -1,6 +1,6 @@
 {
    "name": "pixi.js",
-    "version": "1.5.0",
+    "version": "1.5.1",

    "main": "bin/pixi.js",

--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "pixi.js",
-    "version": "1.5.0",
+    "version": "1.5.1",
    "description": "Pixi.js is a fast lightweight 2D library that works across all devices.",

    "author": "Mat Groves",
--- a/src/pixi/Pixi.js
+++ b/src/pixi/Pixi.js
@ -16,7 +16,7 @@ PIXI.WEBGL_RENDERER = 0;
 PIXI.CANVAS_RENDERER = 1;

 // useful for testing against if your lib is using pixi.
-PIXI.VERSION = "v1.5.0";
+PIXI.VERSION = "v1.5.1";

 // the various blend modes supported by pixi
 PIXI.blendModes = {
--- a/src/pixi/textures/BaseTexture.js
+++ b/src/pixi/textures/BaseTexture.js
@ -167,6 +167,16 @@ PIXI.BaseTexture.fromImage = function(imageUrl, crossorigin, scaleMode)
    return baseTexture;
 };

+/**
+ * Helper function that returns a base texture based on a canvas element
+ * If the image is not in the base texture cache it will be created and loaded
+ *
+ * @static
+ * @method fromCanvas
+ * @param canvas {Canvas} The canvas element source of the texture
+ * @param scaleMode {Number} Should be one of the PIXI.scaleMode consts
+ * @return BaseTexture
+ */
 PIXI.BaseTexture.fromCanvas = function(canvas, scaleMode)
 {
    if(!canvas._pixiId)
--- a/src/pixi/textures/Texture.js
+++ b/src/pixi/textures/Texture.js
@ -155,6 +155,7 @@ PIXI.Texture.prototype._updateWebGLuvs = function()
 * @method fromImage
 * @param imageUrl {String} The image url of the texture
 * @param crossorigin {Boolean} Whether requests should be treated as crossorigin
+ * @param scaleMode {Number} Should be one of the PIXI.scaleMode consts
 * @return Texture
 */
 PIXI.Texture.fromImage = function(imageUrl, crossorigin, scaleMode)
@ -193,6 +194,7 @@ PIXI.Texture.fromFrame = function(frameId)
 * @static
 * @method fromCanvas
 * @param canvas {Canvas} The canvas element source of the texture
+ * @param scaleMode {Number} Should be one of the PIXI.scaleMode consts
 * @return Texture
 */
 PIXI.Texture.fromCanvas = function(canvas, scaleMode)
Author	SHA1	Message	Date
Jeena Paradies	e1f8766a71	Added doc for BaseTexture.fromCanvas	2014-03-08 01:15:14 +01:00
Jeena Paradies	ad7ced5407	@param doc about scaleMode in Texture.fromCanvas	2014-03-08 01:09:33 +01:00
Jeena Paradies	85e6d1928e	@param doc about scaleMode in Texture.fromImage	2014-03-08 01:08:20 +01:00
Chad Engler	b9363442ac	bump to v1.5.1, add new builds	2014-02-13 08:09:19 -08:00
Chad Engler	60ed64d8df	remove grunt-contrib-watch	2014-02-13 08:08:45 -08:00