@galacean/engine-loader 0.9.0-beta.80 → 0.9.0-beta.81

package/dist/miniprogram.js

@@ -4117,6 +4117,7 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader) {
         _this = Loader.apply(this, arguments) || this;
         _this._tempRect = new miniprogram$1.Rect();
         _this._tempVec2 = new miniprogram$1.Vector2();
+        _this._tempVec4 = new miniprogram$1.Vector4();
         return _this;
     }
     var _proto = SpriteAtlasLoader.prototype;
@@ -4134,57 +4135,65 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader) {
             }));
             chainPromises.push(configPromise);
             configPromise.then(function(atlasData) {
-                var atlasItems = atlasData.atlasItems, format = atlasData.format;
-                var atlasItemsLen = atlasItems.length;
-                var imagePromises = miniprogram.AssetPromise.all(atlasItems.map(function(param) {
-                    var img = param.img;
-                    return _this.request(GLTFUtil.parseRelativeUrl(item.url, img), _extends({}, item, {
-                        type: "image"
-                    }));
-                }));
-                chainPromises.push(imagePromises);
-                return imagePromises.then(function(imgs) {
-                    var engine = resourceManager.engine;
-                    // Generate a SpriteAtlas object.
-                    var tempRect = _this._tempRect, tempVec2 = _this._tempVec2;
-                    var spriteAtlas = new miniprogram.SpriteAtlas(engine);
-                    for(var i = 0; i < atlasItemsLen; i++){
-                        // Generate Texture2D according to configuration.
-                        var originalImg = imgs[i];
-                        var width = originalImg.width, height = originalImg.height;
-                        var texture = new miniprogram.Texture2D(engine, width, height, format);
-                        texture.setImageSource(originalImg);
-                        texture.generateMipmaps();
-                        // Generate all the sprites on this texture.
-                        var atlasItem = atlasItems[i];
-                        var sprites = atlasItem.sprites;
-                        var sourceWidthReciprocal = 1.0 / width;
-                        var sourceHeightReciprocal = 1.0 / height;
-                        for(var j = sprites.length - 1; j >= 0; j--){
-                            var atlasSprite = sprites[j];
-                            var region = atlasSprite.region, atlasRegionOffset = atlasSprite.atlasRegionOffset, atlasRegion = atlasSprite.atlasRegion, id = atlasSprite.id, pivot = atlasSprite.pivot;
-                            var sprite = new miniprogram.Sprite(engine, texture, region ? tempRect.set(region.x, region.y, region.w, region.h) : undefined, pivot ? tempVec2.set(pivot.x, pivot.y) : undefined, undefined, atlasSprite.name);
-                            sprite.atlasRegion.set(atlasRegion.x * sourceWidthReciprocal, atlasRegion.y * sourceHeightReciprocal, atlasRegion.w * sourceWidthReciprocal, atlasRegion.h * sourceHeightReciprocal);
-                            atlasSprite.atlasRotated && (sprite.atlasRotated = true);
-                            if (atlasRegionOffset) {
-                                var offsetLeft = atlasRegionOffset.x, offsetTop = atlasRegionOffset.y, offsetRight = atlasRegionOffset.z, offsetBottom = atlasRegionOffset.w;
-                                sprite.atlasRegionOffset.set(offsetLeft * sourceWidthReciprocal, offsetTop * sourceHeightReciprocal, offsetRight * sourceWidthReciprocal, offsetBottom * sourceHeightReciprocal);
+                var _loop = function(i) {
+                    var atlasItem = atlasItems[i];
+                    if (atlasItem.img) {
+                        chainPromises.push(resourceManager.load({
+                            url: atlasItem.img,
+                            type: miniprogram.AssetType.Texture2D,
+                            params: {
+                                format: format,
+                                mipmap: mipmap
                             }
-                            if (id !== undefined) {
+                        }).then(function(texture) {
+                            anisoLevel && (texture.anisoLevel = anisoLevel);
+                            filterMode !== undefined && (texture.filterMode = filterMode);
+                            wrapModeU !== undefined && (texture.wrapModeU = wrapModeU);
+                            wrapModeV !== undefined && (texture.wrapModeV = wrapModeV);
+                            for(var i = 0; i < atlasItem.sprites.length; i++){
                                 // @ts-ignore
-                                sprite._assetID = id;
+                                spriteAtlas._addSprite(_this._makeSprite(engine, atlasItem.sprites[i], texture));
                             }
+                        }).catch(reject));
+                    } else {
+                        for(var i1 = 0; i1 < atlasItem.sprites.length; i1++){
                             // @ts-ignore
-                            spriteAtlas._addSprite(sprite);
+                            spriteAtlas._addSprite(_this._makeSprite(engine, atlasItem.sprites[i1]));
                         }
                     }
+                };
+                var atlasItems = atlasData.atlasItems, mipmap = atlasData.mipmap, anisoLevel = atlasData.anisoLevel, filterMode = atlasData.filterMode, wrapModeU = atlasData.wrapModeU, wrapModeV = atlasData.wrapModeV, format = atlasData.format;
+                var atlasItemsLen = atlasItems ? atlasItems.length : 0;
+                var engine = resourceManager.engine;
+                var spriteAtlas = new miniprogram.SpriteAtlas(engine);
+                if (atlasItemsLen < 0) {
                     resolve(spriteAtlas);
-                });
-            }).catch(function(e) {
-                reject(e);
-            });
+                    return;
+                }
+                chainPromises.length = 0;
+                for(var i = 0; i < atlasItems.length; i++)_loop(i);
+                miniprogram.AssetPromise.all(chainPromises).then(function() {
+                    resolve(spriteAtlas);
+                }).catch(reject);
+            }).catch(reject);
         });
     };
+    _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 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;
+            var invH = 1 / texture.height;
+            sprite.atlasRegion.set(atlasRegion.x * invW, atlasRegion.y * invH, atlasRegion.w * invW, atlasRegion.h * invH);
+            if (atlasRegionOffset) {
+                var offsetLeft = atlasRegionOffset.x, offsetTop = atlasRegionOffset.y, offsetRight = atlasRegionOffset.z, offsetBottom = atlasRegionOffset.w;
+                sprite.atlasRegionOffset.set(offsetLeft * invW, offsetTop * invH, offsetRight * invW, offsetBottom * invH);
+            }
+            config.atlasRotated && (sprite.atlasRotated = true);
+        }
+        return sprite;
+    };
     return SpriteAtlasLoader;
 }(miniprogram.Loader);
 SpriteAtlasLoader = __decorate([
@@ -4205,13 +4214,19 @@ var SpriteLoader = /*#__PURE__*/ function(Loader) {
             _this.request(item.url, _extends({}, item, {
                 type: "json"
             })).then(function(data) {
-                // @ts-ignore
-                resourceManager.getResourceByRef(data.texture).then(function(texture) {
-                    var sprite = new miniprogram.Sprite(resourceManager.engine, texture);
-                    sprite.region = data.region;
-                    sprite.pivot = data.pivot;
-                    resolve(sprite);
-                });
+                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);
         });
     };

package/dist/module.js

@@ -4112,6 +4112,7 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader) {
         _this = Loader.apply(this, arguments) || this;
         _this._tempRect = new Rect();
         _this._tempVec2 = new Vector2();
+        _this._tempVec4 = new Vector4();
         return _this;
     }
     var _proto = SpriteAtlasLoader.prototype;
@@ -4129,57 +4130,65 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader) {
             }));
             chainPromises.push(configPromise);
             configPromise.then(function(atlasData) {
-                var atlasItems = atlasData.atlasItems, format = atlasData.format;
-                var atlasItemsLen = atlasItems.length;
-                var imagePromises = AssetPromise.all(atlasItems.map(function(param) {
-                    var img = param.img;
-                    return _this.request(GLTFUtil.parseRelativeUrl(item.url, img), _extends({}, item, {
-                        type: "image"
-                    }));
-                }));
-                chainPromises.push(imagePromises);
-                return imagePromises.then(function(imgs) {
-                    var engine = resourceManager.engine;
-                    // Generate a SpriteAtlas object.
-                    var tempRect = _this._tempRect, tempVec2 = _this._tempVec2;
-                    var spriteAtlas = new SpriteAtlas(engine);
-                    for(var i = 0; i < atlasItemsLen; i++){
-                        // Generate Texture2D according to configuration.
-                        var originalImg = imgs[i];
-                        var width = originalImg.width, height = originalImg.height;
-                        var texture = new Texture2D(engine, width, height, format);
-                        texture.setImageSource(originalImg);
-                        texture.generateMipmaps();
-                        // Generate all the sprites on this texture.
-                        var atlasItem = atlasItems[i];
-                        var sprites = atlasItem.sprites;
-                        var sourceWidthReciprocal = 1.0 / width;
-                        var sourceHeightReciprocal = 1.0 / height;
-                        for(var j = sprites.length - 1; j >= 0; j--){
-                            var atlasSprite = sprites[j];
-                            var region = atlasSprite.region, atlasRegionOffset = atlasSprite.atlasRegionOffset, atlasRegion = atlasSprite.atlasRegion, id = atlasSprite.id, pivot = atlasSprite.pivot;
-                            var sprite = new Sprite(engine, texture, region ? tempRect.set(region.x, region.y, region.w, region.h) : undefined, pivot ? tempVec2.set(pivot.x, pivot.y) : undefined, undefined, atlasSprite.name);
-                            sprite.atlasRegion.set(atlasRegion.x * sourceWidthReciprocal, atlasRegion.y * sourceHeightReciprocal, atlasRegion.w * sourceWidthReciprocal, atlasRegion.h * sourceHeightReciprocal);
-                            atlasSprite.atlasRotated && (sprite.atlasRotated = true);
-                            if (atlasRegionOffset) {
-                                var offsetLeft = atlasRegionOffset.x, offsetTop = atlasRegionOffset.y, offsetRight = atlasRegionOffset.z, offsetBottom = atlasRegionOffset.w;
-                                sprite.atlasRegionOffset.set(offsetLeft * sourceWidthReciprocal, offsetTop * sourceHeightReciprocal, offsetRight * sourceWidthReciprocal, offsetBottom * sourceHeightReciprocal);
+                var _loop = function(i) {
+                    var atlasItem = atlasItems[i];
+                    if (atlasItem.img) {
+                        chainPromises.push(resourceManager.load({
+                            url: atlasItem.img,
+                            type: AssetType.Texture2D,
+                            params: {
+                                format: format,
+                                mipmap: mipmap
                             }
-                            if (id !== undefined) {
+                        }).then(function(texture) {
+                            anisoLevel && (texture.anisoLevel = anisoLevel);
+                            filterMode !== undefined && (texture.filterMode = filterMode);
+                            wrapModeU !== undefined && (texture.wrapModeU = wrapModeU);
+                            wrapModeV !== undefined && (texture.wrapModeV = wrapModeV);
+                            for(var i = 0; i < atlasItem.sprites.length; i++){
                                 // @ts-ignore
-                                sprite._assetID = id;
+                                spriteAtlas._addSprite(_this._makeSprite(engine, atlasItem.sprites[i], texture));
                             }
+                        }).catch(reject));
+                    } else {
+                        for(var i1 = 0; i1 < atlasItem.sprites.length; i1++){
                             // @ts-ignore
-                            spriteAtlas._addSprite(sprite);
+                            spriteAtlas._addSprite(_this._makeSprite(engine, atlasItem.sprites[i1]));
                         }
                     }
+                };
+                var atlasItems = atlasData.atlasItems, mipmap = atlasData.mipmap, anisoLevel = atlasData.anisoLevel, filterMode = atlasData.filterMode, wrapModeU = atlasData.wrapModeU, wrapModeV = atlasData.wrapModeV, format = atlasData.format;
+                var atlasItemsLen = atlasItems ? atlasItems.length : 0;
+                var engine = resourceManager.engine;
+                var spriteAtlas = new SpriteAtlas(engine);
+                if (atlasItemsLen < 0) {
                     resolve(spriteAtlas);
-                });
-            }).catch(function(e) {
-                reject(e);
-            });
+                    return;
+                }
+                chainPromises.length = 0;
+                for(var i = 0; i < atlasItems.length; i++)_loop(i);
+                AssetPromise.all(chainPromises).then(function() {
+                    resolve(spriteAtlas);
+                }).catch(reject);
+            }).catch(reject);
         });
     };
+    _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 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;
+            var invH = 1 / texture.height;
+            sprite.atlasRegion.set(atlasRegion.x * invW, atlasRegion.y * invH, atlasRegion.w * invW, atlasRegion.h * invH);
+            if (atlasRegionOffset) {
+                var offsetLeft = atlasRegionOffset.x, offsetTop = atlasRegionOffset.y, offsetRight = atlasRegionOffset.z, offsetBottom = atlasRegionOffset.w;
+                sprite.atlasRegionOffset.set(offsetLeft * invW, offsetTop * invH, offsetRight * invW, offsetBottom * invH);
+            }
+            config.atlasRotated && (sprite.atlasRotated = true);
+        }
+        return sprite;
+    };
     return SpriteAtlasLoader;
 }(Loader);
 SpriteAtlasLoader = __decorate([
@@ -4200,13 +4209,19 @@ var SpriteLoader = /*#__PURE__*/ function(Loader) {
             _this.request(item.url, _extends({}, item, {
                 type: "json"
             })).then(function(data) {
-                // @ts-ignore
-                resourceManager.getResourceByRef(data.texture).then(function(texture) {
-                    var sprite = new Sprite(resourceManager.engine, texture);
-                    sprite.region = data.region;
-                    sprite.pivot = data.pivot;
-                    resolve(sprite);
-                });
+                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);
         });
     };