kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore Image as the default container type, with ImageBuffer underneath

Browse Source
This commit is contained in:
Joshua Granick
2014-08-01 21:50:44 -07:00
parent 1749a18ab4
commit d66f48a482
6 changed files with 210 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
templates/haxe/DefaultAssetLibrary.hx
View File

@@ -5,7 +5,7 @@ import haxe.Timer;
import haxe.Unserializer;
import lime.app.Preloader;
import lime.media.AudioBuffer;
import lime.media.ImageBuffer;
import lime.media.Image;
import lime.media.openal.AL;
import lime.utils.ByteArray;
import lime.utils.UInt8Array;
@@ -224,19 +224,19 @@ class DefaultAssetLibrary extends AssetLibrary {
}
public override function getImageBuffer (id:String):ImageBuffer {
public override function getImage (id:String):Image {
#if flash
return ImageBuffer.fromBitmapData (cast (Type.createInstance (className.get (id), []), BitmapData));
return Image.fromBitmapData (cast (Type.createInstance (className.get (id), []), BitmapData));
#elseif js
return ImageBuffer.fromImage (Preloader.images.get (path.get (id)));
return Image.fromImage (Preloader.images.get (path.get (id)));
#else
return ImageBuffer.fromFile (path.get (id));
return Image.fromFile (path.get (id));
#end
@@ -439,7 +439,7 @@ class DefaultAssetLibrary extends AssetLibrary {
}
public override function loadImageBuffer (id:String, handler:ImageBuffer -> Void):Void {
public override function loadImage (id:String, handler:Image -> Void):Void {
#if flash
@@ -449,20 +449,20 @@ class DefaultAssetLibrary extends AssetLibrary {
loader.contentLoaderInfo.addEventListener (Event.COMPLETE, function (event:Event) {
var bitmapData = cast (event.currentTarget.content, Bitmap).bitmapData;
handler (ImageBuffer.fromBitmapData (bitmapData));
handler (Image.fromBitmapData (bitmapData));
});
loader.load (new URLRequest (path.get (id)));
} else {
handler (getImageBuffer (id));
handler (getImage (id));
}
#else
handler (getImageBuffer (id));
handler (getImage (id));
#end