jeena/pixi.js
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge branch 'pr/569' into dev

Browse source
This commit is contained in:
Mat Groves 2014-02-12 10:50:14 +00:00
commit 2d74436c00
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -1,7 +1,7 @@
Pixi Renderer Pixi Renderer
============= =============
![pixi.js logo](http://www.goodboydigital.com/pixijs/logo_small.png) ![pixi.js logo](http://www.goodboydigital.com/pixijs/logo_small.png)
[<img src="http://www.pixijs.com/wp-content/uploads/2013/05/headerPanel_projects-898x342.jpg">](http://www.pixijs.com/projects) [<img src="http://www.pixijs.com/wp-content/uploads/2013/05/headerPanel_projects-898x342.jpg">](http://www.pixijs.com/projects)
#### JavaScript 2D Renderer #### #### JavaScript 2D Renderer ####
@ -15,6 +15,8 @@ If you’re interested in pixi.js then feel free to follow me on twitter
of course check back on [our site](<http://www.goodboydigital.com/blog/>) as of course check back on [our site](<http://www.goodboydigital.com/blog/>) as
any breakthroughs will be posted up there too! any breakthroughs will be posted up there too!
[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/GoodBoyDigital/pixi.js/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
### Demos ### ### Demos ###
- [WebGL Filters!](<http://www.goodboydigital.com/pixijs/examples/15/indexAll.html>) - [WebGL Filters!](<http://www.goodboydigital.com/pixijs/examples/15/indexAll.html>)

4
src/pixi/display/DisplayObject.js
View file

@ -406,8 +406,8 @@ PIXI.DisplayObject.prototype.updateTransform = function()
a01 = -this._sr * this.scale.y, a01 = -this._sr * this.scale.y,
a10 = this._sr * this.scale.x, a10 = this._sr * this.scale.x,
a11 = this._cr * this.scale.y, a11 = this._cr * this.scale.y,
a02 = this.position.x + a00 * px - py * a01, a02 = this.position.x - a00 * px - py * a01,
a12 = this.position.y + a11 * py - px * a10, a12 = this.position.y - a11 * py - px * a10,
b00 = parentTransform.a, b01 = parentTransform.b, b00 = parentTransform.a, b01 = parentTransform.b,
b10 = parentTransform.c, b11 = parentTransform.d; b10 = parentTransform.c, b11 = parentTransform.d;