alpha update

added new function Texture.fromCanvas
docs updated
photonstorm morph example added
photonstorm balls example added
examples renamed
This commit is contained in:
Mat Groves 2013-03-02 20:49:12 +00:00
parent 46174cc0ca
commit b8d849032c
78 changed files with 1354 additions and 301 deletions

View file

@ -126,40 +126,18 @@ PIXI.texturesToUpdate = [];
* @class BaseTexture
* @extends EventTarget
* @constructor
* @param imageUrl {String} image url
* @param source {String} the source object (image or canvas)
*/
PIXI.BaseTexture = function(imageUrl)
PIXI.BaseTexture = function(source)
{
PIXI.EventTarget.call( this );
/**
/*
* The url of the texture
* @property imageUrl
* @type String
*/
this.imageUrl = imageUrl;
/**
* The html image that is loaded to create the texture
* @property image
* @type Image
*/
this.image = new Image();
var scope = this
this.image.onload = function(){
scope.hasLoaded = true;
scope.width = scope.image.width;
scope.height = scope.image.height;
// add it to somewhere...
PIXI.texturesToUpdate.push(scope);
scope.dispatchEvent( { type: 'loaded', content: scope } );
}
//$.proxy(this.onImageLoaded, this);
this.image.src = imageUrl;
//this.imageUrl = source.src;
/**
* [read only] The width of the base texture set when the image has loaded
@ -174,16 +152,60 @@ PIXI.BaseTexture = function(imageUrl)
*/
this.height = 100;
/**
* The source that is loaded to create the texture
* @property source
* @type Image
*/
this.source = source//new Image();
if(this.source instanceof Image)
{
if(this.source.complete)
{
this.hasLoaded = true;
this.width = this.source.width;
this.height = this.source.height;
PIXI.texturesToUpdate.push(this);
}
else
{
var scope = this;
this.source.onload = function(){
scope.hasLoaded = true;
scope.width = scope.source.width;
scope.height = scope.source.height;
// add it to somewhere...
PIXI.texturesToUpdate.push(scope);
scope.dispatchEvent( { type: 'loaded', content: scope } );
}
// this.image.src = imageUrl;
}
}
else
{
this.hasLoaded = true;
this.width = this.source.width;
this.height = this.source.height;
//console.log(">!!",this.width)
PIXI.texturesToUpdate.push(this);
}
PIXI.BaseTextureCache[imageUrl] = this;
}
PIXI.BaseTexture.constructor = PIXI.BaseTexture;
/*
PIXI.BaseTexture.prototype.onImageLoaded = function(image)
PIXI.BaseTexture.prototype.fromImage = function(imageUrl)
{
}*/
}
</pre>
</div>