@galacean/effects-core 2.1.2 → 2.1.3-alpha.1

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.1.2
+ * Version: v2.1.3-alpha.1
  */
 
 'use strict';
@@ -10143,7 +10143,7 @@ var itemFrameFrag = "#version 100\nprecision highp float;vec4 blendColor(vec4 co
 
 var integrate = "float calculateMovement(float t,vec2 p1,vec2 p2,vec2 p3,vec2 p4){float movement=0.0;float h=(t-p1.x)*0.05;for(int i=0;i<=20;i++){float t=float(i)*h;float nt=binarySearchT(t,p1.x,p2.x,p3.x,p4.x);float y=cubicBezier(nt,p1.y,p2.y,p3.y,p4.y);float weight=(i==0||i==20)? 1.0 :(mod(float(i),2.)!=0.)? 4.0 : 2.0;movement+=weight*y;}movement*=h/3.;return movement;}float integrateFromBezierCurveFrames(float time,float frameStart,float frameCount){int start=int(frameStart);int count=int(frameCount-1.);float ret=0.;for(int i=0;i<ITR_END;i+=2){vec4 k0=lookup_curve(i+start);vec4 k1=lookup_curve(i+1+start);if(i==0&&time<k0.x){return ret;}vec2 p1=vec2(k0.x,k0.y);vec2 p2=vec2(k0.z,k0.w);vec2 p3=vec2(k1.z,k1.w);vec2 p4=vec2(k1.x,k1.y);if(time>=k1.x){ret+=calculateMovement(k1.x,p1,p2,p3,p4);}if(time>=k0.x&&time<k1.x){return ret+calculateMovement(time,p1,p2,p3,p4);}}return ret;}float integrateByTimeLineSeg(float t,vec2 p0,vec2 p1){float t0=p0.x;float t1=p1.x;float y0=p0.y;float y1=p1.y;vec4 tSqr=vec4(t,t,t0,t0);tSqr=tSqr*tSqr;vec4 a=vec4(2.*t,3.,-t0,3.)*tSqr;float t1y0=t1*y0;vec4 b=vec4(y0-y1,t0*y1-t1y0,2.*y0+y1,t1y0);float r=dot(a,b);return r/(t0-t1)*0.16666667;}float integrateLineSeg(float time,vec2 p0,vec2 p1){float h=time-p0.x;float y0=p0.y;return(y0+y0+(p1.y-y0)*h/(p1.x-p0.x))*h/2.;}float integrateFromLineSeg(float time,float frameStart,float frameCount){if(time==0.){return 0.;}int start=int(frameStart);int count=int(frameCount-1.);float ret=0.;for(int i=0;i<ITR_END;i++){if(i>count){return ret;}vec4 ks=lookup_curve(i+start);vec2 k0=ks.xy;vec2 k1=ks.zw;if(time>k0.x&&time<=k1.x){return ret+integrateLineSeg(time,k0,k1);}ret+=integrateLineSeg(k1.x,k0,k1);vec2 k2=lookup_curve(i+start+1).xy;if(time>k1.x&&time<=k2.x){return ret+integrateLineSeg(time,k1,k2);}ret+=integrateLineSeg(k2.x,k1,k2);}return ret;}float integrateByTimeFromLineSeg(float time,float frameStart,float frameCount){if(time==0.){return 0.;}int start=int(frameStart);int count=int(frameCount-1.);float ret=0.;for(int i=0;i<ITR_END;i++){if(i>count){return ret;}vec4 ks=lookup_curve(i+start);vec2 k0=ks.xy;vec2 k1=ks.zw;if(time>k0.x&&time<=k1.x){return ret+integrateByTimeLineSeg(time,k0,k1);}ret+=integrateByTimeLineSeg(k1.x,k0,k1);vec2 k2=lookup_curve(i+start+1).xy;if(time>k1.x&&time<=k2.x){return ret+integrateByTimeLineSeg(time,k1,k2);}ret+=integrateByTimeLineSeg(k2.x,k1,k2);}return ret;}float getIntegrateFromTime0(float t1,vec4 value){float type=value.x;if(type==0.){return value.y*t1;}if(type==1.){vec2 p0=vec2(0.,value.y);vec2 p1=vec2(value.w,value.z);return integrateLineSeg(t1,p0,p1);}if(type==3.){return integrateFromLineSeg(t1,value.y,value.z);}if(type==4.){return mix(value.y,value.z,aSeed)*t1;}if(type==5.){return integrateFromBezierCurveFrames(t1,value.z,value.w);}return 0.;}float getIntegrateByTimeFromTime(float t0,float t1,vec4 value){float type=value.x;if(type==0.){return value.y*(t1*t1-t0*t0)/2.;}else if(type==1.){vec2 p0=vec2(0.,value.y);vec2 p1=vec2(value.w,value.z);return integrateByTimeLineSeg(t1,p0,p1)-integrateByTimeLineSeg(t0,p0,p1);}if(type==3.){return integrateByTimeFromLineSeg(t1,value.y,value.z)-integrateByTimeFromLineSeg(t0,value.y,value.z);}if(type==4.){return mix(value.y,value.z,aSeed)*(t1*t1-t0*t0)/2.;}if(type==5.){return integrateFromBezierCurveFrames(t1,value.z,value.w)-integrateFromBezierCurveFrames(t0,value.z,value.w);}return 0.;}";
 
-var itemVert = "precision highp float;attribute vec2 atlasOffset;attribute vec3 aPos;varying vec2 vTexCoord;varying vec3 vParams;varying vec4 vColor;uniform vec2 _Size;uniform vec4 _Color;uniform vec4 _TexParams;uniform vec4 _TexOffset;uniform mat4 effects_MatrixVP;uniform mat4 effects_MatrixInvV;uniform mat4 effects_ObjectToWorld;\n#ifdef ENV_EDITOR\nuniform vec4 uEditorTransform;\n#endif\nvoid main(){vec4 texParams=_TexParams;vTexCoord=vec2(atlasOffset.xy*_TexOffset.zw+_TexOffset.xy);vColor=_Color;vParams=vec3(0.0,texParams.y,texParams.x);vec4 pos=vec4(aPos.xy*_Size,aPos.z,1.0);gl_Position=effects_MatrixVP*effects_ObjectToWorld*pos;\n#ifdef ENV_EDITOR\ngl_Position=vec4(gl_Position.xy*uEditorTransform.xy+uEditorTransform.zw*gl_Position.w,gl_Position.zw);\n#endif\n}";
+var itemVert = "precision highp float;attribute vec2 atlasOffset;attribute vec3 aPos;varying vec2 vTexCoord;varying vec3 vParams;varying vec4 vColor;uniform vec2 _Size;uniform vec3 _Scale;uniform vec4 _Color;uniform vec4 _TexParams;uniform vec4 _TexOffset;uniform mat4 effects_MatrixVP;uniform mat4 effects_ObjectToWorld;uniform mat4 effects_MatrixV;\n#ifdef ENV_EDITOR\nuniform vec4 uEditorTransform;\n#endif\nvoid main(){vec4 texParams=_TexParams;vTexCoord=vec2(atlasOffset.xy*_TexOffset.zw+_TexOffset.xy);vColor=_Color;vParams=vec3(0.0,texParams.y,texParams.x);if(texParams.z==1.0){vec4 pos=vec4(aPos.xy*_Size,aPos.z,1.0);gl_Position=effects_MatrixVP*effects_ObjectToWorld*pos;}else{mat4 view=effects_MatrixV;vec3 camRight=vec3(view[0][0],view[1][0],view[2][0]);vec3 camUp=vec3(view[0][1],view[1][1],view[2][1]);vec3 worldPosition=vec3(effects_ObjectToWorld*vec4(0.0,0.0,0.0,1.0));vec3 vertexPosition=worldPosition+camRight*aPos.x*_Size.x*_Scale.x+camUp*aPos.y*_Size.y*_Scale.y;gl_Position=effects_MatrixVP*vec4(vertexPosition,1.0);}\n#ifdef ENV_EDITOR\ngl_Position=vec4(gl_Position.xy*uEditorTransform.xy+uEditorTransform.zw*gl_Position.w,gl_Position.zw);\n#endif\n}";
 
 var itemFrag = "precision highp float;varying vec4 vColor;varying vec2 vTexCoord;varying vec3 vParams;uniform sampler2D _MainTex;vec4 blendColor(vec4 color,vec4 vc,float mode){vec4 ret=color*vc;float alpha=ret.a;if(mode==1.){ret.rgb*=alpha;}else if(mode==2.){ret.rgb*=alpha;ret.a=dot(ret.rgb,vec3(0.33333333));}else if(mode==3.){alpha=color.r*alpha;ret=vec4(vc.rgb*alpha,alpha);}return ret;}void main(){vec4 color=vec4(0.);vec4 texColor=texture2D(_MainTex,vTexCoord.xy);color=blendColor(texColor,vColor,floor(0.5+vParams.y));if(vParams.z==0.&&color.a<0.04){discard;}color.a=clamp(color.a,0.0,1.0);gl_FragColor=color;}";
 
@@ -13218,7 +13218,7 @@ var ColorCurve = /*#__PURE__*/ function(ValueGetter) {
             }
         };
         _this.renderer = {
-            renderMode: RenderMode.BILLBOARD,
+            renderMode: RenderMode.MESH,
             blending: BlendingMode.ALPHA,
             texture: _this.engine.emptyTexture,
             occlusion: false,
@@ -13292,6 +13292,9 @@ var ColorCurve = /*#__PURE__*/ function(ValueGetter) {
             renderer.setGlobalMatrix("effects_ObjectToWorld", this.transform.getWorldMatrix());
         }
         this.material.setVector2("_Size", this.transform.size);
+        if (this.renderer.renderMode === RenderMode.BILLBOARD || this.renderer.renderMode === RenderMode.VERTICAL_BILLBOARD || this.renderer.renderMode === RenderMode.HORIZONTAL_BILLBOARD) {
+            this.material.setVector3("_Scale", this.transform.scale);
+        }
         renderer.drawGeometry(geo, material);
     };
     _proto.onStart = function onStart() {
@@ -18808,7 +18811,7 @@ exports.SpriteComponent = /*#__PURE__*/ function(BaseRenderComponent) {
         this.interaction = interaction;
         var _renderer_renderMode, _renderer_blending, _renderer_texture, _renderer_side, _renderer_mask, _renderer_maskMode;
         this.renderer = {
-            renderMode: (_renderer_renderMode = renderer.renderMode) != null ? _renderer_renderMode : RenderMode.BILLBOARD,
+            renderMode: (_renderer_renderMode = renderer.renderMode) != null ? _renderer_renderMode : RenderMode.MESH,
             blending: (_renderer_blending = renderer.blending) != null ? _renderer_blending : BlendingMode.ALPHA,
             texture: (_renderer_texture = renderer.texture) != null ? _renderer_texture : this.engine.emptyTexture,
             occlusion: !!renderer.occlusion,
@@ -23902,6 +23905,9 @@ var SerializationHelper = /*#__PURE__*/ function() {
     _proto.onUpdate = function onUpdate(dt) {
         var time = this.time;
         this.timelinePlayable.setTime(time);
+        // The properties of the object may change dynamically,
+        // so reset the track binding to avoid invalidation of the previously obtained binding object.
+        this.resolveBindings();
         this.graph.evaluate(dt);
     };
     _proto.createContent = function createContent() {
@@ -24543,8 +24549,6 @@ var TimelinePlayable = /*#__PURE__*/ function(Playable) {
     };
     _proto.evaluate = function evaluate() {
         var time = this.getTime();
-        // update all tracks binding
-        this.updateTrackAnimatedObject(this.masterTrackInstances);
         // TODO search active clips
         for(var _iterator = _create_for_of_iterator_helper_loose(this.clips), _step; !(_step = _iterator()).done;){
             var clip = _step.value;
@@ -24582,17 +24586,6 @@ var TimelinePlayable = /*#__PURE__*/ function(Playable) {
             }
         }
     };
-    _proto.updateTrackAnimatedObject = function updateTrackAnimatedObject(trackInstances) {
-        for(var _iterator = _create_for_of_iterator_helper_loose(trackInstances), _step; !(_step = _iterator()).done;){
-            var trackInstance = _step.value;
-            var trackAsset = trackInstance.trackAsset;
-            // update track binding use custom method
-            trackAsset.updateAnimatedObject();
-            trackInstance.output.setUserData(trackAsset.boundObject);
-            // update children tracks
-            this.updateTrackAnimatedObject(trackInstance.children);
-        }
-    };
     return TimelinePlayable;
 }(Playable);
 var TrackSortWrapper = function TrackSortWrapper(track, originalIndex) {
@@ -24908,7 +24901,7 @@ exports.TextComponent = /*#__PURE__*/ function(BaseRenderComponent) {
         this.interaction = interaction;
         var _renderer_renderMode, _renderer_blending, _renderer_texture, _renderer_side, _renderer_mask, _renderer_maskMode;
         this.renderer = {
-            renderMode: (_renderer_renderMode = renderer.renderMode) != null ? _renderer_renderMode : RenderMode.BILLBOARD,
+            renderMode: (_renderer_renderMode = renderer.renderMode) != null ? _renderer_renderMode : RenderMode.MESH,
             blending: (_renderer_blending = renderer.blending) != null ? _renderer_blending : BlendingMode.ALPHA,
             texture: (_renderer_texture = renderer.texture) != null ? _renderer_texture : this.engine.emptyTexture,
             occlusion: !!renderer.occlusion,
@@ -27676,7 +27669,7 @@ 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, avif, imageURL, webpURL, avifURL, template, background, url, isVideo, loadFn, resultImage, e, compressed, src, bufferURL, _ref, url1, image, _tmp;
+                            var png, webp, avif, imageURL, webpURL, avifURL, id, template, background, url, isVideo, loadFn, resultImage, e, compressed, src, bufferURL, _ref, url1, image, _tmp;
                             return __generator(this, function(_state) {
                                 switch(_state.label){
                                     case 0:
@@ -27687,6 +27680,7 @@ var seed = 1;
                                         webpURL = webp && new URL(webp, baseUrl).href;
                                         // eslint-disable-next-line compat/compat
                                         avifURL = avif && new URL(avif, baseUrl).href;
+                                        id = img.id;
                                         if (!("template" in img)) return [
                                             3,
                                             8
@@ -27721,7 +27715,7 @@ var seed = 1;
                                             3,
                                             3
                                         ];
-                                        _this.sourceFrom[idx] = {
+                                        _this.sourceFrom[id] = {
                                             url: resultImage.src,
                                             type: exports.TextureSourceType.video
                                         };
@@ -27734,7 +27728,7 @@ var seed = 1;
                                         if (background && Array.isArray(url) && variables) {
                                             variables[background.name] = resultImage.src;
                                         }
-                                        _this.sourceFrom[idx] = {
+                                        _this.sourceFrom[id] = {
                                             url: resultImage.src,
                                             type: exports.TextureSourceType.image
                                         };
@@ -27771,7 +27765,7 @@ var seed = 1;
                                             }
                                             if (src) {
                                                 bufferURL = new URL(src, baseUrl).href;
-                                                _this.sourceFrom[idx] = {
+                                                _this.sourceFrom[id] = {
                                                     url: bufferURL,
                                                     type: exports.TextureSourceType.compressed
                                                 };
@@ -27812,7 +27806,7 @@ var seed = 1;
                                         _state.label = 13;
                                     case 13:
                                         _ref = _tmp, url1 = _ref.url, image = _ref.image;
-                                        _this.sourceFrom[idx] = {
+                                        _this.sourceFrom[id] = {
                                             url: url1,
                                             type: exports.TextureSourceType.image
                                         };
@@ -27904,7 +27898,7 @@ var seed = 1;
                     };
                 });
                 jobs = textures.map(/*#__PURE__*/ _async_to_generator(function(textureOptions, idx) {
-                    var e, source, id, image, texture;
+                    var e, source, id, image, imageId, texture;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -27940,11 +27934,13 @@ var seed = 1;
                                 throw new Error("Load texture " + idx + " fails, error message: " + e + ".");
                             case 4:
                                 source = textureOptions.source, id = textureOptions.id;
+                                imageId = "";
                                 if (!isObject(source)) return [
                                     3,
                                     5
                                 ];
                                 image = _this.assets[source.id];
+                                imageId = source.id;
                                 return [
                                     3,
                                     7
@@ -27963,7 +27959,7 @@ var seed = 1;
                                 _state.label = 7;
                             case 7:
                                 if (image) {
-                                    texture = createTextureOptionsBySource(image, _this.sourceFrom[idx], id);
+                                    texture = createTextureOptionsBySource(image, _this.sourceFrom[imageId], id);
                                     return [
                                         2,
                                         texture.sourceType === exports.TextureSourceType.compressed ? texture : _extends({}, texture, textureOptions)
@@ -31378,7 +31374,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.1.2";
+var version = "2.1.3-alpha.1";
 logger.info("Core version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;