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

Enabling asset embedding for lime native (bytes/text/image working)

Browse Source
This commit is contained in:
MattTuttle
2015-01-15 14:05:41 -06:00
parent 712749e9d7
commit d33dd96cdc
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lime/graphics/TextFormat.hx
View File

@@ -192,11 +192,16 @@ class TextFormat {
}
@:access(lime.graphics.Font)
public function fromString (font:Font, size:Int, text:String):Array<PosInfo> {
#if (cpp || neko || nodejs)
return lime_text_from_string (handle, font.handle, size, text);
return lime_text_from_string (handle, font.__handle, size, text);
#else
return null;
#end

2
lime/utils/ByteArray.hx
View File

@@ -28,7 +28,7 @@ import cpp.NativeArray;
import sys.io.File;
#end
@:autoBuild(openfl.Assets.embedFile())
@:autoBuild(lime.Assets.embedFile())
class ByteArray #if !js extends Bytes implements ArrayAccess<Int> implements IDataInput implements IMemoryRange #end {

27
templates/haxe/DefaultAssetLibrary.hx
View File

@@ -67,13 +67,12 @@ class DefaultAssetLibrary extends AssetLibrary {
#if (windows || mac || linux)
/*var useManifest = false;
var useManifest = false;
::if (assets != null)::::foreach assets::::if (embed)::
className.set ("::id::", __ASSET__::flatName::);
type.set ("::id::", AssetType.$$upper(::type::));
::else::useManifest = true;
::end::::end::::end::*/
var useManifest = true;
::end::::end::::end::
if (useManifest) {
@@ -222,10 +221,8 @@ class DefaultAssetLibrary extends AssetLibrary {
#else
//return null;
//if (className.exists(id)) return cast (Type.createInstance (className.get (id), []), ByteArray);
//else
return ByteArray.readFile (path.get (id));
if (className.exists(id)) return cast (Type.createInstance (className.get (id), []), ByteArray);
else return ByteArray.readFile (path.get (id));
#end
@@ -665,14 +662,14 @@ class DefaultAssetLibrary extends AssetLibrary {
#if (windows || mac || linux)
//::if (assets != null)::
//::foreach assets::::if (embed)::::if (type == "image")::@:bitmap("::sourcePath::") class __ASSET__::flatName:: extends openfl.display.BitmapData {}
//::elseif (type == "sound")::@:sound("::sourcePath::") class __ASSET__::flatName:: extends openfl.media.Sound {}
//::elseif (type == "music")::@:sound("::sourcePath::") class __ASSET__::flatName:: extends openfl.media.Sound {}
//::elseif (type == "font")::@:font("::sourcePath::") class __ASSET__::flatName:: extends openfl.text.Font {}
//::else::@:file("::sourcePath::") class __ASSET__::flatName:: extends lime.utils.ByteArray {}
//::end::::end::::end::
//::end::
::if (assets != null)::
::foreach assets::::if (embed)::::if (type == "image")::@:bitmap("::sourcePath::") class __ASSET__::flatName:: extends lime.graphics.Image {}
::elseif (type == "sound")::@:sound("::sourcePath::") class __ASSET__::flatName:: extends lime.audio.AudioSource {}
::elseif (type == "music")::@:sound("::sourcePath::") class __ASSET__::flatName:: extends lime.audio.AudioSource {}
::elseif (type == "font")::@:font("::sourcePath::") class __ASSET__::flatName:: extends lime.graphics.Font {}
::else::@:file("::sourcePath::") class __ASSET__::flatName:: extends lime.utils.ByteArray {}
::end::::end::::end::
::end::
#end