@galacean/effects-threejs 2.7.0-alpha.0 → 2.7.0-alpha.2

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime threejs plugin for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.7.0-alpha.0
+ * Version: v2.7.0-alpha.2
  */
 
 'use strict';
@@ -3756,20 +3756,21 @@ var BuiltinObjectGUID = {
     UnlitShader: "unlit000000000000000000000000000"
 };
 
-/**
- * 填充类型
- */ var FillType;
+var FillType;
 (function(FillType) {
-    /**
-     * 纯色
-     */ FillType[FillType["Solid"] = 0] = "Solid";
-    /**
-     * 线性渐变
-     */ FillType[FillType["LinearGradient"] = 1] = "LinearGradient";
-    /**
-     * 径向渐变
-     */ FillType[FillType["RadialGradient"] = 2] = "RadialGradient";
+    FillType[FillType["Solid"] = 0] = "Solid";
+    FillType[FillType["GradientLinear"] = 1] = "GradientLinear";
+    FillType[FillType["GradientRadial"] = 2] = "GradientRadial";
+    FillType[FillType["GradientAngular"] = 3] = "GradientAngular";
+    FillType[FillType["Texture"] = 4] = "Texture";
 })(FillType || (FillType = {}));
+var TexturePaintScaleMode;
+(function(TexturePaintScaleMode) {
+    TexturePaintScaleMode[TexturePaintScaleMode["Fill"] = 0] = "Fill";
+    TexturePaintScaleMode[TexturePaintScaleMode["Fit"] = 1] = "Fit";
+    TexturePaintScaleMode[TexturePaintScaleMode["Crop"] = 2] = "Crop";
+    TexturePaintScaleMode[TexturePaintScaleMode["Tile"] = 3] = "Tile";
+})(TexturePaintScaleMode || (TexturePaintScaleMode = {}));
 
 /**
  * 矢量图形类型
@@ -3866,6 +3867,7 @@ var DataType;
     DataType["FloatPropertyTrack"] = "FloatPropertyTrack";
     DataType["ColorPropertyTrack"] = "ColorPropertyTrack";
     DataType["Vector2PropertyTrack"] = "Vector2PropertyTrack";
+    DataType["Vector3PropertyTrack"] = "Vector3PropertyTrack";
     DataType["Vector4PropertyTrack"] = "Vector4PropertyTrack";
     DataType["TransformPlayableAsset"] = "TransformPlayableAsset";
     DataType["SpriteColorPlayableAsset"] = "SpriteColorPlayableAsset";
@@ -3874,6 +3876,7 @@ var DataType;
     DataType["FloatPropertyPlayableAsset"] = "FloatPropertyPlayableAsset";
     DataType["ColorPropertyPlayableAsset"] = "ColorPropertyPlayableAsset";
     DataType["Vector2PropertyPlayableAsset"] = "Vector2PropertyPlayableAsset";
+    DataType["Vector3PropertyPlayableAsset"] = "Vector3PropertyPlayableAsset";
     DataType["Vector4PropertyPlayableAsset"] = "Vector4PropertyPlayableAsset";
     // Components
     DataType["MeshComponent"] = "MeshComponent";
@@ -4037,6 +4040,7 @@ var index$1 = /*#__PURE__*/Object.freeze({
     get FontStyle () { return FontStyle; },
     BuiltinObjectGUID: BuiltinObjectGUID,
     get FillType () { return FillType; },
+    get TexturePaintScaleMode () { return TexturePaintScaleMode; },
     get ShapePrimitiveType () { return ShapePrimitiveType; },
     get LineCap () { return LineCap; },
     get LineJoin () { return LineJoin; },
@@ -16106,9 +16110,9 @@ function oldBezierKeyFramesToNew(props) {
         x: 0,
         y: 0
     };
-    for(var i = 0; i < oldKeyframes.length - 1; i++){
+    for(var i = 0; i < oldKeyframes.length; i++){
         var leftKeyframe = oldKeyframes[i];
-        var rightKeyframe = oldKeyframes[i + 1];
+        var rightKeyframe = i + 1 < oldKeyframes.length ? oldKeyframes[i + 1] : oldKeyframes[i];
         var _getControlPoints = getControlPoints(leftKeyframe, rightKeyframe, true), p0 = _getControlPoints.p0, p1 = _getControlPoints.p1, p2 = _getControlPoints.p2, p3 = _getControlPoints.p3;
         assertExist(p2);
         assertExist(p3);
@@ -16123,19 +16127,6 @@ function oldBezierKeyFramesToNew(props) {
         }
         keyDatas.push(keyData);
         lastControl = p2;
-        if (i === oldKeyframes.length - 2) {
-            var res = getControlPoints(rightKeyframe, rightKeyframe, true);
-            assertExist(res.p3);
-            keyDatas.push({
-                leftControl: p2,
-                value: res.p3,
-                rightControl: {
-                    x: 0,
-                    y: 0
-                },
-                tangentMode: rightKeyframe[0] === BezierKeyframeType.HOLD ? 2 : 0
-            });
-        }
     }
     var calculateSlop = function(p0, p1) {
         return (p1.y - p0.y) / (p1.x - p0.x + NumberEpsilon);
@@ -16273,16 +16264,8 @@ var ColorCurve = /*#__PURE__*/ function(ValueGetter) {
 
 var vert = "precision highp float;attribute vec3 aPos;attribute vec2 aUV;varying vec2 uv0;uniform mat4 effects_MatrixVP;uniform mat4 effects_MatrixInvV;uniform mat4 effects_ObjectToWorld;void main(){vec4 pos=vec4(aPos.xyz,1.0);uv0=aUV;gl_Position=effects_MatrixVP*effects_ObjectToWorld*pos;}";
 
-var frag = "precision highp float;\n#define _MAX_STOPS 8\n#define PI 3.14159265359\nuniform vec4 _Color;uniform vec4 _Colors[_MAX_STOPS];uniform float _Stops[_MAX_STOPS];uniform int _StopsCount;uniform float _FillType;uniform vec2 _StartPoint;uniform vec2 _EndPoint;uniform sampler2D _ImageTex;uniform vec2 _ImageSize;uniform vec2 _DestSize;uniform int _ImageScaleMode;uniform mat3 _ImageTransform;uniform float _ImageScalingFactor;uniform float _ImageOpacity;varying vec2 uv0;vec4 smoothMix(vec4 a,vec4 b,float t){return mix(a,b,smoothstep(0.0,1.0,t));}float calculateAngleRatio(vec2 v1,vec2 v2){float angle=atan(v2.y,v2.x)-atan(v1.y,v1.x);if(angle<0.0)angle+=2.0*PI;return angle/(2.0*PI);}vec2 applyTransform(mat3 m,vec2 uv){vec3 p=m*vec3(uv,1.0);return p.xy;}void main(){vec4 finalColor=vec4(1.0);if(_FillType==0.0){finalColor=_Color;}else if(_FillType==1.0||_FillType==2.0||_FillType==3.0){float t=0.0;if(_FillType==1.0){vec2 gradientVector=_EndPoint-_StartPoint;vec2 pixelVector=uv0-_StartPoint;float denom=max(dot(gradientVector,gradientVector),1e-6);t=clamp(dot(pixelVector,gradientVector)/denom,0.0,1.0);}else if(_FillType==2.0){float maxRadius=max(distance(_EndPoint,_StartPoint),0.001);t=clamp(distance(uv0,_StartPoint)/maxRadius,0.0,1.0);}else{vec2 center=_StartPoint;vec2 referenceVector=_EndPoint-center;vec2 targetVector=uv0-center;if(length(targetVector)>0.001){t=calculateAngleRatio(referenceVector,targetVector);}}finalColor=_Colors[0];for(int i=1;i<_MAX_STOPS;i++){if(i>=_StopsCount)break;float prevStop=_Stops[i-1];float currStop=_Stops[i];if(t>=prevStop&&t<=currStop){float localT=(t-prevStop)/max(currStop-prevStop,1e-6);finalColor=smoothMix(_Colors[i-1],_Colors[i],localT);break;}}}else if(_FillType==4.0){vec2 uv=uv0;float rSrc=_ImageSize.x/max(_ImageSize.y,1.0);float rDst=_DestSize.x/max(_DestSize.y,1.0);bool maskOutside=false;if(_ImageScaleMode==0){vec2 scale=vec2(1.0);if(rDst>rSrc){scale=vec2(1.0,rSrc/rDst);}else{scale=vec2(rDst/rSrc,1.0);}uv=(uv-0.5)*scale+0.5;uv=clamp(uv,0.0,1.0);}else if(_ImageScaleMode==1){vec2 scale=vec2(1.0);if(rDst>rSrc){scale=vec2(rSrc/rDst,1.0);}else{scale=vec2(1.0,rSrc/rDst);}uv=(uv-0.5)*scale+0.5;maskOutside=true;}else if(_ImageScaleMode==2){uv=applyTransform(_ImageTransform,uv0);maskOutside=true;}else if(_ImageScaleMode==3){float aspectFix=rDst/max(rSrc,1e-6);vec2 uvTile=(uv0-0.5)*vec2(aspectFix,1.0)+0.5;float s=max(abs(_ImageScalingFactor),1e-6);uv=fract(uvTile*s);}vec4 img=texture2D(_ImageTex,uv);if(maskOutside){if(uv.x<0.0||uv.x>1.0||uv.y<0.0||uv.y>1.0){img.a=0.0;}}img.a*=_ImageOpacity;finalColor=img;}finalColor.rgb*=finalColor.a;gl_FragColor=finalColor;}";
+var frag = "precision highp float;\n#define _MAX_STOPS 8\n#define PI 3.14159265359\nuniform vec4 _Color;uniform vec4 _Colors[_MAX_STOPS];uniform float _Stops[_MAX_STOPS];uniform int _StopsCount;uniform float _FillType;uniform vec2 _StartPoint;uniform vec2 _EndPoint;uniform sampler2D _ImageTex;uniform vec2 _ImageSize;uniform vec2 _DestSize;uniform int _ImageScaleMode;uniform mat3 _TextureTransform;uniform float _ImageScalingFactor;uniform float _ImageOpacity;varying vec2 uv0;vec4 smoothMix(vec4 a,vec4 b,float t){return mix(a,b,smoothstep(0.0,1.0,t));}float calculateAngleRatio(vec2 v1,vec2 v2){float angle=atan(v2.y,v2.x)-atan(v1.y,v1.x);if(angle<0.0)angle+=2.0*PI;return angle/(2.0*PI);}vec2 applyTransform(mat3 m,vec2 uv){uv=uv-vec2(0.5,0.5);vec3 p=m*vec3(uv,1.0);p.xy=p.xy+vec2(0.5,0.5);return p.xy;}void main(){vec4 finalColor=vec4(1.0);if(_FillType==0.0){finalColor=_Color;}else if(_FillType==1.0||_FillType==2.0||_FillType==3.0){float t=0.0;if(_FillType==1.0){vec2 gradientVector=_EndPoint-_StartPoint;vec2 pixelVector=uv0-_StartPoint;float denom=max(dot(gradientVector,gradientVector),1e-6);t=clamp(dot(pixelVector,gradientVector)/denom,0.0,1.0);}else if(_FillType==2.0){float maxRadius=max(distance(_EndPoint,_StartPoint),0.001);t=clamp(distance(uv0,_StartPoint)/maxRadius,0.0,1.0);}else{vec2 center=_StartPoint;vec2 referenceVector=_EndPoint-center;vec2 targetVector=uv0-center;if(length(targetVector)>0.001){t=calculateAngleRatio(referenceVector,targetVector);}}finalColor=_Colors[0];for(int i=1;i<_MAX_STOPS;i++){if(i>=_StopsCount)break;float prevStop=_Stops[i-1];float currStop=_Stops[i];if(t>=prevStop&&t<=currStop){float localT=(t-prevStop)/max(currStop-prevStop,1e-6);finalColor=smoothMix(_Colors[i-1],_Colors[i],localT);break;}}}else if(_FillType==4.0){vec2 uv=uv0;float rSrc=_ImageSize.x/max(_ImageSize.y,1.0);float rDst=_DestSize.x/max(_DestSize.y,1.0);bool maskOutside=false;if(_ImageScaleMode==0){vec2 scale=vec2(1.0);if(rDst>rSrc){scale=vec2(1.0,rSrc/rDst);}else{scale=vec2(rDst/rSrc,1.0);}uv=(uv-0.5)*scale+0.5;uv=clamp(uv,0.0,1.0);}else if(_ImageScaleMode==1){vec2 scale=vec2(1.0);if(rDst>rSrc){scale=vec2(rSrc/rDst,1.0);}else{scale=vec2(1.0,rSrc/rDst);}uv=(uv-0.5)*scale+0.5;maskOutside=true;}else if(_ImageScaleMode==2){uv=applyTransform(_TextureTransform,uv0);maskOutside=true;}else if(_ImageScaleMode==3){float aspectFix=rDst/max(rSrc,1e-6);vec2 uvTile=(uv0-0.5)*vec2(aspectFix,1.0)+0.5;float s=max(abs(_ImageScalingFactor),1e-6);uv=fract(uvTile*s);}vec4 img=texture2D(_ImageTex,uv);if(maskOutside){if(uv.x<0.0||uv.x>1.0||uv.y<0.0||uv.y>1.0){img.a=0.0;}}img.a*=_ImageOpacity;finalColor=img;}finalColor.rgb*=finalColor.a;gl_FragColor=finalColor;}";
 
-exports.FillType = void 0;
-(function(FillType) {
-    FillType[FillType["Solid"] = 0] = "Solid";
-    FillType[FillType["GradientLinear"] = 1] = "GradientLinear";
-    FillType[FillType["GradientRadial"] = 2] = "GradientRadial";
-    FillType[FillType["GradientAngular"] = 3] = "GradientAngular";
-    FillType[FillType["Texture"] = 4] = "Texture";
-})(exports.FillType || (exports.FillType = {}));
 exports.TexturePaintScaleMode = void 0;
 (function(TexturePaintScaleMode) {
     TexturePaintScaleMode[TexturePaintScaleMode["Fill"] = 0] = "Fill";
@@ -16308,6 +16291,9 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
             join: LineJoin.Miter,
             miterLimit: 10
         };
+        _this.strokeWidth = 1;
+        _this.strokeCap = LineCap.Butt;
+        _this.strokeJoin = LineJoin.Miter;
         _this.strokes = [];
         /**
    * 用于点击测试的碰撞器
@@ -16341,12 +16327,12 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
         // Create Shape Attrributes
         //-------------------------------------------------------------------------
         var gradientStrokeFill = {
-            type: 0,
+            type: FillType.Solid,
             color: new Color(1, 1, 1, 1)
         };
         _this.strokes.push(gradientStrokeFill);
         var gradientLayerFill = {
-            type: 0,
+            type: FillType.Solid,
             color: new Color(1, 1, 1, 1)
         };
         _this.fills.push(gradientLayerFill);
@@ -16510,6 +16496,9 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
                 indices.length;
                 var vertOffset1 = vertices.length / 2;
                 var lineStyle = this.strokeAttributes;
+                lineStyle.cap = this.strokeCap;
+                lineStyle.join = this.strokeJoin;
+                lineStyle.width = this.strokeWidth;
                 var close = true;
                 if (this.shapeAttributes.type === ShapePrimitiveType.Custom) {
                     close = shape1.closePath;
@@ -16674,11 +16663,11 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
     };
     _proto.updatePaintMaterial = function updatePaintMaterial(material, paint) {
         material.setFloat("_FillType", paint.type);
-        if (paint.type === 0) {
+        if (paint.type === FillType.Solid) {
             material.color = paint.color;
-        } else if (paint.type === 1 || paint.type === 3 || paint.type === 2) {
+        } else if (paint.type === FillType.GradientLinear || paint.type === FillType.GradientAngular || paint.type === FillType.GradientRadial) {
             this.updateGradientMaterial(material, paint.gradientStops, paint.startPoint, paint.endPoint);
-        } else if (paint.type === 4) {
+        } else if (paint.type === FillType.Texture) {
             material.setInt("_ImageScaleMode", paint.scaleMode);
             material.setVector2("_ImageSize", new Vector2(paint.texture.getWidth(), paint.texture.getHeight()));
             var boundingBox = this.getBoundingBox();
@@ -16688,6 +16677,8 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
             material.setFloat("_ImageOpacity", paint.opacity);
             material.setFloat("_ImageScalingFactor", paint.scalingFactor);
             material.setTexture("_ImageTex", paint.texture);
+            var transform = paint.textureTransform;
+            material.setMatrix3("_TextureTransform", new Matrix3().scale(transform.scale.x, transform.scale.y).rotate(transform.rotation).translate(transform.offset.x, transform.offset.y).invert());
         }
     };
     _proto.updateGradientMaterial = function updateGradientMaterial(material, gradient, startPoint, endPoint) {
@@ -16723,17 +16714,12 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
             side: (_renderer_side = renderer.side) != null ? _renderer_side : SideMode.DOUBLE,
             mask: this.maskManager.getRefValue()
         };
-        var strokeAttributes = data.stroke;
-        if (strokeAttributes) {
-            this.strokeAttributes = {
-                width: strokeAttributes.width,
-                alignment: 0.5,
-                cap: strokeAttributes.cap,
-                join: strokeAttributes.join,
-                miterLimit: 10
-            };
-        }
-        //@ts-expect-error
+        var _data_strokeCap;
+        this.strokeCap = (_data_strokeCap = data.strokeCap) != null ? _data_strokeCap : LineCap.Butt;
+        var _data_strokeWidth;
+        this.strokeWidth = (_data_strokeWidth = data.strokeWidth) != null ? _data_strokeWidth : 1;
+        var _data_strokeJoin;
+        this.strokeJoin = (_data_strokeJoin = data.strokeJoin) != null ? _data_strokeJoin : LineJoin.Miter;
         for(var _iterator = _create_for_of_iterator_helper_loose(data.strokes), _step; !(_step = _iterator()).done;){
             var stroke = _step.value;
             var strokeParam = stroke;
@@ -16742,7 +16728,6 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
                 this.strokes[0] = this.createPaint(strokeParam);
             }
         }
-        //@ts-expect-error
         for(var _iterator1 = _create_for_of_iterator_helper_loose(data.fills), _step1; !(_step1 = _iterator1()).done;){
             var fill = _step1.value;
             var fillParam = fill;
@@ -16832,7 +16817,7 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
     _proto.createPaint = function createPaint(paintData) {
         var paint;
         switch(paintData.type){
-            case 0:
+            case FillType.Solid:
                 {
                     paint = {
                         type: paintData.type,
@@ -16840,9 +16825,9 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
                     };
                     break;
                 }
-            case 1:
-            case 3:
-            case 2:
+            case FillType.GradientLinear:
+            case FillType.GradientAngular:
+            case FillType.GradientRadial:
                 {
                     paint = {
                         type: paintData.type,
@@ -16852,15 +16837,32 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
                     };
                     break;
                 }
-            case 4:
+            case FillType.Texture:
                 {
+                    var _paintData_textureTransform;
+                    var textureTransform = _extends({
+                        offset: {
+                            x: 0,
+                            y: 0
+                        },
+                        rotation: 0,
+                        scale: {
+                            x: 1,
+                            y: 1
+                        }
+                    }, (_paintData_textureTransform = paintData.textureTransform) != null ? _paintData_textureTransform : {});
                     var _paintData_scalingFactor, _paintData_opacity;
                     paint = {
                         type: paintData.type,
                         texture: this.engine.findObject(paintData.texture),
                         scaleMode: paintData.scaleMode,
                         scalingFactor: (_paintData_scalingFactor = paintData.scalingFactor) != null ? _paintData_scalingFactor : 1,
-                        opacity: (_paintData_opacity = paintData.opacity) != null ? _paintData_opacity : 1
+                        opacity: (_paintData_opacity = paintData.opacity) != null ? _paintData_opacity : 1,
+                        textureTransform: {
+                            offset: new Vector2().copyFrom(textureTransform.offset),
+                            rotation: textureTransform.rotation,
+                            scale: new Vector2().copyFrom(textureTransform.scale)
+                        }
                     };
                     break;
                 }
@@ -22824,6 +22826,25 @@ var Vector4PropertyMixerPlayable = /*#__PURE__*/ function(PropertyMixerPlayable)
     };
     return Vector4PropertyMixerPlayable;
 }(PropertyMixerPlayable);
+var Vector3PropertyMixerPlayable = /*#__PURE__*/ function(PropertyMixerPlayable) {
+    _inherits(Vector3PropertyMixerPlayable, PropertyMixerPlayable);
+    function Vector3PropertyMixerPlayable() {
+        return PropertyMixerPlayable.apply(this, arguments);
+    }
+    var _proto = Vector3PropertyMixerPlayable.prototype;
+    _proto.resetPropertyValue = function resetPropertyValue() {
+        this.propertyValue.x = 0;
+        this.propertyValue.y = 0;
+        this.propertyValue.z = 0;
+    };
+    _proto.addWeightedValue = function addWeightedValue(curveValue, weight) {
+        var result = this.propertyValue;
+        result.x += curveValue.x * weight;
+        result.y += curveValue.y * weight;
+        result.z += curveValue.z * weight;
+    };
+    return Vector3PropertyMixerPlayable;
+}(PropertyMixerPlayable);
 var Vector2PropertyMixerPlayable = /*#__PURE__*/ function(PropertyMixerPlayable) {
     _inherits(Vector2PropertyMixerPlayable, PropertyMixerPlayable);
     function Vector2PropertyMixerPlayable() {
@@ -22978,7 +22999,7 @@ var tempPos = new Vector3();
     };
     return TransformPlayable;
 }(Playable);
-var TransformPlayableAsset = /*#__PURE__*/ function(PlayableAsset) {
+exports.TransformPlayableAsset = /*#__PURE__*/ function(PlayableAsset) {
     _inherits(TransformPlayableAsset, PlayableAsset);
     function TransformPlayableAsset() {
         return PlayableAsset.apply(this, arguments);
@@ -22994,9 +23015,9 @@ var TransformPlayableAsset = /*#__PURE__*/ function(PlayableAsset) {
     };
     return TransformPlayableAsset;
 }(PlayableAsset);
-TransformPlayableAsset = __decorate([
+exports.TransformPlayableAsset = __decorate([
     effectsClass(DataType.TransformPlayableAsset)
-], TransformPlayableAsset);
+], exports.TransformPlayableAsset);
 
 /**
  * @since 2.0.0
@@ -23350,6 +23371,22 @@ exports.Vector4PropertyTrack = /*#__PURE__*/ function(PropertyTrack) {
 exports.Vector4PropertyTrack = __decorate([
     effectsClass(DataType.Vector4PropertyTrack)
 ], exports.Vector4PropertyTrack);
+exports.Vector3PropertyTrack = /*#__PURE__*/ function(PropertyTrack) {
+    _inherits(Vector3PropertyTrack, PropertyTrack);
+    function Vector3PropertyTrack() {
+        return PropertyTrack.apply(this, arguments);
+    }
+    var _proto = Vector3PropertyTrack.prototype;
+    _proto.createTrackMixer = function createTrackMixer() {
+        var mixer = new Vector3PropertyMixerPlayable();
+        mixer.propertyPath = this.path;
+        return mixer;
+    };
+    return Vector3PropertyTrack;
+}(PropertyTrack);
+exports.Vector3PropertyTrack = __decorate([
+    effectsClass(DataType.Vector3PropertyTrack)
+], exports.Vector3PropertyTrack);
 exports.Vector2PropertyTrack = /*#__PURE__*/ function(PropertyTrack) {
     _inherits(Vector2PropertyTrack, PropertyTrack);
     function Vector2PropertyTrack() {
@@ -23364,7 +23401,7 @@ exports.Vector2PropertyTrack = /*#__PURE__*/ function(PropertyTrack) {
     return Vector2PropertyTrack;
 }(PropertyTrack);
 exports.Vector2PropertyTrack = __decorate([
-    effectsClass("Vector2PropertyTrack")
+    effectsClass(DataType.Vector2PropertyTrack)
 ], exports.Vector2PropertyTrack);
 
 exports.ColorPropertyTrack = /*#__PURE__*/ function(PropertyTrack) {
@@ -23529,6 +23566,26 @@ __decorate([
 exports.Vector4PropertyPlayableAsset = __decorate([
     effectsClass(DataType.Vector4PropertyPlayableAsset)
 ], exports.Vector4PropertyPlayableAsset);
+exports.Vector3ropertyPlayableAsset = /*#__PURE__*/ function(PlayableAsset) {
+    _inherits(Vector3ropertyPlayableAsset, PlayableAsset);
+    function Vector3ropertyPlayableAsset() {
+        return PlayableAsset.apply(this, arguments);
+    }
+    var _proto = Vector3ropertyPlayableAsset.prototype;
+    _proto.createPlayable = function createPlayable() {
+        var clipPlayable = new PropertyClipPlayable();
+        clipPlayable.curve = createValueGetter(this.curveData);
+        clipPlayable.value = clipPlayable.curve.getValue(0);
+        return clipPlayable;
+    };
+    return Vector3ropertyPlayableAsset;
+}(PlayableAsset);
+__decorate([
+    serialize()
+], exports.Vector3ropertyPlayableAsset.prototype, "curveData", void 0);
+exports.Vector3ropertyPlayableAsset = __decorate([
+    effectsClass(DataType.Vector3PropertyPlayableAsset)
+], exports.Vector3ropertyPlayableAsset);
 exports.Vector2PropertyPlayableAsset = /*#__PURE__*/ function(PlayableAsset) {
     _inherits(Vector2PropertyPlayableAsset, PlayableAsset);
     function Vector2PropertyPlayableAsset() {
@@ -24165,7 +24222,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
         _this.rootItem.endBehavior = sourceContent.endBehavior;
         _this.rootItem.composition = _assert_this_initialized(_this);
         // Create rootItem components
-        //@ts-expect-error TODO update spec.
         var componentPaths = sourceContent.components;
         for(var _iterator2 = _create_for_of_iterator_helper_loose(componentPaths), _step2; !(_step2 = _iterator2()).done;){
             var componentPath = _step2.value;
@@ -24879,9 +24935,6 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
         /**
    * 元素组件是否显示，用于批量开关元素组件
    */ _this.visible = true;
-        /**
-   * 元素动画的速度
-   */ _this.speed = 1;
         _this.listIndex = 0;
         _this.isEnabled = false;
         _this.eventProcessor = new EventEmitter();
@@ -24939,18 +24992,6 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
         return this.eventProcessor.getListeners(eventName);
     };
     /**
-   * 设置元素的动画速度
-   * @param speed - 速度
-   */ _proto.setSpeed = function setSpeed(speed) {
-        this.speed = speed;
-    };
-    /**
-   * 获取元素的动画速度
-   * @returns
-   */ _proto.getSpeed = function getSpeed() {
-        return this.speed;
-    };
-    /**
    * 添加组件
    * @param classConstructor - 要添加的组件
    */ _proto.addComponent = function addComponent(classConstructor) {
@@ -30410,8 +30451,11 @@ function version33Migration(json) {
         var compositionComponent = {
             id: generateGUID(),
             dataType: "CompositionComponent",
+            //@ts-expect-error
             items: composition.items,
+            //@ts-expect-error
             timelineAsset: composition.timelineAsset,
+            //@ts-expect-error
             sceneBindings: composition.sceneBindings,
             item: {
                 id: composition.id
@@ -30421,7 +30465,6 @@ function version33Migration(json) {
         composition.timelineAsset = undefined;
         //@ts-expect-error
         composition.sceneBindings = undefined;
-        //@ts-expect-error
         composition.components = [
             {
                 id: compositionComponent.id
@@ -30451,8 +30494,6 @@ function version34Migration(json) {
     // 修复合成组件的 item id 问题
     for(var _iterator1 = _create_for_of_iterator_helper_loose(json.compositions), _step1; !(_step1 = _iterator1()).done;){
         var composition = _step1.value;
-        // TODO: Update spec
-        //@ts-expect-error
         for(var _iterator2 = _create_for_of_iterator_helper_loose(composition.components), _step2; !(_step2 = _iterator2()).done;){
             var component = _step2.value;
             var componentID = component.id;
@@ -30477,28 +30518,35 @@ function version34Migration(json) {
         }
         if (componentData1.dataType === DataType.ShapeComponent) {
             var shapeComponentData = componentData1;
-            //@ts-expect-error
             shapeComponentData.fills = [];
+            //@ts-expect-error
             if (shapeComponentData.fill) {
                 var solidPaintData = {
-                    type: exports.FillType.Solid,
+                    type: FillType.Solid,
+                    //@ts-expect-error
                     color: shapeComponentData.fill.color
                 };
-                //@ts-expect-error
                 shapeComponentData.fills.push(solidPaintData);
             }
-            delete shapeComponentData.fill;
             //@ts-expect-error
+            delete shapeComponentData.fill;
             shapeComponentData.strokes = [];
+            //@ts-expect-error
             if (shapeComponentData.stroke) {
                 var solidPaintData1 = {
-                    type: exports.FillType.Solid,
+                    type: FillType.Solid,
+                    //@ts-expect-error
                     color: shapeComponentData.stroke.color
                 };
-                //@ts-expect-error
                 shapeComponentData.strokes.push(solidPaintData1);
                 //@ts-expect-error
-                shapeComponentData.stroke.color = undefined;
+                shapeComponentData.strokeWidth = shapeComponentData.stroke.width;
+                //@ts-expect-error
+                shapeComponentData.strokeCap = shapeComponentData.stroke.cap;
+                //@ts-expect-error
+                shapeComponentData.strokeJoin = shapeComponentData.stroke.join;
+                //@ts-expect-error
+                delete shapeComponentData.stroke;
             }
         }
     }
@@ -30572,6 +30620,7 @@ function version34Migration(json) {
     return geometryData;
 }
 function processContent(composition) {
+    //@ts-expect-error
     for(var _iterator = _create_for_of_iterator_helper_loose(composition.items), _step; !(_step = _iterator()).done;){
         var item = _step.value;
         var itemProps = itemMap.get(item.id);
@@ -30661,6 +30710,7 @@ function processMask(renderContent) {
             };
         });
         var compositionData = _extends({}, composition, {
+            //@ts-expect-error
             timelineAsset: {
                 id: ""
             },
@@ -30703,7 +30753,6 @@ function processMask(renderContent) {
             result.textures.push({
                 id: generateGUID(),
                 dataType: DataType.Texture,
-                //@ts-expect-error
                 source: {
                     id: result.images[i].id
                 },
@@ -30957,6 +31006,7 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
         //@ts-expect-error
         dataType: "TimelineAsset"
     };
+    //@ts-expect-error
     for(var _iterator = _create_for_of_iterator_helper_loose(composition.items), _step; !(_step = _iterator()).done;){
         var itemDataPath = _step.value;
         var item = guidToItemMap[itemDataPath.id];
@@ -31096,9 +31146,11 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
             id: trackData.id
         });
     }
+    //@ts-expect-error
     composition.timelineAsset = {
         id: timelineAssetData.id
     };
+    //@ts-expect-error
     composition.sceneBindings = sceneBindings;
     jsonScene.miscs.push(timelineAssetData);
     for(var _iterator2 = _create_for_of_iterator_helper_loose(trackDatas), _step2; !(_step2 = _iterator2()).done;){
@@ -31424,7 +31476,7 @@ function getStandardSpriteContent(sprite, transform) {
     return ret;
 }
 
-var version$2 = "2.7.0-alpha.0";
+var version$2 = "2.7.0-alpha.2";
 var v0 = /^(\d+)\.(\d+)\.(\d+)(-(\w+)\.\d+)?$/;
 var standardVersion = /^(\d+)\.(\d+)$/;
 var reverseParticle = false;
@@ -34697,7 +34749,7 @@ registerPlugin("sprite", SpriteLoader, exports.VFXItem);
 registerPlugin("particle", ParticleLoader, exports.VFXItem);
 registerPlugin("cal", CalculateLoader, exports.VFXItem);
 registerPlugin("interact", InteractLoader, exports.VFXItem);
-var version$1 = "2.7.0-alpha.0";
+var version$1 = "2.7.0-alpha.2";
 logger.info("Core version: " + version$1 + ".");
 
 var _obj;
@@ -36293,10 +36345,12 @@ setMaxSpriteMeshItemCount(8);
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.7.0-alpha.0";
+var version = "2.7.0-alpha.2";
 logger.info("THREEJS plugin version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;
+exports.ActivationMixerPlayable = ActivationMixerPlayable;
+exports.ActivationPlayable = ActivationPlayable;
 exports.AndNode = AndNode;
 exports.Animatable = Animatable;
 exports.AnimationClipNode = AnimationClipNode;
@@ -36324,6 +36378,7 @@ exports.Camera = Camera;
 exports.CameraVFXItemLoader = CameraVFXItemLoader;
 exports.ColorCurve = ColorCurve;
 exports.ColorPlayable = ColorPlayable;
+exports.ColorPropertyMixerPlayable = ColorPropertyMixerPlayable;
 exports.Component = Component;
 exports.ComponentTimePlayable = ComponentTimePlayable;
 exports.ComponentTimePlayableAsset = ComponentTimePlayableAsset;
@@ -36354,6 +36409,7 @@ exports.EventSystem = EventSystem;
 exports.Float16ArrayWrapper = Float16ArrayWrapper;
 exports.FloatComparisonNode = FloatComparisonNode;
 exports.FloatComparisonNodeData = FloatComparisonNodeData;
+exports.FloatPropertyMixerPlayable = FloatPropertyMixerPlayable;
 exports.FloatValueNode = FloatValueNode;
 exports.Framebuffer = Framebuffer;
 exports.GPUCapability = GPUCapability;
@@ -36387,6 +36443,7 @@ exports.ParticleBehaviourPlayable = ParticleBehaviourPlayable;
 exports.ParticleBehaviourPlayableAsset = ParticleBehaviourPlayableAsset;
 exports.ParticleLoader = ParticleLoader;
 exports.ParticleMesh = ParticleMesh;
+exports.ParticleMixerPlayable = ParticleMixerPlayable;
 exports.ParticleSystemRenderer = ParticleSystemRenderer;
 exports.ParticleTrack = ParticleTrack;
 exports.PassTextureCache = PassTextureCache;
@@ -36399,6 +36456,7 @@ exports.PolyStar = PolyStar;
 exports.Polygon = Polygon;
 exports.Pose = Pose;
 exports.PoseNode = PoseNode;
+exports.PropertyClipPlayable = PropertyClipPlayable;
 exports.PropertyTrack = PropertyTrack;
 exports.RENDER_PASS_NAME_PREFIX = RENDER_PASS_NAME_PREFIX;
 exports.RENDER_PREFER_LOOKUP_TEXTURE = RENDER_PREFER_LOOKUP_TEXTURE;
@@ -36426,11 +36484,14 @@ exports.SerializationHelper = SerializationHelper;
 exports.ShaderFactory = ShaderFactory;
 exports.ShaderVariant = ShaderVariant;
 exports.ShapePath = ShapePath;
+exports.SpriteColorMixerPlayable = SpriteColorMixerPlayable;
 exports.SpriteComponentTimeTrack = SpriteComponentTimeTrack;
 exports.SpriteLoader = SpriteLoader;
 exports.StateMachineNode = StateMachineNode;
 exports.StateNode = StateNode;
 exports.StaticValue = StaticValue;
+exports.SubCompositionClipPlayable = SubCompositionClipPlayable;
+exports.SubCompositionMixerPlayable = SubCompositionMixerPlayable;
 exports.TEMPLATE_USE_OFFSCREEN_CANVAS = TEMPLATE_USE_OFFSCREEN_CANVAS;
 exports.TEXTURE_UNIFORM_MAP = TEXTURE_UNIFORM_MAP;
 exports.TextComponentBase = TextComponentBase;
@@ -36447,13 +36508,19 @@ exports.ThreeTexture = ThreeTexture;
 exports.Ticker = Ticker;
 exports.TimelineClip = TimelineClip;
 exports.TimelineInstance = TimelineInstance;
+exports.TrackMixerPlayable = TrackMixerPlayable;
 exports.Transform = Transform;
+exports.TransformMixerPlayable = TransformMixerPlayable;
+exports.TransformPlayable = TransformPlayable;
 exports.TransitionNode = TransitionNode;
 exports.ValueGetter = ValueGetter;
 exports.ValueNode = ValueNode;
 exports.Vector2Curve = Vector2Curve;
+exports.Vector2PropertyMixerPlayable = Vector2PropertyMixerPlayable;
 exports.Vector3Curve = Vector3Curve;
+exports.Vector3PropertyMixerPlayable = Vector3PropertyMixerPlayable;
 exports.Vector4Curve = Vector4Curve;
+exports.Vector4PropertyMixerPlayable = Vector4PropertyMixerPlayable;
 exports.addByOrder = addByOrder;
 exports.addItem = addItem;
 exports.addItemWithOrder = addItemWithOrder;