@galacean/effects-core 2.0.0-alpha.15 → 2.0.0-alpha.16

package/dist/composition-source-manager.d.ts

@@ -3,7 +3,7 @@ import type { SceneBindingData } from './comp-vfx-item';
 import type { Engine } from './engine';
 import type { PluginSystem } from './plugin-system';
 import type { GlobalVolume } from './render';
-import type { Scene } from './scene';
+import type { Scene, SceneRenderLevel } from './scene';
 import type { Texture } from './texture';
 import type { Disposable } from './utils';
 import type { VFXItemProps } from './vfx-item';
@@ -27,7 +27,7 @@ export declare class CompositionSourceManager implements Disposable {
     refCompositions: Map<string, spec.CompositionData>;
     sourceContent?: ContentOptions;
     refCompositionProps: Map<string, VFXItemProps>;
-    renderLevel?: spec.RenderLevel;
+    renderLevel?: SceneRenderLevel;
     pluginSystem?: PluginSystem;
     totalTime: number;
     imgUsage: Record<string, number[]>;

package/dist/composition.d.ts

@@ -120,10 +120,6 @@ export declare class Composition implements Disposable, LostHandler {
      * 用于保存与当前合成相关的插件数据
      */
     readonly loaderData: Record<string, any>;
-    /**
-     * 渲染等级：S，A+，A，B+，B
-     */
-    readonly renderLevel?: spec.RenderLevel;
     /**
      * 场景加载和首帧渲染时间
      */

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.0.0-alpha.15
+ * Version: v2.0.0-alpha.16
  */
 
 'use strict';
@@ -12778,13 +12778,16 @@ const tempColor = [
 let seed$3 = 0;
 class SpriteColorPlayable extends Playable {
     processFrame(context) {
-        const boundItem = context.output.getUserData();
+        const boundObject = context.output.getUserData();
+        if (!(boundObject instanceof VFXItem)) {
+            return;
+        }
         if (!this.spriteMaterial) {
-            this.spriteMaterial = boundItem.getComponent(SpriteComponent).material;
+            this.spriteMaterial = boundObject.getComponent(SpriteComponent).material;
         }
         let colorInc = vecFill(tempColor, 1);
         let colorChanged;
-        const life = this.time / boundItem.duration;
+        const life = this.time / boundObject.duration;
         const opacityOverLifetime = this.opacityOverLifetime;
         const colorOverLifetime = this.colorOverLifetime;
         if (colorOverLifetime) {
@@ -12883,7 +12886,6 @@ class SpriteComponent extends RendererComponent {
         renderer.drawGeometry(geo, material);
     }
     start() {
-        this.priority = this.item.listIndex;
         this.item.getHitTestParams = this.getHitTestParams;
     }
     update(dt) {
@@ -15252,7 +15254,7 @@ function getTrailMeshShader(trails, particleMaxCount, name, env = '', gpuCapabil
  * @internal
  */ class ParticleSystemRenderer extends RendererComponent {
     start() {
-        this._priority = this.item.listIndex;
+        this._priority = this.item.renderOrder;
         this.particleMesh.gravityModifier.scaleXCoord(this.item.duration);
         for (const mesh of this.meshes){
             mesh.start();
@@ -16282,13 +16284,13 @@ function randomArrItem(arr, keepArr) {
  * @internal
  */ class ParticleBehaviourPlayable extends Playable {
     start(context) {
-        const binding = context.output.getUserData();
-        if (this.particleSystem) {
+        const boundObject = context.output.getUserData();
+        if (this.particleSystem || !(boundObject instanceof VFXItem)) {
             return;
         }
-        this.particleSystem = binding.getComponent(ParticleSystem);
+        this.particleSystem = boundObject.getComponent(ParticleSystem);
         if (this.particleSystem) {
-            this.particleSystem.name = binding.name;
+            this.particleSystem.name = boundObject.name;
             this.particleSystem.start();
             this.particleSystem.initEmitterTransform();
         }
@@ -17408,10 +17410,13 @@ const tempPos = new Vector3();
     }
     processFrame(context) {
         if (!this.binding) {
-            this.binding = context.output.getUserData();
-            this.start();
+            const boundObject = context.output.getUserData();
+            if (boundObject instanceof VFXItem) {
+                this.binding = boundObject;
+                this.start();
+            }
         }
-        if (this.binding.composition) {
+        if (this.binding && this.binding.composition) {
             this.sampleAnimation();
         }
     }
@@ -17579,9 +17584,12 @@ AnimationClip = __decorate([
 ], AnimationClip);
 class AnimationClipPlayable extends Playable {
     processFrame(context) {
-        const boundItem = context.output.getUserData();
-        if (boundItem.composition) {
-            this.clip.sampleAnimation(boundItem, this.time);
+        const boundObject = context.output.getUserData();
+        if (!(boundObject instanceof VFXItem)) {
+            return;
+        }
+        if (boundObject.composition) {
+            this.clip.sampleAnimation(boundObject, this.time);
         }
     }
 }
@@ -17791,13 +17799,11 @@ TransformTrack = __decorate([
 
 class ActivationMixerPlayable extends Playable {
     processFrame(context) {
-        if (!this.bindingItem) {
-            this.bindingItem = context.output.getUserData();
-        }
-        if (!this.bindingItem) {
+        const boundObject = context.output.getUserData();
+        if (!(boundObject instanceof VFXItem)) {
             return;
         }
-        const bindingItem = this.bindingItem;
+        const boundItem = boundObject;
         let hasInput = false;
         for(let i = 0; i < this.getInputCount(); i++){
             if (this.getInputWeight(i) > 0) {
@@ -17806,11 +17812,11 @@ class ActivationMixerPlayable extends Playable {
             }
         }
         if (hasInput) {
-            bindingItem.transform.setValid(true);
-            this.showRendererComponents(bindingItem);
+            boundItem.transform.setValid(true);
+            this.showRendererComponents(boundItem);
         } else {
-            bindingItem.transform.setValid(false);
-            this.hideRendererComponents(bindingItem);
+            boundItem.transform.setValid(false);
+            this.hideRendererComponents(boundItem);
         }
     }
     hideRendererComponents(item) {
@@ -18177,7 +18183,9 @@ SubCompositionTrack = __decorate([
 class SubCompositionClipPlayable extends Playable {
     processFrame(context) {
         const boundObject = context.output.getUserData();
-        boundObject.time = this.getTime();
+        if (boundObject instanceof CompositionComponent) {
+            boundObject.time = this.getTime();
+        }
     }
 }
 
@@ -18902,6 +18910,19 @@ class VFXItem extends EffectsObject {
         return (_this_composition_reusable = (_this_composition = this.composition) == null ? void 0 : _this_composition.reusable) != null ? _this_composition_reusable : false;
     }
     /**
+   * 元素在合成中的索引
+   */ get renderOrder() {
+        return this.listIndex;
+    }
+    set renderOrder(value) {
+        if (this.listIndex !== value) {
+            this.listIndex = value;
+            for (const rendererComponent of this.rendererComponents){
+                rendererComponent.priority = value;
+            }
+        }
+    }
+    /**
    * 设置元素的动画速度
    * @param speed - 速度
    */ setSpeed(speed) {
@@ -19158,7 +19179,7 @@ class VFXItem extends EffectsObject {
         this.parentId = parentId;
         this.duration = duration;
         this.endBehavior = endBehavior;
-        this.listIndex = listIndex;
+        this.renderOrder = listIndex;
         //@ts-expect-error
         this.oldId = data.oldId;
         if (!data.content) {
@@ -19634,9 +19655,8 @@ class SerializationHelper {
             console.error('序列化数据的内嵌对象层数大于上限');
             return;
         }
-        if (typeof property === 'number' || typeof property === 'string' || typeof property === 'boolean') {
-            return property;
-        } else if (property instanceof Array) {
+        // 加载并链接 DataPath 字段表示的 EffectsObject 引用。Class 对象 copy [key, value] 会丢失对象信息，因此只递归数组对象和普通 js Object 结构对象。
+        if (property instanceof Array) {
             const res = [];
             for (const value of property){
                 res.push(SerializationHelper.deserializeProperty(value, engine, level + 1, type));
@@ -19645,9 +19665,7 @@ class SerializationHelper {
         // TODO json 数据避免传 typedArray
         } else if (SerializationHelper.checkDataPath(property)) {
             return engine.assetLoader.loadGUID(property.id);
-        } else if (property instanceof EffectsObject || SerializationHelper.checkImageSource(property) || SerializationHelper.checkTypedArray(property) || SerializationHelper.checkGLTFNode(property)) {
-            return property;
-        } else if (property instanceof Object) {
+        } else if (property instanceof Object && property.constructor === Object) {
             let res;
             if (type) {
                 const classConstructor = effectsClassStore[type];
@@ -19660,6 +19678,8 @@ class SerializationHelper {
                 res[key] = SerializationHelper.deserializeProperty(property[key], engine, level + 1);
             }
             return res;
+        } else {
+            return property;
         }
     }
     static deserializePropertyAsync(property, engine, level, type) {
@@ -19668,9 +19688,7 @@ class SerializationHelper {
                 console.error('序列化数据的内嵌对象层数大于上限');
                 return;
             }
-            if (typeof property === 'number' || typeof property === 'string' || typeof property === 'boolean') {
-                return property;
-            } else if (property instanceof Array) {
+            if (property instanceof Array) {
                 const res = [];
                 for (const value of property){
                     res.push((yield SerializationHelper.deserializePropertyAsync(value, engine, level + 1, type)));
@@ -19680,9 +19698,7 @@ class SerializationHelper {
             } else if (SerializationHelper.checkDataPath(property)) {
                 const res = yield engine.assetLoader.loadGUIDAsync(property.id);
                 return res;
-            } else if (property instanceof EffectsObject || SerializationHelper.checkImageSource(property) || SerializationHelper.checkTypedArray(property) || SerializationHelper.checkGLTFNode(property)) {
-                return property;
-            } else if (property instanceof Object) {
+            } else if (property instanceof Object && property.constructor === Object) {
                 let res;
                 if (type) {
                     const classConstructor = effectsClassStore[type];
@@ -19695,6 +19711,8 @@ class SerializationHelper {
                     res[key] = SerializationHelper.deserializeProperty(property[key], engine, level + 1);
                 }
                 return res;
+            } else {
+                return property;
             }
         })();
     }
@@ -21513,7 +21531,17 @@ function getStandardItem(item, opt = {}) {
     }
 }
 
-const renderLevelPassSet = {
+/**
+ * 机型和渲染等级对应表
+ *
+ * 机型：B-低端机、A-中端机、S-高端机
+ * 渲染等级：B-低、A-中、S-高、A+-中高、B+-全部
+ *
+ * - S（高端机）：高、全部、中高
+ * - A（中端机）：中、全部、中高
+ * - B（低端机）：低、全部
+ * - undefined（全部机型）
+ */ const renderLevelPassSet = {
     [RenderLevel.S]: [
         RenderLevel.S,
         RenderLevel.BPlus,
@@ -23187,7 +23215,7 @@ let listOrder = 0;
             scene.textures = undefined;
             scene.consumed = true;
         }
-        const { sourceContent, pluginSystem, imgUsage, totalTime, renderLevel, refCompositionProps } = this.compositionSourceManager;
+        const { sourceContent, pluginSystem, imgUsage, totalTime, refCompositionProps } = this.compositionSourceManager;
         assertExist(sourceContent);
         this.renderer = renderer;
         this.refCompositionProps = refCompositionProps;
@@ -23213,7 +23241,6 @@ let listOrder = 0;
         };
         this.reusable = reusable;
         this.speed = speed;
-        this.renderLevel = renderLevel;
         this.autoRefTex = !this.keepResource && imageUsage && this.rootItem.endBehavior !== ItemEndBehavior.loop;
         this.name = sourceContent.name;
         this.pluginSystem = pluginSystem;