UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.0' into 4.1-beta

Browse Source 
# Conflicts:
#	spine-ts/package-lock.json
This commit is contained in:
Mario Zechner 2022-01-19 15:33:05 +01:00
commit 9ee399bd1c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spine-ts/spine-core/src/AssetManagerBase.ts
View File

@ -138,7 +138,8 @@ export class AssetManagerBase implements Disposable {
loadTextureAtlas (path: string, loadTextureAtlas (path: string,
success: (path: string, atlas: TextureAtlas) => void = null, success: (path: string, atlas: TextureAtlas) => void = null,
error: (path: string, message: string) => void = null error: (path: string, message: string) => void = null,
fileAlias: {[keyword:string] : string} = null
) { ) {
let index = path.lastIndexOf("/"); let index = path.lastIndexOf("/");
let parent = index >= 0 ? path.substring(0, index + 1) : ""; let parent = index >= 0 ? path.substring(0, index + 1) : "";
@ -149,7 +150,7 @@ export class AssetManagerBase implements Disposable {
let atlas = new TextureAtlas(atlasText); let atlas = new TextureAtlas(atlasText);
let toLoad = atlas.pages.length, abort = false; let toLoad = atlas.pages.length, abort = false;
for (let page of atlas.pages) { for (let page of atlas.pages) {
this.loadTexture(parent + page.name, this.loadTexture(fileAlias == null ? parent + page.name : fileAlias[page.name],
(imagePath: string, texture: Texture) => { (imagePath: string, texture: Texture) => {
if (!abort) { if (!abort) {
page.setTexture(texture); page.setTexture(texture);