@galacean/effects-core 2.1.0-alpha.0 → 2.1.0-alpha.1
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/asset-manager.d.ts +0 -4
- package/dist/comp-vfx-item.d.ts +2 -0
- package/dist/composition.d.ts +0 -2
- package/dist/index.js +320 -35
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +320 -35
- package/dist/index.mjs.map +1 -1
- package/dist/math/value-getter.d.ts +2 -1
- package/dist/plugins/particle/particle-mesh.d.ts +7 -0
- package/dist/plugins/particle/particle-system.d.ts +1 -0
- package/dist/plugins/timeline/playables/sub-composition-mixer-playable.d.ts +5 -0
- package/dist/plugins/timeline/tracks/sub-composition-track.d.ts +2 -0
- package/package.json +1 -1
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.
|
|
6
|
+
* Version: v2.1.0-alpha.1
|
|
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.
|
|
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
|
}
|
|
@@ -10026,8 +10032,13 @@ var RandomValue = /*#__PURE__*/ function(ValueGetter) {
|
|
|
10026
10032
|
this.min = props[0];
|
|
10027
10033
|
this.max = props[1];
|
|
10028
10034
|
};
|
|
10029
|
-
_proto.getValue = function getValue(time) {
|
|
10030
|
-
|
|
10035
|
+
_proto.getValue = function getValue(time, seed) {
|
|
10036
|
+
var randomSeed = seed != null ? seed : Math.random();
|
|
10037
|
+
return this.min + randomSeed * (this.max - this.min);
|
|
10038
|
+
};
|
|
10039
|
+
_proto.getIntegrateValue = function getIntegrateValue(t0, t1, timeScale) {
|
|
10040
|
+
var seed = timeScale != null ? timeScale : 1.0;
|
|
10041
|
+
return (this.min + seed * (this.max - this.min)) * (t1 - t0);
|
|
10031
10042
|
};
|
|
10032
10043
|
_proto.toUniform = function toUniform() {
|
|
10033
10044
|
return new Float32Array([
|
|
@@ -11554,7 +11565,7 @@ var itemFrag = "precision highp float;varying vec4 vColor;varying vec2 vTexCoord
|
|
|
11554
11565
|
|
|
11555
11566
|
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
11567
|
|
|
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}}";
|
|
11568
|
+
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
11569
|
|
|
11559
11570
|
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
11571
|
|
|
@@ -16532,6 +16543,7 @@ function getTrailMeshShader(trails, particleMaxCount, name, gpuCapability, env)
|
|
|
16532
16543
|
_proto.onUpdate = function onUpdate(dt) {
|
|
16533
16544
|
var time = this.particleMesh.time;
|
|
16534
16545
|
this.particleMesh.mesh.material.setVector4("uParams", new Vector4(time, this.item.duration, 0, 0));
|
|
16546
|
+
this.particleMesh.onUpdate(dt);
|
|
16535
16547
|
};
|
|
16536
16548
|
_proto.render = function render(renderer) {
|
|
16537
16549
|
for(var _iterator = _create_for_of_iterator_helper_loose(this.meshes), _step; !(_step = _iterator()).done;){
|
|
@@ -16546,6 +16558,7 @@ function getTrailMeshShader(trails, particleMaxCount, name, gpuCapability, env)
|
|
|
16546
16558
|
};
|
|
16547
16559
|
_proto.updateTime = function updateTime(now, delta) {
|
|
16548
16560
|
this.particleMesh.time = now;
|
|
16561
|
+
// this.particleMesh.onUpdate(delta);
|
|
16549
16562
|
if (this.trailMesh) {
|
|
16550
16563
|
this.trailMesh.time = now;
|
|
16551
16564
|
this.trailMesh.onUpdate(delta);
|
|
@@ -16644,6 +16657,9 @@ var ParticleSystem = /*#__PURE__*/ function(Component) {
|
|
|
16644
16657
|
_proto.isFrozen = function isFrozen() {
|
|
16645
16658
|
return this.frozen;
|
|
16646
16659
|
};
|
|
16660
|
+
_proto.isEnded = function isEnded() {
|
|
16661
|
+
return this.ended;
|
|
16662
|
+
};
|
|
16647
16663
|
_proto.initEmitterTransform = function initEmitterTransform() {
|
|
16648
16664
|
var position = this.item.transform.position.clone();
|
|
16649
16665
|
var rotation = this.item.transform.rotation.clone();
|
|
@@ -17589,11 +17605,8 @@ function randomArrItem(arr, keepArr) {
|
|
|
17589
17605
|
}
|
|
17590
17606
|
var particleSystem = this.particleSystem;
|
|
17591
17607
|
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
17608
|
var deltaTime = context.deltaTime;
|
|
17596
|
-
if (this.time < particleSystem.item.duration && particleSystem.
|
|
17609
|
+
if (this.time >= 0 && this.time < particleSystem.item.duration && particleSystem.isEnded()) {
|
|
17597
17610
|
particleSystem.reset();
|
|
17598
17611
|
}
|
|
17599
17612
|
if (Math.abs(this.time - this.lastTime) < 0.001) {
|
|
@@ -17652,6 +17665,7 @@ var particleUniformTypeMap = {
|
|
|
17652
17665
|
var ParticleMesh = /*#__PURE__*/ function() {
|
|
17653
17666
|
function ParticleMesh(engine, props) {
|
|
17654
17667
|
this.particleCount = 0;
|
|
17668
|
+
this.VERT_MAX_KEY_FRAME_COUNT = 0;
|
|
17655
17669
|
var _engine_renderer;
|
|
17656
17670
|
var env = ((_engine_renderer = engine.renderer) != null ? _engine_renderer : {}).env;
|
|
17657
17671
|
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 +17884,7 @@ var ParticleMesh = /*#__PURE__*/ function() {
|
|
|
17870
17884
|
"FRAG_MAX_KEY_FRAME_COUNT",
|
|
17871
17885
|
fragmentKeyFrameMeta.max
|
|
17872
17886
|
]);
|
|
17887
|
+
this.VERT_MAX_KEY_FRAME_COUNT = vertexKeyFrameMeta.max;
|
|
17873
17888
|
var fragment = particleFrag;
|
|
17874
17889
|
var originalVertex = "#define LOOKUP_TEXTURE_CURVE " + vertex_lookup_texture + "\n" + particleVert;
|
|
17875
17890
|
var vertex = originalVertex;
|
|
@@ -17978,6 +17993,7 @@ var ParticleMesh = /*#__PURE__*/ function() {
|
|
|
17978
17993
|
this.orbitalVelOverLifetime = orbitalVelOverLifetime;
|
|
17979
17994
|
this.orbitalVelOverLifetime = orbitalVelOverLifetime;
|
|
17980
17995
|
this.gravityModifier = gravityModifier;
|
|
17996
|
+
this.rotationOverLifetime = rotationOverLifetime;
|
|
17981
17997
|
this.maxCount = maxCount;
|
|
17982
17998
|
// this.duration = duration;
|
|
17983
17999
|
this.textureOffsets = textureFlip ? [
|
|
@@ -18042,15 +18058,232 @@ var ParticleMesh = /*#__PURE__*/ function() {
|
|
|
18042
18058
|
// @ts-expect-error
|
|
18043
18059
|
geometry.setIndexData(new index.constructor(0));
|
|
18044
18060
|
};
|
|
18061
|
+
_proto.onUpdate = function onUpdate(dt) {
|
|
18062
|
+
var aPosArray = this.geometry.getAttributeData("aPos"); // vector3
|
|
18063
|
+
var aVelArray = this.geometry.getAttributeData("aVel"); // vector3
|
|
18064
|
+
var aOffsetArray = this.geometry.getAttributeData("aOffset");
|
|
18065
|
+
var aRotArray = this.geometry.getAttributeData("aRot"); // vector3
|
|
18066
|
+
var aSeedArray = this.geometry.getAttributeData("aSeed"); // float
|
|
18067
|
+
// const uParams = this.mesh.material.getVector4('uParams');
|
|
18068
|
+
// if (!uParams) {
|
|
18069
|
+
// return;
|
|
18070
|
+
// }
|
|
18071
|
+
var localTime = new Float32Array([
|
|
18072
|
+
this.time
|
|
18073
|
+
])[0];
|
|
18074
|
+
var particleCount = Math.ceil(aPosArray.length / 12);
|
|
18075
|
+
// calculate particle translation
|
|
18076
|
+
var aTranslationArray = this.geometry.getAttributeData("aTranslation");
|
|
18077
|
+
if (aTranslationArray.length < particleCount * 3) {
|
|
18078
|
+
aTranslationArray = new Float32Array(particleCount * 3);
|
|
18079
|
+
}
|
|
18080
|
+
var velocity = new Vector3(0, 0, 0);
|
|
18081
|
+
for(var i = 0; i < particleCount; i++){
|
|
18082
|
+
var velOffset = i * 12 + 3;
|
|
18083
|
+
velocity.set(aVelArray[velOffset], aVelArray[velOffset + 1], aVelArray[velOffset + 2]);
|
|
18084
|
+
var trans = this.calculateTranslation(velocity, aOffsetArray[i * 4 + 2], localTime, aOffsetArray[i * 4 + 3]);
|
|
18085
|
+
var aTranslationOffset = i * 3;
|
|
18086
|
+
aTranslationArray[aTranslationOffset] = trans.x;
|
|
18087
|
+
aTranslationArray[aTranslationOffset + 1] = trans.y;
|
|
18088
|
+
aTranslationArray[aTranslationOffset + 2] = trans.z;
|
|
18089
|
+
}
|
|
18090
|
+
this.geometry.setAttributeData("aTranslation", aTranslationArray);
|
|
18091
|
+
// calculate particle rotation
|
|
18092
|
+
var aRotationArray = this.geometry.getAttributeData("aRotation0");
|
|
18093
|
+
if (aRotationArray.length < particleCount * 9) {
|
|
18094
|
+
aRotationArray = new Float32Array(particleCount * 9);
|
|
18095
|
+
}
|
|
18096
|
+
for(var i1 = 0; i1 < particleCount; i1++){
|
|
18097
|
+
var time = localTime - aOffsetArray[i1 * 4 + 2];
|
|
18098
|
+
var duration = aOffsetArray[i1 * 4 + 3];
|
|
18099
|
+
var life = clamp$1(time / duration, 0.0, 1.0);
|
|
18100
|
+
var aRotOffset = i1 * 8;
|
|
18101
|
+
var aRot = new Vector3(aRotArray[aRotOffset], aRotArray[aRotOffset + 1], aRotArray[aRotOffset + 2]);
|
|
18102
|
+
var aSeed = aSeedArray[i1 * 8 + 3];
|
|
18103
|
+
var aRotation = this.transformFromRotation(aRot, life, duration, aSeed);
|
|
18104
|
+
var aRotationOffset = i1 * 9;
|
|
18105
|
+
var matrixArray = aRotation.toArray();
|
|
18106
|
+
aRotationArray.set(matrixArray, aRotationOffset);
|
|
18107
|
+
}
|
|
18108
|
+
this.geometry.setAttributeData("aRotation0", aRotationArray);
|
|
18109
|
+
// calculate linear movement
|
|
18110
|
+
var aLinearMoveArray = this.geometry.getAttributeData("aLinearMove");
|
|
18111
|
+
if (aLinearMoveArray.length < particleCount * 3) {
|
|
18112
|
+
aLinearMoveArray = new Float32Array(particleCount * 3);
|
|
18113
|
+
}
|
|
18114
|
+
for(var i2 = 0; i2 < particleCount; i2++){
|
|
18115
|
+
var time1 = localTime - aOffsetArray[i2 * 4 + 2];
|
|
18116
|
+
var duration1 = aOffsetArray[i2 * 4 + 3];
|
|
18117
|
+
// const life = math.clamp(time / duration, 0.0, 1.0);
|
|
18118
|
+
var aSeed1 = aSeedArray[i2 * 8 + 3];
|
|
18119
|
+
var linearMove = this.calLinearMov(time1, duration1, aSeed1);
|
|
18120
|
+
var aLinearMoveOffset = i2 * 3;
|
|
18121
|
+
aLinearMoveArray[aLinearMoveOffset] = linearMove.x;
|
|
18122
|
+
aLinearMoveArray[aLinearMoveOffset + 1] = linearMove.y;
|
|
18123
|
+
aLinearMoveArray[aLinearMoveOffset + 2] = linearMove.z;
|
|
18124
|
+
}
|
|
18125
|
+
this.geometry.setAttributeData("aLinearMove", aLinearMoveArray);
|
|
18126
|
+
};
|
|
18045
18127
|
_proto.minusTime = function minusTime(time) {
|
|
18046
|
-
var
|
|
18047
|
-
|
|
18048
|
-
|
|
18049
|
-
data[i + 2] -= time;
|
|
18128
|
+
var aOffset = this.geometry.getAttributeData("aOffset");
|
|
18129
|
+
for(var i = 0; i < aOffset.length; i += 4){
|
|
18130
|
+
aOffset[i + 2] -= time;
|
|
18050
18131
|
}
|
|
18051
|
-
this.geometry.setAttributeData("aOffset",
|
|
18132
|
+
this.geometry.setAttributeData("aOffset", aOffset);
|
|
18052
18133
|
this.time -= time;
|
|
18053
18134
|
};
|
|
18135
|
+
_proto.calculateTranslation = function calculateTranslation(velocity, t0, t1, duration) {
|
|
18136
|
+
var uAcceleration = this.mesh.material.getVector4("uAcceleration");
|
|
18137
|
+
var uGravityModifierValue = this.mesh.material.getVector4("uGravityModifierValue");
|
|
18138
|
+
if (!uAcceleration || !uGravityModifierValue) {
|
|
18139
|
+
return new Vector3();
|
|
18140
|
+
}
|
|
18141
|
+
var dt = t1 - t0; // 相对delay的时间
|
|
18142
|
+
var d = this.gravityModifier.getIntegrateByTime(0, dt);
|
|
18143
|
+
var acc = [
|
|
18144
|
+
uAcceleration.x * d,
|
|
18145
|
+
uAcceleration.y * d,
|
|
18146
|
+
uAcceleration.z * d
|
|
18147
|
+
];
|
|
18148
|
+
// ret.addScaledVector(velData, speedIntegrate);
|
|
18149
|
+
// ret.addScaledVector(acc, d);
|
|
18150
|
+
// speedIntegrate = speedOverLifetime.getIntegrateValue(0, time, duration);
|
|
18151
|
+
if (this.speedOverLifetime) {
|
|
18152
|
+
// dt / dur 归一化
|
|
18153
|
+
var speed = this.speedOverLifetime.getIntegrateValue(0, dt, duration);
|
|
18154
|
+
return velocity.clone().multiply(speed).add(acc);
|
|
18155
|
+
}
|
|
18156
|
+
return velocity.clone().multiply(dt).add(acc);
|
|
18157
|
+
};
|
|
18158
|
+
_proto.transformFromRotation = function transformFromRotation(rot, life, dur, aSeed) {
|
|
18159
|
+
var rotation = rot.clone();
|
|
18160
|
+
if (!this.rotationOverLifetime) {
|
|
18161
|
+
return new Matrix3();
|
|
18162
|
+
}
|
|
18163
|
+
if (this.rotationOverLifetime.asRotation) {
|
|
18164
|
+
// Adjust rotation based on the specified lifetime components
|
|
18165
|
+
if (this.rotationOverLifetime.x) {
|
|
18166
|
+
if (_instanceof1(this.rotationOverLifetime.x, RandomValue)) {
|
|
18167
|
+
rotation.x += this.rotationOverLifetime.x.getValue(life, aSeed);
|
|
18168
|
+
} else {
|
|
18169
|
+
rotation.x += this.rotationOverLifetime.x.getValue(life);
|
|
18170
|
+
}
|
|
18171
|
+
}
|
|
18172
|
+
if (this.rotationOverLifetime.y) {
|
|
18173
|
+
if (_instanceof1(this.rotationOverLifetime.y, RandomValue)) {
|
|
18174
|
+
rotation.y += this.rotationOverLifetime.y.getValue(life, aSeed);
|
|
18175
|
+
} else {
|
|
18176
|
+
rotation.y += this.rotationOverLifetime.y.getValue(life);
|
|
18177
|
+
}
|
|
18178
|
+
}
|
|
18179
|
+
if (this.rotationOverLifetime.z) {
|
|
18180
|
+
if (_instanceof1(this.rotationOverLifetime.z, RandomValue)) {
|
|
18181
|
+
rotation.z += this.rotationOverLifetime.z.getValue(life, aSeed);
|
|
18182
|
+
} else {
|
|
18183
|
+
rotation.z += this.rotationOverLifetime.z.getValue(life);
|
|
18184
|
+
}
|
|
18185
|
+
}
|
|
18186
|
+
} else {
|
|
18187
|
+
// Adjust rotation based on the specified lifetime components
|
|
18188
|
+
if (this.rotationOverLifetime.x) {
|
|
18189
|
+
if (_instanceof1(this.rotationOverLifetime.x, RandomValue)) {
|
|
18190
|
+
rotation.x += this.rotationOverLifetime.x.getIntegrateValue(0.0, life, aSeed) * dur;
|
|
18191
|
+
} else {
|
|
18192
|
+
rotation.x += this.rotationOverLifetime.x.getIntegrateValue(0.0, life, dur) * dur;
|
|
18193
|
+
}
|
|
18194
|
+
}
|
|
18195
|
+
if (this.rotationOverLifetime.y) {
|
|
18196
|
+
if (_instanceof1(this.rotationOverLifetime.y, RandomValue)) {
|
|
18197
|
+
rotation.y += this.rotationOverLifetime.y.getIntegrateValue(0.0, life, aSeed) * dur;
|
|
18198
|
+
} else {
|
|
18199
|
+
rotation.y += this.rotationOverLifetime.y.getIntegrateValue(0.0, life, dur) * dur;
|
|
18200
|
+
}
|
|
18201
|
+
}
|
|
18202
|
+
if (this.rotationOverLifetime.z) {
|
|
18203
|
+
if (_instanceof1(this.rotationOverLifetime.z, RandomValue)) {
|
|
18204
|
+
rotation.z += this.rotationOverLifetime.z.getIntegrateValue(0.0, life, aSeed) * dur;
|
|
18205
|
+
} else {
|
|
18206
|
+
rotation.z += this.rotationOverLifetime.z.getIntegrateValue(0.0, life, dur) * dur;
|
|
18207
|
+
}
|
|
18208
|
+
}
|
|
18209
|
+
}
|
|
18210
|
+
// If the rotation vector is zero, return the identity matrix
|
|
18211
|
+
if (rotation.dot(rotation) === 0.0) {
|
|
18212
|
+
return new Matrix3().identity();
|
|
18213
|
+
}
|
|
18214
|
+
// Return the rotation matrix derived from the rotation vector
|
|
18215
|
+
return this.mat3FromRotation(rotation);
|
|
18216
|
+
};
|
|
18217
|
+
_proto.mat3FromRotation = function mat3FromRotation(rotation) {
|
|
18218
|
+
var d2r = Math.PI / 180;
|
|
18219
|
+
var sinR = rotation.clone().multiply(d2r);
|
|
18220
|
+
sinR.x = Math.sin(sinR.x);
|
|
18221
|
+
sinR.y = Math.sin(sinR.y);
|
|
18222
|
+
sinR.z = Math.sin(sinR.z);
|
|
18223
|
+
var cosR = rotation.clone().multiply(d2r);
|
|
18224
|
+
cosR.x = Math.cos(cosR.x);
|
|
18225
|
+
cosR.y = Math.cos(cosR.y);
|
|
18226
|
+
cosR.z = Math.cos(cosR.z);
|
|
18227
|
+
var rotZ = new Matrix3(cosR.z, -sinR.z, 0., sinR.z, cosR.z, 0., 0., 0., 1.);
|
|
18228
|
+
var rotY = new Matrix3(cosR.y, 0., sinR.y, 0., 1., 0., -sinR.y, 0, cosR.y);
|
|
18229
|
+
var rotX = new Matrix3(1., 0., 0., 0, cosR.x, -sinR.x, 0., sinR.x, cosR.x);
|
|
18230
|
+
var result = rotZ.multiply(rotY).multiply(rotX);
|
|
18231
|
+
return result;
|
|
18232
|
+
};
|
|
18233
|
+
_proto.calLinearMov = function calLinearMov(time, duration, aSeed) {
|
|
18234
|
+
var mov = new Vector3();
|
|
18235
|
+
var lifetime = time / duration;
|
|
18236
|
+
if (!this.linearVelOverLifetime || !this.linearVelOverLifetime.enabled) {
|
|
18237
|
+
return new Vector3();
|
|
18238
|
+
}
|
|
18239
|
+
if (this.linearVelOverLifetime.asMovement) {
|
|
18240
|
+
if (this.linearVelOverLifetime.x) {
|
|
18241
|
+
if (_instanceof1(this.linearVelOverLifetime.x, RandomValue)) {
|
|
18242
|
+
mov.x = this.linearVelOverLifetime.x.getValue(lifetime, aSeed);
|
|
18243
|
+
} else {
|
|
18244
|
+
mov.x = this.linearVelOverLifetime.x.getValue(lifetime);
|
|
18245
|
+
}
|
|
18246
|
+
}
|
|
18247
|
+
if (this.linearVelOverLifetime.y) {
|
|
18248
|
+
if (_instanceof1(this.linearVelOverLifetime.y, RandomValue)) {
|
|
18249
|
+
mov.y = this.linearVelOverLifetime.y.getValue(lifetime, aSeed);
|
|
18250
|
+
} else {
|
|
18251
|
+
mov.y = this.linearVelOverLifetime.y.getValue(lifetime);
|
|
18252
|
+
}
|
|
18253
|
+
}
|
|
18254
|
+
if (this.linearVelOverLifetime.z) {
|
|
18255
|
+
if (_instanceof1(this.linearVelOverLifetime.z, RandomValue)) {
|
|
18256
|
+
mov.z = this.linearVelOverLifetime.z.getValue(lifetime, aSeed);
|
|
18257
|
+
} else {
|
|
18258
|
+
mov.z = this.linearVelOverLifetime.z.getValue(lifetime);
|
|
18259
|
+
}
|
|
18260
|
+
}
|
|
18261
|
+
} else {
|
|
18262
|
+
// Adjust rotation based on the specified lifetime components
|
|
18263
|
+
if (this.linearVelOverLifetime.x) {
|
|
18264
|
+
if (_instanceof1(this.linearVelOverLifetime.x, RandomValue)) {
|
|
18265
|
+
mov.x = this.linearVelOverLifetime.x.getIntegrateValue(0.0, time, aSeed);
|
|
18266
|
+
} else {
|
|
18267
|
+
mov.x = this.linearVelOverLifetime.x.getIntegrateValue(0.0, time, duration);
|
|
18268
|
+
}
|
|
18269
|
+
}
|
|
18270
|
+
if (this.linearVelOverLifetime.y) {
|
|
18271
|
+
if (_instanceof1(this.linearVelOverLifetime.y, RandomValue)) {
|
|
18272
|
+
mov.y = this.linearVelOverLifetime.y.getIntegrateValue(0.0, time, aSeed);
|
|
18273
|
+
} else {
|
|
18274
|
+
mov.y = this.linearVelOverLifetime.y.getIntegrateValue(0.0, time, duration);
|
|
18275
|
+
}
|
|
18276
|
+
}
|
|
18277
|
+
if (this.linearVelOverLifetime.z) {
|
|
18278
|
+
if (_instanceof1(this.linearVelOverLifetime.z, RandomValue)) {
|
|
18279
|
+
mov.z = this.linearVelOverLifetime.z.getIntegrateValue(0.0, time, aSeed);
|
|
18280
|
+
} else {
|
|
18281
|
+
mov.z = this.linearVelOverLifetime.z.getIntegrateValue(0.0, time, duration);
|
|
18282
|
+
}
|
|
18283
|
+
}
|
|
18284
|
+
}
|
|
18285
|
+
return mov;
|
|
18286
|
+
};
|
|
18054
18287
|
_proto.removePoint = function removePoint(index) {
|
|
18055
18288
|
if (index < this.particleCount) {
|
|
18056
18289
|
this.geometry.setAttributeSubData("aOffset", index * 16, new Float32Array(16));
|
|
@@ -18252,6 +18485,32 @@ function generateGeometryProps(maxVertex, useSprite, name) {
|
|
|
18252
18485
|
size: 4,
|
|
18253
18486
|
stride: 4 * bpe,
|
|
18254
18487
|
data: new Float32Array(0)
|
|
18488
|
+
},
|
|
18489
|
+
aTranslation: {
|
|
18490
|
+
size: 3,
|
|
18491
|
+
data: new Float32Array(0)
|
|
18492
|
+
},
|
|
18493
|
+
aLinearMove: {
|
|
18494
|
+
size: 3,
|
|
18495
|
+
data: new Float32Array(0)
|
|
18496
|
+
},
|
|
18497
|
+
aRotation0: {
|
|
18498
|
+
size: 3,
|
|
18499
|
+
offset: 0,
|
|
18500
|
+
stride: 9 * bpe,
|
|
18501
|
+
data: new Float32Array(0)
|
|
18502
|
+
},
|
|
18503
|
+
aRotation1: {
|
|
18504
|
+
size: 3,
|
|
18505
|
+
offset: 3 * bpe,
|
|
18506
|
+
stride: 9 * bpe,
|
|
18507
|
+
dataSource: "aRotation0"
|
|
18508
|
+
},
|
|
18509
|
+
aRotation2: {
|
|
18510
|
+
size: 3,
|
|
18511
|
+
offset: 6 * bpe,
|
|
18512
|
+
stride: 9 * bpe,
|
|
18513
|
+
dataSource: "aRotation0"
|
|
18255
18514
|
}
|
|
18256
18515
|
};
|
|
18257
18516
|
if (useSprite) {
|
|
@@ -19458,6 +19717,18 @@ function compareTracks(a, b) {
|
|
|
19458
19717
|
}
|
|
19459
19718
|
}
|
|
19460
19719
|
};
|
|
19720
|
+
_proto.showItems = function showItems() {
|
|
19721
|
+
for(var _iterator = _create_for_of_iterator_helper_loose(this.items), _step; !(_step = _iterator()).done;){
|
|
19722
|
+
var item = _step.value;
|
|
19723
|
+
item.setVisible(true);
|
|
19724
|
+
}
|
|
19725
|
+
};
|
|
19726
|
+
_proto.hideItems = function hideItems() {
|
|
19727
|
+
for(var _iterator = _create_for_of_iterator_helper_loose(this.items), _step; !(_step = _iterator()).done;){
|
|
19728
|
+
var item = _step.value;
|
|
19729
|
+
item.setVisible(false);
|
|
19730
|
+
}
|
|
19731
|
+
};
|
|
19461
19732
|
_proto.onDestroy = function onDestroy() {
|
|
19462
19733
|
if (this.item.composition) {
|
|
19463
19734
|
if (this.items) {
|
|
@@ -19568,6 +19839,34 @@ function compareTracks(a, b) {
|
|
|
19568
19839
|
return CompositionComponent;
|
|
19569
19840
|
}(Behaviour);
|
|
19570
19841
|
|
|
19842
|
+
var SubCompositionMixerPlayable = /*#__PURE__*/ function(Playable) {
|
|
19843
|
+
_inherits(SubCompositionMixerPlayable, Playable);
|
|
19844
|
+
function SubCompositionMixerPlayable() {
|
|
19845
|
+
return Playable.apply(this, arguments);
|
|
19846
|
+
}
|
|
19847
|
+
var _proto = SubCompositionMixerPlayable.prototype;
|
|
19848
|
+
_proto.processFrame = function processFrame(context) {
|
|
19849
|
+
var boundObject = context.output.getUserData();
|
|
19850
|
+
if (!_instanceof1(boundObject, CompositionComponent)) {
|
|
19851
|
+
return;
|
|
19852
|
+
}
|
|
19853
|
+
var compositionComponent = boundObject;
|
|
19854
|
+
var hasInput = false;
|
|
19855
|
+
for(var i = 0; i < this.getInputCount(); i++){
|
|
19856
|
+
if (this.getInputWeight(i) > 0) {
|
|
19857
|
+
hasInput = true;
|
|
19858
|
+
break;
|
|
19859
|
+
}
|
|
19860
|
+
}
|
|
19861
|
+
if (hasInput) {
|
|
19862
|
+
compositionComponent.showItems();
|
|
19863
|
+
} else {
|
|
19864
|
+
compositionComponent.hideItems();
|
|
19865
|
+
}
|
|
19866
|
+
};
|
|
19867
|
+
return SubCompositionMixerPlayable;
|
|
19868
|
+
}(Playable);
|
|
19869
|
+
|
|
19571
19870
|
var SubCompositionTrack = /*#__PURE__*/ function(TrackAsset) {
|
|
19572
19871
|
_inherits(SubCompositionTrack, TrackAsset);
|
|
19573
19872
|
function SubCompositionTrack() {
|
|
@@ -19580,6 +19879,9 @@ var SubCompositionTrack = /*#__PURE__*/ function(TrackAsset) {
|
|
|
19580
19879
|
}
|
|
19581
19880
|
return parentBinding.getComponent(CompositionComponent);
|
|
19582
19881
|
};
|
|
19882
|
+
_proto.createTrackMixer = function createTrackMixer(graph) {
|
|
19883
|
+
return new SubCompositionMixerPlayable(graph);
|
|
19884
|
+
};
|
|
19583
19885
|
return SubCompositionTrack;
|
|
19584
19886
|
}(TrackAsset);
|
|
19585
19887
|
SubCompositionTrack = __decorate([
|
|
@@ -23675,22 +23977,6 @@ var seed = 1;
|
|
|
23675
23977
|
this.timeout = timeout;
|
|
23676
23978
|
};
|
|
23677
23979
|
/**
|
|
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
23980
|
* 场景创建,通过 json 创建出场景对象,并进行提前编译等工作
|
|
23695
23981
|
* @param url - json 的 URL 链接或者 json 对象
|
|
23696
23982
|
* @param renderer - renderer 对象,用于获取管理、编译 shader 及 GPU 上下文的参数
|
|
@@ -23817,7 +24103,6 @@ var seed = 1;
|
|
|
23817
24103
|
for(i1 = 0; i1 < scene.images.length; i1++){
|
|
23818
24104
|
scene.textureOptions[i1].image = scene.images[i1];
|
|
23819
24105
|
}
|
|
23820
|
-
_this.updateSceneData(scene.jsonScene.items);
|
|
23821
24106
|
_state.label = 5;
|
|
23822
24107
|
case 5:
|
|
23823
24108
|
return [
|
|
@@ -23874,7 +24159,6 @@ var seed = 1;
|
|
|
23874
24159
|
];
|
|
23875
24160
|
case 10:
|
|
23876
24161
|
loadedTextures = _state.sent();
|
|
23877
|
-
_this.updateSceneData(jsonScene.items);
|
|
23878
24162
|
scene = {
|
|
23879
24163
|
timeInfos: timeInfos,
|
|
23880
24164
|
url: url,
|
|
@@ -25208,6 +25492,7 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
|
|
|
25208
25492
|
* 跳到指定时间点(不做任何播放行为)
|
|
25209
25493
|
* @param time - 相对 startTime 的时间
|
|
25210
25494
|
*/ _proto.setTime = function setTime(time) {
|
|
25495
|
+
var speed = this.speed;
|
|
25211
25496
|
var pause = this.paused;
|
|
25212
25497
|
if (pause) {
|
|
25213
25498
|
this.resume();
|
|
@@ -25216,7 +25501,9 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
|
|
|
25216
25501
|
this.rootComposition.onStart();
|
|
25217
25502
|
this.rootComposition.isStartCalled = true;
|
|
25218
25503
|
}
|
|
25504
|
+
this.setSpeed(1);
|
|
25219
25505
|
this.forwardTime(time + this.startTime);
|
|
25506
|
+
this.setSpeed(speed);
|
|
25220
25507
|
if (pause) {
|
|
25221
25508
|
this.pause();
|
|
25222
25509
|
}
|
|
@@ -25228,7 +25515,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
|
|
|
25228
25515
|
/**
|
|
25229
25516
|
* 前进合成到指定时间
|
|
25230
25517
|
* @param time - 相对0时刻的时间
|
|
25231
|
-
* @param skipRender - 是否跳过渲染
|
|
25232
25518
|
*/ _proto.forwardTime = function forwardTime(time) {
|
|
25233
25519
|
var deltaTime = time * 1000 - this.rootComposition.time * 1000;
|
|
25234
25520
|
var reverse = deltaTime < 0;
|
|
@@ -25278,7 +25564,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
|
|
|
25278
25564
|
/**
|
|
25279
25565
|
* 合成更新,针对所有 item 的更新
|
|
25280
25566
|
* @param deltaTime - 更新的时间步长
|
|
25281
|
-
* @param skipRender - 是否需要渲染
|
|
25282
25567
|
*/ _proto.update = function update(deltaTime) {
|
|
25283
25568
|
if (!this.assigned || this.paused) {
|
|
25284
25569
|
return;
|
|
@@ -27781,7 +28066,7 @@ registerPlugin("sprite", SpriteLoader, VFXItem, true);
|
|
|
27781
28066
|
registerPlugin("particle", ParticleLoader, VFXItem, true);
|
|
27782
28067
|
registerPlugin("cal", CalculateLoader, VFXItem, true);
|
|
27783
28068
|
registerPlugin("interact", InteractLoader, VFXItem, true);
|
|
27784
|
-
var version = "2.1.0-alpha.
|
|
28069
|
+
var version = "2.1.0-alpha.1";
|
|
27785
28070
|
logger.info("Core version: " + version + ".");
|
|
27786
28071
|
|
|
27787
28072
|
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 };
|