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

package/dist/miniprogram.js

@@ -5345,7 +5345,7 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader1) {
     };
     _proto._makeSprite = function _makeSprite(engine, config, texture) {
         // Generate a SpriteAtlas object.
-        var region = config.region, atlasRegionOffset = config.atlasRegionOffset, atlasRegion = config.atlasRegion, pivot = config.pivot, border = config.border;
+        var region = config.region, atlasRegionOffset = config.atlasRegionOffset, atlasRegion = config.atlasRegion, pivot = config.pivot, border = config.border, width = config.width, height = config.height;
         var sprite = new miniprogram.Sprite(engine, texture, region ? this._tempRect.set(region.x, region.y, region.w, region.h) : undefined, pivot ? this._tempVec2.set(pivot.x, pivot.y) : undefined, border ? this._tempVec4.set(border.x, border.y, border.z, border.w) : undefined, config.name);
         if (texture) {
             var invW = 1 / texture.width;
@@ -5357,6 +5357,8 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader1) {
             }
             config.atlasRotated && (sprite.atlasRotated = true);
         }
+        isNaN(width) || (sprite.width = width);
+        isNaN(height) || (sprite.height = height);
         return sprite;
     };
     return SpriteAtlasLoader;
@@ -5375,26 +5377,39 @@ var SpriteLoader = /*#__PURE__*/ function(Loader1) {
     var _proto = SpriteLoader.prototype;
     _proto.load = function load(item, resourceManager) {
         var _this = this;
-        return new miniprogram.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, _extends({}, item, {
-                type: "json"
-            })).then(function(data) {
-                if (data.belongToAtlas) {
-                    resourceManager// @ts-ignore
-                    .getResourceByRef(data.belongToAtlas).then(function(atlas) {
-                        resolve(atlas.getSprite(data.fullPath));
-                    }).catch(reject);
-                } else if (data.texture) {
-                    resourceManager// @ts-ignore
-                    .getResourceByRef(data.texture).then(function(texture) {
-                        resolve(new miniprogram.Sprite(resourceManager.engine, texture, data.region, data.pivot, data.border));
-                    }).catch(reject);
-                } else {
-                    resolve(new miniprogram.Sprite(resourceManager.engine, null, data.region, data.pivot, data.border));
-                }
-            }).catch(reject);
+        return this.request(item.url, _extends({}, item, {
+            type: "json"
+        })).then(function(data) {
+            return data.belongToAtlas ? _this._loadFromAtlas(resourceManager, data) : _this._loadFromTexture(resourceManager, data);
         });
     };
+    _proto._loadFromAtlas = function _loadFromAtlas(resourceManager, data) {
+        var _this = this;
+        return resourceManager// @ts-ignore
+        .getResourceByRef(data.belongToAtlas).then(function(atlas) {
+            return atlas.getSprite(data.fullPath) || _this._loadFromTexture(resourceManager, data);
+        });
+    };
+    _proto._loadFromTexture = function _loadFromTexture(resourceManager, data) {
+        if (data.texture) {
+            return resourceManager// @ts-ignore
+            .getResourceByRef(data.texture).then(function(texture) {
+                var sprite = new miniprogram.Sprite(resourceManager.engine, texture, data.region, data.pivot, data.border);
+                var width = data.width, height = data.height;
+                isNaN(width) || (sprite.width = width);
+                isNaN(height) || (sprite.height = height);
+                return sprite;
+            });
+        } else {
+            return new miniprogram.AssetPromise(function(resolve) {
+                var sprite = new miniprogram.Sprite(resourceManager.engine, null, data.region, data.pivot, data.border);
+                var width = data.width, height = data.height;
+                isNaN(width) || (sprite.width = width);
+                isNaN(height) || (sprite.height = height);
+                resolve(sprite);
+            });
+        }
+    };
     return SpriteLoader;
 }(miniprogram.Loader);
 SpriteLoader = __decorate([

package/dist/module.js

@@ -5340,7 +5340,7 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader1) {
     };
     _proto._makeSprite = function _makeSprite(engine, config, texture) {
         // Generate a SpriteAtlas object.
-        var region = config.region, atlasRegionOffset = config.atlasRegionOffset, atlasRegion = config.atlasRegion, pivot = config.pivot, border = config.border;
+        var region = config.region, atlasRegionOffset = config.atlasRegionOffset, atlasRegion = config.atlasRegion, pivot = config.pivot, border = config.border, width = config.width, height = config.height;
         var sprite = new Sprite(engine, texture, region ? this._tempRect.set(region.x, region.y, region.w, region.h) : undefined, pivot ? this._tempVec2.set(pivot.x, pivot.y) : undefined, border ? this._tempVec4.set(border.x, border.y, border.z, border.w) : undefined, config.name);
         if (texture) {
             var invW = 1 / texture.width;
@@ -5352,6 +5352,8 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader1) {
             }
             config.atlasRotated && (sprite.atlasRotated = true);
         }
+        isNaN(width) || (sprite.width = width);
+        isNaN(height) || (sprite.height = height);
         return sprite;
     };
     return SpriteAtlasLoader;
@@ -5370,26 +5372,39 @@ var SpriteLoader = /*#__PURE__*/ function(Loader1) {
     var _proto = SpriteLoader.prototype;
     _proto.load = function load(item, resourceManager) {
         var _this = this;
-        return new AssetPromise(function(resolve, reject) {
-            _this.request(item.url, _extends({}, item, {
-                type: "json"
-            })).then(function(data) {
-                if (data.belongToAtlas) {
-                    resourceManager// @ts-ignore
-                    .getResourceByRef(data.belongToAtlas).then(function(atlas) {
-                        resolve(atlas.getSprite(data.fullPath));
-                    }).catch(reject);
-                } else if (data.texture) {
-                    resourceManager// @ts-ignore
-                    .getResourceByRef(data.texture).then(function(texture) {
-                        resolve(new Sprite(resourceManager.engine, texture, data.region, data.pivot, data.border));
-                    }).catch(reject);
-                } else {
-                    resolve(new Sprite(resourceManager.engine, null, data.region, data.pivot, data.border));
-                }
-            }).catch(reject);
+        return this.request(item.url, _extends({}, item, {
+            type: "json"
+        })).then(function(data) {
+            return data.belongToAtlas ? _this._loadFromAtlas(resourceManager, data) : _this._loadFromTexture(resourceManager, data);
         });
     };
+    _proto._loadFromAtlas = function _loadFromAtlas(resourceManager, data) {
+        var _this = this;
+        return resourceManager// @ts-ignore
+        .getResourceByRef(data.belongToAtlas).then(function(atlas) {
+            return atlas.getSprite(data.fullPath) || _this._loadFromTexture(resourceManager, data);
+        });
+    };
+    _proto._loadFromTexture = function _loadFromTexture(resourceManager, data) {
+        if (data.texture) {
+            return resourceManager// @ts-ignore
+            .getResourceByRef(data.texture).then(function(texture) {
+                var sprite = new Sprite(resourceManager.engine, texture, data.region, data.pivot, data.border);
+                var width = data.width, height = data.height;
+                isNaN(width) || (sprite.width = width);
+                isNaN(height) || (sprite.height = height);
+                return sprite;
+            });
+        } else {
+            return new AssetPromise(function(resolve) {
+                var sprite = new Sprite(resourceManager.engine, null, data.region, data.pivot, data.border);
+                var width = data.width, height = data.height;
+                isNaN(width) || (sprite.width = width);
+                isNaN(height) || (sprite.height = height);
+                resolve(sprite);
+            });
+        }
+    };
     return SpriteLoader;
 }(Loader);
 SpriteLoader = __decorate([