@galacean/effects-specification 2.0.0-alpha.6 → 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.6
+ * 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 以下数据的适配）
  */
@@ -1607,14 +1565,28 @@ function version30Migration(json) {
         if (composition.endBehavior === END_BEHAVIOR_PAUSE_AND_DESTROY || composition.endBehavior === END_BEHAVIOR_PAUSE) {
             composition.endBehavior = END_BEHAVIOR_FREEZE;
         }
+        // 过滤掉滤镜元素
+        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 _r = (e_3 = void 0, __values(composition.items)), _s = _r.next(); !_s.done; _s = _r.next()) {
                 var item = _s.value;
-                itemGuidMap[item.id] = generateGUID();
+                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_3_1) { e_3 = { error: e_3_1 }; }
@@ -1629,10 +1601,10 @@ function version30Migration(json) {
                 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
@@ -1969,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;