@galacean/effects-threejs 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/index.js +321 -36
- package/dist/index.js.map +1 -1
- package/dist/index.min.js +2 -2
- package/dist/index.min.js.map +1 -1
- package/dist/index.mjs +321 -36
- package/dist/index.mjs.map +1 -1
- package/package.json +2 -2
package/dist/index.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Description: Galacean Effects runtime threejs plugin 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
|
'use strict';
|
|
@@ -4711,7 +4711,13 @@ function getDirectStore(target) {
|
|
|
4711
4711
|
}
|
|
4712
4712
|
};
|
|
4713
4713
|
_proto.dispose = function dispose() {
|
|
4714
|
-
this.
|
|
4714
|
+
if (this.isEnableCalled) {
|
|
4715
|
+
this.disable();
|
|
4716
|
+
}
|
|
4717
|
+
if (this.isAwakeCalled) {
|
|
4718
|
+
this.isAwakeCalled = false;
|
|
4719
|
+
this.onDestroy();
|
|
4720
|
+
}
|
|
4715
4721
|
if (this.item) {
|
|
4716
4722
|
removeItem(this.item.components, this);
|
|
4717
4723
|
}
|
|
@@ -10052,8 +10058,13 @@ var RandomValue = /*#__PURE__*/ function(ValueGetter) {
|
|
|
10052
10058
|
this.min = props[0];
|
|
10053
10059
|
this.max = props[1];
|
|
10054
10060
|
};
|
|
10055
|
-
_proto.getValue = function getValue(time) {
|
|
10056
|
-
|
|
10061
|
+
_proto.getValue = function getValue(time, seed) {
|
|
10062
|
+
var randomSeed = seed != null ? seed : Math.random();
|
|
10063
|
+
return this.min + randomSeed * (this.max - this.min);
|
|
10064
|
+
};
|
|
10065
|
+
_proto.getIntegrateValue = function getIntegrateValue(t0, t1, timeScale) {
|
|
10066
|
+
var seed = timeScale != null ? timeScale : 1.0;
|
|
10067
|
+
return (this.min + seed * (this.max - this.min)) * (t1 - t0);
|
|
10057
10068
|
};
|
|
10058
10069
|
_proto.toUniform = function toUniform() {
|
|
10059
10070
|
return new Float32Array([
|
|
@@ -11580,7 +11591,7 @@ var itemFrag = "precision highp float;varying vec4 vColor;varying vec2 vTexCoord
|
|
|
11580
11591
|
|
|
11581
11592
|
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";
|
|
11582
11593
|
|
|
11583
|
-
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}}";
|
|
11594
|
+
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}}";
|
|
11584
11595
|
|
|
11585
11596
|
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}";
|
|
11586
11597
|
|
|
@@ -16558,6 +16569,7 @@ function getTrailMeshShader(trails, particleMaxCount, name, gpuCapability, env)
|
|
|
16558
16569
|
_proto.onUpdate = function onUpdate(dt) {
|
|
16559
16570
|
var time = this.particleMesh.time;
|
|
16560
16571
|
this.particleMesh.mesh.material.setVector4("uParams", new Vector4(time, this.item.duration, 0, 0));
|
|
16572
|
+
this.particleMesh.onUpdate(dt);
|
|
16561
16573
|
};
|
|
16562
16574
|
_proto.render = function render(renderer) {
|
|
16563
16575
|
for(var _iterator = _create_for_of_iterator_helper_loose(this.meshes), _step; !(_step = _iterator()).done;){
|
|
@@ -16572,6 +16584,7 @@ function getTrailMeshShader(trails, particleMaxCount, name, gpuCapability, env)
|
|
|
16572
16584
|
};
|
|
16573
16585
|
_proto.updateTime = function updateTime(now, delta) {
|
|
16574
16586
|
this.particleMesh.time = now;
|
|
16587
|
+
// this.particleMesh.onUpdate(delta);
|
|
16575
16588
|
if (this.trailMesh) {
|
|
16576
16589
|
this.trailMesh.time = now;
|
|
16577
16590
|
this.trailMesh.onUpdate(delta);
|
|
@@ -16670,6 +16683,9 @@ exports.ParticleSystem = /*#__PURE__*/ function(Component) {
|
|
|
16670
16683
|
_proto.isFrozen = function isFrozen() {
|
|
16671
16684
|
return this.frozen;
|
|
16672
16685
|
};
|
|
16686
|
+
_proto.isEnded = function isEnded() {
|
|
16687
|
+
return this.ended;
|
|
16688
|
+
};
|
|
16673
16689
|
_proto.initEmitterTransform = function initEmitterTransform() {
|
|
16674
16690
|
var position = this.item.transform.position.clone();
|
|
16675
16691
|
var rotation = this.item.transform.rotation.clone();
|
|
@@ -17615,11 +17631,8 @@ function randomArrItem(arr, keepArr) {
|
|
|
17615
17631
|
}
|
|
17616
17632
|
var particleSystem = this.particleSystem;
|
|
17617
17633
|
if (particleSystem) {
|
|
17618
|
-
// TODO: [1.31] @十弦 验证 https://github.com/galacean/effects-runtime/commit/3e7d73d37b7d98c2a25e4544e80e928b17801ccd#diff-fae062f28caf3771cfedd3a20dc22f9749bd054c7541bf2fd50a9a5e413153d4
|
|
17619
|
-
// particleSystem.setParentTransform(parentItem.transform);
|
|
17620
|
-
particleSystem.setVisible(true);
|
|
17621
17634
|
var deltaTime = context.deltaTime;
|
|
17622
|
-
if (this.time < particleSystem.item.duration && particleSystem.
|
|
17635
|
+
if (this.time >= 0 && this.time < particleSystem.item.duration && particleSystem.isEnded()) {
|
|
17623
17636
|
particleSystem.reset();
|
|
17624
17637
|
}
|
|
17625
17638
|
if (Math.abs(this.time - this.lastTime) < 0.001) {
|
|
@@ -17678,6 +17691,7 @@ var particleUniformTypeMap = {
|
|
|
17678
17691
|
var ParticleMesh = /*#__PURE__*/ function() {
|
|
17679
17692
|
function ParticleMesh(engine, props) {
|
|
17680
17693
|
this.particleCount = 0;
|
|
17694
|
+
this.VERT_MAX_KEY_FRAME_COUNT = 0;
|
|
17681
17695
|
var _engine_renderer;
|
|
17682
17696
|
var env = ((_engine_renderer = engine.renderer) != null ? _engine_renderer : {}).env;
|
|
17683
17697
|
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;
|
|
@@ -17896,6 +17910,7 @@ var ParticleMesh = /*#__PURE__*/ function() {
|
|
|
17896
17910
|
"FRAG_MAX_KEY_FRAME_COUNT",
|
|
17897
17911
|
fragmentKeyFrameMeta.max
|
|
17898
17912
|
]);
|
|
17913
|
+
this.VERT_MAX_KEY_FRAME_COUNT = vertexKeyFrameMeta.max;
|
|
17899
17914
|
var fragment = particleFrag;
|
|
17900
17915
|
var originalVertex = "#define LOOKUP_TEXTURE_CURVE " + vertex_lookup_texture + "\n" + particleVert;
|
|
17901
17916
|
var vertex = originalVertex;
|
|
@@ -18004,6 +18019,7 @@ var ParticleMesh = /*#__PURE__*/ function() {
|
|
|
18004
18019
|
this.orbitalVelOverLifetime = orbitalVelOverLifetime;
|
|
18005
18020
|
this.orbitalVelOverLifetime = orbitalVelOverLifetime;
|
|
18006
18021
|
this.gravityModifier = gravityModifier;
|
|
18022
|
+
this.rotationOverLifetime = rotationOverLifetime;
|
|
18007
18023
|
this.maxCount = maxCount;
|
|
18008
18024
|
// this.duration = duration;
|
|
18009
18025
|
this.textureOffsets = textureFlip ? [
|
|
@@ -18068,15 +18084,232 @@ var ParticleMesh = /*#__PURE__*/ function() {
|
|
|
18068
18084
|
// @ts-expect-error
|
|
18069
18085
|
geometry.setIndexData(new index.constructor(0));
|
|
18070
18086
|
};
|
|
18087
|
+
_proto.onUpdate = function onUpdate(dt) {
|
|
18088
|
+
var aPosArray = this.geometry.getAttributeData("aPos"); // vector3
|
|
18089
|
+
var aVelArray = this.geometry.getAttributeData("aVel"); // vector3
|
|
18090
|
+
var aOffsetArray = this.geometry.getAttributeData("aOffset");
|
|
18091
|
+
var aRotArray = this.geometry.getAttributeData("aRot"); // vector3
|
|
18092
|
+
var aSeedArray = this.geometry.getAttributeData("aSeed"); // float
|
|
18093
|
+
// const uParams = this.mesh.material.getVector4('uParams');
|
|
18094
|
+
// if (!uParams) {
|
|
18095
|
+
// return;
|
|
18096
|
+
// }
|
|
18097
|
+
var localTime = new Float32Array([
|
|
18098
|
+
this.time
|
|
18099
|
+
])[0];
|
|
18100
|
+
var particleCount = Math.ceil(aPosArray.length / 12);
|
|
18101
|
+
// calculate particle translation
|
|
18102
|
+
var aTranslationArray = this.geometry.getAttributeData("aTranslation");
|
|
18103
|
+
if (aTranslationArray.length < particleCount * 3) {
|
|
18104
|
+
aTranslationArray = new Float32Array(particleCount * 3);
|
|
18105
|
+
}
|
|
18106
|
+
var velocity = new Vector3(0, 0, 0);
|
|
18107
|
+
for(var i = 0; i < particleCount; i++){
|
|
18108
|
+
var velOffset = i * 12 + 3;
|
|
18109
|
+
velocity.set(aVelArray[velOffset], aVelArray[velOffset + 1], aVelArray[velOffset + 2]);
|
|
18110
|
+
var trans = this.calculateTranslation(velocity, aOffsetArray[i * 4 + 2], localTime, aOffsetArray[i * 4 + 3]);
|
|
18111
|
+
var aTranslationOffset = i * 3;
|
|
18112
|
+
aTranslationArray[aTranslationOffset] = trans.x;
|
|
18113
|
+
aTranslationArray[aTranslationOffset + 1] = trans.y;
|
|
18114
|
+
aTranslationArray[aTranslationOffset + 2] = trans.z;
|
|
18115
|
+
}
|
|
18116
|
+
this.geometry.setAttributeData("aTranslation", aTranslationArray);
|
|
18117
|
+
// calculate particle rotation
|
|
18118
|
+
var aRotationArray = this.geometry.getAttributeData("aRotation0");
|
|
18119
|
+
if (aRotationArray.length < particleCount * 9) {
|
|
18120
|
+
aRotationArray = new Float32Array(particleCount * 9);
|
|
18121
|
+
}
|
|
18122
|
+
for(var i1 = 0; i1 < particleCount; i1++){
|
|
18123
|
+
var time = localTime - aOffsetArray[i1 * 4 + 2];
|
|
18124
|
+
var duration = aOffsetArray[i1 * 4 + 3];
|
|
18125
|
+
var life = clamp$1(time / duration, 0.0, 1.0);
|
|
18126
|
+
var aRotOffset = i1 * 8;
|
|
18127
|
+
var aRot = new Vector3(aRotArray[aRotOffset], aRotArray[aRotOffset + 1], aRotArray[aRotOffset + 2]);
|
|
18128
|
+
var aSeed = aSeedArray[i1 * 8 + 3];
|
|
18129
|
+
var aRotation = this.transformFromRotation(aRot, life, duration, aSeed);
|
|
18130
|
+
var aRotationOffset = i1 * 9;
|
|
18131
|
+
var matrixArray = aRotation.toArray();
|
|
18132
|
+
aRotationArray.set(matrixArray, aRotationOffset);
|
|
18133
|
+
}
|
|
18134
|
+
this.geometry.setAttributeData("aRotation0", aRotationArray);
|
|
18135
|
+
// calculate linear movement
|
|
18136
|
+
var aLinearMoveArray = this.geometry.getAttributeData("aLinearMove");
|
|
18137
|
+
if (aLinearMoveArray.length < particleCount * 3) {
|
|
18138
|
+
aLinearMoveArray = new Float32Array(particleCount * 3);
|
|
18139
|
+
}
|
|
18140
|
+
for(var i2 = 0; i2 < particleCount; i2++){
|
|
18141
|
+
var time1 = localTime - aOffsetArray[i2 * 4 + 2];
|
|
18142
|
+
var duration1 = aOffsetArray[i2 * 4 + 3];
|
|
18143
|
+
// const life = math.clamp(time / duration, 0.0, 1.0);
|
|
18144
|
+
var aSeed1 = aSeedArray[i2 * 8 + 3];
|
|
18145
|
+
var linearMove = this.calLinearMov(time1, duration1, aSeed1);
|
|
18146
|
+
var aLinearMoveOffset = i2 * 3;
|
|
18147
|
+
aLinearMoveArray[aLinearMoveOffset] = linearMove.x;
|
|
18148
|
+
aLinearMoveArray[aLinearMoveOffset + 1] = linearMove.y;
|
|
18149
|
+
aLinearMoveArray[aLinearMoveOffset + 2] = linearMove.z;
|
|
18150
|
+
}
|
|
18151
|
+
this.geometry.setAttributeData("aLinearMove", aLinearMoveArray);
|
|
18152
|
+
};
|
|
18071
18153
|
_proto.minusTime = function minusTime(time) {
|
|
18072
|
-
var
|
|
18073
|
-
|
|
18074
|
-
|
|
18075
|
-
data[i + 2] -= time;
|
|
18154
|
+
var aOffset = this.geometry.getAttributeData("aOffset");
|
|
18155
|
+
for(var i = 0; i < aOffset.length; i += 4){
|
|
18156
|
+
aOffset[i + 2] -= time;
|
|
18076
18157
|
}
|
|
18077
|
-
this.geometry.setAttributeData("aOffset",
|
|
18158
|
+
this.geometry.setAttributeData("aOffset", aOffset);
|
|
18078
18159
|
this.time -= time;
|
|
18079
18160
|
};
|
|
18161
|
+
_proto.calculateTranslation = function calculateTranslation(velocity, t0, t1, duration) {
|
|
18162
|
+
var uAcceleration = this.mesh.material.getVector4("uAcceleration");
|
|
18163
|
+
var uGravityModifierValue = this.mesh.material.getVector4("uGravityModifierValue");
|
|
18164
|
+
if (!uAcceleration || !uGravityModifierValue) {
|
|
18165
|
+
return new Vector3();
|
|
18166
|
+
}
|
|
18167
|
+
var dt = t1 - t0; // 相对delay的时间
|
|
18168
|
+
var d = this.gravityModifier.getIntegrateByTime(0, dt);
|
|
18169
|
+
var acc = [
|
|
18170
|
+
uAcceleration.x * d,
|
|
18171
|
+
uAcceleration.y * d,
|
|
18172
|
+
uAcceleration.z * d
|
|
18173
|
+
];
|
|
18174
|
+
// ret.addScaledVector(velData, speedIntegrate);
|
|
18175
|
+
// ret.addScaledVector(acc, d);
|
|
18176
|
+
// speedIntegrate = speedOverLifetime.getIntegrateValue(0, time, duration);
|
|
18177
|
+
if (this.speedOverLifetime) {
|
|
18178
|
+
// dt / dur 归一化
|
|
18179
|
+
var speed = this.speedOverLifetime.getIntegrateValue(0, dt, duration);
|
|
18180
|
+
return velocity.clone().multiply(speed).add(acc);
|
|
18181
|
+
}
|
|
18182
|
+
return velocity.clone().multiply(dt).add(acc);
|
|
18183
|
+
};
|
|
18184
|
+
_proto.transformFromRotation = function transformFromRotation(rot, life, dur, aSeed) {
|
|
18185
|
+
var rotation = rot.clone();
|
|
18186
|
+
if (!this.rotationOverLifetime) {
|
|
18187
|
+
return new Matrix3();
|
|
18188
|
+
}
|
|
18189
|
+
if (this.rotationOverLifetime.asRotation) {
|
|
18190
|
+
// Adjust rotation based on the specified lifetime components
|
|
18191
|
+
if (this.rotationOverLifetime.x) {
|
|
18192
|
+
if (_instanceof1(this.rotationOverLifetime.x, RandomValue)) {
|
|
18193
|
+
rotation.x += this.rotationOverLifetime.x.getValue(life, aSeed);
|
|
18194
|
+
} else {
|
|
18195
|
+
rotation.x += this.rotationOverLifetime.x.getValue(life);
|
|
18196
|
+
}
|
|
18197
|
+
}
|
|
18198
|
+
if (this.rotationOverLifetime.y) {
|
|
18199
|
+
if (_instanceof1(this.rotationOverLifetime.y, RandomValue)) {
|
|
18200
|
+
rotation.y += this.rotationOverLifetime.y.getValue(life, aSeed);
|
|
18201
|
+
} else {
|
|
18202
|
+
rotation.y += this.rotationOverLifetime.y.getValue(life);
|
|
18203
|
+
}
|
|
18204
|
+
}
|
|
18205
|
+
if (this.rotationOverLifetime.z) {
|
|
18206
|
+
if (_instanceof1(this.rotationOverLifetime.z, RandomValue)) {
|
|
18207
|
+
rotation.z += this.rotationOverLifetime.z.getValue(life, aSeed);
|
|
18208
|
+
} else {
|
|
18209
|
+
rotation.z += this.rotationOverLifetime.z.getValue(life);
|
|
18210
|
+
}
|
|
18211
|
+
}
|
|
18212
|
+
} else {
|
|
18213
|
+
// Adjust rotation based on the specified lifetime components
|
|
18214
|
+
if (this.rotationOverLifetime.x) {
|
|
18215
|
+
if (_instanceof1(this.rotationOverLifetime.x, RandomValue)) {
|
|
18216
|
+
rotation.x += this.rotationOverLifetime.x.getIntegrateValue(0.0, life, aSeed) * dur;
|
|
18217
|
+
} else {
|
|
18218
|
+
rotation.x += this.rotationOverLifetime.x.getIntegrateValue(0.0, life, dur) * dur;
|
|
18219
|
+
}
|
|
18220
|
+
}
|
|
18221
|
+
if (this.rotationOverLifetime.y) {
|
|
18222
|
+
if (_instanceof1(this.rotationOverLifetime.y, RandomValue)) {
|
|
18223
|
+
rotation.y += this.rotationOverLifetime.y.getIntegrateValue(0.0, life, aSeed) * dur;
|
|
18224
|
+
} else {
|
|
18225
|
+
rotation.y += this.rotationOverLifetime.y.getIntegrateValue(0.0, life, dur) * dur;
|
|
18226
|
+
}
|
|
18227
|
+
}
|
|
18228
|
+
if (this.rotationOverLifetime.z) {
|
|
18229
|
+
if (_instanceof1(this.rotationOverLifetime.z, RandomValue)) {
|
|
18230
|
+
rotation.z += this.rotationOverLifetime.z.getIntegrateValue(0.0, life, aSeed) * dur;
|
|
18231
|
+
} else {
|
|
18232
|
+
rotation.z += this.rotationOverLifetime.z.getIntegrateValue(0.0, life, dur) * dur;
|
|
18233
|
+
}
|
|
18234
|
+
}
|
|
18235
|
+
}
|
|
18236
|
+
// If the rotation vector is zero, return the identity matrix
|
|
18237
|
+
if (rotation.dot(rotation) === 0.0) {
|
|
18238
|
+
return new Matrix3().identity();
|
|
18239
|
+
}
|
|
18240
|
+
// Return the rotation matrix derived from the rotation vector
|
|
18241
|
+
return this.mat3FromRotation(rotation);
|
|
18242
|
+
};
|
|
18243
|
+
_proto.mat3FromRotation = function mat3FromRotation(rotation) {
|
|
18244
|
+
var d2r = Math.PI / 180;
|
|
18245
|
+
var sinR = rotation.clone().multiply(d2r);
|
|
18246
|
+
sinR.x = Math.sin(sinR.x);
|
|
18247
|
+
sinR.y = Math.sin(sinR.y);
|
|
18248
|
+
sinR.z = Math.sin(sinR.z);
|
|
18249
|
+
var cosR = rotation.clone().multiply(d2r);
|
|
18250
|
+
cosR.x = Math.cos(cosR.x);
|
|
18251
|
+
cosR.y = Math.cos(cosR.y);
|
|
18252
|
+
cosR.z = Math.cos(cosR.z);
|
|
18253
|
+
var rotZ = new Matrix3(cosR.z, -sinR.z, 0., sinR.z, cosR.z, 0., 0., 0., 1.);
|
|
18254
|
+
var rotY = new Matrix3(cosR.y, 0., sinR.y, 0., 1., 0., -sinR.y, 0, cosR.y);
|
|
18255
|
+
var rotX = new Matrix3(1., 0., 0., 0, cosR.x, -sinR.x, 0., sinR.x, cosR.x);
|
|
18256
|
+
var result = rotZ.multiply(rotY).multiply(rotX);
|
|
18257
|
+
return result;
|
|
18258
|
+
};
|
|
18259
|
+
_proto.calLinearMov = function calLinearMov(time, duration, aSeed) {
|
|
18260
|
+
var mov = new Vector3();
|
|
18261
|
+
var lifetime = time / duration;
|
|
18262
|
+
if (!this.linearVelOverLifetime || !this.linearVelOverLifetime.enabled) {
|
|
18263
|
+
return new Vector3();
|
|
18264
|
+
}
|
|
18265
|
+
if (this.linearVelOverLifetime.asMovement) {
|
|
18266
|
+
if (this.linearVelOverLifetime.x) {
|
|
18267
|
+
if (_instanceof1(this.linearVelOverLifetime.x, RandomValue)) {
|
|
18268
|
+
mov.x = this.linearVelOverLifetime.x.getValue(lifetime, aSeed);
|
|
18269
|
+
} else {
|
|
18270
|
+
mov.x = this.linearVelOverLifetime.x.getValue(lifetime);
|
|
18271
|
+
}
|
|
18272
|
+
}
|
|
18273
|
+
if (this.linearVelOverLifetime.y) {
|
|
18274
|
+
if (_instanceof1(this.linearVelOverLifetime.y, RandomValue)) {
|
|
18275
|
+
mov.y = this.linearVelOverLifetime.y.getValue(lifetime, aSeed);
|
|
18276
|
+
} else {
|
|
18277
|
+
mov.y = this.linearVelOverLifetime.y.getValue(lifetime);
|
|
18278
|
+
}
|
|
18279
|
+
}
|
|
18280
|
+
if (this.linearVelOverLifetime.z) {
|
|
18281
|
+
if (_instanceof1(this.linearVelOverLifetime.z, RandomValue)) {
|
|
18282
|
+
mov.z = this.linearVelOverLifetime.z.getValue(lifetime, aSeed);
|
|
18283
|
+
} else {
|
|
18284
|
+
mov.z = this.linearVelOverLifetime.z.getValue(lifetime);
|
|
18285
|
+
}
|
|
18286
|
+
}
|
|
18287
|
+
} else {
|
|
18288
|
+
// Adjust rotation based on the specified lifetime components
|
|
18289
|
+
if (this.linearVelOverLifetime.x) {
|
|
18290
|
+
if (_instanceof1(this.linearVelOverLifetime.x, RandomValue)) {
|
|
18291
|
+
mov.x = this.linearVelOverLifetime.x.getIntegrateValue(0.0, time, aSeed);
|
|
18292
|
+
} else {
|
|
18293
|
+
mov.x = this.linearVelOverLifetime.x.getIntegrateValue(0.0, time, duration);
|
|
18294
|
+
}
|
|
18295
|
+
}
|
|
18296
|
+
if (this.linearVelOverLifetime.y) {
|
|
18297
|
+
if (_instanceof1(this.linearVelOverLifetime.y, RandomValue)) {
|
|
18298
|
+
mov.y = this.linearVelOverLifetime.y.getIntegrateValue(0.0, time, aSeed);
|
|
18299
|
+
} else {
|
|
18300
|
+
mov.y = this.linearVelOverLifetime.y.getIntegrateValue(0.0, time, duration);
|
|
18301
|
+
}
|
|
18302
|
+
}
|
|
18303
|
+
if (this.linearVelOverLifetime.z) {
|
|
18304
|
+
if (_instanceof1(this.linearVelOverLifetime.z, RandomValue)) {
|
|
18305
|
+
mov.z = this.linearVelOverLifetime.z.getIntegrateValue(0.0, time, aSeed);
|
|
18306
|
+
} else {
|
|
18307
|
+
mov.z = this.linearVelOverLifetime.z.getIntegrateValue(0.0, time, duration);
|
|
18308
|
+
}
|
|
18309
|
+
}
|
|
18310
|
+
}
|
|
18311
|
+
return mov;
|
|
18312
|
+
};
|
|
18080
18313
|
_proto.removePoint = function removePoint(index) {
|
|
18081
18314
|
if (index < this.particleCount) {
|
|
18082
18315
|
this.geometry.setAttributeSubData("aOffset", index * 16, new Float32Array(16));
|
|
@@ -18278,6 +18511,32 @@ function generateGeometryProps(maxVertex, useSprite, name) {
|
|
|
18278
18511
|
size: 4,
|
|
18279
18512
|
stride: 4 * bpe,
|
|
18280
18513
|
data: new Float32Array(0)
|
|
18514
|
+
},
|
|
18515
|
+
aTranslation: {
|
|
18516
|
+
size: 3,
|
|
18517
|
+
data: new Float32Array(0)
|
|
18518
|
+
},
|
|
18519
|
+
aLinearMove: {
|
|
18520
|
+
size: 3,
|
|
18521
|
+
data: new Float32Array(0)
|
|
18522
|
+
},
|
|
18523
|
+
aRotation0: {
|
|
18524
|
+
size: 3,
|
|
18525
|
+
offset: 0,
|
|
18526
|
+
stride: 9 * bpe,
|
|
18527
|
+
data: new Float32Array(0)
|
|
18528
|
+
},
|
|
18529
|
+
aRotation1: {
|
|
18530
|
+
size: 3,
|
|
18531
|
+
offset: 3 * bpe,
|
|
18532
|
+
stride: 9 * bpe,
|
|
18533
|
+
dataSource: "aRotation0"
|
|
18534
|
+
},
|
|
18535
|
+
aRotation2: {
|
|
18536
|
+
size: 3,
|
|
18537
|
+
offset: 6 * bpe,
|
|
18538
|
+
stride: 9 * bpe,
|
|
18539
|
+
dataSource: "aRotation0"
|
|
18281
18540
|
}
|
|
18282
18541
|
};
|
|
18283
18542
|
if (useSprite) {
|
|
@@ -19484,6 +19743,18 @@ function compareTracks(a, b) {
|
|
|
19484
19743
|
}
|
|
19485
19744
|
}
|
|
19486
19745
|
};
|
|
19746
|
+
_proto.showItems = function showItems() {
|
|
19747
|
+
for(var _iterator = _create_for_of_iterator_helper_loose(this.items), _step; !(_step = _iterator()).done;){
|
|
19748
|
+
var item = _step.value;
|
|
19749
|
+
item.setVisible(true);
|
|
19750
|
+
}
|
|
19751
|
+
};
|
|
19752
|
+
_proto.hideItems = function hideItems() {
|
|
19753
|
+
for(var _iterator = _create_for_of_iterator_helper_loose(this.items), _step; !(_step = _iterator()).done;){
|
|
19754
|
+
var item = _step.value;
|
|
19755
|
+
item.setVisible(false);
|
|
19756
|
+
}
|
|
19757
|
+
};
|
|
19487
19758
|
_proto.onDestroy = function onDestroy() {
|
|
19488
19759
|
if (this.item.composition) {
|
|
19489
19760
|
if (this.items) {
|
|
@@ -19594,6 +19865,34 @@ function compareTracks(a, b) {
|
|
|
19594
19865
|
return CompositionComponent;
|
|
19595
19866
|
}(Behaviour);
|
|
19596
19867
|
|
|
19868
|
+
var SubCompositionMixerPlayable = /*#__PURE__*/ function(Playable) {
|
|
19869
|
+
_inherits(SubCompositionMixerPlayable, Playable);
|
|
19870
|
+
function SubCompositionMixerPlayable() {
|
|
19871
|
+
return Playable.apply(this, arguments);
|
|
19872
|
+
}
|
|
19873
|
+
var _proto = SubCompositionMixerPlayable.prototype;
|
|
19874
|
+
_proto.processFrame = function processFrame(context) {
|
|
19875
|
+
var boundObject = context.output.getUserData();
|
|
19876
|
+
if (!_instanceof1(boundObject, CompositionComponent)) {
|
|
19877
|
+
return;
|
|
19878
|
+
}
|
|
19879
|
+
var compositionComponent = boundObject;
|
|
19880
|
+
var hasInput = false;
|
|
19881
|
+
for(var i = 0; i < this.getInputCount(); i++){
|
|
19882
|
+
if (this.getInputWeight(i) > 0) {
|
|
19883
|
+
hasInput = true;
|
|
19884
|
+
break;
|
|
19885
|
+
}
|
|
19886
|
+
}
|
|
19887
|
+
if (hasInput) {
|
|
19888
|
+
compositionComponent.showItems();
|
|
19889
|
+
} else {
|
|
19890
|
+
compositionComponent.hideItems();
|
|
19891
|
+
}
|
|
19892
|
+
};
|
|
19893
|
+
return SubCompositionMixerPlayable;
|
|
19894
|
+
}(Playable);
|
|
19895
|
+
|
|
19597
19896
|
exports.SubCompositionTrack = /*#__PURE__*/ function(TrackAsset) {
|
|
19598
19897
|
_inherits(SubCompositionTrack, TrackAsset);
|
|
19599
19898
|
function SubCompositionTrack() {
|
|
@@ -19606,6 +19905,9 @@ exports.SubCompositionTrack = /*#__PURE__*/ function(TrackAsset) {
|
|
|
19606
19905
|
}
|
|
19607
19906
|
return parentBinding.getComponent(CompositionComponent);
|
|
19608
19907
|
};
|
|
19908
|
+
_proto.createTrackMixer = function createTrackMixer(graph) {
|
|
19909
|
+
return new SubCompositionMixerPlayable(graph);
|
|
19910
|
+
};
|
|
19609
19911
|
return SubCompositionTrack;
|
|
19610
19912
|
}(exports.TrackAsset);
|
|
19611
19913
|
exports.SubCompositionTrack = __decorate([
|
|
@@ -23701,22 +24003,6 @@ var seed$1 = 1;
|
|
|
23701
24003
|
this.timeout = timeout;
|
|
23702
24004
|
};
|
|
23703
24005
|
/**
|
|
23704
|
-
* 根据用户传入的参数修改场景数据
|
|
23705
|
-
*/ _proto.updateSceneData = function updateSceneData(items) {
|
|
23706
|
-
var variables = this.options.variables;
|
|
23707
|
-
if (!variables || Object.keys(variables).length === 0) {
|
|
23708
|
-
return;
|
|
23709
|
-
}
|
|
23710
|
-
items.forEach(function(item) {
|
|
23711
|
-
if (item.type === ItemType.text) {
|
|
23712
|
-
var textVariable = variables[item.name];
|
|
23713
|
-
if (textVariable) {
|
|
23714
|
-
item.content.options.text = textVariable;
|
|
23715
|
-
}
|
|
23716
|
-
}
|
|
23717
|
-
});
|
|
23718
|
-
};
|
|
23719
|
-
/**
|
|
23720
24006
|
* 场景创建,通过 json 创建出场景对象,并进行提前编译等工作
|
|
23721
24007
|
* @param url - json 的 URL 链接或者 json 对象
|
|
23722
24008
|
* @param renderer - renderer 对象,用于获取管理、编译 shader 及 GPU 上下文的参数
|
|
@@ -23843,7 +24129,6 @@ var seed$1 = 1;
|
|
|
23843
24129
|
for(i1 = 0; i1 < scene.images.length; i1++){
|
|
23844
24130
|
scene.textureOptions[i1].image = scene.images[i1];
|
|
23845
24131
|
}
|
|
23846
|
-
_this.updateSceneData(scene.jsonScene.items);
|
|
23847
24132
|
_state.label = 5;
|
|
23848
24133
|
case 5:
|
|
23849
24134
|
return [
|
|
@@ -23900,7 +24185,6 @@ var seed$1 = 1;
|
|
|
23900
24185
|
];
|
|
23901
24186
|
case 10:
|
|
23902
24187
|
loadedTextures = _state.sent();
|
|
23903
|
-
_this.updateSceneData(jsonScene.items);
|
|
23904
24188
|
scene = {
|
|
23905
24189
|
timeInfos: timeInfos,
|
|
23906
24190
|
url: url,
|
|
@@ -25234,6 +25518,7 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
|
|
|
25234
25518
|
* 跳到指定时间点(不做任何播放行为)
|
|
25235
25519
|
* @param time - 相对 startTime 的时间
|
|
25236
25520
|
*/ _proto.setTime = function setTime(time) {
|
|
25521
|
+
var speed = this.speed;
|
|
25237
25522
|
var pause = this.paused;
|
|
25238
25523
|
if (pause) {
|
|
25239
25524
|
this.resume();
|
|
@@ -25242,7 +25527,9 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
|
|
|
25242
25527
|
this.rootComposition.onStart();
|
|
25243
25528
|
this.rootComposition.isStartCalled = true;
|
|
25244
25529
|
}
|
|
25530
|
+
this.setSpeed(1);
|
|
25245
25531
|
this.forwardTime(time + this.startTime);
|
|
25532
|
+
this.setSpeed(speed);
|
|
25246
25533
|
if (pause) {
|
|
25247
25534
|
this.pause();
|
|
25248
25535
|
}
|
|
@@ -25254,7 +25541,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
|
|
|
25254
25541
|
/**
|
|
25255
25542
|
* 前进合成到指定时间
|
|
25256
25543
|
* @param time - 相对0时刻的时间
|
|
25257
|
-
* @param skipRender - 是否跳过渲染
|
|
25258
25544
|
*/ _proto.forwardTime = function forwardTime(time) {
|
|
25259
25545
|
var deltaTime = time * 1000 - this.rootComposition.time * 1000;
|
|
25260
25546
|
var reverse = deltaTime < 0;
|
|
@@ -25304,7 +25590,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
|
|
|
25304
25590
|
/**
|
|
25305
25591
|
* 合成更新,针对所有 item 的更新
|
|
25306
25592
|
* @param deltaTime - 更新的时间步长
|
|
25307
|
-
* @param skipRender - 是否需要渲染
|
|
25308
25593
|
*/ _proto.update = function update(deltaTime) {
|
|
25309
25594
|
if (!this.assigned || this.paused) {
|
|
25310
25595
|
return;
|
|
@@ -27807,7 +28092,7 @@ registerPlugin("sprite", SpriteLoader, exports.VFXItem, true);
|
|
|
27807
28092
|
registerPlugin("particle", ParticleLoader, exports.VFXItem, true);
|
|
27808
28093
|
registerPlugin("cal", CalculateLoader, exports.VFXItem, true);
|
|
27809
28094
|
registerPlugin("interact", InteractLoader, exports.VFXItem, true);
|
|
27810
|
-
var version$1 = "2.1.0-alpha.
|
|
28095
|
+
var version$1 = "2.1.0-alpha.1";
|
|
27811
28096
|
logger.info("Core version: " + version$1 + ".");
|
|
27812
28097
|
|
|
27813
28098
|
var _obj;
|
|
@@ -29488,7 +29773,7 @@ setMaxSpriteMeshItemCount(8);
|
|
|
29488
29773
|
*/ Mesh.create = function(engine, props) {
|
|
29489
29774
|
return new ThreeMesh(engine, props);
|
|
29490
29775
|
};
|
|
29491
|
-
var version = "2.1.0-alpha.
|
|
29776
|
+
var version = "2.1.0-alpha.1";
|
|
29492
29777
|
logger.info("THREEJS plugin version: " + version + ".");
|
|
29493
29778
|
|
|
29494
29779
|
exports.AbstractPlugin = AbstractPlugin;
|