@galacean/engine 1.1.0-beta.30 → 1.1.0-beta.31
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/browser.js +24 -19
- package/dist/browser.min.js +1 -1
- package/dist/main.js +1 -1
- package/dist/miniprogram.js +1 -1
- package/dist/module.js +1 -1
- package/package.json +5 -5
package/dist/browser.js
CHANGED
|
@@ -42860,26 +42860,31 @@
|
|
|
42860
42860
|
var _proto = SpriteLoader.prototype;
|
|
42861
42861
|
_proto.load = function load(item, resourceManager) {
|
|
42862
42862
|
var _this = this;
|
|
42863
|
-
return
|
|
42864
|
-
|
|
42865
|
-
|
|
42866
|
-
|
|
42867
|
-
if (data.belongToAtlas) {
|
|
42868
|
-
resourceManager // @ts-ignore
|
|
42869
|
-
.getResourceByRef(data.belongToAtlas).then(function(atlas) {
|
|
42870
|
-
resolve(atlas.getSprite(data.fullPath));
|
|
42871
|
-
}).catch(reject);
|
|
42872
|
-
} else if (data.texture) {
|
|
42873
|
-
resourceManager // @ts-ignore
|
|
42874
|
-
.getResourceByRef(data.texture).then(function(texture) {
|
|
42875
|
-
resolve(new Sprite(resourceManager.engine, texture, data.region, data.pivot, data.border));
|
|
42876
|
-
}).catch(reject);
|
|
42877
|
-
} else {
|
|
42878
|
-
resolve(new Sprite(resourceManager.engine, null, data.region, data.pivot, data.border));
|
|
42879
|
-
}
|
|
42880
|
-
}).catch(reject);
|
|
42863
|
+
return this.request(item.url, _extends({}, item, {
|
|
42864
|
+
type: "json"
|
|
42865
|
+
})).then(function(data) {
|
|
42866
|
+
return data.belongToAtlas ? _this._loadFromAtlas(resourceManager, data) : _this._loadFromTexture(resourceManager, data);
|
|
42881
42867
|
});
|
|
42882
42868
|
};
|
|
42869
|
+
_proto._loadFromAtlas = function _loadFromAtlas(resourceManager, data) {
|
|
42870
|
+
var _this = this;
|
|
42871
|
+
return resourceManager // @ts-ignore
|
|
42872
|
+
.getResourceByRef(data.belongToAtlas).then(function(atlas) {
|
|
42873
|
+
return atlas.getSprite(data.fullPath) || _this._loadFromTexture(resourceManager, data);
|
|
42874
|
+
});
|
|
42875
|
+
};
|
|
42876
|
+
_proto._loadFromTexture = function _loadFromTexture(resourceManager, data) {
|
|
42877
|
+
if (data.texture) {
|
|
42878
|
+
return resourceManager // @ts-ignore
|
|
42879
|
+
.getResourceByRef(data.texture).then(function(texture) {
|
|
42880
|
+
return new Sprite(resourceManager.engine, texture, data.region, data.pivot, data.border);
|
|
42881
|
+
});
|
|
42882
|
+
} else {
|
|
42883
|
+
return new AssetPromise(function(resolve) {
|
|
42884
|
+
resolve(new Sprite(resourceManager.engine, null, data.region, data.pivot, data.border));
|
|
42885
|
+
});
|
|
42886
|
+
}
|
|
42887
|
+
};
|
|
42883
42888
|
return SpriteLoader;
|
|
42884
42889
|
}(Loader);
|
|
42885
42890
|
SpriteLoader = __decorate([
|
|
@@ -43655,7 +43660,7 @@
|
|
|
43655
43660
|
], GALACEAN_animation_event);
|
|
43656
43661
|
|
|
43657
43662
|
//@ts-ignore
|
|
43658
|
-
var version = "1.1.0-beta.
|
|
43663
|
+
var version = "1.1.0-beta.31";
|
|
43659
43664
|
console.log("Galacean engine version: " + version);
|
|
43660
43665
|
for(var key in CoreObjects){
|
|
43661
43666
|
Loader.registerClass(key, CoreObjects[key]);
|