@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/main.js
CHANGED
|
@@ -6542,6 +6542,10 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6542
6542
|
_proto.load = function load(item, resourceManager) {
|
|
6543
6543
|
var _this = this;
|
|
6544
6544
|
return new engineCore.AssetPromise(function(resolve, reject, _, __, onCancel) {
|
|
6545
|
+
var _item_resolvedUrl;
|
|
6546
|
+
// Atlas pages are runtime files addressed relative to the encoded atlas,
|
|
6547
|
+
// not to the editor-facing virtual resource identity.
|
|
6548
|
+
var atlasUrl = (_item_resolvedUrl = item.resolvedUrl) != null ? _item_resolvedUrl : item.url;
|
|
6545
6549
|
var chainPromises = [];
|
|
6546
6550
|
onCancel(function() {
|
|
6547
6551
|
for(var i = 0; i < chainPromises.length; i++){
|
|
@@ -6549,7 +6553,7 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6549
6553
|
}
|
|
6550
6554
|
});
|
|
6551
6555
|
// @ts-ignore
|
|
6552
|
-
var configPromise = resourceManager._request(
|
|
6556
|
+
var configPromise = resourceManager._request(atlasUrl, _extends({}, item, {
|
|
6553
6557
|
type: "json"
|
|
6554
6558
|
}));
|
|
6555
6559
|
chainPromises.push(configPromise);
|
|
@@ -6559,7 +6563,7 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6559
6563
|
if (atlasItem.img) {
|
|
6560
6564
|
var _atlasItem_type;
|
|
6561
6565
|
chainPromises.push(resourceManager.load({
|
|
6562
|
-
url: engineCore.Utils.resolveAbsoluteUrl(
|
|
6566
|
+
url: engineCore.Utils.resolveAbsoluteUrl(atlasUrl, atlasItem.img),
|
|
6563
6567
|
type: (_atlasItem_type = atlasItem.type) != null ? _atlasItem_type : engineCore.AssetType.Texture,
|
|
6564
6568
|
params: {
|
|
6565
6569
|
format: format,
|
|
@@ -6902,7 +6906,10 @@ var ShaderLoader = /*#__PURE__*/ function(Loader) {
|
|
|
6902
6906
|
}
|
|
6903
6907
|
var _proto = ShaderLoader.prototype;
|
|
6904
6908
|
_proto.load = function load(item, resourceManager) {
|
|
6905
|
-
var
|
|
6909
|
+
var _item_resolvedUrl;
|
|
6910
|
+
// Virtual paths preserve source identity (for example `.shader`), while
|
|
6911
|
+
// the physical path determines how this file is encoded (`.shaderc`).
|
|
6912
|
+
var url = (_item_resolvedUrl = item.resolvedUrl) != null ? _item_resolvedUrl : item.url;
|
|
6906
6913
|
if (url.endsWith(".shaderc")) {
|
|
6907
6914
|
// @ts-ignore
|
|
6908
6915
|
return resourceManager._request(url, _extends({}, item, {
|