@galacean/effects-core 2.0.0-alpha.28 → 2.0.0-alpha.29

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.28
+ * Version: v2.0.0-alpha.29
  */
 
 'use strict';
@@ -4602,9 +4602,6 @@ function getDirectStore(target) {
     };
     return EffectsObject;
 }();
-__decorate([
-    serialize()
-], EffectsObject.prototype, "guid", void 0);
 
 /**
  * @since 2.0.0
@@ -4882,8 +4879,8 @@ exports.CameraController = /*#__PURE__*/ function(ItemBehaviour) {
             camera.far = this.options.far;
             camera.fov = this.options.fov;
             camera.clipMode = this.options.clipMode;
-            camera.position = this.transform.position;
-            camera.rotation = this.transform.rotation;
+            camera.position = this.transform.getWorldPosition();
+            camera.rotation = this.transform.getWorldRotation();
         }
     };
     _proto.fromData = function fromData(data) {
@@ -7868,6 +7865,7 @@ exports.TextureSourceType = void 0;
     return Downloader;
 }();
 var webPFailed = false;
+var avifFailed = false;
 /**
  * 异步加载一个 WebP 图片文件，如果不支持 WebP，则加载 PNG 图片文件
  * @param png - PNG 图片文件的 URL
@@ -7943,6 +7941,81 @@ function _loadWebPOptional() {
     });
     return _loadWebPOptional.apply(this, arguments);
 }
+/**
+ * 异步加载一个 AVIF 图片文件，如果不支持 AVIF，则加载 PNG 图片文件
+ * @param png - PNG 图片文件的 URL
+ * @param avif - AVIF 图片文件的 URL
+ */ function loadAVIFOptional(png, avif) {
+    return _loadAVIFOptional.apply(this, arguments);
+}
+function _loadAVIFOptional() {
+    _loadAVIFOptional = _async_to_generator(function(png, avif) {
+        var image, image1, image2;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    if (!(avifFailed || !avif)) return [
+                        3,
+                        2
+                    ];
+                    return [
+                        4,
+                        loadImage(png)
+                    ];
+                case 1:
+                    image = _state.sent();
+                    return [
+                        2,
+                        {
+                            image: image,
+                            url: png
+                        }
+                    ];
+                case 2:
+                    _state.trys.push([
+                        2,
+                        4,
+                        ,
+                        6
+                    ]);
+                    return [
+                        4,
+                        loadImage(avif)
+                    ];
+                case 3:
+                    image1 = _state.sent();
+                    return [
+                        2,
+                        {
+                            image: image1,
+                            url: avif
+                        }
+                    ];
+                case 4:
+                    _state.sent();
+                    avifFailed = true;
+                    return [
+                        4,
+                        loadImage(png)
+                    ];
+                case 5:
+                    image2 = _state.sent();
+                    return [
+                        2,
+                        {
+                            image: image2,
+                            url: png
+                        }
+                    ];
+                case 6:
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return _loadAVIFOptional.apply(this, arguments);
+}
 /**
  * 异步加载一个图片文件
  * @param source - 图片文件的 URL、Blob 或 HTMLImageElement 对象
@@ -11584,7 +11657,7 @@ var gaussianDownVFrag = "precision highp float;varying vec2 uv;uniform sampler2D
 
 var gaussianUpFrag = "precision highp float;varying vec2 uv;uniform sampler2D _MainTex;uniform sampler2D _GaussianDownTex;uniform vec2 _GaussianDownTextureSize;float GaussWeight2D(float x,float y,float sigma){float PI=3.14159265358;float E=2.71828182846;float sigma_2=pow(sigma,2.0);float a=-(x*x+y*y)/(2.0*sigma_2);return pow(E,a)/(2.0*PI*sigma_2);}vec3 GaussNxN(sampler2D tex,vec2 uv,vec2 stride,float sigma){vec3 color=vec3(0.,0.,0.);const int r=1;float weight=0.0;for(int i=-r;i<=r;i++){for(int j=-r;j<=r;j++){float w=GaussWeight2D(float(i),float(j),sigma);vec2 coord=uv+vec2(i,j)*stride;color+=texture2D(tex,coord).rgb*w;weight+=w;}}color/=weight;return color;}void main(){vec3 lowResColor=GaussNxN(_MainTex,uv,0.5/_GaussianDownTextureSize,1.0);vec3 highResColor=GaussNxN(_GaussianDownTex,uv,1.0/_GaussianDownTextureSize,1.0);vec3 color=mix(highResColor,lowResColor,0.7);gl_FragColor=vec4(color,1.0);}";
 
-var thresholdFrag = "precision highp float;varying vec2 uv;uniform sampler2D _MainTex;uniform float _Threshold;void main(){vec4 mainColor=texture2D(_MainTex,uv);mainColor.rgb=pow(mainColor.rgb,vec3(2.2));float brightness=max(mainColor.r,max(mainColor.g,mainColor.b));float w=max(0.0,brightness-_Threshold)/max(brightness,0.00001);mainColor.rgb*=w;gl_FragColor=vec4(mainColor.rgb,1.0);}";
+var thresholdFrag = "precision highp float;varying vec2 uv;uniform sampler2D _MainTex;uniform float _Threshold;void main(){vec4 mainTex=texture2D(_MainTex,uv);mainTex.rgb=pow(mainTex.rgb,vec3(2.2));float brightness=max(mainTex.r,max(mainTex.g,mainTex.b));float w=max(0.0,brightness-_Threshold)/max(brightness,0.00001);mainTex.rgb*=w;mainTex.rgb*=mainTex.a;gl_FragColor=vec4(mainTex.rgb,1.0);}";
 
 // Bloom 阈值 Pass
 var BloomThresholdPass = /*#__PURE__*/ function(RenderPass) {
@@ -11882,28 +11955,6 @@ var ToneMappingPass = /*#__PURE__*/ function(RenderPass) {
     return ToneMappingPass;
 }(RenderPass);
 
-/**
- * 后处理配置
- */ var defaultGlobalVolume = {
-    useHDR: false,
-    /***** Material Uniform *****/ // Bloom
-    useBloom: true,
-    threshold: 1.0,
-    bloomIntensity: 1.0,
-    // ColorAdjustments
-    brightness: 1.0,
-    saturation: 1.0,
-    contrast: 1.0,
-    // Vignette
-    // vignetteColor: new math.Color(0, 0, 0, 1),
-    // vignetteCenter: new math.Vector2(0.5, 0.5),
-    vignetteIntensity: 0.2,
-    vignetteSmoothness: 0.4,
-    vignetteRoundness: 1.0,
-    // ToneMapping
-    useToneMapping: true
-};
-
 var RENDER_PASS_NAME_PREFIX = "_effects_default_";
 var seed$5 = 1;
 /**
@@ -11927,7 +11978,7 @@ var seed$5 = 1;
         } : _options_clearAction;
         var engine = renderer.engine;
         if (globalVolume) {
-            this.globalVolume = _extends({}, defaultGlobalVolume, globalVolume);
+            this.globalVolume = globalVolume;
         }
         this.globalUniforms = new GlobalUniforms();
         var attachments = []; //渲染场景物体Pass的RT
@@ -12964,6 +13015,28 @@ var Renderer = /*#__PURE__*/ function() {
     return Renderer;
 }();
 
+/**
+ * 后处理配置
+ */ var defaultGlobalVolume = {
+    useHDR: false,
+    /***** Material Uniform *****/ // Bloom
+    useBloom: true,
+    threshold: 1.0,
+    bloomIntensity: 1.0,
+    // ColorAdjustments
+    brightness: 1.0,
+    saturation: 1.0,
+    contrast: 1.0,
+    // Vignette
+    // vignetteColor: new math.Color(0, 0, 0, 1),
+    // vignetteCenter: new math.Vector2(0.5, 0.5),
+    vignetteIntensity: 0.2,
+    vignetteSmoothness: 0.4,
+    vignetteRoundness: 1.0,
+    // ToneMapping
+    useToneMapping: true
+};
+
 var vertex = "\nprecision highp float;\n\nattribute vec2 aPoint;\nuniform vec4 uPos;\nuniform vec2 uSize;\nuniform vec4 uQuat;\nuniform vec4 uColor;\nuniform mat4 effects_ObjectToWorld;\nuniform mat4 effects_MatrixInvV;\nuniform mat4 effects_MatrixVP;\nvarying vec4 vColor;\n#ifdef ENV_EDITOR\n  uniform vec4 uEditorTransform;\n#endif\n\nvec3 rotateByQuat(vec3 a, vec4 quat){\n  vec3 qvec = quat.xyz;\n  vec3 uv = cross(qvec, a);\n  vec3 uuv = cross(qvec, uv) * 2.;\n  return a +(uv * 2. * quat.w + uuv);\n}\n\nvoid main() {\n  vec4 _pos = uPos;\n  vec3 point = rotateByQuat(vec3(aPoint.xy * uSize, 0.),uQuat);\n  vec4 pos = vec4(_pos.xyz, 1.0);\n  pos = effects_ObjectToWorld * pos;\n  pos.xyz += effects_MatrixInvV[0].xyz * point.x+ effects_MatrixInvV[1].xyz * point.y;\n  gl_Position = effects_MatrixVP * pos;\n  vColor = uColor;\n  #ifdef ENV_EDITOR\n    gl_Position = vec4(gl_Position.xy * uEditorTransform.xy + uEditorTransform.zw * gl_Position.w, gl_Position.zw);\n  #endif\n}\n";
 var fragment = "\nprecision highp float;\n\n#define fragColor gl_FragColor\n\nvarying vec4 vColor;\nvoid main() {\n  gl_FragColor = vColor;\n}\n";
 var seed$4 = 1;
@@ -13110,6 +13183,7 @@ exports.InteractComponent = /*#__PURE__*/ function(RendererComponent) {
     }
     var _proto = InteractComponent.prototype;
     _proto.start = function start() {
+        var _this = this;
         var options = this.item.props.content.options;
         var env = this.item.engine.renderer.env;
         var composition = this.item.composition;
@@ -13131,6 +13205,16 @@ exports.InteractComponent = /*#__PURE__*/ function(RendererComponent) {
             this.materials = this.previewContent.mesh.materials;
         }
         this.item.getHitTestParams = this.getHitTestParams;
+        this.item.onEnd = function() {
+            if (_this.item && _this.item.composition) {
+                var _this_previewContent;
+                _this.item.composition.removeInteractiveItem(_this.item, _this.item.props.content.options.type);
+                _this.clickable = false;
+                _this.hasBeenAddedToComposition = false;
+                (_this_previewContent = _this.previewContent) == null ? void 0 : _this_previewContent.mesh.dispose();
+                _this.endDragTarget();
+            }
+        };
     };
     _proto.update = function update(dt) {
         var _this_previewContent;
@@ -13159,15 +13243,7 @@ exports.InteractComponent = /*#__PURE__*/ function(RendererComponent) {
             this.previewContent.mesh.render(renderer);
         }
     };
-    _proto.onDestroy = function onDestroy() {
-        if (this.item && this.item.composition) {
-            var _this_previewContent;
-            this.item.composition.removeInteractiveItem(this.item, this.item.props.content.options.type);
-            this.clickable = false;
-            (_this_previewContent = this.previewContent) == null ? void 0 : _this_previewContent.mesh.dispose();
-            this.endDragTarget();
-        }
-    };
+    _proto.onDestroy = function onDestroy() {};
     _proto.endDragTarget = function endDragTarget() {
     // OVERRIDE
     };
@@ -13750,6 +13826,10 @@ var SpriteColorPlayable = /*#__PURE__*/ function(Playable) {
         }
         if (!this.spriteMaterial) {
             this.spriteMaterial = boundObject.getComponent(exports.SpriteComponent).material;
+            var startColor = this.spriteMaterial.getVector4("_Color");
+            if (startColor) {
+                this.startColor = startColor.toArray();
+            }
         }
         var colorInc = vecFill(tempColor, 1);
         var colorChanged;
@@ -13779,12 +13859,6 @@ var SpriteColorPlayable = /*#__PURE__*/ function(Playable) {
                 this.colorOverLifetime = colorStopsFromGradient(colorOverLifetime.color[1]);
             }
         }
-        this.startColor = clipData.startColor || [
-            1,
-            1,
-            1,
-            1
-        ];
         return this;
     };
     return SpriteColorPlayable;
@@ -14092,7 +14166,7 @@ exports.SpriteComponent = /*#__PURE__*/ function(RendererComponent) {
         var splits = item.splits, renderer = item.renderer, textureSheetAnimation = item.textureSheetAnimation;
         var sx = 1, sy = 1;
         if (renderer.shape) {
-            var _renderer_shape = renderer.shape, index = _renderer_shape.index, aPoint = _renderer_shape.aPoint;
+            var _renderer_shape = renderer.shape, _renderer_shape_index = _renderer_shape.index, index = _renderer_shape_index === void 0 ? [] : _renderer_shape_index, _renderer_shape_aPoint = _renderer_shape.aPoint, aPoint = _renderer_shape_aPoint === void 0 ? [] : _renderer_shape_aPoint;
             var point = new Float32Array(aPoint);
             var position = [];
             var atlasOffset = [];
@@ -16962,6 +17036,12 @@ exports.ParticleSystem = /*#__PURE__*/ function(Component) {
             area: area
         };
     };
+    _proto.onAttached = function onAttached() {
+        Component.prototype.onAttached.call(this);
+        this.renderer.item = this.item;
+        this.item.components.push(this.renderer);
+        this.item.rendererComponents.push(this.renderer);
+    };
     _proto.fromData = function fromData(data) {
         Component.prototype.fromData.call(this, data);
         var props = data;
@@ -17243,9 +17323,6 @@ exports.ParticleSystem = /*#__PURE__*/ function(Component) {
         }
         this.item.getHitTestParams = this.getHitTestParams;
         this.item._content = this;
-        this.renderer.item = this.item;
-        this.item.components.push(this.renderer);
-        this.item.rendererComponents.push(this.renderer);
     };
     _create_class(ParticleSystem, [
         {
@@ -19275,7 +19352,7 @@ function compareTracks(a, b) {
     _proto.hitTest = function hitTest(ray, x, y, regions, force, options) {
         var _this, _loop = function(i) {
             var item = _this.items[i];
-            if (item.getVisible() && !item.ended && !exports.VFXItem.isComposition(item) && !skip(item)) {
+            if (item.getVisible() && item.transform.getValid() && !item.ended && !exports.VFXItem.isComposition(item) && !skip(item)) {
                 var hitParams = item.getHitTestParams(force);
                 if (hitParams) {
                     var success = false;
@@ -19431,18 +19508,6 @@ var TextLayout = /*#__PURE__*/ function() {
         var tempWidth = fontSize + letterSpace;
         this.autoWidth = autoWidth;
         this.maxTextWidth = text.length * tempWidth;
-        // if (autoWidth) {
-        //   this.width = this.maxTextWidth + this.lineWidth;
-        //   this.height = fontSize + this.lineHeight;
-        // } else {
-        //   if (textWidth) {
-        //     this.maxCharCount = Math.floor((textWidth - this.lineWidth) / (tempWidth));
-        //     this.width = textWidth;
-        //   } else {
-        //     this.width = basicScale[0] * 100;
-        //   }
-        //   this.height = basicScale[1] * 100;
-        // }
         this.width = textWidth;
         this.height = textHeight;
         this.letterSpace = letterSpace;
@@ -19879,6 +19944,17 @@ var TextComponentBase = /*#__PURE__*/ function() {
         this.isDirty = true;
     };
     /**
+   * 设置自适应宽高开关
+   * @param value - 是否自适应宽高开关
+   * @returns
+   */ _proto.setAutoWidth = function setAutoWidth(value) {
+        if (this.textLayout.autoWidth === value) {
+            return;
+        }
+        this.textLayout.autoWidth = value;
+        this.isDirty = true;
+    };
+    /**
    * 更新文本
    * @returns
    */ _proto.updateTexture = function updateTexture(flipY) {
@@ -19891,20 +19967,26 @@ var TextComponentBase = /*#__PURE__*/ function() {
         var layout = this.textLayout;
         var fontScale = style.fontScale;
         var width = (layout.width + style.fontOffset) * fontScale;
-        var height = layout.height * fontScale;
+        var finalHeight = layout.lineHeight * this.lineCount;
         var fontSize = style.fontSize * fontScale;
         var lineHeight = layout.lineHeight * fontScale;
         this.char = (this.text || "").split("");
         this.canvas.width = width;
-        this.canvas.height = height;
-        context.clearRect(0, 0, width, this.canvas.height);
+        if (layout.autoWidth) {
+            this.canvas.height = finalHeight * fontScale;
+            this.item.transform.size.set(1, finalHeight / layout.height);
+        } else {
+            this.canvas.height = layout.height * fontScale;
+        }
+        var height = this.canvas.height;
+        context.clearRect(0, 0, width, height);
         // fix bug 1/255
         context.fillStyle = "rgba(255, 255, 255, 0.0039)";
         if (!flipY) {
             context.translate(0, height);
             context.scale(1, -1);
         }
-        context.fillRect(0, 0, width, this.canvas.height);
+        context.fillRect(0, 0, width, height);
         style.fontDesc = this.getFontDesc();
         context.font = style.fontDesc;
         if (style.hasShadow) {
@@ -20215,39 +20297,10 @@ exports.PostProcessVolume = /*#__PURE__*/ function(ItemBehaviour) {
     _proto.start = function start() {
         var composition = this.item.composition;
         if (composition) {
-            composition.globalVolume = {
-                useHDR: this.useHDR,
-                useBloom: this.useBloom,
-                threshold: this.threshold,
-                bloomIntensity: this.bloomIntensity,
-                brightness: this.brightness,
-                saturation: this.saturation,
-                contrast: this.contrast,
-                vignetteIntensity: this.vignetteIntensity,
-                vignetteSmoothness: this.vignetteSmoothness,
-                vignetteRoundness: this.vignetteRoundness,
-                useToneMapping: this.useToneMapping
-            };
+            composition.globalVolume = this;
             composition.createRenderFrame();
         }
     };
-    _proto.update = function update(dt) {
-        var composition = this.item.composition;
-        if (composition) {
-            var globalVolume = composition.renderFrame.globalVolume;
-            globalVolume.useHDR = this.useHDR;
-            globalVolume.useBloom = this.useBloom;
-            globalVolume.threshold = this.threshold;
-            globalVolume.bloomIntensity = this.bloomIntensity;
-            globalVolume.brightness = this.brightness;
-            globalVolume.saturation = this.saturation;
-            globalVolume.contrast = this.contrast;
-            globalVolume.vignetteIntensity = this.vignetteIntensity;
-            globalVolume.vignetteSmoothness = this.vignetteSmoothness;
-            globalVolume.vignetteRoundness = this.vignetteRoundness;
-            globalVolume.useToneMapping = this.useToneMapping;
-        }
-    };
     return PostProcessVolume;
 }(ItemBehaviour);
 __decorate([
@@ -21247,27 +21300,46 @@ var SerializationHelper = /*#__PURE__*/ function() {
                             res1
                         ];
                     case 7:
-                        if (isObject(property) && property.constructor === Object) {
-                            if (type) {
-                                res2 = new type();
-                            } else {
-                                res2 = {};
-                            }
-                            for(_iterator1 = _create_for_of_iterator_helper_loose(Object.keys(property)); !(_step1 = _iterator1()).done;){
-                                key = _step1.value;
-                                res2[key] = SerializationHelper.deserializeProperty(property[key], engine, level + 1);
-                            }
-                            return [
-                                2,
-                                res2
-                            ];
+                        if (!(isObject(property) && property.constructor === Object)) return [
+                            3,
+                            12
+                        ];
+                        if (type) {
+                            res2 = new type();
                         } else {
-                            return [
-                                2,
-                                property
-                            ];
+                            res2 = {};
                         }
+                        _iterator1 = _create_for_of_iterator_helper_loose(Object.keys(property));
+                        _state.label = 8;
                     case 8:
+                        if (!!(_step1 = _iterator1()).done) return [
+                            3,
+                            11
+                        ];
+                        key = _step1.value;
+                        return [
+                            4,
+                            SerializationHelper.deserializePropertyAsync(property[key], engine, level + 1)
+                        ];
+                    case 9:
+                        res2[key] = _state.sent();
+                        _state.label = 10;
+                    case 10:
+                        return [
+                            3,
+                            8
+                        ];
+                    case 11:
+                        return [
+                            2,
+                            res2
+                        ];
+                    case 12:
+                        return [
+                            2,
+                            property
+                        ];
+                    case 13:
                         return [
                             2
                         ];
@@ -21926,277 +21998,39 @@ function getBezierCurveFromHermiteInGE(geHermiteCurves) {
     });
 }
 
-function getStandardParticleContent(particle) {
-    var options = particle.options;
-    var transform = particle.transform;
-    var shape = {
-        type: ShapeType.NONE
-    };
-    if (particle.shape) {
-        var _particle_shape_shape;
-        var shapeType = (_particle_shape_shape = particle.shape.shape) == null ? void 0 : _particle_shape_shape.replace(/([A-Z])/g, "_$1").toUpperCase().replace(/^_/, "");
-        shape = _extends({}, particle.shape, {
-            type: ShapeType[shapeType]
-        });
-        if (particle.shape.upDirection) {
-            var _particle_shape_upDirection = particle.shape.upDirection, x = _particle_shape_upDirection[0], y = _particle_shape_upDirection[1], z = _particle_shape_upDirection[2];
-            if (x === 0 && y === 0 && z === 0) {
-                delete shape.upDirection;
-            }
-        }
-    }
-    if (options.startTurbulence) {
-        shape.turbulenceX = ensureNumberExpression(options.turbulenceX);
-        shape.turbulenceY = ensureNumberExpression(options.turbulenceY);
-        shape.turbulenceZ = ensureNumberExpression(options.turbulenceZ);
-    }
-    var emission = particle.emission;
-    if (emission.bursts && emission.bursts.length > 0) {
-        emission.bursts = emission.bursts.map(function(b) {
-            return objectValueToNumber(b);
-        });
-    }
-    if (emission.burstOffsets && emission.burstOffsets.length > 0) {
-        emission.burstOffsets = emission.burstOffsets.map(function(b) {
-            return objectValueToNumber(b);
-        });
-    }
-    if (emission.rateOverTime) {
-        emission.rateOverTime = ensureNumberExpression(emission.rateOverTime);
-    }
+function getStandardCameraContent(model) {
+    var _model_transform;
+    var opt = model.options;
     var ret = {
-        renderer: particle.renderer,
-        shape: shape,
-        splits: particle.splits,
-        emission: emission,
         options: {
-            startLifetime: ensureNumberExpression(options.startLifetime),
-            start3DSize: !!options.start3DSize,
-            startSize: ensureNumberExpression(options.startSize),
-            startSizeX: ensureNumberExpression(options.startSizeX),
-            startSizeY: ensureNumberExpression(options.startSizeY),
-            sizeAspect: ensureNumberExpression(options.sizeAspect),
-            maxCount: options.maxCount,
-            startDelay: ensureNumberExpression(options.startDelay),
-            startColor: ensureColorExpression(options.startColor, true),
-            startRotationZ: ensureNumberExpression(options.startRotation || options.startRotationZ),
-            particleFollowParent: options.particleFollowParent
+            fov: opt.fov,
+            far: opt.far,
+            near: opt.near,
+            clipMode: opt.clipMode
         }
     };
-    if (options.start3DRotation) {
-        ret.options.startRotationX = ensureNumberExpression(options.startRotationX);
-        ret.options.startRotationY = ensureNumberExpression(options.startRotationY);
-    }
-    if (transform && transform.path) {
-        ret.emitterTransform = {
-            path: ensureFixedVec3(transform.path)
-        };
-    }
-    var sizeOverLifetime = particle.sizeOverLifetime;
-    if (sizeOverLifetime) {
-        if (sizeOverLifetime.separateAxes) {
-            ret.sizeOverLifetime = {
-                separateAxes: true,
-                x: ensureNumberExpression(sizeOverLifetime.x),
-                y: ensureNumberExpression(sizeOverLifetime.y)
-            };
-        } else {
-            ret.sizeOverLifetime = {
-                size: ensureNumberExpression(sizeOverLifetime.size)
-            };
-        }
-    }
-    var velocityOverLifetime = particle.velocityOverLifetime || {};
-    var sol = velocityOverLifetime.speedOverLifetime;
-    if (sol) {
-        sol = ensureFixedNumber(sol);
-    } else {
-        sol = undefined;
-    }
-    ret.positionOverLifetime = {
-        gravity: options.gravity,
-        gravityOverLifetime: ensureFixedNumber(options.gravityModifier),
-        startSpeed: ensureNumberExpression(options.startSpeed),
-        speedOverLifetime: sol,
-        asMovement: velocityOverLifetime.asMovement,
-        linearX: ensureNumberExpression(velocityOverLifetime.linearX),
-        linearY: ensureNumberExpression(velocityOverLifetime.linearY),
-        linearZ: ensureNumberExpression(velocityOverLifetime.linearZ),
-        asRotation: velocityOverLifetime.asRotation,
-        orbCenter: velocityOverLifetime.orbCenter,
-        orbitalX: ensureNumberExpression(velocityOverLifetime.orbitalX),
-        orbitalY: ensureNumberExpression(velocityOverLifetime.orbitalY),
-        orbitalZ: ensureNumberExpression(velocityOverLifetime.orbitalZ),
-        forceTarget: velocityOverLifetime.forceTarget,
-        target: velocityOverLifetime.target,
-        forceCurve: ensureFixedNumber(velocityOverLifetime.forceCurve)
-    };
-    deleteEmptyValue(ret.positionOverLifetime);
-    var rotationOverLifetime = particle.rotationOverLifetime;
-    if (rotationOverLifetime) {
-        ret.rotationOverLifetime = {
-            separateAxes: rotationOverLifetime.separateAxes,
-            asRotation: rotationOverLifetime.asRotation,
-            z: ensureNumberExpression(rotationOverLifetime.separateAxes ? rotationOverLifetime.z : rotationOverLifetime.angularVelocity)
-        };
-        if (rotationOverLifetime.separateAxes) {
-            ret.rotationOverLifetime.y = ensureFixedNumber(rotationOverLifetime.y);
-            ret.rotationOverLifetime.x = ensureFixedNumber(rotationOverLifetime.x);
-        }
-    }
-    var colorOverLifetime = particle.colorOverLifetime;
-    if (colorOverLifetime) {
-        var col = ret.colorOverLifetime = {
-            opacity: ensureFixedNumber(colorOverLifetime.opacity)
-        };
-        if (colorOverLifetime.color) {
-            col.color = getGradientColor(colorOverLifetime.color);
-        }
-    }
-    var textureSheetAnimation = particle.textureSheetAnimation;
-    if (textureSheetAnimation) {
-        ret.textureSheetAnimation = {
-            row: textureSheetAnimation.row,
-            col: textureSheetAnimation.col,
-            total: textureSheetAnimation.total,
-            animate: textureSheetAnimation.animate,
-            cycles: ensureFixedNumber(textureSheetAnimation.cycles),
-            animationDelay: ensureFixedNumberWithRandom(textureSheetAnimation.animationDelay, 0),
-            animationDuration: ensureFixedNumberWithRandom(textureSheetAnimation.animationDuration, 0)
-        };
-    }
-    var trials = particle.trails;
-    if (trials) {
-        ret.trails = {
-            lifetime: ensureNumberExpression(trials.lifetime),
-            dieWithParticles: trials.dieWithParticles,
-            maxPointPerTrail: trials.maxPointPerTrail,
-            minimumVertexDistance: trials.minimumVertexDistance,
-            widthOverTrail: ensureFixedNumber(trials.widthOverTrail),
-            colorOverTrail: trials.colorOverTrail && getGradientColor(trials.colorOverTrail, false),
-            blending: trials.blending,
-            colorOverLifetime: trials.colorOverLifetime && getGradientColor(trials.colorOverLifetime, false),
-            inheritParticleColor: trials.inheritParticleColor,
-            occlusion: trials.occlusion,
-            transparentOcclusion: trials.transparentOcclusion,
-            orderOffset: trials.orderOffset,
-            sizeAffectsLifetime: trials.sizeAffectsLifetime,
-            sizeAffectsWidth: trials.sizeAffectsWidth,
-            texture: trials.texture,
-            parentAffectsPosition: trials.parentAffectsPosition,
-            opacityOverLifetime: ensureNumberExpression(trials.opacityOverLifetime)
-        };
-    }
-    ret.trails && deleteEmptyValue(ret.trails);
-    var interaction = particle.interaction;
-    if (interaction) {
-        ret.interaction = {
-            behavior: interaction.behavior,
-            radius: interaction.radius,
-            multiple: interaction.multiple
-        };
-    }
-    return ret;
-}
-
-function getStandardNullContent(sprite, transform) {
-    var _sprite_transform;
-    var opt = sprite.options;
-    var velocityOverLifetime = sprite.velocityOverLifetime || {};
-    var positionOverLifetime = {
-        path: ensureFixedVec3((_sprite_transform = sprite.transform) == null ? void 0 : _sprite_transform.path),
-        gravity: opt.gravity,
-        gravityOverLifetime: ensureFixedNumber(opt.gravityModifier),
-        direction: opt.direction,
-        startSpeed: opt.startSpeed,
-        asMovement: velocityOverLifetime.asMovement,
-        linearX: ensureFixedNumber(velocityOverLifetime.linearX),
-        linearY: ensureFixedNumber(velocityOverLifetime.linearY),
-        linearZ: ensureFixedNumber(velocityOverLifetime.linearZ),
-        asRotation: velocityOverLifetime.asRotation,
-        orbCenter: velocityOverLifetime.orbCenter,
-        orbitalX: ensureFixedNumber(velocityOverLifetime.orbitalX),
-        orbitalY: ensureFixedNumber(velocityOverLifetime.orbitalY),
-        orbitalZ: ensureFixedNumber(velocityOverLifetime.orbitalZ),
-        speedOverLifetime: ensureFixedNumber(velocityOverLifetime.speedOverLifetime)
-    };
-    deleteEmptyValue(positionOverLifetime);
-    var ret = {
-        options: {
-            startColor: ensureRGBAValue(opt.startColor)
-        },
-        positionOverLifetime: positionOverLifetime
-    };
-    if (opt.startSize) {
-        transform.scale = [
-            opt.startSize,
-            opt.startSize / (opt.sizeAspect || 1),
-            1
-        ];
-    }
-    if (opt.startRotation) {
-        if (!transform.rotation) {
-            transform.rotation = [
-                0,
-                0,
-                opt.startRotation
-            ];
-        } else {
-            transform.rotation[2] += opt.startRotation;
-        }
-    }
-    var rotationOverLifetime = sprite.rotationOverLifetime;
-    if (rotationOverLifetime) {
-        var rot = ret.rotationOverLifetime = {
-            separateAxes: rotationOverLifetime.separateAxes,
-            asRotation: rotationOverLifetime.asRotation
-        };
-        if (rot.separateAxes) {
-            rot.x = ensureFixedNumber(rotationOverLifetime.x);
-            rot.y = ensureFixedNumber(rotationOverLifetime.y);
-            rot.z = ensureFixedNumber(rotationOverLifetime.z);
-        } else {
-            rot.z = ensureFixedNumber(rotationOverLifetime.angularVelocity);
-        }
-    }
-    var colorOverLifetime = sprite.colorOverLifetime;
-    if (colorOverLifetime) {
-        var col = ret.colorOverLifetime = {
-            opacity: ensureFixedNumber(colorOverLifetime.opacity)
-        };
-        if (colorOverLifetime.color) {
-            col.color = getGradientColor(colorOverLifetime.color);
-        }
-    }
-    var sizeOverLifetime = sprite.sizeOverLifetime;
-    if (sizeOverLifetime) {
-        ret.sizeOverLifetime = {
-            separateAxes: sizeOverLifetime.separateAxes,
-            size: ensureFixedNumber(sizeOverLifetime.size),
-            x: ensureFixedNumber(sizeOverLifetime.x),
-            y: ensureFixedNumber(sizeOverLifetime.y),
-            z: ensureFixedNumber(sizeOverLifetime.z)
+    var velocityOverLifetime = model.velocityOverLifetime;
+    if (velocityOverLifetime || ((_model_transform = model.transform) == null ? void 0 : _model_transform.path)) {
+        var _model_transform1;
+        var positionOverLifetime = {
+            path: ensureFixedVec3((_model_transform1 = model.transform) == null ? void 0 : _model_transform1.path),
+            linearX: ensureFixedNumber(velocityOverLifetime == null ? void 0 : velocityOverLifetime.translateX),
+            linearY: ensureFixedNumber(velocityOverLifetime == null ? void 0 : velocityOverLifetime.translateY),
+            linearZ: ensureFixedNumber(velocityOverLifetime == null ? void 0 : velocityOverLifetime.translateZ)
         };
+        deleteEmptyValue(positionOverLifetime);
+        ret.positionOverLifetime = positionOverLifetime;
     }
-    return ret;
-}
-function getStandardSpriteContent(sprite, transform) {
-    var ret = getStandardNullContent(sprite, transform);
-    var texAni = sprite.textureSheetAnimation;
-    if (texAni) {
-        ret.textureSheetAnimation = {
-            row: texAni.row,
-            col: texAni.col,
-            total: texAni.total || undefined,
-            animate: texAni.animate
+    var rol = model.rotationOverLifetime;
+    if (rol) {
+        var rotationOverLifetime = {
+            separateAxes: rol.separateAxes,
+            x: ensureFixedNumber(rol == null ? void 0 : rol.rotateX),
+            y: ensureFixedNumber(rol == null ? void 0 : rol.rotateY),
+            z: rol.separateAxes ? ensureFixedNumber(rol == null ? void 0 : rol.rotateZ) : ensureFixedNumber(rol.rotation)
         };
-    }
-    ret.renderer = sprite.renderer;
-    if (sprite.splits) {
-        ret.splits = sprite.splits;
-    }
-    if (sprite.interaction) {
-        ret.interaction = sprite.interaction;
+        deleteEmptyValue(rotationOverLifetime);
+        ret.rotationOverLifetime = rotationOverLifetime;
     }
     return ret;
 }
@@ -22241,43 +22075,6 @@ function getStandardInteractContent(ui) {
     return ret;
 }
 
-function getStandardCameraContent(model) {
-    var _model_transform;
-    var opt = model.options;
-    var ret = {
-        options: {
-            fov: opt.fov,
-            far: opt.far,
-            near: opt.near,
-            clipMode: opt.clipMode
-        }
-    };
-    var velocityOverLifetime = model.velocityOverLifetime;
-    if (velocityOverLifetime || ((_model_transform = model.transform) == null ? void 0 : _model_transform.path)) {
-        var _model_transform1;
-        var positionOverLifetime = {
-            path: ensureFixedVec3((_model_transform1 = model.transform) == null ? void 0 : _model_transform1.path),
-            linearX: ensureFixedNumber(velocityOverLifetime == null ? void 0 : velocityOverLifetime.translateX),
-            linearY: ensureFixedNumber(velocityOverLifetime == null ? void 0 : velocityOverLifetime.translateY),
-            linearZ: ensureFixedNumber(velocityOverLifetime == null ? void 0 : velocityOverLifetime.translateZ)
-        };
-        deleteEmptyValue(positionOverLifetime);
-        ret.positionOverLifetime = positionOverLifetime;
-    }
-    var rol = model.rotationOverLifetime;
-    if (rol) {
-        var rotationOverLifetime = {
-            separateAxes: rol.separateAxes,
-            x: ensureFixedNumber(rol == null ? void 0 : rol.rotateX),
-            y: ensureFixedNumber(rol == null ? void 0 : rol.rotateY),
-            z: rol.separateAxes ? ensureFixedNumber(rol == null ? void 0 : rol.rotateZ) : ensureFixedNumber(rol.rotation)
-        };
-        deleteEmptyValue(rotationOverLifetime);
-        ret.rotationOverLifetime = rotationOverLifetime;
-    }
-    return ret;
-}
-
 /**
  * 2.1 以下版本数据适配（mars-player@2.4.0 及以上版本支持 2.1 以下数据的适配）
  */ function version21Migration(json) {
@@ -22394,11 +22191,12 @@ function getStandardCameraContent(model) {
     var _textures;
     (_textures = (_result = result).textures) != null ? _textures : _result.textures = [];
     result.textures.forEach(function(textureOptions) {
+        var _result_images_textureOptions_source;
         textureOptions.id = generateGUID();
         textureOptions.dataType = DataType.Texture;
         // @ts-expect-error
         textureOptions.source = {
-            id: result.images[textureOptions.source].id
+            id: (_result_images_textureOptions_source = result.images[textureOptions.source]) == null ? void 0 : _result_images_textureOptions_source.id
         };
     });
     if (result.textures.length < result.images.length) {
@@ -22752,8 +22550,7 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
             var newSpriteColorPlayableAssetData = {
                 id: generateGUID(),
                 dataType: "SpriteColorPlayableAsset",
-                colorOverLifetime: item.content.colorOverLifetime,
-                startColor: item.content.options.startColor
+                colorOverLifetime: item.content.colorOverLifetime
             };
             playableAssetDatas.push(newSpriteColorPlayableAssetData);
             var newTrackData1 = {
@@ -22808,77 +22605,352 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
             children: subTrackDatas,
             clips: []
         };
-        trackDatas.push(bindingTrackData);
-        timelineAssetData.tracks.push({
-            id: bindingTrackData.id
-        });
-        sceneBindings.push({
-            key: {
-                id: bindingTrackData.id
-            },
-            value: {
-                id: item.id
-            }
-        });
+        trackDatas.push(bindingTrackData);
+        timelineAssetData.tracks.push({
+            id: bindingTrackData.id
+        });
+        sceneBindings.push({
+            key: {
+                id: bindingTrackData.id
+            },
+            value: {
+                id: item.id
+            }
+        });
+    }
+    var trackIds = [];
+    for(var _iterator1 = _create_for_of_iterator_helper_loose(trackDatas), _step1; !(_step1 = _iterator1()).done;){
+        var trackData = _step1.value;
+        trackIds.push({
+            id: trackData.id
+        });
+    }
+    composition.timelineAsset = {
+        id: timelineAssetData.id
+    };
+    composition.sceneBindings = sceneBindings;
+    jsonScene.miscs.push(timelineAssetData);
+    for(var _iterator2 = _create_for_of_iterator_helper_loose(trackDatas), _step2; !(_step2 = _iterator2()).done;){
+        var trackData1 = _step2.value;
+        //@ts-expect-error
+        jsonScene.miscs.push(trackData1);
+    }
+    for(var _iterator3 = _create_for_of_iterator_helper_loose(playableAssetDatas), _step3; !(_step3 = _iterator3()).done;){
+        var playableAsset = _step3.value;
+        //@ts-expect-error
+        jsonScene.miscs.push(playableAsset);
+    }
+}
+function convertBinaryAsset(bins, jsonScene) {
+    //@ts-expect-error
+    jsonScene.bins = bins.map(function(bin) {
+        return {
+            url: bin.url,
+            "dataType": "BinaryAsset",
+            id: generateGUID()
+        };
+    });
+}
+function convertSpineData(resource, content, jsonScene) {
+    //@ts-expect-error
+    content.resource = {
+        "atlas": {
+            "bins": {
+                //@ts-expect-error
+                "id": jsonScene.bins[resource.atlas[1][0]].id
+            },
+            "source": resource.atlas[1].slice(1)
+        },
+        "skeleton": {
+            "bins": {
+                //@ts-expect-error
+                "id": jsonScene.bins[resource.skeleton[1][0]].id
+            },
+            "source": resource.skeleton[1].slice(1)
+        },
+        "skeletonType": resource.skeletonType,
+        "images": resource.images.map(function(i) {
+            return {
+                //@ts-expect-error
+                id: jsonScene.textures[i].id
+            };
+        })
+    };
+}
+
+function getStandardParticleContent(particle) {
+    var options = particle.options;
+    var transform = particle.transform;
+    var shape = {
+        type: ShapeType.NONE
+    };
+    if (particle.shape) {
+        var _particle_shape_shape;
+        var shapeType = (_particle_shape_shape = particle.shape.shape) == null ? void 0 : _particle_shape_shape.replace(/([A-Z])/g, "_$1").toUpperCase().replace(/^_/, "");
+        shape = _extends({}, particle.shape, {
+            type: ShapeType[shapeType]
+        });
+        if (particle.shape.upDirection) {
+            var _particle_shape_upDirection = particle.shape.upDirection, x = _particle_shape_upDirection[0], y = _particle_shape_upDirection[1], z = _particle_shape_upDirection[2];
+            if (x === 0 && y === 0 && z === 0) {
+                delete shape.upDirection;
+            }
+        }
+    }
+    if (options.startTurbulence) {
+        shape.turbulenceX = ensureNumberExpression(options.turbulenceX);
+        shape.turbulenceY = ensureNumberExpression(options.turbulenceY);
+        shape.turbulenceZ = ensureNumberExpression(options.turbulenceZ);
+    }
+    var emission = particle.emission;
+    if (emission.bursts && emission.bursts.length > 0) {
+        emission.bursts = emission.bursts.map(function(b) {
+            return objectValueToNumber(b);
+        });
+    }
+    if (emission.burstOffsets && emission.burstOffsets.length > 0) {
+        emission.burstOffsets = emission.burstOffsets.map(function(b) {
+            return objectValueToNumber(b);
+        });
+    }
+    if (emission.rateOverTime) {
+        emission.rateOverTime = ensureNumberExpression(emission.rateOverTime);
+    }
+    var ret = {
+        renderer: particle.renderer,
+        shape: shape,
+        splits: particle.splits,
+        emission: emission,
+        options: {
+            startLifetime: ensureNumberExpression(options.startLifetime),
+            start3DSize: !!options.start3DSize,
+            startSize: ensureNumberExpression(options.startSize),
+            startSizeX: ensureNumberExpression(options.startSizeX),
+            startSizeY: ensureNumberExpression(options.startSizeY),
+            sizeAspect: ensureNumberExpression(options.sizeAspect),
+            maxCount: options.maxCount,
+            startDelay: ensureNumberExpression(options.startDelay),
+            startColor: ensureColorExpression(options.startColor, true),
+            startRotationZ: ensureNumberExpression(options.startRotation || options.startRotationZ),
+            particleFollowParent: options.particleFollowParent
+        }
+    };
+    if (options.start3DRotation) {
+        ret.options.startRotationX = ensureNumberExpression(options.startRotationX);
+        ret.options.startRotationY = ensureNumberExpression(options.startRotationY);
+    }
+    if (transform && transform.path) {
+        ret.emitterTransform = {
+            path: ensureFixedVec3(transform.path)
+        };
+    }
+    var sizeOverLifetime = particle.sizeOverLifetime;
+    if (sizeOverLifetime) {
+        if (sizeOverLifetime.separateAxes) {
+            ret.sizeOverLifetime = {
+                separateAxes: true,
+                x: ensureNumberExpression(sizeOverLifetime.x),
+                y: ensureNumberExpression(sizeOverLifetime.y)
+            };
+        } else {
+            ret.sizeOverLifetime = {
+                size: ensureNumberExpression(sizeOverLifetime.size)
+            };
+        }
+    }
+    var velocityOverLifetime = particle.velocityOverLifetime || {};
+    var sol = velocityOverLifetime.speedOverLifetime;
+    if (sol) {
+        sol = ensureFixedNumber(sol);
+    } else {
+        sol = undefined;
+    }
+    ret.positionOverLifetime = {
+        gravity: options.gravity,
+        gravityOverLifetime: ensureFixedNumber(options.gravityModifier),
+        startSpeed: ensureNumberExpression(options.startSpeed),
+        speedOverLifetime: sol,
+        asMovement: velocityOverLifetime.asMovement,
+        linearX: ensureNumberExpression(velocityOverLifetime.linearX),
+        linearY: ensureNumberExpression(velocityOverLifetime.linearY),
+        linearZ: ensureNumberExpression(velocityOverLifetime.linearZ),
+        asRotation: velocityOverLifetime.asRotation,
+        orbCenter: velocityOverLifetime.orbCenter,
+        orbitalX: ensureNumberExpression(velocityOverLifetime.orbitalX),
+        orbitalY: ensureNumberExpression(velocityOverLifetime.orbitalY),
+        orbitalZ: ensureNumberExpression(velocityOverLifetime.orbitalZ),
+        forceTarget: velocityOverLifetime.forceTarget,
+        target: velocityOverLifetime.target,
+        forceCurve: ensureFixedNumber(velocityOverLifetime.forceCurve)
+    };
+    deleteEmptyValue(ret.positionOverLifetime);
+    var rotationOverLifetime = particle.rotationOverLifetime;
+    if (rotationOverLifetime) {
+        ret.rotationOverLifetime = {
+            separateAxes: rotationOverLifetime.separateAxes,
+            asRotation: rotationOverLifetime.asRotation,
+            z: ensureNumberExpression(rotationOverLifetime.separateAxes ? rotationOverLifetime.z : rotationOverLifetime.angularVelocity)
+        };
+        if (rotationOverLifetime.separateAxes) {
+            ret.rotationOverLifetime.y = ensureFixedNumber(rotationOverLifetime.y);
+            ret.rotationOverLifetime.x = ensureFixedNumber(rotationOverLifetime.x);
+        }
     }
-    var trackIds = [];
-    for(var _iterator1 = _create_for_of_iterator_helper_loose(trackDatas), _step1; !(_step1 = _iterator1()).done;){
-        var trackData = _step1.value;
-        trackIds.push({
-            id: trackData.id
-        });
+    var colorOverLifetime = particle.colorOverLifetime;
+    if (colorOverLifetime) {
+        var col = ret.colorOverLifetime = {
+            opacity: ensureFixedNumber(colorOverLifetime.opacity)
+        };
+        if (colorOverLifetime.color) {
+            col.color = getGradientColor(colorOverLifetime.color);
+        }
     }
-    composition.timelineAsset = {
-        id: timelineAssetData.id
-    };
-    composition.sceneBindings = sceneBindings;
-    jsonScene.miscs.push(timelineAssetData);
-    for(var _iterator2 = _create_for_of_iterator_helper_loose(trackDatas), _step2; !(_step2 = _iterator2()).done;){
-        var trackData1 = _step2.value;
-        //@ts-expect-error
-        jsonScene.miscs.push(trackData1);
+    var textureSheetAnimation = particle.textureSheetAnimation;
+    if (textureSheetAnimation) {
+        ret.textureSheetAnimation = {
+            row: textureSheetAnimation.row,
+            col: textureSheetAnimation.col,
+            total: textureSheetAnimation.total,
+            animate: textureSheetAnimation.animate,
+            cycles: ensureFixedNumber(textureSheetAnimation.cycles),
+            animationDelay: ensureFixedNumberWithRandom(textureSheetAnimation.animationDelay, 0),
+            animationDuration: ensureFixedNumberWithRandom(textureSheetAnimation.animationDuration, 0)
+        };
     }
-    for(var _iterator3 = _create_for_of_iterator_helper_loose(playableAssetDatas), _step3; !(_step3 = _iterator3()).done;){
-        var playableAsset = _step3.value;
-        //@ts-expect-error
-        jsonScene.miscs.push(playableAsset);
+    var trials = particle.trails;
+    if (trials) {
+        ret.trails = {
+            lifetime: ensureNumberExpression(trials.lifetime),
+            dieWithParticles: trials.dieWithParticles,
+            maxPointPerTrail: trials.maxPointPerTrail,
+            minimumVertexDistance: trials.minimumVertexDistance,
+            widthOverTrail: ensureFixedNumber(trials.widthOverTrail),
+            colorOverTrail: trials.colorOverTrail && getGradientColor(trials.colorOverTrail, false),
+            blending: trials.blending,
+            colorOverLifetime: trials.colorOverLifetime && getGradientColor(trials.colorOverLifetime, false),
+            inheritParticleColor: trials.inheritParticleColor,
+            occlusion: trials.occlusion,
+            transparentOcclusion: trials.transparentOcclusion,
+            orderOffset: trials.orderOffset,
+            sizeAffectsLifetime: trials.sizeAffectsLifetime,
+            sizeAffectsWidth: trials.sizeAffectsWidth,
+            texture: trials.texture,
+            parentAffectsPosition: trials.parentAffectsPosition,
+            opacityOverLifetime: ensureNumberExpression(trials.opacityOverLifetime)
+        };
     }
-}
-function convertBinaryAsset(bins, jsonScene) {
-    //@ts-expect-error
-    jsonScene.bins = bins.map(function(bin) {
-        return {
-            url: bin.url,
-            "dataType": "BinaryAsset",
-            id: generateGUID()
+    ret.trails && deleteEmptyValue(ret.trails);
+    var interaction = particle.interaction;
+    if (interaction) {
+        ret.interaction = {
+            behavior: interaction.behavior,
+            radius: interaction.radius,
+            multiple: interaction.multiple
         };
-    });
+    }
+    return ret;
 }
-function convertSpineData(resource, content, jsonScene) {
-    //@ts-expect-error
-    content.resource = {
-        "atlas": {
-            "bins": {
-                //@ts-expect-error
-                "id": jsonScene.bins[resource.atlas[1][0]].id
-            },
-            "source": resource.atlas[1].slice(1)
-        },
-        "skeleton": {
-            "bins": {
-                //@ts-expect-error
-                "id": jsonScene.bins[resource.skeleton[1][0]].id
-            },
-            "source": resource.skeleton[1].slice(1)
+
+function getStandardNullContent(sprite, transform) {
+    var _sprite_transform;
+    var opt = sprite.options;
+    var velocityOverLifetime = sprite.velocityOverLifetime || {};
+    var positionOverLifetime = {
+        path: ensureFixedVec3((_sprite_transform = sprite.transform) == null ? void 0 : _sprite_transform.path),
+        gravity: opt.gravity,
+        gravityOverLifetime: ensureFixedNumber(opt.gravityModifier),
+        direction: opt.direction,
+        startSpeed: opt.startSpeed,
+        asMovement: velocityOverLifetime.asMovement,
+        linearX: ensureFixedNumber(velocityOverLifetime.linearX),
+        linearY: ensureFixedNumber(velocityOverLifetime.linearY),
+        linearZ: ensureFixedNumber(velocityOverLifetime.linearZ),
+        asRotation: velocityOverLifetime.asRotation,
+        orbCenter: velocityOverLifetime.orbCenter,
+        orbitalX: ensureFixedNumber(velocityOverLifetime.orbitalX),
+        orbitalY: ensureFixedNumber(velocityOverLifetime.orbitalY),
+        orbitalZ: ensureFixedNumber(velocityOverLifetime.orbitalZ),
+        speedOverLifetime: ensureFixedNumber(velocityOverLifetime.speedOverLifetime)
+    };
+    deleteEmptyValue(positionOverLifetime);
+    var ret = {
+        options: {
+            startColor: ensureRGBAValue(opt.startColor)
         },
-        "skeletonType": resource.skeletonType,
-        "images": resource.images.map(function(i) {
-            return {
-                //@ts-expect-error
-                id: jsonScene.textures[i].id
-            };
-        })
+        positionOverLifetime: positionOverLifetime
     };
+    if (opt.startSize) {
+        transform.scale = [
+            opt.startSize,
+            opt.startSize / (opt.sizeAspect || 1),
+            1
+        ];
+    }
+    if (opt.startRotation) {
+        if (!transform.rotation) {
+            transform.rotation = [
+                0,
+                0,
+                opt.startRotation
+            ];
+        } else {
+            transform.rotation[2] += opt.startRotation;
+        }
+    }
+    var rotationOverLifetime = sprite.rotationOverLifetime;
+    if (rotationOverLifetime) {
+        var rot = ret.rotationOverLifetime = {
+            separateAxes: rotationOverLifetime.separateAxes,
+            asRotation: rotationOverLifetime.asRotation
+        };
+        if (rot.separateAxes) {
+            rot.x = ensureFixedNumber(rotationOverLifetime.x);
+            rot.y = ensureFixedNumber(rotationOverLifetime.y);
+            rot.z = ensureFixedNumber(rotationOverLifetime.z);
+        } else {
+            rot.z = ensureFixedNumber(rotationOverLifetime.angularVelocity);
+        }
+    }
+    var colorOverLifetime = sprite.colorOverLifetime;
+    if (colorOverLifetime) {
+        var col = ret.colorOverLifetime = {
+            opacity: ensureFixedNumber(colorOverLifetime.opacity)
+        };
+        if (colorOverLifetime.color) {
+            col.color = getGradientColor(colorOverLifetime.color);
+        }
+    }
+    var sizeOverLifetime = sprite.sizeOverLifetime;
+    if (sizeOverLifetime) {
+        ret.sizeOverLifetime = {
+            separateAxes: sizeOverLifetime.separateAxes,
+            size: ensureFixedNumber(sizeOverLifetime.size),
+            x: ensureFixedNumber(sizeOverLifetime.x),
+            y: ensureFixedNumber(sizeOverLifetime.y),
+            z: ensureFixedNumber(sizeOverLifetime.z)
+        };
+    }
+    return ret;
+}
+function getStandardSpriteContent(sprite, transform) {
+    var ret = getStandardNullContent(sprite, transform);
+    var texAni = sprite.textureSheetAnimation;
+    if (texAni) {
+        ret.textureSheetAnimation = {
+            row: texAni.row,
+            col: texAni.col,
+            total: texAni.total || undefined,
+            animate: texAni.animate
+        };
+    }
+    ret.renderer = sprite.renderer;
+    if (sprite.splits) {
+        ret.splits = sprite.splits;
+    }
+    if (sprite.interaction) {
+        ret.interaction = sprite.interaction;
+    }
+    return ret;
 }
 
 var v0 = /^(\d+)\.(\d+)\.(\d+)(-(\w+)\.\d+)?$/;
@@ -23260,7 +23332,7 @@ function getBackgroundImage(template, variables) {
 }
 function _combineImageTemplate() {
     _combineImageTemplate = _async_to_generator(function(url, template, variables) {
-        var image, drawImage, templateBackground, _tmp;
+        var image, templateBackground;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -23291,37 +23363,25 @@ function _combineImageTemplate() {
                             image
                         ];
                     }
-                    drawImage = image;
                     // 获取动态换图的图片对象或 url 地址
                     templateBackground = getBackgroundImage(template, variables);
-                    if (!(templateBackground && isString(templateBackground) && templateBackground !== image.src)) return [
-                        3,
-                        7
-                    ];
-                    if (!isString(templateBackground)) return [
-                        3,
-                        5
-                    ];
-                    return [
-                        4,
-                        loadImage(templateBackground)
-                    ];
-                case 4:
-                    _tmp = _state.sent();
-                    return [
-                        3,
-                        6
-                    ];
-                case 5:
-                    _tmp = templateBackground;
-                    _state.label = 6;
-                case 6:
-                    drawImage = _tmp;
-                    _state.label = 7;
-                case 7:
+                    if (templateBackground) {
+                        if (isString(templateBackground) && templateBackground !== image.src) {
+                            return [
+                                2,
+                                loadImage(templateBackground)
+                            ];
+                        }
+                        if (_instanceof1(templateBackground, HTMLImageElement)) {
+                            return [
+                                2,
+                                templateBackground
+                            ];
+                        }
+                    }
                     return [
                         2,
-                        drawImage
+                        image
                     ];
             }
         });
@@ -23785,15 +23845,17 @@ var seed = 1;
                 _this_options = _this.options, useCompressedTexture = _this_options.useCompressedTexture, variables = _this_options.variables;
                 baseUrl = _this.baseUrl;
                 jobs = images.map(/*#__PURE__*/ _async_to_generator(function(img, idx) {
-                    var png, webp, imageURL, webpURL, template, background, url, isVideo, loadFn, resultImage, e, compressed, src, bufferURL, _ref, url1, image;
+                    var png, webp, avif, imageURL, webpURL, avifURL, template, background, url, isVideo, loadFn, resultImage, e, compressed, src, bufferURL, _ref, url1, image, _tmp;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
-                                png = img.url, webp = img.webp;
+                                png = img.url, webp = img.webp, avif = img.avif;
                                 // eslint-disable-next-line compat/compat
                                 imageURL = new URL(png, baseUrl).href;
                                 // eslint-disable-next-line compat/compat
                                 webpURL = webp && new URL(webp, baseUrl).href;
+                                // eslint-disable-next-line compat/compat
+                                avifURL = avif && new URL(avif, baseUrl).href;
                                 if (!("template" in img)) return [
                                     3,
                                     8
@@ -23893,12 +23955,30 @@ var seed = 1;
                                 }
                                 _state.label = 9;
                             case 9:
+                                if (!avifURL) return [
+                                    3,
+                                    11
+                                ];
                                 return [
                                     4,
-                                    loadWebPOptional(imageURL, webpURL)
+                                    loadAVIFOptional(imageURL, avifURL)
                                 ];
                             case 10:
-                                _ref = _state.sent(), url1 = _ref.url, image = _ref.image;
+                                _tmp = _state.sent();
+                                return [
+                                    3,
+                                    13
+                                ];
+                            case 11:
+                                return [
+                                    4,
+                                    loadWebPOptional(imageURL, webpURL)
+                                ];
+                            case 12:
+                                _tmp = _state.sent();
+                                _state.label = 13;
+                            case 13:
+                                _ref = _tmp, url1 = _ref.url, image = _ref.image;
                                 _this.assets[idx] = {
                                     url: url1,
                                     type: exports.TextureSourceType.image
@@ -27368,7 +27448,7 @@ registerPlugin("sprite", SpriteLoader, exports.VFXItem, true);
 registerPlugin("particle", ParticleLoader, exports.VFXItem, true);
 registerPlugin("cal", CalculateLoader, exports.VFXItem, true);
 registerPlugin("interact", InteractLoader, exports.VFXItem, true);
-var version = "2.0.0-alpha.28";
+var version = "2.0.0-alpha.29";
 logger.info("Core version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;
@@ -27562,6 +27642,7 @@ exports.isWechatMiniApp = isWechatMiniApp;
 exports.itemFrag = itemFrag;
 exports.itemFrameFrag = itemFrameFrag;
 exports.itemVert = itemVert;
+exports.loadAVIFOptional = loadAVIFOptional;
 exports.loadBinary = loadBinary;
 exports.loadBlob = loadBlob;
 exports.loadImage = loadImage;