@galacean/effects-core 1.2.3 → 1.3.0-alpha.0

package/dist/downloader.d.ts

@@ -1,14 +1,5 @@
 type SuccessHandler<T> = (data: T) => void;
 type ErrorHandler = (status: number, responseText: string) => void;
-/**
- *
- */
-type VideoLoadOptions = {
-    /**
-     * 视频是否循环播放
-     */
-    loop?: boolean;
-};
 /**
  * JSON 值，它可以是字符串、数字、布尔值、对象或者 JSON 值的数组。
  *
@@ -77,7 +68,6 @@ export declare function loadBlob(url: string): Promise<Blob>;
 /**
  * 异步加载一个视频文件
  * @param url - 视频文件的 URL 或 MediaProvider 对象
- * @param options - 加载参数
  */
-export declare function loadVideo(url: string | MediaProvider, options?: VideoLoadOptions): Promise<HTMLVideoElement>;
+export declare function loadVideo(url: string | MediaProvider): Promise<HTMLVideoElement>;
 export {};

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v1.2.3
+ * Version: v1.3.0-alpha.0
  */
 
 'use strict';
@@ -686,7 +686,7 @@ function asserts(condition, msg) {
  * Name: @galacean/effects-specification
  * Description: Galacean Effects JSON Specification
  * Author: Ant Group CO., Ltd.
- * Version: v1.0.1
+ * Version: v1.1.0-alpha.0
  */
 
 /*********************************************/
@@ -1067,6 +1067,16 @@ var CompositionEndBehavior$1;
     CompositionEndBehavior[CompositionEndBehavior["pause_destroy"] = END_BEHAVIOR_PAUSE_AND_DESTROY$1] = "pause_destroy";
 })(CompositionEndBehavior$1 || (CompositionEndBehavior$1 = {}));
 
+/**
+ * 动态换图类型
+ * @since 1.3.0
+ */
+var BackgroundType$1;
+(function (BackgroundType) {
+    BackgroundType["video"] = "video";
+    BackgroundType["image"] = "image";
+})(BackgroundType$1 || (BackgroundType$1 = {}));
+
 /*********************************************/
 /*               基本数值属性参数              */
 /*********************************************/
@@ -1356,6 +1366,7 @@ var FontStyle$1;
 
 var index$1 = /*#__PURE__*/Object.freeze({
     __proto__: null,
+    get BackgroundType () { return BackgroundType$1; },
     get BezierKeyframeType () { return BezierKeyframeType$1; },
     get BlendingMode () { return BlendingMode$1; },
     BloomFilterThresholdAvgColor: BloomFilterThresholdAvgColor,
@@ -10153,10 +10164,8 @@ function loadBlob(url) {
 /**
  * 异步加载一个视频文件
  * @param url - 视频文件的 URL 或 MediaProvider 对象
- * @param options - 加载参数
  */
-function loadVideo(url, options) {
-    if (options === void 0) { options = {}; }
+function loadVideo(url) {
     return __awaiter(this, void 0, void 0, function () {
         var video;
         return __generator(this, function (_a) {
@@ -10169,9 +10178,6 @@ function loadVideo(url, options) {
             }
             video.crossOrigin = 'anonymous';
             video.muted = true;
-            if (options.loop) {
-                video.addEventListener('ended', function () { return video.play(); });
-            }
             if (isAndroid()) {
                 video.setAttribute('renderer', 'standard');
             }
@@ -19655,6 +19661,26 @@ function getBackgroundImage(template, variables) {
     }
     return templateBackground;
 }
+function loadMedia(url, loadFn) {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!Array.isArray(url)) return [3 /*break*/, 5];
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 3, , 5]);
+                    return [4 /*yield*/, loadFn(url[0])];
+                case 2: return [2 /*return*/, _a.sent()];
+                case 3:
+                    _a.sent();
+                    return [4 /*yield*/, loadFn(url[1])];
+                case 4: return [2 /*return*/, _a.sent()];
+                case 5: return [2 /*return*/, loadFn(url)];
+            }
+        });
+    });
+}
 function drawImageAndTemplate(viewer, image, template, variables, opt) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
@@ -21546,7 +21572,7 @@ var filters = {
  * Name: @galacean/effects-specification
  * Description: Galacean Effects JSON Specification
  * Author: Ant Group CO., Ltd.
- * Version: v1.0.1
+ * Version: v1.1.0-alpha.0
  */
 
 /*********************************************/
@@ -21925,6 +21951,16 @@ var CompositionEndBehavior;
     CompositionEndBehavior[CompositionEndBehavior["pause_destroy"] = END_BEHAVIOR_PAUSE_AND_DESTROY] = "pause_destroy";
 })(CompositionEndBehavior || (CompositionEndBehavior = {}));
 
+/**
+ * 动态换图类型
+ * @since 1.3.0
+ */
+var BackgroundType;
+(function (BackgroundType) {
+    BackgroundType["video"] = "video";
+    BackgroundType["image"] = "image";
+})(BackgroundType || (BackgroundType = {}));
+
 /*********************************************/
 /*               基本数值属性参数              */
 /*********************************************/
@@ -23009,11 +23045,9 @@ function getStandardImage(image, index, imageTags) {
     else if (image.url) {
         return {
             url: image.url,
-            type: image.type,
             webp: image.webp,
             renderLevel: renderLevel,
             oriY: oriY,
-            loop: image.loop,
         };
     }
     else if (image && image.sourceType) {
@@ -23765,79 +23799,61 @@ var AssetManager = /** @class */ (function () {
                 _a = this.options, useCompressedTexture = _a.useCompressedTexture, variables = _a.variables;
                 baseUrl = this.baseUrl;
                 jobs = images.map(function (img, idx) { return __awaiter(_this, void 0, void 0, function () {
-                    var png, webp, imageURL, webpURL, template, result, url_1, name_1, templateImage, loop, compressed, src, bufferURL, _a, url, image;
-                    var _b, _c, _d;
-                    return __generator(this, function (_e) {
-                        switch (_e.label) {
+                    var png, webp, imageURL, webpURL, template, isTemplateV2, background, url_1, isVideo, loadFn, resultImage, resultImage, compressed, src, bufferURL, _a, url, image;
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
                             case 0:
-                                if (!usage[idx]) return [3 /*break*/, 19];
+                                if (!usage[idx]) {
+                                    return [2 /*return*/, undefined];
+                                }
                                 png = img.url, webp = img.webp;
                                 imageURL = new URL(png, baseUrl).href;
                                 webpURL = webp && new URL(webp, baseUrl).href;
-                                if (!('template' in img)) return [3 /*break*/, 16];
+                                if (!('template' in img)) return [3 /*break*/, 13];
                                 template = img.template;
-                                result = void 0;
-                                if (!('v' in template && template.v === 2 && template.background)) return [3 /*break*/, 9];
+                                isTemplateV2 = 'v' in template && template.v === 2 && template.background;
+                                background = isTemplateV2 ? template.background : undefined;
+                                if (!(isTemplateV2 && background)) return [3 /*break*/, 8];
                                 url_1 = getBackgroundImage(template, variables);
-                                if (!(url_1 instanceof Array)) return [3 /*break*/, 6];
-                                name_1 = template.background.name;
-                                _e.label = 1;
+                                isVideo = background.type === BackgroundType$1.video;
+                                loadFn = background && isVideo ? loadVideo : loadImage;
+                                _b.label = 1;
                             case 1:
-                                _e.trys.push([1, 3, , 5]);
-                                _b = {};
-                                return [4 /*yield*/, loadImage(url_1[0])];
+                                _b.trys.push([1, 6, , 7]);
+                                return [4 /*yield*/, loadMedia(url_1, loadFn)];
                             case 2:
-                                result = (_b.image = _e.sent(),
-                                    _b.url = url_1[0],
-                                    _b);
-                                return [3 /*break*/, 5];
+                                resultImage = _b.sent();
+                                if (!(resultImage instanceof HTMLVideoElement)) return [3 /*break*/, 3];
+                                return [2 /*return*/, resultImage];
                             case 3:
-                                _e.sent();
-                                _c = {};
-                                return [4 /*yield*/, loadImage(url_1[1])];
-                            case 4:
-                                result = (_c.image = _e.sent(),
-                                    _c.url = url_1[1],
-                                    _c);
-                                return [3 /*break*/, 5];
-                            case 5:
-                                if (variables) {
-                                    variables[name_1] = result.url;
+                                // 如果是加载图片且是数组，设置变量，视频情况下不需要
+                                if (background && !Array.isArray(url_1) && variables) {
+                                    variables[background.name] = url_1;
                                 }
-                                return [3 /*break*/, 8];
+                                return [4 /*yield*/, combineImageTemplate(resultImage, template, variables, this.options, img.oriY === -1)];
+                            case 4: return [2 /*return*/, _b.sent()];
+                            case 5: return [3 /*break*/, 7];
                             case 6:
-                                if (!(typeof url_1 === 'string')) return [3 /*break*/, 8];
-                                _d = {};
-                                return [4 /*yield*/, loadImage(url_1)];
-                            case 7:
-                                result = (_d.image = _e.sent(),
-                                    _d.url = url_1,
-                                    _d);
-                                _e.label = 8;
-                            case 8: return [3 /*break*/, 11];
-                            case 9: return [4 /*yield*/, loadWebPOptional(imageURL, webpURL)];
-                            case 10:
-                                // 测试场景：'年兽大爆炸——8个彩蛋t1'
-                                result = _e.sent();
-                                _e.label = 11;
+                                _b.sent();
+                                throw new Error("Failed to load. Check the template or if the URL is ".concat(isVideo ? 'video' : 'image', " type, URL: ").concat(url_1, "."));
+                            case 7: return [3 /*break*/, 12];
+                            case 8:
+                                _b.trys.push([8, 11, , 12]);
+                                return [4 /*yield*/, loadWebPOptional(imageURL, webpURL)];
+                            case 9:
+                                resultImage = _b.sent();
+                                return [4 /*yield*/, combineImageTemplate(resultImage.image, template, variables, this.options, img.oriY === -1)];
+                            case 10: return [2 /*return*/, _b.sent()];
                             case 11:
-                                templateImage = void 0;
-                                _e.label = 12;
-                            case 12:
-                                _e.trys.push([12, 14, , 15]);
-                                return [4 /*yield*/, combineImageTemplate(result.image, template, variables, this.options, img.oriY === -1)];
+                                _b.sent();
+                                throw new Error("Failed to load. Check the template, URL: ".concat(imageURL, "."));
+                            case 12: return [3 /*break*/, 14];
                             case 13:
-                                templateImage = _e.sent();
-                                return [3 /*break*/, 15];
-                            case 14:
-                                _e.sent();
-                                throw new Error("image template fail: ".concat(imageURL));
-                            case 15: return [2 /*return*/, templateImage];
-                            case 16:
                                 if ('type' in img && img.type === 'video') {
-                                    loop = img.loop;
                                     // 视频
-                                    return [2 /*return*/, loadVideo(img.url, { loop: loop })];
+                                    // TODO: 2024.03.28 后面考虑下掉非推荐的视频元素使用方式
+                                    console.warn('The video element is deprecated. Use template BackgroundType.video instead.');
+                                    return [2 /*return*/, loadVideo(img.url)];
                                 }
                                 else if ('compressed' in img && useCompressedTexture && compressedTexture) {
                                     compressed = img.compressed;
@@ -23863,13 +23879,12 @@ var AssetManager = /** @class */ (function () {
                                     img instanceof Texture) {
                                     return [2 /*return*/, img];
                                 }
-                                _e.label = 17;
-                            case 17: return [4 /*yield*/, loadWebPOptional(imageURL, webpURL)];
-                            case 18:
-                                _a = _e.sent(), url = _a.url, image = _a.image;
+                                _b.label = 14;
+                            case 14: return [4 /*yield*/, loadWebPOptional(imageURL, webpURL)];
+                            case 15:
+                                _a = _b.sent(), url = _a.url, image = _a.image;
                                 this.assets[idx] = { url: url, type: exports.TextureSourceType.image };
                                 return [2 /*return*/, image];
-                            case 19: return [2 /*return*/, undefined];
                         }
                     });
                 }); });
@@ -25601,6 +25616,7 @@ exports.itemVert = itemVert;
 exports.loadBinary = loadBinary;
 exports.loadBlob = loadBlob;
 exports.loadImage = loadImage;
+exports.loadMedia = loadMedia;
 exports.loadVideo = loadVideo;
 exports.loadWebPOptional = loadWebPOptional;
 exports.logger = logger;