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

Fixed type in bitmap font

Browse source
This commit is contained in:
Mat Groves 2014-01-31 09:23:04 +00:00
parent 001c2b13d7
commit a1091473ec
4 changed files with 39 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
bin/pixi.dev.js
View file

@ -2263,8 +2263,6 @@ PIXI.SpriteBatch.constructor = PIXI.SpriteBatch;
*/ */
PIXI.SpriteBatch.prototype.initWebGL = function(gl) PIXI.SpriteBatch.prototype.initWebGL = function(gl)
{ {
this.fastSpriteBatch = new PIXI.WebGLFastSpriteBatch(gl); this.fastSpriteBatch = new PIXI.WebGLFastSpriteBatch(gl);
this.ready = true; this.ready = true;
@ -2356,7 +2354,22 @@ PIXI.SpriteBatch.prototype._renderCanvas = function(renderSession)
PIXI.DisplayObject.prototype.updateTransform.call(child); PIXI.DisplayObject.prototype.updateTransform.call(child);
transform = child.localTransform; transform = child.localTransform;
context.setTransform(transform.a, transform.c, transform.b, transform.d, transform.tx, transform.ty);
if(this.rotation !== this.rotationCache)
{
this.rotationCache = this.rotation;
this._sr = Math.sin(this.rotation);
this._cr = Math.cos(this.rotation);
}
var a = child._cr * child.scale.x,
b = -child._sr * child.scale.y,
c = child._sr * child.scale.x,
d = child._cr * child.scale.y;
context.setTransform(a, c, b, d, child.position.x, child.position.y);
//context.setTransform(transform.a, transform.c, transform.b, transform.d, transform.tx, transform.ty);
context.drawImage(texture.baseTexture.source, context.drawImage(texture.baseTexture.source,
frame.x, frame.x,
@ -13103,7 +13116,7 @@ PIXI.BitmapFontLoader.prototype.constructor = PIXI.BitmapFontLoader;
*/ */
PIXI.BitmapFontLoader.prototype.load = function() PIXI.BitmapFontLoader.prototype.load = function()
{ {
this.ajaxRequest = new PIXI.ajaxRequest(); this.ajaxRequest = new PIXI.AjaxRequest();
var scope = this; var scope = this;
this.ajaxRequest.onreadystatechange = function() this.ajaxRequest.onreadystatechange = function()
{ {

10
bin/pixi.js
View file

File diff suppressed because one or more lines are too long

19
src/pixi/display/SpriteBatch.js
View file

@ -30,8 +30,6 @@ PIXI.SpriteBatch.constructor = PIXI.SpriteBatch;
*/ */
PIXI.SpriteBatch.prototype.initWebGL = function(gl) PIXI.SpriteBatch.prototype.initWebGL = function(gl)
{ {
this.fastSpriteBatch = new PIXI.WebGLFastSpriteBatch(gl); this.fastSpriteBatch = new PIXI.WebGLFastSpriteBatch(gl);
this.ready = true; this.ready = true;
@ -123,7 +121,22 @@ PIXI.SpriteBatch.prototype._renderCanvas = function(renderSession)
PIXI.DisplayObject.prototype.updateTransform.call(child); PIXI.DisplayObject.prototype.updateTransform.call(child);
transform = child.localTransform; transform = child.localTransform;
context.setTransform(transform.a, transform.c, transform.b, transform.d, transform.tx, transform.ty);
if(this.rotation !== this.rotationCache)
{
this.rotationCache = this.rotation;
this._sr = Math.sin(this.rotation);
this._cr = Math.cos(this.rotation);
}
var a = child._cr * child.scale.x,
b = -child._sr * child.scale.y,
c = child._sr * child.scale.x,
d = child._cr * child.scale.y;
context.setTransform(a, c, b, d, child.position.x, child.position.y);
//context.setTransform(transform.a, transform.c, transform.b, transform.d, transform.tx, transform.ty);
context.drawImage(texture.baseTexture.source, context.drawImage(texture.baseTexture.source,
frame.x, frame.x,

2
src/pixi/loaders/BitmapFontLoader.js
View file

@ -67,7 +67,7 @@ PIXI.BitmapFontLoader.prototype.constructor = PIXI.BitmapFontLoader;
*/ */
PIXI.BitmapFontLoader.prototype.load = function() PIXI.BitmapFontLoader.prototype.load = function()
{ {
this.ajaxRequest = new PIXI.ajaxRequest(); this.ajaxRequest = new PIXI.AjaxRequest();
var scope = this; var scope = this;
this.ajaxRequest.onreadystatechange = function() this.ajaxRequest.onreadystatechange = function()
{ {