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

Merge pull request #1447 from chatziko/rootPath-improvements

Browse Source 
rootPath-related improvements
This commit is contained in:
player-03
2022-09-05 22:56:53 -04:00
committed by GitHub
parent f2ffb83b45 f38119d181
commit 80630a10fa
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lime/utils/PackedAssetLibrary.hx
View File

@@ -241,11 +241,10 @@ import flash.media.Sound;
} }
else else
{ {
var basePath = rootPath; var basePath = rootPath == null || rootPath == "" ? "" : Path.addTrailingSlash(rootPath);
if (basePath == null) basePath = ""; var libPath = paths.exists(id) ? paths.get(id) : id;
if (basePath != "" && !StringTools.endsWith(basePath, "/")) basePath += "/";
var path = basePath + (paths.exists(id) ? paths.get(id) : id); var path = Path.join([basePath, libPath]);
path = __cacheBreak(path); path = __cacheBreak(path);
Bytes.loadFromFile(path).onError(promise.error).onComplete(packedData_onComplete); Bytes.loadFromFile(path).onError(promise.error).onComplete(packedData_onComplete);

12
templates/haxe/ManifestResources.hx
View File

@@ -44,6 +44,12 @@ import sys.FileSystem;
rootPath = Reflect.field (config, "rootPath"); rootPath = Reflect.field (config, "rootPath");
if(!StringTools.endsWith (rootPath, "/")) {
rootPath += "/";
}
} }
if (rootPath == null) { if (rootPath == null) {
@@ -84,9 +90,9 @@ import sys.FileSystem;
Assets.registerLibrary ("::library::", library); Assets.registerLibrary ("::library::", library);
::else::Assets.libraryPaths["::library::"] = rootPath + "::resourceName::"; ::else::Assets.libraryPaths["::library::"] = rootPath + "::resourceName::";
::end::::end::::if (type == "bundle")::::if (embed):: ::end::::end::::if (type == "bundle")::::if (embed)::
bundle = AssetBundle.fromBytes(#if flash Bytes.ofData(new __ASSET__::flatName::() #else new __ASSET__::flatName::() #end)); bundle = AssetBundle.fromBytes (#if flash Bytes.ofData (new __ASSET__::flatName:: () #else new __ASSET__::flatName:: () #end));
library = AssetLibrary.fromBundle(bundle); library = AssetLibrary.fromBundle (bundle);
Assets.registerLibrary("::library::", library); Assets.registerLibrary ("::library::", library);
::else::Assets.bundlePaths["::library::"] = rootPath + "::resourceName::"; ::else::Assets.bundlePaths["::library::"] = rootPath + "::resourceName::";
::end::::end::::end::::end:: ::end::::end::::end::::end::