@galacean/engine-loader 0.0.0-experimental-2.0-migrate.2 → 0.0.0-experimental-2.0-migrate.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/main.js +10 -3
- package/dist/main.js.map +1 -1
- package/dist/module.js +10 -3
- package/dist/module.js.map +1 -1
- package/package.json +4 -4
package/dist/module.js
CHANGED
|
@@ -6538,6 +6538,10 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6538
6538
|
_proto.load = function load(item, resourceManager) {
|
|
6539
6539
|
var _this = this;
|
|
6540
6540
|
return new AssetPromise(function(resolve, reject, _, __, onCancel) {
|
|
6541
|
+
var _item_resolvedUrl;
|
|
6542
|
+
// Atlas pages are runtime files addressed relative to the encoded atlas,
|
|
6543
|
+
// not to the editor-facing virtual resource identity.
|
|
6544
|
+
var atlasUrl = (_item_resolvedUrl = item.resolvedUrl) != null ? _item_resolvedUrl : item.url;
|
|
6541
6545
|
var chainPromises = [];
|
|
6542
6546
|
onCancel(function() {
|
|
6543
6547
|
for(var i = 0; i < chainPromises.length; i++){
|
|
@@ -6545,7 +6549,7 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6545
6549
|
}
|
|
6546
6550
|
});
|
|
6547
6551
|
// @ts-ignore
|
|
6548
|
-
var configPromise = resourceManager._request(
|
|
6552
|
+
var configPromise = resourceManager._request(atlasUrl, _extends({}, item, {
|
|
6549
6553
|
type: "json"
|
|
6550
6554
|
}));
|
|
6551
6555
|
chainPromises.push(configPromise);
|
|
@@ -6555,7 +6559,7 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6555
6559
|
if (atlasItem.img) {
|
|
6556
6560
|
var _atlasItem_type;
|
|
6557
6561
|
chainPromises.push(resourceManager.load({
|
|
6558
|
-
url: Utils.resolveAbsoluteUrl(
|
|
6562
|
+
url: Utils.resolveAbsoluteUrl(atlasUrl, atlasItem.img),
|
|
6559
6563
|
type: (_atlasItem_type = atlasItem.type) != null ? _atlasItem_type : AssetType.Texture,
|
|
6560
6564
|
params: {
|
|
6561
6565
|
format: format,
|
|
@@ -6898,7 +6902,10 @@ var ShaderLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6898
6902
|
}
|
|
6899
6903
|
var _proto = ShaderLoader.prototype;
|
|
6900
6904
|
_proto.load = function load(item, resourceManager) {
|
|
6901
|
-
var
|
|
6905
|
+
var _item_resolvedUrl;
|
|
6906
|
+
// Virtual paths preserve source identity (for example `.shader`), while
|
|
6907
|
+
// the physical path determines how this file is encoded (`.shaderc`).
|
|
6908
|
+
var url = (_item_resolvedUrl = item.resolvedUrl) != null ? _item_resolvedUrl : item.url;
|
|
6902
6909
|
if (url.endsWith(".shaderc")) {
|
|
6903
6910
|
// @ts-ignore
|
|
6904
6911
|
return resourceManager._request(url, _extends({}, item, {
|