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

Merge pull request #522 from Matan/master

Browse Source 
Fixed CPP target embedded assets
This commit is contained in:
Joshua Granick
2015-07-27 08:13:09 -07:00
parent d9faa82bf8 0abd3977c9
commit d7d8c1ca89
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lime/app/Preloader.hx
View File

@@ -287,6 +287,13 @@ class Preloader #if flash extends Sprite #end {
#if flash #if flash
private function current_onEnter (event:Event):Void { private function current_onEnter (event:Event):Void {
// Failsafe for small binary missing the 'onComplete' handler
if(!complete && Lib.current.loaderInfo.bytesLoaded == Lib.current.loaderInfo.bytesTotal)
{
complete = true;
update (Lib.current.loaderInfo.bytesLoaded, Lib.current.loaderInfo.bytesTotal);
}
if (complete) { if (complete) {
Lib.current.removeEventListener (Event.ENTER_FRAME, current_onEnter); Lib.current.removeEventListener (Event.ENTER_FRAME, current_onEnter);

2
templates/haxe/DefaultAssetLibrary.hx
View File

@@ -792,7 +792,7 @@ class DefaultAssetLibrary extends AssetLibrary {
::if (assets != null)::::foreach assets::::if (!embed)::::if (type == "font")::@:keep #if display private #end class __ASSET__::flatName:: extends lime.text.Font { public function new () { __fontPath = #if ios "assets/" + #end "::targetPath::"; name = "::fontName::"; super (); }} ::if (assets != null)::::foreach assets::::if (!embed)::::if (type == "font")::@:keep #if display private #end class __ASSET__::flatName:: extends lime.text.Font { public function new () { __fontPath = #if ios "assets/" + #end "::targetPath::"; name = "::fontName::"; super (); }}
::end::::end::::end::::end:: ::end::::end::::end::::end::
#if (windows || mac || linux) #if (windows || mac || linux || cpp)
::if (assets != null):: ::if (assets != null)::
::foreach assets::::if (embed)::::if (type == "image")::@:image("::sourcePath::") #if display private #end class __ASSET__::flatName:: extends lime.graphics.Image {} ::foreach assets::::if (embed)::::if (type == "image")::@:image("::sourcePath::") #if display private #end class __ASSET__::flatName:: extends lime.graphics.Image {}