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

Preloader: if disable_preloader_assets is defined, keep the public API available

Browse Source 
Ensures that existing custom templates still work
This commit is contained in:
Josh Tynjala
2022-06-14 07:42:30 -07:00
parent e3a755ff60
commit 33502b099e
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/lime/utils/Preloader.hx
View File

@@ -35,18 +35,14 @@ class Preloader #if flash extends Sprite #end
public var onProgress = new Event<Int->Int->Void>(); public var onProgress = new Event<Int->Int->Void>();
@:noCompletion private var bytesLoaded:Int; @:noCompletion private var bytesLoaded:Int;
#if !disable_preloader_assets @:noCompletion private var bytesLoadedCache = new Map<#if !disable_preloader_assets AssetLibrary #else Dynamic #end, Int>();
@:noCompletion private var bytesLoadedCache = new Map<AssetLibrary, Int>();
#end
@:noCompletion private var bytesLoadedCache2 = new Map<String, Int>(); @:noCompletion private var bytesLoadedCache2 = new Map<String, Int>();
@:noCompletion private var bytesTotal:Int; @:noCompletion private var bytesTotal:Int;
@:noCompletion private var bytesTotalCache = new Map<String, Int>(); @:noCompletion private var bytesTotalCache = new Map<String, Int>();
@:noCompletion private var initLibraryNames:Bool; @:noCompletion private var initLibraryNames:Bool;
#if !disable_preloader_assets @:noCompletion private var libraries:Array<#if !disable_preloader_assets AssetLibrary #else Dynamic #end>;
@:noCompletion private var libraries:Array<AssetLibrary>;
@:noCompletion private var libraryNames:Array<String>; @:noCompletion private var libraryNames:Array<String>;
@:noCompletion private var loadedLibraries:Int; @:noCompletion private var loadedLibraries:Int;
#end
@:noCompletion private var loadedStage:Bool; @:noCompletion private var loadedStage:Bool;
@:noCompletion private var preloadComplete:Bool; @:noCompletion private var preloadComplete:Bool;
@:noCompletion private var preloadStarted:Bool; @:noCompletion private var preloadStarted:Bool;
@@ -63,10 +59,8 @@ class Preloader #if flash extends Sprite #end
bytesLoaded = 0; bytesLoaded = 0;
bytesTotal = 0; bytesTotal = 0;
#if !disable_preloader_assets libraries = new Array<#if !disable_preloader_assets AssetLibrary #else Dynamic #end>();
libraries = new Array<AssetLibrary>();
libraryNames = new Array<String>(); libraryNames = new Array<String>();
#end
onProgress.add(update); onProgress.add(update);
@@ -111,8 +105,7 @@ class Preloader #if flash extends Sprite #end
#end #end
} }
#if !disable_preloader_assets public function addLibrary(library:#if !disable_preloader_assets AssetLibrary #else Dynamic #end):Void
public function addLibrary(library:AssetLibrary):Void
{ {
libraries.push(library); libraries.push(library);
} }
@@ -124,21 +117,17 @@ class Preloader #if flash extends Sprite #end
libraryNames.push(name); libraryNames.push(name);
} }
} }
#end
public function load():Void public function load():Void
{ {
#if !disable_preloader_assets
for (library in libraries) for (library in libraries)
{ {
bytesTotal += library.bytesTotal; bytesTotal += library.bytesTotal;
} }
loadedLibraries = -1; loadedLibraries = -1;
#end
preloadStarted = false; preloadStarted = false;
#if !disable_preloader_assets
for (library in libraries) for (library in libraries)
{ {
Log.verbose("Preloading asset library"); Log.verbose("Preloading asset library");
@@ -170,7 +159,7 @@ class Preloader #if flash extends Sprite #end
} }
else else
{ {
bytesLoaded += library.bytesTotal - bytesLoadedCache.get(library); bytesLoaded += Std.int(library.bytesTotal) - bytesLoadedCache.get(library);
} }
loadedAssetLibrary(); loadedAssetLibrary();
@@ -189,12 +178,10 @@ class Preloader #if flash extends Sprite #end
} }
loadedLibraries++; loadedLibraries++;
#end
preloadStarted = true; preloadStarted = true;
updateProgress(); updateProgress();
} }
#if !disable_preloader_assets
@:noCompletion private function loadedAssetLibrary(name:String = null):Void @:noCompletion private function loadedAssetLibrary(name:String = null):Void
{ {
loadedLibraries++; loadedLibraries++;
@@ -215,7 +202,6 @@ class Preloader #if flash extends Sprite #end
updateProgress(); updateProgress();
} }
#end
@:noCompletion private function start():Void @:noCompletion private function start():Void
{ {
@@ -309,8 +295,8 @@ class Preloader #if flash extends Sprite #end
} }
#end #end
if (!simulateProgress #if flash && loadedStage #end#if !disable_preloader_assets if (!simulateProgress #if flash && loadedStage #end
&& loadedLibraries == (libraries.length + libraryNames.length) #end) && loadedLibraries == (libraries.length + libraryNames.length))
{ {
if (!preloadComplete) if (!preloadComplete)
{ {