Skip to content

Support subpackage for wechat #2617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GuoLei1990 merged 7 commits into from
Apr 15, 2025
Merged

Support subpackage for wechat #2617

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b5067cc
feat(wechat-subpackage): add api for subpackage
singlecoder Apr 10, 2025
ffa4907
feat(wechat-subpackage): opt code
singlecoder Apr 11, 2025
9f06f38
feat: opt subpackage name check
singlecoder Apr 15, 2025
7ac4710
feat: opt promise usage
singlecoder Apr 15, 2025
d1d1879
feat: opt code
singlecoder Apr 15, 2025
7149c62
feat: add notice
singlecoder Apr 15, 2025
4ad629f
Update ResourceManager.ts
GuoLei1990 Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions packages/core/src/asset/ResourceManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,8 @@ export class ResourceManager {
const paths = queryPath ? this._parseQueryPath(queryPath) : [];

// Get remote asset base url
const remoteAssetBaseURL = this._virtualPathResourceMap[assetBaseURL]?.path ?? assetBaseURL;
const editorResourceItem = this._virtualPathResourceMap[assetBaseURL];
const remoteAssetBaseURL = editorResourceItem?.path ?? assetBaseURL;

// Check cache
const cacheObject = this._assetUrlPool[remoteAssetBaseURL];
Expand Down Expand Up @@ -403,18 +404,31 @@ export class ResourceManager {
throw `loader not found: ${item.type}`;
}

const subpackageName = editorResourceItem?.subpackageName ?? "";

// Check sub asset
if (queryPath) {
// Check whether load main asset
const mainPromise =
loadingPromises[remoteAssetBaseURL] || this._loadMainAsset(loader, item, remoteAssetBaseURL, assetBaseURL);
loadingPromises[remoteAssetBaseURL] ||
this._loadSubpackageAndMainAsset(loader, item, remoteAssetBaseURL, assetBaseURL, subpackageName);
mainPromise.catch((e) => {
this._onSubAssetFail(remoteAssetBaseURL, queryPath, e);
});

return this._createSubAssetPromiseCallback<T>(remoteAssetBaseURL, remoteAssetURL, queryPath);
}

return this._loadSubpackageAndMainAsset(loader, item, remoteAssetBaseURL, assetBaseURL, subpackageName);
}

private _loadSubpackageAndMainAsset<T>(
loader: Loader<T>,
item: LoadItem,
remoteAssetBaseURL: string,
assetBaseURL: string,
subpackageName: string
): AssetPromise<T> {
return this._loadMainAsset(loader, item, remoteAssetBaseURL, assetBaseURL);
}

Expand Down Expand Up @@ -599,6 +613,7 @@ export class ResourceManager {
}
});
}

//-----------------Editor temp solution-----------------
}

Expand Down Expand Up @@ -642,6 +657,7 @@ type EditorResourceItem = {
type: string;
id: string;
dependentAssetMap?: { [key: string]: string };
subpackageName?: string;
};
type SubAssetPromiseCallbacks<T> = Record<
// main asset url, ie. "https://***.glb"
Expand Down