@galacean/engine-loader 0.0.0-experimental-shaderlab.0 → 0.0.0-experimental-uploadSameBuffer.0

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.
@@ -5375,26 +5375,31 @@ var SpriteLoader = /*#__PURE__*/ function(Loader1) {
5375
5375
  var _proto = SpriteLoader.prototype;
5376
5376
  _proto.load = function load(item, resourceManager) {
5377
5377
  var _this = this;
5378
- return new miniprogram.AssetPromise(function(resolve, reject) {
5379
- _this.request(item.url, _extends({}, item, {
5380
- type: "json"
5381
- })).then(function(data) {
5382
- if (data.belongToAtlas) {
5383
- resourceManager// @ts-ignore
5384
- .getResourceByRef(data.belongToAtlas).then(function(atlas) {
5385
- resolve(atlas.getSprite(data.fullPath));
5386
- }).catch(reject);
5387
- } else if (data.texture) {
5388
- resourceManager// @ts-ignore
5389
- .getResourceByRef(data.texture).then(function(texture) {
5390
- resolve(new miniprogram.Sprite(resourceManager.engine, texture, data.region, data.pivot, data.border));
5391
- }).catch(reject);
5392
- } else {
5393
- resolve(new miniprogram.Sprite(resourceManager.engine, null, data.region, data.pivot, data.border));
5394
- }
5395
- }).catch(reject);
5378
+ return this.request(item.url, _extends({}, item, {
5379
+ type: "json"
5380
+ })).then(function(data) {
5381
+ return data.belongToAtlas ? _this._loadFromAtlas(resourceManager, data) : _this._loadFromTexture(resourceManager, data);
5396
5382
  });
5397
5383
  };
5384
+ _proto._loadFromAtlas = function _loadFromAtlas(resourceManager, data) {
5385
+ var _this = this;
5386
+ return resourceManager// @ts-ignore
5387
+ .getResourceByRef(data.belongToAtlas).then(function(atlas) {
5388
+ return atlas.getSprite(data.fullPath) || _this._loadFromTexture(resourceManager, data);
5389
+ });
5390
+ };
5391
+ _proto._loadFromTexture = function _loadFromTexture(resourceManager, data) {
5392
+ if (data.texture) {
5393
+ return resourceManager// @ts-ignore
5394
+ .getResourceByRef(data.texture).then(function(texture) {
5395
+ return new miniprogram.Sprite(resourceManager.engine, texture, data.region, data.pivot, data.border);
5396
+ });
5397
+ } else {
5398
+ return new miniprogram.AssetPromise(function(resolve) {
5399
+ resolve(new miniprogram.Sprite(resourceManager.engine, null, data.region, data.pivot, data.border));
5400
+ });
5401
+ }
5402
+ };
5398
5403
  return SpriteLoader;
5399
5404
  }(miniprogram.Loader);
5400
5405
  SpriteLoader = __decorate([
package/dist/module.js CHANGED
@@ -5370,26 +5370,31 @@ var SpriteLoader = /*#__PURE__*/ function(Loader1) {
5370
5370
  var _proto = SpriteLoader.prototype;
5371
5371
  _proto.load = function load(item, resourceManager) {
5372
5372
  var _this = this;
5373
- return new AssetPromise(function(resolve, reject) {
5374
- _this.request(item.url, _extends({}, item, {
5375
- type: "json"
5376
- })).then(function(data) {
5377
- if (data.belongToAtlas) {
5378
- resourceManager// @ts-ignore
5379
- .getResourceByRef(data.belongToAtlas).then(function(atlas) {
5380
- resolve(atlas.getSprite(data.fullPath));
5381
- }).catch(reject);
5382
- } else if (data.texture) {
5383
- resourceManager// @ts-ignore
5384
- .getResourceByRef(data.texture).then(function(texture) {
5385
- resolve(new Sprite(resourceManager.engine, texture, data.region, data.pivot, data.border));
5386
- }).catch(reject);
5387
- } else {
5388
- resolve(new Sprite(resourceManager.engine, null, data.region, data.pivot, data.border));
5389
- }
5390
- }).catch(reject);
5373
+ return this.request(item.url, _extends({}, item, {
5374
+ type: "json"
5375
+ })).then(function(data) {
5376
+ return data.belongToAtlas ? _this._loadFromAtlas(resourceManager, data) : _this._loadFromTexture(resourceManager, data);
5391
5377
  });
5392
5378
  };
5379
+ _proto._loadFromAtlas = function _loadFromAtlas(resourceManager, data) {
5380
+ var _this = this;
5381
+ return resourceManager// @ts-ignore
5382
+ .getResourceByRef(data.belongToAtlas).then(function(atlas) {
5383
+ return atlas.getSprite(data.fullPath) || _this._loadFromTexture(resourceManager, data);
5384
+ });
5385
+ };
5386
+ _proto._loadFromTexture = function _loadFromTexture(resourceManager, data) {
5387
+ if (data.texture) {
5388
+ return resourceManager// @ts-ignore
5389
+ .getResourceByRef(data.texture).then(function(texture) {
5390
+ return new Sprite(resourceManager.engine, texture, data.region, data.pivot, data.border);
5391
+ });
5392
+ } else {
5393
+ return new AssetPromise(function(resolve) {
5394
+ resolve(new Sprite(resourceManager.engine, null, data.region, data.pivot, data.border));
5395
+ });
5396
+ }
5397
+ };
5393
5398
  return SpriteLoader;
5394
5399
  }(Loader);
5395
5400
  SpriteLoader = __decorate([