RenderTexture now displays correctly in Canvas games.

Stage.display property added. A direct reference to the root Pixi Stage object (very useful for RenderTexture manipulation)

README.md

@@ -62,6 +62,7 @@ New features:
 * Tweens have a new event: onLoop.
 * You can now load any binary file via the Loader: game.load.binary(key, url, callback) - the optional callback allows for post-load processing before entering the Cache.
 * Group.set will let you deep set a new propery on a single child of the Group.
+* Stage.display property added. A direct reference to the root Pixi Stage object (very useful for RenderTexture manipulation)
 
 
 New Examples:
@@ -74,10 +75,12 @@ New Examples:
 * Added touch joystick example showing how to use the clay.io virtual game controller (thanks gabehollombe)
 * Games - Matching Pairs by Patrick OReilly.
 * Tweens - Example showing how to use the tween events, onStart, onLoop and onComplete.
+* Display - Pixi Render Texture. A Phaser conversion of the Pixi.js Render Texture example.
 
 
 Updates:
 
+* Updated to latest Pixi.js dev branch build
 * When a Sprite is destroyed any active filters are removed as well.
 * Updated Pixi.js so that removing filters now works correctly without breaking the display list.
 * Phaser.Canvas.create updated to it can be given an ID as the 3rd parameter.
@@ -109,6 +112,7 @@ Bug Fixes:
 * Fixed Pixi bug (#425) incorrect width property for multi-line BitmapText (thanks jcd-as)
 * Tween.onStart is now called when the tween starts AFTER the delay value, if given (thanks stevenbouma)
 * Sprites that are fixedToCamera can now be input dragged regardless of world position (thanks RafaelOliveira)
+* RenderTexture now displays correctly in Canvas games.
 
 
 You can view the Change Log for all previous versions at https://github.com/photonstorm/phaser/changelog.md

examples/_site/examples.json

@@ -160,6 +160,10 @@
       "file": "graphics.js",
       "title": "graphics"
     },
+    {
+      "file": "pixi+render+texture.js",
+      "title": "pixi render texture"
+    },
     {
       "file": "render+crisp.js",
       "title": "render crisp"

examples/display/pixi render texture.js

@@ -0,0 +1,78 @@
+//	Original version by @author Mat Groves http://matgroves.com/ @Doormat23 from the Pixi.js examples
+//	Ported to Phaser by Richard Davey
+
+var game = new Phaser.Game(800, 600, Phaser.WEBGL, 'phaser-example', { preload: preload, create: create, update: update });
+
+function preload() {
+
+    game.load.image('spin1', 'assets/sprites/spinObj_01.png');
+    game.load.image('spin2', 'assets/sprites/spinObj_02.png');
+    game.load.image('spin3', 'assets/sprites/spinObj_03.png');
+    game.load.image('spin4', 'assets/sprites/spinObj_04.png');
+    game.load.image('spin5', 'assets/sprites/spinObj_05.png');
+    game.load.image('spin6', 'assets/sprites/spinObj_06.png');
+    game.load.image('spin7', 'assets/sprites/spinObj_07.png');
+    game.load.image('spin8', 'assets/sprites/spinObj_08.png');
+
+}
+
+var renderTexture;
+var renderTexture2;
+var currentTexture;
+var outputSprite;
+var stuffContainer;
+var count = 0;
+
+function create() {
+
+	// create two render textures.. these dynamic textures will be used to draw the scene into itself
+	renderTexture = game.add.renderTexture('texture1', 800, 600);
+	renderTexture2 = game.add.renderTexture('textur2e', 800, 600);
+	currentTexture = renderTexture;
+
+	// create a new sprite that uses the render texture we created above
+	outputSprite = game.add.sprite(400, 300, currentTexture);
+
+	// align the sprite
+	outputSprite.anchor.x = 0.5;
+	outputSprite.anchor.y = 0.5;
+
+	stuffContainer = game.add.group();
+	stuffContainer.x = 800/2;
+	stuffContainer.y = 600/2
+
+	// now create some items and randomly position them in the stuff container
+	for (var i = 0; i < 20; i++)
+	{
+		var item = stuffContainer.create(Math.random() * 400 - 200, Math.random() * 400 - 200, game.rnd.pick(game.cache.getImageKeys()));
+		item.anchor.setTo(0.5, 0.5);
+	}
+
+	// used for spinning!
+	count = 0;
+
+}
+
+function update() {
+
+	stuffContainer.addAll('rotation', 0.1);
+
+	count += 0.01;
+
+	// swap the buffers..
+	var temp = renderTexture;
+	renderTexture = renderTexture2;
+	renderTexture2 = temp;
+
+	// set the new texture
+	outputSprite.setTexture(renderTexture);
+
+	// twist this up!
+	stuffContainer.rotation -= 0.01
+	outputSprite.scale.x = outputSprite.scale.y  = 1 + Math.sin(count) * 0.2;
+
+	// render the stage to the texture
+	// the true clears the texture before content is rendered
+	renderTexture2.renderXY(game.stage.display, 0, 0, true);
+
+}

examples/wip/mod.js

@@ -8,6 +8,11 @@ function preload() {
 	game.load.binary('macrocosm', 'assets/audio/protracker/macrocosm.mod', modLoaded, this);
 	game.load.binary('enigma', 'assets/audio/protracker/enigma.mod', modLoaded, this);
 	game.load.binary('elysium', 'assets/audio/protracker/elysium.mod', modLoaded, this);
+	game.load.binary('stardust', 'assets/audio/protracker/sd-ingame1.mod', modLoaded, this);
+	game.load.binary('globaltrash', 'assets/audio/protracker/global_trash_3_v2.mod', modLoaded, this);
+	game.load.image('vu1', 'assets/sprites/flectrum.png');
+	game.load.image('vu2', 'assets/sprites/flectrum2.png');
+	game.load.image('vu3', 'assets/sprites/healthbar.png');
 
 }
 
@@ -21,35 +26,148 @@ function modLoaded(key, data) {
 
 }
 
-var sprite;
+var vu1;
+var vu2;
+var vu3;
+var vu4;
+
 var modsample = new Array();
 var module;
 
+var sample1;
+var sample2;
+var sample3;
+var sample4;
+var sampleName1;
+var sampleName2;
+var sampleName3;
+var sampleName4;
+
+var r1;
+var r2;
+var r3;
+var r4;
+
 function create() {
 
+	// vu1 = game.add.sprite(400, 100, 'vu3');
+	// vu2 = game.add.sprite(400, 150, 'vu3');
+	// vu3 = game.add.sprite(400, 200, 'vu3');
+	// vu4 = game.add.sprite(400, 250, 'vu3');
+
 	module = new Protracker();
- 	module.buffer = game.cache.getBinary('impulse');
+ 	module.buffer = game.cache.getBinary('globaltrash');
     module.parse();
     module.play();
 
+    r1 = new Phaser.Rectangle(400, 100, 100, 32);
+    r2 = new Phaser.Rectangle(400, 150, 100, 32);
+    r3 = new Phaser.Rectangle(400, 200, 100, 32);
+    r4 = new Phaser.Rectangle(400, 250, 100, 32);
+
+    // console.log(module.sample);
+
 }
 
 function update() {
 
-	if (module.channel[0].noteon) {sam1=module.channel[0].sample; modsamples=1;}else{modsamples=0;}
+	sampleName1 = '';
-	if (module.channel[1].noteon) {sam2=module.channel[1].sample; modsamples=1;}else{modsamples=0;}
+	sampleName2 = '';
-	if (module.channel[2].noteon) {sam3=module.channel[2].sample; modsamples=1;}else{modsamples=0;}
+	sampleName3 = '';
-	if (module.channel[3].noteon) {sam4=module.channel[3].sample; modsamples=1;}else{modsamples=0;}
+	sampleName4 = '';
 		
-	var posi=module.position;
+	sample1 = module.channel[0].sample;
-	var patt=module.row;
+	sample2 = module.channel[1].sample;
-	var bpm=module.bpm;
+	sample3 = module.channel[2].sample;
-	var spd=module.speed;
+	sample4 = module.channel[3].sample;
-	var modname=module.title;
+
-	var modauth=module.signature;
+	/*
+		module.sample = array of Objects containing:
+
+		data (Float32Array)
+		finetime
+		length (ms? bytes?)
+		looplength
+		loopstart
+		name
+		volume
+
+arpeggio: 0
+command: 0
+data: 0
+flags: 0
+note: 22
+noteon: 1
+period: 240
+sample: 11
+samplepos: 314.3411880952386
+samplespeed: 0.335118537414966
+semitone: 14
+slidespeed: 0
+slideto: 214
+slidetospeed: 0
+vibratodepth: 0
+vibratopos: 0
+vibratospeed: 0
+vibratowave: 0
+voiceperiod: 240
+volume: 64
+	*/
+
+	if (module.sample[sample1])
+	{
+		sampleName1 = module.sample[sample1].name;
+	}
+
+	if (module.sample[sample2])
+	{
+		sampleName2 = module.sample[sample2].name;
+	}
+
+	if (module.sample[sample3])
+	{
+		sampleName3 = module.sample[sample3].name;
+	}
+
+	if (module.sample[sample4])
+	{
+		sampleName4 = module.sample[sample4].name;
+	}
+
+	// vu1.width = Math.round(module.vu[0] * 400);
+	// vu2.width = Math.round(module.vu[1] * 400);
+	// vu3.width = Math.round(module.vu[2] * 400);
+	// vu4.width = Math.round(module.vu[3] * 400);
+
+	r1.width = Math.round(module.vu[0] * 500);
+	r2.width = Math.round(module.vu[1] * 500);
+	r3.width = Math.round(module.vu[2] * 500);
+	r4.width = Math.round(module.vu[3] * 500);
 
 }
 
 function render() {
 
+	game.debug.renderText('Sample ' + sample1 + ' : ' + sampleName1, 16, 32);
+	game.debug.renderText('Sample ' + sample2 + ' : ' + sampleName2, 16, 64);
+	game.debug.renderText('Sample ' + sample3 + ' : ' + sampleName3, 16, 96);
+	game.debug.renderText('Sample ' + sample4 + ' : ' + sampleName4, 16, 128);
+
+	game.debug.renderText('Position: ' + module.position, 16, 160);
+	game.debug.renderText('Pattern: ' + module.row, 16, 192);
+	game.debug.renderText('BPM: ' + module.bpm, 16, 224);
+	game.debug.renderText('Speed: ' + module.speed, 16, 256);
+	game.debug.renderText('Name: ' + module.title, 16, 288);
+	game.debug.renderText('Author: ' + module.signature, 16, 320);
+
+	game.debug.renderText('vu1: ' + module.vu[0], 16, 352);
+	game.debug.renderText('vu2: ' + module.vu[1], 16, 384);
+	game.debug.renderText('vu3: ' + module.vu[2], 16, 416);
+	game.debug.renderText('vu4: ' + module.vu[3], 16, 448);
+
+	game.debug.renderRectangle(r1);
+	game.debug.renderRectangle(r2);
+	game.debug.renderRectangle(r3);
+	game.debug.renderRectangle(r4);
+
 }

examples/wip/rendertexture1.js

@@ -1,38 +1,76 @@
 
-var game = new Phaser.Game(800, 600, Phaser.AUTO, 'phaser-example', { preload: preload, create: create, update: update });
+var game = new Phaser.Game(800, 600, Phaser.WEBGL, 'phaser-example', { preload: preload, create: create, update: update });
 
 function preload() {
 
-    game.load.spritesheet('veggies', 'assets/sprites/fruitnveg32wh37.png', 32, 32);
+    game.load.image('spin1', 'assets/sprites/spinObj_01.png');
+    game.load.image('spin2', 'assets/sprites/spinObj_02.png');
+    game.load.image('spin3', 'assets/sprites/spinObj_03.png');
+    game.load.image('spin4', 'assets/sprites/spinObj_04.png');
+    game.load.image('spin5', 'assets/sprites/spinObj_05.png');
+    game.load.image('spin6', 'assets/sprites/spinObj_06.png');
+    game.load.image('spin7', 'assets/sprites/spinObj_07.png');
+    game.load.image('spin8', 'assets/sprites/spinObj_08.png');
 
 }
 
-var group;
+var renderTexture;
-var texture;
+var renderTexture2;
+var currentTexture;
+var outputSprite;
+var stuffContainer;
+var count = 0;
 
 function create() {
 
-	group = game.add.group();
+	// create two render textures.. these dynamic textures will be used to draw the scene into itself
-	group.create(0, 0, 'veggies', 0);
+	renderTexture = game.add.renderTexture('texture1', 800, 600);
-	group.create(32, 0, 'veggies', 1);
+	renderTexture2 = game.add.renderTexture('textur2e', 800, 600);
-	group.create(0, 32, 'veggies', 2);
+	currentTexture = renderTexture;
-	group.create(32, 32, 'veggies', 3);
-	group.visible = false;
 
-	texture = game.add.renderTexture('texture', 800, 600);
+	// create a new sprite that uses the render texture we created above
+	outputSprite = game.add.sprite(400, 300, currentTexture);
 
-	game.add.sprite(0, 0, texture);
+	// align the sprite
+	outputSprite.anchor.x = 0.5;
+	outputSprite.anchor.y = 0.5;
+
+	stuffContainer = game.add.group();
+	stuffContainer.x = 800/2;
+	stuffContainer.y = 600/2
+
+	// now create some items and randomly position them in the stuff container
+	for (var i = 0; i < 20; i++)
+	{
+		var item = stuffContainer.create(Math.random() * 400 - 200, Math.random() * 400 - 200, game.rnd.pick(game.cache.getImageKeys()));
+		item.anchor.setTo(0.5, 0.5);
+	}
+
+	// used for spinning!
+	count = 0;
 
 }
 
 function update() {
 
-	var clear = false;
+	stuffContainer.addAll('rotation', 0.1);
 
-	for (var i = 0; i < 60; i++)
+	count += 0.01;
-	{
+
-		clear = (i == 0);
+	// swap the buffers..
-		texture.renderXY(group, game.world.randomX, game.world.randomY, clear);
+	var temp = renderTexture;
-	}
+	renderTexture = renderTexture2;
+	renderTexture2 = temp;
+
+	// set the new texture
+	outputSprite.setTexture(renderTexture);
+
+	// twist this up!
+	stuffContainer.rotation -= 0.01
+	outputSprite.scale.x = outputSprite.scale.y  = 1 + Math.sin(count) * 0.2;
+
+	// render the stage to the texture
+	// the true clears the texture before content is rendered
+	renderTexture2.renderXY(game.stage.display, 0, 0, true);
 
 }

examples/wip/tilemap.js

@@ -65,7 +65,7 @@ function create() {
     layer.resizeWorld();
 
     //coins = 
-    map.createFromObjects(34, 'coin', 0)
+    map.createFromObjects('Object Layer 1', 34, 'coin', 0);
 
     // layer2 = game.add.tilemapLayer(0, 0, 400, 600, null, map, 0);
     // layer.cameraOffset.x = 400;

src/PixiPatch.js

@@ -77,6 +77,13 @@ PIXI.CanvasRenderer.prototype.renderDisplayObject = function(displayObject)
                     this.context.transform(1, 0, 0, 1, displayObject.texture.trim.x, displayObject.texture.trim.y);
                 }
 
+                //if smoothingEnabled is supported and we need to change the smoothing property for this texture
+                if (this.smoothProperty && this.scaleMode !== displayObject.texture.baseTexture.scaleMode)
+                {
+                    this.scaleMode = displayObject.texture.baseTexture.scaleMode;
+                    this.context[this.smoothProperty] = (this.scaleMode === PIXI.BaseTexture.SCALE_MODE.LINEAR);
+                }
+                    
                 this.context.drawImage(
                     displayObject.texture.baseTexture.source,
                     displayObject.texture.frame.x,

src/core/Stage.js

@@ -47,6 +47,11 @@ Phaser.Stage = function (game, width, height) {
     this._stage.name = '_stage_root';
     this._stage.interactive = false;
 
+    /**
+    * @property {PIXI.Stage} display - The Pixi Stage which is hooked to the renderer.
+    */
+    this.display = this._stage;
+
     /**
     * @property {number} scaleMode - The current scaleMode.
     */

src/pixi/InteractionManager.js

@@ -36,8 +36,6 @@ PIXI.InteractionManager = function(stage)
      */
     this.touchs = {};
 
-
-	
     // helpers
     this.tempPoint = new PIXI.Point();
     //this.tempMatrix =  mat3.create();
@@ -59,10 +57,8 @@ PIXI.InteractionManager = function(stage)
     this.onTouchStart = this.onTouchStart.bind(this);
     this.onTouchEnd = this.onTouchEnd.bind(this);
     this.onTouchMove = this.onTouchMove.bind(this);
-	
-	
     this.last = 0;
-}
+};
 
 // constructor
 PIXI.InteractionManager.prototype.constructor = PIXI.InteractionManager;
@@ -109,7 +105,7 @@ PIXI.InteractionManager.prototype.collectInteractiveSprite = function(displayObj
         }
 //      }
     }
-}
+};
 
 /**
  * Sets the target for event delegation
@@ -129,7 +125,7 @@ PIXI.InteractionManager.prototype.setTarget = function(target)
     }
 
     document.body.addEventListener('mouseup',  this.onMouseUp, true);
-}
+};
 
 
 /**
@@ -179,8 +175,7 @@ PIXI.InteractionManager.prototype.setTargetDomElement = function(domElement)
     domElement.addEventListener('touchstart', this.onTouchStart, true);
     domElement.addEventListener('touchend', this.onTouchEnd, true);
     domElement.addEventListener('touchmove', this.onTouchMove, true);
-}
+};
-
 
 /**
  * updates the state of interactive objects
@@ -200,6 +195,8 @@ PIXI.InteractionManager.prototype.update = function()
     this.last = now;
     //
 
+    var i = 0;
+
     // ok.. so mouse events??
     // yes for now :)
     // OPTIMSE - how often to check??
@@ -209,7 +206,7 @@ PIXI.InteractionManager.prototype.update = function()
 
         var len = this.interactiveItems.length;
 
-		for (var i=0; i < len; i++) {
+        for (i = 0; i < len; i++) {
             this.interactiveItems[i].interactiveChildren = false;
         }
 
@@ -223,9 +220,9 @@ PIXI.InteractionManager.prototype.update = function()
     // loop through interactive objects!
     var length = this.interactiveItems.length;
 
-	this.interactionDOMElement.style.cursor = "inherit";
+    this.interactionDOMElement.style.cursor = 'inherit';
 
-	for (var i = 0; i < length; i++)
+    for (i = 0; i < length; i++)
     {
         var item = this.interactiveItems[i];
 
@@ -265,10 +262,9 @@ PIXI.InteractionManager.prototype.update = function()
                 }
             }
         }
-		
         // --->
     }
-}
+};
 
 /**
  * Is called when the mouse moves accross the renderer element
@@ -287,8 +283,6 @@ PIXI.InteractionManager.prototype.onMouseMove = function(event)
     this.mouse.global.y = (event.clientY - rect.top) * ( this.target.height / rect.height);
 
     var length = this.interactiveItems.length;
-	var global = this.mouse.global;
-	
 
     for (var i = 0; i < length; i++)
     {
@@ -300,7 +294,7 @@ PIXI.InteractionManager.prototype.onMouseMove = function(event)
             item.mousemove(this.mouse);
         }
     }
-}
+};
 
 /**
  * Is called when the mouse button is pressed down on the renderer element
@@ -318,10 +312,6 @@ PIXI.InteractionManager.prototype.onMouseDown = function(event)
     // get interactive items under point??
     //stage.__i
     var length = this.interactiveItems.length;
-	var global = this.mouse.global;
-	
-	var index = 0;
-	var parent = this.stage;
 
     // while
     // hit test
@@ -345,14 +335,14 @@ PIXI.InteractionManager.prototype.onMouseDown = function(event)
             }
         }
     }
-}
+};
 
 
-PIXI.InteractionManager.prototype.onMouseOut = function(event)
+PIXI.InteractionManager.prototype.onMouseOut = function()
 {
     var length = this.interactiveItems.length;
 
-	this.interactionDOMElement.style.cursor = "inherit";
+    this.interactionDOMElement.style.cursor = 'inherit';
 
     for (var i = 0; i < length; i++)
     {
@@ -365,7 +355,7 @@ PIXI.InteractionManager.prototype.onMouseOut = function(event)
             item.__isOver = false;
         }
     }
-}
+};
 
 /**
  * Is called when the mouse button is released on the renderer element
@@ -378,9 +368,6 @@ PIXI.InteractionManager.prototype.onMouseUp = function(event)
 {
     this.mouse.originalEvent = event || window.event; //IE uses window.event
 
-	var global = this.mouse.global;
-	
-	
     var length = this.interactiveItems.length;
     var up = false;
 
@@ -417,7 +404,7 @@ PIXI.InteractionManager.prototype.onMouseUp = function(event)
             item.__isDown = false;
         }
     }
-}
+};
 
 /**
  * Tests if the current mouse coords hit a sprite
@@ -469,7 +456,7 @@ PIXI.InteractionManager.prototype.hitTest = function(item, interactionData)
             if(y > y1 && y < y1 + height)
             {
                 // set the target property if a hit is true!
-				interactionData.target = item
+                interactionData.target = item;
                 return true;
             }
         }
@@ -484,13 +471,13 @@ PIXI.InteractionManager.prototype.hitTest = function(item, interactionData)
         if(hit)
         {
             // hmm.. TODO SET CORRECT TARGET?
-			interactionData.target = item
+            interactionData.target = item;
             return true;
         }
     }
 
     return false;
-}
+};
 
 /**
  * Is called when a touch is moved accross the renderer element
@@ -503,11 +490,13 @@ PIXI.InteractionManager.prototype.onTouchMove = function(event)
 {
     var rect = this.interactionDOMElement.getBoundingClientRect();
     var changedTouches = event.changedTouches;
+    var touchData;
+    var i = 0;
 
-	for (var i=0; i < changedTouches.length; i++) 
+    for (i = 0; i < changedTouches.length; i++)
     {
         var touchEvent = changedTouches[i];
-		var touchData = this.touchs[touchEvent.identifier];
+        touchData = this.touchs[touchEvent.identifier];
         touchData.originalEvent =  event || window.event;
 
         // update the touch position
@@ -516,12 +505,13 @@ PIXI.InteractionManager.prototype.onTouchMove = function(event)
     }
 
     var length = this.interactiveItems.length;
-	for (var i = 0; i < length; i++)
+    for (i = 0; i < length; i++)
     {
         var item = this.interactiveItems[i];
-		if(item.touchmove)item.touchmove(touchData);
+        if(item.touchmove)
+            item.touchmove(touchData);
     }
-}
+};
 
 /**
  * Is called when a touch is started on the renderer element
@@ -570,7 +560,7 @@ PIXI.InteractionManager.prototype.onTouchStart = function(event)
             }
         }
     }
-}
+};
 
 /**
  * Is called when a touch is ended on the renderer element
@@ -600,7 +590,7 @@ PIXI.InteractionManager.prototype.onTouchEnd = function(event)
             var itemTouchData = item.__touchData; // <-- Here!
             item.__hit = this.hitTest(item, touchData);
 
-			if(itemTouchData == touchData)
+            if(itemTouchData === touchData)
             {
                 // so this one WAS down...
                 touchData.originalEvent = event || window.event;
@@ -632,16 +622,18 @@ PIXI.InteractionManager.prototype.onTouchEnd = function(event)
                 item.__touchData = null;
 
             }
+            /*
             else
             {
 
             }
+            */
         }
         // remove the touch..
         this.pool.push(touchData);
         this.touchs[touchEvent.identifier] = null;
     }
-}
+};
 
 /**
  * Holds all information related to an Interaction event
@@ -668,7 +660,7 @@ PIXI.InteractionData = function()
      * @property target
      * @type Sprite
      */
-	this.target;
+    this.target = null;
 
     /**
      * When passed to an event handler, this will be the original DOM Event that was captured
@@ -676,8 +668,8 @@ PIXI.InteractionData = function()
      * @property originalEvent
      * @type Event
      */
-	this.originalEvent;
+    this.originalEvent = null;
-}
+};
 
 /**
  * This will return the local coords of the specified displayObject for this InteractionData
@@ -697,8 +689,8 @@ PIXI.InteractionData.prototype.getLocalPosition = function(displayObject)
         id = 1 / (a00 * a11 + a01 * -a10);
     // set the mouse coords...
     return new PIXI.Point(a11 * id * global.x + -a01 * id * global.y + (a12 * a01 - a02 * a11) * id,
-							   a00 * id * global.y + -a10 * id * global.x + (-a12 * a00 + a02 * a10) * id)
+                               a00 * id * global.y + -a10 * id * global.x + (-a12 * a00 + a02 * a10) * id);
-}
+};
 
 // constructor
 PIXI.InteractionData.prototype.constructor = PIXI.InteractionData;

src/pixi/core/Circle.js

@@ -33,7 +33,7 @@ PIXI.Circle = function(x, y, radius)
      * @default 0
      */
     this.radius = radius || 0;
-}
+};
 
 /**
  * Creates a clone of this Circle instance
@@ -44,7 +44,7 @@ PIXI.Circle = function(x, y, radius)
 PIXI.Circle.prototype.clone = function()
 {
     return new PIXI.Circle(this.x, this.y, this.radius);
-}
+};
 
 /**
  * Checks if the x, and y coords passed to this function are contained within this circle
@@ -67,7 +67,7 @@ PIXI.Circle.prototype.contains = function(x, y)
     dy *= dy;
 
     return (dx + dy <= r2);
-}
+};
 
 // constructor
 PIXI.Circle.prototype.constructor = PIXI.Circle;

src/pixi/core/Ellipse.js

@@ -41,7 +41,7 @@ PIXI.Ellipse = function(x, y, width, height)
      * @default 0
      */
     this.height = height || 0;
-}
+};
 
 /**
  * Creates a clone of this Ellipse instance
@@ -52,7 +52,7 @@ PIXI.Ellipse = function(x, y, width, height)
 PIXI.Ellipse.prototype.clone = function()
 {
     return new PIXI.Ellipse(this.x, this.y, this.width, this.height);
-}
+};
 
 /**
  * Checks if the x, and y coords passed to this function are contained within this ellipse
@@ -76,12 +76,12 @@ PIXI.Ellipse.prototype.contains = function(x, y)
     normy *= normy;
 
     return (normx + normy < 0.25);
-}
+};
 
-PIXI.Ellipse.getBounds = function()
+PIXI.Ellipse.prototype.getBounds = function()
 {
     return new PIXI.Rectangle(this.x, this.y, this.width, this.height);
-}
+};
 
 // constructor
 PIXI.Ellipse.prototype.constructor = PIXI.Ellipse;

src/pixi/core/Matrix.js

@@ -29,7 +29,7 @@ PIXI.mat3.create = function()
     matrix[8] = 1;
 
     return matrix;
-}
+};
 
 
 PIXI.mat3.identity = function(matrix)
@@ -45,7 +45,7 @@ PIXI.mat3.identity = function(matrix)
     matrix[8] = 1;
 
     return matrix;
-}
+};
 
 
 PIXI.mat4 = {};
@@ -72,7 +72,7 @@ PIXI.mat4.create = function()
     matrix[15] = 1;
 
     return matrix;
-}
+};
 
 PIXI.mat3.multiply = function (mat, mat2, dest)
 {
@@ -100,7 +100,7 @@ PIXI.mat3.multiply = function (mat, mat2, dest)
     dest[8] = b20 * a02 + b21 * a12 + b22 * a22;
 
     return dest;
-}
+};
 
 PIXI.mat3.clone = function(mat)
 {
@@ -117,7 +117,7 @@ PIXI.mat3.clone = function(mat)
     matrix[8] = mat[8];
 
     return matrix;
-}
+};
 
 PIXI.mat3.transpose = function (mat, dest)
 {
@@ -145,7 +145,7 @@ PIXI.mat3.transpose = function (mat, dest)
     dest[7] = mat[5];
     dest[8] = mat[8];
     return dest;
-}
+};
 
 PIXI.mat3.toMat4 = function (mat, dest)
 {
@@ -172,7 +172,7 @@ PIXI.mat3.toMat4 = function (mat, dest)
     dest[0] = mat[0];
 
     return dest;
-}
+};
 
 
 /////
@@ -200,7 +200,7 @@ PIXI.mat4.create = function()
     matrix[15] = 1;
 
     return matrix;
-}
+};
 
 PIXI.mat4.transpose = function (mat, dest)
 {
@@ -243,7 +243,7 @@ PIXI.mat4.transpose = function (mat, dest)
     dest[14] = mat[11];
     dest[15] = mat[15];
     return dest;
-}
+};
 
 PIXI.mat4.multiply = function (mat, mat2, dest)
 {
@@ -290,4 +290,4 @@ PIXI.mat4.multiply = function (mat, mat2, dest)
     dest[15] = b0*a03 + b1*a13 + b2*a23 + b3*a33;
 
     return dest;
-}
+};

src/pixi/core/Point.js

@@ -25,7 +25,7 @@ PIXI.Point = function(x, y)
      * @default 0
      */
     this.y = y || 0;
-}
+};
 
 /**
  * Creates a clone of this point
@@ -36,7 +36,7 @@ PIXI.Point = function(x, y)
 PIXI.Point.prototype.clone = function()
 {
     return new PIXI.Point(this.x, this.y);
-}
+};
 
 // constructor
 PIXI.Point.prototype.constructor = PIXI.Point;

src/pixi/core/Polygon.js

@@ -30,7 +30,7 @@ PIXI.Polygon = function(points)
     }
 
     this.points = points;
-}
+};
 
 /**
  * Creates a clone of this polygon
@@ -46,7 +46,7 @@ PIXI.Polygon.prototype.clone = function()
     }
 
     return new PIXI.Polygon(points);
-}
+};
 
 /**
  * Checks if the x, and y coords passed to this function are contained within this polygon
@@ -65,13 +65,13 @@ PIXI.Polygon.prototype.contains = function(x, y)
     for(var i = 0, j = this.points.length - 1; i < this.points.length; j = i++) {
         var xi = this.points[i].x, yi = this.points[i].y,
             xj = this.points[j].x, yj = this.points[j].y,
-            intersect = ((yi > y) != (yj > y)) && (x < (xj - xi) * (y - yi) / (yj - yi) + xi);
+            intersect = ((yi > y) !== (yj > y)) && (x < (xj - xi) * (y - yi) / (yj - yi) + xi);
 
         if(intersect) inside = !inside;
     }
 
     return inside;
-}
+};
 
 // constructor
 PIXI.Polygon.prototype.constructor = PIXI.Polygon;

src/pixi/core/Rectangle.js

@@ -41,7 +41,7 @@ PIXI.Rectangle = function(x, y, width, height)
      * @default 0
      */
     this.height = height || 0;
-}
+};
 
 /**
  * Creates a clone of this Rectangle
@@ -52,7 +52,7 @@ PIXI.Rectangle = function(x, y, width, height)
 PIXI.Rectangle.prototype.clone = function()
 {
     return new PIXI.Rectangle(this.x, this.y, this.width, this.height);
-}
+};
 
 /**
  * Checks if the x, and y coords passed to this function are contained within this Rectangle
@@ -79,7 +79,7 @@ PIXI.Rectangle.prototype.contains = function(x, y)
     }
 
     return false;
-}
+};
 
 // constructor
 PIXI.Rectangle.prototype.constructor = PIXI.Rectangle;

src/pixi/display/DisplayObject.js

@@ -122,7 +122,7 @@ PIXI.DisplayObject = function()
      */
     this._interactive = false;
 
-	this.defaultCursor = "pointer";
+    this.defaultCursor = 'pointer';
 
     /**
      * [read-only] Current transform of the object based on world (parent) factors
@@ -132,7 +132,7 @@ PIXI.DisplayObject = function()
      * @readOnly
      * @private
      */
-	this.worldTransform = PIXI.mat3.create()//mat3.identity();
+    this.worldTransform = PIXI.mat3.create(); //mat3.identity();
 
     /**
      * [read-only] Current transform of the object locally
@@ -142,7 +142,7 @@ PIXI.DisplayObject = function()
      * @readOnly
      * @private
      */
-	this.localTransform = PIXI.mat3.create()//mat3.identity();
+    this.localTransform = PIXI.mat3.create(); //mat3.identity();
 
     /**
      * [NYI] Unkown
@@ -241,7 +241,7 @@ PIXI.DisplayObject = function()
      * @method touchendoutside
      * @param interactionData {InteractionData}
      */
-}
+};
 
 // constructor
 PIXI.DisplayObject.prototype.constructor = PIXI.DisplayObject;
@@ -257,7 +257,7 @@ PIXI.DisplayObject.prototype.constructor = PIXI.DisplayObject;
 PIXI.DisplayObject.prototype.setInteractive = function(interactive)
 {
     this.interactive = interactive;
-}
+};
 
 /**
  * Indicates if the sprite will have touch and mouse interactivity. It is false by default
@@ -343,21 +343,19 @@ Object.defineProperty(PIXI.DisplayObject.prototype, 'filters', {
                 for (var j = 0; j < filterPasses.length; j++)
                 {
                     passes.push(filterPasses[j]);
-	        	};
+                }
-	        };
+            }
 
             value.start.filterPasses = passes;
         }
         else
         {
-        	if(this._filters)this.removeFilter(this._filters);
+            if(this._filters) {
+                this.removeFilter(this._filters);
+            }
         }
 
         this._filters = value;
-
-       
-
-        
     }
 });
 
@@ -397,8 +395,8 @@ PIXI.DisplayObject.prototype.addFilter = function(data)
      * insert start
      */
 
-	var childFirst = start
+    var childFirst = start;
-	var childLast = start
+    var childLast = start;
     var nextObject;
     var previousObject;
 
@@ -421,16 +419,15 @@ PIXI.DisplayObject.prototype.addFilter = function(data)
         childLast._iNext = nextObject;
     }
 
-	
     // now insert the end filter block..
 
     /*
      * insert end filter
      */
-	var childFirst = end
+    childFirst = end;
-	var childLast = end
+    childLast = end;
-	var nextObject = null;
+    nextObject = null;
-	var previousObject = null;
+    previousObject = null;
 
     previousObject = this.last;
     nextObject = previousObject._iNext;
@@ -449,7 +446,7 @@ PIXI.DisplayObject.prototype.addFilter = function(data)
     var prevLast = this.last;
     while(updateLast)
     {
-		if(updateLast.last == prevLast)
+        if(updateLast.last === prevLast)
         {
             updateLast.last = end;
         }
@@ -463,8 +460,7 @@ PIXI.DisplayObject.prototype.addFilter = function(data)
     {
         this.__renderGroup.addFilterBlocks(start, end);
     }
-	
+};
-}
 
 /*
  * Removes the filter to this displayObject
@@ -476,7 +472,7 @@ PIXI.DisplayObject.prototype.removeFilter = function(data)
 {
     //if(!this.filter)return;
     //this.filter = false;
-	// console.log("YUOIO")
+    // console.log('YUOIO')
     // modify the list..
     var startBlock = data.start;
 
@@ -492,8 +488,8 @@ PIXI.DisplayObject.prototype.removeFilter = function(data)
     // remove the end filter
     var lastBlock = data.end;
 
-	var nextObject = lastBlock._iNext;
+    nextObject = lastBlock._iNext;
-	var previousObject = lastBlock._iPrev;
+    previousObject = lastBlock._iPrev;
 
     if(nextObject)nextObject._iPrev = previousObject;
     previousObject._iNext = nextObject;
@@ -502,7 +498,7 @@ PIXI.DisplayObject.prototype.removeFilter = function(data)
     var tempLast =  lastBlock._iPrev;
     // need to make sure the parents last is updated too
     var updateLast = this;
-	while(updateLast.last == lastBlock)
+    while(updateLast.last === lastBlock)
     {
         updateLast.last = tempLast;
         updateLast = updateLast.parent;
@@ -514,7 +510,7 @@ PIXI.DisplayObject.prototype.removeFilter = function(data)
     {
         this.__renderGroup.removeFilterBlocks(startBlock, lastBlock);
     }
-}
+};
 
 /*
  * Updates the object transform for rendering
@@ -537,7 +533,7 @@ PIXI.DisplayObject.prototype.updateTransform = function()
     var worldTransform = this.worldTransform;
     //console.log(localTransform)
     localTransform[0] = this._cr * this.scale.x;
-	localTransform[1] = -this._sr * this.scale.y
+    localTransform[1] = -this._sr * this.scale.y;
     localTransform[3] = this._sr * this.scale.x;
     localTransform[4] = this._cr * this.scale.y;
 
@@ -553,8 +549,8 @@ PIXI.DisplayObject.prototype.updateTransform = function()
         b00 = parentTransform[0], b01 = parentTransform[1], b02 = parentTransform[2],
         b10 = parentTransform[3], b11 = parentTransform[4], b12 = parentTransform[5];
 
-	localTransform[2] = a02
+    localTransform[2] = a02;
-	localTransform[5] = a12
+    localTransform[5] = a12;
 
     worldTransform[0] = b00 * a00 + b01 * a10;
     worldTransform[1] = b00 * a01 + b01 * a11;
@@ -569,7 +565,6 @@ PIXI.DisplayObject.prototype.updateTransform = function()
     this.worldAlpha = this.alpha * this.parent.worldAlpha;
 
     this.vcount = PIXI.visibleCount;
-
+};
-}
 
 PIXI.visibleCount = 0;

src/pixi/display/DisplayObjectContainer.js

@@ -23,7 +23,7 @@ PIXI.DisplayObjectContainer = function()
      * @readOnly
      */
     this.children = [];
-}
+};
 
 // constructor
 PIXI.DisplayObjectContainer.prototype = Object.create( PIXI.DisplayObject.prototype );
@@ -37,9 +37,8 @@ PIXI.DisplayObjectContainer.prototype.constructor = PIXI.DisplayObjectContainer;
  */
 PIXI.DisplayObjectContainer.prototype.addChild = function(child)
 {
-	if(child.parent != undefined)
+    if(child.parent && child.parent !== this)
     {
-		
         //// COULD BE THIS???
         child.parent.removeChild(child);
     //  return;
@@ -60,13 +59,13 @@ PIXI.DisplayObjectContainer.prototype.addChild = function(child)
             tmpChild.stage = this.stage;
             tmpChild = tmpChild._iNext;
         }
-		while(tmpChild)
+        while(tmpChild);
     }
 
     // LINKED LIST //
 
     // modify the list..
-	var childFirst = child.first
+    var childFirst = child.first;
     var childLast = child.last;
     var nextObject;
     var previousObject;
@@ -90,7 +89,7 @@ PIXI.DisplayObjectContainer.prototype.addChild = function(child)
 
     while(updateLast)
     {
-		if(updateLast.last == prevLast)
+        if(updateLast.last === prevLast)
         {
             updateLast.last = child.last;
         }
@@ -114,8 +113,7 @@ PIXI.DisplayObjectContainer.prototype.addChild = function(child)
         // add them to the new render group..
         this.__renderGroup.addDisplayObjectAndChildren(child);
     }
-	
+};
-}
 
 /**
  * Adds a child to the container at a specified index. If the index is out of bounds an error will be thrown
@@ -128,10 +126,11 @@ PIXI.DisplayObjectContainer.prototype.addChildAt = function(child, index)
 {
     if(index >= 0 && index <= this.children.length)
     {
-		if(child.parent != undefined)
+        if(child.parent !== undefined)
         {
             child.parent.removeChild(child);
         }
+
         child.parent = this;
 
         if(this.stage)
@@ -143,7 +142,7 @@ PIXI.DisplayObjectContainer.prototype.addChildAt = function(child, index)
                 tmpChild.stage = this.stage;
                 tmpChild = tmpChild._iNext;
             }
-			while(tmpChild)
+            while(tmpChild);
         }
 
         // modify the list..
@@ -152,21 +151,21 @@ PIXI.DisplayObjectContainer.prototype.addChildAt = function(child, index)
         var nextObject;
         var previousObject;
 
-		if(index == this.children.length)
+        if(index === this.children.length)
         {
             previousObject =  this.last;
             var updateLast = this;
             var prevLast = this.last;
             while(updateLast)
             {
-				if(updateLast.last == prevLast)
+                if(updateLast.last === prevLast)
                 {
                     updateLast.last = child.last;
                 }
                 updateLast = updateLast.parent;
             }
         }
-		else if(index == 0)
+        else if(index === 0)
         {
             previousObject = this;
         }
@@ -200,9 +199,9 @@ PIXI.DisplayObjectContainer.prototype.addChildAt = function(child, index)
     }
     else
     {
-		throw new Error(child + " The index "+ index +" supplied is out of bounds " + this.children.length);
+        throw new Error(child + ' The index '+ index +' supplied is out of bounds ' + this.children.length);
     }
-}
+};
 
 /**
  * [NYI] Swaps the depth of 2 displayObjects
@@ -222,7 +221,7 @@ PIXI.DisplayObjectContainer.prototype.swapChildren = function(child, child2)
     var index2 = this.children.indexOf(child2);
 
     if(index1 < 0 || index2 < 0) {
-		throw new Error("swapChildren: Both the supplied DisplayObjects must be a child of the caller.");
+        throw new Error('swapChildren: Both the supplied DisplayObjects must be a child of the caller.');
     }
 
     this.removeChild(child);
@@ -238,7 +237,7 @@ PIXI.DisplayObjectContainer.prototype.swapChildren = function(child, child2)
         this.addChildAt(child, index2);
         this.addChildAt(child2, index1);
     }
-}
+};
 
 /**
  * Returns the Child at the specified index
@@ -254,9 +253,9 @@ PIXI.DisplayObjectContainer.prototype.getChildAt = function(index)
     }
     else
     {
-		throw new Error(child + " Both the supplied DisplayObjects must be a child of the caller " + this);
+        throw new Error('Both the supplied DisplayObjects must be a child of the caller ' + this);
     }
-}
+};
 
 /**
  * Removes a child from the container.
@@ -280,14 +279,13 @@ PIXI.DisplayObjectContainer.prototype.removeChild = function(child)
         if(nextObject)nextObject._iPrev = previousObject;
         previousObject._iNext = nextObject;
 
-		if(this.last == childLast)
+        if(this.last === childLast)
         {
-
             var tempLast = childFirst._iPrev;
             // need to make sure the parents last is updated too
             var updateLast = this;
 
-			while(updateLast.last == childLast)
+            while(updateLast.last === childLast)
             {
                 updateLast.last = tempLast;
                 updateLast = updateLast.parent;
@@ -309,7 +307,7 @@ PIXI.DisplayObjectContainer.prototype.removeChild = function(child)
                 tmpChild.stage = null;
                 tmpChild = tmpChild._iNext;
             }
-			while(tmpChild)
+            while(tmpChild);
         }
 
         // webGL trim
@@ -323,9 +321,9 @@ PIXI.DisplayObjectContainer.prototype.removeChild = function(child)
     }
     else
     {
-		throw new Error(child + " The supplied DisplayObject must be a child of the caller " + this);
+        throw new Error(child + ' The supplied DisplayObject must be a child of the caller ' + this);
     }
-}
+};
 
 /*
  * Updates the container's children's transform for rendering
@@ -343,4 +341,4 @@ PIXI.DisplayObjectContainer.prototype.updateTransform = function()
     {
         this.children[i].updateTransform();
     }
-}
+};

src/pixi/display/MovieClip.js

@@ -66,7 +66,7 @@ PIXI.MovieClip = function(textures)
      * @readOnly
      */
     this.playing = false;
-}
+};
 
 // constructor
 PIXI.MovieClip.prototype = Object.create( PIXI.Sprite.prototype );
@@ -97,7 +97,7 @@ Object.defineProperty( PIXI.MovieClip.prototype, 'totalFrames', {
 PIXI.MovieClip.prototype.stop = function()
 {
     this.playing = false;
-}
+};
 
 /**
  * Plays the MovieClip
@@ -107,7 +107,7 @@ PIXI.MovieClip.prototype.stop = function()
 PIXI.MovieClip.prototype.play = function()
 {
     this.playing = true;
-}
+};
 
 /**
  * Stops the MovieClip and goes to a specific frame
@@ -121,7 +121,7 @@ PIXI.MovieClip.prototype.gotoAndStop = function(frameNumber)
     this.currentFrame = frameNumber;
     var round = (this.currentFrame + 0.5) | 0;
     this.setTexture(this.textures[round % this.textures.length]);
-}
+};
 
 /**
  * Goes to a specific frame and begins playing the MovieClip
@@ -133,7 +133,7 @@ PIXI.MovieClip.prototype.gotoAndPlay = function(frameNumber)
 {
     this.currentFrame = frameNumber;
     this.playing = true;
-}
+};
 
 /*
  * Updates the object transform for rendering
@@ -163,4 +163,4 @@ PIXI.MovieClip.prototype.updateTransform = function()
             this.onComplete();
         }
     }
-}
+};

src/pixi/display/Sprite.js

@@ -77,7 +77,7 @@ PIXI.Sprite = function(texture)
     }
 
     this.renderable = true;
-}
+};
 
 // constructor
 PIXI.Sprite.prototype = Object.create( PIXI.DisplayObjectContainer.prototype );
@@ -94,7 +94,7 @@ Object.defineProperty(PIXI.Sprite.prototype, 'width', {
         return this.scale.x * this.texture.frame.width;
     },
     set: function(value) {
-    	this.scale.x = value / this.texture.frame.width
+        this.scale.x = value / this.texture.frame.width;
         this._width = value;
     }
 });
@@ -110,7 +110,7 @@ Object.defineProperty(PIXI.Sprite.prototype, 'height', {
         return  this.scale.y * this.texture.frame.height;
     },
     set: function(value) {
-    	this.scale.y = value / this.texture.frame.height
+        this.scale.y = value / this.texture.frame.height;
         this._height = value;
     }
 });
@@ -124,7 +124,7 @@ Object.defineProperty(PIXI.Sprite.prototype, 'height', {
 PIXI.Sprite.prototype.setTexture = function(texture)
 {
     // stop current texture;
-	if(this.texture.baseTexture != texture.baseTexture)
+    if(this.texture.baseTexture !== texture.baseTexture)
     {
         this.textureChange = true;
         this.texture = texture;
@@ -140,7 +140,7 @@ PIXI.Sprite.prototype.setTexture = function(texture)
     }
 
     this.updateFrame = true;
-}
+};
 
 /**
  * When the texture is updated, this event will fire to update the scale and frame
@@ -149,7 +149,7 @@ PIXI.Sprite.prototype.setTexture = function(texture)
  * @param event
  * @private
  */
-PIXI.Sprite.prototype.onTextureUpdate = function(event)
+PIXI.Sprite.prototype.onTextureUpdate = function()
 {
     //this.texture.removeEventListener( 'update', this.onTextureUpdateBind );
 
@@ -158,7 +158,7 @@ PIXI.Sprite.prototype.onTextureUpdate = function(event)
     if(this._height)this.scale.y = this._height / this.texture.frame.height;
 
     this.updateFrame = true;
-}
+};
 
 // some helper functions..
 
@@ -175,9 +175,9 @@ PIXI.Sprite.prototype.onTextureUpdate = function(event)
 PIXI.Sprite.fromFrame = function(frameId)
 {
     var texture = PIXI.TextureCache[frameId];
-	if(!texture)throw new Error("The frameId '"+ frameId +"' does not exist in the texture cache" + this);
+    if(!texture) throw new Error('The frameId "' + frameId + '" does not exist in the texture cache' + this);
     return new PIXI.Sprite(texture);
-}
+};
 
 /**
  *
@@ -193,4 +193,4 @@ PIXI.Sprite.fromImage = function(imageId)
 {
     var texture = PIXI.Texture.fromImage(imageId);
     return new PIXI.Sprite(texture);
-}
+};

src/pixi/display/Stage.js

@@ -61,7 +61,7 @@ PIXI.Stage = function(backgroundColor)
 
     this.setBackgroundColor(backgroundColor);
     this.worldVisible = true;
-}
+};
 
 // constructor
 PIXI.Stage.prototype = Object.create( PIXI.DisplayObjectContainer.prototype );
@@ -77,7 +77,7 @@ PIXI.Stage.prototype.constructor = PIXI.Stage;
 PIXI.Stage.prototype.setInteractionDelegate = function(domElement)
 {
     this.interactionManager.setTargetDomElement( domElement );
-}
+};
 
 /*
  * Updates the object transform for rendering
@@ -104,7 +104,7 @@ PIXI.Stage.prototype.updateTransform = function()
 
 
     if(this.interactive)this.interactionManager.update();
-}
+};
 
 /**
  * Sets the background color for the stage
@@ -116,11 +116,11 @@ PIXI.Stage.prototype.updateTransform = function()
 PIXI.Stage.prototype.setBackgroundColor = function(backgroundColor)
 {
     this.backgroundColor = backgroundColor || 0x000000;
-	this.backgroundColorSplit = HEXtoRGB(this.backgroundColor);
+    this.backgroundColorSplit = PIXI.hex2rgb(this.backgroundColor);
     var hex = this.backgroundColor.toString(16);
-	hex = "000000".substr(0, 6 - hex.length) + hex;
+    hex = '000000'.substr(0, 6 - hex.length) + hex;
-	this.backgroundColorString = "#" + hex;
+    this.backgroundColorString = '#' + hex;
-}
+};
 
 /**
  * This will return the point containing global coords of the mouse.
@@ -131,4 +131,4 @@ PIXI.Stage.prototype.setBackgroundColor = function(backgroundColor)
 PIXI.Stage.prototype.getMousePosition = function()
 {
     return this.interactionManager.mouse.global;
-}
+};

src/pixi/extras/CustomRenderable.js

@@ -15,7 +15,7 @@ PIXI.CustomRenderable = function()
     PIXI.DisplayObject.call( this );
 
     this.renderable = true;
-}
+};
 
 // constructor
 PIXI.CustomRenderable.prototype = Object.create( PIXI.DisplayObject.prototype );
@@ -27,10 +27,10 @@ PIXI.CustomRenderable.prototype.constructor = PIXI.CustomRenderable;
  * @method renderCanvas
  * @param renderer {CanvasRenderer} The renderer instance
  */
-PIXI.CustomRenderable.prototype.renderCanvas = function(renderer)
+PIXI.CustomRenderable.prototype.renderCanvas = function()
 {
     // override!
-}
+};
 
 /**
  * If this object is being rendered by a WebGLRenderer it will call this callback to initialize
@@ -38,20 +38,21 @@ PIXI.CustomRenderable.prototype.renderCanvas = function(renderer)
  * @method initWebGL
  * @param renderer {WebGLRenderer} The renderer instance
  */
-PIXI.CustomRenderable.prototype.initWebGL = function(renderer)
+PIXI.CustomRenderable.prototype.initWebGL = function()
 {
     // override!
-}
+};
 
 /**
  * If this object is being rendered by a WebGLRenderer it will call this callback
  *
  * @method renderWebGL
- * @param renderer {WebGLRenderer} The renderer instance
+ * @param rendererGroup {WebGLRenderGroup} The renderer group instance
+ * @param projectionMatrix {Matrix} The object's projection matrix
  */
-PIXI.CustomRenderable.prototype.renderWebGL = function(renderGroup, projectionMatrix)
+PIXI.CustomRenderable.prototype.renderWebGL = function()
 {
     // not sure if both needed? but ya have for now!
     // override!
-}
+};
 

src/pixi/extras/Rope.js

@@ -2,7 +2,6 @@
  * @author Mat Groves http://matgroves.com/
  */
 
-
 PIXI.Rope = function(texture, points)
 {
     PIXI.Strip.call( this, texture );
@@ -10,22 +9,21 @@ PIXI.Rope = function(texture, points)
 
     try
     {
-		this.verticies = new Float32Array( points.length * 4);
+        this.verticies = new Float32Array(points.length * 4);
-		this.uvs = new Float32Array( points.length * 4);
+        this.uvs = new Float32Array(points.length * 4);
-		this.colors = new Float32Array(  points.length * 2);
+        this.colors = new Float32Array(points.length * 2);
-		this.indices = new Uint16Array( points.length * 2);
+        this.indices = new Uint16Array(points.length * 2);
     }
     catch(error)
     {
-		this.verticies = verticies
+        this.verticies = new Array(points.length * 4);
-
+        this.uvs = new Array(points.length * 4);
-		this.uvs = uvs
+        this.colors = new Array(points.length * 2);
-		this.colors = colors
+        this.indices = new Array(points.length * 2);
-		this.indices = indices
     }
 
     this.refresh();
-}
+};
 
 
 // constructor
@@ -35,24 +33,21 @@ PIXI.Rope.prototype.constructor = PIXI.Rope;
 PIXI.Rope.prototype.refresh = function()
 {
     var points = this.points;
-	if(points.length < 1)return;
+    if(points.length < 1) return;
 
-	var uvs = this.uvs
+    var uvs = this.uvs;
-	var indices = this.indices;
-	var colors = this.colors;
 
     var lastPoint = points[0];
-	var nextPoint;
+    var indices = this.indices;
-	var perp = {x:0, y:0};
+    var colors = this.colors;
-	var point = points[0];
 
     this.count-=0.2;
 
 
-	uvs[0] = 0
+    uvs[0] = 0;
-	uvs[1] = 1
+    uvs[1] = 1;
-	uvs[2] = 0
+    uvs[2] = 0;
-	uvs[3] = 1
+    uvs[3] = 1;
 
     colors[0] = 1;
     colors[1] = 1;
@@ -60,32 +55,33 @@ PIXI.Rope.prototype.refresh = function()
     indices[0] = 0;
     indices[1] = 1;
 
-	var total = points.length;
+    var total = points.length,
+        point, index, amount;
 
     for (var i = 1; i < total; i++)
     {
 
-		var point = points[i];
+        point = points[i];
-		var index = i * 4;
+        index = i * 4;
         // time to do some smart drawing!
-		var amount = i/(total-1)
+        amount = i / (total-1);
 
         if(i%2)
         {
             uvs[index] = amount;
             uvs[index+1] = 0;
 
-			uvs[index+2] = amount
+            uvs[index+2] = amount;
-			uvs[index+3] = 1
+            uvs[index+3] = 1;
 
         }
         else
         {
-			uvs[index] = amount
+            uvs[index] = amount;
-			uvs[index+1] = 0
+            uvs[index+1] = 0;
 
-			uvs[index+2] = amount
+            uvs[index+2] = amount;
-			uvs[index+3] = 1
+            uvs[index+3] = 1;
         }
 
         index = i * 2;
@@ -98,7 +94,7 @@ PIXI.Rope.prototype.refresh = function()
 
         lastPoint = point;
     }
-}
+};
 
 PIXI.Rope.prototype.updateTransform = function()
 {
@@ -106,28 +102,26 @@ PIXI.Rope.prototype.updateTransform = function()
     var points = this.points;
     if(points.length < 1)return;
 
-	var verticies = this.verticies
-
     var lastPoint = points[0];
     var nextPoint;
     var perp = {x:0, y:0};
-	var point = points[0];
 
     this.count-=0.2;
 
-	verticies[0] = point.x + perp.x
+    var verticies = this.verticies;
-	verticies[1] = point.y + perp.y //+ 200
+    verticies[0] = lastPoint.x + perp.x;
-	verticies[2] = point.x - perp.x
+    verticies[1] = lastPoint.y + perp.y; //+ 200
-	verticies[3] = point.y - perp.y//+200
+    verticies[2] = lastPoint.x - perp.x;
+    verticies[3] = lastPoint.y - perp.y;//+200
     // time to do some smart drawing!
 
-	var total = points.length;
+    var total = points.length,
+        point, index, ratio, perpLength, num;
 
     for (var i = 1; i < total; i++)
     {
-
+        point = points[i];
-		var point = points[i];
+        index = i * 4;
-		var index = i * 4;
 
         if(i < points.length-1)
         {
@@ -135,41 +129,38 @@ PIXI.Rope.prototype.updateTransform = function()
         }
         else
         {
-			nextPoint = point
+            nextPoint = point;
         }
 
         perp.y = -(nextPoint.x - lastPoint.x);
         perp.x = nextPoint.y - lastPoint.y;
 
-		var ratio = (1 - (i / (total-1))) * 10;
+        ratio = (1 - (i / (total-1))) * 10;
-				if(ratio > 1)ratio = 1;
 
-		var perpLength = Math.sqrt(perp.x * perp.x + perp.y * perp.y);
+        if(ratio > 1) ratio = 1;
-		var num = this.texture.height/2//(20 + Math.abs(Math.sin((i + this.count) * 0.3) * 50) )* ratio;
+
+        perpLength = Math.sqrt(perp.x * perp.x + perp.y * perp.y);
+        num = this.texture.height / 2; //(20 + Math.abs(Math.sin((i + this.count) * 0.3) * 50) )* ratio;
         perp.x /= perpLength;
         perp.y /= perpLength;
 
         perp.x *= num;
         perp.y *= num;
 
-		verticies[index] = point.x + perp.x
+        verticies[index] = point.x + perp.x;
-		verticies[index+1] = point.y + perp.y
+        verticies[index+1] = point.y + perp.y;
-		verticies[index+2] = point.x - perp.x
+        verticies[index+2] = point.x - perp.x;
-		verticies[index+3] = point.y - perp.y
+        verticies[index+3] = point.y - perp.y;
 
         lastPoint = point;
     }
 
     PIXI.DisplayObjectContainer.prototype.updateTransform.call( this );
-}
+};
 
 PIXI.Rope.prototype.setTexture = function(texture)
 {
     // stop current texture
     this.texture = texture;
     this.updateFrame = true;
-}
+};
-
-
-
-

src/pixi/extras/Spine.js

@@ -7,122 +7,6 @@
  *
  */
 
-/**
- * A class that enables the you to import and run your spine animations in pixi.
- * Spine animation data needs to be loaded using the PIXI.AssetLoader or PIXI.SpineLoader before it can be used by this class
- * See example 12 (http://www.goodboydigital.com/pixijs/examples/12/) to see a working example and check out the source
- *
- * @class Spine
- * @extends DisplayObjectContainer
- * @constructor
- * @param url {String} The url of the spine anim file to be used
- */
-PIXI.Spine = function (url) {
-	PIXI.DisplayObjectContainer.call(this);
-
-	this.spineData = PIXI.AnimCache[url];
-
-	if (!this.spineData) {
-		throw new Error("Spine data must be preloaded using PIXI.SpineLoader or PIXI.AssetLoader: " + url);
-	}
-
-	this.skeleton = new spine.Skeleton(this.spineData);
-	this.skeleton.updateWorldTransform();
-
-	this.stateData = new spine.AnimationStateData(this.spineData);
-	this.state = new spine.AnimationState(this.stateData);
-
-	this.slotContainers = [];
-
-	for (var i = 0, n = this.skeleton.drawOrder.length; i < n; i++) {
-		var slot = this.skeleton.drawOrder[i];
-		var attachment = slot.attachment;
-		var slotContainer = new PIXI.DisplayObjectContainer();
-		this.slotContainers.push(slotContainer);
-		this.addChild(slotContainer);
-		if (!(attachment instanceof spine.RegionAttachment)) {
-			continue;
-		}
-		var spriteName = attachment.rendererObject.name;
-		var sprite = this.createSprite(slot, attachment.rendererObject);
-		slot.currentSprite = sprite;
-		slot.currentSpriteName = spriteName;
-		slotContainer.addChild(sprite);
-	}
-};
-
-PIXI.Spine.prototype = Object.create(PIXI.DisplayObjectContainer.prototype);
-PIXI.Spine.prototype.constructor = PIXI.Spine;
-
-/*
- * Updates the object transform for rendering
- *
- * @method updateTransform
- * @private
- */
-PIXI.Spine.prototype.updateTransform = function () {
-	this.lastTime = this.lastTime || Date.now();
-	var timeDelta = (Date.now() - this.lastTime) * 0.001;
-	this.lastTime = Date.now();
-	this.state.update(timeDelta);
-	this.state.apply(this.skeleton);
-	this.skeleton.updateWorldTransform();
-
-	var drawOrder = this.skeleton.drawOrder;
-	for (var i = 0, n = drawOrder.length; i < n; i++) {
-		var slot = drawOrder[i];
-		var attachment = slot.attachment;
-		var slotContainer = this.slotContainers[i];
-		if (!(attachment instanceof spine.RegionAttachment)) {
-			slotContainer.visible = false;
-			continue;
-		}
-
-		if (attachment.rendererObject) {
-			if (!slot.currentSpriteName || slot.currentSpriteName != attachment.name) {
-				var spriteName = attachment.rendererObject.name;
-				if (slot.currentSprite !== undefined) {
-					slot.currentSprite.visible = false;
-				}
-				slot.sprites = slot.sprites || {};
-				if (slot.sprites[spriteName] !== undefined) {
-					slot.sprites[spriteName].visible = true;
-				} else {
-					var sprite = this.createSprite(slot, attachment.rendererObject);
-					slotContainer.addChild(sprite);
-				}
-				slot.currentSprite = slot.sprites[spriteName];
-				slot.currentSpriteName = spriteName;
-			}
-		}
-		slotContainer.visible = true;
-
-		var bone = slot.bone;
-
-		slotContainer.position.x = bone.worldX + attachment.x * bone.m00 + attachment.y * bone.m01;
-		slotContainer.position.y = bone.worldY + attachment.x * bone.m10 + attachment.y * bone.m11;
-		slotContainer.scale.x = bone.worldScaleX;
-		slotContainer.scale.y = bone.worldScaleY;
-
-		slotContainer.rotation = -(slot.bone.worldRotation * Math.PI / 180);
-	}
-
-	PIXI.DisplayObjectContainer.prototype.updateTransform.call(this);
-};
-
-
-PIXI.Spine.prototype.createSprite = function (slot, descriptor) {
-	var name = PIXI.TextureCache[descriptor.name] ? descriptor.name : descriptor.name + ".png";
-	var sprite = new PIXI.Sprite(PIXI.Texture.fromFrame(name));
-	sprite.scale = descriptor.scale;
-	sprite.rotation = descriptor.rotation;
-	sprite.anchor.x = sprite.anchor.y = 0.5;
-
-	slot.sprites = slot.sprites || {};
-	slot.sprites[descriptor.name] = sprite;
-	return sprite;
-};
-
 /*
  * Awesome JS run time provided by EsotericSoftware
  *
@@ -262,7 +146,7 @@ spine.Skin.prototype = {
     _attachAll: function (skeleton, oldSkin) {
         for (var key in oldSkin.attachments) {
             var colon = key.indexOf(":");
-			var slotIndex = parseInt(key.substring(0, colon));
+            var slotIndex = parseInt(key.substring(0, colon), 10);
             var name = key.substring(colon + 1);
             var slot = skeleton.slots[slotIndex];
             if (slot.attachment && slot.attachment.name == name) {
@@ -280,13 +164,13 @@ spine.Animation = function (name, timelines, duration) {
 };
 spine.Animation.prototype = {
     apply: function (skeleton, time, loop) {
-		if (loop && this.duration != 0) time %= this.duration;
+        if (loop && this.duration) time %= this.duration;
         var timelines = this.timelines;
         for (var i = 0, n = timelines.length; i < n; i++)
             timelines[i].apply(skeleton, time, 1);
     },
     mix: function (skeleton, time, loop, alpha) {
-		if (loop && this.duration != 0) time %= this.duration;
+        if (loop && this.duration) time %= this.duration;
         var timelines = this.timelines;
         for (var i = 0, n = timelines.length; i < n; i++)
             timelines[i].apply(skeleton, time, alpha);
@@ -296,7 +180,7 @@ spine.Animation.prototype = {
 spine.binarySearch = function (values, target, step) {
     var low = 0;
     var high = Math.floor(values.length / step) - 2;
-	if (high == 0) return step;
+    if (!high) return step;
     var current = high >>> 1;
     while (true) {
         if (values[(current + 1) * step] <= target)
@@ -368,7 +252,7 @@ spine.Curves.prototype = {
                 var lastY = y - dfy;
                 return lastY + (y - lastY) * (percent - lastX) / (x - lastX);
             }
-			if (i == 0) break;
+            if (!i) break;
             i--;
             dfx += ddfx;
             dfy += ddfy;
@@ -397,13 +281,15 @@ spine.RotateTimeline.prototype = {
         this.frames[frameIndex + 1] = angle;
     },
     apply: function (skeleton, time, alpha) {
-		var frames = this.frames;
+        var frames = this.frames,
+            amount;
+
         if (time < frames[0]) return; // Time is before first frame.
 
         var bone = skeleton.bones[this.boneIndex];
 
         if (time >= frames[frames.length - 2]) { // Time is after last frame.
-			var amount = bone.data.rotation + frames[frames.length - 1] - bone.rotation;
+            amount = bone.data.rotation + frames[frames.length - 1] - bone.rotation;
             while (amount > 180)
                 amount -= 360;
             while (amount < -180)
@@ -419,7 +305,7 @@ spine.RotateTimeline.prototype = {
         var percent = 1 - (time - frameTime) / (frames[frameIndex - 2/*LAST_FRAME_TIME*/] - frameTime);
         percent = this.curves.getCurvePercent(frameIndex / 2 - 1, percent);
 
-		var amount = frames[frameIndex + 1/*FRAME_VALUE*/] - lastFrameValue;
+        amount = frames[frameIndex + 1/*FRAME_VALUE*/] - lastFrameValue;
         while (amount > 180)
             amount -= 360;
         while (amount < -180)
@@ -672,7 +558,7 @@ spine.Skeleton = function (skeletonData) {
 
     this.slots = [];
     this.drawOrder = [];
-	for (var i = 0, n = skeletonData.slots.length; i < n; i++) {
+    for (i = 0, n = skeletonData.slots.length; i < n; i++) {
         var slotData = skeletonData.slots[i];
         var bone = this.bones[skeletonData.bones.indexOf(slotData.boneData)];
         var slot = new spine.Slot(slotData, this, bone);
@@ -711,7 +597,7 @@ spine.Skeleton.prototype = {
     },
     /** @return May return null. */
     getRootBone: function () {
-		return this.bones.length == 0 ? null : this.bones[0];
+        return this.bones.length ? this.bones[0] : null;
     },
     /** @return May be null. */
     findBone: function (boneName) {
@@ -983,7 +869,7 @@ spine.AnimationState.prototype = {
         entry.loop = loop;
 
         if (!delay || delay <= 0) {
-			var previousAnimation = this.queue.length == 0 ? this.current : this.queue[this.queue.length - 1].animation;
+            var previousAnimation = this.queue.length ? this.queue[this.queue.length - 1].animation : this.current;
             if (previousAnimation != null)
                 delay = previousAnimation.duration - this.data.getMix(previousAnimation, animation) + (delay || 0);
             else
@@ -1005,7 +891,9 @@ spine.SkeletonJson = function (attachmentLoader) {
 spine.SkeletonJson.prototype = {
     scale: 1,
     readSkeletonData: function (root) {
-		var skeletonData = new spine.SkeletonData();
+        /*jshint -W069*/
+        var skeletonData = new spine.SkeletonData(),
+            boneData;
 
         // Bones.
         var bones = root["bones"];
@@ -1016,7 +904,7 @@ spine.SkeletonJson.prototype = {
                 parent = skeletonData.findBone(boneMap["parent"]);
                 if (!parent) throw "Parent bone not found: " + boneMap["parent"];
             }
-			var boneData = new spine.BoneData(boneMap["name"], parent);
+            boneData = new spine.BoneData(boneMap["name"], parent);
             boneData.length = (boneMap["length"] || 0) * this.scale;
             boneData.x = (boneMap["x"] || 0) * this.scale;
             boneData.y = (boneMap["y"] || 0) * this.scale;
@@ -1028,9 +916,9 @@ spine.SkeletonJson.prototype = {
 
         // Slots.
         var slots = root["slots"];
-		for (var i = 0, n = slots.length; i < n; i++) {
+        for (i = 0, n = slots.length; i < n; i++) {
             var slotMap = slots[i];
-			var boneData = skeletonData.findBone(slotMap["bone"]);
+            boneData = skeletonData.findBone(slotMap["bone"]);
             if (!boneData) throw "Slot bone not found: " + slotMap["bone"];
             var slotData = new spine.SlotData(slotMap["name"], boneData);
 
@@ -1077,6 +965,7 @@ spine.SkeletonJson.prototype = {
         return skeletonData;
     },
     readAttachment: function (skin, name, map) {
+        /*jshint -W069*/
         name = map["name"] || name;
 
         var type = spine.AttachmentType[map["type"] || "region"];
@@ -1105,8 +994,11 @@ spine.SkeletonJson.prototype = {
     },
 
     readAnimation: function (name, map, skeletonData) {
+        /*jshint -W069*/
         var timelines = [];
         var duration = 0;
+        var frameIndex, timeline, timelineName, valueMap, values,
+            i, n;
 
         var bones = map["bones"];
         for (var boneName in bones) {
@@ -1115,16 +1007,16 @@ spine.SkeletonJson.prototype = {
             if (boneIndex == -1) throw "Bone not found: " + boneName;
             var boneMap = bones[boneName];
 
-			for (var timelineName in boneMap) {
+            for (timelineName in boneMap) {
                 if (!boneMap.hasOwnProperty(timelineName)) continue;
-				var values = boneMap[timelineName];
+                values = boneMap[timelineName];
                 if (timelineName == "rotate") {
-					var timeline = new spine.RotateTimeline(values.length);
+                    timeline = new spine.RotateTimeline(values.length);
                     timeline.boneIndex = boneIndex;
 
-					var frameIndex = 0;
+                    frameIndex = 0;
-					for (var i = 0, n = values.length; i < n; i++) {
+                    for (i = 0, n = values.length; i < n; i++) {
-						var valueMap = values[i];
+                        valueMap = values[i];
                         timeline.setFrame(frameIndex, valueMap["time"], valueMap["angle"]);
                         spine.SkeletonJson.readCurve(timeline, frameIndex, valueMap);
                         frameIndex++;
@@ -1133,7 +1025,6 @@ spine.SkeletonJson.prototype = {
                     duration = Math.max(duration, timeline.frames[timeline.getFrameCount() * 2 - 2]);
 
                 } else if (timelineName == "translate" || timelineName == "scale") {
-					var timeline;
                     var timelineScale = 1;
                     if (timelineName == "scale")
                         timeline = new spine.ScaleTimeline(values.length);
@@ -1143,9 +1034,9 @@ spine.SkeletonJson.prototype = {
                     }
                     timeline.boneIndex = boneIndex;
 
-					var frameIndex = 0;
+                    frameIndex = 0;
-					for (var i = 0, n = values.length; i < n; i++) {
+                    for (i = 0, n = values.length; i < n; i++) {
-						var valueMap = values[i];
+                        valueMap = values[i];
                         var x = (valueMap["x"] || 0) * timelineScale;
                         var y = (valueMap["y"] || 0) * timelineScale;
                         timeline.setFrame(frameIndex, valueMap["time"], x, y);
@@ -1165,16 +1056,16 @@ spine.SkeletonJson.prototype = {
             var slotMap = slots[slotName];
             var slotIndex = skeletonData.findSlotIndex(slotName);
 
-			for (var timelineName in slotMap) {
+            for (timelineName in slotMap) {
                 if (!slotMap.hasOwnProperty(timelineName)) continue;
-				var values = slotMap[timelineName];
+                values = slotMap[timelineName];
                 if (timelineName == "color") {
-					var timeline = new spine.ColorTimeline(values.length);
+                    timeline = new spine.ColorTimeline(values.length);
                     timeline.slotIndex = slotIndex;
 
-					var frameIndex = 0;
+                    frameIndex = 0;
-					for (var i = 0, n = values.length; i < n; i++) {
+                    for (i = 0, n = values.length; i < n; i++) {
-						var valueMap = values[i];
+                        valueMap = values[i];
                         var color = valueMap["color"];
                         var r = spine.SkeletonJson.toColor(color, 0);
                         var g = spine.SkeletonJson.toColor(color, 1);
@@ -1188,12 +1079,12 @@ spine.SkeletonJson.prototype = {
                     duration = Math.max(duration, timeline.frames[timeline.getFrameCount() * 5 - 5]);
 
                 } else if (timelineName == "attachment") {
-					var timeline = new spine.AttachmentTimeline(values.length);
+                    timeline = new spine.AttachmentTimeline(values.length);
                     timeline.slotIndex = slotIndex;
 
-					var frameIndex = 0;
+                    frameIndex = 0;
-					for (var i = 0, n = values.length; i < n; i++) {
+                    for (i = 0, n = values.length; i < n; i++) {
-						var valueMap = values[i];
+                        valueMap = values[i];
                         timeline.setFrame(frameIndex++, valueMap["time"], valueMap["name"]);
                     }
                     timelines.push(timeline);
@@ -1207,6 +1098,7 @@ spine.SkeletonJson.prototype = {
     }
 };
 spine.SkeletonJson.readCurve = function (timeline, frameIndex, valueMap) {
+    /*jshint -W069*/
     var curve = valueMap["curve"];
     if (!curve) return;
     if (curve == "stepped")
@@ -1232,7 +1124,7 @@ spine.Atlas = function (atlasText, textureLoader) {
         var line = reader.readLine();
         if (line == null) break;
         line = reader.trim(line);
-		if (line.length == 0)
+        if (!line.length)
             page = null;
         else if (!page) {
             page = new spine.AtlasPage();
@@ -1266,12 +1158,12 @@ spine.Atlas = function (atlasText, textureLoader) {
             region.rotate = reader.readValue() == "true";
 
             reader.readTuple(tuple);
-			var x = parseInt(tuple[0]);
+            var x = parseInt(tuple[0], 10);
-			var y = parseInt(tuple[1]);
+            var y = parseInt(tuple[1], 10);
 
             reader.readTuple(tuple);
-			var width = parseInt(tuple[0]);
+            var width = parseInt(tuple[0], 10);
-			var height = parseInt(tuple[1]);
+            var height = parseInt(tuple[1], 10);
 
             region.u = x / page.width;
             region.v = y / page.height;
@@ -1288,23 +1180,23 @@ spine.Atlas = function (atlasText, textureLoader) {
             region.height = Math.abs(height);
 
             if (reader.readTuple(tuple) == 4) { // split is optional
-				region.splits = [parseInt(tuple[0]), parseInt(tuple[1]), parseInt(tuple[2]), parseInt(tuple[3])];
+                region.splits = [parseInt(tuple[0], 10), parseInt(tuple[1], 10), parseInt(tuple[2], 10), parseInt(tuple[3], 10)];
 
                 if (reader.readTuple(tuple) == 4) { // pad is optional, but only present with splits
-					region.pads = [parseInt(tuple[0]), parseInt(tuple[1]), parseInt(tuple[2]), parseInt(tuple[3])];
+                    region.pads = [parseInt(tuple[0], 10), parseInt(tuple[1], 10), parseInt(tuple[2], 10), parseInt(tuple[3], 10)];
 
                     reader.readTuple(tuple);
                 }
             }
 
-			region.originalWidth = parseInt(tuple[0]);
+            region.originalWidth = parseInt(tuple[0], 10);
-			region.originalHeight = parseInt(tuple[1]);
+            region.originalHeight = parseInt(tuple[1], 10);
 
             reader.readTuple(tuple);
-			region.offsetX = parseInt(tuple[0]);
+            region.offsetX = parseInt(tuple[0], 10);
-			region.offsetY = parseInt(tuple[1]);
+            region.offsetY = parseInt(tuple[1], 10);
 
-			region.index = parseInt(reader.readValue());
+            region.index = parseInt(reader.readValue(), 10);
 
             this.regions.push(region);
         }
@@ -1421,7 +1313,7 @@ spine.AtlasReader.prototype = {
         for (; i < 3; i++) {
             var comma = line.indexOf(",", lastMatch);
             if (comma == -1) {
-				if (i == 0) throw "Invalid line: " + line;
+                if (!i) throw "Invalid line: " + line;
                 break;
             }
             tuple[i] = this.trim(line.substr(lastMatch, comma - lastMatch));
@@ -1456,5 +1348,121 @@ spine.AtlasAttachmentLoader.prototype = {
     }
 }
 
-PIXI.AnimCache = {};
 spine.Bone.yDown = true;
+PIXI.AnimCache = {};
+
+/**
+ * A class that enables the you to import and run your spine animations in pixi.
+ * Spine animation data needs to be loaded using the PIXI.AssetLoader or PIXI.SpineLoader before it can be used by this class
+ * See example 12 (http://www.goodboydigital.com/pixijs/examples/12/) to see a working example and check out the source
+ *
+ * @class Spine
+ * @extends DisplayObjectContainer
+ * @constructor
+ * @param url {String} The url of the spine anim file to be used
+ */
+PIXI.Spine = function (url) {
+    PIXI.DisplayObjectContainer.call(this);
+
+    this.spineData = PIXI.AnimCache[url];
+
+    if (!this.spineData) {
+        throw new Error("Spine data must be preloaded using PIXI.SpineLoader or PIXI.AssetLoader: " + url);
+    }
+
+    this.skeleton = new spine.Skeleton(this.spineData);
+    this.skeleton.updateWorldTransform();
+
+    this.stateData = new spine.AnimationStateData(this.spineData);
+    this.state = new spine.AnimationState(this.stateData);
+
+    this.slotContainers = [];
+
+    for (var i = 0, n = this.skeleton.drawOrder.length; i < n; i++) {
+        var slot = this.skeleton.drawOrder[i];
+        var attachment = slot.attachment;
+        var slotContainer = new PIXI.DisplayObjectContainer();
+        this.slotContainers.push(slotContainer);
+        this.addChild(slotContainer);
+        if (!(attachment instanceof spine.RegionAttachment)) {
+            continue;
+        }
+        var spriteName = attachment.rendererObject.name;
+        var sprite = this.createSprite(slot, attachment.rendererObject);
+        slot.currentSprite = sprite;
+        slot.currentSpriteName = spriteName;
+        slotContainer.addChild(sprite);
+    }
+};
+
+PIXI.Spine.prototype = Object.create(PIXI.DisplayObjectContainer.prototype);
+PIXI.Spine.prototype.constructor = PIXI.Spine;
+
+/*
+ * Updates the object transform for rendering
+ *
+ * @method updateTransform
+ * @private
+ */
+PIXI.Spine.prototype.updateTransform = function () {
+    this.lastTime = this.lastTime || Date.now();
+    var timeDelta = (Date.now() - this.lastTime) * 0.001;
+    this.lastTime = Date.now();
+    this.state.update(timeDelta);
+    this.state.apply(this.skeleton);
+    this.skeleton.updateWorldTransform();
+
+    var drawOrder = this.skeleton.drawOrder;
+    for (var i = 0, n = drawOrder.length; i < n; i++) {
+        var slot = drawOrder[i];
+        var attachment = slot.attachment;
+        var slotContainer = this.slotContainers[i];
+        if (!(attachment instanceof spine.RegionAttachment)) {
+            slotContainer.visible = false;
+            continue;
+        }
+
+        if (attachment.rendererObject) {
+            if (!slot.currentSpriteName || slot.currentSpriteName != attachment.name) {
+                var spriteName = attachment.rendererObject.name;
+                if (slot.currentSprite !== undefined) {
+                    slot.currentSprite.visible = false;
+                }
+                slot.sprites = slot.sprites || {};
+                if (slot.sprites[spriteName] !== undefined) {
+                    slot.sprites[spriteName].visible = true;
+                } else {
+                    var sprite = this.createSprite(slot, attachment.rendererObject);
+                    slotContainer.addChild(sprite);
+                }
+                slot.currentSprite = slot.sprites[spriteName];
+                slot.currentSpriteName = spriteName;
+            }
+        }
+        slotContainer.visible = true;
+
+        var bone = slot.bone;
+
+        slotContainer.position.x = bone.worldX + attachment.x * bone.m00 + attachment.y * bone.m01;
+        slotContainer.position.y = bone.worldY + attachment.x * bone.m10 + attachment.y * bone.m11;
+        slotContainer.scale.x = bone.worldScaleX;
+        slotContainer.scale.y = bone.worldScaleY;
+
+        slotContainer.rotation = -(slot.bone.worldRotation * Math.PI / 180);
+    }
+
+    PIXI.DisplayObjectContainer.prototype.updateTransform.call(this);
+};
+
+
+PIXI.Spine.prototype.createSprite = function (slot, descriptor) {
+    var name = PIXI.TextureCache[descriptor.name] ? descriptor.name : descriptor.name + ".png";
+    var sprite = new PIXI.Sprite(PIXI.Texture.fromFrame(name));
+    sprite.scale = descriptor.scale;
+    sprite.rotation = descriptor.rotation;
+    sprite.anchor.x = sprite.anchor.y = 0.5;
+
+    slot.sprites = slot.sprites || {};
+    slot.sprites[descriptor.name] = sprite;
+    return sprite;
+};

src/pixi/extras/Strip.js

@@ -45,7 +45,7 @@ PIXI.Strip = function(texture, width, height)
     this.verticies = new Float32Array()
     this.colors = new Float32Array()
     this.indices = new Uint16Array()
-*/
+    */
     this.width = width;
     this.height = height;
 
@@ -63,7 +63,7 @@ PIXI.Strip = function(texture, width, height)
     }
 
     this.renderable = true;
-}
+};
 
 // constructor
 PIXI.Strip.prototype = Object.create( PIXI.DisplayObjectContainer.prototype );
@@ -79,11 +79,10 @@ PIXI.Strip.prototype.setTexture = function(texture)
     this.width   = texture.frame.width;
     this.height  = texture.frame.height;
     this.updateFrame = true;
-}
+};
 
-PIXI.Strip.prototype.onTextureUpdate = function(event)
+PIXI.Strip.prototype.onTextureUpdate = function()
 {
     this.updateFrame = true;
-}
+};
 // some helper functions..
-

src/pixi/extras/TilingSprite.js

@@ -58,8 +58,8 @@ PIXI.TilingSprite = function(texture, width, height)
 
     this.renderable = true;
 
-	this.blendMode = PIXI.blendModes.NORMAL
+    this.blendMode = PIXI.blendModes.NORMAL;
-}
+};
 
 // constructor
 PIXI.TilingSprite.prototype = Object.create( PIXI.DisplayObjectContainer.prototype );
@@ -79,7 +79,7 @@ PIXI.TilingSprite.prototype.setTexture = function(texture)
     // stop current texture
     this.texture = texture;
     this.updateFrame = true;
-}
+};
 
 /**
  * When the texture is updated, this event will fire to update the frame
@@ -88,8 +88,7 @@ PIXI.TilingSprite.prototype.setTexture = function(texture)
  * @param event
  * @private
  */
-PIXI.TilingSprite.prototype.onTextureUpdate = function(event)
+PIXI.TilingSprite.prototype.onTextureUpdate = function()
 {
     this.updateFrame = true;
-}
+};
-

src/pixi/filters/AbstractFilter.js

@@ -2,7 +2,6 @@
  * @author Mat Groves http://matgroves.com/ @Doormat23
  */
 
-
 /**
  * This is the base class for  creating a pixi.js filter. Currently only webGL supports filters.
  * If you want to make a custom filter this should be your base class.
@@ -33,5 +32,4 @@ PIXI.AbstractFilter = function(fragmentSrc, uniforms)
     this.uniforms = uniforms || {};
 
     this.fragmentSrc = fragmentSrc || [];
-}
+};
-

src/pixi/filters/BlurFilter.js

@@ -2,7 +2,6 @@
  * @author Mat Groves http://matgroves.com/ @Doormat23
  */
 
-
 /**
  *
  * The BlurFilter applies a Gaussian blur to an object.
@@ -13,13 +12,11 @@
  */
 PIXI.BlurFilter = function()
 {
-    
     this.blurXFilter = new PIXI.BlurXFilter();
     this.blurYFilter = new PIXI.BlurYFilter();
 
     this.passes =[this.blurXFilter, this.blurYFilter];
-	
+};
-}
 
 /**
  * Sets the strength of both the blurX and blurY properties simultaneously

src/pixi/filters/BlurXFilter.js

@@ -2,8 +2,6 @@
  * @author Mat Groves http://matgroves.com/ @Doormat23
  */
 
-
-
 PIXI.BlurXFilter = function()
 {
     PIXI.AbstractFilter.call( this );
@@ -16,34 +14,33 @@ PIXI.BlurXFilter = function()
     };
 
     this.fragmentSrc = [
-	  "precision mediump float;",
+        'precision mediump float;',
-	  "varying vec2 vTextureCoord;",
+        'varying vec2 vTextureCoord;',
-	  "varying float vColor;",
+        'varying float vColor;',
-	  "uniform float blur;",
+        'uniform float blur;',
-	  "uniform sampler2D uSampler;",
+        'uniform sampler2D uSampler;',
-	    "void main(void) {",
-	  	"vec4 sum = vec4(0.0);",
 
-	  	"sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;",
+        'void main(void) {',
-	    "sum += texture2D(uSampler, vec2(vTextureCoord.x - 3.0*blur, vTextureCoord.y)) * 0.09;",
+        '   vec4 sum = vec4(0.0);',
-	    "sum += texture2D(uSampler, vec2(vTextureCoord.x - 2.0*blur, vTextureCoord.y)) * 0.12;",
-	    "sum += texture2D(uSampler, vec2(vTextureCoord.x - blur, vTextureCoord.y)) * 0.15;",
-	    "sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y)) * 0.16;",
-	    "sum += texture2D(uSampler, vec2(vTextureCoord.x + blur, vTextureCoord.y)) * 0.15;",
-	    "sum += texture2D(uSampler, vec2(vTextureCoord.x + 2.0*blur, vTextureCoord.y)) * 0.12;",
-	    "sum += texture2D(uSampler, vec2(vTextureCoord.x + 3.0*blur, vTextureCoord.y)) * 0.09;",
-	    "sum += texture2D(uSampler, vec2(vTextureCoord.x + 4.0*blur, vTextureCoord.y)) * 0.05;",
 
-		"gl_FragColor = sum;",
+        '   sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;',
+        '   sum += texture2D(uSampler, vec2(vTextureCoord.x - 3.0*blur, vTextureCoord.y)) * 0.09;',
+        '   sum += texture2D(uSampler, vec2(vTextureCoord.x - 2.0*blur, vTextureCoord.y)) * 0.12;',
+        '   sum += texture2D(uSampler, vec2(vTextureCoord.x - blur, vTextureCoord.y)) * 0.15;',
+        '   sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y)) * 0.16;',
+        '   sum += texture2D(uSampler, vec2(vTextureCoord.x + blur, vTextureCoord.y)) * 0.15;',
+        '   sum += texture2D(uSampler, vec2(vTextureCoord.x + 2.0*blur, vTextureCoord.y)) * 0.12;',
+        '   sum += texture2D(uSampler, vec2(vTextureCoord.x + 3.0*blur, vTextureCoord.y)) * 0.09;',
+        '   sum += texture2D(uSampler, vec2(vTextureCoord.x + 4.0*blur, vTextureCoord.y)) * 0.05;',
 
-	  "}"
+        '   gl_FragColor = sum;',
+        '}'
     ];
-}
+};
 
 PIXI.BlurXFilter.prototype = Object.create( PIXI.AbstractFilter.prototype );
 PIXI.BlurXFilter.prototype.constructor = PIXI.BlurXFilter;
 
-
 Object.defineProperty(PIXI.BlurXFilter.prototype, 'blur', {
     get: function() {
         return this.uniforms.blur.value / (1/7000);

src/pixi/filters/BlurYFilter.js

@@ -2,8 +2,6 @@
  * @author Mat Groves http://matgroves.com/ @Doormat23
  */
 
-
-
 PIXI.BlurYFilter = function()
 {
     PIXI.AbstractFilter.call( this );
@@ -16,29 +14,29 @@ PIXI.BlurYFilter = function()
     };
 
     this.fragmentSrc = [
-	  "precision mediump float;",
+        'precision mediump float;',
-	  "varying vec2 vTextureCoord;",
+        'varying vec2 vTextureCoord;',
-	  "varying float vColor;",
+        'varying float vColor;',
-	  "uniform float blur;",
+        'uniform float blur;',
-	  "uniform sampler2D uSampler;",
+        'uniform sampler2D uSampler;',
-	    "void main(void) {",
-	  	"vec4 sum = vec4(0.0);",
 
-	  	"sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;",
+        'void main(void) {',
-	    "sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 3.0*blur)) * 0.09;",
+        '   vec4 sum = vec4(0.0);',
-	    "sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 2.0*blur)) * 0.12;",
-	    "sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - blur)) * 0.15;",
-	    "sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y)) * 0.16;",
-	    "sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y + blur)) * 0.15;",
-	    "sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y + 2.0*blur)) * 0.12;",
-	    "sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y + 3.0*blur)) * 0.09;",
-	    "sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y + 4.0*blur)) * 0.05;",
 
-		"gl_FragColor = sum;",
+        '   sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;',
+        '   sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 3.0*blur)) * 0.09;',
+        '   sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 2.0*blur)) * 0.12;',
+        '   sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - blur)) * 0.15;',
+        '   sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y)) * 0.16;',
+        '   sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y + blur)) * 0.15;',
+        '   sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y + 2.0*blur)) * 0.12;',
+        '   sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y + 3.0*blur)) * 0.09;',
+        '   sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y + 4.0*blur)) * 0.05;',
 
-	  "}"
+        '   gl_FragColor = sum;',
+        '}'
     ];
-}
+};
 
 PIXI.BlurYFilter.prototype = Object.create( PIXI.AbstractFilter.prototype );
 PIXI.BlurYFilter.prototype.constructor = PIXI.BlurYFilter;

src/pixi/filters/ColorMatrixFilter.js

@@ -25,19 +25,19 @@ PIXI.ColorMatrixFilter = function()
     };
 
     this.fragmentSrc = [
-	  "precision mediump float;",
+        'precision mediump float;',
-	  "varying vec2 vTextureCoord;",
+        'varying vec2 vTextureCoord;',
-	  "varying float vColor;",
+        'varying float vColor;',
-	  "uniform float invert;",
+        'uniform float invert;',
-	  "uniform mat4 matrix;",
+        'uniform mat4 matrix;',
-	  "uniform sampler2D uSampler;",
+        'uniform sampler2D uSampler;',
-	  "void main(void) {",
-	    "gl_FragColor = texture2D(uSampler, vTextureCoord) * matrix;",
-	    "gl_FragColor = gl_FragColor * vColor;",
-	  "}"
-	];
 
-}
+        'void main(void) {',
+        '   gl_FragColor = texture2D(uSampler, vTextureCoord) * matrix;',
+        '   gl_FragColor = gl_FragColor * vColor;',
+        '}'
+    ];
+};
 
 PIXI.ColorMatrixFilter.prototype = Object.create( PIXI.AbstractFilter.prototype );
 PIXI.ColorMatrixFilter.prototype.constructor = PIXI.ColorMatrixFilter;

src/pixi/filters/ColorStepFilter.js

@@ -2,7 +2,6 @@
  * @author Mat Groves http://matgroves.com/ @Doormat23
  */
 
-
 /**
  *
  * This turns your displayObjects to black and white.
@@ -21,18 +20,19 @@ PIXI.ColorStepFilter = function()
     };
 
     this.fragmentSrc = [
-	  "precision mediump float;",
+        'precision mediump float;',
-	  "varying vec2 vTextureCoord;",
+        'varying vec2 vTextureCoord;',
-	  "varying float vColor;",
+        'varying float vColor;',
-	  "uniform sampler2D uSampler;",
+        'uniform sampler2D uSampler;',
-	  "uniform float step;",
+        'uniform float step;',
-	  "void main(void) {",
+
-	    "vec4 color = texture2D(uSampler, vTextureCoord);",
+        'void main(void) {',
-	    "color = floor(color * step) / step;",
+        '   vec4 color = texture2D(uSampler, vTextureCoord);',
-	    "gl_FragColor = color * vColor;",
+        '   color = floor(color * step) / step;',
-	  "}"
+        '   gl_FragColor = color * vColor;',
+        '}'
     ];
-}
+};
 
 PIXI.ColorStepFilter.prototype = Object.create( PIXI.AbstractFilter.prototype );
 PIXI.ColorStepFilter.prototype.constructor = PIXI.ColorStepFilter;

src/pixi/filters/CrossHatchFilter.js

@@ -2,8 +2,6 @@
  * @author Mat Groves http://matgroves.com/ @Doormat23
  */
 
-
-
 PIXI.CrossHatchFilter = function()
 {
     PIXI.AbstractFilter.call( this );
@@ -12,48 +10,47 @@ PIXI.CrossHatchFilter = function()
 
     // set the uniforms
     this.uniforms = {
-		blur: {type: '1f', value: 1/512},
+        blur: {type: '1f', value: 1 / 512},
     };
 
     this.fragmentSrc = [
-	  "precision mediump float;",
+        'precision mediump float;',
-	  "varying vec2 vTextureCoord;",
+        'varying vec2 vTextureCoord;',
-	  "varying float vColor;",
+        'varying float vColor;',
-	  "uniform float blur;",
+        'uniform float blur;',
-	  "uniform sampler2D uSampler;",
+        'uniform sampler2D uSampler;',
-	    "void main(void) {",
 
+        'void main(void) {',
+        '    float lum = length(texture2D(uSampler, vTextureCoord.xy).rgb);',
 
-		"    float lum = length(texture2D(uSampler, vTextureCoord.xy).rgb);",
+        '    gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);',
-		"     ",
+
-		"    gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);",
+        '    if (lum < 1.00) {',
-		"     ",
+        '        if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0) {',
-		"    if (lum < 1.00) {",
+        '            gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);',
-		"        if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0) {",
+        '        }',
-		"            gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);",
+        '    }',
-		"        }",
+
-		"    }",
+        '    if (lum < 0.75) {',
-		"     ",
+        '        if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0) {',
-		"    if (lum < 0.75) {",
+        '            gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);',
-		"        if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0) {",
+        '        }',
-		"            gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);",
+        '    }',
-		"        }",
+
-		"    }",
+        '    if (lum < 0.50) {',
-		"     ",
+        '        if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0) {',
-		"    if (lum < 0.50) {",
+        '            gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);',
-		"        if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0) {",
+        '        }',
-		"            gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);",
+        '    }',
-		"        }",
+
-		"    }",
+        '    if (lum < 0.3) {',
-		"     ",
+        '        if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0) {',
-		"    if (lum < 0.3) {",
+        '            gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);',
-		"        if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0) {",
+        '        }',
-		"            gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);",
+        '    }',
-		"        }",
+        '}'
-		"    }",
-		"}"
     ];
-}
+};
 
 PIXI.CrossHatchFilter.prototype = Object.create( PIXI.AbstractFilter.prototype );
 PIXI.CrossHatchFilter.prototype.constructor = PIXI.BlurYFilter;

src/pixi/filters/DisplacementFilter.js

@@ -2,7 +2,6 @@
  * @author Mat Groves http://matgroves.com/ @Doormat23
  */
 
-
 /**
  *
  * The DisplacementFilter class uses the pixel values from the specified texture (called the displacement map) to perform a displacement of an object.
@@ -29,7 +28,6 @@ PIXI.DisplacementFilter = function(texture)
         dimensions:   {type: '4fv', value:[0,0,0,0]}
     };
 
-
     if(texture.baseTexture.hasLoaded)
     {
         this.uniforms.mapDimensions.value.x = texture.width;
@@ -39,55 +37,51 @@ PIXI.DisplacementFilter = function(texture)
     {
         this.boundLoadedFunction = this.onTextureLoaded.bind(this);
 
-		texture.baseTexture.on("loaded", this.boundLoadedFunction);
+        texture.baseTexture.on('loaded', this.boundLoadedFunction);
     }
 
     this.fragmentSrc = [
-	  "precision mediump float;",
+        'precision mediump float;',
-	  "varying vec2 vTextureCoord;",
+        'varying vec2 vTextureCoord;',
-	  "varying float vColor;",
+        'varying float vColor;',
-	  "uniform sampler2D displacementMap;",
+        'uniform sampler2D displacementMap;',
-	  "uniform sampler2D uSampler;",
+        'uniform sampler2D uSampler;',
-	  "uniform vec2 scale;",
+        'uniform vec2 scale;',
-	  "uniform vec2 offset;",
+        'uniform vec2 offset;',
-	  "uniform vec4 dimensions;",
+        'uniform vec4 dimensions;',
-	  "uniform vec2 mapDimensions;",// = vec2(256.0, 256.0);",
+        'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);',
-	 // "const vec2 textureDimensions = vec2(750.0, 750.0);",
+        // 'const vec2 textureDimensions = vec2(750.0, 750.0);',
 
-	  "void main(void) {",
+        'void main(void) {',
-	  	"vec2 mapCords = vTextureCoord.xy;",
+        '   vec2 mapCords = vTextureCoord.xy;',
-//	  	"mapCords -= ;",
+        //'   mapCords -= ;',
-	 	"mapCords += (dimensions.zw + offset)/ dimensions.xy ;",
+        '   mapCords += (dimensions.zw + offset)/ dimensions.xy ;',
-	 	"mapCords.y *= -1.0;",
+        '   mapCords.y *= -1.0;',
-	 	"mapCords.y += 1.0;",
+        '   mapCords.y += 1.0;',
-	  	"vec2 matSample = texture2D(displacementMap, mapCords).xy;",
+        '   vec2 matSample = texture2D(displacementMap, mapCords).xy;',
-		"matSample -= 0.5;",	  
+        '   matSample -= 0.5;',
-	 	"matSample *= scale;",
+        '   matSample *= scale;',
-	 	"matSample /= mapDimensions;",
+        '   matSample /= mapDimensions;',
-	    "gl_FragColor = texture2D(uSampler, vec2(vTextureCoord.x + matSample.x, vTextureCoord.y + matSample.y));",
+        '   gl_FragColor = texture2D(uSampler, vec2(vTextureCoord.x + matSample.x, vTextureCoord.y + matSample.y));',
-		"gl_FragColor.rgb = mix( gl_FragColor.rgb, gl_FragColor.rgb, 1.0);",
+        '   gl_FragColor.rgb = mix( gl_FragColor.rgb, gl_FragColor.rgb, 1.0);',
-		"vec2 cord = vTextureCoord;",
+        '   vec2 cord = vTextureCoord;',
 
-		//"gl_FragColor =  texture2D(displacementMap, cord);",
+        //'   gl_FragColor =  texture2D(displacementMap, cord);',
-	    "gl_FragColor = gl_FragColor * vColor;",
+        '   gl_FragColor = gl_FragColor * vColor;',
-	    
+        '}'
-	  "}"
     ];
-	
+};
-}
 
 PIXI.DisplacementFilter.prototype = Object.create( PIXI.AbstractFilter.prototype );
 PIXI.DisplacementFilter.prototype.constructor = PIXI.DisplacementFilter;
 
 PIXI.DisplacementFilter.prototype.onTextureLoaded = function()
 {
-	
     this.uniforms.mapDimensions.value.x = this.uniforms.displacementMap.value.width;
     this.uniforms.mapDimensions.value.y = this.uniforms.displacementMap.value.height;
 
-	this.uniforms.displacementMap.value.baseTexture.off("loaded", this.boundLoadedFunction)
+    this.uniforms.displacementMap.value.baseTexture.off('loaded', this.boundLoadedFunction);
-
+};
-}
 
 /**
  * The texture used for the displacemtent map * must be power of 2 texture at the moment

src/pixi/filters/DotScreenFilter.js

@@ -5,7 +5,7 @@
 
 /**
  *
- * This filter applies a pixlate effect making display objects appear "blocky"
+ * This filter applies a pixlate effect making display objects appear 'blocky'
  * @class PixelateFilter
  * @contructor
  */
@@ -23,32 +23,32 @@ PIXI.DotScreenFilter = function()
     };
 
     this.fragmentSrc = [
-	  "precision mediump float;",
+        'precision mediump float;',
-	  "varying vec2 vTextureCoord;",
+        'varying vec2 vTextureCoord;',
-	  "varying float vColor;",
+        'varying float vColor;',
-	  "uniform vec4 dimensions;",
+        'uniform vec4 dimensions;',
-	  "uniform sampler2D uSampler;",
+        'uniform sampler2D uSampler;',
 
-	    "uniform float angle;",
+        'uniform float angle;',
-	    "uniform float scale;",
+        'uniform float scale;',
 
-	    "float pattern() {",
+        'float pattern() {',
-	    	"float s = sin(angle), c = cos(angle);",
+        '   float s = sin(angle), c = cos(angle);',
-	    	"vec2 tex = vTextureCoord * dimensions.xy;",
+        '   vec2 tex = vTextureCoord * dimensions.xy;',
-	    	"vec2 point = vec2(",
+        '   vec2 point = vec2(',
-	    		"c * tex.x - s * tex.y,",
+        '       c * tex.x - s * tex.y,',
-	    		"s * tex.x + c * tex.y",
+        '       s * tex.x + c * tex.y',
-	    	") * scale;",
+        '   ) * scale;',
-	    	"return (sin(point.x) * sin(point.y)) * 4.0;",
+        '   return (sin(point.x) * sin(point.y)) * 4.0;',
-	    "}",
+        '}',
 
-	    "void main() {",
+        'void main() {',
-            "vec4 color = texture2D(uSampler, vTextureCoord);",
+        '   vec4 color = texture2D(uSampler, vTextureCoord);',
-            "float average = (color.r + color.g + color.b) / 3.0;",
+        '   float average = (color.r + color.g + color.b) / 3.0;',
-            "gl_FragColor = vec4(vec3(average * 10.0 - 5.0 + pattern()), color.a);",
+        '   gl_FragColor = vec4(vec3(average * 10.0 - 5.0 + pattern()), color.a);',
-        "}",
+        '}'
     ];
-}
+};
 
 PIXI.DotScreenFilter.prototype = Object.create( PIXI.DotScreenFilter.prototype );
 PIXI.DotScreenFilter.prototype.constructor = PIXI.DotScreenFilter;

src/pixi/filters/FilterBlock.js

@@ -8,4 +8,4 @@ PIXI.FilterBlock = function()
 {
     this.visible = true;
     this.renderable = true;
-}
+};

src/pixi/filters/GrayFilter.js

@@ -2,7 +2,6 @@
  * @author Mat Groves http://matgroves.com/ @Doormat23
  */
 
-
 /**
  *
  * This turns your displayObjects to black and white.
@@ -21,18 +20,19 @@ PIXI.GrayFilter = function()
     };
 
     this.fragmentSrc = [
-	  "precision mediump float;",
+        'precision mediump float;',
-	  "varying vec2 vTextureCoord;",
+        'varying vec2 vTextureCoord;',
-	  "varying float vColor;",
+        'varying float vColor;',
-	  "uniform sampler2D uSampler;",
+        'uniform sampler2D uSampler;',
-	  "uniform float gray;",
+        'uniform float gray;',
-	  "void main(void) {",
+
-	    "gl_FragColor = texture2D(uSampler, vTextureCoord);",
+        'void main(void) {',
-		"gl_FragColor.rgb = mix(gl_FragColor.rgb, vec3(0.2126*gl_FragColor.r + 0.7152*gl_FragColor.g + 0.0722*gl_FragColor.b), gray);",
+        '   gl_FragColor = texture2D(uSampler, vTextureCoord);',
-	    "gl_FragColor = gl_FragColor * vColor;",
+        '   gl_FragColor.rgb = mix(gl_FragColor.rgb, vec3(0.2126*gl_FragColor.r + 0.7152*gl_FragColor.g + 0.0722*gl_FragColor.b), gray);',
-	  "}"
+        '   gl_FragColor = gl_FragColor * vColor;',
+        '}'
     ];
-}
+};
 
 PIXI.GrayFilter.prototype = Object.create( PIXI.AbstractFilter.prototype );
 PIXI.GrayFilter.prototype.constructor = PIXI.GrayFilter;

src/pixi/filters/InvertFilter.js

@@ -20,20 +20,20 @@ PIXI.InvertFilter = function()
     };
 
     this.fragmentSrc = [
-	  "precision mediump float;",
+        'precision mediump float;',
-	  "varying vec2 vTextureCoord;",
+        'varying vec2 vTextureCoord;',
-	  "varying float vColor;",
+        'varying float vColor;',
-	  "uniform float invert;",
+        'uniform float invert;',
-	  "uniform sampler2D uSampler;",
+        'uniform sampler2D uSampler;',
-	  "void main(void) {",
-	    "gl_FragColor = texture2D(uSampler, vTextureCoord);",
-		"gl_FragColor.rgb = mix( (vec3(1)-gl_FragColor.rgb) * gl_FragColor.a, gl_FragColor.rgb, 1.0 - invert);",
-		//"gl_FragColor.rgb = gl_FragColor.rgb  * gl_FragColor.a;",
-	    "gl_FragColor = gl_FragColor * vColor;",
-	  "}"
-	];
 
-}
+        'void main(void) {',
+        '   gl_FragColor = texture2D(uSampler, vTextureCoord);',
+        '   gl_FragColor.rgb = mix( (vec3(1)-gl_FragColor.rgb) * gl_FragColor.a, gl_FragColor.rgb, 1.0 - invert);',
+        //'   gl_FragColor.rgb = gl_FragColor.rgb  * gl_FragColor.a;',
+        '   gl_FragColor = gl_FragColor * vColor;',
+        '}'
+    ];
+};
 
 PIXI.InvertFilter.prototype = Object.create( PIXI.AbstractFilter.prototype );
 PIXI.InvertFilter.prototype.constructor = PIXI.InvertFilter;

src/pixi/filters/PixelateFilter.js

@@ -4,7 +4,7 @@
 
 /**
  *
- * This filter applies a pixlate effect making display objects appear "blocky"
+ * This filter applies a pixlate effect making display objects appear 'blocky'
  * @class PixelateFilter
  * @contructor
  */
@@ -22,25 +22,24 @@ PIXI.PixelateFilter = function()
     };
 
     this.fragmentSrc = [
-	  "precision mediump float;",
+        'precision mediump float;',
-	  "varying vec2 vTextureCoord;",
+        'varying vec2 vTextureCoord;',
-	  "varying float vColor;",
+        'varying float vColor;',
-	  "uniform vec2 testDim;",
+        'uniform vec2 testDim;',
-	  "uniform vec4 dimensions;",
+        'uniform vec4 dimensions;',
-	  "uniform vec2 pixelSize;",
+        'uniform vec2 pixelSize;',
-	  "uniform sampler2D uSampler;",
+        'uniform sampler2D uSampler;',
-	  "void main(void) {",
-	 	"vec2 coord = vTextureCoord;",
 
-	 	"vec2 size = dimensions.xy/pixelSize;",
+        'void main(void) {',
+        '   vec2 coord = vTextureCoord;',
 
-	 	"vec2 color = floor( ( vTextureCoord * size ) ) / size + pixelSize/dimensions.xy * 0.5;",
+        '   vec2 size = dimensions.xy/pixelSize;',
-	    "gl_FragColor = texture2D(uSampler, color);",
+
-	  "}"
+        '   vec2 color = floor( ( vTextureCoord * size ) ) / size + pixelSize/dimensions.xy * 0.5;',
+        '   gl_FragColor = texture2D(uSampler, color);',
+        '}'
     ];
-	
+};
-
-}
 
 PIXI.PixelateFilter.prototype = Object.create( PIXI.AbstractFilter.prototype );
 PIXI.PixelateFilter.prototype.constructor = PIXI.PixelateFilter;

src/pixi/filters/RGBSplitFilter.js

@@ -2,8 +2,6 @@
  * @author Mat Groves http://matgroves.com/ @Doormat23
  */
 
-
-
 PIXI.RGBSplitFilter = function()
 {
     PIXI.AbstractFilter.call( this );
@@ -19,22 +17,23 @@ PIXI.RGBSplitFilter = function()
     };
 
     this.fragmentSrc = [
-	  "precision mediump float;",
+        'precision mediump float;',
-	  "varying vec2 vTextureCoord;",
+        'varying vec2 vTextureCoord;',
-	  "varying float vColor;",
+        'varying float vColor;',
-	  "uniform vec2 red;",
+        'uniform vec2 red;',
-	  "uniform vec2 green;",
+        'uniform vec2 green;',
-	  "uniform vec2 blue;",
+        'uniform vec2 blue;',
-	  "uniform vec4 dimensions;",
+        'uniform vec4 dimensions;',
-	  "uniform sampler2D uSampler;",
+        'uniform sampler2D uSampler;',
-	    "void main(void) {",
+
-	  	  "gl_FragColor.r = texture2D(uSampler, vTextureCoord + red/dimensions.xy).r;",
+        'void main(void) {',
-	  	  "gl_FragColor.g = texture2D(uSampler, vTextureCoord + green/dimensions.xy).g;",
+        '   gl_FragColor.r = texture2D(uSampler, vTextureCoord + red/dimensions.xy).r;',
-	  	  "gl_FragColor.b = texture2D(uSampler, vTextureCoord + blue/dimensions.xy).b;",
+        '   gl_FragColor.g = texture2D(uSampler, vTextureCoord + green/dimensions.xy).g;',
-	  	  "gl_FragColor.a = texture2D(uSampler, vTextureCoord).a;",
+        '   gl_FragColor.b = texture2D(uSampler, vTextureCoord + blue/dimensions.xy).b;',
-	  "}"
+        '   gl_FragColor.a = texture2D(uSampler, vTextureCoord).a;',
+        '}'
     ];
-}
+};
 
 PIXI.RGBSplitFilter.prototype = Object.create( PIXI.AbstractFilter.prototype );
 PIXI.RGBSplitFilter.prototype.constructor = PIXI.RGBSplitFilter;

src/pixi/filters/SepiaFilter.js

@@ -1,9 +1,7 @@
-/**
 /**
  * @author Mat Groves http://matgroves.com/ @Doormat23
  */
 
-
 /**
  *
  * This applies a sepia effect to your displayObjects.
@@ -22,21 +20,21 @@ PIXI.SepiaFilter = function()
     };
 
     this.fragmentSrc = [
-	  "precision mediump float;",
+        'precision mediump float;',
-	  "varying vec2 vTextureCoord;",
+        'varying vec2 vTextureCoord;',
-	  "varying float vColor;",
+        'varying float vColor;',
-	  "uniform float sepia;",
+        'uniform float sepia;',
-	  "uniform sampler2D uSampler;",
+        'uniform sampler2D uSampler;',
 
-	  "const mat3 sepiaMatrix = mat3(0.3588, 0.7044, 0.1368, 0.2990, 0.5870, 0.1140, 0.2392, 0.4696, 0.0912);",
+        'const mat3 sepiaMatrix = mat3(0.3588, 0.7044, 0.1368, 0.2990, 0.5870, 0.1140, 0.2392, 0.4696, 0.0912);',
-	  "void main(void) {",
+
-	    "gl_FragColor = texture2D(uSampler, vTextureCoord);",
+        'void main(void) {',
-		"gl_FragColor.rgb = mix( gl_FragColor.rgb, gl_FragColor.rgb * sepiaMatrix, sepia);",
+        '   gl_FragColor = texture2D(uSampler, vTextureCoord);',
-	    "gl_FragColor = gl_FragColor * vColor;",
+        '   gl_FragColor.rgb = mix( gl_FragColor.rgb, gl_FragColor.rgb * sepiaMatrix, sepia);',
-	  "}"
+        '   gl_FragColor = gl_FragColor * vColor;',
+        '}'
     ];
-	
+};
-}
 
 PIXI.SepiaFilter.prototype = Object.create( PIXI.AbstractFilter.prototype );
 PIXI.SepiaFilter.prototype.constructor = PIXI.SepiaFilter;

src/pixi/filters/SmartBlurFilter.js

@@ -2,8 +2,6 @@
  * @author Mat Groves http://matgroves.com/ @Doormat23
  */
 
-
-
 PIXI.SmartBlurFilter = function()
 {
     PIXI.AbstractFilter.call( this );
@@ -16,40 +14,39 @@ PIXI.SmartBlurFilter = function()
     };
 
     this.fragmentSrc = [
-	  "precision mediump float;",
+        'precision mediump float;',
- 	  "varying vec2 vTextureCoord;",
+        'varying vec2 vTextureCoord;',
-  	  "uniform sampler2D uSampler;",
+        'uniform sampler2D uSampler;',
-    //  "uniform vec2 delta;",
+        //'uniform vec2 delta;',
-      "const vec2 delta = vec2(1.0/10.0, 0.0);",
+        'const vec2 delta = vec2(1.0/10.0, 0.0);',
-     // "uniform float darkness;",
+        //'uniform float darkness;',
 
-	  "float random(vec3 scale, float seed) {",
+        'float random(vec3 scale, float seed) {',
-	        "return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);",
+        '   return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);',
-	   "}",
+        '}',
 
 
-	  "void main(void) {",
+        'void main(void) {',
+        '   vec4 color = vec4(0.0);',
+        '   float total = 0.0;',
 
-	  "vec4 color = vec4(0.0);",
+        '   float offset = random(vec3(12.9898, 78.233, 151.7182), 0.0);',
-	  "float total = 0.0;",
 
-	  "float offset = random(vec3(12.9898, 78.233, 151.7182), 0.0);",
+        '   for (float t = -30.0; t <= 30.0; t++) {',
+        '       float percent = (t + offset - 0.5) / 30.0;',
+        '       float weight = 1.0 - abs(percent);',
+        '       vec4 sample = texture2D(uSampler, vTextureCoord + delta * percent);',
+        '       sample.rgb *= sample.a;',
+        '       color += sample * weight;',
+        '       total += weight;',
+        '   }',
 
-	  "for (float t = -30.0; t <= 30.0; t++) {",
+        '   gl_FragColor = color / total;',
-	           "float percent = (t + offset - 0.5) / 30.0;",
+        '   gl_FragColor.rgb /= gl_FragColor.a + 0.00001;',
-	                "float weight = 1.0 - abs(percent);",
+        //'   gl_FragColor.rgb *= darkness;',
-	                "vec4 sample = texture2D(uSampler, vTextureCoord + delta * percent);",
+        '}'
-	                "sample.rgb *= sample.a;",
-	                "color += sample * weight;",
-	                "total += weight;",
-	            "}",
-	            
-	            "gl_FragColor = color / total;",
-	            "gl_FragColor.rgb /= gl_FragColor.a + 0.00001;",
-	          //  "gl_FragColor.rgb *= darkness;",
-	  "}"
     ];
-}
+};
 
 PIXI.SmartBlurFilter.prototype = Object.create( PIXI.AbstractFilter.prototype );
 PIXI.SmartBlurFilter.prototype.constructor = PIXI.SmartBlurFilter;

src/pixi/filters/TwistFilter.js

@@ -4,7 +4,7 @@
 
 /**
  *
- * This filter applies a pixlate effect making display objects appear "blocky"
+ * This filter applies a pixlate effect making display objects appear 'blocky'
  * @class PixelateFilter
  * @contructor
  */
@@ -22,34 +22,32 @@ PIXI.TwistFilter = function()
     };
 
     this.fragmentSrc = [
-	  "precision mediump float;",
+        'precision mediump float;',
-	  "varying vec2 vTextureCoord;",
+        'varying vec2 vTextureCoord;',
-	  "varying float vColor;",
+        'varying float vColor;',
-	  "uniform vec4 dimensions;",
+        'uniform vec4 dimensions;',
-	  "uniform sampler2D uSampler;",
+        'uniform sampler2D uSampler;',
 
-	  "uniform float radius;",
+        'uniform float radius;',
-      "uniform float angle;",
+        'uniform float angle;',
-      "uniform vec2 offset;",
+        'uniform vec2 offset;',
 
-	  "void main(void) {",
+        'void main(void) {',
-	 	"vec2 coord = vTextureCoord - offset;",
+        '   vec2 coord = vTextureCoord - offset;',
-		"float distance = length(coord);",
+        '   float distance = length(coord);',
 
-	 	"if (distance < radius){",
+        '   if (distance < radius) {',
+        '       float ratio = (radius - distance) / radius;',
+        '       float angleMod = ratio * ratio * angle;',
+        '       float s = sin(angleMod);',
+        '       float c = cos(angleMod);',
+        '       coord = vec2(coord.x * c - coord.y * s, coord.x * s + coord.y * c);',
+        '   }',
 
-		 	"float ratio = (radius - distance) / radius;",
+        '   gl_FragColor = texture2D(uSampler, coord+offset);',
-		 	"float angleMod = ratio * ratio * angle;",
+        '}'
-		 	"float s = sin(angleMod);",
-		 	"float c = cos(angleMod);",
-		 	"coord = vec2(coord.x * c - coord.y * s, coord.x * s + coord.y * c);",
-
-	 	"}",
-
-	    "gl_FragColor = texture2D(uSampler, coord+offset);",
-	  "}"
     ];
-}
+};
 
 PIXI.TwistFilter.prototype = Object.create( PIXI.AbstractFilter.prototype );
 PIXI.TwistFilter.prototype.constructor = PIXI.TwistFilter;

src/pixi/loaders/AssetLoader.js

@@ -6,16 +6,16 @@
  * A Class that loads a bunch of images / sprite sheet / bitmap font files. Once the
  * assets have been loaded they are added to the PIXI Texture cache and can be accessed
  * easily through PIXI.Texture.fromImage() and PIXI.Sprite.fromImage()
- * When all items have been loaded this class will dispatch a "onLoaded" event
+ * When all items have been loaded this class will dispatch a 'onLoaded' event
- * As each individual item is loaded this class will dispatch a "onProgress" event
+ * As each individual item is loaded this class will dispatch a 'onProgress' event
  *
  * @class AssetLoader
  * @constructor
  * @uses EventTarget
  * @param {Array<String>} assetURLs an array of image/sprite sheet urls that you would like loaded
- *      supported. Supported image formats include "jpeg", "jpg", "png", "gif". Supported
+ *      supported. Supported image formats include 'jpeg', 'jpg', 'png', 'gif'. Supported
- *      sprite sheet data formats only include "JSON" at this time. Supported bitmap font
+ *      sprite sheet data formats only include 'JSON' at this time. Supported bitmap font
- *      data formats include "xml" and "fnt".
+ *      data formats include 'xml' and 'fnt'.
  * @param crossorigin {Boolean} Whether requests should be treated as crossorigin
  */
 PIXI.AssetLoader = function(assetURLs, crossorigin)
@@ -45,17 +45,16 @@ PIXI.AssetLoader = function(assetURLs, crossorigin)
      * @type Object
      */
     this.loadersByType = {
-        "jpg":  PIXI.ImageLoader,
+        'jpg':  PIXI.ImageLoader,
-        "jpeg": PIXI.ImageLoader,
+        'jpeg': PIXI.ImageLoader,
-        "png":  PIXI.ImageLoader,
+        'png':  PIXI.ImageLoader,
-        "gif":  PIXI.ImageLoader,
+        'gif':  PIXI.ImageLoader,
-        "json": PIXI.JsonLoader,
+        'json': PIXI.JsonLoader,
-        "anim": PIXI.SpineLoader,
+        'atlas': PIXI.AtlasLoader,
-        "xml":  PIXI.BitmapFontLoader,
+        'anim': PIXI.SpineLoader,
-        "fnt":  PIXI.BitmapFontLoader
+        'xml':  PIXI.BitmapFontLoader,
+        'fnt':  PIXI.BitmapFontLoader
     };
-
-
 };
 
 /**
@@ -74,29 +73,30 @@ PIXI.AssetLoader.prototype.constructor = PIXI.AssetLoader;
 
 PIXI.AssetLoader.prototype._getDataType = function(str)
 {
-    var test = "data:";
+    var test = 'data:';
     //starts with 'data:'
     var start = str.slice(0, test.length).toLowerCase();
-    if (start == test) {
+    if (start === test) {
         var data = str.slice(test.length);
 
         var sepIdx = data.indexOf(',');
         if (sepIdx === -1) //malformed data URI scheme
             return null;
 
-        //e.g. "image/gif;base64" => "image/gif"
+        //e.g. 'image/gif;base64' => 'image/gif'
         var info = data.slice(0, sepIdx).split(';')[0];
 
         //We might need to handle some special cases here...
-        //standardize text/plain to "txt" file extension
+        //standardize text/plain to 'txt' file extension
-        if (!info || info.toLowerCase() == "text/plain")
+        if (!info || info.toLowerCase() === 'text/plain')
-            return "txt"
+            return 'txt';
 
         //User specified mime type, try splitting it by '/'
         return info.split('/').pop().toLowerCase();
     }
+
     return null;
-}
+};
 
 /**
  * Starts loading the assets sequentially
@@ -107,6 +107,10 @@ PIXI.AssetLoader.prototype.load = function()
 {
     var scope = this;
 
+    function onLoad() {
+        scope.onAssetLoaded();
+    }
+
     this.loadCount = this.assetURLs.length;
 
     for (var i=0; i < this.assetURLs.length; i++)
@@ -117,18 +121,15 @@ PIXI.AssetLoader.prototype.load = function()
 
         //if not, assume it's a file URI
         if (!fileType)
-            fileType = fileName.split("?").shift().split(".").pop().toLowerCase();
+            fileType = fileName.split('?').shift().split('.').pop().toLowerCase();
 
-        var loaderClass = this.loadersByType[fileType];
+        var Constructor = this.loadersByType[fileType];
-        if(!loaderClass)
+        if(!Constructor)
-            throw new Error(fileType + " is an unsupported file type");
+            throw new Error(fileType + ' is an unsupported file type');
 
-        var loader = new loaderClass(fileName, this.crossorigin);
+        var loader = new Constructor(fileName, this.crossorigin);
 
-        loader.addEventListener("loaded", function()
+        loader.addEventListener('loaded', onLoad);
-        {
-            scope.onAssetLoaded();
-        });
         loader.load();
     }
 };
@@ -142,13 +143,12 @@ PIXI.AssetLoader.prototype.load = function()
 PIXI.AssetLoader.prototype.onAssetLoaded = function()
 {
     this.loadCount--;
-	this.dispatchEvent({type: "onProgress", content: this});
+    this.dispatchEvent({type: 'onProgress', content: this});
-	if(this.onProgress) this.onProgress();
+    if (this.onProgress) this.onProgress();
 
-	if(this.loadCount == 0)
+    if (!this.loadCount)
     {
-		this.dispatchEvent({type: "onComplete", content: this});
+        this.dispatchEvent({type: 'onComplete', content: this});
         if(this.onComplete) this.onComplete();
     }
 };
-

src/pixi/loaders/AtlasLoader.js

@@ -0,0 +1,184 @@
+/**
+ * @author Martin Kelm http://mkelm.github.com
+ */
+
+/**
+ * The atlas file loader is used to load in Atlas data and parsing it
+ * When loaded this class will dispatch a 'loaded' event
+ * If load failed this class will dispatch a 'error' event
+ * @class AtlasLoader
+ * @extends EventTarget
+ * @constructor
+ * @param {String} url the url of the JSON file
+ * @param {Boolean} crossorigin
+ */
+
+PIXI.AtlasLoader = function (url, crossorigin) {
+    PIXI.EventTarget.call(this);
+    this.url = url;
+    this.baseUrl = url.replace(/[^\/]*$/, '');
+    this.crossorigin = crossorigin;
+    this.loaded = false;
+
+};
+
+// constructor
+PIXI.AtlasLoader.constructor = PIXI.AtlasLoader;
+
+/**
+ * This will begin loading the JSON file
+ */
+PIXI.AtlasLoader.prototype.load = function () {
+    this.ajaxRequest = new PIXI.AjaxRequest();
+    this.ajaxRequest.onreadystatechange = this.onAtlasLoaded.bind(this);
+
+    this.ajaxRequest.open('GET', this.url, true);
+    if (this.ajaxRequest.overrideMimeType) this.ajaxRequest.overrideMimeType('application/json');
+    this.ajaxRequest.send(null);
+};
+
+/**
+ * Invoke when JSON file is loaded
+ * @private
+ */
+PIXI.AtlasLoader.prototype.onAtlasLoaded = function () {
+    if (this.ajaxRequest.readyState === 4) {
+        if (this.ajaxRequest.status === 200 || window.location.href.indexOf('http') === -1) {
+            this.atlas = {
+                meta : {
+                    image : []
+                },
+                frames : []
+            };
+            var result = this.ajaxRequest.responseText.split(/\r?\n/);
+            var lineCount = -3;
+
+            var currentImageId = 0;
+            var currentFrame = null;
+            var nameInNextLine = false;
+
+            var i = 0,
+                j = 0,
+                selfOnLoaded = this.onLoaded.bind(this);
+
+            // parser without rotation support yet!
+            for (i = 0; i < result.length; i++) {
+                result[i] = result[i].replace(/^\s+|\s+$/g, '');
+                if (result[i] === '') {
+                    nameInNextLine = i+1;
+                }
+                if (result[i].length > 0) {
+                    if (nameInNextLine === i) {
+                        this.atlas.meta.image.push(result[i]);
+                        currentImageId = this.atlas.meta.image.length - 1;
+                        this.atlas.frames.push({});
+                        lineCount = -3;
+                    } else if (lineCount > 0) {
+                        if (lineCount % 7 === 1) { // frame name
+                            if (currentFrame != null) { //jshint ignore:line
+                                this.atlas.frames[currentImageId][currentFrame.name] = currentFrame;
+                            }
+                            currentFrame = { name: result[i], frame : {} };
+                        } else {
+                            var text = result[i].split(' ');
+                            if (lineCount % 7 === 3) { // position
+                                currentFrame.frame.x = Number(text[1].replace(',', ''));
+                                currentFrame.frame.y = Number(text[2]);
+                            } else if (lineCount % 7 === 4) { // size
+                                currentFrame.frame.w = Number(text[1].replace(',', ''));
+                                currentFrame.frame.h = Number(text[2]);
+                            } else if (lineCount % 7 === 5) { // real size
+                                var realSize = {
+                                    x : 0,
+                                    y : 0,
+                                    w : Number(text[1].replace(',', '')),
+                                    h : Number(text[2])
+                                };
+
+                                if (realSize.w > currentFrame.frame.w || realSize.h > currentFrame.frame.h) {
+                                    currentFrame.trimmed = true;
+                                    currentFrame.realSize = realSize;
+                                } else {
+                                    currentFrame.trimmed = false;
+                                }
+                            }
+                        }
+                    }
+                    lineCount++;
+                }
+            }
+
+            if (currentFrame != null) { //jshint ignore:line
+                this.atlas.frames[currentImageId][currentFrame.name] = currentFrame;
+            }
+
+            if (this.atlas.meta.image.length > 0) {
+                this.images = [];
+                for (j = 0; j < this.atlas.meta.image.length; j++) {
+                    // sprite sheet
+                    var textureUrl = this.baseUrl + this.atlas.meta.image[j];
+                    var frameData = this.atlas.frames[j];
+                    this.images.push(new PIXI.ImageLoader(textureUrl, this.crossorigin));
+
+                    for (i in frameData) {
+                        var rect = frameData[i].frame;
+                        if (rect) {
+                            PIXI.TextureCache[i] = new PIXI.Texture(this.images[j].texture.baseTexture, {
+                                x: rect.x,
+                                y: rect.y,
+                                width: rect.w,
+                                height: rect.h
+                            });
+                            if (frameData[i].trimmed) {
+                                PIXI.TextureCache[i].realSize = frameData[i].realSize;
+                                // trim in pixi not supported yet, todo update trim properties if it is done ...
+                                PIXI.TextureCache[i].trim.x = 0;
+                                PIXI.TextureCache[i].trim.y = 0;
+                            }
+                        }
+                    }
+                }
+
+                this.currentImageId = 0;
+                for (j = 0; j < this.images.length; j++) {
+                    this.images[j].addEventListener('loaded', selfOnLoaded);
+                }
+                this.images[this.currentImageId].load();
+
+            } else {
+                this.onLoaded();
+            }
+
+        } else {
+            this.onError();
+        }
+    }
+};
+
+/**
+ * Invoke when json file loaded
+ * @private
+ */
+PIXI.AtlasLoader.prototype.onLoaded = function () {
+    if (this.images.length - 1 > this.currentImageId) {
+        this.currentImageId++;
+        this.images[this.currentImageId].load();
+    } else {
+        this.loaded = true;
+        this.dispatchEvent({
+            type: 'loaded',
+            content: this
+        });
+    }
+};
+
+/**
+ * Invoke when error occured
+ * @private
+ */
+PIXI.AtlasLoader.prototype.onError = function () {
+    this.dispatchEvent({
+        type: 'error',
+        content: this
+    });
+};

src/pixi/loaders/BitmapFontLoader.js

@@ -3,10 +3,10 @@
  */
 
 /**
- * The xml loader is used to load in XML bitmap font data ("xml" or "fnt")
+ * The xml loader is used to load in XML bitmap font data ('xml' or 'fnt')
  * To generate the data you can use http://www.angelcode.com/products/bmfont/
  * This loader will also load the image file as the data.
- * When loaded this class will dispatch a "loaded" event
+ * When loaded this class will dispatch a 'loaded' event
  *
  * @class BitmapFontLoader
  * @uses EventTarget
@@ -19,7 +19,7 @@ PIXI.BitmapFontLoader = function(url, crossorigin)
     /*
      * i use texture packer to load the assets..
      * http://www.codeandweb.com/texturepacker
-     * make sure to set the format as "JSON"
+     * make sure to set the format as 'JSON'
      */
     PIXI.EventTarget.call(this);
 
@@ -46,7 +46,7 @@ PIXI.BitmapFontLoader = function(url, crossorigin)
      * @type String
      * @readOnly
      */
-    this.baseUrl = url.replace(/[^\/]*$/, "");
+    this.baseUrl = url.replace(/[^\/]*$/, '');
 
     /**
      * [read-only] The texture of the bitmap font
@@ -74,9 +74,9 @@ PIXI.BitmapFontLoader.prototype.load = function()
         scope.onXMLLoaded();
     };
 
-    this.ajaxRequest.open("GET", this.url, true);
+    this.ajaxRequest.open('GET', this.url, true);
-    if (this.ajaxRequest.overrideMimeType) this.ajaxRequest.overrideMimeType("application/xml");
+    if (this.ajaxRequest.overrideMimeType) this.ajaxRequest.overrideMimeType('application/xml');
-    this.ajaxRequest.send(null)
+    this.ajaxRequest.send(null);
 };
 
 /**
@@ -87,40 +87,40 @@ PIXI.BitmapFontLoader.prototype.load = function()
  */
 PIXI.BitmapFontLoader.prototype.onXMLLoaded = function()
 {
-    if (this.ajaxRequest.readyState == 4)
+    if (this.ajaxRequest.readyState === 4)
     {
-        if (this.ajaxRequest.status == 200 || window.location.href.indexOf("http") == -1)
+        if (this.ajaxRequest.status === 200 || window.location.protocol.indexOf('http') === -1)
         {
-            var textureUrl = this.baseUrl + this.ajaxRequest.responseXML.getElementsByTagName("page")[0].attributes.getNamedItem("file").nodeValue;
+            var textureUrl = this.baseUrl + this.ajaxRequest.responseXML.getElementsByTagName('page')[0].attributes.getNamedItem('file').nodeValue;
             var image = new PIXI.ImageLoader(textureUrl, this.crossorigin);
             this.texture = image.texture.baseTexture;
 
             var data = {};
-            var info = this.ajaxRequest.responseXML.getElementsByTagName("info")[0];
+            var info = this.ajaxRequest.responseXML.getElementsByTagName('info')[0];
-            var common = this.ajaxRequest.responseXML.getElementsByTagName("common")[0];
+            var common = this.ajaxRequest.responseXML.getElementsByTagName('common')[0];
-            data.font = info.attributes.getNamedItem("face").nodeValue;
+            data.font = info.attributes.getNamedItem('face').nodeValue;
-            data.size = parseInt(info.attributes.getNamedItem("size").nodeValue, 10);
+            data.size = parseInt(info.attributes.getNamedItem('size').nodeValue, 10);
-            data.lineHeight = parseInt(common.attributes.getNamedItem("lineHeight").nodeValue, 10);
+            data.lineHeight = parseInt(common.attributes.getNamedItem('lineHeight').nodeValue, 10);
             data.chars = {};
 
             //parse letters
-            var letters = this.ajaxRequest.responseXML.getElementsByTagName("char");
+            var letters = this.ajaxRequest.responseXML.getElementsByTagName('char');
 
             for (var i = 0; i < letters.length; i++)
             {
-                var charCode = parseInt(letters[i].attributes.getNamedItem("id").nodeValue, 10);
+                var charCode = parseInt(letters[i].attributes.getNamedItem('id').nodeValue, 10);
 
                 var textureRect = new PIXI.Rectangle(
-                    parseInt(letters[i].attributes.getNamedItem("x").nodeValue, 10),
+                    parseInt(letters[i].attributes.getNamedItem('x').nodeValue, 10),
-                    parseInt(letters[i].attributes.getNamedItem("y").nodeValue, 10),
+                    parseInt(letters[i].attributes.getNamedItem('y').nodeValue, 10),
-                    parseInt(letters[i].attributes.getNamedItem("width").nodeValue, 10),
+                    parseInt(letters[i].attributes.getNamedItem('width').nodeValue, 10),
-                    parseInt(letters[i].attributes.getNamedItem("height").nodeValue, 10)
+                    parseInt(letters[i].attributes.getNamedItem('height').nodeValue, 10)
                 );
 
                 data.chars[charCode] = {
-                    xOffset: parseInt(letters[i].attributes.getNamedItem("xoffset").nodeValue, 10),
+                    xOffset: parseInt(letters[i].attributes.getNamedItem('xoffset').nodeValue, 10),
-                    yOffset: parseInt(letters[i].attributes.getNamedItem("yoffset").nodeValue, 10),
+                    yOffset: parseInt(letters[i].attributes.getNamedItem('yoffset').nodeValue, 10),
-                    xAdvance: parseInt(letters[i].attributes.getNamedItem("xadvance").nodeValue, 10),
+                    xAdvance: parseInt(letters[i].attributes.getNamedItem('xadvance').nodeValue, 10),
                     kerning: {},
                     texture: PIXI.TextureCache[charCode] = new PIXI.Texture(this.texture, textureRect)
 
@@ -128,12 +128,12 @@ PIXI.BitmapFontLoader.prototype.onXMLLoaded = function()
             }
 
             //parse kernings
-            var kernings = this.ajaxRequest.responseXML.getElementsByTagName("kerning");
+            var kernings = this.ajaxRequest.responseXML.getElementsByTagName('kerning');
             for (i = 0; i < kernings.length; i++)
             {
-               var first = parseInt(kernings[i].attributes.getNamedItem("first").nodeValue, 10);
+                var first = parseInt(kernings[i].attributes.getNamedItem('first').nodeValue, 10);
-               var second = parseInt(kernings[i].attributes.getNamedItem("second").nodeValue, 10);
+                var second = parseInt(kernings[i].attributes.getNamedItem('second').nodeValue, 10);
-               var amount = parseInt(kernings[i].attributes.getNamedItem("amount").nodeValue, 10);
+                var amount = parseInt(kernings[i].attributes.getNamedItem('amount').nodeValue, 10);
 
                 data.chars[second].kerning[first] = amount;
 
@@ -142,7 +142,7 @@ PIXI.BitmapFontLoader.prototype.onXMLLoaded = function()
             PIXI.BitmapText.fonts[data.font] = data;
 
             var scope = this;
-            image.addEventListener("loaded", function() {
+            image.addEventListener('loaded', function() {
                 scope.onLoaded();
             });
             image.load();
@@ -158,5 +158,5 @@ PIXI.BitmapFontLoader.prototype.onXMLLoaded = function()
  */
 PIXI.BitmapFontLoader.prototype.onLoaded = function()
 {
-    this.dispatchEvent({type: "loaded", content: this});
+    this.dispatchEvent({type: 'loaded', content: this});
 };

src/pixi/loaders/ImageLoader.js

@@ -3,7 +3,7 @@
  */
 
 /**
- * The image loader class is responsible for loading images file formats ("jpeg", "jpg", "png" and "gif")
+ * The image loader class is responsible for loading images file formats ('jpeg', 'jpg', 'png' and 'gif')
  * Once the image has been loaded it is stored in the PIXI texture cache and can be accessed though PIXI.Texture.fromFrameId() and PIXI.Sprite.fromFromeId()
  * When loaded this class will dispatch a 'loaded' event
  *
@@ -46,7 +46,7 @@ PIXI.ImageLoader.prototype.load = function()
     if(!this.texture.baseTexture.hasLoaded)
     {
         var scope = this;
-        this.texture.baseTexture.addEventListener("loaded", function()
+        this.texture.baseTexture.addEventListener('loaded', function()
         {
             scope.onLoaded();
         });
@@ -65,7 +65,7 @@ PIXI.ImageLoader.prototype.load = function()
  */
 PIXI.ImageLoader.prototype.onLoaded = function()
 {
-    this.dispatchEvent({type: "loaded", content: this});
+    this.dispatchEvent({type: 'loaded', content: this});
 };
 
 /**
@@ -96,14 +96,14 @@ PIXI.ImageLoader.prototype.loadFramedSpriteSheet = function(frameWidth, frameHei
             });
 
             this.frames.push(texture);
-            if (textureName) PIXI.TextureCache[textureName+'-'+i] = texture;
+            if (textureName) PIXI.TextureCache[textureName + '-' + i] = texture;
         }
     }
 
     if(!this.texture.baseTexture.hasLoaded)
     {
         var scope = this;
-        this.texture.baseTexture.addEventListener("loaded", function() {
+        this.texture.baseTexture.addEventListener('loaded', function() {
             scope.onLoaded();
         });
     }

src/pixi/loaders/JsonLoader.js

@@ -4,8 +4,8 @@
 
 /**
  * The json file loader is used to load in JSON data and parsing it
- * When loaded this class will dispatch a "loaded" event
+ * When loaded this class will dispatch a 'loaded' event
- * If load failed this class will dispatch a "error" event
+ * If load failed this class will dispatch a 'error' event
  *
  * @class JsonLoader
  * @uses EventTarget
@@ -39,7 +39,7 @@ PIXI.JsonLoader = function (url, crossorigin) {
      * @type String
      * @readOnly
      */
-	this.baseUrl = url.replace(/[^\/]*$/, "");
+    this.baseUrl = url.replace(/[^\/]*$/, '');
 
     /**
      * [read-only] Whether the data has loaded yet
@@ -61,14 +61,14 @@ PIXI.JsonLoader.prototype.constructor = PIXI.JsonLoader;
  * @method load
  */
 PIXI.JsonLoader.prototype.load = function () {
-	this.ajaxRequest = new AjaxRequest();
+    this.ajaxRequest = new PIXI.AjaxRequest();
     var scope = this;
     this.ajaxRequest.onreadystatechange = function () {
         scope.onJSONLoaded();
     };
 
-	this.ajaxRequest.open("GET", this.url, true);
+    this.ajaxRequest.open('GET', this.url, true);
-	if (this.ajaxRequest.overrideMimeType) this.ajaxRequest.overrideMimeType("application/json");
+    if (this.ajaxRequest.overrideMimeType) this.ajaxRequest.overrideMimeType('application/json');
     this.ajaxRequest.send(null);
 };
 
@@ -79,8 +79,8 @@ PIXI.JsonLoader.prototype.load = function () {
  * @private
  */
 PIXI.JsonLoader.prototype.onJSONLoaded = function () {
-	if (this.ajaxRequest.readyState == 4) {
+    if (this.ajaxRequest.readyState === 4) {
-		if (this.ajaxRequest.status == 200 || window.location.href.indexOf("http") == -1) {
+        if (this.ajaxRequest.status === 200 || window.location.protocol.indexOf('http') === -1) {
             this.json = JSON.parse(this.ajaxRequest.responseText);
 
             if(this.json.frames)
@@ -92,7 +92,7 @@ PIXI.JsonLoader.prototype.onJSONLoaded = function () {
                 var frameData = this.json.frames;
 
                 this.texture = image.texture.baseTexture;
-				image.addEventListener("loaded", function (event) {
+                image.addEventListener('loaded', function() {
                     scope.onLoaded();
                 });
 
@@ -146,7 +146,7 @@ PIXI.JsonLoader.prototype.onJSONLoaded = function () {
 PIXI.JsonLoader.prototype.onLoaded = function () {
     this.loaded = true;
     this.dispatchEvent({
-		type: "loaded",
+        type: 'loaded',
         content: this
     });
 };
@@ -159,7 +159,7 @@ PIXI.JsonLoader.prototype.onLoaded = function () {
  */
 PIXI.JsonLoader.prototype.onError = function () {
     this.dispatchEvent({
-		type: "error",
+        type: 'error',
         content: this
     });
 };

src/pixi/loaders/SpineLoader.js

@@ -49,7 +49,7 @@ PIXI.SpineLoader = function(url, crossorigin)
      * @readOnly
      */
     this.loaded = false;
-}
+};
 
 PIXI.SpineLoader.prototype.constructor = PIXI.SpineLoader;
 
@@ -75,7 +75,7 @@ PIXI.SpineLoader.prototype.load = function () {
  * @method onJSONLoaded
  * @private
  */
-PIXI.SpineLoader.prototype.onJSONLoaded = function (event) {
+PIXI.SpineLoader.prototype.onJSONLoaded = function () {
     var spineJsonParser = new spine.SkeletonJson();
     var skeletonData = spineJsonParser.readSkeletonData(this.json);
 

src/pixi/loaders/SpriteSheetLoader.js

@@ -4,12 +4,12 @@
 
 /**
  * The sprite sheet loader is used to load in JSON sprite sheet data
- * To generate the data you can use http://www.codeandweb.com/texturepacker and publish the "JSON" format
+ * To generate the data you can use http://www.codeandweb.com/texturepacker and publish the 'JSON' format
  * There is a free version so thats nice, although the paid version is great value for money.
- * It is highly recommended to use Sprite sheets (also know as texture atlas") as it means sprite"s can be batched and drawn together for highly increased rendering speed.
+ * It is highly recommended to use Sprite sheets (also know as texture atlas') as it means sprite's can be batched and drawn together for highly increased rendering speed.
  * Once the data has been loaded the frames are stored in the PIXI texture cache and can be accessed though PIXI.Texture.fromFrameId() and PIXI.Sprite.fromFromeId()
  * This loader will also load the image file that the Spritesheet points to as well as the data.
- * When loaded this class will dispatch a "loaded" event
+ * When loaded this class will dispatch a 'loaded' event
  *
  * @class SpriteSheetLoader
  * @uses EventTarget
@@ -17,12 +17,11 @@
  * @param url {String} The url of the sprite sheet JSON file
  * @param crossorigin {Boolean} Whether requests should be treated as crossorigin
  */
-
 PIXI.SpriteSheetLoader = function (url, crossorigin) {
     /*
      * i use texture packer to load the assets..
      * http://www.codeandweb.com/texturepacker
-	 * make sure to set the format as "JSON"
+     * make sure to set the format as 'JSON'
      */
     PIXI.EventTarget.call(this);
 
@@ -49,7 +48,7 @@ PIXI.SpriteSheetLoader = function (url, crossorigin) {
      * @type String
      * @readOnly
      */
-	this.baseUrl = url.replace(/[^\/]*$/, "");
+    this.baseUrl = url.replace(/[^\/]*$/, '');
 
     /**
      * The texture being loaded
@@ -79,7 +78,7 @@ PIXI.SpriteSheetLoader.prototype.constructor = PIXI.SpriteSheetLoader;
 PIXI.SpriteSheetLoader.prototype.load = function () {
     var scope = this;
     var jsonLoader = new PIXI.JsonLoader(this.url, this.crossorigin);
-	jsonLoader.addEventListener("loaded", function (event) {
+    jsonLoader.addEventListener('loaded', function (event) {
         scope.json = event.content.json;
         scope.onJSONLoaded();
     });
@@ -99,7 +98,7 @@ PIXI.SpriteSheetLoader.prototype.onJSONLoaded = function () {
     var frameData = this.json.frames;
 
     this.texture = image.texture.baseTexture;
-	image.addEventListener("loaded", function (event) {
+    image.addEventListener('loaded', function () {
         scope.onLoaded();
     });
 
@@ -123,6 +122,7 @@ PIXI.SpriteSheetLoader.prototype.onJSONLoaded = function () {
 
     image.load();
 };
+
 /**
  * Invoke when all files are loaded (json and texture)
  *
@@ -131,7 +131,7 @@ PIXI.SpriteSheetLoader.prototype.onJSONLoaded = function () {
  */
 PIXI.SpriteSheetLoader.prototype.onLoaded = function () {
     this.dispatchEvent({
-		type: "loaded",
+        type: 'loaded',
         content: this
     });
 };

src/pixi/primitives/Graphics.js

@@ -59,7 +59,7 @@ PIXI.Graphics = function()
      * @private
      */
     this.currentPath = {points:[]};
-}
+};
 
 // constructor
 PIXI.Graphics.prototype = Object.create( PIXI.DisplayObjectContainer.prototype );
@@ -75,17 +75,17 @@ PIXI.Graphics.prototype.constructor = PIXI.Graphics;
  */
 PIXI.Graphics.prototype.lineStyle = function(lineWidth, color, alpha)
 {
-	if(this.currentPath.points.length == 0)this.graphicsData.pop();
+    if (!this.currentPath.points.length) this.graphicsData.pop();
 
     this.lineWidth = lineWidth || 0;
     this.lineColor = color || 0;
-	this.lineAlpha = (alpha == undefined) ? 1 : alpha;
+    this.lineAlpha = (arguments.length < 3) ? 1 : alpha;
 
     this.currentPath = {lineWidth:this.lineWidth, lineColor:this.lineColor, lineAlpha:this.lineAlpha,
                         fillColor:this.fillColor, fillAlpha:this.fillAlpha, fill:this.filling, points:[], type:PIXI.Graphics.POLY};
 
     this.graphicsData.push(this.currentPath);
-}
+};
 
 /**
  * Moves the current drawing position to (x, y).
@@ -96,7 +96,7 @@ PIXI.Graphics.prototype.lineStyle = function(lineWidth, color, alpha)
  */
 PIXI.Graphics.prototype.moveTo = function(x, y)
 {
-	if(this.currentPath.points.length == 0)this.graphicsData.pop();
+    if (!this.currentPath.points.length) this.graphicsData.pop();
 
     this.currentPath = this.currentPath = {lineWidth:this.lineWidth, lineColor:this.lineColor, lineAlpha:this.lineAlpha,
                         fillColor:this.fillColor, fillAlpha:this.fillAlpha, fill:this.filling, points:[], type:PIXI.Graphics.POLY};
@@ -104,7 +104,7 @@ PIXI.Graphics.prototype.moveTo = function(x, y)
     this.currentPath.points.push(x, y);
 
     this.graphicsData.push(this.currentPath);
-}
+};
 
 /**
  * Draws a line using the current line style from the current drawing position to (x, y);
@@ -118,7 +118,7 @@ PIXI.Graphics.prototype.lineTo = function(x, y)
 {
     this.currentPath.points.push(x, y);
     this.dirty = true;
-}
+};
 
 /**
  * Specifies a simple one-color fill that subsequent calls to other Graphics methods
@@ -132,8 +132,8 @@ PIXI.Graphics.prototype.beginFill = function(color, alpha)
 {
     this.filling = true;
     this.fillColor = color || 0;
-	this.fillAlpha = (alpha == undefined) ? 1 : alpha;
+    this.fillAlpha = (arguments.length < 2) ? 1 : alpha;
-}
+};
 
 /**
  * Applies a fill to the lines and shapes that were added since the last call to the beginFill() method.
@@ -145,7 +145,7 @@ PIXI.Graphics.prototype.endFill = function()
     this.filling = false;
     this.fillColor = null;
     this.fillAlpha = 1;
-}
+};
 
 /**
  * @method drawRect
@@ -157,7 +157,7 @@ PIXI.Graphics.prototype.endFill = function()
  */
 PIXI.Graphics.prototype.drawRect = function( x, y, width, height )
 {
-	if(this.currentPath.points.length == 0)this.graphicsData.pop();
+    if (!this.currentPath.points.length) this.graphicsData.pop();
 
     this.currentPath = {lineWidth:this.lineWidth, lineColor:this.lineColor, lineAlpha:this.lineAlpha,
                         fillColor:this.fillColor, fillAlpha:this.fillAlpha, fill:this.filling,
@@ -165,7 +165,7 @@ PIXI.Graphics.prototype.drawRect = function( x, y, width, height )
 
     this.graphicsData.push(this.currentPath);
     this.dirty = true;
-}
+};
 
 /**
  * Draws a circle.
@@ -177,7 +177,7 @@ PIXI.Graphics.prototype.drawRect = function( x, y, width, height )
  */
 PIXI.Graphics.prototype.drawCircle = function( x, y, radius)
 {
-	if(this.currentPath.points.length == 0)this.graphicsData.pop();
+    if (!this.currentPath.points.length) this.graphicsData.pop();
 
     this.currentPath = {lineWidth:this.lineWidth, lineColor:this.lineColor, lineAlpha:this.lineAlpha,
                         fillColor:this.fillColor, fillAlpha:this.fillAlpha, fill:this.filling,
@@ -185,20 +185,20 @@ PIXI.Graphics.prototype.drawCircle = function( x, y, radius)
 
     this.graphicsData.push(this.currentPath);
     this.dirty = true;
-}
+};
 
 /**
- * Draws an elipse.
+ * Draws an ellipse.
  *
- * @method drawElipse
+ * @method drawEllipse
  * @param x {Number}
  * @param y {Number}
  * @param width {Number}
  * @param height {Number}
  */
-PIXI.Graphics.prototype.drawElipse = function( x, y, width, height)
+PIXI.Graphics.prototype.drawEllipse = function( x, y, width, height)
 {
-	if(this.currentPath.points.length == 0)this.graphicsData.pop();
+    if (!this.currentPath.points.length) this.graphicsData.pop();
 
     this.currentPath = {lineWidth:this.lineWidth, lineColor:this.lineColor, lineAlpha:this.lineAlpha,
                         fillColor:this.fillColor, fillAlpha:this.fillAlpha, fill:this.filling,
@@ -206,7 +206,7 @@ PIXI.Graphics.prototype.drawElipse = function( x, y, width, height)
 
     this.graphicsData.push(this.currentPath);
     this.dirty = true;
-}
+};
 
 /**
  * Clears the graphics that were drawn to this Graphics object, and resets fill and line style settings.
@@ -222,8 +222,8 @@ PIXI.Graphics.prototype.clear = function()
     this.clearDirty = true;
     this.graphicsData = [];
 
-	this.bounds = null//new PIXI.Rectangle();
+    this.bounds = null; //new PIXI.Rectangle();
-}
+};
 
 
 PIXI.Graphics.prototype.updateFilterBounds = function()
@@ -239,8 +239,6 @@ PIXI.Graphics.prototype.updateFilterBounds = function()
         var points, x, y;
 
         for (var i = 0; i < this.graphicsData.length; i++) {
-			
-
             var data = this.graphicsData[i];
             var type = data.type;
             var lineWidth = data.lineWidth;
@@ -286,17 +284,14 @@ PIXI.Graphics.prototype.updateFilterBounds = function()
 
                     minY = y-lineWidth < minY ? y-lineWidth : minY;
                     maxY = y+lineWidth > maxY ? y+lineWidth : maxY;
-				};
                 }
-
+            }
-		};
+        }
 
         this.bounds = new PIXI.Rectangle(minX, minY, maxX - minX, maxY - minY);
-
     }
-
 //  console.log(this.bounds);
-}
+};
 
 // SOME TYPES:
 PIXI.Graphics.POLY = 0;

src/pixi/renderers/canvas/CanvasGraphics.js

@@ -11,7 +11,7 @@
 PIXI.CanvasGraphics = function()
 {
 
-}
+};
 
 
 /*
@@ -26,8 +26,9 @@ PIXI.CanvasGraphics = function()
 PIXI.CanvasGraphics.renderGraphics = function(graphics, context)
 {
     var worldAlpha = graphics.worldAlpha;
+    var color = '';
 
-	for (var i=0; i < graphics.graphicsData.length; i++)
+    for (var i = 0; i < graphics.graphicsData.length; i++)
     {
         var data = graphics.graphicsData[i];
         var points = data.points;
@@ -36,7 +37,7 @@ PIXI.CanvasGraphics.renderGraphics = function(graphics, context)
 
         context.lineWidth = data.lineWidth;
 
-		if(data.type == PIXI.Graphics.POLY)
+        if(data.type === PIXI.Graphics.POLY)
         {
             context.beginPath();
 
@@ -48,7 +49,7 @@ PIXI.CanvasGraphics.renderGraphics = function(graphics, context)
             }
 
             // if the first and last point are the same close the path - much neater :)
-	      	if(points[0] == points[points.length-2] && points[1] == points[points.length-1])
+            if(points[0] === points[points.length-2] && points[1] === points[points.length-1])
             {
                 context.closePath();
             }
@@ -65,7 +66,7 @@ PIXI.CanvasGraphics.renderGraphics = function(graphics, context)
                 context.stroke();
             }
         }
-		else if(data.type == PIXI.Graphics.RECT)
+        else if(data.type === PIXI.Graphics.RECT)
         {
 
             if(data.fillColor || data.fillColor === 0)
@@ -82,7 +83,7 @@ PIXI.CanvasGraphics.renderGraphics = function(graphics, context)
             }
 
         }
-		else if(data.type == PIXI.Graphics.CIRC)
+        else if(data.type === PIXI.Graphics.CIRC)
         {
             // TODO - need to be Undefined!
             context.beginPath();
@@ -101,22 +102,22 @@ PIXI.CanvasGraphics.renderGraphics = function(graphics, context)
                 context.stroke();
             }
         }
-		else if(data.type == PIXI.Graphics.ELIP)
+        else if(data.type === PIXI.Graphics.ELIP)
         {
 
-			// elipse code taken from: http://stackoverflow.com/questions/2172798/how-to-draw-an-oval-in-html5-canvas
+            // ellipse code taken from: http://stackoverflow.com/questions/2172798/how-to-draw-an-oval-in-html5-canvas
 
-			var elipseData =  data.points;
+            var ellipseData =  data.points;
 
-			var w = elipseData[2] * 2;
+            var w = ellipseData[2] * 2;
-			var h = elipseData[3] * 2;
+            var h = ellipseData[3] * 2;
 
-			var x = elipseData[0] - w/2;
+            var x = ellipseData[0] - w/2;
-			var y = elipseData[1] - h/2;
+            var y = ellipseData[1] - h/2;
 
             context.beginPath();
 
-			var kappa = .5522848,
+            var kappa = 0.5522848,
                 ox = (w / 2) * kappa, // control point offset horizontal
                 oy = (h / 2) * kappa, // control point offset vertical
                 xe = x + w,           // x-end
@@ -144,9 +145,8 @@ PIXI.CanvasGraphics.renderGraphics = function(graphics, context)
                 context.stroke();
             }
         }
-
+    }
-	};
+};
-}
 
 /*
  * Renders a graphics mask
@@ -159,23 +159,22 @@ PIXI.CanvasGraphics.renderGraphics = function(graphics, context)
  */
 PIXI.CanvasGraphics.renderGraphicsMask = function(graphics, context)
 {
-	var worldAlpha = graphics.worldAlpha;
-
     var len = graphics.graphicsData.length;
-	if(len === 0)return;
+
+    if(len === 0) return;
 
     if(len > 1)
     {
         len = 1;
-		console.log("Pixi.js warning: masks in canvas can only mask using the first path in the graphics object")
+        window.console.log('Pixi.js warning: masks in canvas can only mask using the first path in the graphics object');
     }
 
-	for (var i=0; i < 1; i++)
+    for (var i = 0; i < 1; i++)
     {
         var data = graphics.graphicsData[i];
         var points = data.points;
 
-		if(data.type == PIXI.Graphics.POLY)
+        if(data.type === PIXI.Graphics.POLY)
         {
             context.beginPath();
             context.moveTo(points[0], points[1]);
@@ -186,40 +185,40 @@ PIXI.CanvasGraphics.renderGraphicsMask = function(graphics, context)
             }
 
             // if the first and last point are the same close the path - much neater :)
-	      	if(points[0] == points[points.length-2] && points[1] == points[points.length-1])
+            if(points[0] === points[points.length-2] && points[1] === points[points.length-1])
             {
                 context.closePath();
             }
 
         }
-		else if(data.type == PIXI.Graphics.RECT)
+        else if(data.type === PIXI.Graphics.RECT)
         {
             context.beginPath();
             context.rect(points[0], points[1], points[2], points[3]);
             context.closePath();
         }
-		else if(data.type == PIXI.Graphics.CIRC)
+        else if(data.type === PIXI.Graphics.CIRC)
         {
             // TODO - need to be Undefined!
             context.beginPath();
             context.arc(points[0], points[1], points[2],0,2*Math.PI);
             context.closePath();
         }
-		else if(data.type == PIXI.Graphics.ELIP)
+        else if(data.type === PIXI.Graphics.ELIP)
         {
 
-			// elipse code taken from: http://stackoverflow.com/questions/2172798/how-to-draw-an-oval-in-html5-canvas
+            // ellipse code taken from: http://stackoverflow.com/questions/2172798/how-to-draw-an-oval-in-html5-canvas
-			var elipseData =  data.points;
+            var ellipseData =  data.points;
 
-			var w = elipseData[2] * 2;
+            var w = ellipseData[2] * 2;
-			var h = elipseData[3] * 2;
+            var h = ellipseData[3] * 2;
 
-			var x = elipseData[0] - w/2;
+            var x = ellipseData[0] - w/2;
-			var y = elipseData[1] - h/2;
+            var y = ellipseData[1] - h/2;
 
             context.beginPath();
 
-			var kappa = .5522848,
+            var kappa = 0.5522848,
                 ox = (w / 2) * kappa, // control point offset horizontal
                 oy = (h / 2) * kappa, // control point offset vertical
                 xe = x + w,           // x-end
@@ -234,7 +233,5 @@ PIXI.CanvasGraphics.renderGraphicsMask = function(graphics, context)
             context.bezierCurveTo(xm - ox, ye, x, ym + oy, x, ym);
             context.closePath();
         }
-
+    }
-
+};
-	};
-}

src/pixi/renderers/canvas/CanvasRenderer.js

@@ -2,7 +2,6 @@
  * @author Mat Groves http://matgroves.com/ @Doormat23
  */
 
-
 /**
  * the CanvasRenderer draws the stage and all its content onto a 2d canvas. This renderer should be used for browsers that do not support webGL.
  * Dont forget to add the view to your DOM or you will not see anything :)
@@ -49,7 +48,21 @@ PIXI.CanvasRenderer = function(width, height, view, transparent)
      * @property context
      * @type Canvas 2d Context
      */
-	this.context = this.view.getContext("2d");
+    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.refresh = true;
     // hack to enable some hardware acceleration!
@@ -58,7 +71,7 @@ PIXI.CanvasRenderer = function(width, height, view, transparent)
     this.view.width = this.width;
     this.view.height = this.height;
     this.count = 0;
-}
+};
 
 // constructor
 PIXI.CanvasRenderer.prototype.constructor = PIXI.CanvasRenderer;
@@ -71,7 +84,6 @@ PIXI.CanvasRenderer.prototype.constructor = PIXI.CanvasRenderer;
  */
 PIXI.CanvasRenderer.prototype.render = function(stage)
 {
-	
     //stage.__childrenAdded = [];
     //stage.__childrenRemoved = [];
 
@@ -83,10 +95,11 @@ PIXI.CanvasRenderer.prototype.render = function(stage)
     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)
+    this.context.clearRect(0, 0, this.width, this.height);
     this.renderDisplayObject(stage);
     //as
 
@@ -106,9 +119,7 @@ PIXI.CanvasRenderer.prototype.render = function(stage)
     {
         PIXI.Texture.frameUpdates = [];
     }
-	
+};
-	
-}
 
 /**
  * resizes the canvas view to the specified width and height
@@ -124,7 +135,7 @@ PIXI.CanvasRenderer.prototype.resize = function(width, height)
 
     this.view.width = width;
     this.view.height = height;
-}
+};
 
 /**
  * Renders a display object
@@ -173,6 +184,12 @@ PIXI.CanvasRenderer.prototype.renderDisplayObject = function(displayObject)
 
                 context.setTransform(transform[0], transform[3], transform[1], transform[4], transform[2], transform[5]);
 
+                //if smoothingEnabled is supported and we need to change the smoothing property for this texture
+                if(this.smoothProperty && this.scaleMode !== displayObject.texture.baseTexture.scaleMode) {
+                    this.scaleMode = displayObject.texture.baseTexture.scaleMode;
+                    context[this.smoothProperty] = (this.scaleMode === PIXI.BaseTexture.SCALE_MODE.LINEAR);
+                }
+
                 context.drawImage(displayObject.texture.baseTexture.source,
                                    frame.x,
                                    frame.y,
@@ -186,12 +203,12 @@ PIXI.CanvasRenderer.prototype.renderDisplayObject = function(displayObject)
         }
         else if(displayObject instanceof PIXI.Strip)
         {
-			context.setTransform(transform[0], transform[3], transform[1], transform[4], transform[2], transform[5])
+            context.setTransform(transform[0], transform[3], transform[1], transform[4], transform[2], transform[5]);
             this.renderStrip(displayObject);
         }
         else if(displayObject instanceof PIXI.TilingSprite)
         {
-			context.setTransform(transform[0], transform[3], transform[1], transform[4], transform[2], transform[5])
+            context.setTransform(transform[0], transform[3], transform[1], transform[4], transform[2], transform[5]);
             this.renderTilingSprite(displayObject);
         }
         else if(displayObject instanceof PIXI.CustomRenderable)
@@ -201,7 +218,7 @@ PIXI.CanvasRenderer.prototype.renderDisplayObject = function(displayObject)
         }
         else if(displayObject instanceof PIXI.Graphics)
         {
-			context.setTransform(transform[0], transform[3], transform[1], transform[4], transform[2], transform[5])
+            context.setTransform(transform[0], transform[3], transform[1], transform[4], transform[2], transform[5]);
             PIXI.CanvasGraphics.renderGraphics(displayObject, context);
         }
         else if(displayObject instanceof PIXI.FilterBlock)
@@ -217,7 +234,7 @@ PIXI.CanvasRenderer.prototype.renderDisplayObject = function(displayObject)
                     var cacheAlpha = mask.alpha;
                     var maskTransform = mask.worldTransform;
 
-					context.setTransform(maskTransform[0], maskTransform[3], maskTransform[1], maskTransform[4], maskTransform[2], maskTransform[5])
+                    context.setTransform(maskTransform[0], maskTransform[3], maskTransform[1], maskTransform[4], maskTransform[2], maskTransform[5]);
 
                     mask.worldAlpha = 0.5;
 
@@ -233,20 +250,12 @@ PIXI.CanvasRenderer.prototype.renderDisplayObject = function(displayObject)
                     context.restore();
                 }
             }
-			else
-			{
-				// only masks supported right now!
         }
-		}
+        //count++
-	//	count++
         displayObject = displayObject._iNext;
-		
-		
     }
-	while(displayObject != testObject)
+    while(displayObject !== testObject);
-
+};
-	
-}
 
 /**
  * Renders a flat strip
@@ -259,7 +268,6 @@ PIXI.CanvasRenderer.prototype.renderStripFlat = function(strip)
 {
     var context = this.context;
     var verticies = strip.verticies;
-	var uvs = strip.uvs;
 
     var length = verticies.length/2;
     this.count++;
@@ -267,7 +275,6 @@ PIXI.CanvasRenderer.prototype.renderStripFlat = function(strip)
     context.beginPath();
     for (var i=1; i < length-2; i++)
     {
-		
         // draw some triangles!
         var index = i*2;
 
@@ -277,13 +284,12 @@ PIXI.CanvasRenderer.prototype.renderStripFlat = function(strip)
         context.moveTo(x0, y0);
         context.lineTo(x1, y1);
         context.lineTo(x2, y2);
+    }
 
-	};	
+    context.fillStyle = '#FF0000';
-	
-	context.fillStyle = "#FF0000";
     context.fill();
     context.closePath();
-}
+};
 
 /**
  * Renders a tiling sprite
@@ -298,7 +304,8 @@ PIXI.CanvasRenderer.prototype.renderTilingSprite = function(sprite)
 
     context.globalAlpha = sprite.worldAlpha;
 
- 	if(!sprite.__tilePattern) sprite.__tilePattern = context.createPattern(sprite.texture.baseTexture.source, "repeat");
+    if(!sprite.__tilePattern)
+        sprite.__tilePattern = context.createPattern(sprite.texture.baseTexture.source, 'repeat');
 
     context.beginPath();
 
@@ -316,7 +323,7 @@ PIXI.CanvasRenderer.prototype.renderTilingSprite = function(sprite)
     context.translate(-tilePosition.x, -tilePosition.y);
 
     context.closePath();
-}
+};
 
 /**
  * Renders a strip
@@ -335,9 +342,9 @@ PIXI.CanvasRenderer.prototype.renderStrip = function(strip)
 
     var length = verticies.length/2;
     this.count++;
-	for (var i=1; i < length-2; i++) 
-	{
 
+    for (var i = 1; i < length-2; i++)
+    {
         // draw some triangles!
         var index = i*2;
 
@@ -347,7 +354,6 @@ PIXI.CanvasRenderer.prototype.renderStrip = function(strip)
         var u0 = uvs[index] * strip.texture.width,   u1 = uvs[index+2] * strip.texture.width, u2 = uvs[index+4]* strip.texture.width;
         var v0 = uvs[index+1]* strip.texture.height, v1 = uvs[index+3] * strip.texture.height, v2 = uvs[index+5]* strip.texture.height;
 
-
         context.save();
         context.beginPath();
         context.moveTo(x0, y0);
@@ -357,25 +363,20 @@ PIXI.CanvasRenderer.prototype.renderStrip = function(strip)
 
         context.clip();
 
-		
         // Compute matrix transform
         var delta = u0*v1 + v0*u2 + u1*v2 - v1*u2 - v0*u1 - u0*v2;
-        var delta_a = x0*v1 + v0*x2 + x1*v2 - v1*x2 - v0*x1 - x0*v2;
+        var deltaA = x0*v1 + v0*x2 + x1*v2 - v1*x2 - v0*x1 - x0*v2;
-        var delta_b = u0*x1 + x0*u2 + u1*x2 - x1*u2 - x0*u1 - u0*x2;
+        var deltaB = u0*x1 + x0*u2 + u1*x2 - x1*u2 - x0*u1 - u0*x2;
-        var delta_c = u0*v1*x2 + v0*x1*u2 + x0*u1*v2 - x0*v1*u2 - v0*u1*x2 - u0*x1*v2;
+        var deltaC = u0*v1*x2 + v0*x1*u2 + x0*u1*v2 - x0*v1*u2 - v0*u1*x2 - u0*x1*v2;
-        var delta_d = y0*v1 + v0*y2 + y1*v2 - v1*y2 - v0*y1 - y0*v2;
+        var deltaD = y0*v1 + v0*y2 + y1*v2 - v1*y2 - v0*y1 - y0*v2;
-        var delta_e = u0*y1 + y0*u2 + u1*y2 - y1*u2 - y0*u1 - u0*y2;
+        var deltaE = u0*y1 + y0*u2 + u1*y2 - y1*u2 - y0*u1 - u0*y2;
-        var delta_f = u0*v1*y2 + v0*y1*u2 + y0*u1*v2 - y0*v1*u2 - v0*u1*y2 - u0*y1*v2;
+        var deltaF = u0*v1*y2 + v0*y1*u2 + y0*u1*v2 - y0*v1*u2 - v0*u1*y2 - u0*y1*v2;
 
-		
+        context.transform(deltaA / delta, deltaD / delta,
-		
+                            deltaB / delta, deltaE / delta,
-		    
+                            deltaC / delta, deltaF / delta);
-        context.transform(delta_a/delta, delta_d/delta,
-                      delta_b/delta, delta_e/delta,
-                      delta_c/delta, delta_f/delta);
 
         context.drawImage(strip.texture.baseTexture.source, 0, 0);
         context.restore();
-	};
+    }
-	
+};
-}

src/pixi/renderers/webgl/PixiShader.js

@@ -12,26 +12,25 @@ PIXI.PixiShader = function()
     /**
     * @property {any} program - The WebGL program.
     */
-    this.program;
+    this.program = null;
 
     /**
     * @property {array} fragmentSrc - The fragment shader.
     */
     this.fragmentSrc = [
-        "precision lowp float;",
+        'precision lowp float;',
-        "varying vec2 vTextureCoord;",
+        'varying vec2 vTextureCoord;',
-        "varying float vColor;",
+        'varying float vColor;',
-        "uniform sampler2D uSampler;",
+        'uniform sampler2D uSampler;',
-        "void main(void) {",
+        'void main(void) {',
-            "gl_FragColor = texture2D(uSampler, vTextureCoord) * vColor;",
+        '   gl_FragColor = texture2D(uSampler, vTextureCoord) * vColor;',
-        "}"
+        '}'
     ];
 
     /**
     * @property {number} textureCount - A local texture counter for multi-texture shaders.
     */
     this.textureCount = 0;
-    
 };
 
 /**
@@ -39,22 +38,22 @@ PIXI.PixiShader = function()
 */
 PIXI.PixiShader.prototype.init = function()
 {
-    var program = PIXI.compileProgram(this.vertexSrc || PIXI.PixiShader.defaultVertexSrc, this.fragmentSrc)
+    var program = PIXI.compileProgram(this.vertexSrc || PIXI.PixiShader.defaultVertexSrc, this.fragmentSrc);
 
     var gl = PIXI.gl;
 
     gl.useProgram(program);
 
     // get and store the uniforms for the shader
-    this.uSampler = gl.getUniformLocation(program, "uSampler");
+    this.uSampler = gl.getUniformLocation(program, 'uSampler');
-    this.projectionVector = gl.getUniformLocation(program, "projectionVector");
+    this.projectionVector = gl.getUniformLocation(program, 'projectionVector');
-    this.offsetVector = gl.getUniformLocation(program, "offsetVector");
+    this.offsetVector = gl.getUniformLocation(program, 'offsetVector');
-    this.dimensions = gl.getUniformLocation(program, "dimensions");
+    this.dimensions = gl.getUniformLocation(program, 'dimensions');
 
     // get and store the attributes
-    this.aVertexPosition = gl.getAttribLocation(program, "aVertexPosition");
+    this.aVertexPosition = gl.getAttribLocation(program, 'aVertexPosition');
-    this.colorAttribute = gl.getAttribLocation(program, "aColor");
+    this.colorAttribute = gl.getAttribLocation(program, 'aColor');
-    this.aTextureCoord = gl.getAttribLocation(program, "aTextureCoord");
+    this.aTextureCoord = gl.getAttribLocation(program, 'aTextureCoord');
 
     // add those custom shaders!
     for (var key in this.uniforms)
@@ -83,10 +82,11 @@ PIXI.PixiShader.prototype.initUniforms = function()
 
     for (var key in this.uniforms)
     {
-        var uniform = this.uniforms[key];
+        uniform = this.uniforms[key];
+
         var type = uniform.type;
 
-        if (type == 'sampler2D')
+        if (type === 'sampler2D')
         {
             uniform._init = false;
 
@@ -95,21 +95,21 @@ PIXI.PixiShader.prototype.initUniforms = function()
                 this.initSampler2D(uniform);
             }
         }
-        else if (type == 'mat2' || type == 'mat3' || type == 'mat4')
+        else if (type === 'mat2' || type === 'mat3' || type === 'mat4')
         {
             //  These require special handling
             uniform.glMatrix = true;
             uniform.glValueLength = 1;
 
-            if (type == 'mat2')
+            if (type === 'mat2')
             {
                 uniform.glFunc = PIXI.gl.uniformMatrix2fv;
             }
-            else if (type == 'mat3')
+            else if (type === 'mat3')
             {
                 uniform.glFunc = PIXI.gl.uniformMatrix3fv;
             }
-            else if (type == 'mat4')
+            else if (type === 'mat4')
             {
                 uniform.glFunc = PIXI.gl.uniformMatrix4fv;
             }
@@ -119,15 +119,15 @@ PIXI.PixiShader.prototype.initUniforms = function()
             //  GL function reference
             uniform.glFunc = PIXI.gl['uniform' + type];
 
-            if (type == '2f' || type == '2i')
+            if (type === '2f' || type === '2i')
             {
                 uniform.glValueLength = 2;
             }
-            else if (type == '3f' || type == '3i')
+            else if (type === '3f' || type === '3i')
             {
                 uniform.glValueLength = 3;
             }
-            else if (type == '4f' || type == '4i')
+            else if (type === '4f' || type === '4i')
             {
                 uniform.glValueLength = 4;
             }
@@ -229,7 +229,7 @@ PIXI.PixiShader.prototype.syncUniforms = function()
 
         uniform = this.uniforms[key];
 
-        if (uniform.glValueLength == 1)
+        if (uniform.glValueLength === 1)
         {
             if (uniform.glMatrix === true)
             {
@@ -240,19 +240,19 @@ PIXI.PixiShader.prototype.syncUniforms = function()
                 uniform.glFunc.call(PIXI.gl, uniform.uniformLocation, uniform.value);
             }
         }
-        else if (uniform.glValueLength == 2)
+        else if (uniform.glValueLength === 2)
         {
             uniform.glFunc.call(PIXI.gl, uniform.uniformLocation, uniform.value.x, uniform.value.y);
         }
-        else if (uniform.glValueLength == 3)
+        else if (uniform.glValueLength === 3)
         {
             uniform.glFunc.call(PIXI.gl, uniform.uniformLocation, uniform.value.x, uniform.value.y, uniform.value.z);
         }
-        else if (uniform.glValueLength == 4)
+        else if (uniform.glValueLength === 4)
         {
             uniform.glFunc.call(PIXI.gl, uniform.uniformLocation, uniform.value.x, uniform.value.y, uniform.value.z, uniform.value.w);
         }
-        else if (uniform.type == 'sampler2D')
+        else if (uniform.type === 'sampler2D')
         {
             if (uniform._init)
             {
@@ -271,22 +271,21 @@ PIXI.PixiShader.prototype.syncUniforms = function()
 };
 
 PIXI.PixiShader.defaultVertexSrc = [
+    'attribute vec2 aVertexPosition;',
+    'attribute vec2 aTextureCoord;',
+    'attribute float aColor;',
 
-    "attribute vec2 aVertexPosition;",
+    'uniform vec2 projectionVector;',
-    "attribute vec2 aTextureCoord;",
+    'uniform vec2 offsetVector;',
-    "attribute float aColor;",
+    'varying vec2 vTextureCoord;',
 
-    "uniform vec2 projectionVector;",
+    'varying float vColor;',
-    "uniform vec2 offsetVector;",
-    "varying vec2 vTextureCoord;",
 
-    "varying float vColor;",
+    'const vec2 center = vec2(-1.0, 1.0);',
 
-    "const vec2 center = vec2(-1.0, 1.0);",
+    'void main(void) {',
-    
+    '   gl_Position = vec4( ((aVertexPosition + offsetVector) / projectionVector) + center , 0.0, 1.0);',
-    "void main(void) {",
+    '   vTextureCoord = aTextureCoord;',
-        "gl_Position = vec4( ((aVertexPosition + offsetVector) / projectionVector) + center , 0.0, 1.0);",
+    '   vColor = aColor;',
-        "vTextureCoord = aTextureCoord;",
+    '}'
-        "vColor = aColor;",
-    "}"
 ];

src/pixi/renderers/webgl/PrimitiveShader.js

@@ -6,33 +6,34 @@
 PIXI.PrimitiveShader = function()
 {
     // the webGL program..
-	this.program;
+    this.program = null;
 
     this.fragmentSrc = [
-      "precision mediump float;",
+        'precision mediump float;',
-      "varying vec4 vColor;",
+        'varying vec4 vColor;',
-      "void main(void) {",
+
-        "gl_FragColor = vColor;",
+        'void main(void) {',
-      "}"
+        '   gl_FragColor = vColor;',
+        '}'
     ];
 
     this.vertexSrc  = [
-      "attribute vec2 aVertexPosition;",
+        'attribute vec2 aVertexPosition;',
-      "attribute vec4 aColor;",
+        'attribute vec4 aColor;',
-      "uniform mat3 translationMatrix;",
+        'uniform mat3 translationMatrix;',
-      "uniform vec2 projectionVector;",
+        'uniform vec2 projectionVector;',
-      "uniform vec2 offsetVector;",
+        'uniform vec2 offsetVector;',
-      "uniform float alpha;",
+        'uniform float alpha;',
-      "varying vec4 vColor;",
+        'varying vec4 vColor;',
-      "void main(void) {",
-        "vec3 v = translationMatrix * vec3(aVertexPosition , 1.0);",
-        "v -= offsetVector.xyx;",
-        "gl_Position = vec4( v.x / projectionVector.x -1.0, v.y / -projectionVector.y + 1.0 , 0.0, 1.0);",
-        "vColor = aColor  * alpha;",
-      "}"
-    ];
 
-}
+        'void main(void) {',
+        '   vec3 v = translationMatrix * vec3(aVertexPosition , 1.0);',
+        '   v -= offsetVector.xyx;',
+        '   gl_Position = vec4( v.x / projectionVector.x -1.0, v.y / -projectionVector.y + 1.0 , 0.0, 1.0);',
+        '   vColor = aColor  * alpha;',
+        '}'
+    ];
+};
 
 PIXI.PrimitiveShader.prototype.init = function()
 {
@@ -43,15 +44,15 @@ PIXI.PrimitiveShader.prototype.init = function()
     gl.useProgram(program);
 
     // get and store the uniforms for the shader
-	this.projectionVector = gl.getUniformLocation(program, "projectionVector");
+    this.projectionVector = gl.getUniformLocation(program, 'projectionVector');
-	this.offsetVector = gl.getUniformLocation(program, "offsetVector");
+    this.offsetVector = gl.getUniformLocation(program, 'offsetVector');
 
     // get and store the attributes
-  this.aVertexPosition = gl.getAttribLocation(program, "aVertexPosition");
+    this.aVertexPosition = gl.getAttribLocation(program, 'aVertexPosition');
-	this.colorAttribute = gl.getAttribLocation(program, "aColor");
+    this.colorAttribute = gl.getAttribLocation(program, 'aColor');
 
-  this.translationMatrix = gl.getUniformLocation(program, "translationMatrix");
+    this.translationMatrix = gl.getUniformLocation(program, 'translationMatrix');
-  this.alpha = gl.getUniformLocation(program, "alpha");
+    this.alpha = gl.getUniformLocation(program, 'alpha');
 
     this.program = program;
-}
+};

src/pixi/renderers/webgl/StripShader.js

@@ -6,60 +6,62 @@
 PIXI.StripShader = function()
 {
     // the webGL program..
-	this.program;
+    this.program = null;
 
     this.fragmentSrc = [
-      "precision mediump float;",
+        'precision mediump float;',
-      "varying vec2 vTextureCoord;",
+        'varying vec2 vTextureCoord;',
-      "varying float vColor;",
+        'varying float vColor;',
-      "uniform float alpha;",
+        'uniform float alpha;',
-      "uniform sampler2D uSampler;",
+        'uniform sampler2D uSampler;',
-      "void main(void) {",
+
-        "gl_FragColor = texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y));",
+        'void main(void) {',
-        "gl_FragColor = gl_FragColor * alpha;",
+        '   gl_FragColor = texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y));',
-      "}"
+        '   gl_FragColor = gl_FragColor * alpha;',
+        '}'
     ];
 
     this.vertexSrc = [
-      "attribute vec2 aVertexPosition;",
+        'attribute vec2 aVertexPosition;',
-      "attribute vec2 aTextureCoord;",
+        'attribute vec2 aTextureCoord;',
-      "attribute float aColor;",
+        'attribute float aColor;',
-      "uniform mat3 translationMatrix;",
+        'uniform mat3 translationMatrix;',
-      "uniform vec2 projectionVector;",
+        'uniform vec2 projectionVector;',
-      "varying vec2 vTextureCoord;",
+        'varying vec2 vTextureCoord;',
-      "varying vec2 offsetVector;",
+        'varying vec2 offsetVector;',
-      "varying float vColor;",
+        'varying float vColor;',
-      "void main(void) {",
+
-        "vec3 v = translationMatrix * vec3(aVertexPosition, 1.0);",
+        'void main(void) {',
-        "v -= offsetVector.xyx;",
+        '   vec3 v = translationMatrix * vec3(aVertexPosition, 1.0);',
-        "gl_Position = vec4( v.x / projectionVector.x -1.0, v.y / projectionVector.y + 1.0 , 0.0, 1.0);",
+        '   v -= offsetVector.xyx;',
-        "vTextureCoord = aTextureCoord;",
+        '   gl_Position = vec4( v.x / projectionVector.x -1.0, v.y / projectionVector.y + 1.0 , 0.0, 1.0);',
-        "vColor = aColor;",
+        '   vTextureCoord = aTextureCoord;',
-      "}"
+        '   vColor = aColor;',
+        '}'
     ];
-}
+};
 
 PIXI.StripShader.prototype.init = function()
 {
-	var program = PIXI.compileProgram(this.vertexSrc, this.fragmentSrc)
+    var program = PIXI.compileProgram(this.vertexSrc, this.fragmentSrc);
 
     var gl = PIXI.gl;
 
     gl.useProgram(program);
 
     // get and store the uniforms for the shader
-	this.uSampler = gl.getUniformLocation(program, "uSampler");
+    this.uSampler = gl.getUniformLocation(program, 'uSampler');
-	this.projectionVector = gl.getUniformLocation(program, "projectionVector");
+    this.projectionVector = gl.getUniformLocation(program, 'projectionVector');
-	this.offsetVector = gl.getUniformLocation(program, "offsetVector");
+    this.offsetVector = gl.getUniformLocation(program, 'offsetVector');
-	this.colorAttribute = gl.getAttribLocation(program, "aColor");
+    this.colorAttribute = gl.getAttribLocation(program, 'aColor');
-	//this.dimensions = gl.getUniformLocation(this.program, "dimensions");
+    //this.dimensions = gl.getUniformLocation(this.program, 'dimensions');
 
     // get and store the attributes
-	this.aVertexPosition = gl.getAttribLocation(program, "aVertexPosition");
+    this.aVertexPosition = gl.getAttribLocation(program, 'aVertexPosition');
-	this.aTextureCoord = gl.getAttribLocation(program, "aTextureCoord");
+    this.aTextureCoord = gl.getAttribLocation(program, 'aTextureCoord');
 
-    this.translationMatrix = gl.getUniformLocation(program, "translationMatrix");
+    this.translationMatrix = gl.getUniformLocation(program, 'translationMatrix');
-    this.alpha = gl.getUniformLocation(program, "alpha");
+    this.alpha = gl.getUniformLocation(program, 'alpha');
 
     this.program = program;
-}
+};

src/pixi/renderers/webgl/WebGLBatch.js

@@ -9,7 +9,7 @@ PIXI._batchs = [];
  */
 PIXI._getBatch = function(gl)
 {
-	if(PIXI._batchs.length == 0)
+    if(PIXI._batchs.length === 0)
     {
         return new PIXI.WebGLBatch(gl);
     }
@@ -17,7 +17,7 @@ PIXI._getBatch = function(gl)
     {
         return PIXI._batchs.pop();
     }
-}
+};
 
 /**
  * @private
@@ -26,7 +26,7 @@ PIXI._returnBatch = function(batch)
 {
     batch.clean();
     PIXI._batchs.push(batch);
-}
+};
 
 /**
  * @private
@@ -36,8 +36,8 @@ PIXI._restoreBatchs = function(gl)
     for (var i=0; i < PIXI._batchs.length; i++)
     {
         PIXI._batchs[i].restoreLostContext(gl);
-	};
+    }
-}
+};
 
 /**
  * A WebGLBatch Enables a group of sprites to be drawn using the same settings.
@@ -63,7 +63,7 @@ PIXI.WebGLBatch = function(gl)
     this.colorBuffer =  gl.createBuffer();
     this.blendMode = PIXI.blendModes.NORMAL;
     this.dynamicSize = 1;
-}
+};
 
 // constructor
 PIXI.WebGLBatch.prototype.constructor = PIXI.WebGLBatch;
@@ -83,9 +83,9 @@ PIXI.WebGLBatch.prototype.clean = function()
     this.texture = null;
     this.last = null;
     this.size = 0;
-	this.head;
+    this.head = null;
-	this.tail;
+    this.tail = null;
-}
+};
 
 /**
  * Recreates the buffers in the event of a context loss
@@ -100,7 +100,7 @@ PIXI.WebGLBatch.prototype.restoreLostContext = function(gl)
     this.indexBuffer =  gl.createBuffer();
     this.uvBuffer =  gl.createBuffer();
     this.colorBuffer =  gl.createBuffer();
-}
+};
 
 /**
  * inits the batch's texture and blend mode based if the supplied sprite
@@ -120,7 +120,7 @@ PIXI.WebGLBatch.prototype.init = function(sprite)
     this.size = 1;
 
     this.growBatch();
-}
+};
 
 /**
  * inserts a sprite before the specified sprite
@@ -148,7 +148,7 @@ PIXI.WebGLBatch.prototype.insertBefore = function(sprite, nextSprite)
     {
         this.head = sprite;
     }
-}
+};
 
 /**
  * inserts a sprite after the specified sprite
@@ -175,9 +175,9 @@ PIXI.WebGLBatch.prototype.insertAfter = function(sprite, previousSprite)
     }
     else
     {
-		this.tail = sprite
+        this.tail = sprite;
     }
-}
+};
 
 /**
  * removes a sprite from the batch
@@ -189,7 +189,7 @@ PIXI.WebGLBatch.prototype.remove = function(sprite)
 {
     this.size--;
 
-	if(this.size == 0)
+    if(this.size === 0)
     {
         sprite.batch = null;
         sprite.__prev = null;
@@ -214,14 +214,14 @@ PIXI.WebGLBatch.prototype.remove = function(sprite)
     else
     {
         this.tail = sprite.__prev;
-		this.tail.__next = null
+        this.tail.__next = null;
     }
 
     sprite.batch = null;
     sprite.__next = null;
     sprite.__prev = null;
     this.dirty = true;
-}
+};
 
 /**
  * Splits the batch into two with the specified sprite being the start of the new batch.
@@ -262,7 +262,7 @@ PIXI.WebGLBatch.prototype.split = function(sprite)
     this.size -= tempSize;
 
     return batch;
-}
+};
 
 /**
  * Merges two batchs together
@@ -287,7 +287,7 @@ PIXI.WebGLBatch.prototype.merge = function(batch)
         sprite.batch = this;
         sprite = sprite.__next;
     }
-}
+};
 
 /**
  * Grows the size of the batch. As the elements in the batch cannot have a dynamic size this
@@ -299,14 +299,15 @@ PIXI.WebGLBatch.prototype.merge = function(batch)
 PIXI.WebGLBatch.prototype.growBatch = function()
 {
     var gl = this.gl;
-	if( this.size == 1)
+    if( this.size === 1)
     {
         this.dynamicSize = 1;
     }
     else
     {
-		this.dynamicSize = this.size * 1.5
+        this.dynamicSize = this.size * 1.5;
     }
+
     // grow verts
     this.verticies = new Float32Array(this.dynamicSize * 8);
 
@@ -328,7 +329,7 @@ PIXI.WebGLBatch.prototype.growBatch = function()
     this.indices = new Uint16Array(this.dynamicSize * 6);
     var length = this.indices.length/6;
 
-	for (var i=0; i < length; i++) 
+    for (var i = 0; i < length; i++)
     {
         var index2 = i * 6;
         var index3 = i * 4;
@@ -338,11 +339,11 @@ PIXI.WebGLBatch.prototype.growBatch = function()
         this.indices[index2 + 3] = index3 + 0;
         this.indices[index2 + 4] = index3 + 2;
         this.indices[index2 + 5] = index3 + 3;
-	};
+    }
 
     gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this.indexBuffer);
     gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, this.indices, gl.STATIC_DRAW);
-}
+};
 
 /**
  * Refresh's all the data in the batch and sync's it with the webGL buffers
@@ -351,16 +352,13 @@ PIXI.WebGLBatch.prototype.growBatch = function()
  */
 PIXI.WebGLBatch.prototype.refresh = function()
 {
-	var gl = this.gl;
-
     if (this.dynamicSize < this.size)
     {
         this.growBatch();
     }
 
     var indexRun = 0;
-	var worldTransform, width, height, aX, aY, w0, w1, h0, h1, index;
+    var index, colorIndex;
-	var a, b, c, d, tx, ty;
 
     var displayObject = this.head;
 
@@ -393,12 +391,12 @@ PIXI.WebGLBatch.prototype.refresh = function()
 
         displayObject = displayObject.__next;
 
-		indexRun ++;
+        indexRun++;
     }
 
     this.dirtyUVS = true;
     this.dirtyColors = true;
-}
+};
 
 /**
  * Updates all the relevant geometry and uploads the data to the GPU
@@ -407,8 +405,7 @@ PIXI.WebGLBatch.prototype.refresh = function()
  */
 PIXI.WebGLBatch.prototype.update = function()
 {
-	var gl = this.gl;
+    var worldTransform, width, height, aX, aY, w0, w1, h0, h1, index;
-	var worldTransform, width, height, aX, aY, w0, w1, h0, h1, index, index2, index3
 
     var a, b, c, d, tx, ty;
 
@@ -484,7 +481,7 @@ PIXI.WebGLBatch.prototype.update = function()
             }
 
             // TODO this probably could do with some optimisation....
-			if(displayObject.cacheAlpha != displayObject.worldAlpha)
+            if(displayObject.cacheAlpha !== displayObject.worldAlpha)
             {
                 displayObject.cacheAlpha = displayObject.worldAlpha;
 
@@ -503,7 +500,7 @@ PIXI.WebGLBatch.prototype.update = function()
         indexRun++;
         displayObject = displayObject.__next;
     }
-}
+};
 
 /**
  * Draws the batch to the frame buffer
@@ -514,7 +511,8 @@ PIXI.WebGLBatch.prototype.render = function(start, end)
 {
     start = start || 0;
 
-	if(end == undefined)end = this.size;
+    if(end === undefined)
+        end = this.size;
 
     if(this.dirty)
     {
@@ -522,7 +520,7 @@ PIXI.WebGLBatch.prototype.render = function(start, end)
         this.dirty = false;
     }
 
-	if (this.size == 0)return;
+    if (this.size === 0)return;
 
     this.update();
     var gl = this.gl;
@@ -536,7 +534,7 @@ PIXI.WebGLBatch.prototype.render = function(start, end)
     // update the verts..
     gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexBuffer);
     // ok..
-	gl.bufferSubData(gl.ARRAY_BUFFER, 0, this.verticies)
+    gl.bufferSubData(gl.ARRAY_BUFFER, 0, this.verticies);
     gl.vertexAttribPointer(shaderProgram.aVertexPosition, 2, gl.FLOAT, false, 0, 0);
     // update the uvs
     //var isDefault = (shaderProgram == PIXI.shaderProgram)
@@ -571,4 +569,4 @@ PIXI.WebGLBatch.prototype.render = function(start, end)
 
     // DRAW THAT this!
     gl.drawElements(gl.TRIANGLES, len * 6, gl.UNSIGNED_SHORT, start * 2 * 6 );
-}
+};

src/pixi/renderers/webgl/WebGLFilterManager.js

@@ -14,7 +14,7 @@ PIXI.WebGLFilterManager = function(transparent)
     this.offsetY = 0;
 
     this.initShaderBuffers();
-}
+};
 
 // API
 
@@ -23,7 +23,7 @@ PIXI.WebGLFilterManager.prototype.begin = function(projection, buffer)
     this.width = projection.x * 2;
     this.height = -projection.y * 2;
     this.buffer = buffer;
-}
+};
 
 PIXI.WebGLFilterManager.prototype.pushFilter = function(filterBlock)
 {
@@ -35,15 +35,9 @@ PIXI.WebGLFilterManager.prototype.pushFilter = function(filterBlock)
 
     var filter = filterBlock.filterPasses[0];
 
-	
-
     this.offsetX += filterBlock.target.filterArea.x;
     this.offsetY += filterBlock.target.filterArea.y;
 
-	
-	
-	
-	
     var texture = this.texturePool.pop();
     if(!texture)
     {
@@ -75,11 +69,10 @@ PIXI.WebGLFilterManager.prototype.pushFilter = function(filterBlock)
     if(filterArea.y < 0)filterArea.y = 0;
     if(filterArea.height > this.height)filterArea.height = this.height;
 
-
     //gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA,  filterArea.width, filterArea.height, 0, gl.RGBA, gl.UNSIGNED_BYTE, null);
     gl.bindFramebuffer(gl.FRAMEBUFFER, texture.frameBuffer);
 
-  // console.log(filterArea)
+    //console.log(filterArea)
     // set view port
     gl.viewport(0, 0, filterArea.width, filterArea.height);
 
@@ -103,20 +96,14 @@ PIXI.WebGLFilterManager.prototype.pushFilter = function(filterBlock)
     filterBlock._glFilterTexture = texture;
 
     //console.log("PUSH")
-}
+};
 
 
 PIXI.WebGLFilterManager.prototype.popFilter = function()
 {
-	
     var gl = PIXI.gl;
-	
     var filterBlock = this.filterStack.pop();
-
-
-
     var filterArea = filterBlock.target.filterArea;
-
     var texture = filterBlock._glFilterTexture;
 
     if(filterBlock.filterPasses.length > 1)
@@ -137,10 +124,8 @@ PIXI.WebGLFilterManager.prototype.popFilter = function()
         this.vertexArray[6] = filterArea.width;
         this.vertexArray[7] = 0;
 
-
         gl.bufferSubData(gl.ARRAY_BUFFER, 0, this.vertexArray);
 
-	
         gl.bindBuffer(gl.ARRAY_BUFFER, this.uvBuffer);
         // nnow set the uvs..
         this.uvArray[2] = filterArea.width/this.width;
@@ -178,8 +163,7 @@ PIXI.WebGLFilterManager.prototype.popFilter = function()
             var temp = inputTexture;
             inputTexture = outputTexture;
             outputTexture = temp;
-			
+        }
-		};
 
         gl.enable(gl.BLEND);
 
@@ -209,7 +193,7 @@ PIXI.WebGLFilterManager.prototype.popFilter = function()
     else
     {
         var currentFilter = this.filterStack[this.filterStack.length-1];
-		var filterArea = currentFilter.target.filterArea;
+        filterArea = currentFilter.target.filterArea;
 
         sizeX = filterArea.width;
         sizeY = filterArea.height;
@@ -229,8 +213,8 @@ PIXI.WebGLFilterManager.prototype.popFilter = function()
     PIXI.offset.x = offsetX;
     PIXI.offset.y = offsetY;
 
+    filterArea = filterBlock.target.filterArea;
 
-	var filterArea =  filterBlock.target.filterArea;
     var x = filterArea.x-offsetX;
     var y = filterArea.y-offsetY;
 
@@ -281,16 +265,17 @@ PIXI.WebGLFilterManager.prototype.popFilter = function()
     // return the texture to the pool
     this.texturePool.push(texture);
     filterBlock._glFilterTexture = null;
-}
+};
 
 PIXI.WebGLFilterManager.prototype.applyFilterPass = function(filter, filterArea, width, height)
 {
     // use program
     var gl = PIXI.gl;
+    var shader = filter.shader;
 
-	if(!filter.shader)
+    if(!shader)
     {
-		var shader = new PIXI.PixiShader();
+        shader = new PIXI.PixiShader();
 
         shader.fragmentSrc = filter.fragmentSrc;
         shader.uniforms = filter.uniforms;
@@ -299,13 +284,11 @@ PIXI.WebGLFilterManager.prototype.applyFilterPass = function(filter, filterArea,
         filter.shader = shader;
     }
 
-	var shader = filter.shader;
-	
     // set the shader
     gl.useProgram(shader.program);
 
     gl.uniform2f(shader.projectionVector, width/2, -height/2);
-	gl.uniform2f(shader.offsetVector, 0,0)
+    gl.uniform2f(shader.offsetVector, 0,0);
 
     if(filter.uniforms.dimensions)
     {
@@ -329,7 +312,7 @@ PIXI.WebGLFilterManager.prototype.applyFilterPass = function(filter, filterArea,
 
     // draw the filter...
     gl.drawElements(gl.TRIANGLES, 6, gl.UNSIGNED_SHORT, 0 );
-}
+};
 
 PIXI.WebGLFilterManager.prototype.initShaderBuffers = function()
 {
@@ -372,12 +355,12 @@ PIXI.WebGLFilterManager.prototype.initShaderBuffers = function()
     gl.ELEMENT_ARRAY_BUFFER,
     new Uint16Array([0, 1, 2, 1, 3, 2]),
     gl.STATIC_DRAW);
-}
+};
 
 PIXI.WebGLFilterManager.prototype.getBounds = function(displayObject)
 {
     // time to get the width and height of the object!
-	var worldTransform, width, height, aX, aY, w0, w1, h0, h1, index, doTest;
+    var worldTransform, width, height, aX, aY, w0, w1, h0, h1, doTest;
     var a, b, c, d, tx, ty, x1, x2, x3, x4, y1, y2, y3, y4;
 
     var tempObject = displayObject.first;
@@ -420,10 +403,10 @@ PIXI.WebGLFilterManager.prototype.getBounds = function(displayObject)
                 width = bounds.width;
                 height = bounds.height;
 
-				w0 = bounds.x
+                w0 = bounds.x;
                 w1 = bounds.x + bounds.width;
 
-				h0 = bounds.y
+                h0 = bounds.y;
                 h1 = bounds.y + bounds.height;
 
                 doTest = true;
@@ -478,7 +461,7 @@ PIXI.WebGLFilterManager.prototype.getBounds = function(displayObject)
         tempObject = tempObject._iNext;
 
     }
-	while(tempObject != testObject)
+    while(tempObject !== testObject);
 
     // maximum bounds is the size of the screen..
     //minX = minX > 0 ? minX : 0;
@@ -490,7 +473,7 @@ PIXI.WebGLFilterManager.prototype.getBounds = function(displayObject)
 //  console.log(maxX+ " : " + minX)
     displayObject.filterArea.width = maxX - minX;
     displayObject.filterArea.height = maxY - minY;
-}
+};
 
 PIXI.FilterTexture = function(width, height)
 {
@@ -511,11 +494,11 @@ PIXI.FilterTexture = function(width, height)
     gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, this.texture, 0);
 
     this.resize(width, height);
-}
+};
 
 PIXI.FilterTexture.prototype.resize = function(width, height)
 {
-	if(this.width == width && this.height == height)return;
+    if(this.width === width && this.height === height) return;
 
     this.width = width;
     this.height = height;
@@ -525,4 +508,4 @@ PIXI.FilterTexture.prototype.resize = function(width, height)
     gl.bindTexture(gl.TEXTURE_2D,  this.texture);
     gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA,  width, height, 0, gl.RGBA, gl.UNSIGNED_BYTE, null);
 
-}
+};

src/pixi/renderers/webgl/WebGLGraphics.js

@@ -10,7 +10,7 @@
 PIXI.WebGLGraphics = function()
 {
 
-}
+};
 
 /**
  * Renders the graphics object
@@ -75,10 +75,9 @@ PIXI.WebGLGraphics.renderGraphics = function(graphics, projection)
 
     PIXI.deactivatePrimitiveShader();
 
-	
     // return to default shader...
 //  PIXI.activateShader(PIXI.defaultShader);
-}
+};
 
 /**
  * Updates the graphics object
@@ -90,11 +89,11 @@ PIXI.WebGLGraphics.renderGraphics = function(graphics, projection)
  */
 PIXI.WebGLGraphics.updateGraphics = function(graphics)
 {
-	for (var i=graphics._webGL.lastIndex; i < graphics.graphicsData.length; i++) 
+    for (var i = graphics._webGL.lastIndex; i < graphics.graphicsData.length; i++)
     {
         var data = graphics.graphicsData[i];
 
-		if(data.type == PIXI.Graphics.POLY)
+        if(data.type === PIXI.Graphics.POLY)
         {
             if(data.fill)
             {
@@ -107,15 +106,15 @@ PIXI.WebGLGraphics.updateGraphics = function(graphics)
                 PIXI.WebGLGraphics.buildLine(data, graphics._webGL);
             }
         }
-		else if(data.type == PIXI.Graphics.RECT)
+        else if(data.type === PIXI.Graphics.RECT)
         {
             PIXI.WebGLGraphics.buildRectangle(data, graphics._webGL);
         }
-		else if(data.type == PIXI.Graphics.CIRC || data.type == PIXI.Graphics.ELIP)
+        else if(data.type === PIXI.Graphics.CIRC || data.type === PIXI.Graphics.ELIP);
         {
             PIXI.WebGLGraphics.buildCircle(data, graphics._webGL);
         }
-	};
+    }
 
     graphics._webGL.lastIndex = graphics.graphicsData.length;
 
@@ -130,7 +129,7 @@ PIXI.WebGLGraphics.updateGraphics = function(graphics)
 
     gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, graphics._webGL.indexBuffer);
     gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, graphics._webGL.glIndicies, gl.STATIC_DRAW);
-}
+};
 
 /**
  * Builds a rectangle to draw
@@ -155,7 +154,7 @@ PIXI.WebGLGraphics.buildRectangle = function(graphicsData, webGLData)
 
     if(graphicsData.fill)
     {
-		var color = HEXtoRGB(graphicsData.fillColor);
+        var color = PIXI.hex2rgb(graphicsData.fillColor);
         var alpha = graphicsData.fillAlpha;
 
         var r = color[0] * alpha;
@@ -181,7 +180,7 @@ PIXI.WebGLGraphics.buildRectangle = function(graphicsData, webGLData)
         verts.push(r, g, b, alpha);
 
         // insert 2 dead triangles..
-		indices.push(vertPos, vertPos, vertPos+1, vertPos+2, vertPos+3, vertPos+3)
+        indices.push(vertPos, vertPos, vertPos+1, vertPos+2, vertPos+3, vertPos+3);
     }
 
     if(graphicsData.lineWidth)
@@ -194,8 +193,7 @@ PIXI.WebGLGraphics.buildRectangle = function(graphicsData, webGLData)
 
         PIXI.WebGLGraphics.buildLine(graphicsData, webGLData);
     }
-	
+};
-}
 
 /**
  * Builds a circle to draw
@@ -220,9 +218,11 @@ PIXI.WebGLGraphics.buildCircle = function(graphicsData, webGLData)
     var totalSegs = 40;
     var seg = (Math.PI * 2) / totalSegs ;
 
+    var i = 0;
+
     if(graphicsData.fill)
     {
-		var color = HEXtoRGB(graphicsData.fillColor);
+        var color = PIXI.hex2rgb(graphicsData.fillColor);
         var alpha = graphicsData.fillAlpha;
 
         var r = color[0] * alpha;
@@ -236,7 +236,7 @@ PIXI.WebGLGraphics.buildCircle = function(graphicsData, webGLData)
 
         indices.push(vecPos);
 
-		for (var i=0; i < totalSegs + 1 ; i++) 
+        for (i = 0; i < totalSegs + 1 ; i++)
         {
             verts.push(x,y, r, g, b, alpha);
 
@@ -245,7 +245,7 @@ PIXI.WebGLGraphics.buildCircle = function(graphicsData, webGLData)
                        r, g, b, alpha);
 
             indices.push(vecPos++, vecPos++);
-		};
+        }
 
         indices.push(vecPos-1);
     }
@@ -254,16 +254,15 @@ PIXI.WebGLGraphics.buildCircle = function(graphicsData, webGLData)
     {
         graphicsData.points = [];
 
-		for (var i=0; i < totalSegs + 1; i++) 
+        for (i = 0; i < totalSegs + 1; i++)
         {
             graphicsData.points.push(x + Math.sin(seg * i) * width,
-									 y + Math.cos(seg * i) * height)
+                                     y + Math.cos(seg * i) * height);
-		};
+        }
 
         PIXI.WebGLGraphics.buildLine(graphicsData, webGLData);
     }
-	
+};
-}
 
 /**
  * Builds a line to draw
@@ -277,17 +276,17 @@ PIXI.WebGLGraphics.buildCircle = function(graphicsData, webGLData)
 PIXI.WebGLGraphics.buildLine = function(graphicsData, webGLData)
 {
     // TODO OPTIMISE!
+    var i = 0;
 
-	var wrap = true;
     var points = graphicsData.points;
-	if(points.length == 0)return;
+    if(points.length === 0)return;
 
     // if the line width is an odd number add 0.5 to align to a whole pixel
     if(graphicsData.lineWidth%2)
     {
-		for (var i = 0; i < points.length; i++) {
+        for (i = 0; i < points.length; i++) {
             points[i] += 0.5;
-		};
+        }
     }
 
     // get first and last point.. figure out the middle!
@@ -295,7 +294,7 @@ PIXI.WebGLGraphics.buildLine = function(graphicsData, webGLData)
     var lastPoint = new PIXI.Point( points[points.length - 2], points[points.length - 1] );
 
     // if the first point is the last point - goona have issues :)
-	if(firstPoint.x == lastPoint.x && firstPoint.y == lastPoint.y)
+    if(firstPoint.x === lastPoint.x && firstPoint.y === lastPoint.y)
     {
         points.pop();
         points.pop();
@@ -306,7 +305,7 @@ PIXI.WebGLGraphics.buildLine = function(graphicsData, webGLData)
         var midPointY = lastPoint.y + (firstPoint.y - lastPoint.y) *0.5;
 
         points.unshift(midPointX, midPointY);
-		points.push(midPointX, midPointY)
+        points.push(midPointX, midPointY);
     }
 
     var verts = webGLData.points;
@@ -319,15 +318,14 @@ PIXI.WebGLGraphics.buildLine = function(graphicsData, webGLData)
     var width = graphicsData.lineWidth / 2;
 
     // sort color
-	var color = HEXtoRGB(graphicsData.lineColor);
+    var color = PIXI.hex2rgb(graphicsData.lineColor);
     var alpha = graphicsData.lineAlpha;
     var r = color[0] * alpha;
     var g = color[1] * alpha;
     var b = color[2] * alpha;
 
-	var p1x, p1y, p2x, p2y, p3x, p3y;
+    var px, py, p1x, p1y, p2x, p2y, p3x, p3y;
     var perpx, perpy, perp2x, perp2y, perp3x, perp3y;
-	var ipx, ipy;
     var a1, b1, c1, a2, b2, c2;
     var denom, pdist, dist;
 
@@ -354,13 +352,13 @@ PIXI.WebGLGraphics.buildLine = function(graphicsData, webGLData)
     verts.push(p1x + perpx , p1y + perpy,
                 r, g, b, alpha);
 
-	for (var i = 1; i < length-1; i++) 
+    for (i = 1; i < length-1; i++)
     {
         p1x = points[(i-1)*2];
         p1y = points[(i-1)*2 + 1];
 
-		p2x = points[(i)*2]
+        p2x = points[(i)*2];
-		p2y = points[(i)*2 + 1]
+        p2y = points[(i)*2 + 1];
 
         p3x = points[(i+1)*2];
         p3y = points[(i+1)*2 + 1];
@@ -445,13 +443,13 @@ PIXI.WebGLGraphics.buildLine = function(graphicsData, webGLData)
         }
     }
 
-	p1x = points[(length-2)*2]
+    p1x = points[(length-2)*2];
-	p1y = points[(length-2)*2 + 1] 
+    p1y = points[(length-2)*2 + 1];
 
-	p2x = points[(length-1)*2]
+    p2x = points[(length-1)*2];
-	p2y = points[(length-1)*2 + 1]
+    p2y = points[(length-1)*2 + 1];
 
-	perpx = -(p1y - p2y)
+    perpx = -(p1y - p2y);
     perpy = p1x - p2x;
 
     dist = Math.sqrt(perpx*perpx + perpy*perpy);
@@ -460,21 +458,21 @@ PIXI.WebGLGraphics.buildLine = function(graphicsData, webGLData)
     perpx *= width;
     perpy *= width;
 
-	verts.push(p2x - perpx , p2y - perpy)
+    verts.push(p2x - perpx , p2y - perpy);
     verts.push(r, g, b, alpha);
 
-	verts.push(p2x + perpx , p2y + perpy)
+    verts.push(p2x + perpx , p2y + perpy);
     verts.push(r, g, b, alpha);
 
     indices.push(indexStart);
 
-	for (var i=0; i < indexCount; i++) 
+    for (i = 0; i < indexCount; i++)
     {
         indices.push(indexStart++);
-	};
+    }
 
     indices.push(indexStart-1);
-}
+};
 
 /**
  * Builds a polygon to draw
@@ -497,7 +495,7 @@ PIXI.WebGLGraphics.buildPoly = function(graphicsData, webGLData)
     var length = points.length / 2;
 
     // sort color
-	var color = HEXtoRGB(graphicsData.fillColor);
+    var color = PIXI.hex2rgb(graphicsData.fillColor);
     var alpha = graphicsData.fillAlpha;
     var r = color[0] * alpha;
     var g = color[1] * alpha;
@@ -507,26 +505,20 @@ PIXI.WebGLGraphics.buildPoly = function(graphicsData, webGLData)
 
     var vertPos = verts.length / 6;
 
-	for (var i=0; i < triangles.length; i+=3) 
+    var i = 0;
+
+    for (i = 0; i < triangles.length; i+=3)
     {
         indices.push(triangles[i] + vertPos);
         indices.push(triangles[i] + vertPos);
         indices.push(triangles[i+1] + vertPos);
         indices.push(triangles[i+2] +vertPos);
         indices.push(triangles[i+2] + vertPos);
-	};
+    }
 
-	for (var i = 0; i < length; i++) 
+    for (i = 0; i < length; i++)
     {
         verts.push(points[i * 2], points[i * 2 + 1],
                    r, g, b, alpha);
-	};
+    }
-}
+};
-
-function HEXtoRGB(hex) {
-	return [(hex >> 16 & 0xFF) / 255, ( hex >> 8 & 0xFF) / 255, (hex & 0xFF)/ 255];
-}
-
-
-
-

src/pixi/renderers/webgl/WebGLRenderGroup.js

@@ -25,6 +25,7 @@ PIXI.WebGLRenderGroup = function(gl, transparent)
 	
 	this.batchs = [];
 	this.toRemove = [];
+	// console.log(this.transparent)
 	this.filterManager = new PIXI.WebGLFilterManager(this.transparent);
 }
 

src/pixi/renderers/webgl/WebGLRenderer.js

@@ -6,7 +6,7 @@ PIXI._defaultFrame = new PIXI.Rectangle(0,0,1,1);
 
 // an instance of the gl context..
 // only one at the moment :/
-PIXI.gl;
+PIXI.gl = null;
 
 /**
  * the WebGLRenderer is draws the stage and all its content onto a webGL enabled canvas. This renderer
@@ -38,8 +38,8 @@ PIXI.WebGLRenderer = function(width, height, view, transparent, antialias)
 
     // deal with losing context..
     var scope = this;
-	this.view.addEventListener('webglcontextlost', function(event) { scope.handleContextLost(event); }, false)
+    this.view.addEventListener('webglcontextlost', function(event) { scope.handleContextLost(event); }, false);
-	this.view.addEventListener('webglcontextrestored', function(event) { scope.handleContextRestored(event); }, false)
+    this.view.addEventListener('webglcontextrestored', function(event) { scope.handleContextRestored(event); }, false);
 
     this.batchs = [];
 
@@ -48,18 +48,18 @@ PIXI.WebGLRenderer = function(width, height, view, transparent, antialias)
         antialias:!!antialias, // SPEED UP??
         premultipliedAlpha:false,
         stencil:true
-	}
+    };
 
     //try 'experimental-webgl'
     try {
-		PIXI.gl = this.gl = this.view.getContext("experimental-webgl",  options);
+        PIXI.gl = this.gl = this.view.getContext('experimental-webgl',  options);
     } catch (e) {
         //try 'webgl'
         try {
-			PIXI.gl = this.gl = this.view.getContext("webgl",  options);
+            PIXI.gl = this.gl = this.view.getContext('webgl',  options);
-		} catch (e) {
+        } catch (e2) {
             // fail, not able to get a context
-			throw new Error(" This browser does not support webGL. Try using the canvas renderer" + this);
+            throw new Error(' This browser does not support webGL. Try using the canvas renderer' + this);
         }
     }
 
@@ -96,7 +96,7 @@ PIXI.WebGLRenderer = function(width, height, view, transparent, antialias)
 
     this.stageRenderGroup = new PIXI.WebGLRenderGroup(this.gl, this.transparent);
   //  this.stageRenderGroup. = this.transparent
-}
+};
 
 // constructor
 PIXI.WebGLRenderer.prototype.constructor = PIXI.WebGLRenderer;
@@ -111,7 +111,7 @@ PIXI.WebGLRenderer.prototype.constructor = PIXI.WebGLRenderer;
  */
 PIXI.WebGLRenderer.getBatch = function()
 {
-	if(PIXI._batchs.length == 0)
+    if(PIXI._batchs.length === 0)
     {
         return new PIXI.WebGLBatch(PIXI.WebGLRenderer.gl);
     }
@@ -119,7 +119,7 @@ PIXI.WebGLRenderer.getBatch = function()
     {
         return PIXI._batchs.pop();
     }
-}
+};
 
 /**
  * Puts a batch back into the pool
@@ -133,7 +133,7 @@ PIXI.WebGLRenderer.returnBatch = function(batch)
 {
     batch.clean();
     PIXI._batchs.push(batch);
-}
+};
 
 /**
  * Renders the stage to its webGL view
@@ -200,11 +200,11 @@ PIXI.WebGLRenderer.prototype.render = function(stage)
         for (var i=0; i < PIXI.Texture.frameUpdates.length; i++)
         {
             PIXI.Texture.frameUpdates[i].updateFrame = false;
-		};
+        }
 
         PIXI.Texture.frameUpdates = [];
     }
-}
+};
 
 /**
  * Updates the textures loaded into this webgl renderer
@@ -215,12 +215,18 @@ PIXI.WebGLRenderer.prototype.render = function(stage)
  */
 PIXI.WebGLRenderer.updateTextures = function()
 {
+    var i = 0;
+
     //TODO break this out into a texture manager...
-	for (var i=0; i < PIXI.texturesToUpdate.length; i++) PIXI.WebGLRenderer.updateTexture(PIXI.texturesToUpdate[i]);
+    for (i = 0; i < PIXI.texturesToUpdate.length; i++)
-	for (var i=0; i < PIXI.texturesToDestroy.length; i++) PIXI.WebGLRenderer.destroyTexture(PIXI.texturesToDestroy[i]);
+        PIXI.WebGLRenderer.updateTexture(PIXI.texturesToUpdate[i]);
+
+    for (i = 0; i < PIXI.texturesToDestroy.length; i++)
+        PIXI.WebGLRenderer.destroyTexture(PIXI.texturesToDestroy[i]);
+
     PIXI.texturesToUpdate = [];
     PIXI.texturesToDestroy = [];
-}
+};
 
 /**
  * Updates a loaded webgl texture
@@ -246,8 +252,8 @@ PIXI.WebGLRenderer.updateTexture = function(texture)
         gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, true);
 
         gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, texture.source);
-		gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, texture.scaleMode === PIXI.BaseTexture.SCALE_MODE.LINEAR ? gl.LINEAR : gl.NEAREST);
-		gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, texture.scaleMode === PIXI.BaseTexture.SCALE_MODE.LINEAR ? gl.LINEAR : gl.NEAREST);
 
         // reguler...
 
@@ -264,7 +270,7 @@ PIXI.WebGLRenderer.updateTexture = function(texture)
 
         gl.bindTexture(gl.TEXTURE_2D, null);
     }
-}
+};
 
 /**
  * Destroys a loaded webgl texture
@@ -283,7 +289,7 @@ PIXI.WebGLRenderer.destroyTexture = function(texture)
         texture._glTexture = gl.createTexture();
         gl.deleteTexture(gl.TEXTURE_2D, texture._glTexture);
     }
-}
+};
 
 /**
  * resizes the webGL view to the specified width and height
@@ -314,7 +320,7 @@ PIXI.WebGLRenderer.prototype.resize = function(width, height)
 //  projectionMatrix[5] = -2/this.height;
 //  projectionMatrix[12] = -1;
 //  projectionMatrix[13] = 1;
-}
+};
 
 /**
  * Handles a lost webgl context
@@ -327,7 +333,7 @@ PIXI.WebGLRenderer.prototype.handleContextLost = function(event)
 {
     event.preventDefault();
     this.contextLost = true;
-}
+};
 
 /**
  * Handles a restored webgl context
@@ -336,9 +342,9 @@ PIXI.WebGLRenderer.prototype.handleContextLost = function(event)
  * @param event {Event}
  * @private
  */
-PIXI.WebGLRenderer.prototype.handleContextRestored = function(event)
+PIXI.WebGLRenderer.prototype.handleContextRestored = function()
 {
-	this.gl = this.view.getContext("experimental-webgl",  {  	
+    this.gl = this.view.getContext('experimental-webgl',  {
         alpha: true
     });
 
@@ -349,15 +355,15 @@ PIXI.WebGLRenderer.prototype.handleContextRestored = function(event)
         var texture = PIXI.TextureCache[key].baseTexture;
         texture._glTexture = null;
         PIXI.WebGLRenderer.updateTexture(texture);
-	};
+    }
 
     for (var i=0; i <  this.batchs.length; i++)
     {
-		this.batchs[i].restoreLostContext(this.gl)//
+        this.batchs[i].restoreLostContext(this.gl);
         this.batchs[i].dirty = true;
-	};
+    }
 
     PIXI._restoreBatchs(this.gl);
 
     this.contextLost = false;
-}
+};

src/pixi/renderers/webgl/WebGLShaders.js

@@ -2,7 +2,6 @@
  * @author Mat Groves http://matgroves.com/ @Doormat23
  */
 
-
 PIXI.initDefaultShaders = function()
 {
     PIXI.primitiveShader = new PIXI.PrimitiveShader();
@@ -17,13 +16,12 @@ PIXI.initDefaultShaders = function()
     var gl = PIXI.gl;
     var shaderProgram = PIXI.defaultShader.program;
 
-
     gl.useProgram(shaderProgram);
 
     gl.enableVertexAttribArray(PIXI.defaultShader.aVertexPosition);
     gl.enableVertexAttribArray(PIXI.defaultShader.colorAttribute);
     gl.enableVertexAttribArray(PIXI.defaultShader.aTextureCoord);
-}
+};
 
 PIXI.activatePrimitiveShader = function()
 {
@@ -37,7 +35,7 @@ PIXI.activatePrimitiveShader = function()
 
     gl.enableVertexAttribArray(PIXI.primitiveShader.aVertexPosition);
     gl.enableVertexAttribArray(PIXI.primitiveShader.colorAttribute);
-} 
+};
 
 PIXI.deactivatePrimitiveShader = function()
 {
@@ -51,8 +49,7 @@ PIXI.deactivatePrimitiveShader = function()
     gl.enableVertexAttribArray(PIXI.defaultShader.aVertexPosition);
     gl.enableVertexAttribArray(PIXI.defaultShader.colorAttribute);
     gl.enableVertexAttribArray(PIXI.defaultShader.aTextureCoord);
-
+};
-}
 
 PIXI.activateStripShader = function()
 {
@@ -60,7 +57,7 @@ PIXI.activateStripShader = function()
 
     gl.useProgram(PIXI.stripShader.program);
  // gl.disableVertexAttribArray(PIXI.defaultShader.aTextureCoord);
-} 
+};
 
 PIXI.deactivateStripShader = function()
 {
@@ -68,7 +65,7 @@ PIXI.deactivateStripShader = function()
 
     gl.useProgram(PIXI.defaultShader.program);
     //gl.enableVertexAttribArray(PIXI.defaultShader.aTextureCoord);
-}
+};
 
 /*
 
@@ -78,12 +75,12 @@ SHADER COMPILER HELPERS
 PIXI.CompileVertexShader = function(gl, shaderSrc)
 {
     return PIXI._CompileShader(gl, shaderSrc, gl.VERTEX_SHADER);
-}
+};
 
 PIXI.CompileFragmentShader = function(gl, shaderSrc)
 {
     return PIXI._CompileShader(gl, shaderSrc, gl.FRAGMENT_SHADER);
-}
+};
 
 PIXI._CompileShader = function(gl, shaderSrc, shaderType)
 {
@@ -93,13 +90,12 @@ PIXI._CompileShader = function(gl, shaderSrc, shaderType)
     gl.compileShader(shader);
 
     if (!gl.getShaderParameter(shader, gl.COMPILE_STATUS)) {
-    console.log(gl.getShaderInfoLog(shader));
+        window.console.log(gl.getShaderInfoLog(shader));
         return null;
     }
 
     return shader;
-}
+};
-
 
 PIXI.compileProgram = function(vertexSrc, fragmentSrc)
 {
@@ -114,8 +110,8 @@ PIXI.compileProgram = function(vertexSrc, fragmentSrc)
     gl.linkProgram(shaderProgram);
 
     if (!gl.getProgramParameter(shaderProgram, gl.LINK_STATUS)) {
-        console.log("Could not initialise shaders");
+        window.console.log("Could not initialise shaders");
     }
 
     return shaderProgram;
-} 
+};

src/pixi/text/BitmapText.js

@@ -3,7 +3,7 @@
  */
 
 /**
- * A Text Object will create a line(s) of text using bitmap font. To split a line you can use "\n", "\r" or "\r\n"
+ * A Text Object will create a line(s) of text using bitmap font. To split a line you can use '\n', '\r' or '\r\n'
  * You can generate the fnt files using
  * http://www.angelcode.com/products/bmfont/ for windows or
  * http://www.bmglyph.com/ for mac.
@@ -13,8 +13,8 @@
  * @constructor
  * @param text {String} The copy that you would like the text to display
  * @param style {Object} The style parameters
- * @param style.font {String} The size (optional) and bitmap font id (required) eq "Arial" or "20px Arial" (must have loaded previously)
+ * @param style.font {String} The size (optional) and bitmap font id (required) eq 'Arial' or '20px Arial' (must have loaded previously)
- * @param [style.align="left"] {String} An alignment of the multiline text ("left", "center" or "right")
+ * @param [style.align='left'] {String} An alignment of the multiline text ('left', 'center' or 'right')
  */
 PIXI.BitmapText = function(text, style)
 {
@@ -23,8 +23,7 @@ PIXI.BitmapText = function(text, style)
     this.setText(text);
     this.setStyle(style);
     this.updateText();
-    this.dirty = false
+    this.dirty = false;
-
 };
 
 // constructor
@@ -39,7 +38,7 @@ PIXI.BitmapText.prototype.constructor = PIXI.BitmapText;
  */
 PIXI.BitmapText.prototype.setText = function(text)
 {
-    this.text = text || " ";
+    this.text = text || ' ';
     this.dirty = true;
 };
 
@@ -48,16 +47,16 @@ PIXI.BitmapText.prototype.setText = function(text)
  *
  * @method setStyle
  * @param style {Object} The style parameters
- * @param style.font {String} The size (optional) and bitmap font id (required) eq "Arial" or "20px Arial" (must have loaded previously)
+ * @param style.font {String} The size (optional) and bitmap font id (required) eq 'Arial' or '20px Arial' (must have loaded previously)
- * @param [style.align="left"] {String} An alignment of the multiline text ("left", "center" or "right")
+ * @param [style.align='left'] {String} An alignment of the multiline text ('left', 'center' or 'right')
  */
 PIXI.BitmapText.prototype.setStyle = function(style)
 {
     style = style || {};
-    style.align = style.align || "left";
+    style.align = style.align || 'left';
     this.style = style;
 
-    var font = style.font.split(" ");
+    var font = style.font.split(' ');
     this.fontName = font[font.length - 1];
     this.fontSize = font.length >= 2 ? parseInt(font[font.length - 2], 10) : PIXI.BitmapText.fonts[this.fontName].size;
 
@@ -115,11 +114,11 @@ PIXI.BitmapText.prototype.updateText = function()
     for(i = 0; i <= line; i++)
     {
         var alignOffset = 0;
-        if(this.style.align == "right")
+        if(this.style.align === 'right')
         {
             alignOffset = maxLineWidth - lineWidths[i];
         }
-        else if(this.style.align == "center")
+        else if(this.style.align === 'center')
         {
             alignOffset = (maxLineWidth - lineWidths[i]) / 2;
         }
@@ -128,7 +127,7 @@ PIXI.BitmapText.prototype.updateText = function()
 
     for(i = 0; i < chars.length; i++)
     {
-        var c = new PIXI.Sprite(chars[i].texture)//PIXI.Sprite.fromFrame(chars[i].charCode);
+        var c = new PIXI.Sprite(chars[i].texture); //PIXI.Sprite.fromFrame(chars[i].charCode);
         c.position.x = (chars[i].position.x + lineAlignOffsets[chars[i].line]) * scale;
         c.position.y = chars[i].position.y * scale;
         c.scale.x = c.scale.y = scale;

src/pixi/text/Text.js

@@ -3,25 +3,25 @@
  */
 
 /**
- * A Text Object will create a line(s) of text to split a line you can use "\n"
+ * A Text Object will create a line(s) of text to split a line you can use '\n'
  *
  * @class Text
  * @extends Sprite
  * @constructor
  * @param text {String} The copy that you would like the text to display
  * @param [style] {Object} The style parameters
- * @param [style.font] {String} default "bold 20pt Arial" The style and size of the font
+ * @param [style.font] {String} default 'bold 20pt Arial' The style and size of the font
- * @param [style.fill="black"] {Object} A canvas fillstyle that will be used on the text eg "red", "#00FF00"
+ * @param [style.fill='black'] {Object} A canvas fillstyle that will be used on the text eg 'red', '#00FF00'
- * @param [style.align="left"] {String} An alignment of the multiline text ("left", "center" or "right")
+ * @param [style.align='left'] {String} An alignment of the multiline text ('left', 'center' or 'right')
- * @param [style.stroke] {String} A canvas fillstyle that will be used on the text stroke eg "blue", "#FCFF00"
+ * @param [style.stroke] {String} A canvas fillstyle that will be used on the text stroke eg 'blue', '#FCFF00'
  * @param [style.strokeThickness=0] {Number} A number that represents the thickness of the stroke. Default is 0 (no stroke)
  * @param [style.wordWrap=false] {Boolean} Indicates if word wrap should be used
  * @param [style.wordWrapWidth=100] {Number} The width at which text will wrap
  */
 PIXI.Text = function(text, style)
 {
-    this.canvas = document.createElement("canvas");
+    this.canvas = document.createElement('canvas');
-    this.context = this.canvas.getContext("2d");
+    this.context = this.canvas.getContext('2d');
     PIXI.Sprite.call(this, PIXI.Texture.fromCanvas(this.canvas));
 
     this.setText(text);
@@ -40,10 +40,10 @@ PIXI.Text.prototype.constructor = PIXI.Text;
  *
  * @method setStyle
  * @param [style] {Object} The style parameters
- * @param [style.font="bold 20pt Arial"] {String} The style and size of the font
+ * @param [style.font='bold 20pt Arial'] {String} The style and size of the font
- * @param [style.fill="black"] {Object} A canvas fillstyle that will be used on the text eg "red", "#00FF00"
+ * @param [style.fill='black'] {Object} A canvas fillstyle that will be used on the text eg 'red', '#00FF00'
- * @param [style.align="left"] {String} An alignment of the multiline text ("left", "center" or "right")
+ * @param [style.align='left'] {String} An alignment of the multiline text ('left', 'center' or 'right')
- * @param [style.stroke="black"] {String} A canvas fillstyle that will be used on the text stroke eg "blue", "#FCFF00"
+ * @param [style.stroke='black'] {String} A canvas fillstyle that will be used on the text stroke eg 'blue', '#FCFF00'
  * @param [style.strokeThickness=0] {Number} A number that represents the thickness of the stroke. Default is 0 (no stroke)
  * @param [style.wordWrap=false] {Boolean} Indicates if word wrap should be used
  * @param [style.wordWrapWidth=100] {Number} The width at which text will wrap
@@ -51,10 +51,10 @@ PIXI.Text.prototype.constructor = PIXI.Text;
 PIXI.Text.prototype.setStyle = function(style)
 {
     style = style || {};
-    style.font = style.font || "bold 20pt Arial";
+    style.font = style.font || 'bold 20pt Arial';
-    style.fill = style.fill || "black";
+    style.fill = style.fill || 'black';
-    style.align = style.align || "left";
+    style.align = style.align || 'left';
-    style.stroke = style.stroke || "black"; //provide a default, see: https://github.com/GoodBoyDigital/pixi.js/issues/136
+    style.stroke = style.stroke || 'black'; //provide a default, see: https://github.com/GoodBoyDigital/pixi.js/issues/136
     style.strokeThickness = style.strokeThickness || 0;
     style.wordWrap = style.wordWrap || false;
     style.wordWrapWidth = style.wordWrapWidth || 100;
@@ -63,14 +63,14 @@ PIXI.Text.prototype.setStyle = function(style)
 };
 
 /**
- * Set the copy for the text object. To split a line you can use "\n"
+ * Set the copy for the text object. To split a line you can use '\n'
  *
  * @method setText
  * @param {String} text The copy that you would like the text to display
  */
 PIXI.Text.prototype.setText = function(text)
 {
-    this.text = text.toString() || " ";
+    this.text = text.toString() || ' ';
     this.dirty = true;
 };
 
@@ -105,7 +105,7 @@ PIXI.Text.prototype.updateText = function()
     this.canvas.width = maxLineWidth + this.style.strokeThickness;
 
     //calculate text height
-	var lineHeight = this.determineFontHeight("font: " + this.style.font  + ";") + this.style.strokeThickness;
+    var lineHeight = this.determineFontHeight('font: ' + this.style.font  + ';') + this.style.strokeThickness;
     this.canvas.height = lineHeight * lines.length;
 
     //set canvas text styles
@@ -115,18 +115,18 @@ PIXI.Text.prototype.updateText = function()
     this.context.strokeStyle = this.style.stroke;
     this.context.lineWidth = this.style.strokeThickness;
 
-	this.context.textBaseline = "top";
+    this.context.textBaseline = 'top';
 
     //draw lines line by line
     for (i = 0; i < lines.length; i++)
     {
         var linePosition = new PIXI.Point(this.style.strokeThickness / 2, this.style.strokeThickness / 2 + i * lineHeight);
 
-		if(this.style.align == "right")
+        if(this.style.align === 'right')
         {
             linePosition.x += maxLineWidth - lineWidths[i];
         }
-		else if(this.style.align == "center")
+        else if(this.style.align === 'center')
         {
             linePosition.x += (maxLineWidth - lineWidths[i]) / 2;
         }
@@ -197,11 +197,11 @@ PIXI.Text.prototype.determineFontHeight = function(fontStyle)
 
     if(!result)
     {
-		var body = document.getElementsByTagName("body")[0];
+        var body = document.getElementsByTagName('body')[0];
-		var dummy = document.createElement("div");
+        var dummy = document.createElement('div');
-		var dummyText = document.createTextNode("M");
+        var dummyText = document.createTextNode('M');
         dummy.appendChild(dummyText);
-		dummy.setAttribute("style", fontStyle + ';position:absolute;top:0;left:0');
+        dummy.setAttribute('style', fontStyle + ';position:absolute;top:0;left:0');
         body.appendChild(dummy);
 
         result = dummy.offsetHeight;
@@ -225,34 +225,34 @@ PIXI.Text.prototype.wordWrap = function(text)
 {
     // Greedy wrapping algorithm that will wrap words as the line grows longer
     // than its horizontal bounds.
-	var result = "";
+    var result = '';
-	var lines = text.split("\n");
+    var lines = text.split('\n');
     for (var i = 0; i < lines.length; i++)
     {
         var spaceLeft = this.style.wordWrapWidth;
-		var words = lines[i].split(" ");
+        var words = lines[i].split(' ');
         for (var j = 0; j < words.length; j++)
         {
             var wordWidth = this.context.measureText(words[j]).width;
-			var wordWidthWithSpace = wordWidth + this.context.measureText(" ").width;
+            var wordWidthWithSpace = wordWidth + this.context.measureText(' ').width;
             if(wordWidthWithSpace > spaceLeft)
             {
                 // Skip printing the newline if it's the first word of the line that is
                 // greater than the word wrap width.
                 if(j > 0)
                 {
-					result += "\n";
+                    result += '\n';
                 }
-				result += words[j] + " ";
+                result += words[j] + ' ';
                 spaceLeft = this.style.wordWrapWidth - wordWidth;
             }
             else
             {
                 spaceLeft -= wordWidthWithSpace;
-				result += words[j] + " ";
+                result += words[j] + ' ';
             }
         }
-		result += "\n";
+        result += '\n';
     }
     return result;
 };

src/pixi/textures/BaseTexture.js

@@ -14,7 +14,7 @@ PIXI.texturesToDestroy = [];
  * @constructor
  * @param source {String} the source object (image or canvas)
  */
-PIXI.BaseTexture = function(source)
+PIXI.BaseTexture = function(source, scaleMode)
 {
     PIXI.EventTarget.call( this );
 
@@ -36,6 +36,14 @@ PIXI.BaseTexture = function(source)
      */
     this.height = 100;
 
+    /**
+     * The scale mode to apply when scaling this texture
+     * @property scaleMode
+     * @type PIXI.BaseTexture.SCALE_MODE
+     * @default PIXI.BaseTexture.SCALE_MODE.LINEAR
+     */
+    this.scaleMode = scaleMode || PIXI.BaseTexture.SCALE_MODE.DEFAULT;
+
     /**
      * [read-only] Describes if the base texture has loaded or not
      *
@@ -69,7 +77,7 @@ PIXI.BaseTexture = function(source)
         {
 
             var scope = this;
-			this.source.onload = function(){
+            this.source.onload = function() {
 
                 scope.hasLoaded = true;
                 scope.width = scope.source.width;
@@ -78,8 +86,8 @@ PIXI.BaseTexture = function(source)
                 // add it to somewhere...
                 PIXI.texturesToUpdate.push(scope);
                 scope.dispatchEvent( { type: 'loaded', content: scope } );
-			}
+            };
-			//	this.image.src = imageUrl;
+            //this.image.src = imageUrl;
         }
     }
     else
@@ -93,7 +101,7 @@ PIXI.BaseTexture = function(source)
 
     this.imageUrl = null;
     this._powerOf2 = false;
-}
+};
 
 PIXI.BaseTexture.prototype.constructor = PIXI.BaseTexture;
 
@@ -113,7 +121,7 @@ PIXI.BaseTexture.prototype.destroy = function()
     }
     this.source = null;
     PIXI.texturesToDestroy.push(this);
-}
+};
 
 /**
  *
@@ -126,7 +134,7 @@ PIXI.BaseTexture.prototype.updateSourceImage = function(newSrc)
     this.hasLoaded = false;
     this.source.src = null;
     this.source.src = newSrc;
-}
+};
 
 /**
  * Helper function that returns a base texture based on an image url
@@ -137,7 +145,7 @@ PIXI.BaseTexture.prototype.updateSourceImage = function(newSrc)
  * @param imageUrl {String} The image url of the texture
  * @return BaseTexture
  */
-PIXI.BaseTexture.fromImage = function(imageUrl, crossorigin)
+PIXI.BaseTexture.fromImage = function(imageUrl, crossorigin, scaleMode)
 {
     var baseTexture = PIXI.BaseTextureCache[imageUrl];
     if(!baseTexture)
@@ -150,10 +158,16 @@ PIXI.BaseTexture.fromImage = function(imageUrl, crossorigin)
             image.crossOrigin = '';
         }
         image.src = imageUrl;
-		baseTexture = new PIXI.BaseTexture(image);
+        baseTexture = new PIXI.BaseTexture(image, scaleMode);
         baseTexture.imageUrl = imageUrl;
         PIXI.BaseTextureCache[imageUrl] = baseTexture;
     }
 
     return baseTexture;
-}
+};
+
+PIXI.BaseTexture.SCALE_MODE = {
+    DEFAULT: 0, //default to LINEAR
+    LINEAR: 0,
+    NEAREST: 1
+};

src/pixi/textures/RenderTexture.js

@@ -49,7 +49,7 @@ PIXI.RenderTexture = function(width, height)
     {
         this.initCanvas();
     }
-}
+};
 
 PIXI.RenderTexture.prototype = Object.create( PIXI.Texture.prototype );
 PIXI.RenderTexture.prototype.constructor = PIXI.RenderTexture;
@@ -95,7 +95,7 @@ PIXI.RenderTexture.prototype.initWebGL = function()
 
     // set the correct render function..
     this.render = this.renderWebGL;
-}
+};
 
 
 PIXI.RenderTexture.prototype.resize = function(width, height)
@@ -106,8 +106,8 @@ PIXI.RenderTexture.prototype.resize = function(width, height)
 
     if(PIXI.gl)
     {
-		this.projection.x = this.width/2
+        this.projection.x = this.width / 2;
-		this.projection.y = -this.height/2;
+        this.projection.y = -this.height / 2;
 
         var gl = PIXI.gl;
         gl.bindTexture(gl.TEXTURE_2D, this.baseTexture._glTexture);
@@ -116,11 +116,11 @@ PIXI.RenderTexture.prototype.resize = function(width, height)
     else
     {
 
-		this.frame.width = this.width
+        this.frame.width = this.width;
         this.frame.height = this.height;
         this.renderer.resize(this.width, this.height);
     }
-}
+};
 
 /**
  * Initializes the canvas data for this texture
@@ -136,7 +136,7 @@ PIXI.RenderTexture.prototype.initCanvas = function()
     this.frame = new PIXI.Rectangle(0, 0, this.width, this.height);
 
     this.render = this.renderCanvas;
-}
+};
 
 /**
  * This function will draw the display object to the texture.
@@ -191,7 +191,7 @@ PIXI.RenderTexture.prototype.renderWebGL = function(displayObject, position, cle
 
     if(renderGroup)
     {
-		if(displayObject == renderGroup.root)
+        if(displayObject === renderGroup.root)
         {
             renderGroup.render(this.projection, this.glFramebuffer);
         }
@@ -208,7 +208,7 @@ PIXI.RenderTexture.prototype.renderWebGL = function(displayObject, position, cle
     }
 
     displayObject.worldTransform = originalWorldTransform;
-}
+};
 
 
 /**
@@ -232,17 +232,16 @@ PIXI.RenderTexture.prototype.renderCanvas = function(displayObject, position, cl
     }
 
 
-	for(var i=0,j=children.length; i<j; i++)
+    for(var i = 0, j = children.length; i < j; i++)
     {
         children[i].updateTransform();
     }
 
-	if(clear)this.renderer.context.clearRect(0,0, this.width, this.height);
+    if(clear) this.renderer.context.clearRect(0,0, this.width, this.height);
 
     this.renderer.renderDisplayObject(displayObject);
 
     this.renderer.context.setTransform(1,0,0,1,0,0);
 
-
+    //PIXI.texturesToUpdate.push(this.baseTexture);
-  //  PIXI.texturesToUpdate.push(this.baseTexture);
+};
-}

src/pixi/textures/Texture.js

@@ -64,9 +64,9 @@ PIXI.Texture = function(baseTexture, frame)
     else
     {
         var scope = this;
-		baseTexture.addEventListener( 'loaded', function(){ scope.onBaseTextureLoaded()} );
+        baseTexture.addEventListener('loaded', function(){ scope.onBaseTextureLoaded(); });
     }
-}
+};
 
 PIXI.Texture.prototype.constructor = PIXI.Texture;
 
@@ -77,7 +77,7 @@ PIXI.Texture.prototype.constructor = PIXI.Texture;
  * @param event
  * @private
  */
-PIXI.Texture.prototype.onBaseTextureLoaded = function(event)
+PIXI.Texture.prototype.onBaseTextureLoaded = function()
 {
     var baseTexture = this.baseTexture;
     baseTexture.removeEventListener( 'loaded', this.onLoaded );
@@ -88,7 +88,7 @@ PIXI.Texture.prototype.onBaseTextureLoaded = function(event)
     this.height = this.frame.height;
 
     this.scope.dispatchEvent( { type: 'update', content: this } );
-}
+};
 
 /**
  * Destroys this texture
@@ -98,8 +98,8 @@ PIXI.Texture.prototype.onBaseTextureLoaded = function(event)
  */
 PIXI.Texture.prototype.destroy = function(destroyBase)
 {
-	if(destroyBase)this.baseTexture.destroy();
+    if(destroyBase) this.baseTexture.destroy();
-}
+};
 
 /**
  * Specifies the rectangle region of the baseTexture
@@ -115,14 +115,14 @@ PIXI.Texture.prototype.setFrame = function(frame)
 
     if(frame.x + frame.width > this.baseTexture.width || frame.y + frame.height > this.baseTexture.height)
     {
-		throw new Error("Texture Error: frame does not fit inside the base Texture dimensions " + this);
+        throw new Error('Texture Error: frame does not fit inside the base Texture dimensions ' + this);
     }
 
     this.updateFrame = true;
 
     PIXI.Texture.frameUpdates.push(this);
     //this.dispatchEvent( { type: 'update', content: this } );
-}
+};
 
 /**
  * Helper function that returns a texture based on an image url
@@ -134,18 +134,18 @@ PIXI.Texture.prototype.setFrame = function(frame)
  * @param crossorigin {Boolean} Whether requests should be treated as crossorigin
  * @return Texture
  */
-PIXI.Texture.fromImage = function(imageUrl, crossorigin)
+PIXI.Texture.fromImage = function(imageUrl, crossorigin, scaleMode)
 {
     var texture = PIXI.TextureCache[imageUrl];
 
     if(!texture)
     {
-		texture = new PIXI.Texture(PIXI.BaseTexture.fromImage(imageUrl, crossorigin));
+        texture = new PIXI.Texture(PIXI.BaseTexture.fromImage(imageUrl, crossorigin, scaleMode));
         PIXI.TextureCache[imageUrl] = texture;
     }
 
     return texture;
-}
+};
 
 /**
  * Helper function that returns a texture based on a frame id
@@ -159,9 +159,9 @@ PIXI.Texture.fromImage = function(imageUrl, crossorigin)
 PIXI.Texture.fromFrame = function(frameId)
 {
     var texture = PIXI.TextureCache[frameId];
-	if(!texture)throw new Error("The frameId '"+ frameId +"' does not exist in the texture cache " + this);
+    if(!texture) throw new Error('The frameId "' + frameId + '" does not exist in the texture cache ' + this);
     return texture;
-}
+};
 
 /**
  * Helper function that returns a texture based on a canvas element
@@ -172,11 +172,11 @@ PIXI.Texture.fromFrame = function(frameId)
  * @param canvas {Canvas} The canvas element source of the texture
  * @return Texture
  */
-PIXI.Texture.fromCanvas = function(canvas)
+PIXI.Texture.fromCanvas = function(canvas, scaleMode)
 {
-	var	baseTexture = new PIXI.BaseTexture(canvas);
+    var baseTexture = new PIXI.BaseTexture(canvas, scaleMode);
     return new PIXI.Texture(baseTexture);
-}
+};
 
 
 /**
@@ -190,7 +190,7 @@ PIXI.Texture.fromCanvas = function(canvas)
 PIXI.Texture.addTextureToCache = function(texture, id)
 {
     PIXI.TextureCache[id] = texture;
-}
+};
 
 /**
  * Remove a texture from the textureCache.
@@ -202,11 +202,12 @@ PIXI.Texture.addTextureToCache = function(texture, id)
  */
 PIXI.Texture.removeTextureFromCache = function(id)
 {
-	var texture = PIXI.TextureCache[id]
+    var texture = PIXI.TextureCache[id];
     PIXI.TextureCache[id] = null;
     return texture;
-}
+};
 
 // this is more for webGL.. it contains updated frames..
 PIXI.Texture.frameUpdates = [];
 
+PIXI.Texture.SCALE_MODE = PIXI.BaseTexture.SCALE_MODE;

src/pixi/utils/Detector.js

@@ -23,11 +23,17 @@ PIXI.autoDetectRenderer = function(width, height, view, transparent, antialias)
     if(!height)height = 600;
 
     // BORROWED from Mr Doob (mrdoob.com)
-	var webgl = ( function () { try { var canvas = document.createElement( 'canvas' ); return !! window.WebGLRenderingContext && ( canvas.getContext( 'webgl' ) || canvas.getContext( 'experimental-webgl' ) ); } catch( e ) { return false; } } )();
+    var webgl = ( function () { try {
+                                    var canvas = document.createElement( 'canvas' );
+                                    return !! window.WebGLRenderingContext && ( canvas.getContext( 'webgl' ) || canvas.getContext( 'experimental-webgl' ) );
+                                } catch( e ) {
+                                    return false;
+                                }
+                            } )();
 
     if(webgl)
     {
-		var ie =  (navigator.userAgent.toLowerCase().indexOf('trident') != -1);
+        var ie =  (navigator.userAgent.toLowerCase().indexOf('trident') !== -1);
         webgl = !ie;
     }
 
@@ -39,5 +45,3 @@ PIXI.autoDetectRenderer = function(width, height, view, transparent, antialias)
 
     return  new PIXI.CanvasRenderer(width, height, view, transparent);
 };
-
-

src/pixi/utils/Polyk.js

@@ -44,13 +44,14 @@ PIXI.PolyK.Triangulate = function(p)
 {
     var sign = true;
 
-	var n = p.length>>1;
+    var n = p.length >> 1;
-	if(n<3) return [];
+    if(n < 3) return [];
+
     var tgs = [];
     var avl = [];
-	for(var i=0; i<n; i++) avl.push(i);
+    for(var i = 0; i < n; i++) avl.push(i);
 
-	var i = 0;
+    i = 0;
     var al = n;
     while(al > 3)
     {
@@ -66,13 +67,18 @@ PIXI.PolyK.Triangulate = function(p)
         if(PIXI.PolyK._convex(ax, ay, bx, by, cx, cy, sign))
         {
             earFound = true;
-			for(var j=0; j<al; j++)
+            for(var j = 0; j < al; j++)
             {
                 var vi = avl[j];
-				if(vi==i0 || vi==i1 || vi==i2) continue;
+                if(vi === i0 || vi === i1 || vi === i2) continue;
-				if(PIXI.PolyK._PointInTriangle(p[2*vi], p[2*vi+1], ax, ay, bx, by, cx, cy)) {earFound = false; break;}
+
+                if(PIXI.PolyK._PointInTriangle(p[2*vi], p[2*vi+1], ax, ay, bx, by, cx, cy)) {
+                    earFound = false;
+                    break;
                 }
             }
+        }
+
         if(earFound)
         {
             tgs.push(i0, i1, i2);
@@ -86,9 +92,9 @@ PIXI.PolyK.Triangulate = function(p)
             // reset!
             if(sign)
             {
-				var tgs = [];
+                tgs = [];
                 avl = [];
-				for(var i=0; i<n; i++) avl.push(i);
+                for(i = 0; i < n; i++) avl.push(i);
 
                 i = 0;
                 al = n;
@@ -97,14 +103,15 @@ PIXI.PolyK.Triangulate = function(p)
             }
             else
             {
-				console.log("PIXI Warning: shape too complex to fill")
+                window.console.log("PIXI Warning: shape too complex to fill");
                 return [];
             }
         }
     }
+
     tgs.push(avl[0], avl[1], avl[2]);
     return tgs;
-}
+};
 
 /**
  * Checks if a point is within a triangle
@@ -134,7 +141,7 @@ PIXI.PolyK._PointInTriangle = function(px, py, ax, ay, bx, by, cx, cy)
 
     // Check if point is in triangle
     return (u >= 0) && (v >= 0) && (u + v < 1);
-}
+};
 
 /**
  * Checks if a shape is convex
@@ -145,5 +152,5 @@ PIXI.PolyK._PointInTriangle = function(px, py, ax, ay, bx, by, cx, cy)
  */
 PIXI.PolyK._convex = function(ax, ay, bx, by, cx, cy, sign)
 {
-	return ((ay-by)*(cx-bx) + (bx-ax)*(cy-by) >= 0) == sign;
+    return ((ay-by)*(cx-bx) + (bx-ax)*(cy-by) >= 0) === sign;
-}
+};

src/pixi/utils/Utils.js

@@ -18,13 +18,13 @@
 var lastTime = 0;
 var vendors = ['ms', 'moz', 'webkit', 'o'];
 for(var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
-    window.requestAnimationFrame = window[vendors[x]+'RequestAnimationFrame'];
+    window.requestAnimationFrame = window[vendors[x] + 'RequestAnimationFrame'];
-    window.cancelAnimationFrame = window[vendors[x]+'CancelAnimationFrame']
+    window.cancelAnimationFrame = window[vendors[x] + 'CancelAnimationFrame'] ||
-                               || window[vendors[x]+'CancelRequestAnimationFrame'];
+        window[vendors[x] + 'CancelRequestAnimationFrame'];
 }
 
-if (!window.requestAnimationFrame)
+if (!window.requestAnimationFrame) {
-    window.requestAnimationFrame = function(callback, element) {
+    window.requestAnimationFrame = function(callback) {
         var currTime = new Date().getTime();
         var timeToCall = Math.max(0, 16 - (currTime - lastTime));
         var id = window.setTimeout(function() { callback(currTime + timeToCall); },
@@ -32,36 +32,38 @@ if (!window.requestAnimationFrame)
         lastTime = currTime + timeToCall;
         return id;
     };
+}
 
-if (!window.cancelAnimationFrame)
+if (!window.cancelAnimationFrame) {
     window.cancelAnimationFrame = function(id) {
         clearTimeout(id);
     };
+}
 
 window.requestAnimFrame = window.requestAnimationFrame;
 
 /**
  * Converts a hex color number to an [R, G, B] array
  *
- * @method HEXtoRGB
+ * @method hex2rgb
  * @param hex {Number}
  */
-function HEXtoRGB(hex) {
+PIXI.hex2rgb = function hex2rgb(hex) {
     return [(hex >> 16 & 0xFF) / 255, ( hex >> 8 & 0xFF) / 255, (hex & 0xFF)/ 255];
-}
+};
 
 /**
  * A polyfill for Function.prototype.bind
  *
  * @method bind
  */
-if (typeof Function.prototype.bind != 'function') {
+if (typeof Function.prototype.bind !== 'function') {
     Function.prototype.bind = (function () {
         var slice = Array.prototype.slice;
         return function (thisArg) {
             var target = this, boundArgs = slice.call(arguments, 1);
 
-      if (typeof target != 'function') throw new TypeError();
+            if (typeof target !== 'function') throw new TypeError();
 
             function bound() {
                 var args = boundArgs.concat(slice.call(arguments));
@@ -69,8 +71,8 @@ if (typeof Function.prototype.bind != 'function') {
             }
 
             bound.prototype = (function F(proto) {
-          proto && (F.prototype = proto);
+                if (proto) F.prototype = proto;
-          if (!(this instanceof F)) return new F;
+                if (!(this instanceof F)) return new F();
             })(target.prototype);
 
             return bound;
@@ -84,57 +86,57 @@ if (typeof Function.prototype.bind != 'function') {
  * @class AjaxRequest
  * @constructor
  */
-var AjaxRequest = PIXI.AjaxRequest = function()
+PIXI.AjaxRequest = function AjaxRequest()
 {
-	var activexmodes = ["Msxml2.XMLHTTP.6.0", "Msxml2.XMLHTTP.3.0", "Microsoft.XMLHTTP"] //activeX versions to check for in IE
+    var activexmodes = ['Msxml2.XMLHTTP.6.0', 'Msxml2.XMLHTTP.3.0', 'Microsoft.XMLHTTP']; //activeX versions to check for in IE
 
     if (window.ActiveXObject)
     { //Test for support for ActiveXObject in IE first (as XMLHttpRequest in IE7 is broken)
         for (var i=0; i<activexmodes.length; i++)
         {
             try{
-				return new ActiveXObject(activexmodes[i])
+                return new window.ActiveXObject(activexmodes[i]);
             }
-   			catch(e){
+            catch(e) {
                 //suppress error
             }
         }
     }
     else if (window.XMLHttpRequest) // if Mozilla, Safari etc
     {
-  		return new XMLHttpRequest()
+        return new window.XMLHttpRequest();
     }
     else
     {
         return false;
     }
-}
+};
 
 /*
  * DEBUGGING ONLY
  */
 PIXI.runList = function(item)
 {
-	console.log(">>>>>>>>>")
+    window.console.log('>>>>>>>>>');
-	console.log("_")
+    window.console.log('_');
     var safe = 0;
     var tmp = item.first;
-	console.log(tmp);
+    window.console.log(tmp);
 
     while(tmp._iNext)
     {
         safe++;
         tmp = tmp._iNext;
-		console.log(tmp);
+        window.console.log(tmp);
     //  console.log(tmp);
 
         if(safe > 100)
         {
-			console.log("BREAK")
+            window.console.log('BREAK');
-			break
+            break;
         }
     }
-}
+};
 
 
 

src/tilemap/Tilemap.js

@@ -197,6 +197,7 @@ Phaser.Tilemap.prototype = {
     * Sprite is created. You could also give it a value like: body.velocity.x: 100 to set it moving automatically.
     *
     * @method Phaser.Tileset#createFromObjects
+    * @param {string} name - The name of the Object Group to create Sprites from.
     * @param {number} gid - The layer array index value, or if a string is given the layer name, within the map data that this TilemapLayer represents.
     * @param {string} key - The Game.cache key of the image that this Sprite will use.
     * @param {number|string} [frame] - If the Sprite image contains multiple frames you can specify which one to use here.
@@ -204,28 +205,34 @@ Phaser.Tilemap.prototype = {
     * @param {boolean} [autoCull=true] - The default autoCull state of the Sprite. Sprites that are autoCulled are culled from the camera if out of its range.
     * @param {Phaser.Group} [group] - Optional Group to add the Sprite to. If not specified it will be added to the World group.
     */
-    createFromObjects: function (gid, key, frame, exists, autoCull, group) {
+    createFromObjects: function (name, gid, key, frame, exists, autoCull, group) {
 
         if (typeof exists === 'undefined') { exists = true; }
         if (typeof autoCull === 'undefined') { autoCull = true; }
         if (typeof group === 'undefined') { group = this.game.world; }
 
+        if (!this.objects[name])
+        {
+            console.warn('Tilemap.createFromObjects: Invalid objectgroup name given: ' + name);
+            return;
+        }
+
         var sprite;
 
-        for (var i = 0; i < this.objects.length; i++)
+        for (var i = 0, len = this.objects[name].length; i < len; i++)
         {
-            if (this.objects[i].gid === gid)
+            if (this.objects[name][i].gid === gid)
             {
-                sprite = group.create(this.objects[i].x, this.objects[i].y, key, frame, exists);
+                sprite = group.create(this.objects[name][i].x, this.objects[name][i].y, key, frame, exists);
 
                 sprite.anchor.setTo(0, 1);
-                sprite.name = this.objects[i].name;
+                sprite.name = this.objects[name][i].name;
-                sprite.visible = this.objects[i].visible;
+                sprite.visible = this.objects[name][i].visible;
                 sprite.autoCull = autoCull;
 
-                for (property in this.objects[i].properties)
+                for (property in this.objects[name][i].properties)
                 {
-                    group.set(sprite, property, this.objects[i].properties[property], false, false, 0);
+                    group.set(sprite, property, this.objects[name][i].properties[property], false, false, 0);
                 }
             }
         }

src/tilemap/TilemapParser.js

@@ -265,7 +265,7 @@ Phaser.TilemapParser = {
         map.images = images;
 
         //  Objects
-        var objects = [];
+        var objects = {};
 
         for (var i = 0; i < json.layers.length; i++)
         {
@@ -274,7 +274,9 @@ Phaser.TilemapParser = {
                 continue;
             }
 
-            for (var v = 0; v < json.layers[i].objects.length; v++)
+            objects[json.layers[i].name] = [];
+
+            for (var v = 0, len = json.layers[i].objects.length; v < len; v++)
             {
                 //  For now we'll just support object tiles
                 if (json.layers[i].objects[v].gid)
@@ -290,7 +292,7 @@ Phaser.TilemapParser = {
 
                     };
         
-                    objects.push(object);
+                    objects[json.layers[i].name].push(object);
                 }
 
             }

src/utils/Utils.js

@@ -244,6 +244,16 @@ function HEXtoRGB(hex) {
     return [(hex >> 16 & 0xFF) / 255, ( hex >> 8 & 0xFF) / 255, (hex & 0xFF)/ 255];
 }
 
+/**
+ * Converts a hex color number to an [R, G, B] array
+ *
+ * @method hex2rgb
+ * @param hex {Number}
+ */
+PIXI.hex2rgb = function hex2rgb(hex) {
+    return [(hex >> 16 & 0xFF) / 255, ( hex >> 8 & 0xFF) / 255, (hex & 0xFF)/ 255];
+};
+
 /**
 * A polyfill for Function.prototype.bind
 */