@galacean/effects-core 2.1.0-alpha.0 → 2.1.0-alpha.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.mjs CHANGED
@@ -3,7 +3,7 @@
3
3
  * Description: Galacean Effects runtime core for the web
4
4
  * Author: Ant Group CO., Ltd.
5
5
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
6
- * Version: v2.1.0-alpha.0
6
+ * Version: v2.1.0-alpha.2
7
7
  */
8
8
 
9
9
  function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
@@ -4685,7 +4685,13 @@ function getDirectStore(target) {
4685
4685
  }
4686
4686
  };
4687
4687
  _proto.dispose = function dispose() {
4688
- this.onDestroy();
4688
+ if (this.isEnableCalled) {
4689
+ this.disable();
4690
+ }
4691
+ if (this.isAwakeCalled) {
4692
+ this.isAwakeCalled = false;
4693
+ this.onDestroy();
4694
+ }
4689
4695
  if (this.item) {
4690
4696
  removeItem(this.item.components, this);
4691
4697
  }
@@ -8342,7 +8348,7 @@ var seed$8 = 1;
8342
8348
  * 通过 URL 创建 Texture 对象。
8343
8349
  * @param url - 要创建的 Texture URL
8344
8350
  * @since 2.0.0
8345
- */ Texture.fromImage = function fromImage(url, engine) {
8351
+ */ Texture.fromImage = function fromImage(url, engine, options) {
8346
8352
  return _async_to_generator(function() {
8347
8353
  var image, texture;
8348
8354
  return __generator(this, function(_state) {
@@ -8354,12 +8360,13 @@ var seed$8 = 1;
8354
8360
  ];
8355
8361
  case 1:
8356
8362
  image = _state.sent();
8357
- texture = Texture.create(engine, {
8363
+ texture = Texture.create(engine, _extends({
8358
8364
  sourceType: TextureSourceType.image,
8359
8365
  image: image,
8366
+ target: glContext.TEXTURE_2D,
8360
8367
  id: generateGUID(),
8361
8368
  flipY: true
8362
- });
8369
+ }, options));
8363
8370
  texture.initialize();
8364
8371
  return [
8365
8372
  2,
@@ -10026,8 +10033,13 @@ var RandomValue = /*#__PURE__*/ function(ValueGetter) {
10026
10033
  this.min = props[0];
10027
10034
  this.max = props[1];
10028
10035
  };
10029
- _proto.getValue = function getValue(time) {
10030
- return randomInRange(this.min, this.max);
10036
+ _proto.getValue = function getValue(time, seed) {
10037
+ var randomSeed = seed != null ? seed : Math.random();
10038
+ return this.min + randomSeed * (this.max - this.min);
10039
+ };
10040
+ _proto.getIntegrateValue = function getIntegrateValue(t0, t1, timeScale) {
10041
+ var seed = timeScale != null ? timeScale : 1.0;
10042
+ return (this.min + seed * (this.max - this.min)) * (t1 - t0);
10031
10043
  };
10032
10044
  _proto.toUniform = function toUniform() {
10033
10045
  return new Float32Array([
@@ -10286,15 +10298,19 @@ var BezierCurve = /*#__PURE__*/ function(ValueGetter) {
10286
10298
  points: points,
10287
10299
  timeInterval: timeInterval,
10288
10300
  valueInterval: valueInterval,
10289
- curve: curve
10301
+ curve: curve,
10302
+ timeStart: Number(s.x),
10303
+ timeEnd: Number(e.x)
10290
10304
  };
10291
10305
  }
10292
10306
  };
10293
10307
  _proto.getValue = function getValue(time) {
10294
10308
  var result = 0;
10295
10309
  var keyTimeData = Object.keys(this.curveMap);
10296
- var keyTimeStart = Number(keyTimeData[0].split("&")[0]);
10297
- var keyTimeEnd = Number(keyTimeData[keyTimeData.length - 1].split("&")[1]);
10310
+ var keyTimeStart = this.curveMap[keyTimeData[0]].timeStart;
10311
+ var keyTimeEnd = this.curveMap[keyTimeData[keyTimeData.length - 1]].timeEnd;
10312
+ // const keyTimeStart = Number(keyTimeData[0].split('&')[0]);
10313
+ // const keyTimeEnd = Number(keyTimeData[keyTimeData.length - 1].split('&')[1]);
10298
10314
  if (time <= keyTimeStart) {
10299
10315
  return this.getCurveValue(keyTimeData[0], keyTimeStart);
10300
10316
  }
@@ -10302,7 +10318,9 @@ var BezierCurve = /*#__PURE__*/ function(ValueGetter) {
10302
10318
  return this.getCurveValue(keyTimeData[keyTimeData.length - 1], keyTimeEnd);
10303
10319
  }
10304
10320
  for(var i = 0; i < keyTimeData.length; i++){
10305
- var _keyTimeData_i_split = keyTimeData[i].split("&"), xMin = _keyTimeData_i_split[0], xMax = _keyTimeData_i_split[1];
10321
+ var xMin = this.curveMap[keyTimeData[i]].timeStart;
10322
+ var xMax = this.curveMap[keyTimeData[i]].timeEnd;
10323
+ // const [xMin, xMax] = keyTimeData[i].split('&');
10306
10324
  if (time >= Number(xMin) && time < Number(xMax)) {
10307
10325
  result = this.getCurveValue(keyTimeData[i], time);
10308
10326
  break;
@@ -10315,12 +10333,13 @@ var BezierCurve = /*#__PURE__*/ function(ValueGetter) {
10315
10333
  var time = (t1 - t0) / ts;
10316
10334
  var result = 0;
10317
10335
  var keyTimeData = Object.keys(this.curveMap);
10318
- var keyTimeStart = Number(keyTimeData[0].split("&")[0]);
10336
+ var keyTimeStart = this.curveMap[keyTimeData[0]].timeStart;
10319
10337
  if (time <= keyTimeStart) {
10320
10338
  return 0;
10321
10339
  }
10322
10340
  for(var i = 0; i < keyTimeData.length; i++){
10323
- var _keyTimeData_i_split = keyTimeData[i].split("&"), xMin = _keyTimeData_i_split[0], xMax = _keyTimeData_i_split[1];
10341
+ var xMin = this.curveMap[keyTimeData[i]].timeStart;
10342
+ var xMax = this.curveMap[keyTimeData[i]].timeEnd;
10324
10343
  if (time >= Number(xMax)) {
10325
10344
  result += ts * this.getCurveIntegrateValue(keyTimeData[i], Number(xMax));
10326
10345
  }
@@ -11554,7 +11573,7 @@ var itemFrag = "precision highp float;varying vec4 vColor;varying vec2 vTexCoord
11554
11573
 
11555
11574
  var particleFrag = "#version 100\nprecision mediump float;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;}\n#define PATICLE_SHADER 1\nvarying float vLife;varying vec2 vTexCoord;varying vec4 vColor;uniform vec3 emissionColor;uniform float emissionIntensity;uniform sampler2D uMaskTex;uniform vec4 uColorParams;uniform vec2 uTexOffset;\n#ifdef COLOR_OVER_LIFETIME\nuniform sampler2D uColorOverLifetime;\n#endif\n#ifdef USE_SPRITE\nvarying vec4 vTexCoordBlend;\n#endif\nvarying float vSeed;\n#ifdef PREVIEW_BORDER\nuniform vec4 uPreviewColor;\n#endif\n#ifdef USE_SPRITE\nvec4 getTextureColor(sampler2D tex,vec2 texCoord){if(vTexCoordBlend.w>0.){return mix(texture2D(tex,texCoord),texture2D(tex,vTexCoordBlend.xy+texCoord),vTexCoordBlend.z);}return texture2D(tex,texCoord);}\n#else\n#define getTextureColor texture2D\n#endif\n#ifndef WEBGL2\n#define round(a) floor(0.5+a)\n#endif\n#ifdef PREVIEW_BORDER\nvoid main(){gl_FragColor=uPreviewColor;}\n#else\nvoid main(){vec4 color=vec4(1.0);vec4 tempColor=vColor;vec2 texOffset=uTexOffset;if(vLife<0.){discard;}if(uColorParams.x>0.0){color=getTextureColor(uMaskTex,vTexCoord);}\n#ifdef COLOR_OVER_LIFETIME\n#ifndef ENABLE_VERTEX_TEXTURE\ntempColor*=texture2D(uColorOverLifetime,vec2(vLife,0.));\n#endif\n#endif\ncolor=blendColor(color,tempColor,round(uColorParams.y));if(color.a<=0.01&&uColorParams.w>0.){float _at=texture2D(uMaskTex,vTexCoord+texOffset).a+texture2D(uMaskTex,vTexCoord+texOffset*-1.).a;if(_at<=0.02){discard;}}vec3 emission=emissionColor*pow(2.0,emissionIntensity);color=vec4(pow(pow(color.rgb,vec3(2.2))+emission,vec3(1.0/2.2)),color.a);gl_FragColor=color;}\n#endif\n";
11556
11575
 
11557
- var particleVert = "#version 100\nprecision mediump float;\n#define SHADER_VERTEX 1\n#define PATICLE_SHADER 1\n#ifdef SHADER_VERTEX\n#define CURVE_VALUE_TEXTURE uVCurveValueTexture\n#define CURVE_VALUE_ARRAY uVCurveValues\n#define CURVE_VALUE_COUNT VERT_CURVE_VALUE_COUNT\n#define FRAG_CURVE_VALUE_COUNT 0\n#else\n#define CURVE_VALUE_TEXTURE uFCurveValueTexture\n#define CURVE_VALUE_ARRAY uFCurveValues\n#define CURVE_VALUE_COUNT FRAG_CURVE_VALUE_COUNT\n#define VERT_CURVE_VALUE_COUNT 0\n#endif\n#if CURVE_VALUE_COUNT > 0\n#if LOOKUP_TEXTURE_CURVE\nuniform sampler2D CURVE_VALUE_TEXTURE;const float uCurveCount=1./float(CURVE_VALUE_COUNT);\n#define lookup_curve(i) texture2D(CURVE_VALUE_TEXTURE,vec2(float(i) * uCurveCount,0.))\n#else\nuniform vec4 CURVE_VALUE_ARRAY[CURVE_VALUE_COUNT];\n#define lookup_curve(i) CURVE_VALUE_ARRAY[i]\n#endif\n#else\n#define lookup_curve(i) vec4(0.)\n#endif\n#ifdef WEBGL2\n#define ITR_END (count + 1)\n#else\n#define ITR_END MAX_C\n#endif\n#define NONE_CONST_INDEX 1\n#ifdef SHADER_VERTEX\nattribute float aSeed;varying float vSeed;\n#endif\n#ifdef SHADER_VERTEX\n#define MAX_C VERT_MAX_KEY_FRAME_COUNT\n#else\n#define MAX_C FRAG_MAX_KEY_FRAME_COUNT\n#endif\nmat4 cubicBezierMatrix=mat4(1.0,-3.0,3.0,-1.0,0.0,3.0,-6.0,3.0,0.0,0.0,3.0,-3.0,0.0,0.0,0.0,1.0);float cubicBezier(float t,float y1,float y2,float y3,float y4){vec4 tVec=vec4(1.0,t,t*t,t*t*t);vec4 yVec=vec4(y1,y2,y3,y4);vec4 result=tVec*cubicBezierMatrix*yVec;return result.x+result.y+result.z+result.w;}float binarySearchT(float x,float x1,float x2,float x3,float x4){float left=0.0;float right=1.0;float mid=0.0;float computedX;for(int i=0;i<8;i++){mid=(left+right)*0.5;computedX=cubicBezier(mid,x1,x2,x3,x4);if(abs(computedX-x)<0.0001){break;}else if(computedX>x){right=mid;}else{left=mid;}}return mid;}float valueFromBezierCurveFrames(float time,float frameStart,float frameCount){int start=int(frameStart);int count=int(frameCount-1.);for(int i=0;i<ITR_END;i+=2){if(i>=count){break;}vec4 k0=lookup_curve(i+start);vec4 k1=lookup_curve(i+1+start);if(i==0&&time<k0.x){return k0.y;}if(i==int(frameCount-2.)&&time>=k1.x){return k1.y;}if(time>=k0.x&&time<=k1.x){float t=(time-k0.x)/(k1.x-k0.x);float nt=binarySearchT(time,k0.x,k0.z,k1.z,k1.x);return cubicBezier(nt,k0.y,k0.w,k1.w,k1.y);}}}float evaluteLineSeg(float t,vec2 p0,vec2 p1){return p0.y+(p1.y-p0.y)*(t-p0.x)/(p1.x-p0.x);}float valueFromLineSegs(float time,float frameStart,float frameCount){int start=int(frameStart);int count=int(frameCount-1.);int end=start+count;for(int i=0;i<ITR_END;i++){if(i>count){return lookup_curve(i).w;}vec4 seg=lookup_curve(i+start);vec2 p0=seg.xy;vec2 p1=seg.zw;if(time>=p0.x&&time<=p1.x){return evaluteLineSeg(time,p0,p1);}vec2 p2=lookup_curve(i+start+1).xy;if(time>p1.x&&time<=p2.x){return evaluteLineSeg(time,p1,p2);}}return lookup_curve(0).y;}float getValueFromTime(float time,vec4 value){float type=value.x;if(type==0.){return value.y;}if(type==1.){return mix(value.y,value.z,time/value.w);}if(type==3.){return valueFromLineSegs(time,value.y,value.z);}if(type==4.){return mix(value.y,value.z,aSeed);}if(type==5.){return valueFromBezierCurveFrames(time,value.z,value.w);}return 0.;}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.;}const float d2r=3.141592653589793/180.;attribute vec3 aPos;attribute vec4 aOffset;attribute vec3 aVel;attribute vec3 aRot;attribute vec4 aColor;attribute vec3 aDirX;attribute vec3 aDirY;\n#ifdef USE_SPRITE\nattribute vec3 aSprite;uniform vec4 uSprite;struct UVDetail{vec2 uv0;vec3 uv1;};UVDetail getSpriteUV(vec2 uv,float lifeTime);varying vec4 vTexCoordBlend;\n#endif\n#ifdef FINAL_TARGET\nuniform vec3 uFinalTarget;uniform vec4 uForceCurve;\n#endif\nuniform mat4 effects_ObjectToWorld;uniform mat4 effects_MatrixV;uniform mat4 effects_MatrixVP;uniform vec4 uParams;uniform vec4 uAcceleration;uniform vec4 uGravityModifierValue;uniform vec4 uOpacityOverLifetimeValue;\n#ifdef ROT_X_LIFETIME\nuniform vec4 uRXByLifeTimeValue;\n#endif\n#ifdef ROT_Y_LIFETIME\nuniform vec4 uRYByLifeTimeValue;\n#endif\n#ifdef ROT_Z_LIFETIME\nuniform vec4 uRZByLifeTimeValue;\n#endif\n#ifdef COLOR_OVER_LIFETIME\nuniform sampler2D uColorOverLifetime;\n#endif\n#if LINEAR_VEL_X + LINEAR_VEL_Y + LINEAR_VEL_Z\n#if LINEAR_VEL_X\nuniform vec4 uLinearXByLifetimeValue;\n#endif\n#if LINEAR_VEL_Y\nuniform vec4 uLinearYByLifetimeValue;\n#endif\n#if LINEAR_VEL_Z\nuniform vec4 uLinearZByLifetimeValue;\n#endif\n#endif\n#ifdef SPEED_OVER_LIFETIME\nuniform vec4 uSpeedLifetimeValue;\n#endif\n#if ORB_VEL_X + ORB_VEL_Y + ORB_VEL_Z\n#if ORB_VEL_X\nuniform vec4 uOrbXByLifetimeValue;\n#endif\n#if ORB_VEL_Y\nuniform vec4 uOrbYByLifetimeValue;\n#endif\n#if ORB_VEL_Z\nuniform vec4 uOrbZByLifetimeValue;\n#endif\nuniform vec3 uOrbCenter;\n#endif\nuniform vec4 uSizeByLifetimeValue;\n#ifdef SIZE_Y_BY_LIFE\nuniform vec4 uSizeYByLifetimeValue;\n#endif\nvarying float vLife;varying vec4 vColor;varying vec2 vTexCoord;\n#ifdef ENV_EDITOR\nuniform vec4 uEditorTransform;\n#endif\nvec3 calOrbitalMov(float _life,float _dur){vec3 orb=vec3(0.0);\n#ifdef AS_ORBITAL_MOVEMENT\n#define FUNC(a) getValueFromTime(_life,a)\n#else\n#define FUNC(a) getIntegrateFromTime0(_life,a) * _dur\n#endif\n#if ORB_VEL_X\norb.x=FUNC(uOrbXByLifetimeValue);\n#endif\n#if ORB_VEL_Y\norb.y=FUNC(uOrbYByLifetimeValue);\n#endif\n#if ORB_VEL_Z\norb.z=FUNC(uOrbZByLifetimeValue);\n#endif\n#undef FUNC\nreturn orb;}vec3 calLinearMov(float _life,float _dur){vec3 mov=vec3(0.0);\n#ifdef AS_LINEAR_MOVEMENT\n#define FUNC(a) getValueFromTime(_life,a)\n#else\n#define FUNC(a) getIntegrateFromTime0(_life,a) * _dur\n#endif\n#if LINEAR_VEL_X\nmov.x=FUNC(uLinearXByLifetimeValue);\n#endif\n#if LINEAR_VEL_Y\nmov.y=FUNC(uLinearYByLifetimeValue);\n#endif\n#if LINEAR_VEL_Z\nmov.z=FUNC(uLinearZByLifetimeValue);\n#endif\n#undef FUNC\nreturn mov;}mat3 mat3FromRotation(vec3 rotation){vec3 sinR=sin(rotation*d2r);vec3 cosR=cos(rotation*d2r);return mat3(cosR.z,-sinR.z,0.,sinR.z,cosR.z,0.,0.,0.,1.)*mat3(cosR.y,0.,sinR.y,0.,1.,0.,-sinR.y,0,cosR.y)*mat3(1.,0.,0.,0,cosR.x,-sinR.x,0.,sinR.x,cosR.x);}\n#ifdef USE_SPRITE\nUVDetail getSpriteUV(vec2 uv,float lifeTime){float t=fract(clamp((lifeTime-aSprite.x)/aSprite.y,0.0,1.)*aSprite.z);float frame=uSprite.z*t;float frameIndex=max(ceil(frame)-1.,0.);float row=floor((frameIndex+0.1)/uSprite.x);float col=frameIndex-row*uSprite.x;vec2 retUV=(vec2(col,row)+uv)/uSprite.xy;UVDetail ret;if(uSprite.w>0.){float blend=frame-frameIndex;float frameIndex1=min(ceil(frame),uSprite.z-1.);float row1=floor((frameIndex1+0.1)/uSprite.x);float col1=frameIndex1-row1*uSprite.x;vec2 coord=(vec2(col1,row1)+uv)/uSprite.xy-retUV;ret.uv1=vec3(coord.x,1.-coord.y,blend);}ret.uv0=vec2(retUV.x,1.-retUV.y);return ret;}\n#endif\nvec3 calculateTranslation(vec3 vel,float t0,float t1,float dur){float dt=t1-t0;float d=getIntegrateByTimeFromTime(0.,dt,uGravityModifierValue);vec3 acc=uAcceleration.xyz*d;\n#ifdef SPEED_OVER_LIFETIME\nreturn vel*getIntegrateFromTime0(dt/dur,uSpeedLifetimeValue)*dur+acc;\n#endif\nreturn vel*dt+acc;}mat3 transformFromRotation(vec3 rot,float _life,float _dur){vec3 rotation=rot;\n#ifdef ROT_LIFETIME_AS_MOVEMENT\n#define FUNC1(a) getValueFromTime(_life,a)\n#else\n#define FUNC1(a) getIntegrateFromTime0(_life,a) * _dur\n#endif\n#ifdef ROT_X_LIFETIME\nrotation.x+=FUNC1(uRXByLifeTimeValue);\n#endif\n#ifdef ROT_Y_LIFETIME\nrotation.y+=FUNC1(uRYByLifeTimeValue);\n#endif\n#ifdef ROT_Z_LIFETIME\nrotation.z+=FUNC1(uRZByLifeTimeValue);\n#endif\nif(dot(rotation,rotation)==0.0){return mat3(1.0);}\n#undef FUNC1\nreturn mat3FromRotation(rotation);}void main(){float time=uParams.x-aOffset.z;float dur=aOffset.w;if(time<0.||time>dur){gl_Position=vec4(-3.,-3.,-3.,1.);}else{float life=clamp(time/dur,0.0,1.0);vLife=life;\n#ifdef USE_SPRITE\nUVDetail uvD=getSpriteUV(aOffset.xy,time);vTexCoord=uvD.uv0;vTexCoordBlend=vec4(uvD.uv1,uSprite.w);\n#else\nvTexCoord=aOffset.xy;\n#endif\nvColor=aColor;\n#ifdef COLOR_OVER_LIFETIME\n#ifdef ENABLE_VERTEX_TEXTURE\nvColor*=texture2D(uColorOverLifetime,vec2(life,0.));\n#endif\n#endif\nvColor.a*=clamp(getValueFromTime(life,uOpacityOverLifetimeValue),0.,1.);vec3 size=vec3(vec2(getValueFromTime(life,uSizeByLifetimeValue)),1.0);\n#ifdef SIZE_Y_BY_LIFE\nsize.y=getValueFromTime(life,uSizeYByLifetimeValue);\n#endif\nvec3 point=transformFromRotation(aRot,life,dur)*(aDirX*size.x+aDirY*size.y);vec3 pt=calculateTranslation(aVel,aOffset.z,uParams.x,dur);vec3 _pos=aPos+pt;\n#if ORB_VEL_X + ORB_VEL_Y + ORB_VEL_Z\n_pos=mat3FromRotation(calOrbitalMov(life,dur))*(_pos-uOrbCenter);_pos+=uOrbCenter;\n#endif\n#if LINEAR_VEL_X + LINEAR_VEL_Y + LINEAR_VEL_Z\n_pos.xyz+=calLinearMov(life,dur);\n#endif\n#ifdef FINAL_TARGET\nfloat force=getValueFromTime(life,uForceCurve);vec4 pos=vec4(mix(_pos,uFinalTarget,force),1.);\n#else\nvec4 pos=vec4(_pos,1.0);\n#endif\n#if RENDER_MODE == 1\npos.xyz+=point;pos=effects_ObjectToWorld*pos;\n#elif RENDER_MODE == 3\npos=effects_ObjectToWorld*pos;pos.xyz+=effects_MatrixV[0].xyz*point.x+effects_MatrixV[2].xyz*point.y;\n#elif RENDER_MODE == 2\npos=effects_ObjectToWorld*pos;pos.xy+=point.xy;\n#elif RENDER_MODE == 0\npos=effects_ObjectToWorld*pos;pos.xyz+=effects_MatrixV[0].xyz*point.x+effects_MatrixV[1].xyz*point.y;\n#endif\ngl_Position=effects_MatrixVP*pos;vSeed=aSeed;gl_PointSize=6.0;\n#ifdef ENV_EDITOR\ngl_Position=vec4(gl_Position.xy*uEditorTransform.xy+uEditorTransform.zw*gl_Position.w,gl_Position.zw);\n#endif\n}}";
11576
+ var particleVert = "#version 100\nprecision mediump float;\n#define SHADER_VERTEX 1\n#define PATICLE_SHADER 1\n#ifdef SHADER_VERTEX\n#define CURVE_VALUE_TEXTURE uVCurveValueTexture\n#define CURVE_VALUE_ARRAY uVCurveValues\n#define CURVE_VALUE_COUNT VERT_CURVE_VALUE_COUNT\n#define FRAG_CURVE_VALUE_COUNT 0\n#else\n#define CURVE_VALUE_TEXTURE uFCurveValueTexture\n#define CURVE_VALUE_ARRAY uFCurveValues\n#define CURVE_VALUE_COUNT FRAG_CURVE_VALUE_COUNT\n#define VERT_CURVE_VALUE_COUNT 0\n#endif\n#if CURVE_VALUE_COUNT > 0\n#if LOOKUP_TEXTURE_CURVE\nuniform sampler2D CURVE_VALUE_TEXTURE;const float uCurveCount=1./float(CURVE_VALUE_COUNT);\n#define lookup_curve(i) texture2D(CURVE_VALUE_TEXTURE,vec2(float(i) * uCurveCount,0.))\n#else\nuniform vec4 CURVE_VALUE_ARRAY[CURVE_VALUE_COUNT];\n#define lookup_curve(i) CURVE_VALUE_ARRAY[i]\n#endif\n#else\n#define lookup_curve(i) vec4(0.)\n#endif\n#ifdef WEBGL2\n#define ITR_END (count + 1)\n#else\n#define ITR_END MAX_C\n#endif\n#define NONE_CONST_INDEX 1\n#ifdef SHADER_VERTEX\nattribute float aSeed;varying float vSeed;\n#endif\n#ifdef SHADER_VERTEX\n#define MAX_C VERT_MAX_KEY_FRAME_COUNT\n#else\n#define MAX_C FRAG_MAX_KEY_FRAME_COUNT\n#endif\nmat4 cubicBezierMatrix=mat4(1.0,-3.0,3.0,-1.0,0.0,3.0,-6.0,3.0,0.0,0.0,3.0,-3.0,0.0,0.0,0.0,1.0);float cubicBezier(float t,float y1,float y2,float y3,float y4){vec4 tVec=vec4(1.0,t,t*t,t*t*t);vec4 yVec=vec4(y1,y2,y3,y4);vec4 result=tVec*cubicBezierMatrix*yVec;return result.x+result.y+result.z+result.w;}float binarySearchT(float x,float x1,float x2,float x3,float x4){float left=0.0;float right=1.0;float mid=0.0;float computedX;for(int i=0;i<8;i++){mid=(left+right)*0.5;computedX=cubicBezier(mid,x1,x2,x3,x4);if(abs(computedX-x)<0.0001){break;}else if(computedX>x){right=mid;}else{left=mid;}}return mid;}float valueFromBezierCurveFrames(float time,float frameStart,float frameCount){int start=int(frameStart);int count=int(frameCount-1.);for(int i=0;i<ITR_END;i+=2){if(i>=count){break;}vec4 k0=lookup_curve(i+start);vec4 k1=lookup_curve(i+1+start);if(i==0&&time<k0.x){return k0.y;}if(i==int(frameCount-2.)&&time>=k1.x){return k1.y;}if(time>=k0.x&&time<=k1.x){float t=(time-k0.x)/(k1.x-k0.x);float nt=binarySearchT(time,k0.x,k0.z,k1.z,k1.x);return cubicBezier(nt,k0.y,k0.w,k1.w,k1.y);}}}float evaluteLineSeg(float t,vec2 p0,vec2 p1){return p0.y+(p1.y-p0.y)*(t-p0.x)/(p1.x-p0.x);}float valueFromLineSegs(float time,float frameStart,float frameCount){int start=int(frameStart);int count=int(frameCount-1.);int end=start+count;for(int i=0;i<ITR_END;i++){if(i>count){return lookup_curve(i).w;}vec4 seg=lookup_curve(i+start);vec2 p0=seg.xy;vec2 p1=seg.zw;if(time>=p0.x&&time<=p1.x){return evaluteLineSeg(time,p0,p1);}vec2 p2=lookup_curve(i+start+1).xy;if(time>p1.x&&time<=p2.x){return evaluteLineSeg(time,p1,p2);}}return lookup_curve(0).y;}float getValueFromTime(float time,vec4 value){float type=value.x;if(type==0.){return value.y;}if(type==1.){return mix(value.y,value.z,time/value.w);}if(type==3.){return valueFromLineSegs(time,value.y,value.z);}if(type==4.){return mix(value.y,value.z,aSeed);}if(type==5.){return valueFromBezierCurveFrames(time,value.z,value.w);}return 0.;}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.;}const float d2r=3.141592653589793/180.;attribute vec3 aPos;attribute vec4 aOffset;attribute vec4 aColor;attribute vec3 aDirX;attribute vec3 aDirY;attribute vec3 aTranslation;attribute vec3 aRotation0;attribute vec3 aRotation1;attribute vec3 aRotation2;attribute vec3 aLinearMove;\n#ifdef USE_SPRITE\nattribute vec3 aSprite;uniform vec4 uSprite;struct UVDetail{vec2 uv0;vec3 uv1;};UVDetail getSpriteUV(vec2 uv,float lifeTime);varying vec4 vTexCoordBlend;\n#endif\n#ifdef FINAL_TARGET\nuniform vec3 uFinalTarget;uniform vec4 uForceCurve;\n#endif\nuniform mat4 effects_ObjectToWorld;uniform mat4 effects_MatrixV;uniform mat4 effects_MatrixVP;uniform vec4 uParams;uniform vec4 uOpacityOverLifetimeValue;\n#ifdef COLOR_OVER_LIFETIME\nuniform sampler2D uColorOverLifetime;\n#endif\nuniform vec4 uOrbXByLifetimeValue;uniform vec4 uOrbYByLifetimeValue;uniform vec4 uOrbZByLifetimeValue;uniform vec3 uOrbCenter;uniform vec4 uSizeByLifetimeValue;\n#ifdef SIZE_Y_BY_LIFE\nuniform vec4 uSizeYByLifetimeValue;\n#endif\nvarying float vLife;varying vec4 vColor;varying vec2 vTexCoord;\n#ifdef ENV_EDITOR\nuniform vec4 uEditorTransform;\n#endif\nvec3 calOrbitalMov(float _life,float _dur){vec3 orb=vec3(0.0);\n#ifdef AS_ORBITAL_MOVEMENT\n#define FUNC(a) getValueFromTime(_life,a)\n#else\n#define FUNC(a) getIntegrateFromTime0(_life,a) * _dur\n#endif\n#if ORB_VEL_X\norb.x=FUNC(uOrbXByLifetimeValue);\n#endif\n#if ORB_VEL_Y\norb.y=FUNC(uOrbYByLifetimeValue);\n#endif\n#if ORB_VEL_Z\norb.z=FUNC(uOrbZByLifetimeValue);\n#endif\n#undef FUNC\nreturn orb;}mat3 mat3FromRotation(vec3 rotation){vec3 sinR=sin(rotation*d2r);vec3 cosR=cos(rotation*d2r);return mat3(cosR.z,-sinR.z,0.,sinR.z,cosR.z,0.,0.,0.,1.)*mat3(cosR.y,0.,sinR.y,0.,1.,0.,-sinR.y,0,cosR.y)*mat3(1.,0.,0.,0,cosR.x,-sinR.x,0.,sinR.x,cosR.x);}\n#ifdef USE_SPRITE\nUVDetail getSpriteUV(vec2 uv,float lifeTime){float t=fract(clamp((lifeTime-aSprite.x)/aSprite.y,0.0,1.)*aSprite.z);float frame=uSprite.z*t;float frameIndex=max(ceil(frame)-1.,0.);float row=floor((frameIndex+0.1)/uSprite.x);float col=frameIndex-row*uSprite.x;vec2 retUV=(vec2(col,row)+uv)/uSprite.xy;UVDetail ret;if(uSprite.w>0.){float blend=frame-frameIndex;float frameIndex1=min(ceil(frame),uSprite.z-1.);float row1=floor((frameIndex1+0.1)/uSprite.x);float col1=frameIndex1-row1*uSprite.x;vec2 coord=(vec2(col1,row1)+uv)/uSprite.xy-retUV;ret.uv1=vec3(coord.x,1.-coord.y,blend);}ret.uv0=vec2(retUV.x,1.-retUV.y);return ret;}\n#endif\nvoid main(){float time=uParams.x-aOffset.z;float dur=aOffset.w;if(time<0.||time>dur){gl_Position=vec4(-3.,-3.,-3.,1.);}else{float life=clamp(time/dur,0.0,1.0);vLife=life;\n#ifdef USE_SPRITE\nUVDetail uvD=getSpriteUV(aOffset.xy,time);vTexCoord=uvD.uv0;vTexCoordBlend=vec4(uvD.uv1,uSprite.w);\n#else\nvTexCoord=aOffset.xy;\n#endif\nvColor=aColor;\n#ifdef COLOR_OVER_LIFETIME\n#ifdef ENABLE_VERTEX_TEXTURE\nvColor*=texture2D(uColorOverLifetime,vec2(life,0.));\n#endif\n#endif\nvColor.a*=clamp(getValueFromTime(life,uOpacityOverLifetimeValue),0.,1.);vec3 size=vec3(vec2(getValueFromTime(life,uSizeByLifetimeValue)),1.0);\n#ifdef SIZE_Y_BY_LIFE\nsize.y=getValueFromTime(life,uSizeYByLifetimeValue);\n#endif\nmat3 aRotation=mat3(aRotation0,aRotation1,aRotation2);vec3 point=aRotation*(aDirX*size.x+aDirY*size.y);vec3 _pos=aPos+aTranslation;\n#if ORB_VEL_X + ORB_VEL_Y + ORB_VEL_Z\n_pos=mat3FromRotation(calOrbitalMov(life,dur))*(_pos-uOrbCenter);_pos+=uOrbCenter;\n#endif\n_pos.xyz+=aLinearMove;\n#ifdef FINAL_TARGET\nfloat force=getValueFromTime(life,uForceCurve);vec4 pos=vec4(mix(_pos,uFinalTarget,force),1.);\n#else\nvec4 pos=vec4(_pos,1.0);\n#endif\n#if RENDER_MODE == 1\npos.xyz+=point;pos=effects_ObjectToWorld*pos;\n#elif RENDER_MODE == 3\npos=effects_ObjectToWorld*pos;pos.xyz+=effects_MatrixV[0].xyz*point.x+effects_MatrixV[2].xyz*point.y;\n#elif RENDER_MODE == 2\npos=effects_ObjectToWorld*pos;pos.xy+=point.xy;\n#elif RENDER_MODE == 0\npos=effects_ObjectToWorld*pos;pos.xyz+=effects_MatrixV[0].xyz*point.x+effects_MatrixV[1].xyz*point.y;\n#endif\ngl_Position=effects_MatrixVP*pos;vSeed=aSeed;gl_PointSize=6.0;\n#ifdef ENV_EDITOR\ngl_Position=vec4(gl_Position.xy*uEditorTransform.xy+uEditorTransform.zw*gl_Position.w,gl_Position.zw);\n#endif\n}}";
11558
11577
 
11559
11578
  var trailVert = "#version 100\nprecision mediump float;\n#define SHADER_VERTEX 1\n#ifdef SHADER_VERTEX\n#define CURVE_VALUE_TEXTURE uVCurveValueTexture\n#define CURVE_VALUE_ARRAY uVCurveValues\n#define CURVE_VALUE_COUNT VERT_CURVE_VALUE_COUNT\n#define FRAG_CURVE_VALUE_COUNT 0\n#else\n#define CURVE_VALUE_TEXTURE uFCurveValueTexture\n#define CURVE_VALUE_ARRAY uFCurveValues\n#define CURVE_VALUE_COUNT FRAG_CURVE_VALUE_COUNT\n#define VERT_CURVE_VALUE_COUNT 0\n#endif\n#if CURVE_VALUE_COUNT > 0\n#if LOOKUP_TEXTURE_CURVE\nuniform sampler2D CURVE_VALUE_TEXTURE;const float uCurveCount=1./float(CURVE_VALUE_COUNT);\n#define lookup_curve(i) texture2D(CURVE_VALUE_TEXTURE,vec2(float(i) * uCurveCount,0.))\n#else\nuniform vec4 CURVE_VALUE_ARRAY[CURVE_VALUE_COUNT];\n#define lookup_curve(i) CURVE_VALUE_ARRAY[i]\n#endif\n#else\n#define lookup_curve(i) vec4(0.)\n#endif\n#ifdef WEBGL2\n#define ITR_END (count + 1)\n#else\n#define ITR_END MAX_C\n#endif\n#define NONE_CONST_INDEX 1\n#ifdef SHADER_VERTEX\nattribute float aSeed;varying float vSeed;\n#endif\n#ifdef SHADER_VERTEX\n#define MAX_C VERT_MAX_KEY_FRAME_COUNT\n#else\n#define MAX_C FRAG_MAX_KEY_FRAME_COUNT\n#endif\nmat4 cubicBezierMatrix=mat4(1.0,-3.0,3.0,-1.0,0.0,3.0,-6.0,3.0,0.0,0.0,3.0,-3.0,0.0,0.0,0.0,1.0);float cubicBezier(float t,float y1,float y2,float y3,float y4){vec4 tVec=vec4(1.0,t,t*t,t*t*t);vec4 yVec=vec4(y1,y2,y3,y4);vec4 result=tVec*cubicBezierMatrix*yVec;return result.x+result.y+result.z+result.w;}float binarySearchT(float x,float x1,float x2,float x3,float x4){float left=0.0;float right=1.0;float mid=0.0;float computedX;for(int i=0;i<8;i++){mid=(left+right)*0.5;computedX=cubicBezier(mid,x1,x2,x3,x4);if(abs(computedX-x)<0.0001){break;}else if(computedX>x){right=mid;}else{left=mid;}}return mid;}float valueFromBezierCurveFrames(float time,float frameStart,float frameCount){int start=int(frameStart);int count=int(frameCount-1.);for(int i=0;i<ITR_END;i+=2){if(i>=count){break;}vec4 k0=lookup_curve(i+start);vec4 k1=lookup_curve(i+1+start);if(i==0&&time<k0.x){return k0.y;}if(i==int(frameCount-2.)&&time>=k1.x){return k1.y;}if(time>=k0.x&&time<=k1.x){float t=(time-k0.x)/(k1.x-k0.x);float nt=binarySearchT(time,k0.x,k0.z,k1.z,k1.x);return cubicBezier(nt,k0.y,k0.w,k1.w,k1.y);}}}float evaluteLineSeg(float t,vec2 p0,vec2 p1){return p0.y+(p1.y-p0.y)*(t-p0.x)/(p1.x-p0.x);}float valueFromLineSegs(float time,float frameStart,float frameCount){int start=int(frameStart);int count=int(frameCount-1.);int end=start+count;for(int i=0;i<ITR_END;i++){if(i>count){return lookup_curve(i).w;}vec4 seg=lookup_curve(i+start);vec2 p0=seg.xy;vec2 p1=seg.zw;if(time>=p0.x&&time<=p1.x){return evaluteLineSeg(time,p0,p1);}vec2 p2=lookup_curve(i+start+1).xy;if(time>p1.x&&time<=p2.x){return evaluteLineSeg(time,p1,p2);}}return lookup_curve(0).y;}float getValueFromTime(float time,vec4 value){float type=value.x;if(type==0.){return value.y;}if(type==1.){return mix(value.y,value.z,time/value.w);}if(type==3.){return valueFromLineSegs(time,value.y,value.z);}if(type==4.){return mix(value.y,value.z,aSeed);}if(type==5.){return valueFromBezierCurveFrames(time,value.z,value.w);}return 0.;}attribute vec4 aPos;attribute vec3 aDir;attribute vec3 aInfo;attribute vec4 aColor;attribute float aTime;\n#ifdef ATTR_TRAIL_START\nattribute float aTrailStart;\n#else\nuniform float uTrailStart[64];attribute float aTrailStartIndex;\n#endif\nuniform mat4 effects_MatrixInvV;uniform mat4 effects_ObjectToWorld;uniform mat4 effects_MatrixVP;uniform vec4 uTextureMap;uniform float uTime;uniform vec4 uParams;uniform vec4 uColorParams;uniform vec4 uOpacityOverLifetimeValue;uniform vec4 uWidthOverTrail;\n#ifdef COLOR_OVER_TRAIL\nuniform sampler2D uColorOverTrail;\n#endif\n#ifdef COLOR_OVER_LIFETIME\nuniform sampler2D uColorOverLifetime;\n#endif\nvarying float vLife;varying vec2 vTexCoord;varying vec4 vColor;\n#ifdef ENV_EDITOR\nuniform vec4 uEditorTransform;\n#endif\nvoid main(){vec4 _pa=effects_MatrixVP*vec4(aPos.xyz,1.);vec4 _pb=effects_MatrixVP*vec4(aPos.xyz+aDir,1.);vec2 dir=normalize(_pb.xy/_pb.w-_pa.xy/_pa.w);vec2 screen_xy=vec2(-dir.y,dir.x);vec4 pos=effects_ObjectToWorld*vec4(aPos.xyz,1.);\n#ifdef ATTR_TRAIL_START\nfloat ts=aTrailStart;\n#else\nfloat ts=uTrailStart[int(aTrailStartIndex)];\n#endif\nfloat trail=(ts-aInfo.y)/uParams.y;float width=aPos.w*getValueFromTime(trail,uWidthOverTrail)/max(abs(screen_xy.x),abs(screen_xy.y));pos.xyz+=(effects_MatrixInvV[0].xyz*screen_xy.x+effects_MatrixInvV[1].xyz*screen_xy.y)*width;float time=min((uTime-aTime)/aInfo.x,1.0);gl_Position=effects_MatrixVP*pos;vColor=aColor;\n#ifdef COLOR_OVER_LIFETIME\n#ifdef ENABLE_VERTEX_TEXTURE\nvColor*=texture2D(uColorOverLifetime,vec2(time,0.));\n#endif\n#endif\n#ifdef COLOR_OVER_TRAIL\nvColor*=texture2D(uColorOverTrail,vec2(trail,0.));\n#endif\nvColor.a*=clamp(getValueFromTime(time,uOpacityOverLifetimeValue),0.,1.);vLife=time;vTexCoord=uTextureMap.xy+vec2(trail,aInfo.z)*uTextureMap.zw;vSeed=aSeed;\n#ifdef ENV_EDITOR\ngl_Position=vec4(gl_Position.xy*uEditorTransform.xy+uEditorTransform.zw*gl_Position.w,gl_Position.zw);\n#endif\n}";
11560
11579
 
@@ -16532,6 +16551,7 @@ function getTrailMeshShader(trails, particleMaxCount, name, gpuCapability, env)
16532
16551
  _proto.onUpdate = function onUpdate(dt) {
16533
16552
  var time = this.particleMesh.time;
16534
16553
  this.particleMesh.mesh.material.setVector4("uParams", new Vector4(time, this.item.duration, 0, 0));
16554
+ this.particleMesh.onUpdate(dt);
16535
16555
  };
16536
16556
  _proto.render = function render(renderer) {
16537
16557
  for(var _iterator = _create_for_of_iterator_helper_loose(this.meshes), _step; !(_step = _iterator()).done;){
@@ -16546,6 +16566,7 @@ function getTrailMeshShader(trails, particleMaxCount, name, gpuCapability, env)
16546
16566
  };
16547
16567
  _proto.updateTime = function updateTime(now, delta) {
16548
16568
  this.particleMesh.time = now;
16569
+ // this.particleMesh.onUpdate(delta);
16549
16570
  if (this.trailMesh) {
16550
16571
  this.trailMesh.time = now;
16551
16572
  this.trailMesh.onUpdate(delta);
@@ -16644,6 +16665,9 @@ var ParticleSystem = /*#__PURE__*/ function(Component) {
16644
16665
  _proto.isFrozen = function isFrozen() {
16645
16666
  return this.frozen;
16646
16667
  };
16668
+ _proto.isEnded = function isEnded() {
16669
+ return this.ended;
16670
+ };
16647
16671
  _proto.initEmitterTransform = function initEmitterTransform() {
16648
16672
  var position = this.item.transform.position.clone();
16649
16673
  var rotation = this.item.transform.rotation.clone();
@@ -17589,11 +17613,8 @@ function randomArrItem(arr, keepArr) {
17589
17613
  }
17590
17614
  var particleSystem = this.particleSystem;
17591
17615
  if (particleSystem) {
17592
- // TODO: [1.31] @十弦 验证 https://github.com/galacean/effects-runtime/commit/3e7d73d37b7d98c2a25e4544e80e928b17801ccd#diff-fae062f28caf3771cfedd3a20dc22f9749bd054c7541bf2fd50a9a5e413153d4
17593
- // particleSystem.setParentTransform(parentItem.transform);
17594
- particleSystem.setVisible(true);
17595
17616
  var deltaTime = context.deltaTime;
17596
- if (this.time < particleSystem.item.duration && particleSystem.isFrozen()) {
17617
+ if (this.time >= 0 && this.time < particleSystem.item.duration && particleSystem.isEnded()) {
17597
17618
  particleSystem.reset();
17598
17619
  }
17599
17620
  if (Math.abs(this.time - this.lastTime) < 0.001) {
@@ -17652,6 +17673,13 @@ var particleUniformTypeMap = {
17652
17673
  var ParticleMesh = /*#__PURE__*/ function() {
17653
17674
  function ParticleMesh(engine, props) {
17654
17675
  this.particleCount = 0;
17676
+ this.cachedVelocity = new Vector3();
17677
+ this.cachedRotationVector3 = new Vector3();
17678
+ this.cachedRotationMatrix = new Matrix3();
17679
+ this.cachedLinearMove = new Vector3();
17680
+ this.tempMatrix3 = new Matrix3();
17681
+ this.tempVector3 = new Vector3();
17682
+ this.VERT_MAX_KEY_FRAME_COUNT = 0;
17655
17683
  var _engine_renderer;
17656
17684
  var env = ((_engine_renderer = engine.renderer) != null ? _engine_renderer : {}).env;
17657
17685
  var speedOverLifetime = props.speedOverLifetime, colorOverLifetime = props.colorOverLifetime, linearVelOverLifetime = props.linearVelOverLifetime, orbitalVelOverLifetime = props.orbitalVelOverLifetime, sizeOverLifetime = props.sizeOverLifetime, rotationOverLifetime = props.rotationOverLifetime, sprite = props.sprite, gravityModifier = props.gravityModifier, maxCount = props.maxCount, textureFlip = props.textureFlip, useSprite = props.useSprite, name = props.name, gravity = props.gravity, forceTarget = props.forceTarget, side = props.side, occlusion = props.occlusion, anchor = props.anchor, blending = props.blending, maskMode = props.maskMode, mask = props.mask, transparentOcclusion = props.transparentOcclusion, meshSlots = props.meshSlots, _props_renderMode = props.renderMode, renderMode = _props_renderMode === void 0 ? 0 : _props_renderMode, _props_diffuse = props.diffuse, diffuse = _props_diffuse === void 0 ? Texture.createWithData(engine) : _props_diffuse;
@@ -17870,6 +17898,7 @@ var ParticleMesh = /*#__PURE__*/ function() {
17870
17898
  "FRAG_MAX_KEY_FRAME_COUNT",
17871
17899
  fragmentKeyFrameMeta.max
17872
17900
  ]);
17901
+ this.VERT_MAX_KEY_FRAME_COUNT = vertexKeyFrameMeta.max;
17873
17902
  var fragment = particleFrag;
17874
17903
  var originalVertex = "#define LOOKUP_TEXTURE_CURVE " + vertex_lookup_texture + "\n" + particleVert;
17875
17904
  var vertex = originalVertex;
@@ -17978,6 +18007,7 @@ var ParticleMesh = /*#__PURE__*/ function() {
17978
18007
  this.orbitalVelOverLifetime = orbitalVelOverLifetime;
17979
18008
  this.orbitalVelOverLifetime = orbitalVelOverLifetime;
17980
18009
  this.gravityModifier = gravityModifier;
18010
+ this.rotationOverLifetime = rotationOverLifetime;
17981
18011
  this.maxCount = maxCount;
17982
18012
  // this.duration = duration;
17983
18013
  this.textureOffsets = textureFlip ? [
@@ -18042,15 +18072,230 @@ var ParticleMesh = /*#__PURE__*/ function() {
18042
18072
  // @ts-expect-error
18043
18073
  geometry.setIndexData(new index.constructor(0));
18044
18074
  };
18075
+ _proto.onUpdate = function onUpdate(dt) {
18076
+ var aPosArray = this.geometry.getAttributeData("aPos"); // vector3
18077
+ var aVelArray = this.geometry.getAttributeData("aVel"); // vector3
18078
+ var aOffsetArray = this.geometry.getAttributeData("aOffset");
18079
+ var aRotArray = this.geometry.getAttributeData("aRot"); // vector3
18080
+ var aSeedArray = this.geometry.getAttributeData("aSeed"); // float
18081
+ // const uParams = this.mesh.material.getVector4('uParams');
18082
+ // if (!uParams) {
18083
+ // return;
18084
+ // }
18085
+ var localTime = this.time;
18086
+ var particleCount = Math.ceil(aPosArray.length / 12);
18087
+ // calculate particle translation
18088
+ var aTranslationArray = this.geometry.getAttributeData("aTranslation");
18089
+ if (aTranslationArray.length < particleCount * 3) {
18090
+ aTranslationArray = this.expandArray(aTranslationArray, particleCount * 3);
18091
+ }
18092
+ var velocity = this.cachedVelocity;
18093
+ for(var i = 0; i < particleCount; i++){
18094
+ var velOffset = i * 12 + 3;
18095
+ velocity.set(aVelArray[velOffset], aVelArray[velOffset + 1], aVelArray[velOffset + 2]);
18096
+ this.calculateTranslation(velocity, aOffsetArray[i * 4 + 2], localTime, aOffsetArray[i * 4 + 3]);
18097
+ var aTranslationOffset = i * 3;
18098
+ if (aOffsetArray[i * 4 + 2] < localTime) {
18099
+ var translation = velocity.multiply(dt / 1000);
18100
+ aTranslationArray[aTranslationOffset] += translation.x;
18101
+ aTranslationArray[aTranslationOffset + 1] += translation.y;
18102
+ aTranslationArray[aTranslationOffset + 2] += translation.z;
18103
+ }
18104
+ }
18105
+ this.geometry.setAttributeData("aTranslation", aTranslationArray);
18106
+ // calculate particle rotation
18107
+ var aRotationArray = this.geometry.getAttributeData("aRotation0");
18108
+ if (aRotationArray.length < particleCount * 9) {
18109
+ aRotationArray = this.expandArray(aRotationArray, particleCount * 9);
18110
+ }
18111
+ for(var i1 = 0; i1 < particleCount; i1++){
18112
+ var time = localTime - aOffsetArray[i1 * 4 + 2];
18113
+ var duration = aOffsetArray[i1 * 4 + 3];
18114
+ var life = clamp$1(time / duration, 0.0, 1.0);
18115
+ var aRotOffset = i1 * 8;
18116
+ var aRot = this.cachedRotationVector3.set(aRotArray[aRotOffset], aRotArray[aRotOffset + 1], aRotArray[aRotOffset + 2]);
18117
+ var aSeed = aSeedArray[i1 * 8 + 3];
18118
+ var aRotation = this.transformFromRotation(aRot, life, duration, aSeed, this.cachedRotationMatrix);
18119
+ var aRotationOffset = i1 * 9;
18120
+ var matrixArray = aRotation.toArray();
18121
+ aRotationArray.set(matrixArray, aRotationOffset);
18122
+ }
18123
+ this.geometry.setAttributeData("aRotation0", aRotationArray);
18124
+ // calculate linear movement
18125
+ var aLinearMoveArray = this.geometry.getAttributeData("aLinearMove");
18126
+ if (aLinearMoveArray.length < particleCount * 3) {
18127
+ aLinearMoveArray = this.expandArray(aLinearMoveArray, particleCount * 3);
18128
+ }
18129
+ var linearMove = this.cachedLinearMove;
18130
+ for(var i2 = 0; i2 < particleCount; i2++){
18131
+ var time1 = localTime - aOffsetArray[i2 * 4 + 2];
18132
+ var duration1 = aOffsetArray[i2 * 4 + 3];
18133
+ // const life = math.clamp(time / duration, 0.0, 1.0);
18134
+ var aSeed1 = aSeedArray[i2 * 8 + 3];
18135
+ linearMove.setZero();
18136
+ this.calLinearMov(time1, duration1, aSeed1, linearMove);
18137
+ var aLinearMoveOffset = i2 * 3;
18138
+ aLinearMoveArray[aLinearMoveOffset] = linearMove.x;
18139
+ aLinearMoveArray[aLinearMoveOffset + 1] = linearMove.y;
18140
+ aLinearMoveArray[aLinearMoveOffset + 2] = linearMove.z;
18141
+ }
18142
+ this.geometry.setAttributeData("aLinearMove", aLinearMoveArray);
18143
+ };
18045
18144
  _proto.minusTime = function minusTime(time) {
18046
- var data = this.geometry.getAttributeData("aOffset");
18047
- assertExist(data);
18048
- for(var i = 0; i < data.length; i += 4){
18049
- data[i + 2] -= time;
18145
+ var aOffset = this.geometry.getAttributeData("aOffset");
18146
+ for(var i = 0; i < aOffset.length; i += 4){
18147
+ aOffset[i + 2] -= time;
18050
18148
  }
18051
- this.geometry.setAttributeData("aOffset", data);
18149
+ this.geometry.setAttributeData("aOffset", aOffset);
18052
18150
  this.time -= time;
18053
18151
  };
18152
+ _proto.calculateTranslation = function calculateTranslation(velocity, t0, t1, duration) {
18153
+ var uAcceleration = this.mesh.material.getVector4("uAcceleration");
18154
+ var uGravityModifierValue = this.mesh.material.getVector4("uGravityModifierValue");
18155
+ if (!uAcceleration || !uGravityModifierValue) {
18156
+ return velocity;
18157
+ }
18158
+ var dt = t1 - t0; // 相对delay的时间
18159
+ var d = this.gravityModifier.getIntegrateValue(0, dt, duration);
18160
+ var acc = this.tempVector3.set(uAcceleration.x * d, uAcceleration.y * d, uAcceleration.z * d);
18161
+ // speedIntegrate = speedOverLifetime.getIntegrateValue(0, time, duration);
18162
+ if (this.speedOverLifetime) {
18163
+ // dt / dur 归一化
18164
+ var speed = this.speedOverLifetime.getValue(dt / duration);
18165
+ return velocity.multiply(speed).add(acc);
18166
+ }
18167
+ return velocity.add(acc);
18168
+ };
18169
+ _proto.transformFromRotation = function transformFromRotation(rot, life, dur, aSeed, result) {
18170
+ var rotation = rot;
18171
+ if (!this.rotationOverLifetime) {
18172
+ return result.setZero();
18173
+ }
18174
+ if (this.rotationOverLifetime.asRotation) {
18175
+ // Adjust rotation based on the specified lifetime components
18176
+ if (this.rotationOverLifetime.x) {
18177
+ if (_instanceof1(this.rotationOverLifetime.x, RandomValue)) {
18178
+ rotation.x += this.rotationOverLifetime.x.getValue(life, aSeed);
18179
+ } else {
18180
+ rotation.x += this.rotationOverLifetime.x.getValue(life);
18181
+ }
18182
+ }
18183
+ if (this.rotationOverLifetime.y) {
18184
+ if (_instanceof1(this.rotationOverLifetime.y, RandomValue)) {
18185
+ rotation.y += this.rotationOverLifetime.y.getValue(life, aSeed);
18186
+ } else {
18187
+ rotation.y += this.rotationOverLifetime.y.getValue(life);
18188
+ }
18189
+ }
18190
+ if (this.rotationOverLifetime.z) {
18191
+ if (_instanceof1(this.rotationOverLifetime.z, RandomValue)) {
18192
+ rotation.z += this.rotationOverLifetime.z.getValue(life, aSeed);
18193
+ } else {
18194
+ rotation.z += this.rotationOverLifetime.z.getValue(life);
18195
+ }
18196
+ }
18197
+ } else {
18198
+ // Adjust rotation based on the specified lifetime components
18199
+ if (this.rotationOverLifetime.x) {
18200
+ if (_instanceof1(this.rotationOverLifetime.x, RandomValue)) {
18201
+ rotation.x += this.rotationOverLifetime.x.getIntegrateValue(0.0, life, aSeed) * dur;
18202
+ } else {
18203
+ rotation.x += this.rotationOverLifetime.x.getIntegrateValue(0.0, life, dur) * dur;
18204
+ }
18205
+ }
18206
+ if (this.rotationOverLifetime.y) {
18207
+ if (_instanceof1(this.rotationOverLifetime.y, RandomValue)) {
18208
+ rotation.y += this.rotationOverLifetime.y.getIntegrateValue(0.0, life, aSeed) * dur;
18209
+ } else {
18210
+ rotation.y += this.rotationOverLifetime.y.getIntegrateValue(0.0, life, dur) * dur;
18211
+ }
18212
+ }
18213
+ if (this.rotationOverLifetime.z) {
18214
+ if (_instanceof1(this.rotationOverLifetime.z, RandomValue)) {
18215
+ rotation.z += this.rotationOverLifetime.z.getIntegrateValue(0.0, life, aSeed) * dur;
18216
+ } else {
18217
+ rotation.z += this.rotationOverLifetime.z.getIntegrateValue(0.0, life, dur) * dur;
18218
+ }
18219
+ }
18220
+ }
18221
+ // If the rotation vector is zero, return the identity matrix
18222
+ if (rotation.dot(rotation) === 0.0) {
18223
+ return result.identity();
18224
+ }
18225
+ // Return the rotation matrix derived from the rotation vector
18226
+ return this.mat3FromRotation(rotation, result);
18227
+ };
18228
+ _proto.mat3FromRotation = function mat3FromRotation(rotation, result) {
18229
+ var d2r = Math.PI / 180;
18230
+ var rotationXD2r = rotation.x * d2r;
18231
+ var rotationYD2r = rotation.y * d2r;
18232
+ var rotationZD2r = rotation.z * d2r;
18233
+ var sinRX = Math.sin(rotationXD2r);
18234
+ var sinRY = Math.sin(rotationYD2r);
18235
+ var sinRZ = Math.sin(rotationZD2r);
18236
+ var cosRX = Math.cos(rotationXD2r);
18237
+ var cosRY = Math.cos(rotationYD2r);
18238
+ var cosRZ = Math.cos(rotationZD2r);
18239
+ // rotZ * rotY * rotX
18240
+ result.set(cosRZ, -sinRZ, 0., sinRZ, cosRZ, 0., 0., 0., 1.); //rotZ
18241
+ result.multiply(this.tempMatrix3.set(cosRY, 0., sinRY, 0., 1., 0., -sinRY, 0, cosRY)); //rotY
18242
+ result.multiply(this.tempMatrix3.set(1., 0., 0., 0, cosRX, -sinRX, 0., sinRX, cosRX)); //rotX
18243
+ return result;
18244
+ };
18245
+ _proto.calLinearMov = function calLinearMov(time, duration, aSeed, result) {
18246
+ var mov = result;
18247
+ var lifetime = time / duration;
18248
+ if (!this.linearVelOverLifetime || !this.linearVelOverLifetime.enabled) {
18249
+ return mov;
18250
+ }
18251
+ if (this.linearVelOverLifetime.asMovement) {
18252
+ if (this.linearVelOverLifetime.x) {
18253
+ if (_instanceof1(this.linearVelOverLifetime.x, RandomValue)) {
18254
+ mov.x = this.linearVelOverLifetime.x.getValue(lifetime, aSeed);
18255
+ } else {
18256
+ mov.x = this.linearVelOverLifetime.x.getValue(lifetime);
18257
+ }
18258
+ }
18259
+ if (this.linearVelOverLifetime.y) {
18260
+ if (_instanceof1(this.linearVelOverLifetime.y, RandomValue)) {
18261
+ mov.y = this.linearVelOverLifetime.y.getValue(lifetime, aSeed);
18262
+ } else {
18263
+ mov.y = this.linearVelOverLifetime.y.getValue(lifetime);
18264
+ }
18265
+ }
18266
+ if (this.linearVelOverLifetime.z) {
18267
+ if (_instanceof1(this.linearVelOverLifetime.z, RandomValue)) {
18268
+ mov.z = this.linearVelOverLifetime.z.getValue(lifetime, aSeed);
18269
+ } else {
18270
+ mov.z = this.linearVelOverLifetime.z.getValue(lifetime);
18271
+ }
18272
+ }
18273
+ } else {
18274
+ // Adjust rotation based on the specified lifetime components
18275
+ if (this.linearVelOverLifetime.x) {
18276
+ if (_instanceof1(this.linearVelOverLifetime.x, RandomValue)) {
18277
+ mov.x = this.linearVelOverLifetime.x.getIntegrateValue(0.0, time, aSeed);
18278
+ } else {
18279
+ mov.x = this.linearVelOverLifetime.x.getIntegrateValue(0.0, time, duration);
18280
+ }
18281
+ }
18282
+ if (this.linearVelOverLifetime.y) {
18283
+ if (_instanceof1(this.linearVelOverLifetime.y, RandomValue)) {
18284
+ mov.y = this.linearVelOverLifetime.y.getIntegrateValue(0.0, time, aSeed);
18285
+ } else {
18286
+ mov.y = this.linearVelOverLifetime.y.getIntegrateValue(0.0, time, duration);
18287
+ }
18288
+ }
18289
+ if (this.linearVelOverLifetime.z) {
18290
+ if (_instanceof1(this.linearVelOverLifetime.z, RandomValue)) {
18291
+ mov.z = this.linearVelOverLifetime.z.getIntegrateValue(0.0, time, aSeed);
18292
+ } else {
18293
+ mov.z = this.linearVelOverLifetime.z.getIntegrateValue(0.0, time, duration);
18294
+ }
18295
+ }
18296
+ }
18297
+ return mov;
18298
+ };
18054
18299
  _proto.removePoint = function removePoint(index) {
18055
18300
  if (index < this.particleCount) {
18056
18301
  this.geometry.setAttributeSubData("aOffset", index * 16, new Float32Array(16));
@@ -18074,7 +18319,8 @@ var ParticleMesh = /*#__PURE__*/ function() {
18074
18319
  var pointData = {
18075
18320
  aPos: new Float32Array(48),
18076
18321
  aRot: new Float32Array(32),
18077
- aOffset: new Float32Array(16)
18322
+ aOffset: new Float32Array(16),
18323
+ aTranslation: new Float32Array(12)
18078
18324
  };
18079
18325
  var useSprite = this.useSprite;
18080
18326
  if (useSprite) {
@@ -18183,6 +18429,11 @@ var ParticleMesh = /*#__PURE__*/ function() {
18183
18429
  geometry.setDrawCount(this.particleCount * 6);
18184
18430
  }
18185
18431
  };
18432
+ _proto.expandArray = function expandArray(array, newSize) {
18433
+ var newArr = new Float32Array(newSize);
18434
+ newArr.set(array);
18435
+ return newArr;
18436
+ };
18186
18437
  return ParticleMesh;
18187
18438
  }();
18188
18439
  var gl2UniformSlots = [
@@ -18252,6 +18503,32 @@ function generateGeometryProps(maxVertex, useSprite, name) {
18252
18503
  size: 4,
18253
18504
  stride: 4 * bpe,
18254
18505
  data: new Float32Array(0)
18506
+ },
18507
+ aTranslation: {
18508
+ size: 3,
18509
+ data: new Float32Array(0)
18510
+ },
18511
+ aLinearMove: {
18512
+ size: 3,
18513
+ data: new Float32Array(0)
18514
+ },
18515
+ aRotation0: {
18516
+ size: 3,
18517
+ offset: 0,
18518
+ stride: 9 * bpe,
18519
+ data: new Float32Array(0)
18520
+ },
18521
+ aRotation1: {
18522
+ size: 3,
18523
+ offset: 3 * bpe,
18524
+ stride: 9 * bpe,
18525
+ dataSource: "aRotation0"
18526
+ },
18527
+ aRotation2: {
18528
+ size: 3,
18529
+ offset: 6 * bpe,
18530
+ stride: 9 * bpe,
18531
+ dataSource: "aRotation0"
18255
18532
  }
18256
18533
  };
18257
18534
  if (useSprite) {
@@ -19458,6 +19735,18 @@ function compareTracks(a, b) {
19458
19735
  }
19459
19736
  }
19460
19737
  };
19738
+ _proto.showItems = function showItems() {
19739
+ for(var _iterator = _create_for_of_iterator_helper_loose(this.items), _step; !(_step = _iterator()).done;){
19740
+ var item = _step.value;
19741
+ item.setVisible(true);
19742
+ }
19743
+ };
19744
+ _proto.hideItems = function hideItems() {
19745
+ for(var _iterator = _create_for_of_iterator_helper_loose(this.items), _step; !(_step = _iterator()).done;){
19746
+ var item = _step.value;
19747
+ item.setVisible(false);
19748
+ }
19749
+ };
19461
19750
  _proto.onDestroy = function onDestroy() {
19462
19751
  if (this.item.composition) {
19463
19752
  if (this.items) {
@@ -19568,6 +19857,34 @@ function compareTracks(a, b) {
19568
19857
  return CompositionComponent;
19569
19858
  }(Behaviour);
19570
19859
 
19860
+ var SubCompositionMixerPlayable = /*#__PURE__*/ function(Playable) {
19861
+ _inherits(SubCompositionMixerPlayable, Playable);
19862
+ function SubCompositionMixerPlayable() {
19863
+ return Playable.apply(this, arguments);
19864
+ }
19865
+ var _proto = SubCompositionMixerPlayable.prototype;
19866
+ _proto.processFrame = function processFrame(context) {
19867
+ var boundObject = context.output.getUserData();
19868
+ if (!_instanceof1(boundObject, CompositionComponent)) {
19869
+ return;
19870
+ }
19871
+ var compositionComponent = boundObject;
19872
+ var hasInput = false;
19873
+ for(var i = 0; i < this.getInputCount(); i++){
19874
+ if (this.getInputWeight(i) > 0) {
19875
+ hasInput = true;
19876
+ break;
19877
+ }
19878
+ }
19879
+ if (hasInput) {
19880
+ compositionComponent.showItems();
19881
+ } else {
19882
+ compositionComponent.hideItems();
19883
+ }
19884
+ };
19885
+ return SubCompositionMixerPlayable;
19886
+ }(Playable);
19887
+
19571
19888
  var SubCompositionTrack = /*#__PURE__*/ function(TrackAsset) {
19572
19889
  _inherits(SubCompositionTrack, TrackAsset);
19573
19890
  function SubCompositionTrack() {
@@ -19580,6 +19897,9 @@ var SubCompositionTrack = /*#__PURE__*/ function(TrackAsset) {
19580
19897
  }
19581
19898
  return parentBinding.getComponent(CompositionComponent);
19582
19899
  };
19900
+ _proto.createTrackMixer = function createTrackMixer(graph) {
19901
+ return new SubCompositionMixerPlayable(graph);
19902
+ };
19583
19903
  return SubCompositionTrack;
19584
19904
  }(TrackAsset);
19585
19905
  SubCompositionTrack = __decorate([
@@ -23675,22 +23995,6 @@ var seed = 1;
23675
23995
  this.timeout = timeout;
23676
23996
  };
23677
23997
  /**
23678
- * 根据用户传入的参数修改场景数据
23679
- */ _proto.updateSceneData = function updateSceneData(items) {
23680
- var variables = this.options.variables;
23681
- if (!variables || Object.keys(variables).length === 0) {
23682
- return;
23683
- }
23684
- items.forEach(function(item) {
23685
- if (item.type === ItemType.text) {
23686
- var textVariable = variables[item.name];
23687
- if (textVariable) {
23688
- item.content.options.text = textVariable;
23689
- }
23690
- }
23691
- });
23692
- };
23693
- /**
23694
23998
  * 场景创建,通过 json 创建出场景对象,并进行提前编译等工作
23695
23999
  * @param url - json 的 URL 链接或者 json 对象
23696
24000
  * @param renderer - renderer 对象,用于获取管理、编译 shader 及 GPU 上下文的参数
@@ -23817,7 +24121,6 @@ var seed = 1;
23817
24121
  for(i1 = 0; i1 < scene.images.length; i1++){
23818
24122
  scene.textureOptions[i1].image = scene.images[i1];
23819
24123
  }
23820
- _this.updateSceneData(scene.jsonScene.items);
23821
24124
  _state.label = 5;
23822
24125
  case 5:
23823
24126
  return [
@@ -23874,7 +24177,6 @@ var seed = 1;
23874
24177
  ];
23875
24178
  case 10:
23876
24179
  loadedTextures = _state.sent();
23877
- _this.updateSceneData(jsonScene.items);
23878
24180
  scene = {
23879
24181
  timeInfos: timeInfos,
23880
24182
  url: url,
@@ -25208,6 +25510,7 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
25208
25510
  * 跳到指定时间点(不做任何播放行为)
25209
25511
  * @param time - 相对 startTime 的时间
25210
25512
  */ _proto.setTime = function setTime(time) {
25513
+ var speed = this.speed;
25211
25514
  var pause = this.paused;
25212
25515
  if (pause) {
25213
25516
  this.resume();
@@ -25216,7 +25519,9 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
25216
25519
  this.rootComposition.onStart();
25217
25520
  this.rootComposition.isStartCalled = true;
25218
25521
  }
25522
+ this.setSpeed(1);
25219
25523
  this.forwardTime(time + this.startTime);
25524
+ this.setSpeed(speed);
25220
25525
  if (pause) {
25221
25526
  this.pause();
25222
25527
  }
@@ -25228,7 +25533,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
25228
25533
  /**
25229
25534
  * 前进合成到指定时间
25230
25535
  * @param time - 相对0时刻的时间
25231
- * @param skipRender - 是否跳过渲染
25232
25536
  */ _proto.forwardTime = function forwardTime(time) {
25233
25537
  var deltaTime = time * 1000 - this.rootComposition.time * 1000;
25234
25538
  var reverse = deltaTime < 0;
@@ -25278,7 +25582,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
25278
25582
  /**
25279
25583
  * 合成更新,针对所有 item 的更新
25280
25584
  * @param deltaTime - 更新的时间步长
25281
- * @param skipRender - 是否需要渲染
25282
25585
  */ _proto.update = function update(deltaTime) {
25283
25586
  if (!this.assigned || this.paused) {
25284
25587
  return;
@@ -27781,7 +28084,7 @@ registerPlugin("sprite", SpriteLoader, VFXItem, true);
27781
28084
  registerPlugin("particle", ParticleLoader, VFXItem, true);
27782
28085
  registerPlugin("cal", CalculateLoader, VFXItem, true);
27783
28086
  registerPlugin("interact", InteractLoader, VFXItem, true);
27784
- var version = "2.1.0-alpha.0";
28087
+ var version = "2.1.0-alpha.2";
27785
28088
  logger.info("Core version: " + version + ".");
27786
28089
 
27787
28090
  export { AbstractPlugin, ActivationPlayable, ActivationPlayableAsset, ActivationTrack, AnimationClip, AnimationClipPlayable, AssetLoader, AssetManager, BYTES_TYPE_MAP, Behaviour, BezierCurve, BezierCurvePath, BezierCurveQuat, BinaryAsset, COMPRESSED_TEXTURE, COPY_FRAGMENT_SHADER, COPY_MESH_SHADER_ID, COPY_VERTEX_SHADER, CalculateLoader, Camera, CameraController, CameraVFXItemLoader, Component, Composition, CompositionComponent, CompositionSourceManager, DEFAULT_FONTS, DEFAULT_FPS, Database, DestroyOptions, Downloader, EFFECTS_COPY_MESH_NAME, EVENT_TYPE_CLICK, EVENT_TYPE_TOUCH_END, EVENT_TYPE_TOUCH_MOVE, EVENT_TYPE_TOUCH_START, EffectComponent, EffectsObject, EffectsPackage, Engine, EventEmitter, EventSystem, FilterMode, Float16ArrayWrapper, Framebuffer, GLSLVersion, GPUCapability, Geometry, GlobalUniforms, GradientValue, HELP_LINK, HitTestType, InteractComponent, InteractLoader, InteractMesh, Item, KTXTexture, LineSegments, LinearValue, Material, MaterialDataBlock, MaterialRenderType, Mesh, ObjectBindingTrack, OrderType, PLAYER_OPTIONS_ENV_EDITOR, POST_PROCESS_SETTINGS, ParticleBehaviourPlayable, ParticleBehaviourPlayableAsset, ParticleLoader, ParticleMesh, ParticleSystem, ParticleSystemRenderer, PassTextureCache, PathSegments, PluginSystem, PostProcessVolume, RENDER_PASS_NAME_PREFIX, RENDER_PREFER_LOOKUP_TEXTURE, RUNTIME_ENV, RandomSetValue, RandomValue, RandomVectorValue, RenderFrame, RenderPass, RenderPassAttachmentStorageType, RenderPassDestroyAttachmentType, RenderPassPriorityNormal, RenderPassPriorityPostprocess, RenderPassPriorityPrepare, RenderTargetHandle, RenderTextureFormat, Renderbuffer, Renderer, RendererComponent, RuntimeClip, SEMANTIC_MAIN_PRE_COLOR_ATTACHMENT_0, SEMANTIC_MAIN_PRE_COLOR_ATTACHMENT_SIZE_0, SEMANTIC_PRE_COLOR_ATTACHMENT_0, SEMANTIC_PRE_COLOR_ATTACHMENT_SIZE_0, SPRITE_VERTEX_STRIDE, SemanticMap, SerializationHelper, Shader, ShaderCompileResultStatus, ShaderFactory, ShaderType, ShaderVariant, SpriteColorPlayable, SpriteColorPlayableAsset, SpriteColorTrack, SpriteComponent, SpriteLoader, StaticValue, SubCompositionPlayableAsset, SubCompositionTrack, TEMPLATE_USE_OFFSCREEN_CANVAS, TextComponent, TextComponentBase, TextLayout, TextLoader, TextStyle, Texture, TextureFactory, TextureLoadAction, TextureSourceType, TextureStoreAction, Ticker, TimelineAsset, TimelineClip, TimelinePlayable, TrackAsset, TrackSortWrapper, TrackType, Transform, TransformAnimationPlayable, TransformPlayableAsset, TransformTrack, VFXItem, ValueGetter, addByOrder, addItem, addItemWithOrder, applyMixins, assertExist, asserts, base64ToFile, blend, calculateTranslation, canvasPool, colorGradingFrag, colorStopsFromGradient, colorToArr$1 as colorToArr, combineImageTemplate, createCopyShader, createGLContext, createKeyFrameMeta, createShape, createValueGetter, decimalEqual, defaultGlobalVolume, defaultPlugins, deserializeMipmapTexture, earcut, effectsClass, effectsClassStore, enlargeBuffer, ensureFixedNumber, ensureVec3, findPreviousRenderPass, gaussianDown_frag as gaussianDownFrag, gaussianDownHFrag, gaussianDownVFrag, gaussianUpFrag, generateEmptyTypedArray, generateGUID, generateHalfFloatTexture, generateTransparentTexture, generateWhiteTexture, getBackgroundImage, getColorFromGradientStops, getConfig, getDefaultTextureFactory, getGeometryByShape, getGeometryTriangles, getImageItemRenderInfo, getKTXTextureOptions, getKeyFrameMetaByRawValue, getMergedStore, getParticleMeshShader, getPixelRatio, getPreMultiAlpha, getStandardComposition, getStandardImage, getStandardItem, getStandardJSON, getTextureSize, glContext, glType2VertexFormatType, gpuTimer, imageDataFromColor, imageDataFromGradient, initErrors, initGLContext, integrate, interpolateColor, isAlipayMiniApp, isAndroid, isArray, isCanvas, isFunction, isIOS, isIOSByUA, isMiniProgram, isObject, isSceneJSON, isSceneURL, isSceneWithOptions, isSimulatorCellPhone, isString, isUniformStruct, isUniformStructArray, isValidFontFamily, isWebGL2, isWechatMiniApp, itemFrag, itemFrameFrag, itemVert, loadAVIFOptional, loadBinary, loadBlob, loadImage, loadMedia, loadVideo, loadWebPOptional, logger, index as math, maxSpriteMeshItemCount, modifyMaxKeyframeShader, nearestPowerOfTwo, noop, normalizeColor, numberToFix, parsePercent$1 as parsePercent, particleFrag, particleOriginTranslateMap$1 as particleOriginTranslateMap, particleUniformTypeMap, particleVert, pluginLoaderMap, randomInRange, registerPlugin, removeItem, rotateVec2, screenMeshVert, serialize, setBlendMode, setConfig, setDefaultTextureFactory, setMaskMode, setMaxSpriteMeshItemCount, setRayFromCamera, setSideMode, setSpriteMeshMaxItemCountByGPU, sortByOrder, index$1 as spec, spriteMeshShaderFromFilter, spriteMeshShaderFromRenderInfo, spriteMeshShaderIdFromRenderInfo, thresholdFrag, throwDestroyedError, trailVert, translatePoint, trianglesFromRect, unregisterPlugin, valIfUndefined, value, valueDefine, vecFill, vecMulCombine, version, vertexFormatType2GLType };