@galacean/effects-specification 2.0.0-alpha.5 → 2.0.0-alpha.7

package/dist/fallback/index.d.ts

@@ -1,4 +1,4 @@
-import type { BaseItem, Composition, CompressedImage, Image, JSONScene, ParticleItem, RenderLevel, SpriteItem, TemplateImage, FilterItem } from '../src';
+import type { BaseItem, Composition, CompressedImage, Image, JSONScene, ParticleItem, RenderLevel, SpriteItem, TemplateImage } from '../src';
 export * from './utils';
 export declare function getStandardJSON(json: any): JSONScene;
 export declare function getStandardImage(image: any, index: number, imageTags: RenderLevel[]): TemplateImage | Image | CompressedImage;
@@ -9,4 +9,4 @@ export declare function getStandardComposition(composition: any, opt?: {
 export declare function getStandardItem(item: any, opt?: {
     plugins?: string[];
     requires?: string[];
-}): SpriteItem | ParticleItem | BaseItem | FilterItem;
+}): SpriteItem | ParticleItem | BaseItem;

package/dist/fallback.js

@@ -2,7 +2,7 @@
  * Name: @galacean/effects-specification
  * Description: Galacean Effects JSON Specification
  * Author: Ant Group CO., Ltd.
- * Version: v2.0.0-alpha.5
+ * Version: v2.0.0-alpha.7
  */
 
 'use strict';
@@ -378,10 +378,6 @@ var ItemType;
      * 预合成元素
      */
     ItemType["composition"] = "7";
-    /**
-     * 滤镜图层
-     */
-    ItemType["filter"] = "8";
     /**
      * Spine 元素
      */
@@ -530,7 +526,7 @@ var CompositionEndBehavior;
 
 /**
  * 动态换图类型
- * @since 1.3.0
+ * @since 1.1.0
  */
 var BackgroundType;
 (function (BackgroundType) {
@@ -1222,14 +1218,6 @@ function getStandardParticleContent(particle) {
         ret.options.startRotationX = ensureNumberExpression(options.startRotationX);
         ret.options.startRotationY = ensureNumberExpression(options.startRotationY);
     }
-    if (particle.filter) {
-        var filter_1 = {};
-        forEach(particle.filter, function (val, key) {
-            // @ts-expect-error
-            filter_1[key] = ensureValueGetter(val);
-        });
-        ret.filter = filter_1;
-    }
     if (transform && transform.path) {
         ret.emitterTransform = {
             path: ensureFixedVec3(transform.path),
@@ -1513,36 +1501,6 @@ function getStandardCameraContent(model) {
     return ret;
 }
 
-var convertParams = [
-    'strength',
-    'bloomAddon',
-    'colorAddon',
-    'period',
-    'waveMovement',
-    'colorThreshold',
-    'xOpacity',
-    'yOpacity',
-    'feather',
-];
-var pathParams = [
-    'path', 'position',
-];
-function getStandardFilterContent(filter) {
-    var ret = {};
-    forEach(filter, function (val, key) {
-        if (convertParams.includes(key)) {
-            ret[key] = ensureFixedNumber(val);
-        }
-        else if (pathParams.includes(key)) {
-            ret[key] = ensureFixedVec3(val);
-        }
-        else {
-            ret[key] = val;
-        }
-    });
-    return ret;
-}
-
 /**
  * 2.1 以下版本数据适配（mars-player@2.4.0 及以上版本支持 2.1 以下数据的适配）
  */
@@ -1581,21 +1539,18 @@ function version22Migration(json) {
  * 3.0 以下版本数据适配（runtime 2.0及以上版本支持）
  */
 function version30Migration(json) {
-    var e_1, _a;
-    var _b, _c, _d, _e, _f, _g, _h, _j;
+    var e_1, _a, e_2, _b;
+    var _c, _d, _e, _f, _g, _h, _j, _k;
     var result = __assign(__assign({}, json), { items: [], components: [], materials: [], shaders: [], geometries: [] });
     // 兼容老版本数据中不存在textures的情况
-    (_b = result.textures) !== null && _b !== void 0 ? _b : (result.textures = []);
+    (_c = result.textures) !== null && _c !== void 0 ? _c : (result.textures = []);
     result.textures.forEach(function (textureOptions) {
-        //@ts-expect-error
         textureOptions.id = generateGUID();
-        //@ts-expect-error
         textureOptions.dataType = DataType.Texture;
     });
     if (result.textures.length < result.images.length) {
         for (var i = result.textures.length; i < result.images.length; i++) {
             result.textures.push({
-                //@ts-expect-error
                 id: generateGUID(),
                 dataType: DataType.Texture,
                 source: i,
@@ -1603,39 +1558,53 @@ function version30Migration(json) {
             });
         }
     }
+    var itemGuidMap = {};
     var _loop_1 = function (composition) {
-        var e_2, _m, e_3, _o;
+        var e_3, _q;
         // composition 的 endbehaviour 兼容
         if (composition.endBehavior === END_BEHAVIOR_PAUSE_AND_DESTROY || composition.endBehavior === END_BEHAVIOR_PAUSE) {
             composition.endBehavior = END_BEHAVIOR_FREEZE;
         }
-        var itemGuidMap = {};
+        // 过滤掉滤镜元素
+        composition.items = composition.items.filter(function (item) { return item.type !== '8'; });
+        // 过滤掉粒子滤镜（扭曲）
+        composition.items.forEach(function (item) {
+            if (item.type === ItemType.particle) {
+                // @ts-expect-error
+                var filterData = item.content['filter'];
+                if (filterData) {
+                    // @ts-expect-error
+                    delete item.content['filter'];
+                }
+            }
+        });
+        var itemGuidMap_1 = {};
         try {
-            for (var _p = (e_2 = void 0, __values(composition.items)), _q = _p.next(); !_q.done; _q = _p.next()) {
-                var item = _q.value;
-                itemGuidMap[item.id] = generateGUID();
+            for (var _r = (e_3 = void 0, __values(composition.items)), _s = _r.next(); !_s.done; _s = _r.next()) {
+                var item = _s.value;
+                itemGuidMap_1[item.id] = generateGUID();
                 // TODO: 编辑器测试用，上线后删除
                 //@ts-expect-error
                 item.oldId = item.id;
-                item.id = itemGuidMap[item.id];
+                item.id = itemGuidMap_1[item.id];
             }
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
-                if (_q && !_q.done && (_m = _p.return)) _m.call(_p);
+                if (_s && !_s.done && (_q = _r.return)) _q.call(_r);
             }
-            finally { if (e_2) throw e_2.error; }
+            finally { if (e_3) throw e_3.error; }
         }
         composition.items.forEach(function (item, index) {
             if (item.parentId) {
                 if (item.parentId.includes('^')) {
                     var parentId = (item.parentId).split('^')[0];
                     var nodeId = (item.parentId).split('^')[1];
-                    item.parentId = itemGuidMap[parentId] + '^' + nodeId;
+                    item.parentId = itemGuidMap_1[parentId] + '^' + nodeId;
                 }
                 else {
-                    item.parentId = itemGuidMap[item.parentId];
+                    item.parentId = itemGuidMap_1[item.parentId];
                 }
             }
             // @ts-expect-error fix item type
@@ -1643,179 +1612,177 @@ function version30Migration(json) {
             // @ts-expect-error fix item type
             composition.items[index] = { id: item.id };
         });
+    };
+    try {
+        // 更正Composition.endBehavior
+        for (var _l = __values(json.compositions), _m = _l.next(); !_m.done; _m = _l.next()) {
+            var composition = _m.value;
+            _loop_1(composition);
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
         try {
-            for (var _r = (e_3 = void 0, __values(result.items)), _s = _r.next(); !_s.done; _s = _r.next()) {
-                var item = _s.value;
-                // 原 texture 索引转为统一 guid 索引
-                if (item.content) {
-                    if (item.content.renderer) {
-                        if (item.content.renderer.texture !== undefined) {
-                            var oldTextureId = item.content.renderer.texture;
-                            //@ts-expect-error
-                            item.content.renderer.texture = { id: result.textures[oldTextureId].id };
-                        }
-                    }
-                    if (item.content.trails) {
-                        if (item.content.trails.texture !== undefined) {
-                            var oldTextureId = item.content.trails.texture;
-                            //@ts-expect-error
-                            item.content.trails.texture = { id: result.textures[oldTextureId].id };
-                        }
+            if (_m && !_m.done && (_a = _l.return)) _a.call(_l);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    try {
+        for (var _o = __values(result.items), _p = _o.next(); !_p.done; _p = _o.next()) {
+            var item = _p.value;
+            // 原 texture 索引转为统一 guid 索引
+            if (item.content) {
+                if (item.content.renderer) {
+                    if (item.content.renderer.texture !== undefined) {
+                        var oldTextureId = item.content.renderer.texture;
+                        item.content.renderer.texture = { id: result.textures[oldTextureId].id };
                     }
                 }
-                // item 的 transform 属性由数组转为 {x:n, y:n, z:n}
-                if (item.transform) {
-                    //@ts-expect-error
-                    var position = __spreadArray([], __read((_c = item.transform.position) !== null && _c !== void 0 ? _c : [0, 0, 0]), false);
-                    //@ts-expect-error
-                    var rotation = __spreadArray([], __read((_d = item.transform.rotation) !== null && _d !== void 0 ? _d : [0, 0, 0]), false);
-                    //@ts-expect-error
-                    var scale = __spreadArray([], __read((_e = item.transform.scale) !== null && _e !== void 0 ? _e : [1, 1, 1]), false);
-                    Object.assign(item, {
-                        transform: {
-                            position: { x: position[0], y: position[1], z: position[2] },
-                            eulerHint: { x: rotation[0], y: rotation[1], z: rotation[2] },
-                            scale: { x: scale[0], y: scale[1], z: scale[0] },
-                        },
-                    });
-                    // sprite 的 scale 转为 size
-                    if (item.type === ItemType.sprite) {
-                        item.transform.size = { x: scale[0], y: scale[1] };
-                        item.transform.scale = { x: 1, y: 1, z: 1 };
-                    }
-                    // sprite 的 anchor 修正
-                    if (item.type === ItemType.sprite) {
-                        var content = item.content;
-                        if (!content.renderer) {
-                            content.renderer = {};
-                        }
-                        var renderer = content.renderer;
-                        var realAnchor = convertAnchor(renderer.anchor, renderer.particleOrigin);
-                        var startSize = item.transform.size;
-                        // 兼容旧JSON（anchor和particleOrigin可能同时存在）
-                        if (!renderer.anchor && renderer.particleOrigin !== undefined) {
-                            item.transform.position.x += -realAnchor[0] * ((_f = startSize === null || startSize === void 0 ? void 0 : startSize.x) !== null && _f !== void 0 ? _f : 1);
-                            item.transform.position.y += -realAnchor[1] * ((_g = startSize === null || startSize === void 0 ? void 0 : startSize.y) !== null && _g !== void 0 ? _g : 1);
-                        }
-                        item.transform.anchor = { x: realAnchor[0] * ((_h = startSize === null || startSize === void 0 ? void 0 : startSize.x) !== null && _h !== void 0 ? _h : 1), y: realAnchor[1] * ((_j = startSize === null || startSize === void 0 ? void 0 : startSize.y) !== null && _j !== void 0 ? _j : 1) };
+                if (item.content.trails) {
+                    if (item.content.trails.texture !== undefined) {
+                        var oldTextureId = item.content.trails.texture;
+                        item.content.trails.texture = { id: result.textures[oldTextureId].id };
                     }
                 }
-                if (item.type === ItemType.particle) {
+            }
+            // item 的 transform 属性由数组转为 {x:n, y:n, z:n}
+            if (item.transform) {
+                //@ts-expect-error
+                var position = __spreadArray([], __read((_d = item.transform.position) !== null && _d !== void 0 ? _d : [0, 0, 0]), false);
+                //@ts-expect-error
+                var rotation = __spreadArray([], __read((_e = item.transform.rotation) !== null && _e !== void 0 ? _e : [0, 0, 0]), false);
+                //@ts-expect-error
+                var scale = __spreadArray([], __read((_f = item.transform.scale) !== null && _f !== void 0 ? _f : [1, 1, 1]), false);
+                Object.assign(item, {
+                    transform: {
+                        position: { x: position[0], y: position[1], z: position[2] },
+                        eulerHint: { x: rotation[0], y: rotation[1], z: rotation[2] },
+                        scale: { x: scale[0], y: scale[1], z: scale[0] },
+                    },
+                });
+                // sprite 的 scale 转为 size
+                if (item.type === ItemType.sprite) {
+                    item.transform.size = { x: scale[0], y: scale[1] };
+                    item.transform.scale = { x: 1, y: 1, z: 1 };
+                }
+                // sprite 的 anchor 修正
+                if (item.type === ItemType.sprite) {
                     var content = item.content;
                     if (!content.renderer) {
                         content.renderer = {};
                     }
                     var renderer = content.renderer;
-                    content.renderer.anchor = convertAnchor(renderer.anchor, renderer.particleOrigin);
+                    var realAnchor = convertAnchor(renderer.anchor, renderer.particleOrigin);
+                    var startSize = item.transform.size;
+                    // 兼容旧JSON（anchor和particleOrigin可能同时存在）
+                    if (!renderer.anchor && renderer.particleOrigin !== undefined) {
+                        item.transform.position.x += -realAnchor[0] * ((_g = startSize === null || startSize === void 0 ? void 0 : startSize.x) !== null && _g !== void 0 ? _g : 1);
+                        item.transform.position.y += -realAnchor[1] * ((_h = startSize === null || startSize === void 0 ? void 0 : startSize.y) !== null && _h !== void 0 ? _h : 1);
+                    }
+                    item.transform.anchor = { x: realAnchor[0] * ((_j = startSize === null || startSize === void 0 ? void 0 : startSize.x) !== null && _j !== void 0 ? _j : 1), y: realAnchor[1] * ((_k = startSize === null || startSize === void 0 ? void 0 : startSize.y) !== null && _k !== void 0 ? _k : 1) };
                 }
-                // 动画数据转化 TODO: 动画数据移到 TimelineComponentData
-                item.content.tracks = [];
-                var tracks = item.content.tracks;
-                if (item.type !== ItemType.particle) {
-                    tracks.push({
-                        clips: [
-                            {
-                                dataType: 'TransformAnimationPlayableAsset',
-                                animationClip: {
-                                    sizeOverLifetime: item.content.sizeOverLifetime,
-                                    rotationOverLifetime: item.content.rotationOverLifetime,
-                                    positionOverLifetime: item.content.positionOverLifetime,
-                                },
-                            },
-                        ],
-                    });
+            }
+            if (item.type === ItemType.particle) {
+                var content = item.content;
+                if (!content.renderer) {
+                    content.renderer = {};
                 }
-                if (item.type === ItemType.sprite) {
-                    tracks.push({
-                        clips: [
-                            {
-                                dataType: 'SpriteColorAnimationPlayableAsset',
-                                animationClip: {
-                                    colorOverLifetime: item.content.colorOverLifetime,
-                                    startColor: item.content.options.startColor,
-                                },
+                var renderer = content.renderer;
+                content.renderer.anchor = convertAnchor(renderer.anchor, renderer.particleOrigin);
+            }
+            // 动画数据转化 TODO: 动画数据移到 TimelineComponentData
+            item.content.tracks = [];
+            var tracks = item.content.tracks;
+            if (item.type !== ItemType.particle) {
+                tracks.push({
+                    clips: [
+                        {
+                            dataType: 'TransformAnimationPlayableAsset',
+                            animationClip: {
+                                sizeOverLifetime: item.content.sizeOverLifetime,
+                                rotationOverLifetime: item.content.rotationOverLifetime,
+                                positionOverLifetime: item.content.positionOverLifetime,
                             },
-                        ],
-                    });
-                }
-                // gizmo 的 target id 转换为新的 item guid
-                if (item.content.options.target) {
-                    item.content.options.target = itemGuidMap[item.content.options.target];
-                }
-                // item 的 content 转为 component data 加入 JSONScene.components
-                var uuid = generateGUID();
-                if (item.type === ItemType.sprite ||
-                    item.type === ItemType.particle ||
-                    item.type === ItemType.mesh ||
-                    item.type === ItemType.skybox ||
-                    item.type === ItemType.light ||
-                    item.type === 'camera' ||
-                    item.type === ItemType.tree ||
-                    item.type === ItemType.interact ||
-                    item.type === ItemType.camera ||
-                    item.type === ItemType.text) {
-                    item.components = [];
-                    result.components.push(item.content);
-                    item.content.id = uuid;
-                    item.content.item = { id: item.id };
-                    item.dataType = DataType.VFXItemData;
-                    item.components.push({ id: item.content.id });
-                }
-                switch (item.type) {
-                    case ItemType.sprite:
-                        item.content.dataType = DataType.SpriteComponent;
-                        break;
-                    case ItemType.particle:
-                        item.content.dataType = DataType.ParticleSystem;
-                        break;
-                    case ItemType.mesh:
-                        item.content.dataType = DataType.MeshComponent;
-                        break;
-                    case ItemType.skybox:
-                        item.content.dataType = DataType.SkyboxComponent;
-                        break;
-                    case ItemType.light:
-                        item.content.dataType = DataType.LightComponent;
-                        break;
-                    case 'camera':
-                        item.content.dataType = DataType.CameraComponent;
-                        break;
-                    case ItemType.tree:
-                        item.content.dataType = DataType.TreeComponent;
-                        break;
-                    case ItemType.interact:
-                        item.content.dataType = DataType.InteractComponent;
-                        break;
-                    case ItemType.camera:
-                        item.content.dataType = DataType.CameraController;
-                        break;
-                    case ItemType.text:
-                        item.content.dataType = DataType.TextComponent;
-                        break;
-                }
+                        },
+                    ],
+                });
             }
-        }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
-        finally {
-            try {
-                if (_s && !_s.done && (_o = _r.return)) _o.call(_r);
+            if (item.type === ItemType.sprite) {
+                tracks.push({
+                    clips: [
+                        {
+                            dataType: 'SpriteColorAnimationPlayableAsset',
+                            animationClip: {
+                                colorOverLifetime: item.content.colorOverLifetime,
+                                startColor: item.content.options.startColor,
+                            },
+                        },
+                    ],
+                });
+            }
+            // gizmo 的 target id 转换为新的 item guid
+            if (item.content.options.target) {
+                item.content.options.target = itemGuidMap[item.content.options.target];
+            }
+            // item 的 content 转为 component data 加入 JSONScene.components
+            var uuid = generateGUID();
+            if (item.type === ItemType.sprite ||
+                item.type === ItemType.particle ||
+                item.type === ItemType.mesh ||
+                item.type === ItemType.skybox ||
+                item.type === ItemType.light ||
+                item.type === 'camera' ||
+                item.type === ItemType.tree ||
+                item.type === ItemType.interact ||
+                item.type === ItemType.camera ||
+                item.type === ItemType.text) {
+                item.components = [];
+                result.components.push(item.content);
+                item.content.id = uuid;
+                item.content.item = { id: item.id };
+                item.dataType = DataType.VFXItemData;
+                item.components.push({ id: item.content.id });
+            }
+            switch (item.type) {
+                case ItemType.sprite:
+                    item.content.dataType = DataType.SpriteComponent;
+                    break;
+                case ItemType.particle:
+                    item.content.dataType = DataType.ParticleSystem;
+                    break;
+                case ItemType.mesh:
+                    item.content.dataType = DataType.MeshComponent;
+                    break;
+                case ItemType.skybox:
+                    item.content.dataType = DataType.SkyboxComponent;
+                    break;
+                case ItemType.light:
+                    item.content.dataType = DataType.LightComponent;
+                    break;
+                case 'camera':
+                    item.content.dataType = DataType.CameraComponent;
+                    break;
+                case ItemType.tree:
+                    item.content.dataType = DataType.TreeComponent;
+                    break;
+                case ItemType.interact:
+                    item.content.dataType = DataType.InteractComponent;
+                    break;
+                case ItemType.camera:
+                    item.content.dataType = DataType.CameraController;
+                    break;
+                case ItemType.text:
+                    item.content.dataType = DataType.TextComponent;
+                    break;
             }
-            finally { if (e_3) throw e_3.error; }
-        }
-    };
-    try {
-        // 更正Composition.endBehavior
-        for (var _k = __values(json.compositions), _l = _k.next(); !_l.done; _l = _k.next()) {
-            var composition = _l.value;
-            _loop_1(composition);
         }
     }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    catch (e_2_1) { e_2 = { error: e_2_1 }; }
     finally {
         try {
-            if (_l && !_l.done && (_a = _k.return)) _a.call(_k);
+            if (_p && !_p.done && (_b = _o.return)) _b.call(_o);
         }
-        finally { if (e_1) throw e_1.error; }
+        finally { if (e_2) throw e_2.error; }
     }
     result.version = '3.0';
     return result;
@@ -1974,14 +1941,6 @@ function getStandardItem(item, opt) {
             duration = item.duration;
         }
         transform = item.transform || getTransform(originContent.transform);
-        if (type === ItemType.filter) {
-            if (currentVersion < '1.1') {
-                currentVersion = '1.1';
-            }
-            content = getStandardSpriteContent(originContent, transform);
-            // @ts-expect-error
-            content.filter = getStandardFilterContent(originContent.filter);
-        }
     }
     else if (item.particle) {
         type = ItemType.particle;